From e9f107d5e366dbb93305d9d29134683f24a0df3c Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:22:46 +0530
Subject: [PATCH 01/23] Updated tenatns.json and added 400 data folder wise

---
 .../BillingService/BusinessService.json       |    145 +
 .../1050454/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1429340/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1432067/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1439931/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1441030/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1450901/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1758972/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1759034/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1761428/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1763377/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1764917/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1769128/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1769703/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1770771/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1770808/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1771140/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1774472/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1774711/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1774890/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1775011/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1779266/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1783019/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1783754/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1784430/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1784527/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1784979/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1803054/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1812780/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1817138/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1817302/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1819835/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1830310/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1841150/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1842161/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1842244/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1842378/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1842423/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1842653/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1842776/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1843088/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1843358/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1843430/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1844212/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1844228/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1844235/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1845373/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1845703/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1845765/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1845900/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1846063/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1846172/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1846500/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1846605/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1846743/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1852364/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1852774/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1852987/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1853306/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1853326/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1853350/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1853501/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1853696/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1854331/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1854436/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1858924/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1859895/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1860965/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1861320/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1861420/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1872281/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1872304/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1872337/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1936743/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937513/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937533/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937549/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937556/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937635/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937654/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937787/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937816/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937849/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937917/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937928/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937948/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1937960/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1941516/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1941535/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1941750/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1941769/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1941788/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1941850/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../1970469/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2404395/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2404401/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2404437/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2405228/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2406004/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2421895/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2421903/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2421911/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2421922/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2423434/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2426035/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2429111/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2433896/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2443383/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2480357/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2480363/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2484676/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2484678/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2486691/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2491893/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2495922/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2496124/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2496136/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2497758/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2515923/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2515942/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2515998/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516005/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516013/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516019/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516135/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516159/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516189/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516326/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516787/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516881/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2516940/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2517189/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2517201/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2517213/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2517242/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2517248/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2517256/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2520036/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2520181/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2581909/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2582386/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2582460/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../2615100/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3164535/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3319750/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3321276/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3321879/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3327425/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3328455/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3328647/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3328767/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3328873/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3333586/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3359758/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3370880/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3372158/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3373443/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3374529/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3375170/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3375765/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3378587/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3384885/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3384921/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3385844/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3385946/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3385982/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386123/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386146/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386204/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386236/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386289/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386322/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386356/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386386/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386407/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386435/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386445/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386466/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386515/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386526/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386540/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386544/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386664/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3386695/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../3800160/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4516012/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4516046/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4516419/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../452628/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../452685/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../452697/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../453185/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../454276/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../455214/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../455219/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../455220/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../455374/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4566832/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567143/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567157/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567167/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567203/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567253/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567258/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567264/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4567271/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4627074/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4627137/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4637354/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4637711/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4637724/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4637728/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4638859/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4639802/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4639900/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4639926/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4639994/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4640433/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4640480/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4642317/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4642337/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4651600/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4652293/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4653590/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4654670/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4655460/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4655542/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4655617/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4656070/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4656202/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4656990/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4657126/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4657150/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4657189/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4657198/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4657250/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4658923/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4658962/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4659024/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4659210/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4668398/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4869442/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4870166/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4870229/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4870250/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4870307/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872574/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872595/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872646/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872699/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872806/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872849/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4872988/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873102/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873166/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873607/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873634/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873695/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873715/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873739/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873771/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873867/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4873898/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4887720/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4887740/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4887755/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4887898/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4887947/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4888080/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4888114/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4888263/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4888294/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492155/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492158/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492161/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492165/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492168/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492177/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../492182/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../4963515/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5072706/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5072752/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5072807/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5072821/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5072838/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5072844/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5073321/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5073330/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5073372/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5073861/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5073879/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5073951/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5074126/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5074129/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5074133/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../50796/BillingService/BusinessService.json |    145 +
 .../as/50796/egov-location/boundary-data.json |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5102401/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5102996/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5103007/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../51526/BillingService/BusinessService.json |    145 +
 .../as/51526/egov-location/boundary-data.json |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../51536/BillingService/BusinessService.json |    145 +
 .../as/51536/egov-location/boundary-data.json |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5182812/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5183548/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5183964/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5184373/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185351/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185356/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185535/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185541/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185549/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185556/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185570/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185575/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185587/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185591/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185615/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185635/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185650/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185655/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185659/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185665/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185685/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185693/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185707/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185717/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5185887/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186387/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186420/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186446/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186457/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186463/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186493/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186499/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186506/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5186513/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5206914/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5230312/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5230346/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5230398/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../52793/BillingService/BusinessService.json |    145 +
 .../as/52793/egov-location/boundary-data.json |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5344027/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5349626/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5349656/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5349682/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5357091/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5362300/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5362332/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5379654/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5379810/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5404892/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5404904/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5404932/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5407809/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5407828/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5407846/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5407857/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408096/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408108/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408187/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408224/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408248/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408300/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408316/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408332/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408704/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408793/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408854/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5408891/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5464190/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5464241/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5464278/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5464342/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5464413/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5464439/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5475220/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5519133/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5519203/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5523260/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5527478/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5528384/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5531603/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5532932/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5533989/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5534043/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5534657/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5544794/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5547805/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5547815/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5547824/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5547832/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../5547843/egov-location/boundary-data.json  |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../600587/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../603120/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../603277/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../603538/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../729083/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../729086/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../874344/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../877925/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 .../BillingService/BusinessService.json       |    145 +
 .../877934/egov-location/boundary-data.json   |     62 +
 .../ws-services-calculation/Penalty.json      |     17 +
 .../WCBillingSlab.json                        |    118 +
 data/as/tenant/tenants.json                   | 115200 ++++++++++++++-
 1597 files changed, 251178 insertions(+), 480 deletions(-)
 create mode 100644 data/as/1050454/BillingService/BusinessService.json
 create mode 100644 data/as/1050454/egov-location/boundary-data.json
 create mode 100644 data/as/1050454/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1050454/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1429340/BillingService/BusinessService.json
 create mode 100644 data/as/1429340/egov-location/boundary-data.json
 create mode 100644 data/as/1429340/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1429340/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1432067/BillingService/BusinessService.json
 create mode 100644 data/as/1432067/egov-location/boundary-data.json
 create mode 100644 data/as/1432067/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1432067/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1439931/BillingService/BusinessService.json
 create mode 100644 data/as/1439931/egov-location/boundary-data.json
 create mode 100644 data/as/1439931/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1439931/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1441030/BillingService/BusinessService.json
 create mode 100644 data/as/1441030/egov-location/boundary-data.json
 create mode 100644 data/as/1441030/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1441030/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1450901/BillingService/BusinessService.json
 create mode 100644 data/as/1450901/egov-location/boundary-data.json
 create mode 100644 data/as/1450901/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1450901/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1758972/BillingService/BusinessService.json
 create mode 100644 data/as/1758972/egov-location/boundary-data.json
 create mode 100644 data/as/1758972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1758972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1759034/BillingService/BusinessService.json
 create mode 100644 data/as/1759034/egov-location/boundary-data.json
 create mode 100644 data/as/1759034/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1759034/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1761428/BillingService/BusinessService.json
 create mode 100644 data/as/1761428/egov-location/boundary-data.json
 create mode 100644 data/as/1761428/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1761428/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1763377/BillingService/BusinessService.json
 create mode 100644 data/as/1763377/egov-location/boundary-data.json
 create mode 100644 data/as/1763377/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1763377/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1764917/BillingService/BusinessService.json
 create mode 100644 data/as/1764917/egov-location/boundary-data.json
 create mode 100644 data/as/1764917/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1764917/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1769128/BillingService/BusinessService.json
 create mode 100644 data/as/1769128/egov-location/boundary-data.json
 create mode 100644 data/as/1769128/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1769128/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1769703/BillingService/BusinessService.json
 create mode 100644 data/as/1769703/egov-location/boundary-data.json
 create mode 100644 data/as/1769703/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1769703/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1770771/BillingService/BusinessService.json
 create mode 100644 data/as/1770771/egov-location/boundary-data.json
 create mode 100644 data/as/1770771/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1770771/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1770808/BillingService/BusinessService.json
 create mode 100644 data/as/1770808/egov-location/boundary-data.json
 create mode 100644 data/as/1770808/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1770808/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1771140/BillingService/BusinessService.json
 create mode 100644 data/as/1771140/egov-location/boundary-data.json
 create mode 100644 data/as/1771140/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1771140/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1774472/BillingService/BusinessService.json
 create mode 100644 data/as/1774472/egov-location/boundary-data.json
 create mode 100644 data/as/1774472/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1774472/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1774711/BillingService/BusinessService.json
 create mode 100644 data/as/1774711/egov-location/boundary-data.json
 create mode 100644 data/as/1774711/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1774711/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1774890/BillingService/BusinessService.json
 create mode 100644 data/as/1774890/egov-location/boundary-data.json
 create mode 100644 data/as/1774890/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1774890/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1775011/BillingService/BusinessService.json
 create mode 100644 data/as/1775011/egov-location/boundary-data.json
 create mode 100644 data/as/1775011/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1775011/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1779266/BillingService/BusinessService.json
 create mode 100644 data/as/1779266/egov-location/boundary-data.json
 create mode 100644 data/as/1779266/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1779266/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1783019/BillingService/BusinessService.json
 create mode 100644 data/as/1783019/egov-location/boundary-data.json
 create mode 100644 data/as/1783019/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1783019/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1783754/BillingService/BusinessService.json
 create mode 100644 data/as/1783754/egov-location/boundary-data.json
 create mode 100644 data/as/1783754/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1783754/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1784430/BillingService/BusinessService.json
 create mode 100644 data/as/1784430/egov-location/boundary-data.json
 create mode 100644 data/as/1784430/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1784430/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1784527/BillingService/BusinessService.json
 create mode 100644 data/as/1784527/egov-location/boundary-data.json
 create mode 100644 data/as/1784527/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1784527/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1784979/BillingService/BusinessService.json
 create mode 100644 data/as/1784979/egov-location/boundary-data.json
 create mode 100644 data/as/1784979/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1784979/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1803054/BillingService/BusinessService.json
 create mode 100644 data/as/1803054/egov-location/boundary-data.json
 create mode 100644 data/as/1803054/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1803054/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1812780/BillingService/BusinessService.json
 create mode 100644 data/as/1812780/egov-location/boundary-data.json
 create mode 100644 data/as/1812780/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1812780/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1817138/BillingService/BusinessService.json
 create mode 100644 data/as/1817138/egov-location/boundary-data.json
 create mode 100644 data/as/1817138/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1817138/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1817302/BillingService/BusinessService.json
 create mode 100644 data/as/1817302/egov-location/boundary-data.json
 create mode 100644 data/as/1817302/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1817302/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1819835/BillingService/BusinessService.json
 create mode 100644 data/as/1819835/egov-location/boundary-data.json
 create mode 100644 data/as/1819835/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1819835/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1830310/BillingService/BusinessService.json
 create mode 100644 data/as/1830310/egov-location/boundary-data.json
 create mode 100644 data/as/1830310/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1830310/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1841150/BillingService/BusinessService.json
 create mode 100644 data/as/1841150/egov-location/boundary-data.json
 create mode 100644 data/as/1841150/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1841150/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1842161/BillingService/BusinessService.json
 create mode 100644 data/as/1842161/egov-location/boundary-data.json
 create mode 100644 data/as/1842161/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1842161/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1842244/BillingService/BusinessService.json
 create mode 100644 data/as/1842244/egov-location/boundary-data.json
 create mode 100644 data/as/1842244/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1842244/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1842378/BillingService/BusinessService.json
 create mode 100644 data/as/1842378/egov-location/boundary-data.json
 create mode 100644 data/as/1842378/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1842378/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1842423/BillingService/BusinessService.json
 create mode 100644 data/as/1842423/egov-location/boundary-data.json
 create mode 100644 data/as/1842423/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1842423/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1842653/BillingService/BusinessService.json
 create mode 100644 data/as/1842653/egov-location/boundary-data.json
 create mode 100644 data/as/1842653/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1842653/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1842776/BillingService/BusinessService.json
 create mode 100644 data/as/1842776/egov-location/boundary-data.json
 create mode 100644 data/as/1842776/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1842776/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1843088/BillingService/BusinessService.json
 create mode 100644 data/as/1843088/egov-location/boundary-data.json
 create mode 100644 data/as/1843088/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1843088/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1843358/BillingService/BusinessService.json
 create mode 100644 data/as/1843358/egov-location/boundary-data.json
 create mode 100644 data/as/1843358/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1843358/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1843430/BillingService/BusinessService.json
 create mode 100644 data/as/1843430/egov-location/boundary-data.json
 create mode 100644 data/as/1843430/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1843430/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1844212/BillingService/BusinessService.json
 create mode 100644 data/as/1844212/egov-location/boundary-data.json
 create mode 100644 data/as/1844212/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1844212/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1844228/BillingService/BusinessService.json
 create mode 100644 data/as/1844228/egov-location/boundary-data.json
 create mode 100644 data/as/1844228/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1844228/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1844235/BillingService/BusinessService.json
 create mode 100644 data/as/1844235/egov-location/boundary-data.json
 create mode 100644 data/as/1844235/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1844235/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1845373/BillingService/BusinessService.json
 create mode 100644 data/as/1845373/egov-location/boundary-data.json
 create mode 100644 data/as/1845373/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1845373/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1845703/BillingService/BusinessService.json
 create mode 100644 data/as/1845703/egov-location/boundary-data.json
 create mode 100644 data/as/1845703/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1845703/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1845765/BillingService/BusinessService.json
 create mode 100644 data/as/1845765/egov-location/boundary-data.json
 create mode 100644 data/as/1845765/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1845765/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1845900/BillingService/BusinessService.json
 create mode 100644 data/as/1845900/egov-location/boundary-data.json
 create mode 100644 data/as/1845900/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1845900/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1846063/BillingService/BusinessService.json
 create mode 100644 data/as/1846063/egov-location/boundary-data.json
 create mode 100644 data/as/1846063/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1846063/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1846172/BillingService/BusinessService.json
 create mode 100644 data/as/1846172/egov-location/boundary-data.json
 create mode 100644 data/as/1846172/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1846172/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1846500/BillingService/BusinessService.json
 create mode 100644 data/as/1846500/egov-location/boundary-data.json
 create mode 100644 data/as/1846500/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1846500/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1846605/BillingService/BusinessService.json
 create mode 100644 data/as/1846605/egov-location/boundary-data.json
 create mode 100644 data/as/1846605/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1846605/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1846743/BillingService/BusinessService.json
 create mode 100644 data/as/1846743/egov-location/boundary-data.json
 create mode 100644 data/as/1846743/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1846743/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1852364/BillingService/BusinessService.json
 create mode 100644 data/as/1852364/egov-location/boundary-data.json
 create mode 100644 data/as/1852364/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1852364/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1852774/BillingService/BusinessService.json
 create mode 100644 data/as/1852774/egov-location/boundary-data.json
 create mode 100644 data/as/1852774/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1852774/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1852987/BillingService/BusinessService.json
 create mode 100644 data/as/1852987/egov-location/boundary-data.json
 create mode 100644 data/as/1852987/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1852987/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1853306/BillingService/BusinessService.json
 create mode 100644 data/as/1853306/egov-location/boundary-data.json
 create mode 100644 data/as/1853306/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1853306/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1853326/BillingService/BusinessService.json
 create mode 100644 data/as/1853326/egov-location/boundary-data.json
 create mode 100644 data/as/1853326/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1853326/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1853350/BillingService/BusinessService.json
 create mode 100644 data/as/1853350/egov-location/boundary-data.json
 create mode 100644 data/as/1853350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1853350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1853501/BillingService/BusinessService.json
 create mode 100644 data/as/1853501/egov-location/boundary-data.json
 create mode 100644 data/as/1853501/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1853501/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1853696/BillingService/BusinessService.json
 create mode 100644 data/as/1853696/egov-location/boundary-data.json
 create mode 100644 data/as/1853696/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1853696/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1854331/BillingService/BusinessService.json
 create mode 100644 data/as/1854331/egov-location/boundary-data.json
 create mode 100644 data/as/1854331/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1854331/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1854436/BillingService/BusinessService.json
 create mode 100644 data/as/1854436/egov-location/boundary-data.json
 create mode 100644 data/as/1854436/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1854436/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1858924/BillingService/BusinessService.json
 create mode 100644 data/as/1858924/egov-location/boundary-data.json
 create mode 100644 data/as/1858924/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1858924/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1859895/BillingService/BusinessService.json
 create mode 100644 data/as/1859895/egov-location/boundary-data.json
 create mode 100644 data/as/1859895/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1859895/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1860965/BillingService/BusinessService.json
 create mode 100644 data/as/1860965/egov-location/boundary-data.json
 create mode 100644 data/as/1860965/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1860965/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1861320/BillingService/BusinessService.json
 create mode 100644 data/as/1861320/egov-location/boundary-data.json
 create mode 100644 data/as/1861320/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1861320/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1861420/BillingService/BusinessService.json
 create mode 100644 data/as/1861420/egov-location/boundary-data.json
 create mode 100644 data/as/1861420/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1861420/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1872281/BillingService/BusinessService.json
 create mode 100644 data/as/1872281/egov-location/boundary-data.json
 create mode 100644 data/as/1872281/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1872281/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1872304/BillingService/BusinessService.json
 create mode 100644 data/as/1872304/egov-location/boundary-data.json
 create mode 100644 data/as/1872304/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1872304/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1872337/BillingService/BusinessService.json
 create mode 100644 data/as/1872337/egov-location/boundary-data.json
 create mode 100644 data/as/1872337/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1872337/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1936743/BillingService/BusinessService.json
 create mode 100644 data/as/1936743/egov-location/boundary-data.json
 create mode 100644 data/as/1936743/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1936743/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937513/BillingService/BusinessService.json
 create mode 100644 data/as/1937513/egov-location/boundary-data.json
 create mode 100644 data/as/1937513/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937513/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937533/BillingService/BusinessService.json
 create mode 100644 data/as/1937533/egov-location/boundary-data.json
 create mode 100644 data/as/1937533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937549/BillingService/BusinessService.json
 create mode 100644 data/as/1937549/egov-location/boundary-data.json
 create mode 100644 data/as/1937549/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937549/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937556/BillingService/BusinessService.json
 create mode 100644 data/as/1937556/egov-location/boundary-data.json
 create mode 100644 data/as/1937556/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937556/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937635/BillingService/BusinessService.json
 create mode 100644 data/as/1937635/egov-location/boundary-data.json
 create mode 100644 data/as/1937635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937654/BillingService/BusinessService.json
 create mode 100644 data/as/1937654/egov-location/boundary-data.json
 create mode 100644 data/as/1937654/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937654/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937787/BillingService/BusinessService.json
 create mode 100644 data/as/1937787/egov-location/boundary-data.json
 create mode 100644 data/as/1937787/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937787/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937816/BillingService/BusinessService.json
 create mode 100644 data/as/1937816/egov-location/boundary-data.json
 create mode 100644 data/as/1937816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937849/BillingService/BusinessService.json
 create mode 100644 data/as/1937849/egov-location/boundary-data.json
 create mode 100644 data/as/1937849/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937849/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937917/BillingService/BusinessService.json
 create mode 100644 data/as/1937917/egov-location/boundary-data.json
 create mode 100644 data/as/1937917/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937917/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937928/BillingService/BusinessService.json
 create mode 100644 data/as/1937928/egov-location/boundary-data.json
 create mode 100644 data/as/1937928/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937928/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937948/BillingService/BusinessService.json
 create mode 100644 data/as/1937948/egov-location/boundary-data.json
 create mode 100644 data/as/1937948/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937948/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1937960/BillingService/BusinessService.json
 create mode 100644 data/as/1937960/egov-location/boundary-data.json
 create mode 100644 data/as/1937960/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1937960/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1941516/BillingService/BusinessService.json
 create mode 100644 data/as/1941516/egov-location/boundary-data.json
 create mode 100644 data/as/1941516/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1941516/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1941535/BillingService/BusinessService.json
 create mode 100644 data/as/1941535/egov-location/boundary-data.json
 create mode 100644 data/as/1941535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1941535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1941750/BillingService/BusinessService.json
 create mode 100644 data/as/1941750/egov-location/boundary-data.json
 create mode 100644 data/as/1941750/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1941750/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1941769/BillingService/BusinessService.json
 create mode 100644 data/as/1941769/egov-location/boundary-data.json
 create mode 100644 data/as/1941769/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1941769/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1941788/BillingService/BusinessService.json
 create mode 100644 data/as/1941788/egov-location/boundary-data.json
 create mode 100644 data/as/1941788/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1941788/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1941850/BillingService/BusinessService.json
 create mode 100644 data/as/1941850/egov-location/boundary-data.json
 create mode 100644 data/as/1941850/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1941850/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/1970469/BillingService/BusinessService.json
 create mode 100644 data/as/1970469/egov-location/boundary-data.json
 create mode 100644 data/as/1970469/ws-services-calculation/Penalty.json
 create mode 100644 data/as/1970469/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2404395/BillingService/BusinessService.json
 create mode 100644 data/as/2404395/egov-location/boundary-data.json
 create mode 100644 data/as/2404395/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2404395/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2404401/BillingService/BusinessService.json
 create mode 100644 data/as/2404401/egov-location/boundary-data.json
 create mode 100644 data/as/2404401/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2404401/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2404437/BillingService/BusinessService.json
 create mode 100644 data/as/2404437/egov-location/boundary-data.json
 create mode 100644 data/as/2404437/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2404437/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2405228/BillingService/BusinessService.json
 create mode 100644 data/as/2405228/egov-location/boundary-data.json
 create mode 100644 data/as/2405228/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2405228/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2406004/BillingService/BusinessService.json
 create mode 100644 data/as/2406004/egov-location/boundary-data.json
 create mode 100644 data/as/2406004/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2406004/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2421895/BillingService/BusinessService.json
 create mode 100644 data/as/2421895/egov-location/boundary-data.json
 create mode 100644 data/as/2421895/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2421895/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2421903/BillingService/BusinessService.json
 create mode 100644 data/as/2421903/egov-location/boundary-data.json
 create mode 100644 data/as/2421903/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2421903/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2421911/BillingService/BusinessService.json
 create mode 100644 data/as/2421911/egov-location/boundary-data.json
 create mode 100644 data/as/2421911/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2421911/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2421922/BillingService/BusinessService.json
 create mode 100644 data/as/2421922/egov-location/boundary-data.json
 create mode 100644 data/as/2421922/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2421922/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2423434/BillingService/BusinessService.json
 create mode 100644 data/as/2423434/egov-location/boundary-data.json
 create mode 100644 data/as/2423434/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2423434/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2426035/BillingService/BusinessService.json
 create mode 100644 data/as/2426035/egov-location/boundary-data.json
 create mode 100644 data/as/2426035/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2426035/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2429111/BillingService/BusinessService.json
 create mode 100644 data/as/2429111/egov-location/boundary-data.json
 create mode 100644 data/as/2429111/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2429111/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2433896/BillingService/BusinessService.json
 create mode 100644 data/as/2433896/egov-location/boundary-data.json
 create mode 100644 data/as/2433896/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2433896/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2443383/BillingService/BusinessService.json
 create mode 100644 data/as/2443383/egov-location/boundary-data.json
 create mode 100644 data/as/2443383/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2443383/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2480357/BillingService/BusinessService.json
 create mode 100644 data/as/2480357/egov-location/boundary-data.json
 create mode 100644 data/as/2480357/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2480357/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2480363/BillingService/BusinessService.json
 create mode 100644 data/as/2480363/egov-location/boundary-data.json
 create mode 100644 data/as/2480363/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2480363/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2484676/BillingService/BusinessService.json
 create mode 100644 data/as/2484676/egov-location/boundary-data.json
 create mode 100644 data/as/2484676/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2484676/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2484678/BillingService/BusinessService.json
 create mode 100644 data/as/2484678/egov-location/boundary-data.json
 create mode 100644 data/as/2484678/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2484678/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2486691/BillingService/BusinessService.json
 create mode 100644 data/as/2486691/egov-location/boundary-data.json
 create mode 100644 data/as/2486691/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2486691/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2491893/BillingService/BusinessService.json
 create mode 100644 data/as/2491893/egov-location/boundary-data.json
 create mode 100644 data/as/2491893/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2491893/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2495922/BillingService/BusinessService.json
 create mode 100644 data/as/2495922/egov-location/boundary-data.json
 create mode 100644 data/as/2495922/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2495922/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2496124/BillingService/BusinessService.json
 create mode 100644 data/as/2496124/egov-location/boundary-data.json
 create mode 100644 data/as/2496124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2496124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2496136/BillingService/BusinessService.json
 create mode 100644 data/as/2496136/egov-location/boundary-data.json
 create mode 100644 data/as/2496136/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2496136/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2497758/BillingService/BusinessService.json
 create mode 100644 data/as/2497758/egov-location/boundary-data.json
 create mode 100644 data/as/2497758/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2497758/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2515923/BillingService/BusinessService.json
 create mode 100644 data/as/2515923/egov-location/boundary-data.json
 create mode 100644 data/as/2515923/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2515923/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2515942/BillingService/BusinessService.json
 create mode 100644 data/as/2515942/egov-location/boundary-data.json
 create mode 100644 data/as/2515942/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2515942/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2515998/BillingService/BusinessService.json
 create mode 100644 data/as/2515998/egov-location/boundary-data.json
 create mode 100644 data/as/2515998/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2515998/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516005/BillingService/BusinessService.json
 create mode 100644 data/as/2516005/egov-location/boundary-data.json
 create mode 100644 data/as/2516005/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516005/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516013/BillingService/BusinessService.json
 create mode 100644 data/as/2516013/egov-location/boundary-data.json
 create mode 100644 data/as/2516013/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516013/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516019/BillingService/BusinessService.json
 create mode 100644 data/as/2516019/egov-location/boundary-data.json
 create mode 100644 data/as/2516019/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516019/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516135/BillingService/BusinessService.json
 create mode 100644 data/as/2516135/egov-location/boundary-data.json
 create mode 100644 data/as/2516135/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516135/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516159/BillingService/BusinessService.json
 create mode 100644 data/as/2516159/egov-location/boundary-data.json
 create mode 100644 data/as/2516159/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516159/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516189/BillingService/BusinessService.json
 create mode 100644 data/as/2516189/egov-location/boundary-data.json
 create mode 100644 data/as/2516189/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516189/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516326/BillingService/BusinessService.json
 create mode 100644 data/as/2516326/egov-location/boundary-data.json
 create mode 100644 data/as/2516326/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516326/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516787/BillingService/BusinessService.json
 create mode 100644 data/as/2516787/egov-location/boundary-data.json
 create mode 100644 data/as/2516787/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516787/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516881/BillingService/BusinessService.json
 create mode 100644 data/as/2516881/egov-location/boundary-data.json
 create mode 100644 data/as/2516881/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516881/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2516940/BillingService/BusinessService.json
 create mode 100644 data/as/2516940/egov-location/boundary-data.json
 create mode 100644 data/as/2516940/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2516940/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2517189/BillingService/BusinessService.json
 create mode 100644 data/as/2517189/egov-location/boundary-data.json
 create mode 100644 data/as/2517189/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2517189/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2517201/BillingService/BusinessService.json
 create mode 100644 data/as/2517201/egov-location/boundary-data.json
 create mode 100644 data/as/2517201/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2517201/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2517213/BillingService/BusinessService.json
 create mode 100644 data/as/2517213/egov-location/boundary-data.json
 create mode 100644 data/as/2517213/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2517213/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2517242/BillingService/BusinessService.json
 create mode 100644 data/as/2517242/egov-location/boundary-data.json
 create mode 100644 data/as/2517242/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2517242/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2517248/BillingService/BusinessService.json
 create mode 100644 data/as/2517248/egov-location/boundary-data.json
 create mode 100644 data/as/2517248/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2517248/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2517256/BillingService/BusinessService.json
 create mode 100644 data/as/2517256/egov-location/boundary-data.json
 create mode 100644 data/as/2517256/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2517256/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2520036/BillingService/BusinessService.json
 create mode 100644 data/as/2520036/egov-location/boundary-data.json
 create mode 100644 data/as/2520036/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2520036/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2520181/BillingService/BusinessService.json
 create mode 100644 data/as/2520181/egov-location/boundary-data.json
 create mode 100644 data/as/2520181/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2520181/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2581909/BillingService/BusinessService.json
 create mode 100644 data/as/2581909/egov-location/boundary-data.json
 create mode 100644 data/as/2581909/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2581909/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2582386/BillingService/BusinessService.json
 create mode 100644 data/as/2582386/egov-location/boundary-data.json
 create mode 100644 data/as/2582386/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2582386/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2582460/BillingService/BusinessService.json
 create mode 100644 data/as/2582460/egov-location/boundary-data.json
 create mode 100644 data/as/2582460/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2582460/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/2615100/BillingService/BusinessService.json
 create mode 100644 data/as/2615100/egov-location/boundary-data.json
 create mode 100644 data/as/2615100/ws-services-calculation/Penalty.json
 create mode 100644 data/as/2615100/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3164535/BillingService/BusinessService.json
 create mode 100644 data/as/3164535/egov-location/boundary-data.json
 create mode 100644 data/as/3164535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3164535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3319750/BillingService/BusinessService.json
 create mode 100644 data/as/3319750/egov-location/boundary-data.json
 create mode 100644 data/as/3319750/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3319750/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3321276/BillingService/BusinessService.json
 create mode 100644 data/as/3321276/egov-location/boundary-data.json
 create mode 100644 data/as/3321276/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3321276/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3321879/BillingService/BusinessService.json
 create mode 100644 data/as/3321879/egov-location/boundary-data.json
 create mode 100644 data/as/3321879/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3321879/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3327425/BillingService/BusinessService.json
 create mode 100644 data/as/3327425/egov-location/boundary-data.json
 create mode 100644 data/as/3327425/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3327425/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3328455/BillingService/BusinessService.json
 create mode 100644 data/as/3328455/egov-location/boundary-data.json
 create mode 100644 data/as/3328455/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3328455/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3328647/BillingService/BusinessService.json
 create mode 100644 data/as/3328647/egov-location/boundary-data.json
 create mode 100644 data/as/3328647/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3328647/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3328767/BillingService/BusinessService.json
 create mode 100644 data/as/3328767/egov-location/boundary-data.json
 create mode 100644 data/as/3328767/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3328767/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3328873/BillingService/BusinessService.json
 create mode 100644 data/as/3328873/egov-location/boundary-data.json
 create mode 100644 data/as/3328873/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3328873/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3333586/BillingService/BusinessService.json
 create mode 100644 data/as/3333586/egov-location/boundary-data.json
 create mode 100644 data/as/3333586/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3333586/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3359758/BillingService/BusinessService.json
 create mode 100644 data/as/3359758/egov-location/boundary-data.json
 create mode 100644 data/as/3359758/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3359758/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3370880/BillingService/BusinessService.json
 create mode 100644 data/as/3370880/egov-location/boundary-data.json
 create mode 100644 data/as/3370880/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3370880/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3372158/BillingService/BusinessService.json
 create mode 100644 data/as/3372158/egov-location/boundary-data.json
 create mode 100644 data/as/3372158/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3372158/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3373443/BillingService/BusinessService.json
 create mode 100644 data/as/3373443/egov-location/boundary-data.json
 create mode 100644 data/as/3373443/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3373443/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3374529/BillingService/BusinessService.json
 create mode 100644 data/as/3374529/egov-location/boundary-data.json
 create mode 100644 data/as/3374529/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3374529/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3375170/BillingService/BusinessService.json
 create mode 100644 data/as/3375170/egov-location/boundary-data.json
 create mode 100644 data/as/3375170/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3375170/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3375765/BillingService/BusinessService.json
 create mode 100644 data/as/3375765/egov-location/boundary-data.json
 create mode 100644 data/as/3375765/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3375765/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3378587/BillingService/BusinessService.json
 create mode 100644 data/as/3378587/egov-location/boundary-data.json
 create mode 100644 data/as/3378587/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3378587/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3384885/BillingService/BusinessService.json
 create mode 100644 data/as/3384885/egov-location/boundary-data.json
 create mode 100644 data/as/3384885/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3384885/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3384921/BillingService/BusinessService.json
 create mode 100644 data/as/3384921/egov-location/boundary-data.json
 create mode 100644 data/as/3384921/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3384921/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3385844/BillingService/BusinessService.json
 create mode 100644 data/as/3385844/egov-location/boundary-data.json
 create mode 100644 data/as/3385844/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3385844/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3385946/BillingService/BusinessService.json
 create mode 100644 data/as/3385946/egov-location/boundary-data.json
 create mode 100644 data/as/3385946/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3385946/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3385982/BillingService/BusinessService.json
 create mode 100644 data/as/3385982/egov-location/boundary-data.json
 create mode 100644 data/as/3385982/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3385982/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386123/BillingService/BusinessService.json
 create mode 100644 data/as/3386123/egov-location/boundary-data.json
 create mode 100644 data/as/3386123/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386123/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386146/BillingService/BusinessService.json
 create mode 100644 data/as/3386146/egov-location/boundary-data.json
 create mode 100644 data/as/3386146/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386146/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386204/BillingService/BusinessService.json
 create mode 100644 data/as/3386204/egov-location/boundary-data.json
 create mode 100644 data/as/3386204/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386204/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386236/BillingService/BusinessService.json
 create mode 100644 data/as/3386236/egov-location/boundary-data.json
 create mode 100644 data/as/3386236/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386236/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386289/BillingService/BusinessService.json
 create mode 100644 data/as/3386289/egov-location/boundary-data.json
 create mode 100644 data/as/3386289/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386289/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386322/BillingService/BusinessService.json
 create mode 100644 data/as/3386322/egov-location/boundary-data.json
 create mode 100644 data/as/3386322/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386322/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386356/BillingService/BusinessService.json
 create mode 100644 data/as/3386356/egov-location/boundary-data.json
 create mode 100644 data/as/3386356/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386356/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386386/BillingService/BusinessService.json
 create mode 100644 data/as/3386386/egov-location/boundary-data.json
 create mode 100644 data/as/3386386/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386386/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386407/BillingService/BusinessService.json
 create mode 100644 data/as/3386407/egov-location/boundary-data.json
 create mode 100644 data/as/3386407/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386407/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386435/BillingService/BusinessService.json
 create mode 100644 data/as/3386435/egov-location/boundary-data.json
 create mode 100644 data/as/3386435/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386435/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386445/BillingService/BusinessService.json
 create mode 100644 data/as/3386445/egov-location/boundary-data.json
 create mode 100644 data/as/3386445/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386445/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386466/BillingService/BusinessService.json
 create mode 100644 data/as/3386466/egov-location/boundary-data.json
 create mode 100644 data/as/3386466/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386466/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386515/BillingService/BusinessService.json
 create mode 100644 data/as/3386515/egov-location/boundary-data.json
 create mode 100644 data/as/3386515/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386515/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386526/BillingService/BusinessService.json
 create mode 100644 data/as/3386526/egov-location/boundary-data.json
 create mode 100644 data/as/3386526/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386526/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386540/BillingService/BusinessService.json
 create mode 100644 data/as/3386540/egov-location/boundary-data.json
 create mode 100644 data/as/3386540/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386540/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386544/BillingService/BusinessService.json
 create mode 100644 data/as/3386544/egov-location/boundary-data.json
 create mode 100644 data/as/3386544/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386544/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386664/BillingService/BusinessService.json
 create mode 100644 data/as/3386664/egov-location/boundary-data.json
 create mode 100644 data/as/3386664/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386664/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3386695/BillingService/BusinessService.json
 create mode 100644 data/as/3386695/egov-location/boundary-data.json
 create mode 100644 data/as/3386695/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3386695/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/3800160/BillingService/BusinessService.json
 create mode 100644 data/as/3800160/egov-location/boundary-data.json
 create mode 100644 data/as/3800160/ws-services-calculation/Penalty.json
 create mode 100644 data/as/3800160/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4516012/BillingService/BusinessService.json
 create mode 100644 data/as/4516012/egov-location/boundary-data.json
 create mode 100644 data/as/4516012/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4516012/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4516046/BillingService/BusinessService.json
 create mode 100644 data/as/4516046/egov-location/boundary-data.json
 create mode 100644 data/as/4516046/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4516046/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4516419/BillingService/BusinessService.json
 create mode 100644 data/as/4516419/egov-location/boundary-data.json
 create mode 100644 data/as/4516419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4516419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/452628/BillingService/BusinessService.json
 create mode 100644 data/as/452628/egov-location/boundary-data.json
 create mode 100644 data/as/452628/ws-services-calculation/Penalty.json
 create mode 100644 data/as/452628/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/452685/BillingService/BusinessService.json
 create mode 100644 data/as/452685/egov-location/boundary-data.json
 create mode 100644 data/as/452685/ws-services-calculation/Penalty.json
 create mode 100644 data/as/452685/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/452697/BillingService/BusinessService.json
 create mode 100644 data/as/452697/egov-location/boundary-data.json
 create mode 100644 data/as/452697/ws-services-calculation/Penalty.json
 create mode 100644 data/as/452697/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/453185/BillingService/BusinessService.json
 create mode 100644 data/as/453185/egov-location/boundary-data.json
 create mode 100644 data/as/453185/ws-services-calculation/Penalty.json
 create mode 100644 data/as/453185/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/454276/BillingService/BusinessService.json
 create mode 100644 data/as/454276/egov-location/boundary-data.json
 create mode 100644 data/as/454276/ws-services-calculation/Penalty.json
 create mode 100644 data/as/454276/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/455214/BillingService/BusinessService.json
 create mode 100644 data/as/455214/egov-location/boundary-data.json
 create mode 100644 data/as/455214/ws-services-calculation/Penalty.json
 create mode 100644 data/as/455214/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/455219/BillingService/BusinessService.json
 create mode 100644 data/as/455219/egov-location/boundary-data.json
 create mode 100644 data/as/455219/ws-services-calculation/Penalty.json
 create mode 100644 data/as/455219/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/455220/BillingService/BusinessService.json
 create mode 100644 data/as/455220/egov-location/boundary-data.json
 create mode 100644 data/as/455220/ws-services-calculation/Penalty.json
 create mode 100644 data/as/455220/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/455374/BillingService/BusinessService.json
 create mode 100644 data/as/455374/egov-location/boundary-data.json
 create mode 100644 data/as/455374/ws-services-calculation/Penalty.json
 create mode 100644 data/as/455374/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4566832/BillingService/BusinessService.json
 create mode 100644 data/as/4566832/egov-location/boundary-data.json
 create mode 100644 data/as/4566832/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4566832/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567143/BillingService/BusinessService.json
 create mode 100644 data/as/4567143/egov-location/boundary-data.json
 create mode 100644 data/as/4567143/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567143/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567157/BillingService/BusinessService.json
 create mode 100644 data/as/4567157/egov-location/boundary-data.json
 create mode 100644 data/as/4567157/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567157/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567167/BillingService/BusinessService.json
 create mode 100644 data/as/4567167/egov-location/boundary-data.json
 create mode 100644 data/as/4567167/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567167/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567203/BillingService/BusinessService.json
 create mode 100644 data/as/4567203/egov-location/boundary-data.json
 create mode 100644 data/as/4567203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567253/BillingService/BusinessService.json
 create mode 100644 data/as/4567253/egov-location/boundary-data.json
 create mode 100644 data/as/4567253/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567253/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567258/BillingService/BusinessService.json
 create mode 100644 data/as/4567258/egov-location/boundary-data.json
 create mode 100644 data/as/4567258/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567258/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567264/BillingService/BusinessService.json
 create mode 100644 data/as/4567264/egov-location/boundary-data.json
 create mode 100644 data/as/4567264/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567264/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4567271/BillingService/BusinessService.json
 create mode 100644 data/as/4567271/egov-location/boundary-data.json
 create mode 100644 data/as/4567271/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4567271/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4627074/BillingService/BusinessService.json
 create mode 100644 data/as/4627074/egov-location/boundary-data.json
 create mode 100644 data/as/4627074/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4627074/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4627137/BillingService/BusinessService.json
 create mode 100644 data/as/4627137/egov-location/boundary-data.json
 create mode 100644 data/as/4627137/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4627137/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4637354/BillingService/BusinessService.json
 create mode 100644 data/as/4637354/egov-location/boundary-data.json
 create mode 100644 data/as/4637354/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4637354/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4637711/BillingService/BusinessService.json
 create mode 100644 data/as/4637711/egov-location/boundary-data.json
 create mode 100644 data/as/4637711/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4637711/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4637724/BillingService/BusinessService.json
 create mode 100644 data/as/4637724/egov-location/boundary-data.json
 create mode 100644 data/as/4637724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4637724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4637728/BillingService/BusinessService.json
 create mode 100644 data/as/4637728/egov-location/boundary-data.json
 create mode 100644 data/as/4637728/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4637728/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4638859/BillingService/BusinessService.json
 create mode 100644 data/as/4638859/egov-location/boundary-data.json
 create mode 100644 data/as/4638859/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4638859/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4639802/BillingService/BusinessService.json
 create mode 100644 data/as/4639802/egov-location/boundary-data.json
 create mode 100644 data/as/4639802/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4639802/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4639900/BillingService/BusinessService.json
 create mode 100644 data/as/4639900/egov-location/boundary-data.json
 create mode 100644 data/as/4639900/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4639900/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4639926/BillingService/BusinessService.json
 create mode 100644 data/as/4639926/egov-location/boundary-data.json
 create mode 100644 data/as/4639926/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4639926/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4639994/BillingService/BusinessService.json
 create mode 100644 data/as/4639994/egov-location/boundary-data.json
 create mode 100644 data/as/4639994/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4639994/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4640433/BillingService/BusinessService.json
 create mode 100644 data/as/4640433/egov-location/boundary-data.json
 create mode 100644 data/as/4640433/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4640433/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4640480/BillingService/BusinessService.json
 create mode 100644 data/as/4640480/egov-location/boundary-data.json
 create mode 100644 data/as/4640480/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4640480/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4642317/BillingService/BusinessService.json
 create mode 100644 data/as/4642317/egov-location/boundary-data.json
 create mode 100644 data/as/4642317/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4642317/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4642337/BillingService/BusinessService.json
 create mode 100644 data/as/4642337/egov-location/boundary-data.json
 create mode 100644 data/as/4642337/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4642337/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4651600/BillingService/BusinessService.json
 create mode 100644 data/as/4651600/egov-location/boundary-data.json
 create mode 100644 data/as/4651600/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4651600/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4652293/BillingService/BusinessService.json
 create mode 100644 data/as/4652293/egov-location/boundary-data.json
 create mode 100644 data/as/4652293/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4652293/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4653590/BillingService/BusinessService.json
 create mode 100644 data/as/4653590/egov-location/boundary-data.json
 create mode 100644 data/as/4653590/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4653590/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4654670/BillingService/BusinessService.json
 create mode 100644 data/as/4654670/egov-location/boundary-data.json
 create mode 100644 data/as/4654670/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4654670/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4655460/BillingService/BusinessService.json
 create mode 100644 data/as/4655460/egov-location/boundary-data.json
 create mode 100644 data/as/4655460/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4655460/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4655542/BillingService/BusinessService.json
 create mode 100644 data/as/4655542/egov-location/boundary-data.json
 create mode 100644 data/as/4655542/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4655542/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4655617/BillingService/BusinessService.json
 create mode 100644 data/as/4655617/egov-location/boundary-data.json
 create mode 100644 data/as/4655617/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4655617/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4656070/BillingService/BusinessService.json
 create mode 100644 data/as/4656070/egov-location/boundary-data.json
 create mode 100644 data/as/4656070/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4656070/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4656202/BillingService/BusinessService.json
 create mode 100644 data/as/4656202/egov-location/boundary-data.json
 create mode 100644 data/as/4656202/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4656202/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4656990/BillingService/BusinessService.json
 create mode 100644 data/as/4656990/egov-location/boundary-data.json
 create mode 100644 data/as/4656990/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4656990/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4657126/BillingService/BusinessService.json
 create mode 100644 data/as/4657126/egov-location/boundary-data.json
 create mode 100644 data/as/4657126/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4657126/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4657150/BillingService/BusinessService.json
 create mode 100644 data/as/4657150/egov-location/boundary-data.json
 create mode 100644 data/as/4657150/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4657150/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4657189/BillingService/BusinessService.json
 create mode 100644 data/as/4657189/egov-location/boundary-data.json
 create mode 100644 data/as/4657189/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4657189/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4657198/BillingService/BusinessService.json
 create mode 100644 data/as/4657198/egov-location/boundary-data.json
 create mode 100644 data/as/4657198/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4657198/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4657250/BillingService/BusinessService.json
 create mode 100644 data/as/4657250/egov-location/boundary-data.json
 create mode 100644 data/as/4657250/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4657250/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4658923/BillingService/BusinessService.json
 create mode 100644 data/as/4658923/egov-location/boundary-data.json
 create mode 100644 data/as/4658923/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4658923/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4658962/BillingService/BusinessService.json
 create mode 100644 data/as/4658962/egov-location/boundary-data.json
 create mode 100644 data/as/4658962/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4658962/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4659024/BillingService/BusinessService.json
 create mode 100644 data/as/4659024/egov-location/boundary-data.json
 create mode 100644 data/as/4659024/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4659024/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4659210/BillingService/BusinessService.json
 create mode 100644 data/as/4659210/egov-location/boundary-data.json
 create mode 100644 data/as/4659210/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4659210/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4668398/BillingService/BusinessService.json
 create mode 100644 data/as/4668398/egov-location/boundary-data.json
 create mode 100644 data/as/4668398/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4668398/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4869442/BillingService/BusinessService.json
 create mode 100644 data/as/4869442/egov-location/boundary-data.json
 create mode 100644 data/as/4869442/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4869442/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4870166/BillingService/BusinessService.json
 create mode 100644 data/as/4870166/egov-location/boundary-data.json
 create mode 100644 data/as/4870166/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4870166/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4870229/BillingService/BusinessService.json
 create mode 100644 data/as/4870229/egov-location/boundary-data.json
 create mode 100644 data/as/4870229/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4870229/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4870250/BillingService/BusinessService.json
 create mode 100644 data/as/4870250/egov-location/boundary-data.json
 create mode 100644 data/as/4870250/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4870250/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4870307/BillingService/BusinessService.json
 create mode 100644 data/as/4870307/egov-location/boundary-data.json
 create mode 100644 data/as/4870307/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4870307/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872574/BillingService/BusinessService.json
 create mode 100644 data/as/4872574/egov-location/boundary-data.json
 create mode 100644 data/as/4872574/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872574/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872595/BillingService/BusinessService.json
 create mode 100644 data/as/4872595/egov-location/boundary-data.json
 create mode 100644 data/as/4872595/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872595/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872646/BillingService/BusinessService.json
 create mode 100644 data/as/4872646/egov-location/boundary-data.json
 create mode 100644 data/as/4872646/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872646/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872699/BillingService/BusinessService.json
 create mode 100644 data/as/4872699/egov-location/boundary-data.json
 create mode 100644 data/as/4872699/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872699/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872806/BillingService/BusinessService.json
 create mode 100644 data/as/4872806/egov-location/boundary-data.json
 create mode 100644 data/as/4872806/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872806/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872849/BillingService/BusinessService.json
 create mode 100644 data/as/4872849/egov-location/boundary-data.json
 create mode 100644 data/as/4872849/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872849/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4872988/BillingService/BusinessService.json
 create mode 100644 data/as/4872988/egov-location/boundary-data.json
 create mode 100644 data/as/4872988/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4872988/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873102/BillingService/BusinessService.json
 create mode 100644 data/as/4873102/egov-location/boundary-data.json
 create mode 100644 data/as/4873102/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873102/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873166/BillingService/BusinessService.json
 create mode 100644 data/as/4873166/egov-location/boundary-data.json
 create mode 100644 data/as/4873166/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873166/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873607/BillingService/BusinessService.json
 create mode 100644 data/as/4873607/egov-location/boundary-data.json
 create mode 100644 data/as/4873607/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873607/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873634/BillingService/BusinessService.json
 create mode 100644 data/as/4873634/egov-location/boundary-data.json
 create mode 100644 data/as/4873634/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873634/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873695/BillingService/BusinessService.json
 create mode 100644 data/as/4873695/egov-location/boundary-data.json
 create mode 100644 data/as/4873695/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873695/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873715/BillingService/BusinessService.json
 create mode 100644 data/as/4873715/egov-location/boundary-data.json
 create mode 100644 data/as/4873715/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873715/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873739/BillingService/BusinessService.json
 create mode 100644 data/as/4873739/egov-location/boundary-data.json
 create mode 100644 data/as/4873739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873771/BillingService/BusinessService.json
 create mode 100644 data/as/4873771/egov-location/boundary-data.json
 create mode 100644 data/as/4873771/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873771/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873867/BillingService/BusinessService.json
 create mode 100644 data/as/4873867/egov-location/boundary-data.json
 create mode 100644 data/as/4873867/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873867/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4873898/BillingService/BusinessService.json
 create mode 100644 data/as/4873898/egov-location/boundary-data.json
 create mode 100644 data/as/4873898/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4873898/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4887720/BillingService/BusinessService.json
 create mode 100644 data/as/4887720/egov-location/boundary-data.json
 create mode 100644 data/as/4887720/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4887720/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4887740/BillingService/BusinessService.json
 create mode 100644 data/as/4887740/egov-location/boundary-data.json
 create mode 100644 data/as/4887740/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4887740/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4887755/BillingService/BusinessService.json
 create mode 100644 data/as/4887755/egov-location/boundary-data.json
 create mode 100644 data/as/4887755/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4887755/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4887898/BillingService/BusinessService.json
 create mode 100644 data/as/4887898/egov-location/boundary-data.json
 create mode 100644 data/as/4887898/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4887898/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4887947/BillingService/BusinessService.json
 create mode 100644 data/as/4887947/egov-location/boundary-data.json
 create mode 100644 data/as/4887947/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4887947/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4888080/BillingService/BusinessService.json
 create mode 100644 data/as/4888080/egov-location/boundary-data.json
 create mode 100644 data/as/4888080/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4888080/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4888114/BillingService/BusinessService.json
 create mode 100644 data/as/4888114/egov-location/boundary-data.json
 create mode 100644 data/as/4888114/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4888114/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4888263/BillingService/BusinessService.json
 create mode 100644 data/as/4888263/egov-location/boundary-data.json
 create mode 100644 data/as/4888263/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4888263/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4888294/BillingService/BusinessService.json
 create mode 100644 data/as/4888294/egov-location/boundary-data.json
 create mode 100644 data/as/4888294/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4888294/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492155/BillingService/BusinessService.json
 create mode 100644 data/as/492155/egov-location/boundary-data.json
 create mode 100644 data/as/492155/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492155/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492158/BillingService/BusinessService.json
 create mode 100644 data/as/492158/egov-location/boundary-data.json
 create mode 100644 data/as/492158/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492158/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492161/BillingService/BusinessService.json
 create mode 100644 data/as/492161/egov-location/boundary-data.json
 create mode 100644 data/as/492161/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492161/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492165/BillingService/BusinessService.json
 create mode 100644 data/as/492165/egov-location/boundary-data.json
 create mode 100644 data/as/492165/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492165/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492168/BillingService/BusinessService.json
 create mode 100644 data/as/492168/egov-location/boundary-data.json
 create mode 100644 data/as/492168/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492168/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492177/BillingService/BusinessService.json
 create mode 100644 data/as/492177/egov-location/boundary-data.json
 create mode 100644 data/as/492177/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492177/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/492182/BillingService/BusinessService.json
 create mode 100644 data/as/492182/egov-location/boundary-data.json
 create mode 100644 data/as/492182/ws-services-calculation/Penalty.json
 create mode 100644 data/as/492182/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/4963515/BillingService/BusinessService.json
 create mode 100644 data/as/4963515/egov-location/boundary-data.json
 create mode 100644 data/as/4963515/ws-services-calculation/Penalty.json
 create mode 100644 data/as/4963515/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5072706/BillingService/BusinessService.json
 create mode 100644 data/as/5072706/egov-location/boundary-data.json
 create mode 100644 data/as/5072706/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5072706/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5072752/BillingService/BusinessService.json
 create mode 100644 data/as/5072752/egov-location/boundary-data.json
 create mode 100644 data/as/5072752/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5072752/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5072807/BillingService/BusinessService.json
 create mode 100644 data/as/5072807/egov-location/boundary-data.json
 create mode 100644 data/as/5072807/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5072807/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5072821/BillingService/BusinessService.json
 create mode 100644 data/as/5072821/egov-location/boundary-data.json
 create mode 100644 data/as/5072821/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5072821/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5072838/BillingService/BusinessService.json
 create mode 100644 data/as/5072838/egov-location/boundary-data.json
 create mode 100644 data/as/5072838/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5072838/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5072844/BillingService/BusinessService.json
 create mode 100644 data/as/5072844/egov-location/boundary-data.json
 create mode 100644 data/as/5072844/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5072844/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5073321/BillingService/BusinessService.json
 create mode 100644 data/as/5073321/egov-location/boundary-data.json
 create mode 100644 data/as/5073321/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5073321/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5073330/BillingService/BusinessService.json
 create mode 100644 data/as/5073330/egov-location/boundary-data.json
 create mode 100644 data/as/5073330/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5073330/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5073372/BillingService/BusinessService.json
 create mode 100644 data/as/5073372/egov-location/boundary-data.json
 create mode 100644 data/as/5073372/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5073372/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5073861/BillingService/BusinessService.json
 create mode 100644 data/as/5073861/egov-location/boundary-data.json
 create mode 100644 data/as/5073861/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5073861/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5073879/BillingService/BusinessService.json
 create mode 100644 data/as/5073879/egov-location/boundary-data.json
 create mode 100644 data/as/5073879/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5073879/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5073951/BillingService/BusinessService.json
 create mode 100644 data/as/5073951/egov-location/boundary-data.json
 create mode 100644 data/as/5073951/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5073951/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5074126/BillingService/BusinessService.json
 create mode 100644 data/as/5074126/egov-location/boundary-data.json
 create mode 100644 data/as/5074126/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5074126/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5074129/BillingService/BusinessService.json
 create mode 100644 data/as/5074129/egov-location/boundary-data.json
 create mode 100644 data/as/5074129/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5074129/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5074133/BillingService/BusinessService.json
 create mode 100644 data/as/5074133/egov-location/boundary-data.json
 create mode 100644 data/as/5074133/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5074133/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/50796/BillingService/BusinessService.json
 create mode 100644 data/as/50796/egov-location/boundary-data.json
 create mode 100644 data/as/50796/ws-services-calculation/Penalty.json
 create mode 100644 data/as/50796/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5102401/BillingService/BusinessService.json
 create mode 100644 data/as/5102401/egov-location/boundary-data.json
 create mode 100644 data/as/5102401/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5102401/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5102996/BillingService/BusinessService.json
 create mode 100644 data/as/5102996/egov-location/boundary-data.json
 create mode 100644 data/as/5102996/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5102996/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5103007/BillingService/BusinessService.json
 create mode 100644 data/as/5103007/egov-location/boundary-data.json
 create mode 100644 data/as/5103007/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5103007/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/51526/BillingService/BusinessService.json
 create mode 100644 data/as/51526/egov-location/boundary-data.json
 create mode 100644 data/as/51526/ws-services-calculation/Penalty.json
 create mode 100644 data/as/51526/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/51536/BillingService/BusinessService.json
 create mode 100644 data/as/51536/egov-location/boundary-data.json
 create mode 100644 data/as/51536/ws-services-calculation/Penalty.json
 create mode 100644 data/as/51536/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5182812/BillingService/BusinessService.json
 create mode 100644 data/as/5182812/egov-location/boundary-data.json
 create mode 100644 data/as/5182812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5182812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5183548/BillingService/BusinessService.json
 create mode 100644 data/as/5183548/egov-location/boundary-data.json
 create mode 100644 data/as/5183548/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5183548/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5183964/BillingService/BusinessService.json
 create mode 100644 data/as/5183964/egov-location/boundary-data.json
 create mode 100644 data/as/5183964/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5183964/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5184373/BillingService/BusinessService.json
 create mode 100644 data/as/5184373/egov-location/boundary-data.json
 create mode 100644 data/as/5184373/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5184373/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185351/BillingService/BusinessService.json
 create mode 100644 data/as/5185351/egov-location/boundary-data.json
 create mode 100644 data/as/5185351/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185351/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185356/BillingService/BusinessService.json
 create mode 100644 data/as/5185356/egov-location/boundary-data.json
 create mode 100644 data/as/5185356/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185356/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185535/BillingService/BusinessService.json
 create mode 100644 data/as/5185535/egov-location/boundary-data.json
 create mode 100644 data/as/5185535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185541/BillingService/BusinessService.json
 create mode 100644 data/as/5185541/egov-location/boundary-data.json
 create mode 100644 data/as/5185541/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185541/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185549/BillingService/BusinessService.json
 create mode 100644 data/as/5185549/egov-location/boundary-data.json
 create mode 100644 data/as/5185549/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185549/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185556/BillingService/BusinessService.json
 create mode 100644 data/as/5185556/egov-location/boundary-data.json
 create mode 100644 data/as/5185556/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185556/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185570/BillingService/BusinessService.json
 create mode 100644 data/as/5185570/egov-location/boundary-data.json
 create mode 100644 data/as/5185570/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185570/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185575/BillingService/BusinessService.json
 create mode 100644 data/as/5185575/egov-location/boundary-data.json
 create mode 100644 data/as/5185575/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185575/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185587/BillingService/BusinessService.json
 create mode 100644 data/as/5185587/egov-location/boundary-data.json
 create mode 100644 data/as/5185587/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185587/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185591/BillingService/BusinessService.json
 create mode 100644 data/as/5185591/egov-location/boundary-data.json
 create mode 100644 data/as/5185591/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185591/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185615/BillingService/BusinessService.json
 create mode 100644 data/as/5185615/egov-location/boundary-data.json
 create mode 100644 data/as/5185615/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185615/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185635/BillingService/BusinessService.json
 create mode 100644 data/as/5185635/egov-location/boundary-data.json
 create mode 100644 data/as/5185635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185650/BillingService/BusinessService.json
 create mode 100644 data/as/5185650/egov-location/boundary-data.json
 create mode 100644 data/as/5185650/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185650/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185655/BillingService/BusinessService.json
 create mode 100644 data/as/5185655/egov-location/boundary-data.json
 create mode 100644 data/as/5185655/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185655/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185659/BillingService/BusinessService.json
 create mode 100644 data/as/5185659/egov-location/boundary-data.json
 create mode 100644 data/as/5185659/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185659/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185665/BillingService/BusinessService.json
 create mode 100644 data/as/5185665/egov-location/boundary-data.json
 create mode 100644 data/as/5185665/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185665/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185685/BillingService/BusinessService.json
 create mode 100644 data/as/5185685/egov-location/boundary-data.json
 create mode 100644 data/as/5185685/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185685/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185693/BillingService/BusinessService.json
 create mode 100644 data/as/5185693/egov-location/boundary-data.json
 create mode 100644 data/as/5185693/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185693/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185707/BillingService/BusinessService.json
 create mode 100644 data/as/5185707/egov-location/boundary-data.json
 create mode 100644 data/as/5185707/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185707/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185717/BillingService/BusinessService.json
 create mode 100644 data/as/5185717/egov-location/boundary-data.json
 create mode 100644 data/as/5185717/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185717/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5185887/BillingService/BusinessService.json
 create mode 100644 data/as/5185887/egov-location/boundary-data.json
 create mode 100644 data/as/5185887/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5185887/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186387/BillingService/BusinessService.json
 create mode 100644 data/as/5186387/egov-location/boundary-data.json
 create mode 100644 data/as/5186387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186420/BillingService/BusinessService.json
 create mode 100644 data/as/5186420/egov-location/boundary-data.json
 create mode 100644 data/as/5186420/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186420/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186446/BillingService/BusinessService.json
 create mode 100644 data/as/5186446/egov-location/boundary-data.json
 create mode 100644 data/as/5186446/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186446/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186457/BillingService/BusinessService.json
 create mode 100644 data/as/5186457/egov-location/boundary-data.json
 create mode 100644 data/as/5186457/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186457/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186463/BillingService/BusinessService.json
 create mode 100644 data/as/5186463/egov-location/boundary-data.json
 create mode 100644 data/as/5186463/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186463/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186493/BillingService/BusinessService.json
 create mode 100644 data/as/5186493/egov-location/boundary-data.json
 create mode 100644 data/as/5186493/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186493/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186499/BillingService/BusinessService.json
 create mode 100644 data/as/5186499/egov-location/boundary-data.json
 create mode 100644 data/as/5186499/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186499/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186506/BillingService/BusinessService.json
 create mode 100644 data/as/5186506/egov-location/boundary-data.json
 create mode 100644 data/as/5186506/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186506/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5186513/BillingService/BusinessService.json
 create mode 100644 data/as/5186513/egov-location/boundary-data.json
 create mode 100644 data/as/5186513/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5186513/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5206914/BillingService/BusinessService.json
 create mode 100644 data/as/5206914/egov-location/boundary-data.json
 create mode 100644 data/as/5206914/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5206914/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5230312/BillingService/BusinessService.json
 create mode 100644 data/as/5230312/egov-location/boundary-data.json
 create mode 100644 data/as/5230312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5230312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5230346/BillingService/BusinessService.json
 create mode 100644 data/as/5230346/egov-location/boundary-data.json
 create mode 100644 data/as/5230346/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5230346/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5230398/BillingService/BusinessService.json
 create mode 100644 data/as/5230398/egov-location/boundary-data.json
 create mode 100644 data/as/5230398/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5230398/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/52793/BillingService/BusinessService.json
 create mode 100644 data/as/52793/egov-location/boundary-data.json
 create mode 100644 data/as/52793/ws-services-calculation/Penalty.json
 create mode 100644 data/as/52793/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5344027/BillingService/BusinessService.json
 create mode 100644 data/as/5344027/egov-location/boundary-data.json
 create mode 100644 data/as/5344027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5344027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5349626/BillingService/BusinessService.json
 create mode 100644 data/as/5349626/egov-location/boundary-data.json
 create mode 100644 data/as/5349626/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5349626/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5349656/BillingService/BusinessService.json
 create mode 100644 data/as/5349656/egov-location/boundary-data.json
 create mode 100644 data/as/5349656/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5349656/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5349682/BillingService/BusinessService.json
 create mode 100644 data/as/5349682/egov-location/boundary-data.json
 create mode 100644 data/as/5349682/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5349682/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5357091/BillingService/BusinessService.json
 create mode 100644 data/as/5357091/egov-location/boundary-data.json
 create mode 100644 data/as/5357091/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5357091/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5362300/BillingService/BusinessService.json
 create mode 100644 data/as/5362300/egov-location/boundary-data.json
 create mode 100644 data/as/5362300/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5362300/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5362332/BillingService/BusinessService.json
 create mode 100644 data/as/5362332/egov-location/boundary-data.json
 create mode 100644 data/as/5362332/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5362332/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5379654/BillingService/BusinessService.json
 create mode 100644 data/as/5379654/egov-location/boundary-data.json
 create mode 100644 data/as/5379654/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5379654/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5379810/BillingService/BusinessService.json
 create mode 100644 data/as/5379810/egov-location/boundary-data.json
 create mode 100644 data/as/5379810/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5379810/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5404892/BillingService/BusinessService.json
 create mode 100644 data/as/5404892/egov-location/boundary-data.json
 create mode 100644 data/as/5404892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5404892/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5404904/BillingService/BusinessService.json
 create mode 100644 data/as/5404904/egov-location/boundary-data.json
 create mode 100644 data/as/5404904/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5404904/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5404932/BillingService/BusinessService.json
 create mode 100644 data/as/5404932/egov-location/boundary-data.json
 create mode 100644 data/as/5404932/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5404932/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5407809/BillingService/BusinessService.json
 create mode 100644 data/as/5407809/egov-location/boundary-data.json
 create mode 100644 data/as/5407809/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5407809/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5407828/BillingService/BusinessService.json
 create mode 100644 data/as/5407828/egov-location/boundary-data.json
 create mode 100644 data/as/5407828/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5407828/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5407846/BillingService/BusinessService.json
 create mode 100644 data/as/5407846/egov-location/boundary-data.json
 create mode 100644 data/as/5407846/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5407846/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5407857/BillingService/BusinessService.json
 create mode 100644 data/as/5407857/egov-location/boundary-data.json
 create mode 100644 data/as/5407857/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5407857/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408096/BillingService/BusinessService.json
 create mode 100644 data/as/5408096/egov-location/boundary-data.json
 create mode 100644 data/as/5408096/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408096/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408108/BillingService/BusinessService.json
 create mode 100644 data/as/5408108/egov-location/boundary-data.json
 create mode 100644 data/as/5408108/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408108/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408187/BillingService/BusinessService.json
 create mode 100644 data/as/5408187/egov-location/boundary-data.json
 create mode 100644 data/as/5408187/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408187/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408224/BillingService/BusinessService.json
 create mode 100644 data/as/5408224/egov-location/boundary-data.json
 create mode 100644 data/as/5408224/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408224/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408248/BillingService/BusinessService.json
 create mode 100644 data/as/5408248/egov-location/boundary-data.json
 create mode 100644 data/as/5408248/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408248/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408300/BillingService/BusinessService.json
 create mode 100644 data/as/5408300/egov-location/boundary-data.json
 create mode 100644 data/as/5408300/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408300/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408316/BillingService/BusinessService.json
 create mode 100644 data/as/5408316/egov-location/boundary-data.json
 create mode 100644 data/as/5408316/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408316/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408332/BillingService/BusinessService.json
 create mode 100644 data/as/5408332/egov-location/boundary-data.json
 create mode 100644 data/as/5408332/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408332/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408704/BillingService/BusinessService.json
 create mode 100644 data/as/5408704/egov-location/boundary-data.json
 create mode 100644 data/as/5408704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408793/BillingService/BusinessService.json
 create mode 100644 data/as/5408793/egov-location/boundary-data.json
 create mode 100644 data/as/5408793/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408793/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408854/BillingService/BusinessService.json
 create mode 100644 data/as/5408854/egov-location/boundary-data.json
 create mode 100644 data/as/5408854/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408854/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5408891/BillingService/BusinessService.json
 create mode 100644 data/as/5408891/egov-location/boundary-data.json
 create mode 100644 data/as/5408891/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5408891/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5464190/BillingService/BusinessService.json
 create mode 100644 data/as/5464190/egov-location/boundary-data.json
 create mode 100644 data/as/5464190/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5464190/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5464241/BillingService/BusinessService.json
 create mode 100644 data/as/5464241/egov-location/boundary-data.json
 create mode 100644 data/as/5464241/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5464241/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5464278/BillingService/BusinessService.json
 create mode 100644 data/as/5464278/egov-location/boundary-data.json
 create mode 100644 data/as/5464278/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5464278/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5464342/BillingService/BusinessService.json
 create mode 100644 data/as/5464342/egov-location/boundary-data.json
 create mode 100644 data/as/5464342/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5464342/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5464413/BillingService/BusinessService.json
 create mode 100644 data/as/5464413/egov-location/boundary-data.json
 create mode 100644 data/as/5464413/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5464413/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5464439/BillingService/BusinessService.json
 create mode 100644 data/as/5464439/egov-location/boundary-data.json
 create mode 100644 data/as/5464439/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5464439/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5475220/BillingService/BusinessService.json
 create mode 100644 data/as/5475220/egov-location/boundary-data.json
 create mode 100644 data/as/5475220/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5475220/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5519133/BillingService/BusinessService.json
 create mode 100644 data/as/5519133/egov-location/boundary-data.json
 create mode 100644 data/as/5519133/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5519133/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5519203/BillingService/BusinessService.json
 create mode 100644 data/as/5519203/egov-location/boundary-data.json
 create mode 100644 data/as/5519203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5519203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5523260/BillingService/BusinessService.json
 create mode 100644 data/as/5523260/egov-location/boundary-data.json
 create mode 100644 data/as/5523260/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5523260/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5527478/BillingService/BusinessService.json
 create mode 100644 data/as/5527478/egov-location/boundary-data.json
 create mode 100644 data/as/5527478/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5527478/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5528384/BillingService/BusinessService.json
 create mode 100644 data/as/5528384/egov-location/boundary-data.json
 create mode 100644 data/as/5528384/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5528384/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5531603/BillingService/BusinessService.json
 create mode 100644 data/as/5531603/egov-location/boundary-data.json
 create mode 100644 data/as/5531603/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5531603/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5532932/BillingService/BusinessService.json
 create mode 100644 data/as/5532932/egov-location/boundary-data.json
 create mode 100644 data/as/5532932/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5532932/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5533989/BillingService/BusinessService.json
 create mode 100644 data/as/5533989/egov-location/boundary-data.json
 create mode 100644 data/as/5533989/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5533989/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5534043/BillingService/BusinessService.json
 create mode 100644 data/as/5534043/egov-location/boundary-data.json
 create mode 100644 data/as/5534043/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5534043/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5534657/BillingService/BusinessService.json
 create mode 100644 data/as/5534657/egov-location/boundary-data.json
 create mode 100644 data/as/5534657/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5534657/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5544794/BillingService/BusinessService.json
 create mode 100644 data/as/5544794/egov-location/boundary-data.json
 create mode 100644 data/as/5544794/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5544794/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547805/BillingService/BusinessService.json
 create mode 100644 data/as/5547805/egov-location/boundary-data.json
 create mode 100644 data/as/5547805/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547805/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547815/BillingService/BusinessService.json
 create mode 100644 data/as/5547815/egov-location/boundary-data.json
 create mode 100644 data/as/5547815/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547815/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547824/BillingService/BusinessService.json
 create mode 100644 data/as/5547824/egov-location/boundary-data.json
 create mode 100644 data/as/5547824/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547824/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547832/BillingService/BusinessService.json
 create mode 100644 data/as/5547832/egov-location/boundary-data.json
 create mode 100644 data/as/5547832/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547832/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547843/BillingService/BusinessService.json
 create mode 100644 data/as/5547843/egov-location/boundary-data.json
 create mode 100644 data/as/5547843/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547843/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/600587/BillingService/BusinessService.json
 create mode 100644 data/as/600587/egov-location/boundary-data.json
 create mode 100644 data/as/600587/ws-services-calculation/Penalty.json
 create mode 100644 data/as/600587/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/603120/BillingService/BusinessService.json
 create mode 100644 data/as/603120/egov-location/boundary-data.json
 create mode 100644 data/as/603120/ws-services-calculation/Penalty.json
 create mode 100644 data/as/603120/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/603277/BillingService/BusinessService.json
 create mode 100644 data/as/603277/egov-location/boundary-data.json
 create mode 100644 data/as/603277/ws-services-calculation/Penalty.json
 create mode 100644 data/as/603277/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/603538/BillingService/BusinessService.json
 create mode 100644 data/as/603538/egov-location/boundary-data.json
 create mode 100644 data/as/603538/ws-services-calculation/Penalty.json
 create mode 100644 data/as/603538/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/729083/BillingService/BusinessService.json
 create mode 100644 data/as/729083/egov-location/boundary-data.json
 create mode 100644 data/as/729083/ws-services-calculation/Penalty.json
 create mode 100644 data/as/729083/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/729086/BillingService/BusinessService.json
 create mode 100644 data/as/729086/egov-location/boundary-data.json
 create mode 100644 data/as/729086/ws-services-calculation/Penalty.json
 create mode 100644 data/as/729086/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/874344/BillingService/BusinessService.json
 create mode 100644 data/as/874344/egov-location/boundary-data.json
 create mode 100644 data/as/874344/ws-services-calculation/Penalty.json
 create mode 100644 data/as/874344/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/877925/BillingService/BusinessService.json
 create mode 100644 data/as/877925/egov-location/boundary-data.json
 create mode 100644 data/as/877925/ws-services-calculation/Penalty.json
 create mode 100644 data/as/877925/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/877934/BillingService/BusinessService.json
 create mode 100644 data/as/877934/egov-location/boundary-data.json
 create mode 100644 data/as/877934/ws-services-calculation/Penalty.json
 create mode 100644 data/as/877934/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/1050454/BillingService/BusinessService.json b/data/as/1050454/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e5bedf104
--- /dev/null
+++ b/data/as/1050454/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1050454",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1050454/egov-location/boundary-data.json b/data/as/1050454/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35f5584032
--- /dev/null
+++ b/data/as/1050454/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1050454",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUMARGAON PWSS",
+                "localname": "KUMARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1050454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUMARGAON PWSS",
+                        "localname": "KUMARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUMARGAON PWSS",
+                "localname": "KUMARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1050454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUMARGAON PWSS",
+                        "localname": "KUMARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1050454/ws-services-calculation/Penalty.json b/data/as/1050454/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f0408eda7
--- /dev/null
+++ b/data/as/1050454/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1050454",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1050454/ws-services-calculation/WCBillingSlab.json b/data/as/1050454/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d717a95ba
--- /dev/null
+++ b/data/as/1050454/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1050454",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1429340/BillingService/BusinessService.json b/data/as/1429340/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d0d9ce15d0
--- /dev/null
+++ b/data/as/1429340/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1429340",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1429340/egov-location/boundary-data.json b/data/as/1429340/egov-location/boundary-data.json
new file mode 100644
index 0000000000..63aec60157
--- /dev/null
+++ b/data/as/1429340/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1429340",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULIP TE PWSS",
+                "localname": "TULIP TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1429340",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULIP TE PWSS",
+                        "localname": "TULIP TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULIP TE PWSS",
+                "localname": "TULIP TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1429340",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULIP TE PWSS",
+                        "localname": "TULIP TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1429340/ws-services-calculation/Penalty.json b/data/as/1429340/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a288c93935
--- /dev/null
+++ b/data/as/1429340/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1429340",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1429340/ws-services-calculation/WCBillingSlab.json b/data/as/1429340/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a154976e9f
--- /dev/null
+++ b/data/as/1429340/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1429340",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1432067/BillingService/BusinessService.json b/data/as/1432067/BillingService/BusinessService.json
new file mode 100644
index 0000000000..892114706c
--- /dev/null
+++ b/data/as/1432067/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1432067",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1432067/egov-location/boundary-data.json b/data/as/1432067/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0beb1a6526
--- /dev/null
+++ b/data/as/1432067/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1432067",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOORPURJUTE PWSS",
+                "localname": "NOORPURJUTE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1432067",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOORPURJUTE PWSS",
+                        "localname": "NOORPURJUTE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOORPURJUTE PWSS",
+                "localname": "NOORPURJUTE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1432067",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOORPURJUTE PWSS",
+                        "localname": "NOORPURJUTE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1432067/ws-services-calculation/Penalty.json b/data/as/1432067/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9cb1e9c2ee
--- /dev/null
+++ b/data/as/1432067/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1432067",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1432067/ws-services-calculation/WCBillingSlab.json b/data/as/1432067/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1ec4fa381b
--- /dev/null
+++ b/data/as/1432067/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1432067",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1439931/BillingService/BusinessService.json b/data/as/1439931/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b400064eff
--- /dev/null
+++ b/data/as/1439931/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1439931",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1439931/egov-location/boundary-data.json b/data/as/1439931/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c18b470f67
--- /dev/null
+++ b/data/as/1439931/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1439931",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SURJYAPUR PWSS",
+                "localname": "SURJYAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1439931",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SURJYAPUR PWSS",
+                        "localname": "SURJYAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SURJYAPUR PWSS",
+                "localname": "SURJYAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1439931",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SURJYAPUR PWSS",
+                        "localname": "SURJYAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1439931/ws-services-calculation/Penalty.json b/data/as/1439931/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b8d0544b8b
--- /dev/null
+++ b/data/as/1439931/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1439931",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1439931/ws-services-calculation/WCBillingSlab.json b/data/as/1439931/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b38c9c8ea
--- /dev/null
+++ b/data/as/1439931/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1439931",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1441030/BillingService/BusinessService.json b/data/as/1441030/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7492c46ce
--- /dev/null
+++ b/data/as/1441030/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1441030",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1441030/egov-location/boundary-data.json b/data/as/1441030/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53fb203f81
--- /dev/null
+++ b/data/as/1441030/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1441030",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MIZIBARI PWSS",
+                "localname": "MIZIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1441030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MIZIBARI PWSS",
+                        "localname": "MIZIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MIZIBARI PWSS",
+                "localname": "MIZIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1441030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MIZIBARI PWSS",
+                        "localname": "MIZIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1441030/ws-services-calculation/Penalty.json b/data/as/1441030/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f84b869922
--- /dev/null
+++ b/data/as/1441030/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1441030",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1441030/ws-services-calculation/WCBillingSlab.json b/data/as/1441030/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bcfd9108d5
--- /dev/null
+++ b/data/as/1441030/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1441030",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1450901/BillingService/BusinessService.json b/data/as/1450901/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e2035dfcab
--- /dev/null
+++ b/data/as/1450901/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1450901",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1450901/egov-location/boundary-data.json b/data/as/1450901/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e656282754
--- /dev/null
+++ b/data/as/1450901/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1450901",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALUPATHER PWSS",
+                "localname": "KATHALUPATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1450901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALUPATHER PWSS",
+                        "localname": "KATHALUPATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALUPATHER PWSS",
+                "localname": "KATHALUPATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1450901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALUPATHER PWSS",
+                        "localname": "KATHALUPATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1450901/ws-services-calculation/Penalty.json b/data/as/1450901/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9c015d895d
--- /dev/null
+++ b/data/as/1450901/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1450901",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1450901/ws-services-calculation/WCBillingSlab.json b/data/as/1450901/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7399c9077f
--- /dev/null
+++ b/data/as/1450901/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1450901",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1758972/BillingService/BusinessService.json b/data/as/1758972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55aff2077f
--- /dev/null
+++ b/data/as/1758972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1758972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1758972/egov-location/boundary-data.json b/data/as/1758972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f43f49b2a3
--- /dev/null
+++ b/data/as/1758972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1758972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATACHIPUR PWSS",
+                "localname": "BATACHIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1758972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATACHIPUR PWSS",
+                        "localname": "BATACHIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATACHIPUR PWSS",
+                "localname": "BATACHIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1758972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATACHIPUR PWSS",
+                        "localname": "BATACHIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1758972/ws-services-calculation/Penalty.json b/data/as/1758972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3de597b000
--- /dev/null
+++ b/data/as/1758972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1758972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1758972/ws-services-calculation/WCBillingSlab.json b/data/as/1758972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3c9139eae4
--- /dev/null
+++ b/data/as/1758972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1758972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1759034/BillingService/BusinessService.json b/data/as/1759034/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5483081b3a
--- /dev/null
+++ b/data/as/1759034/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1759034",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1759034/egov-location/boundary-data.json b/data/as/1759034/egov-location/boundary-data.json
new file mode 100644
index 0000000000..107df7a58a
--- /dev/null
+++ b/data/as/1759034/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1759034",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIKHUNDA MEDHIPAM",
+                "localname": "MATIKHUNDA MEDHIPAM",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1759034",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIKHUNDA MEDHIPAM",
+                        "localname": "MATIKHUNDA MEDHIPAM",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIKHUNDA MEDHIPAM",
+                "localname": "MATIKHUNDA MEDHIPAM",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1759034",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIKHUNDA MEDHIPAM",
+                        "localname": "MATIKHUNDA MEDHIPAM",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1759034/ws-services-calculation/Penalty.json b/data/as/1759034/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b5c57e662
--- /dev/null
+++ b/data/as/1759034/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1759034",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1759034/ws-services-calculation/WCBillingSlab.json b/data/as/1759034/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e26dfa9edb
--- /dev/null
+++ b/data/as/1759034/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1759034",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1761428/BillingService/BusinessService.json b/data/as/1761428/BillingService/BusinessService.json
new file mode 100644
index 0000000000..68d8e6c91d
--- /dev/null
+++ b/data/as/1761428/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1761428",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1761428/egov-location/boundary-data.json b/data/as/1761428/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7b13334d7
--- /dev/null
+++ b/data/as/1761428/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1761428",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LIKHOKGAON PWSS",
+                "localname": "LIKHOKGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1761428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LIKHOKGAON PWSS",
+                        "localname": "LIKHOKGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LIKHOKGAON PWSS",
+                "localname": "LIKHOKGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1761428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LIKHOKGAON PWSS",
+                        "localname": "LIKHOKGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1761428/ws-services-calculation/Penalty.json b/data/as/1761428/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5519ff180
--- /dev/null
+++ b/data/as/1761428/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1761428",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1761428/ws-services-calculation/WCBillingSlab.json b/data/as/1761428/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df5ece2d08
--- /dev/null
+++ b/data/as/1761428/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1761428",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1763377/BillingService/BusinessService.json b/data/as/1763377/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32cf615a5f
--- /dev/null
+++ b/data/as/1763377/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1763377",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1763377/egov-location/boundary-data.json b/data/as/1763377/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bfb0ae50fe
--- /dev/null
+++ b/data/as/1763377/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1763377",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARENGKATI PWSS",
+                "localname": "NARENGKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1763377",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARENGKATI PWSS",
+                        "localname": "NARENGKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARENGKATI PWSS",
+                "localname": "NARENGKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1763377",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARENGKATI PWSS",
+                        "localname": "NARENGKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1763377/ws-services-calculation/Penalty.json b/data/as/1763377/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..85bbf57bb8
--- /dev/null
+++ b/data/as/1763377/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1763377",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1763377/ws-services-calculation/WCBillingSlab.json b/data/as/1763377/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b2c13690d
--- /dev/null
+++ b/data/as/1763377/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1763377",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1764917/BillingService/BusinessService.json b/data/as/1764917/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f7c4f38c6
--- /dev/null
+++ b/data/as/1764917/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1764917",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1764917/egov-location/boundary-data.json b/data/as/1764917/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1433c848a4
--- /dev/null
+++ b/data/as/1764917/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1764917",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAIRAGURI PWSS",
+                "localname": "BHAIRAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1764917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAIRAGURI PWSS",
+                        "localname": "BHAIRAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAIRAGURI PWSS",
+                "localname": "BHAIRAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1764917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAIRAGURI PWSS",
+                        "localname": "BHAIRAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1764917/ws-services-calculation/Penalty.json b/data/as/1764917/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f2d71ae38
--- /dev/null
+++ b/data/as/1764917/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1764917",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1764917/ws-services-calculation/WCBillingSlab.json b/data/as/1764917/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..25c1cb4e9b
--- /dev/null
+++ b/data/as/1764917/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1764917",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769128/BillingService/BusinessService.json b/data/as/1769128/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07e2b6d3dc
--- /dev/null
+++ b/data/as/1769128/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1769128",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769128/egov-location/boundary-data.json b/data/as/1769128/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dce65789fc
--- /dev/null
+++ b/data/as/1769128/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1769128",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALISIHA PWSS",
+                "localname": "BALISIHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1769128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALISIHA PWSS",
+                        "localname": "BALISIHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALISIHA PWSS",
+                "localname": "BALISIHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1769128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALISIHA PWSS",
+                        "localname": "BALISIHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769128/ws-services-calculation/Penalty.json b/data/as/1769128/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15f4649d65
--- /dev/null
+++ b/data/as/1769128/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1769128",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769128/ws-services-calculation/WCBillingSlab.json b/data/as/1769128/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ec7e8af21c
--- /dev/null
+++ b/data/as/1769128/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1769128",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769703/BillingService/BusinessService.json b/data/as/1769703/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f72c4cab6e
--- /dev/null
+++ b/data/as/1769703/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1769703",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769703/egov-location/boundary-data.json b/data/as/1769703/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce482d76b7
--- /dev/null
+++ b/data/as/1769703/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1769703",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PIRAKATA PWSS",
+                "localname": "PIRAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1769703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PIRAKATA PWSS",
+                        "localname": "PIRAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PIRAKATA PWSS",
+                "localname": "PIRAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1769703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PIRAKATA PWSS",
+                        "localname": "PIRAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769703/ws-services-calculation/Penalty.json b/data/as/1769703/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..18c62240d3
--- /dev/null
+++ b/data/as/1769703/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1769703",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1769703/ws-services-calculation/WCBillingSlab.json b/data/as/1769703/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac8d4ddab6
--- /dev/null
+++ b/data/as/1769703/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1769703",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770771/BillingService/BusinessService.json b/data/as/1770771/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b0a81652a9
--- /dev/null
+++ b/data/as/1770771/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1770771",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770771/egov-location/boundary-data.json b/data/as/1770771/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5a728e6ce
--- /dev/null
+++ b/data/as/1770771/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1770771",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARUAGAON PWSS",
+                "localname": "GARUAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1770771",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARUAGAON PWSS",
+                        "localname": "GARUAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARUAGAON PWSS",
+                "localname": "GARUAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1770771",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARUAGAON PWSS",
+                        "localname": "GARUAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770771/ws-services-calculation/Penalty.json b/data/as/1770771/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ce8bb9a38
--- /dev/null
+++ b/data/as/1770771/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1770771",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770771/ws-services-calculation/WCBillingSlab.json b/data/as/1770771/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..00947ad61e
--- /dev/null
+++ b/data/as/1770771/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1770771",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770808/BillingService/BusinessService.json b/data/as/1770808/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b2f3e7762
--- /dev/null
+++ b/data/as/1770808/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1770808",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770808/egov-location/boundary-data.json b/data/as/1770808/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eee08834c2
--- /dev/null
+++ b/data/as/1770808/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1770808",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI GOPCHAR PWSS",
+                "localname": "SITALMARI GOPCHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1770808",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI GOPCHAR PWSS",
+                        "localname": "SITALMARI GOPCHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI GOPCHAR PWSS",
+                "localname": "SITALMARI GOPCHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1770808",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI GOPCHAR PWSS",
+                        "localname": "SITALMARI GOPCHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770808/ws-services-calculation/Penalty.json b/data/as/1770808/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d72b171c2f
--- /dev/null
+++ b/data/as/1770808/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1770808",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1770808/ws-services-calculation/WCBillingSlab.json b/data/as/1770808/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0467e5bbdd
--- /dev/null
+++ b/data/as/1770808/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1770808",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1771140/BillingService/BusinessService.json b/data/as/1771140/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b2f34ad1d
--- /dev/null
+++ b/data/as/1771140/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1771140",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1771140/egov-location/boundary-data.json b/data/as/1771140/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb8f7e5685
--- /dev/null
+++ b/data/as/1771140/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1771140",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORPUKHURI PWSS",
+                "localname": "BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1771140",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORPUKHURI PWSS",
+                        "localname": "BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORPUKHURI PWSS",
+                "localname": "BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1771140",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORPUKHURI PWSS",
+                        "localname": "BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1771140/ws-services-calculation/Penalty.json b/data/as/1771140/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b92bc420de
--- /dev/null
+++ b/data/as/1771140/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1771140",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1771140/ws-services-calculation/WCBillingSlab.json b/data/as/1771140/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c06c0f39f0
--- /dev/null
+++ b/data/as/1771140/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1771140",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774472/BillingService/BusinessService.json b/data/as/1774472/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4bdac247a8
--- /dev/null
+++ b/data/as/1774472/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1774472",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774472/egov-location/boundary-data.json b/data/as/1774472/egov-location/boundary-data.json
new file mode 100644
index 0000000000..27211f8bc5
--- /dev/null
+++ b/data/as/1774472/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1774472",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARABHARALIPAR PWSS",
+                "localname": "MARABHARALIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1774472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARABHARALIPAR PWSS",
+                        "localname": "MARABHARALIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARABHARALIPAR PWSS",
+                "localname": "MARABHARALIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1774472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARABHARALIPAR PWSS",
+                        "localname": "MARABHARALIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774472/ws-services-calculation/Penalty.json b/data/as/1774472/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe4a8c1f46
--- /dev/null
+++ b/data/as/1774472/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1774472",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774472/ws-services-calculation/WCBillingSlab.json b/data/as/1774472/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6250ed6a2
--- /dev/null
+++ b/data/as/1774472/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1774472",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774711/BillingService/BusinessService.json b/data/as/1774711/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc384059b8
--- /dev/null
+++ b/data/as/1774711/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1774711",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774711/egov-location/boundary-data.json b/data/as/1774711/egov-location/boundary-data.json
new file mode 100644
index 0000000000..946e24a687
--- /dev/null
+++ b/data/as/1774711/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1774711",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LACHITNAGAR-RUDRAPATH PWSS",
+                "localname": "LACHITNAGAR-RUDRAPATH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1774711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LACHITNAGAR-RUDRAPATH PWSS",
+                        "localname": "LACHITNAGAR-RUDRAPATH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LACHITNAGAR-RUDRAPATH PWSS",
+                "localname": "LACHITNAGAR-RUDRAPATH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1774711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LACHITNAGAR-RUDRAPATH PWSS",
+                        "localname": "LACHITNAGAR-RUDRAPATH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774711/ws-services-calculation/Penalty.json b/data/as/1774711/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c1a2db7ac7
--- /dev/null
+++ b/data/as/1774711/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1774711",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774711/ws-services-calculation/WCBillingSlab.json b/data/as/1774711/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a0a40019d
--- /dev/null
+++ b/data/as/1774711/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1774711",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774890/BillingService/BusinessService.json b/data/as/1774890/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9be53780f3
--- /dev/null
+++ b/data/as/1774890/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1774890",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774890/egov-location/boundary-data.json b/data/as/1774890/egov-location/boundary-data.json
new file mode 100644
index 0000000000..143f7b4e1c
--- /dev/null
+++ b/data/as/1774890/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1774890",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARABHARALIPAR PWSS",
+                "localname": "MARABHARALIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1774890",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARABHARALIPAR PWSS",
+                        "localname": "MARABHARALIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARABHARALIPAR PWSS",
+                "localname": "MARABHARALIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1774890",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARABHARALIPAR PWSS",
+                        "localname": "MARABHARALIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774890/ws-services-calculation/Penalty.json b/data/as/1774890/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..261e0dd75c
--- /dev/null
+++ b/data/as/1774890/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1774890",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1774890/ws-services-calculation/WCBillingSlab.json b/data/as/1774890/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a2c5de80ce
--- /dev/null
+++ b/data/as/1774890/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1774890",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1775011/BillingService/BusinessService.json b/data/as/1775011/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9d98397191
--- /dev/null
+++ b/data/as/1775011/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1775011",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1775011/egov-location/boundary-data.json b/data/as/1775011/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2f18d97a2e
--- /dev/null
+++ b/data/as/1775011/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1775011",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                "localname": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1775011",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                        "localname": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                "localname": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1775011",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                        "localname": "RUBBER BAGAN-INDIRA NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1775011/ws-services-calculation/Penalty.json b/data/as/1775011/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83f0b6399b
--- /dev/null
+++ b/data/as/1775011/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1775011",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1775011/ws-services-calculation/WCBillingSlab.json b/data/as/1775011/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b022a3ec7b
--- /dev/null
+++ b/data/as/1775011/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1775011",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1779266/BillingService/BusinessService.json b/data/as/1779266/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d775bcf11a
--- /dev/null
+++ b/data/as/1779266/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1779266",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1779266/egov-location/boundary-data.json b/data/as/1779266/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a59490911c
--- /dev/null
+++ b/data/as/1779266/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1779266",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOORPUKHURI PWSS",
+                "localname": "JOORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1779266",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOORPUKHURI PWSS",
+                        "localname": "JOORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOORPUKHURI PWSS",
+                "localname": "JOORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1779266",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOORPUKHURI PWSS",
+                        "localname": "JOORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1779266/ws-services-calculation/Penalty.json b/data/as/1779266/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f7e075ed3
--- /dev/null
+++ b/data/as/1779266/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1779266",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1779266/ws-services-calculation/WCBillingSlab.json b/data/as/1779266/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3717ea5da3
--- /dev/null
+++ b/data/as/1779266/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1779266",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783019/BillingService/BusinessService.json b/data/as/1783019/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e3f0a0fe6a
--- /dev/null
+++ b/data/as/1783019/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1783019",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783019/egov-location/boundary-data.json b/data/as/1783019/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a77c115084
--- /dev/null
+++ b/data/as/1783019/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1783019",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALISINGA PWSS",
+                "localname": "ALISINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1783019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALISINGA PWSS",
+                        "localname": "ALISINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALISINGA PWSS",
+                "localname": "ALISINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1783019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALISINGA PWSS",
+                        "localname": "ALISINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783019/ws-services-calculation/Penalty.json b/data/as/1783019/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fcda8dd1ef
--- /dev/null
+++ b/data/as/1783019/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1783019",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783019/ws-services-calculation/WCBillingSlab.json b/data/as/1783019/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2fd44ca10b
--- /dev/null
+++ b/data/as/1783019/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1783019",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783754/BillingService/BusinessService.json b/data/as/1783754/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70ed94bdbd
--- /dev/null
+++ b/data/as/1783754/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1783754",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783754/egov-location/boundary-data.json b/data/as/1783754/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3968b19349
--- /dev/null
+++ b/data/as/1783754/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1783754",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKERIGAON PWSS",
+                "localname": "DHEKERIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1783754",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKERIGAON PWSS",
+                        "localname": "DHEKERIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKERIGAON PWSS",
+                "localname": "DHEKERIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1783754",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKERIGAON PWSS",
+                        "localname": "DHEKERIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783754/ws-services-calculation/Penalty.json b/data/as/1783754/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c39ca90cf3
--- /dev/null
+++ b/data/as/1783754/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1783754",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1783754/ws-services-calculation/WCBillingSlab.json b/data/as/1783754/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ed2dfb2e8
--- /dev/null
+++ b/data/as/1783754/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1783754",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784430/BillingService/BusinessService.json b/data/as/1784430/BillingService/BusinessService.json
new file mode 100644
index 0000000000..277da51c2e
--- /dev/null
+++ b/data/as/1784430/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1784430",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784430/egov-location/boundary-data.json b/data/as/1784430/egov-location/boundary-data.json
new file mode 100644
index 0000000000..59466e14cb
--- /dev/null
+++ b/data/as/1784430/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1784430",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARBARI BENGALI P.W.S.S",
+                "localname": "NAHARBARI BENGALI P.W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1784430",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARBARI BENGALI P.W.S.S",
+                        "localname": "NAHARBARI BENGALI P.W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARBARI BENGALI P.W.S.S",
+                "localname": "NAHARBARI BENGALI P.W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1784430",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARBARI BENGALI P.W.S.S",
+                        "localname": "NAHARBARI BENGALI P.W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784430/ws-services-calculation/Penalty.json b/data/as/1784430/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1e56d81cad
--- /dev/null
+++ b/data/as/1784430/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1784430",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784430/ws-services-calculation/WCBillingSlab.json b/data/as/1784430/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1d0d5182f0
--- /dev/null
+++ b/data/as/1784430/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1784430",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784527/BillingService/BusinessService.json b/data/as/1784527/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f396c2c166
--- /dev/null
+++ b/data/as/1784527/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1784527",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784527/egov-location/boundary-data.json b/data/as/1784527/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1aec44f3ce
--- /dev/null
+++ b/data/as/1784527/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1784527",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LABARIGAON P,W.S.S",
+                "localname": "LABARIGAON P,W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1784527",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LABARIGAON P,W.S.S",
+                        "localname": "LABARIGAON P,W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LABARIGAON P,W.S.S",
+                "localname": "LABARIGAON P,W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1784527",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LABARIGAON P,W.S.S",
+                        "localname": "LABARIGAON P,W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784527/ws-services-calculation/Penalty.json b/data/as/1784527/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..776de7c8e8
--- /dev/null
+++ b/data/as/1784527/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1784527",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784527/ws-services-calculation/WCBillingSlab.json b/data/as/1784527/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..348b903349
--- /dev/null
+++ b/data/as/1784527/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1784527",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784979/BillingService/BusinessService.json b/data/as/1784979/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6edbe9411e
--- /dev/null
+++ b/data/as/1784979/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1784979",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784979/egov-location/boundary-data.json b/data/as/1784979/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f72e7d567
--- /dev/null
+++ b/data/as/1784979/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1784979",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI PWSS",
+                "localname": "SINGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1784979",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI PWSS",
+                        "localname": "SINGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI PWSS",
+                "localname": "SINGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1784979",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI PWSS",
+                        "localname": "SINGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784979/ws-services-calculation/Penalty.json b/data/as/1784979/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4fcc293b8e
--- /dev/null
+++ b/data/as/1784979/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1784979",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1784979/ws-services-calculation/WCBillingSlab.json b/data/as/1784979/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7a70e19fb
--- /dev/null
+++ b/data/as/1784979/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1784979",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1803054/BillingService/BusinessService.json b/data/as/1803054/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66b7fcee8a
--- /dev/null
+++ b/data/as/1803054/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1803054",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1803054/egov-location/boundary-data.json b/data/as/1803054/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e1bfd4bbb
--- /dev/null
+++ b/data/as/1803054/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1803054",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANI PWSS",
+                "localname": "NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1803054",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANI PWSS",
+                        "localname": "NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANI PWSS",
+                "localname": "NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1803054",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANI PWSS",
+                        "localname": "NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1803054/ws-services-calculation/Penalty.json b/data/as/1803054/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9deb708ec
--- /dev/null
+++ b/data/as/1803054/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1803054",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1803054/ws-services-calculation/WCBillingSlab.json b/data/as/1803054/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4dbe940e97
--- /dev/null
+++ b/data/as/1803054/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1803054",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1812780/BillingService/BusinessService.json b/data/as/1812780/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b8926a61a
--- /dev/null
+++ b/data/as/1812780/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1812780",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1812780/egov-location/boundary-data.json b/data/as/1812780/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7dead0b96b
--- /dev/null
+++ b/data/as/1812780/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1812780",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANIJARANI PWSS",
+                "localname": "MANIJARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1812780",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANIJARANI PWSS",
+                        "localname": "MANIJARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANIJARANI PWSS",
+                "localname": "MANIJARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1812780",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANIJARANI PWSS",
+                        "localname": "MANIJARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1812780/ws-services-calculation/Penalty.json b/data/as/1812780/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad3c66e39b
--- /dev/null
+++ b/data/as/1812780/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1812780",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1812780/ws-services-calculation/WCBillingSlab.json b/data/as/1812780/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..539f274474
--- /dev/null
+++ b/data/as/1812780/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1812780",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817138/BillingService/BusinessService.json b/data/as/1817138/BillingService/BusinessService.json
new file mode 100644
index 0000000000..edc9b1cb21
--- /dev/null
+++ b/data/as/1817138/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1817138",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817138/egov-location/boundary-data.json b/data/as/1817138/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ead891842
--- /dev/null
+++ b/data/as/1817138/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1817138",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1817138",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1817138",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817138/ws-services-calculation/Penalty.json b/data/as/1817138/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bae169932b
--- /dev/null
+++ b/data/as/1817138/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1817138",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817138/ws-services-calculation/WCBillingSlab.json b/data/as/1817138/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..935a6f9f25
--- /dev/null
+++ b/data/as/1817138/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1817138",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817302/BillingService/BusinessService.json b/data/as/1817302/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c1538219ea
--- /dev/null
+++ b/data/as/1817302/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1817302",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817302/egov-location/boundary-data.json b/data/as/1817302/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1d4faafbcb
--- /dev/null
+++ b/data/as/1817302/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1817302",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1817302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1817302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817302/ws-services-calculation/Penalty.json b/data/as/1817302/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5df00a4aca
--- /dev/null
+++ b/data/as/1817302/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1817302",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1817302/ws-services-calculation/WCBillingSlab.json b/data/as/1817302/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ea4c342df
--- /dev/null
+++ b/data/as/1817302/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1817302",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1819835/BillingService/BusinessService.json b/data/as/1819835/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a37db25ce6
--- /dev/null
+++ b/data/as/1819835/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1819835",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1819835/egov-location/boundary-data.json b/data/as/1819835/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b099eda9b
--- /dev/null
+++ b/data/as/1819835/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1819835",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARPARA PWSS",
+                "localname": "GARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1819835",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARPARA PWSS",
+                        "localname": "GARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARPARA PWSS",
+                "localname": "GARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1819835",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARPARA PWSS",
+                        "localname": "GARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1819835/ws-services-calculation/Penalty.json b/data/as/1819835/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..52da2796e7
--- /dev/null
+++ b/data/as/1819835/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1819835",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1819835/ws-services-calculation/WCBillingSlab.json b/data/as/1819835/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2611c43c8
--- /dev/null
+++ b/data/as/1819835/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1819835",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1830310/BillingService/BusinessService.json b/data/as/1830310/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35c922fec1
--- /dev/null
+++ b/data/as/1830310/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1830310",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1830310/egov-location/boundary-data.json b/data/as/1830310/egov-location/boundary-data.json
new file mode 100644
index 0000000000..117db167ef
--- /dev/null
+++ b/data/as/1830310/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1830310",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE PWSS",
+                "localname": "SOPAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1830310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE PWSS",
+                        "localname": "SOPAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE PWSS",
+                "localname": "SOPAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1830310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE PWSS",
+                        "localname": "SOPAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1830310/ws-services-calculation/Penalty.json b/data/as/1830310/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e391ea899
--- /dev/null
+++ b/data/as/1830310/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1830310",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1830310/ws-services-calculation/WCBillingSlab.json b/data/as/1830310/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..193f3005af
--- /dev/null
+++ b/data/as/1830310/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1830310",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1841150/BillingService/BusinessService.json b/data/as/1841150/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e757348f2d
--- /dev/null
+++ b/data/as/1841150/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1841150",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1841150/egov-location/boundary-data.json b/data/as/1841150/egov-location/boundary-data.json
new file mode 100644
index 0000000000..73c41294a5
--- /dev/null
+++ b/data/as/1841150/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1841150",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIAGAON",
+                "localname": "TELIAGAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1841150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIAGAON",
+                        "localname": "TELIAGAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIAGAON",
+                "localname": "TELIAGAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1841150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIAGAON",
+                        "localname": "TELIAGAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1841150/ws-services-calculation/Penalty.json b/data/as/1841150/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0a5e469a1f
--- /dev/null
+++ b/data/as/1841150/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1841150",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1841150/ws-services-calculation/WCBillingSlab.json b/data/as/1841150/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..035b4e0523
--- /dev/null
+++ b/data/as/1841150/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1841150",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842161/BillingService/BusinessService.json b/data/as/1842161/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f1a8f69e5
--- /dev/null
+++ b/data/as/1842161/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1842161",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842161/egov-location/boundary-data.json b/data/as/1842161/egov-location/boundary-data.json
new file mode 100644
index 0000000000..816602d774
--- /dev/null
+++ b/data/as/1842161/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1842161",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "USHA NAGAR-MURHA TETELI PWSS",
+                "localname": "USHA NAGAR-MURHA TETELI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842161",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "USHA NAGAR-MURHA TETELI PWSS",
+                        "localname": "USHA NAGAR-MURHA TETELI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "USHA NAGAR-MURHA TETELI PWSS",
+                "localname": "USHA NAGAR-MURHA TETELI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842161",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "USHA NAGAR-MURHA TETELI PWSS",
+                        "localname": "USHA NAGAR-MURHA TETELI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842161/ws-services-calculation/Penalty.json b/data/as/1842161/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c17515adb5
--- /dev/null
+++ b/data/as/1842161/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1842161",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842161/ws-services-calculation/WCBillingSlab.json b/data/as/1842161/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7191819976
--- /dev/null
+++ b/data/as/1842161/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1842161",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842244/BillingService/BusinessService.json b/data/as/1842244/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f067352b27
--- /dev/null
+++ b/data/as/1842244/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1842244",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842244/egov-location/boundary-data.json b/data/as/1842244/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a525102bc4
--- /dev/null
+++ b/data/as/1842244/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1842244",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAMARIGAON PWSS",
+                "localname": "BATAMARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAMARIGAON PWSS",
+                        "localname": "BATAMARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAMARIGAON PWSS",
+                "localname": "BATAMARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAMARIGAON PWSS",
+                        "localname": "BATAMARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842244/ws-services-calculation/Penalty.json b/data/as/1842244/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94401965a1
--- /dev/null
+++ b/data/as/1842244/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1842244",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842244/ws-services-calculation/WCBillingSlab.json b/data/as/1842244/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cb8c952d96
--- /dev/null
+++ b/data/as/1842244/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1842244",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842378/BillingService/BusinessService.json b/data/as/1842378/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fcff54d5ea
--- /dev/null
+++ b/data/as/1842378/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1842378",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842378/egov-location/boundary-data.json b/data/as/1842378/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a66c2908dc
--- /dev/null
+++ b/data/as/1842378/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1842378",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ISLAMPUR PWSS",
+                "localname": "ISLAMPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842378",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ISLAMPUR PWSS",
+                        "localname": "ISLAMPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ISLAMPUR PWSS",
+                "localname": "ISLAMPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842378",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ISLAMPUR PWSS",
+                        "localname": "ISLAMPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842378/ws-services-calculation/Penalty.json b/data/as/1842378/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..208a624e9d
--- /dev/null
+++ b/data/as/1842378/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1842378",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842378/ws-services-calculation/WCBillingSlab.json b/data/as/1842378/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b724ae3bac
--- /dev/null
+++ b/data/as/1842378/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1842378",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842423/BillingService/BusinessService.json b/data/as/1842423/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf7230dc41
--- /dev/null
+++ b/data/as/1842423/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1842423",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842423/egov-location/boundary-data.json b/data/as/1842423/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b8928801cb
--- /dev/null
+++ b/data/as/1842423/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1842423",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORUADOLONI PWSS",
+                "localname": "BORUADOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORUADOLONI PWSS",
+                        "localname": "BORUADOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORUADOLONI PWSS",
+                "localname": "BORUADOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORUADOLONI PWSS",
+                        "localname": "BORUADOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842423/ws-services-calculation/Penalty.json b/data/as/1842423/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32a521e15a
--- /dev/null
+++ b/data/as/1842423/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1842423",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842423/ws-services-calculation/WCBillingSlab.json b/data/as/1842423/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..52fca68b6b
--- /dev/null
+++ b/data/as/1842423/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1842423",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842653/BillingService/BusinessService.json b/data/as/1842653/BillingService/BusinessService.json
new file mode 100644
index 0000000000..969a2667c1
--- /dev/null
+++ b/data/as/1842653/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1842653",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842653/egov-location/boundary-data.json b/data/as/1842653/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e86e289511
--- /dev/null
+++ b/data/as/1842653/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1842653",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGARUDUBA PWSS",
+                "localname": "BURAGARUDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842653",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGARUDUBA PWSS",
+                        "localname": "BURAGARUDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGARUDUBA PWSS",
+                "localname": "BURAGARUDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842653",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGARUDUBA PWSS",
+                        "localname": "BURAGARUDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842653/ws-services-calculation/Penalty.json b/data/as/1842653/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1c2afd0c34
--- /dev/null
+++ b/data/as/1842653/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1842653",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842653/ws-services-calculation/WCBillingSlab.json b/data/as/1842653/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e310ec6c12
--- /dev/null
+++ b/data/as/1842653/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1842653",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842776/BillingService/BusinessService.json b/data/as/1842776/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b2e5f252a
--- /dev/null
+++ b/data/as/1842776/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1842776",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842776/egov-location/boundary-data.json b/data/as/1842776/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6500137cce
--- /dev/null
+++ b/data/as/1842776/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1842776",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMULUGURI PWSS",
+                "localname": "SIMULUGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMULUGURI PWSS",
+                        "localname": "SIMULUGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMULUGURI PWSS",
+                "localname": "SIMULUGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1842776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMULUGURI PWSS",
+                        "localname": "SIMULUGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842776/ws-services-calculation/Penalty.json b/data/as/1842776/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e1354b59d0
--- /dev/null
+++ b/data/as/1842776/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1842776",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1842776/ws-services-calculation/WCBillingSlab.json b/data/as/1842776/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b91e23a37
--- /dev/null
+++ b/data/as/1842776/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1842776",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843088/BillingService/BusinessService.json b/data/as/1843088/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9a1e7378e
--- /dev/null
+++ b/data/as/1843088/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1843088",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843088/egov-location/boundary-data.json b/data/as/1843088/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fca6e7666d
--- /dev/null
+++ b/data/as/1843088/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1843088",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALIHAMARI PWSS",
+                "localname": "KHALIHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1843088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALIHAMARI PWSS",
+                        "localname": "KHALIHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALIHAMARI PWSS",
+                "localname": "KHALIHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1843088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALIHAMARI PWSS",
+                        "localname": "KHALIHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843088/ws-services-calculation/Penalty.json b/data/as/1843088/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..52809d1c6d
--- /dev/null
+++ b/data/as/1843088/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1843088",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843088/ws-services-calculation/WCBillingSlab.json b/data/as/1843088/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48ad81e3ed
--- /dev/null
+++ b/data/as/1843088/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1843088",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843358/BillingService/BusinessService.json b/data/as/1843358/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d83d36aa7a
--- /dev/null
+++ b/data/as/1843358/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1843358",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843358/egov-location/boundary-data.json b/data/as/1843358/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a80797be34
--- /dev/null
+++ b/data/as/1843358/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1843358",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAMARI PWSS",
+                "localname": "BATIAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1843358",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAMARI PWSS",
+                        "localname": "BATIAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAMARI PWSS",
+                "localname": "BATIAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1843358",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAMARI PWSS",
+                        "localname": "BATIAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843358/ws-services-calculation/Penalty.json b/data/as/1843358/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2536c19745
--- /dev/null
+++ b/data/as/1843358/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1843358",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843358/ws-services-calculation/WCBillingSlab.json b/data/as/1843358/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1d08ae657
--- /dev/null
+++ b/data/as/1843358/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1843358",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843430/BillingService/BusinessService.json b/data/as/1843430/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9080d95c4f
--- /dev/null
+++ b/data/as/1843430/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1843430",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843430/egov-location/boundary-data.json b/data/as/1843430/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f6ed26091
--- /dev/null
+++ b/data/as/1843430/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1843430",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOUBHANGA PWSS",
+                "localname": "TOUBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1843430",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOUBHANGA PWSS",
+                        "localname": "TOUBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOUBHANGA PWSS",
+                "localname": "TOUBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1843430",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOUBHANGA PWSS",
+                        "localname": "TOUBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843430/ws-services-calculation/Penalty.json b/data/as/1843430/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f060a07d5
--- /dev/null
+++ b/data/as/1843430/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1843430",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1843430/ws-services-calculation/WCBillingSlab.json b/data/as/1843430/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e7fdfc900
--- /dev/null
+++ b/data/as/1843430/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1843430",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844212/BillingService/BusinessService.json b/data/as/1844212/BillingService/BusinessService.json
new file mode 100644
index 0000000000..acec64d5cc
--- /dev/null
+++ b/data/as/1844212/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1844212",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844212/egov-location/boundary-data.json b/data/as/1844212/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea07cb557a
--- /dev/null
+++ b/data/as/1844212/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1844212",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POLASHBOSTI PATHER PWSS",
+                "localname": "POLASHBOSTI PATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1844212",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POLASHBOSTI PATHER PWSS",
+                        "localname": "POLASHBOSTI PATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POLASHBOSTI PATHER PWSS",
+                "localname": "POLASHBOSTI PATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1844212",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POLASHBOSTI PATHER PWSS",
+                        "localname": "POLASHBOSTI PATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844212/ws-services-calculation/Penalty.json b/data/as/1844212/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e4d6d0598
--- /dev/null
+++ b/data/as/1844212/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1844212",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844212/ws-services-calculation/WCBillingSlab.json b/data/as/1844212/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9b3ef7493
--- /dev/null
+++ b/data/as/1844212/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1844212",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844228/BillingService/BusinessService.json b/data/as/1844228/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d441a2844f
--- /dev/null
+++ b/data/as/1844228/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1844228",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844228/egov-location/boundary-data.json b/data/as/1844228/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5892dab274
--- /dev/null
+++ b/data/as/1844228/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1844228",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEHERUKHANDA PWSS",
+                "localname": "KEHERUKHANDA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1844228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEHERUKHANDA PWSS",
+                        "localname": "KEHERUKHANDA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEHERUKHANDA PWSS",
+                "localname": "KEHERUKHANDA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1844228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEHERUKHANDA PWSS",
+                        "localname": "KEHERUKHANDA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844228/ws-services-calculation/Penalty.json b/data/as/1844228/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89bc107ca8
--- /dev/null
+++ b/data/as/1844228/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1844228",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844228/ws-services-calculation/WCBillingSlab.json b/data/as/1844228/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0970c53c7
--- /dev/null
+++ b/data/as/1844228/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1844228",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844235/BillingService/BusinessService.json b/data/as/1844235/BillingService/BusinessService.json
new file mode 100644
index 0000000000..260de9287b
--- /dev/null
+++ b/data/as/1844235/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1844235",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844235/egov-location/boundary-data.json b/data/as/1844235/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74f184655d
--- /dev/null
+++ b/data/as/1844235/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1844235",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUBARI PWSS",
+                "localname": "OUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1844235",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUBARI PWSS",
+                        "localname": "OUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUBARI PWSS",
+                "localname": "OUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1844235",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUBARI PWSS",
+                        "localname": "OUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844235/ws-services-calculation/Penalty.json b/data/as/1844235/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b089ebd6a
--- /dev/null
+++ b/data/as/1844235/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1844235",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1844235/ws-services-calculation/WCBillingSlab.json b/data/as/1844235/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..62879b5907
--- /dev/null
+++ b/data/as/1844235/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1844235",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845373/BillingService/BusinessService.json b/data/as/1845373/BillingService/BusinessService.json
new file mode 100644
index 0000000000..716e63b306
--- /dev/null
+++ b/data/as/1845373/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1845373",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845373/egov-location/boundary-data.json b/data/as/1845373/egov-location/boundary-data.json
new file mode 100644
index 0000000000..282e395f80
--- /dev/null
+++ b/data/as/1845373/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1845373",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOLOGURI PWSS",
+                "localname": "SOLOGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOLOGURI PWSS",
+                        "localname": "SOLOGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOLOGURI PWSS",
+                "localname": "SOLOGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOLOGURI PWSS",
+                        "localname": "SOLOGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845373/ws-services-calculation/Penalty.json b/data/as/1845373/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..93115a38b5
--- /dev/null
+++ b/data/as/1845373/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1845373",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845373/ws-services-calculation/WCBillingSlab.json b/data/as/1845373/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..170b8f8bc0
--- /dev/null
+++ b/data/as/1845373/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1845373",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845703/BillingService/BusinessService.json b/data/as/1845703/BillingService/BusinessService.json
new file mode 100644
index 0000000000..52f24edcbd
--- /dev/null
+++ b/data/as/1845703/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1845703",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845703/egov-location/boundary-data.json b/data/as/1845703/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b42c18c3a6
--- /dev/null
+++ b/data/as/1845703/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1845703",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORBIL SILONIPAM PWSS",
+                "localname": "GORBIL SILONIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORBIL SILONIPAM PWSS",
+                        "localname": "GORBIL SILONIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORBIL SILONIPAM PWSS",
+                "localname": "GORBIL SILONIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORBIL SILONIPAM PWSS",
+                        "localname": "GORBIL SILONIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845703/ws-services-calculation/Penalty.json b/data/as/1845703/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ea09a1512
--- /dev/null
+++ b/data/as/1845703/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1845703",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845703/ws-services-calculation/WCBillingSlab.json b/data/as/1845703/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b256093d7d
--- /dev/null
+++ b/data/as/1845703/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1845703",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845765/BillingService/BusinessService.json b/data/as/1845765/BillingService/BusinessService.json
new file mode 100644
index 0000000000..54d28408a2
--- /dev/null
+++ b/data/as/1845765/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1845765",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845765/egov-location/boundary-data.json b/data/as/1845765/egov-location/boundary-data.json
new file mode 100644
index 0000000000..caa87a1e4f
--- /dev/null
+++ b/data/as/1845765/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1845765",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHITARSUTI PWSS",
+                "localname": "BHITARSUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845765",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHITARSUTI PWSS",
+                        "localname": "BHITARSUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHITARSUTI PWSS",
+                "localname": "BHITARSUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845765",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHITARSUTI PWSS",
+                        "localname": "BHITARSUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845765/ws-services-calculation/Penalty.json b/data/as/1845765/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ae26625c4
--- /dev/null
+++ b/data/as/1845765/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1845765",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845765/ws-services-calculation/WCBillingSlab.json b/data/as/1845765/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0047d9e859
--- /dev/null
+++ b/data/as/1845765/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1845765",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845900/BillingService/BusinessService.json b/data/as/1845900/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0ea00890f1
--- /dev/null
+++ b/data/as/1845900/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1845900",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845900/egov-location/boundary-data.json b/data/as/1845900/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4af813f316
--- /dev/null
+++ b/data/as/1845900/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1845900",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHUCHOWA PWSS",
+                "localname": "PAHUCHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845900",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHUCHOWA PWSS",
+                        "localname": "PAHUCHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHUCHOWA PWSS",
+                "localname": "PAHUCHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1845900",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHUCHOWA PWSS",
+                        "localname": "PAHUCHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845900/ws-services-calculation/Penalty.json b/data/as/1845900/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cdb99db422
--- /dev/null
+++ b/data/as/1845900/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1845900",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1845900/ws-services-calculation/WCBillingSlab.json b/data/as/1845900/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..be0ed8baa2
--- /dev/null
+++ b/data/as/1845900/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1845900",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846063/BillingService/BusinessService.json b/data/as/1846063/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6fa2e72ceb
--- /dev/null
+++ b/data/as/1846063/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1846063",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846063/egov-location/boundary-data.json b/data/as/1846063/egov-location/boundary-data.json
new file mode 100644
index 0000000000..833919fbfa
--- /dev/null
+++ b/data/as/1846063/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1846063",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAPEKHATI PWSS",
+                "localname": "SAPEKHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846063",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAPEKHATI PWSS",
+                        "localname": "SAPEKHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAPEKHATI PWSS",
+                "localname": "SAPEKHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846063",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAPEKHATI PWSS",
+                        "localname": "SAPEKHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846063/ws-services-calculation/Penalty.json b/data/as/1846063/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5b2c9a7f1
--- /dev/null
+++ b/data/as/1846063/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1846063",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846063/ws-services-calculation/WCBillingSlab.json b/data/as/1846063/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a095db5c6
--- /dev/null
+++ b/data/as/1846063/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1846063",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846172/BillingService/BusinessService.json b/data/as/1846172/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a5c1dd3238
--- /dev/null
+++ b/data/as/1846172/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1846172",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846172/egov-location/boundary-data.json b/data/as/1846172/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ff618829af
--- /dev/null
+++ b/data/as/1846172/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1846172",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMAGURI PWSS",
+                "localname": "SAMAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846172",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMAGURI PWSS",
+                        "localname": "SAMAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMAGURI PWSS",
+                "localname": "SAMAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846172",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMAGURI PWSS",
+                        "localname": "SAMAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846172/ws-services-calculation/Penalty.json b/data/as/1846172/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8c384e26fd
--- /dev/null
+++ b/data/as/1846172/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1846172",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846172/ws-services-calculation/WCBillingSlab.json b/data/as/1846172/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94a4294aea
--- /dev/null
+++ b/data/as/1846172/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1846172",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846500/BillingService/BusinessService.json b/data/as/1846500/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2791bf3974
--- /dev/null
+++ b/data/as/1846500/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1846500",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846500/egov-location/boundary-data.json b/data/as/1846500/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cedd0dc9b8
--- /dev/null
+++ b/data/as/1846500/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1846500",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATINGA PWSS",
+                "localname": "HATINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATINGA PWSS",
+                        "localname": "HATINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATINGA PWSS",
+                "localname": "HATINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATINGA PWSS",
+                        "localname": "HATINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846500/ws-services-calculation/Penalty.json b/data/as/1846500/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04345bc7a8
--- /dev/null
+++ b/data/as/1846500/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1846500",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846500/ws-services-calculation/WCBillingSlab.json b/data/as/1846500/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a5f4d7657
--- /dev/null
+++ b/data/as/1846500/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1846500",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846605/BillingService/BusinessService.json b/data/as/1846605/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c71993c0e9
--- /dev/null
+++ b/data/as/1846605/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1846605",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846605/egov-location/boundary-data.json b/data/as/1846605/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6aab49cf3c
--- /dev/null
+++ b/data/as/1846605/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1846605",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO1 DOLABARI PWSS",
+                "localname": "NO1 DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846605",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO1 DOLABARI PWSS",
+                        "localname": "NO1 DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO1 DOLABARI PWSS",
+                "localname": "NO1 DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846605",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO1 DOLABARI PWSS",
+                        "localname": "NO1 DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846605/ws-services-calculation/Penalty.json b/data/as/1846605/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e35dd5591
--- /dev/null
+++ b/data/as/1846605/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1846605",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846605/ws-services-calculation/WCBillingSlab.json b/data/as/1846605/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fcdd7cd4b6
--- /dev/null
+++ b/data/as/1846605/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1846605",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846743/BillingService/BusinessService.json b/data/as/1846743/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ebc3ae1855
--- /dev/null
+++ b/data/as/1846743/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1846743",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846743/egov-location/boundary-data.json b/data/as/1846743/egov-location/boundary-data.json
new file mode 100644
index 0000000000..404ffee5a8
--- /dev/null
+++ b/data/as/1846743/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1846743",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALIABHATA PWSS",
+                "localname": "KALIABHATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALIABHATA PWSS",
+                        "localname": "KALIABHATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALIABHATA PWSS",
+                "localname": "KALIABHATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1846743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALIABHATA PWSS",
+                        "localname": "KALIABHATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846743/ws-services-calculation/Penalty.json b/data/as/1846743/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..440026ca92
--- /dev/null
+++ b/data/as/1846743/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1846743",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1846743/ws-services-calculation/WCBillingSlab.json b/data/as/1846743/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d56beee6eb
--- /dev/null
+++ b/data/as/1846743/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1846743",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852364/BillingService/BusinessService.json b/data/as/1852364/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e72e0a10d8
--- /dev/null
+++ b/data/as/1852364/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1852364",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852364/egov-location/boundary-data.json b/data/as/1852364/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cce2340f9e
--- /dev/null
+++ b/data/as/1852364/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1852364",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUNIONI PWSS",
+                "localname": "PUNIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1852364",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUNIONI PWSS",
+                        "localname": "PUNIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUNIONI PWSS",
+                "localname": "PUNIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1852364",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUNIONI PWSS",
+                        "localname": "PUNIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852364/ws-services-calculation/Penalty.json b/data/as/1852364/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..29a50a7814
--- /dev/null
+++ b/data/as/1852364/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1852364",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852364/ws-services-calculation/WCBillingSlab.json b/data/as/1852364/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c65de91014
--- /dev/null
+++ b/data/as/1852364/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1852364",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852774/BillingService/BusinessService.json b/data/as/1852774/BillingService/BusinessService.json
new file mode 100644
index 0000000000..28288ce672
--- /dev/null
+++ b/data/as/1852774/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1852774",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852774/egov-location/boundary-data.json b/data/as/1852774/egov-location/boundary-data.json
new file mode 100644
index 0000000000..22062c5d2f
--- /dev/null
+++ b/data/as/1852774/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1852774",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHMILE PWSS",
+                "localname": "PANCHMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1852774",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHMILE PWSS",
+                        "localname": "PANCHMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHMILE PWSS",
+                "localname": "PANCHMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1852774",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHMILE PWSS",
+                        "localname": "PANCHMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852774/ws-services-calculation/Penalty.json b/data/as/1852774/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..22f5a38a9f
--- /dev/null
+++ b/data/as/1852774/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1852774",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852774/ws-services-calculation/WCBillingSlab.json b/data/as/1852774/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9529805645
--- /dev/null
+++ b/data/as/1852774/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1852774",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852987/BillingService/BusinessService.json b/data/as/1852987/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ce0f473c5
--- /dev/null
+++ b/data/as/1852987/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1852987",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852987/egov-location/boundary-data.json b/data/as/1852987/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3917af042f
--- /dev/null
+++ b/data/as/1852987/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1852987",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINIMILE PWSS",
+                "localname": "TINIMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1852987",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINIMILE PWSS",
+                        "localname": "TINIMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINIMILE PWSS",
+                "localname": "TINIMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1852987",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINIMILE PWSS",
+                        "localname": "TINIMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852987/ws-services-calculation/Penalty.json b/data/as/1852987/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00961df80a
--- /dev/null
+++ b/data/as/1852987/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1852987",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1852987/ws-services-calculation/WCBillingSlab.json b/data/as/1852987/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd692a624e
--- /dev/null
+++ b/data/as/1852987/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1852987",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853306/BillingService/BusinessService.json b/data/as/1853306/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86339c555b
--- /dev/null
+++ b/data/as/1853306/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1853306",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853306/egov-location/boundary-data.json b/data/as/1853306/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0f71464d77
--- /dev/null
+++ b/data/as/1853306/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1853306",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALIJAN PWSS",
+                "localname": "MALIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853306",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALIJAN PWSS",
+                        "localname": "MALIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALIJAN PWSS",
+                "localname": "MALIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853306",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALIJAN PWSS",
+                        "localname": "MALIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853306/ws-services-calculation/Penalty.json b/data/as/1853306/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4bb6bf7430
--- /dev/null
+++ b/data/as/1853306/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1853306",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853306/ws-services-calculation/WCBillingSlab.json b/data/as/1853306/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a70ddccd86
--- /dev/null
+++ b/data/as/1853306/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1853306",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853326/BillingService/BusinessService.json b/data/as/1853326/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97b8825a44
--- /dev/null
+++ b/data/as/1853326/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1853326",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853326/egov-location/boundary-data.json b/data/as/1853326/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3b36e0e7ac
--- /dev/null
+++ b/data/as/1853326/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1853326",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ HALESWAR PWSS",
+                "localname": "NIZ HALESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853326",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ HALESWAR PWSS",
+                        "localname": "NIZ HALESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ HALESWAR PWSS",
+                "localname": "NIZ HALESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853326",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ HALESWAR PWSS",
+                        "localname": "NIZ HALESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853326/ws-services-calculation/Penalty.json b/data/as/1853326/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71ebbb698d
--- /dev/null
+++ b/data/as/1853326/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1853326",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853326/ws-services-calculation/WCBillingSlab.json b/data/as/1853326/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b61f2cb5f5
--- /dev/null
+++ b/data/as/1853326/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1853326",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853350/BillingService/BusinessService.json b/data/as/1853350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0d4ef40ca2
--- /dev/null
+++ b/data/as/1853350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1853350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853350/egov-location/boundary-data.json b/data/as/1853350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..09724cecf5
--- /dev/null
+++ b/data/as/1853350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1853350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEPOTA HATKHOLA PWSS",
+                "localname": "DEPOTA HATKHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEPOTA HATKHOLA PWSS",
+                        "localname": "DEPOTA HATKHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEPOTA HATKHOLA PWSS",
+                "localname": "DEPOTA HATKHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEPOTA HATKHOLA PWSS",
+                        "localname": "DEPOTA HATKHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853350/ws-services-calculation/Penalty.json b/data/as/1853350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41af06f26f
--- /dev/null
+++ b/data/as/1853350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1853350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853350/ws-services-calculation/WCBillingSlab.json b/data/as/1853350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b7ff0daea
--- /dev/null
+++ b/data/as/1853350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1853350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853501/BillingService/BusinessService.json b/data/as/1853501/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc5a85d41d
--- /dev/null
+++ b/data/as/1853501/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1853501",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853501/egov-location/boundary-data.json b/data/as/1853501/egov-location/boundary-data.json
new file mode 100644
index 0000000000..337ba362c2
--- /dev/null
+++ b/data/as/1853501/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1853501",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA PANBARI PWSS",
+                "localname": "SESSA PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853501",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA PANBARI PWSS",
+                        "localname": "SESSA PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA PANBARI PWSS",
+                "localname": "SESSA PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853501",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA PANBARI PWSS",
+                        "localname": "SESSA PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853501/ws-services-calculation/Penalty.json b/data/as/1853501/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b50a2def2
--- /dev/null
+++ b/data/as/1853501/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1853501",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853501/ws-services-calculation/WCBillingSlab.json b/data/as/1853501/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aa88979d16
--- /dev/null
+++ b/data/as/1853501/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1853501",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853696/BillingService/BusinessService.json b/data/as/1853696/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f442b07ea9
--- /dev/null
+++ b/data/as/1853696/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1853696",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853696/egov-location/boundary-data.json b/data/as/1853696/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c608b1935
--- /dev/null
+++ b/data/as/1853696/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1853696",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNBARI PWSS",
+                "localname": "BAMUNBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNBARI PWSS",
+                        "localname": "BAMUNBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNBARI PWSS",
+                "localname": "BAMUNBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1853696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNBARI PWSS",
+                        "localname": "BAMUNBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853696/ws-services-calculation/Penalty.json b/data/as/1853696/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6cff12ed3f
--- /dev/null
+++ b/data/as/1853696/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1853696",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1853696/ws-services-calculation/WCBillingSlab.json b/data/as/1853696/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..690f38e452
--- /dev/null
+++ b/data/as/1853696/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1853696",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854331/BillingService/BusinessService.json b/data/as/1854331/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94380bc62c
--- /dev/null
+++ b/data/as/1854331/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1854331",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854331/egov-location/boundary-data.json b/data/as/1854331/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12a22e4c4f
--- /dev/null
+++ b/data/as/1854331/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1854331",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABARI",
+                "localname": "ADABARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1854331",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABARI",
+                        "localname": "ADABARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABARI",
+                "localname": "ADABARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1854331",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABARI",
+                        "localname": "ADABARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854331/ws-services-calculation/Penalty.json b/data/as/1854331/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d2df95ff8
--- /dev/null
+++ b/data/as/1854331/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1854331",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854331/ws-services-calculation/WCBillingSlab.json b/data/as/1854331/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7430d30327
--- /dev/null
+++ b/data/as/1854331/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1854331",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854436/BillingService/BusinessService.json b/data/as/1854436/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad859ec40e
--- /dev/null
+++ b/data/as/1854436/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1854436",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854436/egov-location/boundary-data.json b/data/as/1854436/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd47eb0f9f
--- /dev/null
+++ b/data/as/1854436/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1854436",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM GAON GHORAMARI",
+                "localname": "BAM GAON GHORAMARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1854436",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM GAON GHORAMARI",
+                        "localname": "BAM GAON GHORAMARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM GAON GHORAMARI",
+                "localname": "BAM GAON GHORAMARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1854436",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM GAON GHORAMARI",
+                        "localname": "BAM GAON GHORAMARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854436/ws-services-calculation/Penalty.json b/data/as/1854436/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9535423f55
--- /dev/null
+++ b/data/as/1854436/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1854436",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1854436/ws-services-calculation/WCBillingSlab.json b/data/as/1854436/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b64ac7e192
--- /dev/null
+++ b/data/as/1854436/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1854436",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1858924/BillingService/BusinessService.json b/data/as/1858924/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d9f2abddb
--- /dev/null
+++ b/data/as/1858924/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1858924",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1858924/egov-location/boundary-data.json b/data/as/1858924/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6b5d4a9e59
--- /dev/null
+++ b/data/as/1858924/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1858924",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ERAGAON PWSS",
+                "localname": "ERAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1858924",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ERAGAON PWSS",
+                        "localname": "ERAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ERAGAON PWSS",
+                "localname": "ERAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1858924",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ERAGAON PWSS",
+                        "localname": "ERAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1858924/ws-services-calculation/Penalty.json b/data/as/1858924/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d10223af1a
--- /dev/null
+++ b/data/as/1858924/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1858924",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1858924/ws-services-calculation/WCBillingSlab.json b/data/as/1858924/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca78d869e8
--- /dev/null
+++ b/data/as/1858924/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1858924",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1859895/BillingService/BusinessService.json b/data/as/1859895/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c5f516ad5
--- /dev/null
+++ b/data/as/1859895/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1859895",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1859895/egov-location/boundary-data.json b/data/as/1859895/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e75a3dc027
--- /dev/null
+++ b/data/as/1859895/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1859895",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAGAON PWSS",
+                "localname": "BOKAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1859895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAGAON PWSS",
+                        "localname": "BOKAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAGAON PWSS",
+                "localname": "BOKAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1859895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAGAON PWSS",
+                        "localname": "BOKAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1859895/ws-services-calculation/Penalty.json b/data/as/1859895/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce949d7d80
--- /dev/null
+++ b/data/as/1859895/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1859895",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1859895/ws-services-calculation/WCBillingSlab.json b/data/as/1859895/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c6b3085c7
--- /dev/null
+++ b/data/as/1859895/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1859895",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1860965/BillingService/BusinessService.json b/data/as/1860965/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ac92752ef
--- /dev/null
+++ b/data/as/1860965/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1860965",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1860965/egov-location/boundary-data.json b/data/as/1860965/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9421b8b1a3
--- /dev/null
+++ b/data/as/1860965/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1860965",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONOJULI PWSS",
+                "localname": "MONOJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1860965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONOJULI PWSS",
+                        "localname": "MONOJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONOJULI PWSS",
+                "localname": "MONOJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1860965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONOJULI PWSS",
+                        "localname": "MONOJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1860965/ws-services-calculation/Penalty.json b/data/as/1860965/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..843bf64427
--- /dev/null
+++ b/data/as/1860965/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1860965",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1860965/ws-services-calculation/WCBillingSlab.json b/data/as/1860965/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e90f82336d
--- /dev/null
+++ b/data/as/1860965/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1860965",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861320/BillingService/BusinessService.json b/data/as/1861320/BillingService/BusinessService.json
new file mode 100644
index 0000000000..67957c5f22
--- /dev/null
+++ b/data/as/1861320/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1861320",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861320/egov-location/boundary-data.json b/data/as/1861320/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e35663e27a
--- /dev/null
+++ b/data/as/1861320/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1861320",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORUADOLONI PWSS",
+                "localname": "BORUADOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1861320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORUADOLONI PWSS",
+                        "localname": "BORUADOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORUADOLONI PWSS",
+                "localname": "BORUADOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1861320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORUADOLONI PWSS",
+                        "localname": "BORUADOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861320/ws-services-calculation/Penalty.json b/data/as/1861320/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fdcffcbcf5
--- /dev/null
+++ b/data/as/1861320/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1861320",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861320/ws-services-calculation/WCBillingSlab.json b/data/as/1861320/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c923ddfc4b
--- /dev/null
+++ b/data/as/1861320/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1861320",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861420/BillingService/BusinessService.json b/data/as/1861420/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b38f082ce1
--- /dev/null
+++ b/data/as/1861420/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1861420",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861420/egov-location/boundary-data.json b/data/as/1861420/egov-location/boundary-data.json
new file mode 100644
index 0000000000..90962aea17
--- /dev/null
+++ b/data/as/1861420/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1861420",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGARUDUBA PWSS",
+                "localname": "BURAGARUDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1861420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGARUDUBA PWSS",
+                        "localname": "BURAGARUDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGARUDUBA PWSS",
+                "localname": "BURAGARUDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1861420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGARUDUBA PWSS",
+                        "localname": "BURAGARUDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861420/ws-services-calculation/Penalty.json b/data/as/1861420/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d5d278c8d
--- /dev/null
+++ b/data/as/1861420/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1861420",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1861420/ws-services-calculation/WCBillingSlab.json b/data/as/1861420/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..20bda88140
--- /dev/null
+++ b/data/as/1861420/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1861420",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872281/BillingService/BusinessService.json b/data/as/1872281/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9ab38f6f4c
--- /dev/null
+++ b/data/as/1872281/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1872281",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872281/egov-location/boundary-data.json b/data/as/1872281/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3010037a54
--- /dev/null
+++ b/data/as/1872281/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1872281",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PWSS",
+                "localname": "FAFANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1872281",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PWSS",
+                        "localname": "FAFANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PWSS",
+                "localname": "FAFANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1872281",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PWSS",
+                        "localname": "FAFANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872281/ws-services-calculation/Penalty.json b/data/as/1872281/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5a2c54f42
--- /dev/null
+++ b/data/as/1872281/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1872281",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872281/ws-services-calculation/WCBillingSlab.json b/data/as/1872281/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f86d796f3
--- /dev/null
+++ b/data/as/1872281/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1872281",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872304/BillingService/BusinessService.json b/data/as/1872304/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3317b5714c
--- /dev/null
+++ b/data/as/1872304/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1872304",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872304/egov-location/boundary-data.json b/data/as/1872304/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4378244401
--- /dev/null
+++ b/data/as/1872304/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1872304",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "9 NO.  CAMP PWSS",
+                "localname": "9 NO.  CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1872304",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "9 NO.  CAMP PWSS",
+                        "localname": "9 NO.  CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "9 NO.  CAMP PWSS",
+                "localname": "9 NO.  CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1872304",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "9 NO.  CAMP PWSS",
+                        "localname": "9 NO.  CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872304/ws-services-calculation/Penalty.json b/data/as/1872304/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9c71766c0a
--- /dev/null
+++ b/data/as/1872304/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1872304",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872304/ws-services-calculation/WCBillingSlab.json b/data/as/1872304/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..00aa4dc989
--- /dev/null
+++ b/data/as/1872304/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1872304",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872337/BillingService/BusinessService.json b/data/as/1872337/BillingService/BusinessService.json
new file mode 100644
index 0000000000..531a99ddaa
--- /dev/null
+++ b/data/as/1872337/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1872337",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872337/egov-location/boundary-data.json b/data/as/1872337/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4afb983617
--- /dev/null
+++ b/data/as/1872337/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1872337",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARKULA PWSS",
+                "localname": "MARKULA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1872337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARKULA PWSS",
+                        "localname": "MARKULA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARKULA PWSS",
+                "localname": "MARKULA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1872337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARKULA PWSS",
+                        "localname": "MARKULA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872337/ws-services-calculation/Penalty.json b/data/as/1872337/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65a217fbcd
--- /dev/null
+++ b/data/as/1872337/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1872337",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1872337/ws-services-calculation/WCBillingSlab.json b/data/as/1872337/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c0f74d4b5
--- /dev/null
+++ b/data/as/1872337/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1872337",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1936743/BillingService/BusinessService.json b/data/as/1936743/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8511359b6a
--- /dev/null
+++ b/data/as/1936743/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1936743",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1936743/egov-location/boundary-data.json b/data/as/1936743/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bdd4647051
--- /dev/null
+++ b/data/as/1936743/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1936743",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAWMARI PWSS",
+                "localname": "RAWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1936743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAWMARI PWSS",
+                        "localname": "RAWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAWMARI PWSS",
+                "localname": "RAWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1936743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAWMARI PWSS",
+                        "localname": "RAWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1936743/ws-services-calculation/Penalty.json b/data/as/1936743/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b8d0863c3
--- /dev/null
+++ b/data/as/1936743/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1936743",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1936743/ws-services-calculation/WCBillingSlab.json b/data/as/1936743/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de8a63a888
--- /dev/null
+++ b/data/as/1936743/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1936743",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937513/BillingService/BusinessService.json b/data/as/1937513/BillingService/BusinessService.json
new file mode 100644
index 0000000000..177e3b8fa0
--- /dev/null
+++ b/data/as/1937513/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937513",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937513/egov-location/boundary-data.json b/data/as/1937513/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a72d413f82
--- /dev/null
+++ b/data/as/1937513/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937513",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOWAMARI PWSS",
+                "localname": "MOWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937513",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOWAMARI PWSS",
+                        "localname": "MOWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOWAMARI PWSS",
+                "localname": "MOWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937513",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOWAMARI PWSS",
+                        "localname": "MOWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937513/ws-services-calculation/Penalty.json b/data/as/1937513/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a82f5eab11
--- /dev/null
+++ b/data/as/1937513/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937513",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937513/ws-services-calculation/WCBillingSlab.json b/data/as/1937513/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03afa7ca2a
--- /dev/null
+++ b/data/as/1937513/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937513",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937533/BillingService/BusinessService.json b/data/as/1937533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4eb8b21e86
--- /dev/null
+++ b/data/as/1937533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937533/egov-location/boundary-data.json b/data/as/1937533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dc3d6c48dd
--- /dev/null
+++ b/data/as/1937533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHECHAJHARA PWSS",
+                "localname": "CHECHAJHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHECHAJHARA PWSS",
+                        "localname": "CHECHAJHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHECHAJHARA PWSS",
+                "localname": "CHECHAJHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHECHAJHARA PWSS",
+                        "localname": "CHECHAJHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937533/ws-services-calculation/Penalty.json b/data/as/1937533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7df5be6b9a
--- /dev/null
+++ b/data/as/1937533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937533/ws-services-calculation/WCBillingSlab.json b/data/as/1937533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d2da1fa67
--- /dev/null
+++ b/data/as/1937533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937549/BillingService/BusinessService.json b/data/as/1937549/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c66d4128c
--- /dev/null
+++ b/data/as/1937549/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937549",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937549/egov-location/boundary-data.json b/data/as/1937549/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9de64439b
--- /dev/null
+++ b/data/as/1937549/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937549",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHOMARI PWSS",
+                "localname": "KACHOMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHOMARI PWSS",
+                        "localname": "KACHOMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHOMARI PWSS",
+                "localname": "KACHOMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHOMARI PWSS",
+                        "localname": "KACHOMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937549/ws-services-calculation/Penalty.json b/data/as/1937549/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bc1469f0d2
--- /dev/null
+++ b/data/as/1937549/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937549",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937549/ws-services-calculation/WCBillingSlab.json b/data/as/1937549/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b98a643107
--- /dev/null
+++ b/data/as/1937549/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937549",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937556/BillingService/BusinessService.json b/data/as/1937556/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66e8008d02
--- /dev/null
+++ b/data/as/1937556/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937556",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937556/egov-location/boundary-data.json b/data/as/1937556/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b9afdd963e
--- /dev/null
+++ b/data/as/1937556/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937556",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLAIKHAMAR PWSS",
+                "localname": "BOLAIKHAMAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLAIKHAMAR PWSS",
+                        "localname": "BOLAIKHAMAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLAIKHAMAR PWSS",
+                "localname": "BOLAIKHAMAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLAIKHAMAR PWSS",
+                        "localname": "BOLAIKHAMAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937556/ws-services-calculation/Penalty.json b/data/as/1937556/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2370c5285f
--- /dev/null
+++ b/data/as/1937556/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937556",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937556/ws-services-calculation/WCBillingSlab.json b/data/as/1937556/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..43392eb167
--- /dev/null
+++ b/data/as/1937556/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937556",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937635/BillingService/BusinessService.json b/data/as/1937635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42352d1dc4
--- /dev/null
+++ b/data/as/1937635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937635/egov-location/boundary-data.json b/data/as/1937635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2acb211f12
--- /dev/null
+++ b/data/as/1937635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILSAK DAMAS PWSS",
+                "localname": "SILSAK DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILSAK DAMAS PWSS",
+                        "localname": "SILSAK DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILSAK DAMAS PWSS",
+                "localname": "SILSAK DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILSAK DAMAS PWSS",
+                        "localname": "SILSAK DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937635/ws-services-calculation/Penalty.json b/data/as/1937635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aa21056d66
--- /dev/null
+++ b/data/as/1937635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937635/ws-services-calculation/WCBillingSlab.json b/data/as/1937635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..581d35fc74
--- /dev/null
+++ b/data/as/1937635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937654/BillingService/BusinessService.json b/data/as/1937654/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6473ae926f
--- /dev/null
+++ b/data/as/1937654/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937654",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937654/egov-location/boundary-data.json b/data/as/1937654/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ad406509f
--- /dev/null
+++ b/data/as/1937654/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937654",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHANTINAGAR PWSS",
+                "localname": "SHANTINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937654",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHANTINAGAR PWSS",
+                        "localname": "SHANTINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHANTINAGAR PWSS",
+                "localname": "SHANTINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937654",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHANTINAGAR PWSS",
+                        "localname": "SHANTINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937654/ws-services-calculation/Penalty.json b/data/as/1937654/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6a3e757434
--- /dev/null
+++ b/data/as/1937654/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937654",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937654/ws-services-calculation/WCBillingSlab.json b/data/as/1937654/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e865dec9ec
--- /dev/null
+++ b/data/as/1937654/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937654",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937787/BillingService/BusinessService.json b/data/as/1937787/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a802f7c5db
--- /dev/null
+++ b/data/as/1937787/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937787",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937787/egov-location/boundary-data.json b/data/as/1937787/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3978194acb
--- /dev/null
+++ b/data/as/1937787/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937787",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEKDHOWA PWSS",
+                "localname": "DEKDHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEKDHOWA PWSS",
+                        "localname": "DEKDHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEKDHOWA PWSS",
+                "localname": "DEKDHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEKDHOWA PWSS",
+                        "localname": "DEKDHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937787/ws-services-calculation/Penalty.json b/data/as/1937787/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a57001e71
--- /dev/null
+++ b/data/as/1937787/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937787",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937787/ws-services-calculation/WCBillingSlab.json b/data/as/1937787/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c4ded7abb
--- /dev/null
+++ b/data/as/1937787/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937787",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937816/BillingService/BusinessService.json b/data/as/1937816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b41d6c2834
--- /dev/null
+++ b/data/as/1937816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937816/egov-location/boundary-data.json b/data/as/1937816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a89bd785ca
--- /dev/null
+++ b/data/as/1937816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI BHAKATPARA PWSS",
+                "localname": "TIPLAI BHAKATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI BHAKATPARA PWSS",
+                        "localname": "TIPLAI BHAKATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI BHAKATPARA PWSS",
+                "localname": "TIPLAI BHAKATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI BHAKATPARA PWSS",
+                        "localname": "TIPLAI BHAKATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937816/ws-services-calculation/Penalty.json b/data/as/1937816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c1e476fad5
--- /dev/null
+++ b/data/as/1937816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937816/ws-services-calculation/WCBillingSlab.json b/data/as/1937816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..09e42b6e3c
--- /dev/null
+++ b/data/as/1937816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937849/BillingService/BusinessService.json b/data/as/1937849/BillingService/BusinessService.json
new file mode 100644
index 0000000000..957fed4bd2
--- /dev/null
+++ b/data/as/1937849/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937849",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937849/egov-location/boundary-data.json b/data/as/1937849/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac723ec2b0
--- /dev/null
+++ b/data/as/1937849/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937849",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOIJONGA PWSS",
+                "localname": "MOIJONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOIJONGA PWSS",
+                        "localname": "MOIJONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOIJONGA PWSS",
+                "localname": "MOIJONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOIJONGA PWSS",
+                        "localname": "MOIJONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937849/ws-services-calculation/Penalty.json b/data/as/1937849/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4047fc4796
--- /dev/null
+++ b/data/as/1937849/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937849",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937849/ws-services-calculation/WCBillingSlab.json b/data/as/1937849/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d863b86450
--- /dev/null
+++ b/data/as/1937849/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937849",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937917/BillingService/BusinessService.json b/data/as/1937917/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da7d5042cd
--- /dev/null
+++ b/data/as/1937917/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937917",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937917/egov-location/boundary-data.json b/data/as/1937917/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a83e11d9a2
--- /dev/null
+++ b/data/as/1937917/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937917",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ  BARBHITA PWSS",
+                "localname": "NIZ  BARBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ  BARBHITA PWSS",
+                        "localname": "NIZ  BARBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ  BARBHITA PWSS",
+                "localname": "NIZ  BARBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ  BARBHITA PWSS",
+                        "localname": "NIZ  BARBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937917/ws-services-calculation/Penalty.json b/data/as/1937917/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..12faecf485
--- /dev/null
+++ b/data/as/1937917/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937917",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937917/ws-services-calculation/WCBillingSlab.json b/data/as/1937917/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48b3fdc81e
--- /dev/null
+++ b/data/as/1937917/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937917",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937928/BillingService/BusinessService.json b/data/as/1937928/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ac301c17a
--- /dev/null
+++ b/data/as/1937928/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937928",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937928/egov-location/boundary-data.json b/data/as/1937928/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50b22e0485
--- /dev/null
+++ b/data/as/1937928/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937928",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERMOHRA PWSS",
+                "localname": "KHERMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937928",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERMOHRA PWSS",
+                        "localname": "KHERMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERMOHRA PWSS",
+                "localname": "KHERMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937928",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERMOHRA PWSS",
+                        "localname": "KHERMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937928/ws-services-calculation/Penalty.json b/data/as/1937928/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5cd795ed3
--- /dev/null
+++ b/data/as/1937928/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937928",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937928/ws-services-calculation/WCBillingSlab.json b/data/as/1937928/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e48218fd4c
--- /dev/null
+++ b/data/as/1937928/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937928",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937948/BillingService/BusinessService.json b/data/as/1937948/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8dd616a177
--- /dev/null
+++ b/data/as/1937948/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937948",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937948/egov-location/boundary-data.json b/data/as/1937948/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e0746908ca
--- /dev/null
+++ b/data/as/1937948/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937948",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GURIA PWSS",
+                "localname": "GURIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GURIA PWSS",
+                        "localname": "GURIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GURIA PWSS",
+                "localname": "GURIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GURIA PWSS",
+                        "localname": "GURIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937948/ws-services-calculation/Penalty.json b/data/as/1937948/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f974ec7784
--- /dev/null
+++ b/data/as/1937948/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937948",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937948/ws-services-calculation/WCBillingSlab.json b/data/as/1937948/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..28e585fe56
--- /dev/null
+++ b/data/as/1937948/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937948",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937960/BillingService/BusinessService.json b/data/as/1937960/BillingService/BusinessService.json
new file mode 100644
index 0000000000..40fe461454
--- /dev/null
+++ b/data/as/1937960/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1937960",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937960/egov-location/boundary-data.json b/data/as/1937960/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ebbe1cd0e
--- /dev/null
+++ b/data/as/1937960/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1937960",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA PAHARTOLI PWSS",
+                "localname": "NALANGA PAHARTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA PAHARTOLI PWSS",
+                        "localname": "NALANGA PAHARTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA PAHARTOLI PWSS",
+                "localname": "NALANGA PAHARTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1937960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA PAHARTOLI PWSS",
+                        "localname": "NALANGA PAHARTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937960/ws-services-calculation/Penalty.json b/data/as/1937960/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e7711ee1cd
--- /dev/null
+++ b/data/as/1937960/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1937960",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1937960/ws-services-calculation/WCBillingSlab.json b/data/as/1937960/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..35b0c7c717
--- /dev/null
+++ b/data/as/1937960/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1937960",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941516/BillingService/BusinessService.json b/data/as/1941516/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd704c16b6
--- /dev/null
+++ b/data/as/1941516/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1941516",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941516/egov-location/boundary-data.json b/data/as/1941516/egov-location/boundary-data.json
new file mode 100644
index 0000000000..987f0da58e
--- /dev/null
+++ b/data/as/1941516/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1941516",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAYASTHAPARA PWSS",
+                "localname": "KAYASTHAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAYASTHAPARA PWSS",
+                        "localname": "KAYASTHAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAYASTHAPARA PWSS",
+                "localname": "KAYASTHAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAYASTHAPARA PWSS",
+                        "localname": "KAYASTHAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941516/ws-services-calculation/Penalty.json b/data/as/1941516/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9720ae7f10
--- /dev/null
+++ b/data/as/1941516/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1941516",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941516/ws-services-calculation/WCBillingSlab.json b/data/as/1941516/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..933878d9eb
--- /dev/null
+++ b/data/as/1941516/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1941516",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941535/BillingService/BusinessService.json b/data/as/1941535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f8d04230d3
--- /dev/null
+++ b/data/as/1941535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1941535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941535/egov-location/boundary-data.json b/data/as/1941535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce96377a5b
--- /dev/null
+++ b/data/as/1941535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1941535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUHIARBARI PWSS",
+                "localname": "KUHIARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUHIARBARI PWSS",
+                        "localname": "KUHIARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUHIARBARI PWSS",
+                "localname": "KUHIARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUHIARBARI PWSS",
+                        "localname": "KUHIARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941535/ws-services-calculation/Penalty.json b/data/as/1941535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1d1deb176d
--- /dev/null
+++ b/data/as/1941535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1941535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941535/ws-services-calculation/WCBillingSlab.json b/data/as/1941535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48a274ec7a
--- /dev/null
+++ b/data/as/1941535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1941535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941750/BillingService/BusinessService.json b/data/as/1941750/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc67fae1cf
--- /dev/null
+++ b/data/as/1941750/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1941750",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941750/egov-location/boundary-data.json b/data/as/1941750/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9a7d3ede32
--- /dev/null
+++ b/data/as/1941750/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1941750",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATAIMARI PWSS",
+                "localname": "CHATAIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941750",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATAIMARI PWSS",
+                        "localname": "CHATAIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATAIMARI PWSS",
+                "localname": "CHATAIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941750",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATAIMARI PWSS",
+                        "localname": "CHATAIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941750/ws-services-calculation/Penalty.json b/data/as/1941750/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6fc4f8056e
--- /dev/null
+++ b/data/as/1941750/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1941750",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941750/ws-services-calculation/WCBillingSlab.json b/data/as/1941750/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e87b85936
--- /dev/null
+++ b/data/as/1941750/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1941750",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941769/BillingService/BusinessService.json b/data/as/1941769/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88b542a2e8
--- /dev/null
+++ b/data/as/1941769/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1941769",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941769/egov-location/boundary-data.json b/data/as/1941769/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d1e0c14b5
--- /dev/null
+++ b/data/as/1941769/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1941769",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUMAIJHAR PWSS",
+                "localname": "GUMAIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUMAIJHAR PWSS",
+                        "localname": "GUMAIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUMAIJHAR PWSS",
+                "localname": "GUMAIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUMAIJHAR PWSS",
+                        "localname": "GUMAIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941769/ws-services-calculation/Penalty.json b/data/as/1941769/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..50db05a526
--- /dev/null
+++ b/data/as/1941769/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1941769",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941769/ws-services-calculation/WCBillingSlab.json b/data/as/1941769/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..75040a3585
--- /dev/null
+++ b/data/as/1941769/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1941769",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941788/BillingService/BusinessService.json b/data/as/1941788/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56f5c54462
--- /dev/null
+++ b/data/as/1941788/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1941788",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941788/egov-location/boundary-data.json b/data/as/1941788/egov-location/boundary-data.json
new file mode 100644
index 0000000000..833b009cfb
--- /dev/null
+++ b/data/as/1941788/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1941788",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOREMARI PWSS",
+                "localname": "GOREMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOREMARI PWSS",
+                        "localname": "GOREMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOREMARI PWSS",
+                "localname": "GOREMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOREMARI PWSS",
+                        "localname": "GOREMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941788/ws-services-calculation/Penalty.json b/data/as/1941788/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8660dd051f
--- /dev/null
+++ b/data/as/1941788/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1941788",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941788/ws-services-calculation/WCBillingSlab.json b/data/as/1941788/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d3cb315a71
--- /dev/null
+++ b/data/as/1941788/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1941788",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941850/BillingService/BusinessService.json b/data/as/1941850/BillingService/BusinessService.json
new file mode 100644
index 0000000000..899eb95ef1
--- /dev/null
+++ b/data/as/1941850/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1941850",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941850/egov-location/boundary-data.json b/data/as/1941850/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9eb5739b45
--- /dev/null
+++ b/data/as/1941850/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1941850",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ASUDUBI PWSS",
+                "localname": "ASUDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ASUDUBI PWSS",
+                        "localname": "ASUDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ASUDUBI PWSS",
+                "localname": "ASUDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1941850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ASUDUBI PWSS",
+                        "localname": "ASUDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941850/ws-services-calculation/Penalty.json b/data/as/1941850/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62676e5cf7
--- /dev/null
+++ b/data/as/1941850/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1941850",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1941850/ws-services-calculation/WCBillingSlab.json b/data/as/1941850/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..73133bc566
--- /dev/null
+++ b/data/as/1941850/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1941850",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1970469/BillingService/BusinessService.json b/data/as/1970469/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b1ce2126a
--- /dev/null
+++ b/data/as/1970469/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.1970469",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1970469/egov-location/boundary-data.json b/data/as/1970469/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4367137f62
--- /dev/null
+++ b/data/as/1970469/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.1970469",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDIKORAI -I  PWSS",
+                "localname": "BORDIKORAI -I  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1970469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDIKORAI -I  PWSS",
+                        "localname": "BORDIKORAI -I  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDIKORAI -I  PWSS",
+                "localname": "BORDIKORAI -I  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.1970469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDIKORAI -I  PWSS",
+                        "localname": "BORDIKORAI -I  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1970469/ws-services-calculation/Penalty.json b/data/as/1970469/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d12f4792d
--- /dev/null
+++ b/data/as/1970469/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.1970469",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/1970469/ws-services-calculation/WCBillingSlab.json b/data/as/1970469/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d9fe875be5
--- /dev/null
+++ b/data/as/1970469/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.1970469",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404395/BillingService/BusinessService.json b/data/as/2404395/BillingService/BusinessService.json
new file mode 100644
index 0000000000..048cac68d5
--- /dev/null
+++ b/data/as/2404395/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2404395",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404395/egov-location/boundary-data.json b/data/as/2404395/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87ff809151
--- /dev/null
+++ b/data/as/2404395/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2404395",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAHARI PWSS",
+                "localname": "SAHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2404395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAHARI PWSS",
+                        "localname": "SAHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAHARI PWSS",
+                "localname": "SAHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2404395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAHARI PWSS",
+                        "localname": "SAHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404395/ws-services-calculation/Penalty.json b/data/as/2404395/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fa8fb5e4ad
--- /dev/null
+++ b/data/as/2404395/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2404395",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404395/ws-services-calculation/WCBillingSlab.json b/data/as/2404395/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1a81cc5284
--- /dev/null
+++ b/data/as/2404395/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2404395",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404401/BillingService/BusinessService.json b/data/as/2404401/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c956b98b28
--- /dev/null
+++ b/data/as/2404401/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2404401",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404401/egov-location/boundary-data.json b/data/as/2404401/egov-location/boundary-data.json
new file mode 100644
index 0000000000..387c6ee708
--- /dev/null
+++ b/data/as/2404401/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2404401",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA PWSS",
+                "localname": "MANUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2404401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA PWSS",
+                        "localname": "MANUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA PWSS",
+                "localname": "MANUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2404401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA PWSS",
+                        "localname": "MANUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404401/ws-services-calculation/Penalty.json b/data/as/2404401/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a15bf39f60
--- /dev/null
+++ b/data/as/2404401/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2404401",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404401/ws-services-calculation/WCBillingSlab.json b/data/as/2404401/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3843dd75d6
--- /dev/null
+++ b/data/as/2404401/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2404401",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404437/BillingService/BusinessService.json b/data/as/2404437/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f5af73562d
--- /dev/null
+++ b/data/as/2404437/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2404437",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404437/egov-location/boundary-data.json b/data/as/2404437/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e32f8f848
--- /dev/null
+++ b/data/as/2404437/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2404437",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLABARI PWSS",
+                "localname": "SIMLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2404437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLABARI PWSS",
+                        "localname": "SIMLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLABARI PWSS",
+                "localname": "SIMLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2404437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLABARI PWSS",
+                        "localname": "SIMLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404437/ws-services-calculation/Penalty.json b/data/as/2404437/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ba0eb661e2
--- /dev/null
+++ b/data/as/2404437/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2404437",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2404437/ws-services-calculation/WCBillingSlab.json b/data/as/2404437/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..75167efbca
--- /dev/null
+++ b/data/as/2404437/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2404437",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2405228/BillingService/BusinessService.json b/data/as/2405228/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e625c87b0b
--- /dev/null
+++ b/data/as/2405228/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2405228",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2405228/egov-location/boundary-data.json b/data/as/2405228/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e30c7e8c6d
--- /dev/null
+++ b/data/as/2405228/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2405228",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADOPARA SARDARPARA PWSS",
+                "localname": "ADOPARA SARDARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2405228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADOPARA SARDARPARA PWSS",
+                        "localname": "ADOPARA SARDARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADOPARA SARDARPARA PWSS",
+                "localname": "ADOPARA SARDARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2405228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADOPARA SARDARPARA PWSS",
+                        "localname": "ADOPARA SARDARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2405228/ws-services-calculation/Penalty.json b/data/as/2405228/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..707168f7de
--- /dev/null
+++ b/data/as/2405228/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2405228",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2405228/ws-services-calculation/WCBillingSlab.json b/data/as/2405228/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..36aa683e29
--- /dev/null
+++ b/data/as/2405228/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2405228",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2406004/BillingService/BusinessService.json b/data/as/2406004/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01edb80a1a
--- /dev/null
+++ b/data/as/2406004/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2406004",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2406004/egov-location/boundary-data.json b/data/as/2406004/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71db435c51
--- /dev/null
+++ b/data/as/2406004/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2406004",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUZA PWSS",
+                "localname": "KHARMUZA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2406004",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUZA PWSS",
+                        "localname": "KHARMUZA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUZA PWSS",
+                "localname": "KHARMUZA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2406004",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUZA PWSS",
+                        "localname": "KHARMUZA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2406004/ws-services-calculation/Penalty.json b/data/as/2406004/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3804379b9
--- /dev/null
+++ b/data/as/2406004/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2406004",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2406004/ws-services-calculation/WCBillingSlab.json b/data/as/2406004/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b03f8e9531
--- /dev/null
+++ b/data/as/2406004/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2406004",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421895/BillingService/BusinessService.json b/data/as/2421895/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4210d53bb3
--- /dev/null
+++ b/data/as/2421895/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2421895",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421895/egov-location/boundary-data.json b/data/as/2421895/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8db47aae2
--- /dev/null
+++ b/data/as/2421895/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2421895",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUGUDOBA PWSS",
+                "localname": "GHUGUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUGUDOBA PWSS",
+                        "localname": "GHUGUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUGUDOBA PWSS",
+                "localname": "GHUGUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUGUDOBA PWSS",
+                        "localname": "GHUGUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421895/ws-services-calculation/Penalty.json b/data/as/2421895/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a06c2802d1
--- /dev/null
+++ b/data/as/2421895/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2421895",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421895/ws-services-calculation/WCBillingSlab.json b/data/as/2421895/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..63e41f9e87
--- /dev/null
+++ b/data/as/2421895/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2421895",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421903/BillingService/BusinessService.json b/data/as/2421903/BillingService/BusinessService.json
new file mode 100644
index 0000000000..78528769df
--- /dev/null
+++ b/data/as/2421903/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2421903",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421903/egov-location/boundary-data.json b/data/as/2421903/egov-location/boundary-data.json
new file mode 100644
index 0000000000..24644b6667
--- /dev/null
+++ b/data/as/2421903/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2421903",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURUABHASA PWSS",
+                "localname": "KURUABHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421903",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURUABHASA PWSS",
+                        "localname": "KURUABHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURUABHASA PWSS",
+                "localname": "KURUABHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421903",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURUABHASA PWSS",
+                        "localname": "KURUABHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421903/ws-services-calculation/Penalty.json b/data/as/2421903/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d65642489c
--- /dev/null
+++ b/data/as/2421903/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2421903",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421903/ws-services-calculation/WCBillingSlab.json b/data/as/2421903/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..678abea77c
--- /dev/null
+++ b/data/as/2421903/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2421903",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421911/BillingService/BusinessService.json b/data/as/2421911/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11358e1eff
--- /dev/null
+++ b/data/as/2421911/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2421911",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421911/egov-location/boundary-data.json b/data/as/2421911/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c9700c93a
--- /dev/null
+++ b/data/as/2421911/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2421911",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANDUBI PWSS",
+                "localname": "MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421911",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANDUBI PWSS",
+                        "localname": "MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANDUBI PWSS",
+                "localname": "MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421911",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANDUBI PWSS",
+                        "localname": "MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421911/ws-services-calculation/Penalty.json b/data/as/2421911/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0bb2d6b6f7
--- /dev/null
+++ b/data/as/2421911/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2421911",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421911/ws-services-calculation/WCBillingSlab.json b/data/as/2421911/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b13ab7922e
--- /dev/null
+++ b/data/as/2421911/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2421911",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421922/BillingService/BusinessService.json b/data/as/2421922/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9d62c4616b
--- /dev/null
+++ b/data/as/2421922/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2421922",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421922/egov-location/boundary-data.json b/data/as/2421922/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8fe921b65b
--- /dev/null
+++ b/data/as/2421922/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2421922",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAIKAN PWSS",
+                "localname": "PAIKAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAIKAN PWSS",
+                        "localname": "PAIKAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAIKAN PWSS",
+                "localname": "PAIKAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2421922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAIKAN PWSS",
+                        "localname": "PAIKAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421922/ws-services-calculation/Penalty.json b/data/as/2421922/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40ddbe3d61
--- /dev/null
+++ b/data/as/2421922/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2421922",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2421922/ws-services-calculation/WCBillingSlab.json b/data/as/2421922/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..628b6b9b90
--- /dev/null
+++ b/data/as/2421922/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2421922",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2423434/BillingService/BusinessService.json b/data/as/2423434/BillingService/BusinessService.json
new file mode 100644
index 0000000000..088ab67336
--- /dev/null
+++ b/data/as/2423434/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2423434",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2423434/egov-location/boundary-data.json b/data/as/2423434/egov-location/boundary-data.json
new file mode 100644
index 0000000000..453125ef45
--- /dev/null
+++ b/data/as/2423434/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2423434",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUPERIBHITA PWSS",
+                "localname": "SUPERIBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2423434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUPERIBHITA PWSS",
+                        "localname": "SUPERIBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUPERIBHITA PWSS",
+                "localname": "SUPERIBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2423434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUPERIBHITA PWSS",
+                        "localname": "SUPERIBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2423434/ws-services-calculation/Penalty.json b/data/as/2423434/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..322ab78879
--- /dev/null
+++ b/data/as/2423434/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2423434",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2423434/ws-services-calculation/WCBillingSlab.json b/data/as/2423434/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5facc45329
--- /dev/null
+++ b/data/as/2423434/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2423434",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2426035/BillingService/BusinessService.json b/data/as/2426035/BillingService/BusinessService.json
new file mode 100644
index 0000000000..67b9c43c91
--- /dev/null
+++ b/data/as/2426035/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2426035",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2426035/egov-location/boundary-data.json b/data/as/2426035/egov-location/boundary-data.json
new file mode 100644
index 0000000000..286979f708
--- /dev/null
+++ b/data/as/2426035/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2426035",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGIA PWSS",
+                "localname": "AGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2426035",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGIA PWSS",
+                        "localname": "AGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGIA PWSS",
+                "localname": "AGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2426035",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGIA PWSS",
+                        "localname": "AGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2426035/ws-services-calculation/Penalty.json b/data/as/2426035/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bdbff77397
--- /dev/null
+++ b/data/as/2426035/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2426035",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2426035/ws-services-calculation/WCBillingSlab.json b/data/as/2426035/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22fd113993
--- /dev/null
+++ b/data/as/2426035/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2426035",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2429111/BillingService/BusinessService.json b/data/as/2429111/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c155b3ccee
--- /dev/null
+++ b/data/as/2429111/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2429111",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2429111/egov-location/boundary-data.json b/data/as/2429111/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c7fea661f
--- /dev/null
+++ b/data/as/2429111/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2429111",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CONST. OF DHULAPADUNG PWSS",
+                "localname": "CONST. OF DHULAPADUNG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2429111",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CONST. OF DHULAPADUNG PWSS",
+                        "localname": "CONST. OF DHULAPADUNG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CONST. OF DHULAPADUNG PWSS",
+                "localname": "CONST. OF DHULAPADUNG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2429111",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CONST. OF DHULAPADUNG PWSS",
+                        "localname": "CONST. OF DHULAPADUNG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2429111/ws-services-calculation/Penalty.json b/data/as/2429111/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81fcd6556e
--- /dev/null
+++ b/data/as/2429111/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2429111",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2429111/ws-services-calculation/WCBillingSlab.json b/data/as/2429111/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..26901789a5
--- /dev/null
+++ b/data/as/2429111/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2429111",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2433896/BillingService/BusinessService.json b/data/as/2433896/BillingService/BusinessService.json
new file mode 100644
index 0000000000..094e8a1bb9
--- /dev/null
+++ b/data/as/2433896/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2433896",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2433896/egov-location/boundary-data.json b/data/as/2433896/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40af7de6af
--- /dev/null
+++ b/data/as/2433896/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2433896",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PT-III PWSS",
+                "localname": "AMBARI PT-III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2433896",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PT-III PWSS",
+                        "localname": "AMBARI PT-III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PT-III PWSS",
+                "localname": "AMBARI PT-III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2433896",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PT-III PWSS",
+                        "localname": "AMBARI PT-III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2433896/ws-services-calculation/Penalty.json b/data/as/2433896/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..235b3df577
--- /dev/null
+++ b/data/as/2433896/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2433896",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2433896/ws-services-calculation/WCBillingSlab.json b/data/as/2433896/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..570d67699c
--- /dev/null
+++ b/data/as/2433896/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2433896",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2443383/BillingService/BusinessService.json b/data/as/2443383/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e6facb284f
--- /dev/null
+++ b/data/as/2443383/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2443383",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2443383/egov-location/boundary-data.json b/data/as/2443383/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a572c8061
--- /dev/null
+++ b/data/as/2443383/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2443383",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAHIKATA PWSS",
+                "localname": "DAHIKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2443383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAHIKATA PWSS",
+                        "localname": "DAHIKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAHIKATA PWSS",
+                "localname": "DAHIKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2443383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAHIKATA PWSS",
+                        "localname": "DAHIKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2443383/ws-services-calculation/Penalty.json b/data/as/2443383/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..127b67033e
--- /dev/null
+++ b/data/as/2443383/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2443383",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2443383/ws-services-calculation/WCBillingSlab.json b/data/as/2443383/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f3c18b3dc0
--- /dev/null
+++ b/data/as/2443383/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2443383",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480357/BillingService/BusinessService.json b/data/as/2480357/BillingService/BusinessService.json
new file mode 100644
index 0000000000..12acb0c82b
--- /dev/null
+++ b/data/as/2480357/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2480357",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480357/egov-location/boundary-data.json b/data/as/2480357/egov-location/boundary-data.json
new file mode 100644
index 0000000000..989f3d5904
--- /dev/null
+++ b/data/as/2480357/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2480357",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARY P.W.S.S.",
+                "localname": "PUTHIMARY P.W.S.S.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2480357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARY P.W.S.S.",
+                        "localname": "PUTHIMARY P.W.S.S.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARY P.W.S.S.",
+                "localname": "PUTHIMARY P.W.S.S.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2480357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARY P.W.S.S.",
+                        "localname": "PUTHIMARY P.W.S.S.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480357/ws-services-calculation/Penalty.json b/data/as/2480357/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e38b10475
--- /dev/null
+++ b/data/as/2480357/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2480357",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480357/ws-services-calculation/WCBillingSlab.json b/data/as/2480357/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c094c2a41
--- /dev/null
+++ b/data/as/2480357/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2480357",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480363/BillingService/BusinessService.json b/data/as/2480363/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45fb45e772
--- /dev/null
+++ b/data/as/2480363/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2480363",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480363/egov-location/boundary-data.json b/data/as/2480363/egov-location/boundary-data.json
new file mode 100644
index 0000000000..909e7a0adb
--- /dev/null
+++ b/data/as/2480363/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2480363",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORMARA KACHARI",
+                "localname": "GORMARA KACHARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2480363",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORMARA KACHARI",
+                        "localname": "GORMARA KACHARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORMARA KACHARI",
+                "localname": "GORMARA KACHARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2480363",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORMARA KACHARI",
+                        "localname": "GORMARA KACHARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480363/ws-services-calculation/Penalty.json b/data/as/2480363/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b6f232a8e
--- /dev/null
+++ b/data/as/2480363/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2480363",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2480363/ws-services-calculation/WCBillingSlab.json b/data/as/2480363/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf0b0ca2ee
--- /dev/null
+++ b/data/as/2480363/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2480363",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484676/BillingService/BusinessService.json b/data/as/2484676/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bf70c43ada
--- /dev/null
+++ b/data/as/2484676/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2484676",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484676/egov-location/boundary-data.json b/data/as/2484676/egov-location/boundary-data.json
new file mode 100644
index 0000000000..61cc9c340b
--- /dev/null
+++ b/data/as/2484676/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2484676",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ORIANTOLI PWSS",
+                "localname": "ORIANTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2484676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ORIANTOLI PWSS",
+                        "localname": "ORIANTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ORIANTOLI PWSS",
+                "localname": "ORIANTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2484676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ORIANTOLI PWSS",
+                        "localname": "ORIANTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484676/ws-services-calculation/Penalty.json b/data/as/2484676/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d004d4b6f
--- /dev/null
+++ b/data/as/2484676/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2484676",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484676/ws-services-calculation/WCBillingSlab.json b/data/as/2484676/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..83c42e38a3
--- /dev/null
+++ b/data/as/2484676/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2484676",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484678/BillingService/BusinessService.json b/data/as/2484678/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7ec7ba199b
--- /dev/null
+++ b/data/as/2484678/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2484678",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484678/egov-location/boundary-data.json b/data/as/2484678/egov-location/boundary-data.json
new file mode 100644
index 0000000000..688e013bee
--- /dev/null
+++ b/data/as/2484678/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2484678",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYNAGAR PWSS",
+                "localname": "JOYNAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2484678",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYNAGAR PWSS",
+                        "localname": "JOYNAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYNAGAR PWSS",
+                "localname": "JOYNAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2484678",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYNAGAR PWSS",
+                        "localname": "JOYNAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484678/ws-services-calculation/Penalty.json b/data/as/2484678/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a77d78de0e
--- /dev/null
+++ b/data/as/2484678/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2484678",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2484678/ws-services-calculation/WCBillingSlab.json b/data/as/2484678/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..efd1b17897
--- /dev/null
+++ b/data/as/2484678/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2484678",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2486691/BillingService/BusinessService.json b/data/as/2486691/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7007bc7d73
--- /dev/null
+++ b/data/as/2486691/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2486691",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2486691/egov-location/boundary-data.json b/data/as/2486691/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aac4b3096a
--- /dev/null
+++ b/data/as/2486691/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2486691",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENGENAJULI PWSS",
+                "localname": "BENGENAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2486691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENGENAJULI PWSS",
+                        "localname": "BENGENAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENGENAJULI PWSS",
+                "localname": "BENGENAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2486691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENGENAJULI PWSS",
+                        "localname": "BENGENAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2486691/ws-services-calculation/Penalty.json b/data/as/2486691/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1db44252fc
--- /dev/null
+++ b/data/as/2486691/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2486691",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2486691/ws-services-calculation/WCBillingSlab.json b/data/as/2486691/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..985e02c398
--- /dev/null
+++ b/data/as/2486691/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2486691",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2491893/BillingService/BusinessService.json b/data/as/2491893/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c1b5ae7c1a
--- /dev/null
+++ b/data/as/2491893/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2491893",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2491893/egov-location/boundary-data.json b/data/as/2491893/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97b3386072
--- /dev/null
+++ b/data/as/2491893/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2491893",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGDOBA PWSS",
+                "localname": "BAGDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2491893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGDOBA PWSS",
+                        "localname": "BAGDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGDOBA PWSS",
+                "localname": "BAGDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2491893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGDOBA PWSS",
+                        "localname": "BAGDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2491893/ws-services-calculation/Penalty.json b/data/as/2491893/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c4c62b020
--- /dev/null
+++ b/data/as/2491893/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2491893",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2491893/ws-services-calculation/WCBillingSlab.json b/data/as/2491893/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32b3d716f0
--- /dev/null
+++ b/data/as/2491893/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2491893",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2495922/BillingService/BusinessService.json b/data/as/2495922/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98781dfd1c
--- /dev/null
+++ b/data/as/2495922/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2495922",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2495922/egov-location/boundary-data.json b/data/as/2495922/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60fe1aefef
--- /dev/null
+++ b/data/as/2495922/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2495922",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOUR NAGAR PWSS",
+                "localname": "GOUR NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2495922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOUR NAGAR PWSS",
+                        "localname": "GOUR NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOUR NAGAR PWSS",
+                "localname": "GOUR NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2495922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOUR NAGAR PWSS",
+                        "localname": "GOUR NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2495922/ws-services-calculation/Penalty.json b/data/as/2495922/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ae78b95460
--- /dev/null
+++ b/data/as/2495922/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2495922",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2495922/ws-services-calculation/WCBillingSlab.json b/data/as/2495922/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3bc19442e9
--- /dev/null
+++ b/data/as/2495922/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2495922",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496124/BillingService/BusinessService.json b/data/as/2496124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c956ee7d2
--- /dev/null
+++ b/data/as/2496124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2496124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496124/egov-location/boundary-data.json b/data/as/2496124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc0313b6ed
--- /dev/null
+++ b/data/as/2496124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2496124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI PWSS",
+                "localname": "BHALUKDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2496124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI PWSS",
+                        "localname": "BHALUKDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI PWSS",
+                "localname": "BHALUKDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2496124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI PWSS",
+                        "localname": "BHALUKDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496124/ws-services-calculation/Penalty.json b/data/as/2496124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a9aaab19a1
--- /dev/null
+++ b/data/as/2496124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2496124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496124/ws-services-calculation/WCBillingSlab.json b/data/as/2496124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d4ae978aea
--- /dev/null
+++ b/data/as/2496124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2496124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496136/BillingService/BusinessService.json b/data/as/2496136/BillingService/BusinessService.json
new file mode 100644
index 0000000000..83992e18e5
--- /dev/null
+++ b/data/as/2496136/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2496136",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496136/egov-location/boundary-data.json b/data/as/2496136/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b1d28e52e
--- /dev/null
+++ b/data/as/2496136/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2496136",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KRISHNAI PWSS",
+                "localname": "KRISHNAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2496136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KRISHNAI PWSS",
+                        "localname": "KRISHNAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KRISHNAI PWSS",
+                "localname": "KRISHNAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2496136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KRISHNAI PWSS",
+                        "localname": "KRISHNAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496136/ws-services-calculation/Penalty.json b/data/as/2496136/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..516b7f9e08
--- /dev/null
+++ b/data/as/2496136/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2496136",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2496136/ws-services-calculation/WCBillingSlab.json b/data/as/2496136/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7afdba7868
--- /dev/null
+++ b/data/as/2496136/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2496136",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2497758/BillingService/BusinessService.json b/data/as/2497758/BillingService/BusinessService.json
new file mode 100644
index 0000000000..49ed067193
--- /dev/null
+++ b/data/as/2497758/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2497758",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2497758/egov-location/boundary-data.json b/data/as/2497758/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb915c9074
--- /dev/null
+++ b/data/as/2497758/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2497758",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPUBHETI P.W.S.S.",
+                "localname": "BAPUBHETI P.W.S.S.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2497758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPUBHETI P.W.S.S.",
+                        "localname": "BAPUBHETI P.W.S.S.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPUBHETI P.W.S.S.",
+                "localname": "BAPUBHETI P.W.S.S.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2497758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPUBHETI P.W.S.S.",
+                        "localname": "BAPUBHETI P.W.S.S.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2497758/ws-services-calculation/Penalty.json b/data/as/2497758/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d0182876bb
--- /dev/null
+++ b/data/as/2497758/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2497758",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2497758/ws-services-calculation/WCBillingSlab.json b/data/as/2497758/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ffdb68f929
--- /dev/null
+++ b/data/as/2497758/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2497758",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515923/BillingService/BusinessService.json b/data/as/2515923/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ff0d1666e1
--- /dev/null
+++ b/data/as/2515923/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2515923",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515923/egov-location/boundary-data.json b/data/as/2515923/egov-location/boundary-data.json
new file mode 100644
index 0000000000..62aae7eb0f
--- /dev/null
+++ b/data/as/2515923/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2515923",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAUDOBA PWSS",
+                "localname": "LAUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2515923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAUDOBA PWSS",
+                        "localname": "LAUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAUDOBA PWSS",
+                "localname": "LAUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2515923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAUDOBA PWSS",
+                        "localname": "LAUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515923/ws-services-calculation/Penalty.json b/data/as/2515923/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19cffbe74d
--- /dev/null
+++ b/data/as/2515923/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2515923",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515923/ws-services-calculation/WCBillingSlab.json b/data/as/2515923/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5e5bcaaf97
--- /dev/null
+++ b/data/as/2515923/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2515923",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515942/BillingService/BusinessService.json b/data/as/2515942/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df33d0d7be
--- /dev/null
+++ b/data/as/2515942/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2515942",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515942/egov-location/boundary-data.json b/data/as/2515942/egov-location/boundary-data.json
new file mode 100644
index 0000000000..de8206b1bf
--- /dev/null
+++ b/data/as/2515942/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2515942",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIDANPUR PWSS",
+                "localname": "NIDANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2515942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIDANPUR PWSS",
+                        "localname": "NIDANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIDANPUR PWSS",
+                "localname": "NIDANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2515942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIDANPUR PWSS",
+                        "localname": "NIDANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515942/ws-services-calculation/Penalty.json b/data/as/2515942/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..feec5d4e70
--- /dev/null
+++ b/data/as/2515942/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2515942",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515942/ws-services-calculation/WCBillingSlab.json b/data/as/2515942/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7dae9192a
--- /dev/null
+++ b/data/as/2515942/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2515942",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515998/BillingService/BusinessService.json b/data/as/2515998/BillingService/BusinessService.json
new file mode 100644
index 0000000000..282426ae76
--- /dev/null
+++ b/data/as/2515998/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2515998",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515998/egov-location/boundary-data.json b/data/as/2515998/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f815f4a559
--- /dev/null
+++ b/data/as/2515998/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2515998",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HELAPAKHIRI PWSS",
+                "localname": "HELAPAKHIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2515998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HELAPAKHIRI PWSS",
+                        "localname": "HELAPAKHIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HELAPAKHIRI PWSS",
+                "localname": "HELAPAKHIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2515998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HELAPAKHIRI PWSS",
+                        "localname": "HELAPAKHIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515998/ws-services-calculation/Penalty.json b/data/as/2515998/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f42620104
--- /dev/null
+++ b/data/as/2515998/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2515998",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2515998/ws-services-calculation/WCBillingSlab.json b/data/as/2515998/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a33b28620
--- /dev/null
+++ b/data/as/2515998/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2515998",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516005/BillingService/BusinessService.json b/data/as/2516005/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0903ef8d50
--- /dev/null
+++ b/data/as/2516005/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516005",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516005/egov-location/boundary-data.json b/data/as/2516005/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7a6a9a775
--- /dev/null
+++ b/data/as/2516005/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516005",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMGURI PURANPARA PWSS",
+                "localname": "AMGURI PURANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMGURI PURANPARA PWSS",
+                        "localname": "AMGURI PURANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMGURI PURANPARA PWSS",
+                "localname": "AMGURI PURANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMGURI PURANPARA PWSS",
+                        "localname": "AMGURI PURANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516005/ws-services-calculation/Penalty.json b/data/as/2516005/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca3563c96f
--- /dev/null
+++ b/data/as/2516005/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516005",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516005/ws-services-calculation/WCBillingSlab.json b/data/as/2516005/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d040c30a76
--- /dev/null
+++ b/data/as/2516005/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516005",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516013/BillingService/BusinessService.json b/data/as/2516013/BillingService/BusinessService.json
new file mode 100644
index 0000000000..18a840766d
--- /dev/null
+++ b/data/as/2516013/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516013",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516013/egov-location/boundary-data.json b/data/as/2516013/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb4f1f6ebb
--- /dev/null
+++ b/data/as/2516013/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516013",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJAPARA PWSS",
+                "localname": "RAJAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516013",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJAPARA PWSS",
+                        "localname": "RAJAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJAPARA PWSS",
+                "localname": "RAJAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516013",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJAPARA PWSS",
+                        "localname": "RAJAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516013/ws-services-calculation/Penalty.json b/data/as/2516013/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..47c9017c23
--- /dev/null
+++ b/data/as/2516013/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516013",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516013/ws-services-calculation/WCBillingSlab.json b/data/as/2516013/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6230cf2be
--- /dev/null
+++ b/data/as/2516013/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516013",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516019/BillingService/BusinessService.json b/data/as/2516019/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ddd5f71ee1
--- /dev/null
+++ b/data/as/2516019/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516019",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516019/egov-location/boundary-data.json b/data/as/2516019/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b32bffba7b
--- /dev/null
+++ b/data/as/2516019/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516019",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILA BEEL PWSS",
+                "localname": "HASILA BEEL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILA BEEL PWSS",
+                        "localname": "HASILA BEEL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILA BEEL PWSS",
+                "localname": "HASILA BEEL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILA BEEL PWSS",
+                        "localname": "HASILA BEEL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516019/ws-services-calculation/Penalty.json b/data/as/2516019/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b00bf7464
--- /dev/null
+++ b/data/as/2516019/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516019",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516019/ws-services-calculation/WCBillingSlab.json b/data/as/2516019/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b12f4268b7
--- /dev/null
+++ b/data/as/2516019/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516019",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516135/BillingService/BusinessService.json b/data/as/2516135/BillingService/BusinessService.json
new file mode 100644
index 0000000000..25e71896bd
--- /dev/null
+++ b/data/as/2516135/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516135",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516135/egov-location/boundary-data.json b/data/as/2516135/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a73f68ac88
--- /dev/null
+++ b/data/as/2516135/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516135",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEBATTAR BAPUPARA PWSS",
+                "localname": "DEBATTAR BAPUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEBATTAR BAPUPARA PWSS",
+                        "localname": "DEBATTAR BAPUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEBATTAR BAPUPARA PWSS",
+                "localname": "DEBATTAR BAPUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEBATTAR BAPUPARA PWSS",
+                        "localname": "DEBATTAR BAPUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516135/ws-services-calculation/Penalty.json b/data/as/2516135/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec04462eb9
--- /dev/null
+++ b/data/as/2516135/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516135",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516135/ws-services-calculation/WCBillingSlab.json b/data/as/2516135/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..160a8f76c2
--- /dev/null
+++ b/data/as/2516135/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516135",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516159/BillingService/BusinessService.json b/data/as/2516159/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ae9135e4f
--- /dev/null
+++ b/data/as/2516159/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516159",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516159/egov-location/boundary-data.json b/data/as/2516159/egov-location/boundary-data.json
new file mode 100644
index 0000000000..309ab284e7
--- /dev/null
+++ b/data/as/2516159/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516159",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ZIRA PWSS",
+                "localname": "ZIRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516159",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ZIRA PWSS",
+                        "localname": "ZIRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ZIRA PWSS",
+                "localname": "ZIRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516159",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ZIRA PWSS",
+                        "localname": "ZIRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516159/ws-services-calculation/Penalty.json b/data/as/2516159/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3dbb4dee61
--- /dev/null
+++ b/data/as/2516159/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516159",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516159/ws-services-calculation/WCBillingSlab.json b/data/as/2516159/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f066a99487
--- /dev/null
+++ b/data/as/2516159/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516159",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516189/BillingService/BusinessService.json b/data/as/2516189/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc3481cdf4
--- /dev/null
+++ b/data/as/2516189/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516189",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516189/egov-location/boundary-data.json b/data/as/2516189/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ded02c6186
--- /dev/null
+++ b/data/as/2516189/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516189",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNIPANIKHOWA PWSS",
+                "localname": "BAMUNIPANIKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNIPANIKHOWA PWSS",
+                        "localname": "BAMUNIPANIKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNIPANIKHOWA PWSS",
+                "localname": "BAMUNIPANIKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNIPANIKHOWA PWSS",
+                        "localname": "BAMUNIPANIKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516189/ws-services-calculation/Penalty.json b/data/as/2516189/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..083c10167a
--- /dev/null
+++ b/data/as/2516189/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516189",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516189/ws-services-calculation/WCBillingSlab.json b/data/as/2516189/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07ba1cbe13
--- /dev/null
+++ b/data/as/2516189/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516189",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516326/BillingService/BusinessService.json b/data/as/2516326/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f484d30bba
--- /dev/null
+++ b/data/as/2516326/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516326",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516326/egov-location/boundary-data.json b/data/as/2516326/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d12f96ff52
--- /dev/null
+++ b/data/as/2516326/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516326",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHRITARY  PWSS",
+                "localname": "PAKHRITARY  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516326",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHRITARY  PWSS",
+                        "localname": "PAKHRITARY  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHRITARY  PWSS",
+                "localname": "PAKHRITARY  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516326",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHRITARY  PWSS",
+                        "localname": "PAKHRITARY  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516326/ws-services-calculation/Penalty.json b/data/as/2516326/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e084e43799
--- /dev/null
+++ b/data/as/2516326/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516326",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516326/ws-services-calculation/WCBillingSlab.json b/data/as/2516326/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cb76d002fa
--- /dev/null
+++ b/data/as/2516326/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516326",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516787/BillingService/BusinessService.json b/data/as/2516787/BillingService/BusinessService.json
new file mode 100644
index 0000000000..43c83422c4
--- /dev/null
+++ b/data/as/2516787/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516787",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516787/egov-location/boundary-data.json b/data/as/2516787/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d97bccaf52
--- /dev/null
+++ b/data/as/2516787/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516787",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATABARI PWSS",
+                "localname": "BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATABARI PWSS",
+                        "localname": "BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATABARI PWSS",
+                "localname": "BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATABARI PWSS",
+                        "localname": "BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516787/ws-services-calculation/Penalty.json b/data/as/2516787/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ceede6ea6
--- /dev/null
+++ b/data/as/2516787/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516787",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516787/ws-services-calculation/WCBillingSlab.json b/data/as/2516787/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b20123ff2
--- /dev/null
+++ b/data/as/2516787/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516787",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516881/BillingService/BusinessService.json b/data/as/2516881/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09fc39d2a6
--- /dev/null
+++ b/data/as/2516881/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516881",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516881/egov-location/boundary-data.json b/data/as/2516881/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad8e3961f1
--- /dev/null
+++ b/data/as/2516881/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516881",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA PWSS",
+                "localname": "DUBAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516881",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA PWSS",
+                        "localname": "DUBAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA PWSS",
+                "localname": "DUBAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516881",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA PWSS",
+                        "localname": "DUBAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516881/ws-services-calculation/Penalty.json b/data/as/2516881/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e4e372641
--- /dev/null
+++ b/data/as/2516881/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516881",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516881/ws-services-calculation/WCBillingSlab.json b/data/as/2516881/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..44120781bd
--- /dev/null
+++ b/data/as/2516881/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516881",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516940/BillingService/BusinessService.json b/data/as/2516940/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c6a9ba047
--- /dev/null
+++ b/data/as/2516940/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2516940",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516940/egov-location/boundary-data.json b/data/as/2516940/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c638b96023
--- /dev/null
+++ b/data/as/2516940/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2516940",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARA PWSS",
+                "localname": "BALASARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516940",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARA PWSS",
+                        "localname": "BALASARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARA PWSS",
+                "localname": "BALASARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2516940",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARA PWSS",
+                        "localname": "BALASARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516940/ws-services-calculation/Penalty.json b/data/as/2516940/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f131e8af3b
--- /dev/null
+++ b/data/as/2516940/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2516940",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2516940/ws-services-calculation/WCBillingSlab.json b/data/as/2516940/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17c932f126
--- /dev/null
+++ b/data/as/2516940/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2516940",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517189/BillingService/BusinessService.json b/data/as/2517189/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41f9f209d1
--- /dev/null
+++ b/data/as/2517189/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2517189",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517189/egov-location/boundary-data.json b/data/as/2517189/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd2ec972ae
--- /dev/null
+++ b/data/as/2517189/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2517189",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAMAR RESERVE PWSS",
+                "localname": "DHAMAR RESERVE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAMAR RESERVE PWSS",
+                        "localname": "DHAMAR RESERVE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAMAR RESERVE PWSS",
+                "localname": "DHAMAR RESERVE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAMAR RESERVE PWSS",
+                        "localname": "DHAMAR RESERVE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517189/ws-services-calculation/Penalty.json b/data/as/2517189/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69ec25ff52
--- /dev/null
+++ b/data/as/2517189/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2517189",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517189/ws-services-calculation/WCBillingSlab.json b/data/as/2517189/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a13892a2a2
--- /dev/null
+++ b/data/as/2517189/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2517189",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517201/BillingService/BusinessService.json b/data/as/2517201/BillingService/BusinessService.json
new file mode 100644
index 0000000000..52a5a9eda7
--- /dev/null
+++ b/data/as/2517201/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2517201",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517201/egov-location/boundary-data.json b/data/as/2517201/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef8c613ac3
--- /dev/null
+++ b/data/as/2517201/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2517201",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDRA PWSS",
+                "localname": "GENDRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517201",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDRA PWSS",
+                        "localname": "GENDRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDRA PWSS",
+                "localname": "GENDRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517201",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDRA PWSS",
+                        "localname": "GENDRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517201/ws-services-calculation/Penalty.json b/data/as/2517201/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df5667a4f0
--- /dev/null
+++ b/data/as/2517201/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2517201",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517201/ws-services-calculation/WCBillingSlab.json b/data/as/2517201/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad47575fdb
--- /dev/null
+++ b/data/as/2517201/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2517201",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517213/BillingService/BusinessService.json b/data/as/2517213/BillingService/BusinessService.json
new file mode 100644
index 0000000000..39c940e644
--- /dev/null
+++ b/data/as/2517213/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2517213",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517213/egov-location/boundary-data.json b/data/as/2517213/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1518f51995
--- /dev/null
+++ b/data/as/2517213/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2517213",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERADUBI PWSS",
+                "localname": "GERADUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERADUBI PWSS",
+                        "localname": "GERADUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERADUBI PWSS",
+                "localname": "GERADUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERADUBI PWSS",
+                        "localname": "GERADUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517213/ws-services-calculation/Penalty.json b/data/as/2517213/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13974fafdb
--- /dev/null
+++ b/data/as/2517213/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2517213",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517213/ws-services-calculation/WCBillingSlab.json b/data/as/2517213/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8868bdc301
--- /dev/null
+++ b/data/as/2517213/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2517213",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517242/BillingService/BusinessService.json b/data/as/2517242/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c6a5bb45b
--- /dev/null
+++ b/data/as/2517242/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2517242",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517242/egov-location/boundary-data.json b/data/as/2517242/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb5a68153f
--- /dev/null
+++ b/data/as/2517242/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2517242",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADANG PT-III PWSS",
+                "localname": "MADANG PT-III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADANG PT-III PWSS",
+                        "localname": "MADANG PT-III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADANG PT-III PWSS",
+                "localname": "MADANG PT-III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADANG PT-III PWSS",
+                        "localname": "MADANG PT-III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517242/ws-services-calculation/Penalty.json b/data/as/2517242/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d7a0d17da7
--- /dev/null
+++ b/data/as/2517242/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2517242",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517242/ws-services-calculation/WCBillingSlab.json b/data/as/2517242/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6123618204
--- /dev/null
+++ b/data/as/2517242/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2517242",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517248/BillingService/BusinessService.json b/data/as/2517248/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0776c83ae9
--- /dev/null
+++ b/data/as/2517248/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2517248",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517248/egov-location/boundary-data.json b/data/as/2517248/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bac5ae8f3c
--- /dev/null
+++ b/data/as/2517248/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2517248",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHYAMAGAON PWSS",
+                "localname": "SHYAMAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517248",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHYAMAGAON PWSS",
+                        "localname": "SHYAMAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHYAMAGAON PWSS",
+                "localname": "SHYAMAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517248",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHYAMAGAON PWSS",
+                        "localname": "SHYAMAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517248/ws-services-calculation/Penalty.json b/data/as/2517248/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc620851b6
--- /dev/null
+++ b/data/as/2517248/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2517248",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517248/ws-services-calculation/WCBillingSlab.json b/data/as/2517248/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0741db4cc3
--- /dev/null
+++ b/data/as/2517248/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2517248",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517256/BillingService/BusinessService.json b/data/as/2517256/BillingService/BusinessService.json
new file mode 100644
index 0000000000..823b8cfd12
--- /dev/null
+++ b/data/as/2517256/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2517256",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517256/egov-location/boundary-data.json b/data/as/2517256/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c66eafff72
--- /dev/null
+++ b/data/as/2517256/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2517256",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THORKO PWSS",
+                "localname": "THORKO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THORKO PWSS",
+                        "localname": "THORKO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THORKO PWSS",
+                "localname": "THORKO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2517256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THORKO PWSS",
+                        "localname": "THORKO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517256/ws-services-calculation/Penalty.json b/data/as/2517256/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15635e90ad
--- /dev/null
+++ b/data/as/2517256/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2517256",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2517256/ws-services-calculation/WCBillingSlab.json b/data/as/2517256/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..57e87d04bd
--- /dev/null
+++ b/data/as/2517256/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2517256",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520036/BillingService/BusinessService.json b/data/as/2520036/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b29a662397
--- /dev/null
+++ b/data/as/2520036/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2520036",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520036/egov-location/boundary-data.json b/data/as/2520036/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bf11d386cd
--- /dev/null
+++ b/data/as/2520036/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2520036",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FARINGAPARA PWSS",
+                "localname": "FARINGAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2520036",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FARINGAPARA PWSS",
+                        "localname": "FARINGAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FARINGAPARA PWSS",
+                "localname": "FARINGAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2520036",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FARINGAPARA PWSS",
+                        "localname": "FARINGAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520036/ws-services-calculation/Penalty.json b/data/as/2520036/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ba8765902
--- /dev/null
+++ b/data/as/2520036/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2520036",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520036/ws-services-calculation/WCBillingSlab.json b/data/as/2520036/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9762e16e09
--- /dev/null
+++ b/data/as/2520036/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2520036",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520181/BillingService/BusinessService.json b/data/as/2520181/BillingService/BusinessService.json
new file mode 100644
index 0000000000..23ab231440
--- /dev/null
+++ b/data/as/2520181/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2520181",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520181/egov-location/boundary-data.json b/data/as/2520181/egov-location/boundary-data.json
new file mode 100644
index 0000000000..85391b1d38
--- /dev/null
+++ b/data/as/2520181/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2520181",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABA SALPARA PWSS",
+                "localname": "NABA SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2520181",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABA SALPARA PWSS",
+                        "localname": "NABA SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABA SALPARA PWSS",
+                "localname": "NABA SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2520181",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABA SALPARA PWSS",
+                        "localname": "NABA SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520181/ws-services-calculation/Penalty.json b/data/as/2520181/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..98c06bf599
--- /dev/null
+++ b/data/as/2520181/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2520181",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2520181/ws-services-calculation/WCBillingSlab.json b/data/as/2520181/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56c1d8d059
--- /dev/null
+++ b/data/as/2520181/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2520181",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2581909/BillingService/BusinessService.json b/data/as/2581909/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41695c8dc4
--- /dev/null
+++ b/data/as/2581909/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2581909",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2581909/egov-location/boundary-data.json b/data/as/2581909/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fce04898eb
--- /dev/null
+++ b/data/as/2581909/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2581909",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI NO.2 PWSS",
+                "localname": "SOPAI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2581909",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI NO.2 PWSS",
+                        "localname": "SOPAI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI NO.2 PWSS",
+                "localname": "SOPAI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2581909",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI NO.2 PWSS",
+                        "localname": "SOPAI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2581909/ws-services-calculation/Penalty.json b/data/as/2581909/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89d4878729
--- /dev/null
+++ b/data/as/2581909/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2581909",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2581909/ws-services-calculation/WCBillingSlab.json b/data/as/2581909/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b265eba567
--- /dev/null
+++ b/data/as/2581909/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2581909",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582386/BillingService/BusinessService.json b/data/as/2582386/BillingService/BusinessService.json
new file mode 100644
index 0000000000..54841946cb
--- /dev/null
+++ b/data/as/2582386/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2582386",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582386/egov-location/boundary-data.json b/data/as/2582386/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c291913c36
--- /dev/null
+++ b/data/as/2582386/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2582386",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKEKHOWA PWSS",
+                "localname": "BHALUKEKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2582386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKEKHOWA PWSS",
+                        "localname": "BHALUKEKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKEKHOWA PWSS",
+                "localname": "BHALUKEKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2582386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKEKHOWA PWSS",
+                        "localname": "BHALUKEKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582386/ws-services-calculation/Penalty.json b/data/as/2582386/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d910691ee
--- /dev/null
+++ b/data/as/2582386/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2582386",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582386/ws-services-calculation/WCBillingSlab.json b/data/as/2582386/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..61bd14d911
--- /dev/null
+++ b/data/as/2582386/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2582386",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582460/BillingService/BusinessService.json b/data/as/2582460/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f627777805
--- /dev/null
+++ b/data/as/2582460/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2582460",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582460/egov-location/boundary-data.json b/data/as/2582460/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d90a00c466
--- /dev/null
+++ b/data/as/2582460/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2582460",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUNPAM PWSS",
+                "localname": "NATUNPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2582460",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUNPAM PWSS",
+                        "localname": "NATUNPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUNPAM PWSS",
+                "localname": "NATUNPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2582460",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUNPAM PWSS",
+                        "localname": "NATUNPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582460/ws-services-calculation/Penalty.json b/data/as/2582460/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..75c0083e2a
--- /dev/null
+++ b/data/as/2582460/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2582460",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2582460/ws-services-calculation/WCBillingSlab.json b/data/as/2582460/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a62d0a2663
--- /dev/null
+++ b/data/as/2582460/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2582460",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2615100/BillingService/BusinessService.json b/data/as/2615100/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b98a3cb489
--- /dev/null
+++ b/data/as/2615100/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.2615100",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2615100/egov-location/boundary-data.json b/data/as/2615100/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b2a00af913
--- /dev/null
+++ b/data/as/2615100/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.2615100",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIPUKHURI PWSS",
+                "localname": "HATIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2615100",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIPUKHURI PWSS",
+                        "localname": "HATIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIPUKHURI PWSS",
+                "localname": "HATIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.2615100",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIPUKHURI PWSS",
+                        "localname": "HATIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2615100/ws-services-calculation/Penalty.json b/data/as/2615100/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4826777038
--- /dev/null
+++ b/data/as/2615100/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.2615100",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/2615100/ws-services-calculation/WCBillingSlab.json b/data/as/2615100/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..edc812f6cb
--- /dev/null
+++ b/data/as/2615100/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.2615100",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3164535/BillingService/BusinessService.json b/data/as/3164535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5866cdccb8
--- /dev/null
+++ b/data/as/3164535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3164535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3164535/egov-location/boundary-data.json b/data/as/3164535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2b4617d910
--- /dev/null
+++ b/data/as/3164535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3164535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLAIBIL PWSS",
+                "localname": "DHOLAIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3164535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLAIBIL PWSS",
+                        "localname": "DHOLAIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLAIBIL PWSS",
+                "localname": "DHOLAIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3164535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLAIBIL PWSS",
+                        "localname": "DHOLAIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3164535/ws-services-calculation/Penalty.json b/data/as/3164535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b1f6f3cc9
--- /dev/null
+++ b/data/as/3164535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3164535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3164535/ws-services-calculation/WCBillingSlab.json b/data/as/3164535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..287b21bf1e
--- /dev/null
+++ b/data/as/3164535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3164535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3319750/BillingService/BusinessService.json b/data/as/3319750/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e8b873f81b
--- /dev/null
+++ b/data/as/3319750/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3319750",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3319750/egov-location/boundary-data.json b/data/as/3319750/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dcebc2a46a
--- /dev/null
+++ b/data/as/3319750/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3319750",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABARIGAON PWSS",
+                "localname": "ADABARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3319750",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABARIGAON PWSS",
+                        "localname": "ADABARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABARIGAON PWSS",
+                "localname": "ADABARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3319750",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABARIGAON PWSS",
+                        "localname": "ADABARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3319750/ws-services-calculation/Penalty.json b/data/as/3319750/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6502b8c323
--- /dev/null
+++ b/data/as/3319750/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3319750",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3319750/ws-services-calculation/WCBillingSlab.json b/data/as/3319750/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6008d419ed
--- /dev/null
+++ b/data/as/3319750/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3319750",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321276/BillingService/BusinessService.json b/data/as/3321276/BillingService/BusinessService.json
new file mode 100644
index 0000000000..441ba952c9
--- /dev/null
+++ b/data/as/3321276/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3321276",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321276/egov-location/boundary-data.json b/data/as/3321276/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3dcd59acae
--- /dev/null
+++ b/data/as/3321276/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3321276",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMOTA PWSS",
+                "localname": "BORMOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3321276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMOTA PWSS",
+                        "localname": "BORMOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMOTA PWSS",
+                "localname": "BORMOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3321276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMOTA PWSS",
+                        "localname": "BORMOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321276/ws-services-calculation/Penalty.json b/data/as/3321276/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b33b401ee7
--- /dev/null
+++ b/data/as/3321276/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3321276",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321276/ws-services-calculation/WCBillingSlab.json b/data/as/3321276/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6b760b876
--- /dev/null
+++ b/data/as/3321276/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3321276",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321879/BillingService/BusinessService.json b/data/as/3321879/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d1a574268
--- /dev/null
+++ b/data/as/3321879/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3321879",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321879/egov-location/boundary-data.json b/data/as/3321879/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ddc87be351
--- /dev/null
+++ b/data/as/3321879/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3321879",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOMORDOLONI PWSS",
+                "localname": "SOMORDOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3321879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOMORDOLONI PWSS",
+                        "localname": "SOMORDOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOMORDOLONI PWSS",
+                "localname": "SOMORDOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3321879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOMORDOLONI PWSS",
+                        "localname": "SOMORDOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321879/ws-services-calculation/Penalty.json b/data/as/3321879/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37081b2f79
--- /dev/null
+++ b/data/as/3321879/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3321879",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3321879/ws-services-calculation/WCBillingSlab.json b/data/as/3321879/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..427905f3ce
--- /dev/null
+++ b/data/as/3321879/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3321879",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3327425/BillingService/BusinessService.json b/data/as/3327425/BillingService/BusinessService.json
new file mode 100644
index 0000000000..212de82b3c
--- /dev/null
+++ b/data/as/3327425/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3327425",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3327425/egov-location/boundary-data.json b/data/as/3327425/egov-location/boundary-data.json
new file mode 100644
index 0000000000..33915613b8
--- /dev/null
+++ b/data/as/3327425/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3327425",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHGAON PWSS",
+                "localname": "KOCHGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3327425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHGAON PWSS",
+                        "localname": "KOCHGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHGAON PWSS",
+                "localname": "KOCHGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3327425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHGAON PWSS",
+                        "localname": "KOCHGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3327425/ws-services-calculation/Penalty.json b/data/as/3327425/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b11674699
--- /dev/null
+++ b/data/as/3327425/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3327425",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3327425/ws-services-calculation/WCBillingSlab.json b/data/as/3327425/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74e7ed9cc0
--- /dev/null
+++ b/data/as/3327425/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3327425",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328455/BillingService/BusinessService.json b/data/as/3328455/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5cbb9c36f5
--- /dev/null
+++ b/data/as/3328455/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3328455",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328455/egov-location/boundary-data.json b/data/as/3328455/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef57366622
--- /dev/null
+++ b/data/as/3328455/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3328455",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIBARIBENGALI PWSS",
+                "localname": "CHOIBARIBENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIBARIBENGALI PWSS",
+                        "localname": "CHOIBARIBENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIBARIBENGALI PWSS",
+                "localname": "CHOIBARIBENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIBARIBENGALI PWSS",
+                        "localname": "CHOIBARIBENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328455/ws-services-calculation/Penalty.json b/data/as/3328455/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b98b04eaa
--- /dev/null
+++ b/data/as/3328455/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3328455",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328455/ws-services-calculation/WCBillingSlab.json b/data/as/3328455/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..430f2fedae
--- /dev/null
+++ b/data/as/3328455/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3328455",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328647/BillingService/BusinessService.json b/data/as/3328647/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd4fd23ddb
--- /dev/null
+++ b/data/as/3328647/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3328647",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328647/egov-location/boundary-data.json b/data/as/3328647/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d30681e255
--- /dev/null
+++ b/data/as/3328647/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3328647",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAI T E NLR 4/6 PWSS",
+                "localname": "DIKORAI T E NLR 4/6 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328647",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAI T E NLR 4/6 PWSS",
+                        "localname": "DIKORAI T E NLR 4/6 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAI T E NLR 4/6 PWSS",
+                "localname": "DIKORAI T E NLR 4/6 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328647",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAI T E NLR 4/6 PWSS",
+                        "localname": "DIKORAI T E NLR 4/6 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328647/ws-services-calculation/Penalty.json b/data/as/3328647/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3440be8760
--- /dev/null
+++ b/data/as/3328647/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3328647",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328647/ws-services-calculation/WCBillingSlab.json b/data/as/3328647/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e483d45566
--- /dev/null
+++ b/data/as/3328647/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3328647",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328767/BillingService/BusinessService.json b/data/as/3328767/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da14132c78
--- /dev/null
+++ b/data/as/3328767/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3328767",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328767/egov-location/boundary-data.json b/data/as/3328767/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc85cabbe4
--- /dev/null
+++ b/data/as/3328767/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3328767",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGAMARI PWSS",
+                "localname": "CHENGAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGAMARI PWSS",
+                        "localname": "CHENGAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGAMARI PWSS",
+                "localname": "CHENGAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGAMARI PWSS",
+                        "localname": "CHENGAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328767/ws-services-calculation/Penalty.json b/data/as/3328767/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7201023b33
--- /dev/null
+++ b/data/as/3328767/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3328767",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328767/ws-services-calculation/WCBillingSlab.json b/data/as/3328767/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..da89328bfe
--- /dev/null
+++ b/data/as/3328767/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3328767",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328873/BillingService/BusinessService.json b/data/as/3328873/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b0eff0259c
--- /dev/null
+++ b/data/as/3328873/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3328873",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328873/egov-location/boundary-data.json b/data/as/3328873/egov-location/boundary-data.json
new file mode 100644
index 0000000000..190c024a81
--- /dev/null
+++ b/data/as/3328873/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3328873",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAHCHORA PWSS",
+                "localname": "HAHCHORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328873",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAHCHORA PWSS",
+                        "localname": "HAHCHORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAHCHORA PWSS",
+                "localname": "HAHCHORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3328873",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAHCHORA PWSS",
+                        "localname": "HAHCHORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328873/ws-services-calculation/Penalty.json b/data/as/3328873/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8f0a1725e5
--- /dev/null
+++ b/data/as/3328873/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3328873",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3328873/ws-services-calculation/WCBillingSlab.json b/data/as/3328873/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ace867c5da
--- /dev/null
+++ b/data/as/3328873/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3328873",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3333586/BillingService/BusinessService.json b/data/as/3333586/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb976b4119
--- /dev/null
+++ b/data/as/3333586/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3333586",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3333586/egov-location/boundary-data.json b/data/as/3333586/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6b137dc8da
--- /dev/null
+++ b/data/as/3333586/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3333586",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERBHERI PWSS",
+                "localname": "BHERBHERI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3333586",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERBHERI PWSS",
+                        "localname": "BHERBHERI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERBHERI PWSS",
+                "localname": "BHERBHERI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3333586",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERBHERI PWSS",
+                        "localname": "BHERBHERI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3333586/ws-services-calculation/Penalty.json b/data/as/3333586/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a66a61e7e
--- /dev/null
+++ b/data/as/3333586/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3333586",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3333586/ws-services-calculation/WCBillingSlab.json b/data/as/3333586/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..074b5e8699
--- /dev/null
+++ b/data/as/3333586/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3333586",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3359758/BillingService/BusinessService.json b/data/as/3359758/BillingService/BusinessService.json
new file mode 100644
index 0000000000..48eb37f24b
--- /dev/null
+++ b/data/as/3359758/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3359758",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3359758/egov-location/boundary-data.json b/data/as/3359758/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0edcec08c
--- /dev/null
+++ b/data/as/3359758/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3359758",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHADOL PWSS",
+                "localname": "KACHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3359758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHADOL PWSS",
+                        "localname": "KACHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHADOL PWSS",
+                "localname": "KACHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3359758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHADOL PWSS",
+                        "localname": "KACHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3359758/ws-services-calculation/Penalty.json b/data/as/3359758/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee3d38b8f4
--- /dev/null
+++ b/data/as/3359758/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3359758",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3359758/ws-services-calculation/WCBillingSlab.json b/data/as/3359758/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dfb65bc723
--- /dev/null
+++ b/data/as/3359758/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3359758",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3370880/BillingService/BusinessService.json b/data/as/3370880/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e2a38801b
--- /dev/null
+++ b/data/as/3370880/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3370880",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3370880/egov-location/boundary-data.json b/data/as/3370880/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b55311e114
--- /dev/null
+++ b/data/as/3370880/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3370880",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHITOLMARI PWSS",
+                "localname": "CHITOLMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3370880",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHITOLMARI PWSS",
+                        "localname": "CHITOLMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHITOLMARI PWSS",
+                "localname": "CHITOLMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3370880",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHITOLMARI PWSS",
+                        "localname": "CHITOLMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3370880/ws-services-calculation/Penalty.json b/data/as/3370880/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..151ecc9a32
--- /dev/null
+++ b/data/as/3370880/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3370880",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3370880/ws-services-calculation/WCBillingSlab.json b/data/as/3370880/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8d7ecec73
--- /dev/null
+++ b/data/as/3370880/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3370880",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3372158/BillingService/BusinessService.json b/data/as/3372158/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17216fb7d9
--- /dev/null
+++ b/data/as/3372158/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3372158",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3372158/egov-location/boundary-data.json b/data/as/3372158/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54943eb5a9
--- /dev/null
+++ b/data/as/3372158/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3372158",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI NO 3 PWSS",
+                "localname": "SOPAI NO 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3372158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI NO 3 PWSS",
+                        "localname": "SOPAI NO 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI NO 3 PWSS",
+                "localname": "SOPAI NO 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3372158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI NO 3 PWSS",
+                        "localname": "SOPAI NO 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3372158/ws-services-calculation/Penalty.json b/data/as/3372158/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73e86c4f14
--- /dev/null
+++ b/data/as/3372158/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3372158",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3372158/ws-services-calculation/WCBillingSlab.json b/data/as/3372158/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5ea32ee463
--- /dev/null
+++ b/data/as/3372158/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3372158",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3373443/BillingService/BusinessService.json b/data/as/3373443/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4c9797056c
--- /dev/null
+++ b/data/as/3373443/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3373443",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3373443/egov-location/boundary-data.json b/data/as/3373443/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0520574880
--- /dev/null
+++ b/data/as/3373443/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3373443",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAJULI TE_II PWSS",
+                "localname": "HIRAJULI TE_II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3373443",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAJULI TE_II PWSS",
+                        "localname": "HIRAJULI TE_II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAJULI TE_II PWSS",
+                "localname": "HIRAJULI TE_II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3373443",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAJULI TE_II PWSS",
+                        "localname": "HIRAJULI TE_II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3373443/ws-services-calculation/Penalty.json b/data/as/3373443/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f0cf17a7c
--- /dev/null
+++ b/data/as/3373443/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3373443",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3373443/ws-services-calculation/WCBillingSlab.json b/data/as/3373443/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e6d2f6746
--- /dev/null
+++ b/data/as/3373443/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3373443",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3374529/BillingService/BusinessService.json b/data/as/3374529/BillingService/BusinessService.json
new file mode 100644
index 0000000000..775c5264ff
--- /dev/null
+++ b/data/as/3374529/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3374529",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3374529/egov-location/boundary-data.json b/data/as/3374529/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87855b7ded
--- /dev/null
+++ b/data/as/3374529/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3374529",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PWSS",
+                "localname": "CHEKOWARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3374529",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PWSS",
+                        "localname": "CHEKOWARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PWSS",
+                "localname": "CHEKOWARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3374529",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PWSS",
+                        "localname": "CHEKOWARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3374529/ws-services-calculation/Penalty.json b/data/as/3374529/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fbbadb5289
--- /dev/null
+++ b/data/as/3374529/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3374529",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3374529/ws-services-calculation/WCBillingSlab.json b/data/as/3374529/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..396a4b6b28
--- /dev/null
+++ b/data/as/3374529/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3374529",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375170/BillingService/BusinessService.json b/data/as/3375170/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41efd895a0
--- /dev/null
+++ b/data/as/3375170/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3375170",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375170/egov-location/boundary-data.json b/data/as/3375170/egov-location/boundary-data.json
new file mode 100644
index 0000000000..181b2a7ace
--- /dev/null
+++ b/data/as/3375170/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3375170",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARBARI",
+                "localname": "NAHARBARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3375170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARBARI",
+                        "localname": "NAHARBARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARBARI",
+                "localname": "NAHARBARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3375170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARBARI",
+                        "localname": "NAHARBARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375170/ws-services-calculation/Penalty.json b/data/as/3375170/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e0acb4e149
--- /dev/null
+++ b/data/as/3375170/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3375170",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375170/ws-services-calculation/WCBillingSlab.json b/data/as/3375170/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..09bae18b8c
--- /dev/null
+++ b/data/as/3375170/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3375170",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375765/BillingService/BusinessService.json b/data/as/3375765/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e5edad77cc
--- /dev/null
+++ b/data/as/3375765/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3375765",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375765/egov-location/boundary-data.json b/data/as/3375765/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db8fa2c330
--- /dev/null
+++ b/data/as/3375765/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3375765",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TORIPAM PWSS",
+                "localname": "TORIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3375765",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TORIPAM PWSS",
+                        "localname": "TORIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TORIPAM PWSS",
+                "localname": "TORIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3375765",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TORIPAM PWSS",
+                        "localname": "TORIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375765/ws-services-calculation/Penalty.json b/data/as/3375765/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c0c4b30c9f
--- /dev/null
+++ b/data/as/3375765/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3375765",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3375765/ws-services-calculation/WCBillingSlab.json b/data/as/3375765/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4eec5b9799
--- /dev/null
+++ b/data/as/3375765/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3375765",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3378587/BillingService/BusinessService.json b/data/as/3378587/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4c06c5901e
--- /dev/null
+++ b/data/as/3378587/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3378587",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3378587/egov-location/boundary-data.json b/data/as/3378587/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ab01ffe3c
--- /dev/null
+++ b/data/as/3378587/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3378587",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI BAGAN PWSS",
+                "localname": "SINGRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3378587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI BAGAN PWSS",
+                        "localname": "SINGRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI BAGAN PWSS",
+                "localname": "SINGRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3378587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI BAGAN PWSS",
+                        "localname": "SINGRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3378587/ws-services-calculation/Penalty.json b/data/as/3378587/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0aaea78f28
--- /dev/null
+++ b/data/as/3378587/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3378587",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3378587/ws-services-calculation/WCBillingSlab.json b/data/as/3378587/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4444cfe3ca
--- /dev/null
+++ b/data/as/3378587/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3378587",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384885/BillingService/BusinessService.json b/data/as/3384885/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c69d8c5105
--- /dev/null
+++ b/data/as/3384885/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3384885",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384885/egov-location/boundary-data.json b/data/as/3384885/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e61c44f546
--- /dev/null
+++ b/data/as/3384885/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3384885",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARANGAPUR BAZAR PWSS",
+                "localname": "TARANGAPUR BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3384885",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARANGAPUR BAZAR PWSS",
+                        "localname": "TARANGAPUR BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARANGAPUR BAZAR PWSS",
+                "localname": "TARANGAPUR BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3384885",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARANGAPUR BAZAR PWSS",
+                        "localname": "TARANGAPUR BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384885/ws-services-calculation/Penalty.json b/data/as/3384885/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dfdb98a8f2
--- /dev/null
+++ b/data/as/3384885/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3384885",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384885/ws-services-calculation/WCBillingSlab.json b/data/as/3384885/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca58657172
--- /dev/null
+++ b/data/as/3384885/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3384885",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384921/BillingService/BusinessService.json b/data/as/3384921/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bcd8519fc5
--- /dev/null
+++ b/data/as/3384921/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3384921",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384921/egov-location/boundary-data.json b/data/as/3384921/egov-location/boundary-data.json
new file mode 100644
index 0000000000..026ced0548
--- /dev/null
+++ b/data/as/3384921/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3384921",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKURA PWSS",
+                "localname": "DHOBAKURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3384921",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKURA PWSS",
+                        "localname": "DHOBAKURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKURA PWSS",
+                "localname": "DHOBAKURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3384921",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKURA PWSS",
+                        "localname": "DHOBAKURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384921/ws-services-calculation/Penalty.json b/data/as/3384921/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eeba9e530b
--- /dev/null
+++ b/data/as/3384921/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3384921",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3384921/ws-services-calculation/WCBillingSlab.json b/data/as/3384921/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..57bdf09d17
--- /dev/null
+++ b/data/as/3384921/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3384921",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385844/BillingService/BusinessService.json b/data/as/3385844/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7fb92938db
--- /dev/null
+++ b/data/as/3385844/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3385844",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385844/egov-location/boundary-data.json b/data/as/3385844/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cb2ed046e0
--- /dev/null
+++ b/data/as/3385844/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3385844",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANYAGURI PWSS",
+                "localname": "BANYAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3385844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANYAGURI PWSS",
+                        "localname": "BANYAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANYAGURI PWSS",
+                "localname": "BANYAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3385844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANYAGURI PWSS",
+                        "localname": "BANYAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385844/ws-services-calculation/Penalty.json b/data/as/3385844/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ab0b0e3cf
--- /dev/null
+++ b/data/as/3385844/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3385844",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385844/ws-services-calculation/WCBillingSlab.json b/data/as/3385844/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df6fe285c4
--- /dev/null
+++ b/data/as/3385844/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3385844",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385946/BillingService/BusinessService.json b/data/as/3385946/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bc76c7b855
--- /dev/null
+++ b/data/as/3385946/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3385946",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385946/egov-location/boundary-data.json b/data/as/3385946/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c73eeb180a
--- /dev/null
+++ b/data/as/3385946/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3385946",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA TEA ESTATE PWSS",
+                "localname": "SIMLITOLA TEA ESTATE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3385946",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA TEA ESTATE PWSS",
+                        "localname": "SIMLITOLA TEA ESTATE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA TEA ESTATE PWSS",
+                "localname": "SIMLITOLA TEA ESTATE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3385946",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA TEA ESTATE PWSS",
+                        "localname": "SIMLITOLA TEA ESTATE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385946/ws-services-calculation/Penalty.json b/data/as/3385946/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5dfa01b05
--- /dev/null
+++ b/data/as/3385946/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3385946",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385946/ws-services-calculation/WCBillingSlab.json b/data/as/3385946/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d8f1b3da60
--- /dev/null
+++ b/data/as/3385946/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3385946",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385982/BillingService/BusinessService.json b/data/as/3385982/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5a008e788d
--- /dev/null
+++ b/data/as/3385982/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3385982",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385982/egov-location/boundary-data.json b/data/as/3385982/egov-location/boundary-data.json
new file mode 100644
index 0000000000..908c261eaf
--- /dev/null
+++ b/data/as/3385982/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3385982",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALLA PWSS",
+                "localname": "CHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3385982",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALLA PWSS",
+                        "localname": "CHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALLA PWSS",
+                "localname": "CHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3385982",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALLA PWSS",
+                        "localname": "CHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385982/ws-services-calculation/Penalty.json b/data/as/3385982/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cdd2cfa9e7
--- /dev/null
+++ b/data/as/3385982/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3385982",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3385982/ws-services-calculation/WCBillingSlab.json b/data/as/3385982/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c7e573679
--- /dev/null
+++ b/data/as/3385982/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3385982",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386123/BillingService/BusinessService.json b/data/as/3386123/BillingService/BusinessService.json
new file mode 100644
index 0000000000..783d0f34b4
--- /dev/null
+++ b/data/as/3386123/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386123",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386123/egov-location/boundary-data.json b/data/as/3386123/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3e09658ca
--- /dev/null
+++ b/data/as/3386123/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386123",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RISHIPARA PWSS",
+                "localname": "RISHIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386123",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RISHIPARA PWSS",
+                        "localname": "RISHIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RISHIPARA PWSS",
+                "localname": "RISHIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386123",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RISHIPARA PWSS",
+                        "localname": "RISHIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386123/ws-services-calculation/Penalty.json b/data/as/3386123/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc6baaf32a
--- /dev/null
+++ b/data/as/3386123/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386123",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386123/ws-services-calculation/WCBillingSlab.json b/data/as/3386123/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fbeed2b0be
--- /dev/null
+++ b/data/as/3386123/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386123",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386146/BillingService/BusinessService.json b/data/as/3386146/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b90bf23549
--- /dev/null
+++ b/data/as/3386146/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386146",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386146/egov-location/boundary-data.json b/data/as/3386146/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3aa4d709d
--- /dev/null
+++ b/data/as/3386146/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386146",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAPUR-1 PWSS",
+                "localname": "SONAPUR-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAPUR-1 PWSS",
+                        "localname": "SONAPUR-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAPUR-1 PWSS",
+                "localname": "SONAPUR-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAPUR-1 PWSS",
+                        "localname": "SONAPUR-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386146/ws-services-calculation/Penalty.json b/data/as/3386146/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5f0adc90b9
--- /dev/null
+++ b/data/as/3386146/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386146",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386146/ws-services-calculation/WCBillingSlab.json b/data/as/3386146/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d169a2e80a
--- /dev/null
+++ b/data/as/3386146/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386146",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386204/BillingService/BusinessService.json b/data/as/3386204/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dbc0bdec2d
--- /dev/null
+++ b/data/as/3386204/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386204",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386204/egov-location/boundary-data.json b/data/as/3386204/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12bd3cc838
--- /dev/null
+++ b/data/as/3386204/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386204",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARPATHAR PWSS",
+                "localname": "BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386204",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARPATHAR PWSS",
+                        "localname": "BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARPATHAR PWSS",
+                "localname": "BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386204",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARPATHAR PWSS",
+                        "localname": "BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386204/ws-services-calculation/Penalty.json b/data/as/3386204/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fce34903f2
--- /dev/null
+++ b/data/as/3386204/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386204",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386204/ws-services-calculation/WCBillingSlab.json b/data/as/3386204/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fe9f48dd0
--- /dev/null
+++ b/data/as/3386204/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386204",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386236/BillingService/BusinessService.json b/data/as/3386236/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a2aacaff1d
--- /dev/null
+++ b/data/as/3386236/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386236",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386236/egov-location/boundary-data.json b/data/as/3386236/egov-location/boundary-data.json
new file mode 100644
index 0000000000..031118bfee
--- /dev/null
+++ b/data/as/3386236/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386236",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIKIAJULI KAHIBARI PWSS",
+                "localname": "SIKIAJULI KAHIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386236",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIKIAJULI KAHIBARI PWSS",
+                        "localname": "SIKIAJULI KAHIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIKIAJULI KAHIBARI PWSS",
+                "localname": "SIKIAJULI KAHIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386236",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIKIAJULI KAHIBARI PWSS",
+                        "localname": "SIKIAJULI KAHIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386236/ws-services-calculation/Penalty.json b/data/as/3386236/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce528b9bb9
--- /dev/null
+++ b/data/as/3386236/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386236",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386236/ws-services-calculation/WCBillingSlab.json b/data/as/3386236/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce53e93a71
--- /dev/null
+++ b/data/as/3386236/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386236",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386289/BillingService/BusinessService.json b/data/as/3386289/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17a0d98db8
--- /dev/null
+++ b/data/as/3386289/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386289",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386289/egov-location/boundary-data.json b/data/as/3386289/egov-location/boundary-data.json
new file mode 100644
index 0000000000..faeef7d1be
--- /dev/null
+++ b/data/as/3386289/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386289",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI PT-II PWSS",
+                "localname": "TIPLAI PT-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI PT-II PWSS",
+                        "localname": "TIPLAI PT-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI PT-II PWSS",
+                "localname": "TIPLAI PT-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI PT-II PWSS",
+                        "localname": "TIPLAI PT-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386289/ws-services-calculation/Penalty.json b/data/as/3386289/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0dad51541a
--- /dev/null
+++ b/data/as/3386289/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386289",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386289/ws-services-calculation/WCBillingSlab.json b/data/as/3386289/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b453b9c62
--- /dev/null
+++ b/data/as/3386289/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386289",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386322/BillingService/BusinessService.json b/data/as/3386322/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7179547618
--- /dev/null
+++ b/data/as/3386322/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386322",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386322/egov-location/boundary-data.json b/data/as/3386322/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60a443ea10
--- /dev/null
+++ b/data/as/3386322/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386322",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRIBHASA PWSS",
+                "localname": "DAMRIBHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386322",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRIBHASA PWSS",
+                        "localname": "DAMRIBHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRIBHASA PWSS",
+                "localname": "DAMRIBHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386322",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRIBHASA PWSS",
+                        "localname": "DAMRIBHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386322/ws-services-calculation/Penalty.json b/data/as/3386322/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ead0af0cb
--- /dev/null
+++ b/data/as/3386322/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386322",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386322/ws-services-calculation/WCBillingSlab.json b/data/as/3386322/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..155834ca7a
--- /dev/null
+++ b/data/as/3386322/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386322",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386356/BillingService/BusinessService.json b/data/as/3386356/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1703f6cc5e
--- /dev/null
+++ b/data/as/3386356/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386356",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386356/egov-location/boundary-data.json b/data/as/3386356/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0660c41656
--- /dev/null
+++ b/data/as/3386356/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386356",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PWSS",
+                "localname": "BAPURBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PWSS",
+                        "localname": "BAPURBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PWSS",
+                "localname": "BAPURBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PWSS",
+                        "localname": "BAPURBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386356/ws-services-calculation/Penalty.json b/data/as/3386356/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c085cf5f3
--- /dev/null
+++ b/data/as/3386356/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386356",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386356/ws-services-calculation/WCBillingSlab.json b/data/as/3386356/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0f6126e75
--- /dev/null
+++ b/data/as/3386356/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386356",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386386/BillingService/BusinessService.json b/data/as/3386386/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c4593a69d6
--- /dev/null
+++ b/data/as/3386386/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386386",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386386/egov-location/boundary-data.json b/data/as/3386386/egov-location/boundary-data.json
new file mode 100644
index 0000000000..910d659557
--- /dev/null
+++ b/data/as/3386386/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386386",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUCHIA PAHAR PWSS",
+                "localname": "SUCHIA PAHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUCHIA PAHAR PWSS",
+                        "localname": "SUCHIA PAHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUCHIA PAHAR PWSS",
+                "localname": "SUCHIA PAHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUCHIA PAHAR PWSS",
+                        "localname": "SUCHIA PAHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386386/ws-services-calculation/Penalty.json b/data/as/3386386/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5401b4c3b8
--- /dev/null
+++ b/data/as/3386386/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386386",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386386/ws-services-calculation/WCBillingSlab.json b/data/as/3386386/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..24f9a08822
--- /dev/null
+++ b/data/as/3386386/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386386",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386407/BillingService/BusinessService.json b/data/as/3386407/BillingService/BusinessService.json
new file mode 100644
index 0000000000..262ca70a5f
--- /dev/null
+++ b/data/as/3386407/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386407",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386407/egov-location/boundary-data.json b/data/as/3386407/egov-location/boundary-data.json
new file mode 100644
index 0000000000..860bae3279
--- /dev/null
+++ b/data/as/3386407/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386407",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMOHRA PWSS",
+                "localname": "BARMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMOHRA PWSS",
+                        "localname": "BARMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMOHRA PWSS",
+                "localname": "BARMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMOHRA PWSS",
+                        "localname": "BARMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386407/ws-services-calculation/Penalty.json b/data/as/3386407/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a9fcbf31f5
--- /dev/null
+++ b/data/as/3386407/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386407",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386407/ws-services-calculation/WCBillingSlab.json b/data/as/3386407/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6d09ead21
--- /dev/null
+++ b/data/as/3386407/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386407",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386435/BillingService/BusinessService.json b/data/as/3386435/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b0d22d4888
--- /dev/null
+++ b/data/as/3386435/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386435",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386435/egov-location/boundary-data.json b/data/as/3386435/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7da498e554
--- /dev/null
+++ b/data/as/3386435/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386435",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CELABORI PWSS",
+                "localname": "CELABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CELABORI PWSS",
+                        "localname": "CELABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CELABORI PWSS",
+                "localname": "CELABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CELABORI PWSS",
+                        "localname": "CELABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386435/ws-services-calculation/Penalty.json b/data/as/3386435/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ba7072d774
--- /dev/null
+++ b/data/as/3386435/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386435",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386435/ws-services-calculation/WCBillingSlab.json b/data/as/3386435/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df3eda61bf
--- /dev/null
+++ b/data/as/3386435/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386435",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386445/BillingService/BusinessService.json b/data/as/3386445/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85f8d55479
--- /dev/null
+++ b/data/as/3386445/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386445",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386445/egov-location/boundary-data.json b/data/as/3386445/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aab1ec5002
--- /dev/null
+++ b/data/as/3386445/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386445",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEODHUTURI PWSS",
+                "localname": "DEODHUTURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEODHUTURI PWSS",
+                        "localname": "DEODHUTURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEODHUTURI PWSS",
+                "localname": "DEODHUTURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEODHUTURI PWSS",
+                        "localname": "DEODHUTURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386445/ws-services-calculation/Penalty.json b/data/as/3386445/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..51311d3b9a
--- /dev/null
+++ b/data/as/3386445/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386445",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386445/ws-services-calculation/WCBillingSlab.json b/data/as/3386445/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8bdde11324
--- /dev/null
+++ b/data/as/3386445/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386445",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386466/BillingService/BusinessService.json b/data/as/3386466/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a32fc4e09d
--- /dev/null
+++ b/data/as/3386466/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386466",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386466/egov-location/boundary-data.json b/data/as/3386466/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3cf3b224af
--- /dev/null
+++ b/data/as/3386466/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386466",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKMARA PWSS",
+                "localname": "BAKMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386466",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKMARA PWSS",
+                        "localname": "BAKMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKMARA PWSS",
+                "localname": "BAKMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386466",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKMARA PWSS",
+                        "localname": "BAKMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386466/ws-services-calculation/Penalty.json b/data/as/3386466/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83b180d4f5
--- /dev/null
+++ b/data/as/3386466/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386466",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386466/ws-services-calculation/WCBillingSlab.json b/data/as/3386466/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed53d218e8
--- /dev/null
+++ b/data/as/3386466/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386466",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386515/BillingService/BusinessService.json b/data/as/3386515/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f386d2912b
--- /dev/null
+++ b/data/as/3386515/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386515",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386515/egov-location/boundary-data.json b/data/as/3386515/egov-location/boundary-data.json
new file mode 100644
index 0000000000..24d2f51800
--- /dev/null
+++ b/data/as/3386515/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386515",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA SINGIMARI PWSS",
+                "localname": "NALANGA SINGIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA SINGIMARI PWSS",
+                        "localname": "NALANGA SINGIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA SINGIMARI PWSS",
+                "localname": "NALANGA SINGIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA SINGIMARI PWSS",
+                        "localname": "NALANGA SINGIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386515/ws-services-calculation/Penalty.json b/data/as/3386515/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..624f7d8c34
--- /dev/null
+++ b/data/as/3386515/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386515",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386515/ws-services-calculation/WCBillingSlab.json b/data/as/3386515/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1d96e27b0d
--- /dev/null
+++ b/data/as/3386515/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386515",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386526/BillingService/BusinessService.json b/data/as/3386526/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c8b88e85fa
--- /dev/null
+++ b/data/as/3386526/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386526",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386526/egov-location/boundary-data.json b/data/as/3386526/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1373217080
--- /dev/null
+++ b/data/as/3386526/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386526",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONKAIR PUBPAR PWSS",
+                "localname": "KONKAIR PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONKAIR PUBPAR PWSS",
+                        "localname": "KONKAIR PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONKAIR PUBPAR PWSS",
+                "localname": "KONKAIR PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONKAIR PUBPAR PWSS",
+                        "localname": "KONKAIR PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386526/ws-services-calculation/Penalty.json b/data/as/3386526/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1857d3dc1c
--- /dev/null
+++ b/data/as/3386526/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386526",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386526/ws-services-calculation/WCBillingSlab.json b/data/as/3386526/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2511c88b8b
--- /dev/null
+++ b/data/as/3386526/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386526",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386540/BillingService/BusinessService.json b/data/as/3386540/BillingService/BusinessService.json
new file mode 100644
index 0000000000..84ece49aff
--- /dev/null
+++ b/data/as/3386540/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386540",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386540/egov-location/boundary-data.json b/data/as/3386540/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b031a82bed
--- /dev/null
+++ b/data/as/3386540/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386540",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOSKOPARA PWSS",
+                "localname": "BOSKOPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386540",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOSKOPARA PWSS",
+                        "localname": "BOSKOPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOSKOPARA PWSS",
+                "localname": "BOSKOPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386540",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOSKOPARA PWSS",
+                        "localname": "BOSKOPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386540/ws-services-calculation/Penalty.json b/data/as/3386540/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1d9b2974d6
--- /dev/null
+++ b/data/as/3386540/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386540",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386540/ws-services-calculation/WCBillingSlab.json b/data/as/3386540/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f82d7edea
--- /dev/null
+++ b/data/as/3386540/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386540",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386544/BillingService/BusinessService.json b/data/as/3386544/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7967440d2d
--- /dev/null
+++ b/data/as/3386544/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386544",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386544/egov-location/boundary-data.json b/data/as/3386544/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ba68c480f
--- /dev/null
+++ b/data/as/3386544/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386544",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISKHULI PWSS",
+                "localname": "BHOISKHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386544",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISKHULI PWSS",
+                        "localname": "BHOISKHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISKHULI PWSS",
+                "localname": "BHOISKHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386544",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISKHULI PWSS",
+                        "localname": "BHOISKHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386544/ws-services-calculation/Penalty.json b/data/as/3386544/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bfc79c11c8
--- /dev/null
+++ b/data/as/3386544/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386544",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386544/ws-services-calculation/WCBillingSlab.json b/data/as/3386544/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6a4845451e
--- /dev/null
+++ b/data/as/3386544/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386544",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386664/BillingService/BusinessService.json b/data/as/3386664/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a12c47e0da
--- /dev/null
+++ b/data/as/3386664/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386664",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386664/egov-location/boundary-data.json b/data/as/3386664/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3869a72217
--- /dev/null
+++ b/data/as/3386664/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386664",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PADUPARA PWSS",
+                "localname": "PADUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386664",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PADUPARA PWSS",
+                        "localname": "PADUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PADUPARA PWSS",
+                "localname": "PADUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386664",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PADUPARA PWSS",
+                        "localname": "PADUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386664/ws-services-calculation/Penalty.json b/data/as/3386664/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f789a224d4
--- /dev/null
+++ b/data/as/3386664/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386664",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386664/ws-services-calculation/WCBillingSlab.json b/data/as/3386664/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..795711ceca
--- /dev/null
+++ b/data/as/3386664/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386664",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386695/BillingService/BusinessService.json b/data/as/3386695/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9af4fd7cac
--- /dev/null
+++ b/data/as/3386695/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3386695",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386695/egov-location/boundary-data.json b/data/as/3386695/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3ab6d2fa6
--- /dev/null
+++ b/data/as/3386695/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3386695",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOISTOMPARA PWSS",
+                "localname": "BOISTOMPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOISTOMPARA PWSS",
+                        "localname": "BOISTOMPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOISTOMPARA PWSS",
+                "localname": "BOISTOMPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3386695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOISTOMPARA PWSS",
+                        "localname": "BOISTOMPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386695/ws-services-calculation/Penalty.json b/data/as/3386695/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c316be6d5
--- /dev/null
+++ b/data/as/3386695/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3386695",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3386695/ws-services-calculation/WCBillingSlab.json b/data/as/3386695/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10a4aa5185
--- /dev/null
+++ b/data/as/3386695/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3386695",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3800160/BillingService/BusinessService.json b/data/as/3800160/BillingService/BusinessService.json
new file mode 100644
index 0000000000..52a0e1b142
--- /dev/null
+++ b/data/as/3800160/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.3800160",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3800160/egov-location/boundary-data.json b/data/as/3800160/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e2d71213c2
--- /dev/null
+++ b/data/as/3800160/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.3800160",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIPORIA BATABARI PWSS",
+                "localname": "SIPORIA BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3800160",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIPORIA BATABARI PWSS",
+                        "localname": "SIPORIA BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIPORIA BATABARI PWSS",
+                "localname": "SIPORIA BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.3800160",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIPORIA BATABARI PWSS",
+                        "localname": "SIPORIA BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3800160/ws-services-calculation/Penalty.json b/data/as/3800160/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04ea0e53ae
--- /dev/null
+++ b/data/as/3800160/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.3800160",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/3800160/ws-services-calculation/WCBillingSlab.json b/data/as/3800160/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8f58a513f
--- /dev/null
+++ b/data/as/3800160/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.3800160",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516012/BillingService/BusinessService.json b/data/as/4516012/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10cf1960c9
--- /dev/null
+++ b/data/as/4516012/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4516012",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516012/egov-location/boundary-data.json b/data/as/4516012/egov-location/boundary-data.json
new file mode 100644
index 0000000000..69cf917b9f
--- /dev/null
+++ b/data/as/4516012/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4516012",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPAJULI PWSS",
+                "localname": "RUPAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4516012",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPAJULI PWSS",
+                        "localname": "RUPAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPAJULI PWSS",
+                "localname": "RUPAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4516012",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPAJULI PWSS",
+                        "localname": "RUPAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516012/ws-services-calculation/Penalty.json b/data/as/4516012/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab4a704e78
--- /dev/null
+++ b/data/as/4516012/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4516012",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516012/ws-services-calculation/WCBillingSlab.json b/data/as/4516012/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7a539e4aff
--- /dev/null
+++ b/data/as/4516012/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4516012",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516046/BillingService/BusinessService.json b/data/as/4516046/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e290d7af25
--- /dev/null
+++ b/data/as/4516046/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4516046",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516046/egov-location/boundary-data.json b/data/as/4516046/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9f2bc7793
--- /dev/null
+++ b/data/as/4516046/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4516046",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BONGALGAON PWSS",
+                "localname": "BONGALGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4516046",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BONGALGAON PWSS",
+                        "localname": "BONGALGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BONGALGAON PWSS",
+                "localname": "BONGALGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4516046",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BONGALGAON PWSS",
+                        "localname": "BONGALGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516046/ws-services-calculation/Penalty.json b/data/as/4516046/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..314c366fa4
--- /dev/null
+++ b/data/as/4516046/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4516046",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516046/ws-services-calculation/WCBillingSlab.json b/data/as/4516046/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d6117a3d9
--- /dev/null
+++ b/data/as/4516046/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4516046",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516419/BillingService/BusinessService.json b/data/as/4516419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b1a98335bf
--- /dev/null
+++ b/data/as/4516419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4516419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516419/egov-location/boundary-data.json b/data/as/4516419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40b33d030f
--- /dev/null
+++ b/data/as/4516419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4516419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUMUKI PWSS",
+                "localname": "TUMUKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4516419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUMUKI PWSS",
+                        "localname": "TUMUKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUMUKI PWSS",
+                "localname": "TUMUKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4516419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUMUKI PWSS",
+                        "localname": "TUMUKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516419/ws-services-calculation/Penalty.json b/data/as/4516419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0c1ee13a58
--- /dev/null
+++ b/data/as/4516419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4516419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4516419/ws-services-calculation/WCBillingSlab.json b/data/as/4516419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ef4cc9d413
--- /dev/null
+++ b/data/as/4516419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4516419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452628/BillingService/BusinessService.json b/data/as/452628/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a81842680d
--- /dev/null
+++ b/data/as/452628/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.452628",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452628/egov-location/boundary-data.json b/data/as/452628/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c9dfe6eab5
--- /dev/null
+++ b/data/as/452628/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.452628",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOTLONG PWSS",
+                "localname": "GOTLONG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.452628",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOTLONG PWSS",
+                        "localname": "GOTLONG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOTLONG PWSS",
+                "localname": "GOTLONG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.452628",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOTLONG PWSS",
+                        "localname": "GOTLONG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452628/ws-services-calculation/Penalty.json b/data/as/452628/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26908c85b3
--- /dev/null
+++ b/data/as/452628/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.452628",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452628/ws-services-calculation/WCBillingSlab.json b/data/as/452628/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..86ad596e8d
--- /dev/null
+++ b/data/as/452628/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.452628",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452685/BillingService/BusinessService.json b/data/as/452685/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f87c3ce84
--- /dev/null
+++ b/data/as/452685/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.452685",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452685/egov-location/boundary-data.json b/data/as/452685/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f8ac74b07a
--- /dev/null
+++ b/data/as/452685/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.452685",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANI ALIMUR PWSS",
+                "localname": "PURANI ALIMUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.452685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANI ALIMUR PWSS",
+                        "localname": "PURANI ALIMUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANI ALIMUR PWSS",
+                "localname": "PURANI ALIMUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.452685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANI ALIMUR PWSS",
+                        "localname": "PURANI ALIMUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452685/ws-services-calculation/Penalty.json b/data/as/452685/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9c550981d
--- /dev/null
+++ b/data/as/452685/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.452685",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452685/ws-services-calculation/WCBillingSlab.json b/data/as/452685/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c501cd731a
--- /dev/null
+++ b/data/as/452685/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.452685",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452697/BillingService/BusinessService.json b/data/as/452697/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5df11bbc6
--- /dev/null
+++ b/data/as/452697/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.452697",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452697/egov-location/boundary-data.json b/data/as/452697/egov-location/boundary-data.json
new file mode 100644
index 0000000000..94c3f334ee
--- /dev/null
+++ b/data/as/452697/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.452697",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAM BAGARI BARI PWSS",
+                "localname": "NAM BAGARI BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.452697",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAM BAGARI BARI PWSS",
+                        "localname": "NAM BAGARI BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAM BAGARI BARI PWSS",
+                "localname": "NAM BAGARI BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.452697",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAM BAGARI BARI PWSS",
+                        "localname": "NAM BAGARI BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452697/ws-services-calculation/Penalty.json b/data/as/452697/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..39e87e75ef
--- /dev/null
+++ b/data/as/452697/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.452697",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/452697/ws-services-calculation/WCBillingSlab.json b/data/as/452697/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d94a9b3147
--- /dev/null
+++ b/data/as/452697/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.452697",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/453185/BillingService/BusinessService.json b/data/as/453185/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d245f5bc7e
--- /dev/null
+++ b/data/as/453185/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.453185",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/453185/egov-location/boundary-data.json b/data/as/453185/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89dfed9637
--- /dev/null
+++ b/data/as/453185/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.453185",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUGLANI PWSS",
+                "localname": "JUGLANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.453185",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUGLANI PWSS",
+                        "localname": "JUGLANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUGLANI PWSS",
+                "localname": "JUGLANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.453185",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUGLANI PWSS",
+                        "localname": "JUGLANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/453185/ws-services-calculation/Penalty.json b/data/as/453185/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f014ad8420
--- /dev/null
+++ b/data/as/453185/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.453185",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/453185/ws-services-calculation/WCBillingSlab.json b/data/as/453185/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49c3519a3d
--- /dev/null
+++ b/data/as/453185/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.453185",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/454276/BillingService/BusinessService.json b/data/as/454276/BillingService/BusinessService.json
new file mode 100644
index 0000000000..872c1a35f7
--- /dev/null
+++ b/data/as/454276/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.454276",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/454276/egov-location/boundary-data.json b/data/as/454276/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3acb1cf920
--- /dev/null
+++ b/data/as/454276/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.454276",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBINDAPUR PWSS",
+                "localname": "GOBINDAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.454276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBINDAPUR PWSS",
+                        "localname": "GOBINDAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBINDAPUR PWSS",
+                "localname": "GOBINDAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.454276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBINDAPUR PWSS",
+                        "localname": "GOBINDAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/454276/ws-services-calculation/Penalty.json b/data/as/454276/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c3fde2063f
--- /dev/null
+++ b/data/as/454276/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.454276",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/454276/ws-services-calculation/WCBillingSlab.json b/data/as/454276/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4a52d67be
--- /dev/null
+++ b/data/as/454276/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.454276",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455214/BillingService/BusinessService.json b/data/as/455214/BillingService/BusinessService.json
new file mode 100644
index 0000000000..daa74aad22
--- /dev/null
+++ b/data/as/455214/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.455214",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455214/egov-location/boundary-data.json b/data/as/455214/egov-location/boundary-data.json
new file mode 100644
index 0000000000..24d26c1da0
--- /dev/null
+++ b/data/as/455214/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.455214",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LALABORI PWSS",
+                "localname": "LALABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455214",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LALABORI PWSS",
+                        "localname": "LALABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LALABORI PWSS",
+                "localname": "LALABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455214",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LALABORI PWSS",
+                        "localname": "LALABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455214/ws-services-calculation/Penalty.json b/data/as/455214/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ff64d45ac
--- /dev/null
+++ b/data/as/455214/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.455214",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455214/ws-services-calculation/WCBillingSlab.json b/data/as/455214/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..53ab546fb0
--- /dev/null
+++ b/data/as/455214/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.455214",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455219/BillingService/BusinessService.json b/data/as/455219/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f55b82a59
--- /dev/null
+++ b/data/as/455219/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.455219",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455219/egov-location/boundary-data.json b/data/as/455219/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3633e3b1d
--- /dev/null
+++ b/data/as/455219/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.455219",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINI PWSS",
+                "localname": "RAKSHASINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINI PWSS",
+                        "localname": "RAKSHASINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINI PWSS",
+                "localname": "RAKSHASINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINI PWSS",
+                        "localname": "RAKSHASINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455219/ws-services-calculation/Penalty.json b/data/as/455219/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..98518f36e5
--- /dev/null
+++ b/data/as/455219/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.455219",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455219/ws-services-calculation/WCBillingSlab.json b/data/as/455219/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd2ceaacd0
--- /dev/null
+++ b/data/as/455219/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.455219",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455220/BillingService/BusinessService.json b/data/as/455220/BillingService/BusinessService.json
new file mode 100644
index 0000000000..579fc851b5
--- /dev/null
+++ b/data/as/455220/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.455220",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455220/egov-location/boundary-data.json b/data/as/455220/egov-location/boundary-data.json
new file mode 100644
index 0000000000..393ade0543
--- /dev/null
+++ b/data/as/455220/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.455220",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAKOCHA PWSS",
+                "localname": "MONAKOCHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAKOCHA PWSS",
+                        "localname": "MONAKOCHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAKOCHA PWSS",
+                "localname": "MONAKOCHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAKOCHA PWSS",
+                        "localname": "MONAKOCHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455220/ws-services-calculation/Penalty.json b/data/as/455220/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..85c5152b5f
--- /dev/null
+++ b/data/as/455220/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.455220",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455220/ws-services-calculation/WCBillingSlab.json b/data/as/455220/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6416de92f2
--- /dev/null
+++ b/data/as/455220/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.455220",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455374/BillingService/BusinessService.json b/data/as/455374/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c2b22d7f24
--- /dev/null
+++ b/data/as/455374/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.455374",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455374/egov-location/boundary-data.json b/data/as/455374/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b25a98113d
--- /dev/null
+++ b/data/as/455374/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.455374",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLAGAON PWSS",
+                "localname": "DOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455374",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLAGAON PWSS",
+                        "localname": "DOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLAGAON PWSS",
+                "localname": "DOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.455374",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLAGAON PWSS",
+                        "localname": "DOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455374/ws-services-calculation/Penalty.json b/data/as/455374/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08d34bee7a
--- /dev/null
+++ b/data/as/455374/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.455374",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/455374/ws-services-calculation/WCBillingSlab.json b/data/as/455374/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..933129c979
--- /dev/null
+++ b/data/as/455374/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.455374",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4566832/BillingService/BusinessService.json b/data/as/4566832/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e0191cd9bb
--- /dev/null
+++ b/data/as/4566832/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4566832",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4566832/egov-location/boundary-data.json b/data/as/4566832/egov-location/boundary-data.json
new file mode 100644
index 0000000000..81c61e963b
--- /dev/null
+++ b/data/as/4566832/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4566832",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RATANJALI PWSS",
+                "localname": "RATANJALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4566832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RATANJALI PWSS",
+                        "localname": "RATANJALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RATANJALI PWSS",
+                "localname": "RATANJALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4566832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RATANJALI PWSS",
+                        "localname": "RATANJALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4566832/ws-services-calculation/Penalty.json b/data/as/4566832/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f1c3a488c
--- /dev/null
+++ b/data/as/4566832/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4566832",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4566832/ws-services-calculation/WCBillingSlab.json b/data/as/4566832/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf8a86811d
--- /dev/null
+++ b/data/as/4566832/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4566832",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567143/BillingService/BusinessService.json b/data/as/4567143/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de8901d906
--- /dev/null
+++ b/data/as/4567143/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567143",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567143/egov-location/boundary-data.json b/data/as/4567143/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b35b0d1e2d
--- /dev/null
+++ b/data/as/4567143/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567143",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI TE PWSS",
+                "localname": "DHEKIAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI TE PWSS",
+                        "localname": "DHEKIAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI TE PWSS",
+                "localname": "DHEKIAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI TE PWSS",
+                        "localname": "DHEKIAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567143/ws-services-calculation/Penalty.json b/data/as/4567143/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..acc8b20b09
--- /dev/null
+++ b/data/as/4567143/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567143",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567143/ws-services-calculation/WCBillingSlab.json b/data/as/4567143/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d697561f3
--- /dev/null
+++ b/data/as/4567143/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567143",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567157/BillingService/BusinessService.json b/data/as/4567157/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37716df822
--- /dev/null
+++ b/data/as/4567157/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567157",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567157/egov-location/boundary-data.json b/data/as/4567157/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab6ba8a5b5
--- /dev/null
+++ b/data/as/4567157/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567157",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINSORIA BAGAN PWSS",
+                "localname": "TINSORIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINSORIA BAGAN PWSS",
+                        "localname": "TINSORIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINSORIA BAGAN PWSS",
+                "localname": "TINSORIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINSORIA BAGAN PWSS",
+                        "localname": "TINSORIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567157/ws-services-calculation/Penalty.json b/data/as/4567157/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f8fdaec8a
--- /dev/null
+++ b/data/as/4567157/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567157",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567157/ws-services-calculation/WCBillingSlab.json b/data/as/4567157/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f8049778fc
--- /dev/null
+++ b/data/as/4567157/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567157",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567167/BillingService/BusinessService.json b/data/as/4567167/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c9d225776
--- /dev/null
+++ b/data/as/4567167/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567167",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567167/egov-location/boundary-data.json b/data/as/4567167/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e94ec06ed
--- /dev/null
+++ b/data/as/4567167/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567167",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHYMGURI PWSS",
+                "localname": "SHYMGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567167",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHYMGURI PWSS",
+                        "localname": "SHYMGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHYMGURI PWSS",
+                "localname": "SHYMGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567167",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHYMGURI PWSS",
+                        "localname": "SHYMGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567167/ws-services-calculation/Penalty.json b/data/as/4567167/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5bc8f2d55
--- /dev/null
+++ b/data/as/4567167/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567167",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567167/ws-services-calculation/WCBillingSlab.json b/data/as/4567167/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e2b5f768ad
--- /dev/null
+++ b/data/as/4567167/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567167",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567203/BillingService/BusinessService.json b/data/as/4567203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6efed6ba5c
--- /dev/null
+++ b/data/as/4567203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567203/egov-location/boundary-data.json b/data/as/4567203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ffc401846
--- /dev/null
+++ b/data/as/4567203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENIMARI PWSS",
+                "localname": "CHENIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENIMARI PWSS",
+                        "localname": "CHENIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENIMARI PWSS",
+                "localname": "CHENIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENIMARI PWSS",
+                        "localname": "CHENIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567203/ws-services-calculation/Penalty.json b/data/as/4567203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e174f41b94
--- /dev/null
+++ b/data/as/4567203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567203/ws-services-calculation/WCBillingSlab.json b/data/as/4567203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32b0b7de7c
--- /dev/null
+++ b/data/as/4567203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567253/BillingService/BusinessService.json b/data/as/4567253/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b8307c649
--- /dev/null
+++ b/data/as/4567253/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567253",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567253/egov-location/boundary-data.json b/data/as/4567253/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b45f13a112
--- /dev/null
+++ b/data/as/4567253/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567253",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAR PATHAR PWSS",
+                "localname": "KAMAR PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567253",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAR PATHAR PWSS",
+                        "localname": "KAMAR PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAR PATHAR PWSS",
+                "localname": "KAMAR PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567253",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAR PATHAR PWSS",
+                        "localname": "KAMAR PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567253/ws-services-calculation/Penalty.json b/data/as/4567253/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de30a34b8e
--- /dev/null
+++ b/data/as/4567253/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567253",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567253/ws-services-calculation/WCBillingSlab.json b/data/as/4567253/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ac5c7e930
--- /dev/null
+++ b/data/as/4567253/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567253",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567258/BillingService/BusinessService.json b/data/as/4567258/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3316dacbea
--- /dev/null
+++ b/data/as/4567258/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567258",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567258/egov-location/boundary-data.json b/data/as/4567258/egov-location/boundary-data.json
new file mode 100644
index 0000000000..afc9b18270
--- /dev/null
+++ b/data/as/4567258/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567258",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMARCHUBURI PWSS",
+                "localname": "KAMARCHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567258",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMARCHUBURI PWSS",
+                        "localname": "KAMARCHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMARCHUBURI PWSS",
+                "localname": "KAMARCHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567258",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMARCHUBURI PWSS",
+                        "localname": "KAMARCHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567258/ws-services-calculation/Penalty.json b/data/as/4567258/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89d2c2822e
--- /dev/null
+++ b/data/as/4567258/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567258",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567258/ws-services-calculation/WCBillingSlab.json b/data/as/4567258/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8844bdddfb
--- /dev/null
+++ b/data/as/4567258/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567258",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567264/BillingService/BusinessService.json b/data/as/4567264/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a3a0f433d8
--- /dev/null
+++ b/data/as/4567264/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567264",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567264/egov-location/boundary-data.json b/data/as/4567264/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e9fd71d26a
--- /dev/null
+++ b/data/as/4567264/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567264",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                "localname": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                        "localname": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                "localname": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                        "localname": "BORBIL KACHARI (BAMUNPUKHURI) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567264/ws-services-calculation/Penalty.json b/data/as/4567264/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a442f5bac7
--- /dev/null
+++ b/data/as/4567264/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567264",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567264/ws-services-calculation/WCBillingSlab.json b/data/as/4567264/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e05b7c843a
--- /dev/null
+++ b/data/as/4567264/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567264",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567271/BillingService/BusinessService.json b/data/as/4567271/BillingService/BusinessService.json
new file mode 100644
index 0000000000..060801f64e
--- /dev/null
+++ b/data/as/4567271/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4567271",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567271/egov-location/boundary-data.json b/data/as/4567271/egov-location/boundary-data.json
new file mode 100644
index 0000000000..76947af614
--- /dev/null
+++ b/data/as/4567271/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4567271",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUN PUKHURI PWSS",
+                "localname": "BAMUN PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUN PUKHURI PWSS",
+                        "localname": "BAMUN PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUN PUKHURI PWSS",
+                "localname": "BAMUN PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4567271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUN PUKHURI PWSS",
+                        "localname": "BAMUN PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567271/ws-services-calculation/Penalty.json b/data/as/4567271/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a790db5a51
--- /dev/null
+++ b/data/as/4567271/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4567271",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4567271/ws-services-calculation/WCBillingSlab.json b/data/as/4567271/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c0ae4a9fd2
--- /dev/null
+++ b/data/as/4567271/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4567271",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627074/BillingService/BusinessService.json b/data/as/4627074/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6d384934ef
--- /dev/null
+++ b/data/as/4627074/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4627074",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627074/egov-location/boundary-data.json b/data/as/4627074/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0eec91528f
--- /dev/null
+++ b/data/as/4627074/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4627074",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KORSONTOLA BORIGAON",
+                "localname": "KORSONTOLA BORIGAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4627074",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KORSONTOLA BORIGAON",
+                        "localname": "KORSONTOLA BORIGAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KORSONTOLA BORIGAON",
+                "localname": "KORSONTOLA BORIGAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4627074",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KORSONTOLA BORIGAON",
+                        "localname": "KORSONTOLA BORIGAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627074/ws-services-calculation/Penalty.json b/data/as/4627074/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..762e544f34
--- /dev/null
+++ b/data/as/4627074/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4627074",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627074/ws-services-calculation/WCBillingSlab.json b/data/as/4627074/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..45447e519c
--- /dev/null
+++ b/data/as/4627074/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4627074",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627137/BillingService/BusinessService.json b/data/as/4627137/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f558d0f5f
--- /dev/null
+++ b/data/as/4627137/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4627137",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627137/egov-location/boundary-data.json b/data/as/4627137/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eae5a5bcde
--- /dev/null
+++ b/data/as/4627137/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4627137",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHOBARI BHAGOWATICHUK PWSS",
+                "localname": "KATHOBARI BHAGOWATICHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4627137",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHOBARI BHAGOWATICHUK PWSS",
+                        "localname": "KATHOBARI BHAGOWATICHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHOBARI BHAGOWATICHUK PWSS",
+                "localname": "KATHOBARI BHAGOWATICHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4627137",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHOBARI BHAGOWATICHUK PWSS",
+                        "localname": "KATHOBARI BHAGOWATICHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627137/ws-services-calculation/Penalty.json b/data/as/4627137/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aef0134e14
--- /dev/null
+++ b/data/as/4627137/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4627137",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4627137/ws-services-calculation/WCBillingSlab.json b/data/as/4627137/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b39962e6e3
--- /dev/null
+++ b/data/as/4627137/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4627137",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637354/BillingService/BusinessService.json b/data/as/4637354/BillingService/BusinessService.json
new file mode 100644
index 0000000000..def9e072ee
--- /dev/null
+++ b/data/as/4637354/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4637354",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637354/egov-location/boundary-data.json b/data/as/4637354/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52bc1de06f
--- /dev/null
+++ b/data/as/4637354/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4637354",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMANIGAON PWSS",
+                "localname": "NAMANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637354",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMANIGAON PWSS",
+                        "localname": "NAMANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMANIGAON PWSS",
+                "localname": "NAMANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637354",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMANIGAON PWSS",
+                        "localname": "NAMANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637354/ws-services-calculation/Penalty.json b/data/as/4637354/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d8f436f272
--- /dev/null
+++ b/data/as/4637354/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4637354",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637354/ws-services-calculation/WCBillingSlab.json b/data/as/4637354/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80db9d0320
--- /dev/null
+++ b/data/as/4637354/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4637354",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637711/BillingService/BusinessService.json b/data/as/4637711/BillingService/BusinessService.json
new file mode 100644
index 0000000000..69e512f0dc
--- /dev/null
+++ b/data/as/4637711/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4637711",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637711/egov-location/boundary-data.json b/data/as/4637711/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20865841b1
--- /dev/null
+++ b/data/as/4637711/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4637711",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHUYANPARA PWSS",
+                "localname": "RETROFITTING OF BHUYANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHUYANPARA PWSS",
+                        "localname": "RETROFITTING OF BHUYANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHUYANPARA PWSS",
+                "localname": "RETROFITTING OF BHUYANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHUYANPARA PWSS",
+                        "localname": "RETROFITTING OF BHUYANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637711/ws-services-calculation/Penalty.json b/data/as/4637711/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68d36f4b92
--- /dev/null
+++ b/data/as/4637711/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4637711",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637711/ws-services-calculation/WCBillingSlab.json b/data/as/4637711/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..36ad473c94
--- /dev/null
+++ b/data/as/4637711/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4637711",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637724/BillingService/BusinessService.json b/data/as/4637724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..64c113f97f
--- /dev/null
+++ b/data/as/4637724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4637724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637724/egov-location/boundary-data.json b/data/as/4637724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f27a0d4fad
--- /dev/null
+++ b/data/as/4637724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4637724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GUTIBARI PWSS",
+                "localname": "RETROFITTING OF GUTIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GUTIBARI PWSS",
+                        "localname": "RETROFITTING OF GUTIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GUTIBARI PWSS",
+                "localname": "RETROFITTING OF GUTIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GUTIBARI PWSS",
+                        "localname": "RETROFITTING OF GUTIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637724/ws-services-calculation/Penalty.json b/data/as/4637724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b05f0f7c89
--- /dev/null
+++ b/data/as/4637724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4637724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637724/ws-services-calculation/WCBillingSlab.json b/data/as/4637724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ddde4d53ec
--- /dev/null
+++ b/data/as/4637724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4637724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637728/BillingService/BusinessService.json b/data/as/4637728/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cdca8f467f
--- /dev/null
+++ b/data/as/4637728/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4637728",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637728/egov-location/boundary-data.json b/data/as/4637728/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f25854556
--- /dev/null
+++ b/data/as/4637728/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4637728",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEBEJIA PWSS",
+                "localname": "BEBEJIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637728",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEBEJIA PWSS",
+                        "localname": "BEBEJIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEBEJIA PWSS",
+                "localname": "BEBEJIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4637728",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEBEJIA PWSS",
+                        "localname": "BEBEJIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637728/ws-services-calculation/Penalty.json b/data/as/4637728/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..02f3fbc48f
--- /dev/null
+++ b/data/as/4637728/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4637728",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4637728/ws-services-calculation/WCBillingSlab.json b/data/as/4637728/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85f8aefb8c
--- /dev/null
+++ b/data/as/4637728/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4637728",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4638859/BillingService/BusinessService.json b/data/as/4638859/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1aeed721db
--- /dev/null
+++ b/data/as/4638859/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4638859",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4638859/egov-location/boundary-data.json b/data/as/4638859/egov-location/boundary-data.json
new file mode 100644
index 0000000000..01c131615f
--- /dev/null
+++ b/data/as/4638859/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4638859",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARCHUK PWSS",
+                "localname": "RETROFITTING OF KAMARCHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4638859",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARCHUK PWSS",
+                        "localname": "RETROFITTING OF KAMARCHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARCHUK PWSS",
+                "localname": "RETROFITTING OF KAMARCHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4638859",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARCHUK PWSS",
+                        "localname": "RETROFITTING OF KAMARCHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4638859/ws-services-calculation/Penalty.json b/data/as/4638859/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2ea23df9a1
--- /dev/null
+++ b/data/as/4638859/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4638859",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4638859/ws-services-calculation/WCBillingSlab.json b/data/as/4638859/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1282165227
--- /dev/null
+++ b/data/as/4638859/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4638859",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639802/BillingService/BusinessService.json b/data/as/4639802/BillingService/BusinessService.json
new file mode 100644
index 0000000000..83271fec8c
--- /dev/null
+++ b/data/as/4639802/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4639802",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639802/egov-location/boundary-data.json b/data/as/4639802/egov-location/boundary-data.json
new file mode 100644
index 0000000000..041d64a2f9
--- /dev/null
+++ b/data/as/4639802/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4639802",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONARIGAON PWSS.",
+                "localname": "SONARIGAON PWSS.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONARIGAON PWSS.",
+                        "localname": "SONARIGAON PWSS.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONARIGAON PWSS.",
+                "localname": "SONARIGAON PWSS.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONARIGAON PWSS.",
+                        "localname": "SONARIGAON PWSS.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639802/ws-services-calculation/Penalty.json b/data/as/4639802/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..518676b801
--- /dev/null
+++ b/data/as/4639802/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4639802",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639802/ws-services-calculation/WCBillingSlab.json b/data/as/4639802/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d652ba3d95
--- /dev/null
+++ b/data/as/4639802/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4639802",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639900/BillingService/BusinessService.json b/data/as/4639900/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1cf0f4e1bd
--- /dev/null
+++ b/data/as/4639900/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4639900",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639900/egov-location/boundary-data.json b/data/as/4639900/egov-location/boundary-data.json
new file mode 100644
index 0000000000..282650491a
--- /dev/null
+++ b/data/as/4639900/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4639900",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                "localname": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639900",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                        "localname": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                "localname": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639900",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                        "localname": "RETROFITTING OF BORPUKHURIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639900/ws-services-calculation/Penalty.json b/data/as/4639900/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c605ef26c7
--- /dev/null
+++ b/data/as/4639900/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4639900",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639900/ws-services-calculation/WCBillingSlab.json b/data/as/4639900/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..622a19ca9f
--- /dev/null
+++ b/data/as/4639900/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4639900",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639926/BillingService/BusinessService.json b/data/as/4639926/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0367a24df
--- /dev/null
+++ b/data/as/4639926/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4639926",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639926/egov-location/boundary-data.json b/data/as/4639926/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f18766e595
--- /dev/null
+++ b/data/as/4639926/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4639926",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOMIRIPAL PWSS",
+                "localname": "GOMIRIPAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639926",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOMIRIPAL PWSS",
+                        "localname": "GOMIRIPAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOMIRIPAL PWSS",
+                "localname": "GOMIRIPAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639926",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOMIRIPAL PWSS",
+                        "localname": "GOMIRIPAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639926/ws-services-calculation/Penalty.json b/data/as/4639926/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d45eca862e
--- /dev/null
+++ b/data/as/4639926/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4639926",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639926/ws-services-calculation/WCBillingSlab.json b/data/as/4639926/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..92e6a2067c
--- /dev/null
+++ b/data/as/4639926/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4639926",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639994/BillingService/BusinessService.json b/data/as/4639994/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f9c499a60
--- /dev/null
+++ b/data/as/4639994/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4639994",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639994/egov-location/boundary-data.json b/data/as/4639994/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1cf1a40f0
--- /dev/null
+++ b/data/as/4639994/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4639994",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIGAON PWSS",
+                "localname": "GHILADHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639994",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIGAON PWSS",
+                        "localname": "GHILADHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIGAON PWSS",
+                "localname": "GHILADHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4639994",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIGAON PWSS",
+                        "localname": "GHILADHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639994/ws-services-calculation/Penalty.json b/data/as/4639994/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d4909e1c5
--- /dev/null
+++ b/data/as/4639994/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4639994",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4639994/ws-services-calculation/WCBillingSlab.json b/data/as/4639994/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a62f1ece37
--- /dev/null
+++ b/data/as/4639994/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4639994",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640433/BillingService/BusinessService.json b/data/as/4640433/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d28ae89724
--- /dev/null
+++ b/data/as/4640433/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4640433",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640433/egov-location/boundary-data.json b/data/as/4640433/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e7a67ce5d
--- /dev/null
+++ b/data/as/4640433/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4640433",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBASTI PATHAR PWSS",
+                "localname": "PALASHBASTI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4640433",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBASTI PATHAR PWSS",
+                        "localname": "PALASHBASTI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBASTI PATHAR PWSS",
+                "localname": "PALASHBASTI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4640433",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBASTI PATHAR PWSS",
+                        "localname": "PALASHBASTI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640433/ws-services-calculation/Penalty.json b/data/as/4640433/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9d3c905370
--- /dev/null
+++ b/data/as/4640433/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4640433",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640433/ws-services-calculation/WCBillingSlab.json b/data/as/4640433/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8e86b01a8d
--- /dev/null
+++ b/data/as/4640433/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4640433",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640480/BillingService/BusinessService.json b/data/as/4640480/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d09591ebdc
--- /dev/null
+++ b/data/as/4640480/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4640480",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640480/egov-location/boundary-data.json b/data/as/4640480/egov-location/boundary-data.json
new file mode 100644
index 0000000000..84b82ab5e3
--- /dev/null
+++ b/data/as/4640480/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4640480",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZGORPAL PWSS",
+                "localname": "NIZGORPAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4640480",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZGORPAL PWSS",
+                        "localname": "NIZGORPAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZGORPAL PWSS",
+                "localname": "NIZGORPAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4640480",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZGORPAL PWSS",
+                        "localname": "NIZGORPAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640480/ws-services-calculation/Penalty.json b/data/as/4640480/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1fb6f84f2
--- /dev/null
+++ b/data/as/4640480/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4640480",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4640480/ws-services-calculation/WCBillingSlab.json b/data/as/4640480/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56ae9ca4f1
--- /dev/null
+++ b/data/as/4640480/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4640480",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642317/BillingService/BusinessService.json b/data/as/4642317/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46116ce30b
--- /dev/null
+++ b/data/as/4642317/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4642317",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642317/egov-location/boundary-data.json b/data/as/4642317/egov-location/boundary-data.json
new file mode 100644
index 0000000000..65c613b709
--- /dev/null
+++ b/data/as/4642317/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4642317",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULIP TE PWSS",
+                "localname": "TULIP TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4642317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULIP TE PWSS",
+                        "localname": "TULIP TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULIP TE PWSS",
+                "localname": "TULIP TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4642317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULIP TE PWSS",
+                        "localname": "TULIP TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642317/ws-services-calculation/Penalty.json b/data/as/4642317/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b0febef1c4
--- /dev/null
+++ b/data/as/4642317/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4642317",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642317/ws-services-calculation/WCBillingSlab.json b/data/as/4642317/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e1290383d4
--- /dev/null
+++ b/data/as/4642317/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4642317",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642337/BillingService/BusinessService.json b/data/as/4642337/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad0a55b81d
--- /dev/null
+++ b/data/as/4642337/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4642337",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642337/egov-location/boundary-data.json b/data/as/4642337/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9749d177d
--- /dev/null
+++ b/data/as/4642337/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4642337",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASBASTI PATHAR",
+                "localname": "PALASBASTI PATHAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4642337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASBASTI PATHAR",
+                        "localname": "PALASBASTI PATHAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASBASTI PATHAR",
+                "localname": "PALASBASTI PATHAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4642337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASBASTI PATHAR",
+                        "localname": "PALASBASTI PATHAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642337/ws-services-calculation/Penalty.json b/data/as/4642337/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d1669a612
--- /dev/null
+++ b/data/as/4642337/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4642337",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4642337/ws-services-calculation/WCBillingSlab.json b/data/as/4642337/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..136e76b250
--- /dev/null
+++ b/data/as/4642337/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4642337",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4651600/BillingService/BusinessService.json b/data/as/4651600/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4621314e49
--- /dev/null
+++ b/data/as/4651600/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4651600",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4651600/egov-location/boundary-data.json b/data/as/4651600/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3469500346
--- /dev/null
+++ b/data/as/4651600/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4651600",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASU PT II PWSS",
+                "localname": "THEKASU PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4651600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASU PT II PWSS",
+                        "localname": "THEKASU PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASU PT II PWSS",
+                "localname": "THEKASU PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4651600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASU PT II PWSS",
+                        "localname": "THEKASU PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4651600/ws-services-calculation/Penalty.json b/data/as/4651600/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..840a353098
--- /dev/null
+++ b/data/as/4651600/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4651600",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4651600/ws-services-calculation/WCBillingSlab.json b/data/as/4651600/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f0094d417
--- /dev/null
+++ b/data/as/4651600/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4651600",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4652293/BillingService/BusinessService.json b/data/as/4652293/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d0852b1ffe
--- /dev/null
+++ b/data/as/4652293/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4652293",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4652293/egov-location/boundary-data.json b/data/as/4652293/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ca139aa64
--- /dev/null
+++ b/data/as/4652293/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4652293",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGAON PWSS",
+                "localname": "BANGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4652293",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGAON PWSS",
+                        "localname": "BANGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGAON PWSS",
+                "localname": "BANGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4652293",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGAON PWSS",
+                        "localname": "BANGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4652293/ws-services-calculation/Penalty.json b/data/as/4652293/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..06cbdeac01
--- /dev/null
+++ b/data/as/4652293/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4652293",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4652293/ws-services-calculation/WCBillingSlab.json b/data/as/4652293/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..000c93602a
--- /dev/null
+++ b/data/as/4652293/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4652293",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4653590/BillingService/BusinessService.json b/data/as/4653590/BillingService/BusinessService.json
new file mode 100644
index 0000000000..336ae8be8d
--- /dev/null
+++ b/data/as/4653590/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4653590",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4653590/egov-location/boundary-data.json b/data/as/4653590/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ec8cfe3561
--- /dev/null
+++ b/data/as/4653590/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4653590",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIA PWSS",
+                "localname": "SINGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4653590",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIA PWSS",
+                        "localname": "SINGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIA PWSS",
+                "localname": "SINGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4653590",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIA PWSS",
+                        "localname": "SINGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4653590/ws-services-calculation/Penalty.json b/data/as/4653590/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f7d68a098
--- /dev/null
+++ b/data/as/4653590/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4653590",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4653590/ws-services-calculation/WCBillingSlab.json b/data/as/4653590/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b03b0f1a57
--- /dev/null
+++ b/data/as/4653590/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4653590",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4654670/BillingService/BusinessService.json b/data/as/4654670/BillingService/BusinessService.json
new file mode 100644
index 0000000000..552660b661
--- /dev/null
+++ b/data/as/4654670/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4654670",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4654670/egov-location/boundary-data.json b/data/as/4654670/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ec05eeb8e
--- /dev/null
+++ b/data/as/4654670/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4654670",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAMARI PWSS",
+                "localname": "BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4654670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAMARI PWSS",
+                        "localname": "BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAMARI PWSS",
+                "localname": "BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4654670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAMARI PWSS",
+                        "localname": "BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4654670/ws-services-calculation/Penalty.json b/data/as/4654670/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3914a719c8
--- /dev/null
+++ b/data/as/4654670/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4654670",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4654670/ws-services-calculation/WCBillingSlab.json b/data/as/4654670/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e15e990a0
--- /dev/null
+++ b/data/as/4654670/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4654670",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655460/BillingService/BusinessService.json b/data/as/4655460/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b35648fad4
--- /dev/null
+++ b/data/as/4655460/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4655460",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655460/egov-location/boundary-data.json b/data/as/4655460/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49317c3616
--- /dev/null
+++ b/data/as/4655460/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4655460",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARANAKURI PWSS",
+                "localname": "MARANAKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4655460",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARANAKURI PWSS",
+                        "localname": "MARANAKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARANAKURI PWSS",
+                "localname": "MARANAKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4655460",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARANAKURI PWSS",
+                        "localname": "MARANAKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655460/ws-services-calculation/Penalty.json b/data/as/4655460/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bca8ca514d
--- /dev/null
+++ b/data/as/4655460/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4655460",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655460/ws-services-calculation/WCBillingSlab.json b/data/as/4655460/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d00e8b726
--- /dev/null
+++ b/data/as/4655460/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4655460",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655542/BillingService/BusinessService.json b/data/as/4655542/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d469faa945
--- /dev/null
+++ b/data/as/4655542/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4655542",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655542/egov-location/boundary-data.json b/data/as/4655542/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6dc5cf4d3c
--- /dev/null
+++ b/data/as/4655542/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4655542",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDIKARAI PWSS",
+                "localname": "BORDIKARAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4655542",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDIKARAI PWSS",
+                        "localname": "BORDIKARAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDIKARAI PWSS",
+                "localname": "BORDIKARAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4655542",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDIKARAI PWSS",
+                        "localname": "BORDIKARAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655542/ws-services-calculation/Penalty.json b/data/as/4655542/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2860e9025b
--- /dev/null
+++ b/data/as/4655542/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4655542",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655542/ws-services-calculation/WCBillingSlab.json b/data/as/4655542/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0b5b5c601
--- /dev/null
+++ b/data/as/4655542/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4655542",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655617/BillingService/BusinessService.json b/data/as/4655617/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ac35e57eb
--- /dev/null
+++ b/data/as/4655617/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4655617",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655617/egov-location/boundary-data.json b/data/as/4655617/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9bfa1489b9
--- /dev/null
+++ b/data/as/4655617/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4655617",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOROIANI PWSS",
+                "localname": "KOROIANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4655617",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOROIANI PWSS",
+                        "localname": "KOROIANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOROIANI PWSS",
+                "localname": "KOROIANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4655617",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOROIANI PWSS",
+                        "localname": "KOROIANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655617/ws-services-calculation/Penalty.json b/data/as/4655617/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05645a335d
--- /dev/null
+++ b/data/as/4655617/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4655617",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4655617/ws-services-calculation/WCBillingSlab.json b/data/as/4655617/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ddafc847c
--- /dev/null
+++ b/data/as/4655617/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4655617",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656070/BillingService/BusinessService.json b/data/as/4656070/BillingService/BusinessService.json
new file mode 100644
index 0000000000..93b52ded3e
--- /dev/null
+++ b/data/as/4656070/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4656070",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656070/egov-location/boundary-data.json b/data/as/4656070/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1b77b76a2c
--- /dev/null
+++ b/data/as/4656070/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4656070",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PITHAGURIDOL PWSS",
+                "localname": "PITHAGURIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4656070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PITHAGURIDOL PWSS",
+                        "localname": "PITHAGURIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PITHAGURIDOL PWSS",
+                "localname": "PITHAGURIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4656070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PITHAGURIDOL PWSS",
+                        "localname": "PITHAGURIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656070/ws-services-calculation/Penalty.json b/data/as/4656070/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bded1f50e5
--- /dev/null
+++ b/data/as/4656070/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4656070",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656070/ws-services-calculation/WCBillingSlab.json b/data/as/4656070/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a502790c77
--- /dev/null
+++ b/data/as/4656070/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4656070",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656202/BillingService/BusinessService.json b/data/as/4656202/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9703ad461c
--- /dev/null
+++ b/data/as/4656202/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4656202",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656202/egov-location/boundary-data.json b/data/as/4656202/egov-location/boundary-data.json
new file mode 100644
index 0000000000..01280dabfe
--- /dev/null
+++ b/data/as/4656202/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4656202",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILONI PWSS",
+                "localname": "SILONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4656202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILONI PWSS",
+                        "localname": "SILONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILONI PWSS",
+                "localname": "SILONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4656202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILONI PWSS",
+                        "localname": "SILONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656202/ws-services-calculation/Penalty.json b/data/as/4656202/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f64c7a7e38
--- /dev/null
+++ b/data/as/4656202/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4656202",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656202/ws-services-calculation/WCBillingSlab.json b/data/as/4656202/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b5883fca07
--- /dev/null
+++ b/data/as/4656202/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4656202",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656990/BillingService/BusinessService.json b/data/as/4656990/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e4f9de9cc3
--- /dev/null
+++ b/data/as/4656990/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4656990",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656990/egov-location/boundary-data.json b/data/as/4656990/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ef8b12f4d
--- /dev/null
+++ b/data/as/4656990/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4656990",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ARALILOGA PWSS",
+                "localname": "RETROFITTING OF ARALILOGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4656990",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ARALILOGA PWSS",
+                        "localname": "RETROFITTING OF ARALILOGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ARALILOGA PWSS",
+                "localname": "RETROFITTING OF ARALILOGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4656990",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ARALILOGA PWSS",
+                        "localname": "RETROFITTING OF ARALILOGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656990/ws-services-calculation/Penalty.json b/data/as/4656990/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56aa736072
--- /dev/null
+++ b/data/as/4656990/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4656990",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4656990/ws-services-calculation/WCBillingSlab.json b/data/as/4656990/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8bbfde4f0b
--- /dev/null
+++ b/data/as/4656990/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4656990",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657126/BillingService/BusinessService.json b/data/as/4657126/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f4e8a659bb
--- /dev/null
+++ b/data/as/4657126/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4657126",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657126/egov-location/boundary-data.json b/data/as/4657126/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3aa12f1fd1
--- /dev/null
+++ b/data/as/4657126/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4657126",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RENGANIJAR PWSS",
+                "localname": "RENGANIJAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RENGANIJAR PWSS",
+                        "localname": "RENGANIJAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RENGANIJAR PWSS",
+                "localname": "RENGANIJAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RENGANIJAR PWSS",
+                        "localname": "RENGANIJAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657126/ws-services-calculation/Penalty.json b/data/as/4657126/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..605340139e
--- /dev/null
+++ b/data/as/4657126/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4657126",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657126/ws-services-calculation/WCBillingSlab.json b/data/as/4657126/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c50f1cf9fa
--- /dev/null
+++ b/data/as/4657126/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4657126",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657150/BillingService/BusinessService.json b/data/as/4657150/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f808cda483
--- /dev/null
+++ b/data/as/4657150/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4657150",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657150/egov-location/boundary-data.json b/data/as/4657150/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d30e3fd98b
--- /dev/null
+++ b/data/as/4657150/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4657150",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARCHURA PWSS",
+                "localname": "RETROFITTING OF HARCHURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARCHURA PWSS",
+                        "localname": "RETROFITTING OF HARCHURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARCHURA PWSS",
+                "localname": "RETROFITTING OF HARCHURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARCHURA PWSS",
+                        "localname": "RETROFITTING OF HARCHURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657150/ws-services-calculation/Penalty.json b/data/as/4657150/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b6ab68e16c
--- /dev/null
+++ b/data/as/4657150/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4657150",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657150/ws-services-calculation/WCBillingSlab.json b/data/as/4657150/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27ecffaaa5
--- /dev/null
+++ b/data/as/4657150/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4657150",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657189/BillingService/BusinessService.json b/data/as/4657189/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ee80b01cd
--- /dev/null
+++ b/data/as/4657189/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4657189",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657189/egov-location/boundary-data.json b/data/as/4657189/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6a6ee05e8d
--- /dev/null
+++ b/data/as/4657189/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4657189",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BERAJAN PWSS",
+                "localname": "BERAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BERAJAN PWSS",
+                        "localname": "BERAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BERAJAN PWSS",
+                "localname": "BERAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BERAJAN PWSS",
+                        "localname": "BERAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657189/ws-services-calculation/Penalty.json b/data/as/4657189/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a6f923295d
--- /dev/null
+++ b/data/as/4657189/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4657189",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657189/ws-services-calculation/WCBillingSlab.json b/data/as/4657189/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..70e5a3b36b
--- /dev/null
+++ b/data/as/4657189/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4657189",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657198/BillingService/BusinessService.json b/data/as/4657198/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d0bbe4451a
--- /dev/null
+++ b/data/as/4657198/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4657198",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657198/egov-location/boundary-data.json b/data/as/4657198/egov-location/boundary-data.json
new file mode 100644
index 0000000000..747e2e943d
--- /dev/null
+++ b/data/as/4657198/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4657198",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON TE PWSS",
+                "localname": "KACHARIGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON TE PWSS",
+                        "localname": "KACHARIGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON TE PWSS",
+                "localname": "KACHARIGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON TE PWSS",
+                        "localname": "KACHARIGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657198/ws-services-calculation/Penalty.json b/data/as/4657198/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5851402cf
--- /dev/null
+++ b/data/as/4657198/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4657198",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657198/ws-services-calculation/WCBillingSlab.json b/data/as/4657198/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07a46dc304
--- /dev/null
+++ b/data/as/4657198/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4657198",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657250/BillingService/BusinessService.json b/data/as/4657250/BillingService/BusinessService.json
new file mode 100644
index 0000000000..055588c4be
--- /dev/null
+++ b/data/as/4657250/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4657250",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657250/egov-location/boundary-data.json b/data/as/4657250/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4691cbd28
--- /dev/null
+++ b/data/as/4657250/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4657250",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AKABASTI PWSS",
+                "localname": "AKABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657250",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AKABASTI PWSS",
+                        "localname": "AKABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AKABASTI PWSS",
+                "localname": "AKABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4657250",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AKABASTI PWSS",
+                        "localname": "AKABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657250/ws-services-calculation/Penalty.json b/data/as/4657250/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05bacc254c
--- /dev/null
+++ b/data/as/4657250/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4657250",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4657250/ws-services-calculation/WCBillingSlab.json b/data/as/4657250/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..112b94cd2f
--- /dev/null
+++ b/data/as/4657250/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4657250",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658923/BillingService/BusinessService.json b/data/as/4658923/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55c9fc6fdf
--- /dev/null
+++ b/data/as/4658923/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4658923",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658923/egov-location/boundary-data.json b/data/as/4658923/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e1cf4ce818
--- /dev/null
+++ b/data/as/4658923/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4658923",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORAGURI PWSS",
+                "localname": "BORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4658923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORAGURI PWSS",
+                        "localname": "BORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORAGURI PWSS",
+                "localname": "BORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4658923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORAGURI PWSS",
+                        "localname": "BORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658923/ws-services-calculation/Penalty.json b/data/as/4658923/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df74871314
--- /dev/null
+++ b/data/as/4658923/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4658923",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658923/ws-services-calculation/WCBillingSlab.json b/data/as/4658923/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..389b617100
--- /dev/null
+++ b/data/as/4658923/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4658923",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658962/BillingService/BusinessService.json b/data/as/4658962/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bf215d1d66
--- /dev/null
+++ b/data/as/4658962/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4658962",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658962/egov-location/boundary-data.json b/data/as/4658962/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5ffeb7baeb
--- /dev/null
+++ b/data/as/4658962/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4658962",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOMORAGURI PWSS",
+                "localname": "BHOMORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4658962",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOMORAGURI PWSS",
+                        "localname": "BHOMORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOMORAGURI PWSS",
+                "localname": "BHOMORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4658962",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOMORAGURI PWSS",
+                        "localname": "BHOMORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658962/ws-services-calculation/Penalty.json b/data/as/4658962/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e91ca35302
--- /dev/null
+++ b/data/as/4658962/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4658962",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4658962/ws-services-calculation/WCBillingSlab.json b/data/as/4658962/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e128a396dd
--- /dev/null
+++ b/data/as/4658962/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4658962",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659024/BillingService/BusinessService.json b/data/as/4659024/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cce81aa1ce
--- /dev/null
+++ b/data/as/4659024/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4659024",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659024/egov-location/boundary-data.json b/data/as/4659024/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c10cc68573
--- /dev/null
+++ b/data/as/4659024/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4659024",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHARIKATI  PWSS",
+                "localname": "DHARIKATI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4659024",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHARIKATI  PWSS",
+                        "localname": "DHARIKATI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHARIKATI  PWSS",
+                "localname": "DHARIKATI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4659024",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHARIKATI  PWSS",
+                        "localname": "DHARIKATI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659024/ws-services-calculation/Penalty.json b/data/as/4659024/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40a9fed60c
--- /dev/null
+++ b/data/as/4659024/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4659024",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659024/ws-services-calculation/WCBillingSlab.json b/data/as/4659024/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a31da86422
--- /dev/null
+++ b/data/as/4659024/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4659024",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659210/BillingService/BusinessService.json b/data/as/4659210/BillingService/BusinessService.json
new file mode 100644
index 0000000000..be1181c82e
--- /dev/null
+++ b/data/as/4659210/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4659210",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659210/egov-location/boundary-data.json b/data/as/4659210/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f137c289a
--- /dev/null
+++ b/data/as/4659210/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4659210",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIBIL PWSS",
+                "localname": "JOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4659210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIBIL PWSS",
+                        "localname": "JOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIBIL PWSS",
+                "localname": "JOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4659210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIBIL PWSS",
+                        "localname": "JOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659210/ws-services-calculation/Penalty.json b/data/as/4659210/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..be09fed0b5
--- /dev/null
+++ b/data/as/4659210/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4659210",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4659210/ws-services-calculation/WCBillingSlab.json b/data/as/4659210/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47bccea7cc
--- /dev/null
+++ b/data/as/4659210/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4659210",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4668398/BillingService/BusinessService.json b/data/as/4668398/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6092c3778f
--- /dev/null
+++ b/data/as/4668398/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4668398",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4668398/egov-location/boundary-data.json b/data/as/4668398/egov-location/boundary-data.json
new file mode 100644
index 0000000000..470ba81cf5
--- /dev/null
+++ b/data/as/4668398/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4668398",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHITABOSTI  PWSS",
+                "localname": "CHITABOSTI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4668398",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHITABOSTI  PWSS",
+                        "localname": "CHITABOSTI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHITABOSTI  PWSS",
+                "localname": "CHITABOSTI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4668398",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHITABOSTI  PWSS",
+                        "localname": "CHITABOSTI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4668398/ws-services-calculation/Penalty.json b/data/as/4668398/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..069e0acad1
--- /dev/null
+++ b/data/as/4668398/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4668398",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4668398/ws-services-calculation/WCBillingSlab.json b/data/as/4668398/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e6cae845da
--- /dev/null
+++ b/data/as/4668398/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4668398",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4869442/BillingService/BusinessService.json b/data/as/4869442/BillingService/BusinessService.json
new file mode 100644
index 0000000000..307a3b24a8
--- /dev/null
+++ b/data/as/4869442/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4869442",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4869442/egov-location/boundary-data.json b/data/as/4869442/egov-location/boundary-data.json
new file mode 100644
index 0000000000..04008fd277
--- /dev/null
+++ b/data/as/4869442/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4869442",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON PWSS",
+                "localname": "JURIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4869442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON PWSS",
+                        "localname": "JURIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON PWSS",
+                "localname": "JURIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4869442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON PWSS",
+                        "localname": "JURIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4869442/ws-services-calculation/Penalty.json b/data/as/4869442/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08cf426af9
--- /dev/null
+++ b/data/as/4869442/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4869442",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4869442/ws-services-calculation/WCBillingSlab.json b/data/as/4869442/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56b71cfacc
--- /dev/null
+++ b/data/as/4869442/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4869442",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870166/BillingService/BusinessService.json b/data/as/4870166/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f07a534f0
--- /dev/null
+++ b/data/as/4870166/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4870166",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870166/egov-location/boundary-data.json b/data/as/4870166/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9b9e38f4b7
--- /dev/null
+++ b/data/as/4870166/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4870166",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATPARA PWSS",
+                "localname": "PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATPARA PWSS",
+                        "localname": "PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATPARA PWSS",
+                "localname": "PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATPARA PWSS",
+                        "localname": "PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870166/ws-services-calculation/Penalty.json b/data/as/4870166/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f57fdeb464
--- /dev/null
+++ b/data/as/4870166/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4870166",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870166/ws-services-calculation/WCBillingSlab.json b/data/as/4870166/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..175754cf97
--- /dev/null
+++ b/data/as/4870166/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4870166",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870229/BillingService/BusinessService.json b/data/as/4870229/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb6d1529ad
--- /dev/null
+++ b/data/as/4870229/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4870229",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870229/egov-location/boundary-data.json b/data/as/4870229/egov-location/boundary-data.json
new file mode 100644
index 0000000000..837881085c
--- /dev/null
+++ b/data/as/4870229/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4870229",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOISKHULI GAROPARA PWSS",
+                "localname": "MOISKHULI GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870229",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOISKHULI GAROPARA PWSS",
+                        "localname": "MOISKHULI GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOISKHULI GAROPARA PWSS",
+                "localname": "MOISKHULI GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870229",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOISKHULI GAROPARA PWSS",
+                        "localname": "MOISKHULI GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870229/ws-services-calculation/Penalty.json b/data/as/4870229/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78b0bb0d2c
--- /dev/null
+++ b/data/as/4870229/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4870229",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870229/ws-services-calculation/WCBillingSlab.json b/data/as/4870229/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb05b2ad72
--- /dev/null
+++ b/data/as/4870229/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4870229",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870250/BillingService/BusinessService.json b/data/as/4870250/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7355176c8
--- /dev/null
+++ b/data/as/4870250/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4870250",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870250/egov-location/boundary-data.json b/data/as/4870250/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4edfb2193c
--- /dev/null
+++ b/data/as/4870250/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4870250",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "5 NO. SARANARTHI CAMP PWSS",
+                "localname": "5 NO. SARANARTHI CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870250",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "5 NO. SARANARTHI CAMP PWSS",
+                        "localname": "5 NO. SARANARTHI CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "5 NO. SARANARTHI CAMP PWSS",
+                "localname": "5 NO. SARANARTHI CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870250",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "5 NO. SARANARTHI CAMP PWSS",
+                        "localname": "5 NO. SARANARTHI CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870250/ws-services-calculation/Penalty.json b/data/as/4870250/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d916b0ef66
--- /dev/null
+++ b/data/as/4870250/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4870250",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870250/ws-services-calculation/WCBillingSlab.json b/data/as/4870250/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..215e1d5a62
--- /dev/null
+++ b/data/as/4870250/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4870250",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870307/BillingService/BusinessService.json b/data/as/4870307/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b2733791c
--- /dev/null
+++ b/data/as/4870307/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4870307",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870307/egov-location/boundary-data.json b/data/as/4870307/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3fb70f0ccc
--- /dev/null
+++ b/data/as/4870307/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4870307",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASHDOBA PWSS",
+                "localname": "HASHDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASHDOBA PWSS",
+                        "localname": "HASHDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASHDOBA PWSS",
+                "localname": "HASHDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4870307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASHDOBA PWSS",
+                        "localname": "HASHDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870307/ws-services-calculation/Penalty.json b/data/as/4870307/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d9ef54b838
--- /dev/null
+++ b/data/as/4870307/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4870307",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4870307/ws-services-calculation/WCBillingSlab.json b/data/as/4870307/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bbe434d02f
--- /dev/null
+++ b/data/as/4870307/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4870307",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872574/BillingService/BusinessService.json b/data/as/4872574/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f14d443d54
--- /dev/null
+++ b/data/as/4872574/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872574",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872574/egov-location/boundary-data.json b/data/as/4872574/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e7455c037
--- /dev/null
+++ b/data/as/4872574/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872574",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALGRAM PWSS",
+                "localname": "MANDALGRAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALGRAM PWSS",
+                        "localname": "MANDALGRAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALGRAM PWSS",
+                "localname": "MANDALGRAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALGRAM PWSS",
+                        "localname": "MANDALGRAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872574/ws-services-calculation/Penalty.json b/data/as/4872574/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..956d71ab81
--- /dev/null
+++ b/data/as/4872574/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872574",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872574/ws-services-calculation/WCBillingSlab.json b/data/as/4872574/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3bcffd02c5
--- /dev/null
+++ b/data/as/4872574/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872574",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872595/BillingService/BusinessService.json b/data/as/4872595/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4fefd0a1f7
--- /dev/null
+++ b/data/as/4872595/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872595",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872595/egov-location/boundary-data.json b/data/as/4872595/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d556f61bd
--- /dev/null
+++ b/data/as/4872595/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872595",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHREE PT-III PWSS",
+                "localname": "BANDARSHREE PT-III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHREE PT-III PWSS",
+                        "localname": "BANDARSHREE PT-III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHREE PT-III PWSS",
+                "localname": "BANDARSHREE PT-III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHREE PT-III PWSS",
+                        "localname": "BANDARSHREE PT-III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872595/ws-services-calculation/Penalty.json b/data/as/4872595/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5423b4b267
--- /dev/null
+++ b/data/as/4872595/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872595",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872595/ws-services-calculation/WCBillingSlab.json b/data/as/4872595/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31ffcec7c5
--- /dev/null
+++ b/data/as/4872595/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872595",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872646/BillingService/BusinessService.json b/data/as/4872646/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d4d98a3dc
--- /dev/null
+++ b/data/as/4872646/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872646",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872646/egov-location/boundary-data.json b/data/as/4872646/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad54163558
--- /dev/null
+++ b/data/as/4872646/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872646",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANDURBER PWSS",
+                "localname": "ANDURBER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872646",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANDURBER PWSS",
+                        "localname": "ANDURBER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANDURBER PWSS",
+                "localname": "ANDURBER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872646",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANDURBER PWSS",
+                        "localname": "ANDURBER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872646/ws-services-calculation/Penalty.json b/data/as/4872646/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27724bc3a4
--- /dev/null
+++ b/data/as/4872646/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872646",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872646/ws-services-calculation/WCBillingSlab.json b/data/as/4872646/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..52b7d2a86e
--- /dev/null
+++ b/data/as/4872646/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872646",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872699/BillingService/BusinessService.json b/data/as/4872699/BillingService/BusinessService.json
new file mode 100644
index 0000000000..30188d2529
--- /dev/null
+++ b/data/as/4872699/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872699",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872699/egov-location/boundary-data.json b/data/as/4872699/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1d0e469a9e
--- /dev/null
+++ b/data/as/4872699/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872699",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMPUR PWSS",
+                "localname": "RAMPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872699",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMPUR PWSS",
+                        "localname": "RAMPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMPUR PWSS",
+                "localname": "RAMPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872699",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMPUR PWSS",
+                        "localname": "RAMPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872699/ws-services-calculation/Penalty.json b/data/as/4872699/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42a543cb76
--- /dev/null
+++ b/data/as/4872699/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872699",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872699/ws-services-calculation/WCBillingSlab.json b/data/as/4872699/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3eced6545d
--- /dev/null
+++ b/data/as/4872699/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872699",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872806/BillingService/BusinessService.json b/data/as/4872806/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8b4a847b73
--- /dev/null
+++ b/data/as/4872806/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872806",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872806/egov-location/boundary-data.json b/data/as/4872806/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d198faae0c
--- /dev/null
+++ b/data/as/4872806/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872806",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMULKANDI PWSS",
+                "localname": "SIMULKANDI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMULKANDI PWSS",
+                        "localname": "SIMULKANDI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMULKANDI PWSS",
+                "localname": "SIMULKANDI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMULKANDI PWSS",
+                        "localname": "SIMULKANDI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872806/ws-services-calculation/Penalty.json b/data/as/4872806/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42c5971514
--- /dev/null
+++ b/data/as/4872806/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872806",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872806/ws-services-calculation/WCBillingSlab.json b/data/as/4872806/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..08f0696b10
--- /dev/null
+++ b/data/as/4872806/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872806",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872849/BillingService/BusinessService.json b/data/as/4872849/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6bec5d7ff2
--- /dev/null
+++ b/data/as/4872849/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872849",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872849/egov-location/boundary-data.json b/data/as/4872849/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b67248300b
--- /dev/null
+++ b/data/as/4872849/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872849",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILAN NAGAR PWSS",
+                "localname": "MILAN NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILAN NAGAR PWSS",
+                        "localname": "MILAN NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILAN NAGAR PWSS",
+                "localname": "MILAN NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILAN NAGAR PWSS",
+                        "localname": "MILAN NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872849/ws-services-calculation/Penalty.json b/data/as/4872849/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6316008673
--- /dev/null
+++ b/data/as/4872849/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872849",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872849/ws-services-calculation/WCBillingSlab.json b/data/as/4872849/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..abe4e3e3fe
--- /dev/null
+++ b/data/as/4872849/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872849",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872988/BillingService/BusinessService.json b/data/as/4872988/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b1354f4776
--- /dev/null
+++ b/data/as/4872988/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4872988",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872988/egov-location/boundary-data.json b/data/as/4872988/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eac9ca5a20
--- /dev/null
+++ b/data/as/4872988/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4872988",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALU BAZAR PWSS",
+                "localname": "KALU BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALU BAZAR PWSS",
+                        "localname": "KALU BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALU BAZAR PWSS",
+                "localname": "KALU BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4872988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALU BAZAR PWSS",
+                        "localname": "KALU BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872988/ws-services-calculation/Penalty.json b/data/as/4872988/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c8583e592d
--- /dev/null
+++ b/data/as/4872988/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4872988",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4872988/ws-services-calculation/WCBillingSlab.json b/data/as/4872988/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6d5ffe291
--- /dev/null
+++ b/data/as/4872988/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4872988",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873102/BillingService/BusinessService.json b/data/as/4873102/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e04ca227d
--- /dev/null
+++ b/data/as/4873102/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873102",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873102/egov-location/boundary-data.json b/data/as/4873102/egov-location/boundary-data.json
new file mode 100644
index 0000000000..994f6d4bd1
--- /dev/null
+++ b/data/as/4873102/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873102",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURIHAMARI PWSS",
+                "localname": "KURIHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873102",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURIHAMARI PWSS",
+                        "localname": "KURIHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURIHAMARI PWSS",
+                "localname": "KURIHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873102",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURIHAMARI PWSS",
+                        "localname": "KURIHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873102/ws-services-calculation/Penalty.json b/data/as/4873102/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e4076f43f
--- /dev/null
+++ b/data/as/4873102/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873102",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873102/ws-services-calculation/WCBillingSlab.json b/data/as/4873102/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85826648f2
--- /dev/null
+++ b/data/as/4873102/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873102",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873166/BillingService/BusinessService.json b/data/as/4873166/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec0f78ba9e
--- /dev/null
+++ b/data/as/4873166/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873166",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873166/egov-location/boundary-data.json b/data/as/4873166/egov-location/boundary-data.json
new file mode 100644
index 0000000000..026b637f46
--- /dev/null
+++ b/data/as/4873166/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873166",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAKHYABARI PWSS",
+                "localname": "KAMAKHYABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAKHYABARI PWSS",
+                        "localname": "KAMAKHYABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAKHYABARI PWSS",
+                "localname": "KAMAKHYABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAKHYABARI PWSS",
+                        "localname": "KAMAKHYABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873166/ws-services-calculation/Penalty.json b/data/as/4873166/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56ec0e3a43
--- /dev/null
+++ b/data/as/4873166/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873166",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873166/ws-services-calculation/WCBillingSlab.json b/data/as/4873166/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7b6fe85f97
--- /dev/null
+++ b/data/as/4873166/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873166",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873607/BillingService/BusinessService.json b/data/as/4873607/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a71551af4d
--- /dev/null
+++ b/data/as/4873607/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873607",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873607/egov-location/boundary-data.json b/data/as/4873607/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f0f0cdee79
--- /dev/null
+++ b/data/as/4873607/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873607",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARKULA GAROPARA  PWSS",
+                "localname": "MARKULA GAROPARA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARKULA GAROPARA  PWSS",
+                        "localname": "MARKULA GAROPARA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARKULA GAROPARA  PWSS",
+                "localname": "MARKULA GAROPARA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARKULA GAROPARA  PWSS",
+                        "localname": "MARKULA GAROPARA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873607/ws-services-calculation/Penalty.json b/data/as/4873607/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6101d08f67
--- /dev/null
+++ b/data/as/4873607/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873607",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873607/ws-services-calculation/WCBillingSlab.json b/data/as/4873607/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e33ef1963b
--- /dev/null
+++ b/data/as/4873607/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873607",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873634/BillingService/BusinessService.json b/data/as/4873634/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c19d05a723
--- /dev/null
+++ b/data/as/4873634/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873634",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873634/egov-location/boundary-data.json b/data/as/4873634/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02eb199a9b
--- /dev/null
+++ b/data/as/4873634/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873634",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MURALIJHAR PWSS",
+                "localname": "MURALIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MURALIJHAR PWSS",
+                        "localname": "MURALIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MURALIJHAR PWSS",
+                "localname": "MURALIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MURALIJHAR PWSS",
+                        "localname": "MURALIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873634/ws-services-calculation/Penalty.json b/data/as/4873634/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5565abd83
--- /dev/null
+++ b/data/as/4873634/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873634",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873634/ws-services-calculation/WCBillingSlab.json b/data/as/4873634/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac2b6c362b
--- /dev/null
+++ b/data/as/4873634/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873634",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873695/BillingService/BusinessService.json b/data/as/4873695/BillingService/BusinessService.json
new file mode 100644
index 0000000000..708ef6759c
--- /dev/null
+++ b/data/as/4873695/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873695",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873695/egov-location/boundary-data.json b/data/as/4873695/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2d87df2b99
--- /dev/null
+++ b/data/as/4873695/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873695",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUMBANDHA PWSS",
+                "localname": "DHUMBANDHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUMBANDHA PWSS",
+                        "localname": "DHUMBANDHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUMBANDHA PWSS",
+                "localname": "DHUMBANDHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUMBANDHA PWSS",
+                        "localname": "DHUMBANDHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873695/ws-services-calculation/Penalty.json b/data/as/4873695/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d7e5e9149
--- /dev/null
+++ b/data/as/4873695/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873695",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873695/ws-services-calculation/WCBillingSlab.json b/data/as/4873695/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2617f802a
--- /dev/null
+++ b/data/as/4873695/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873695",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873715/BillingService/BusinessService.json b/data/as/4873715/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7107d1fd06
--- /dev/null
+++ b/data/as/4873715/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873715",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873715/egov-location/boundary-data.json b/data/as/4873715/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5bc3fdf0be
--- /dev/null
+++ b/data/as/4873715/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873715",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATISILA PWSS",
+                "localname": "HATISILA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATISILA PWSS",
+                        "localname": "HATISILA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATISILA PWSS",
+                "localname": "HATISILA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATISILA PWSS",
+                        "localname": "HATISILA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873715/ws-services-calculation/Penalty.json b/data/as/4873715/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec1613197d
--- /dev/null
+++ b/data/as/4873715/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873715",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873715/ws-services-calculation/WCBillingSlab.json b/data/as/4873715/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f209fc18c
--- /dev/null
+++ b/data/as/4873715/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873715",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873739/BillingService/BusinessService.json b/data/as/4873739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2a3a728c36
--- /dev/null
+++ b/data/as/4873739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873739/egov-location/boundary-data.json b/data/as/4873739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8c05bcf59
--- /dev/null
+++ b/data/as/4873739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATOGAON PWSS",
+                "localname": "HATOGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATOGAON PWSS",
+                        "localname": "HATOGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATOGAON PWSS",
+                "localname": "HATOGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATOGAON PWSS",
+                        "localname": "HATOGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873739/ws-services-calculation/Penalty.json b/data/as/4873739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..088c49c651
--- /dev/null
+++ b/data/as/4873739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873739/ws-services-calculation/WCBillingSlab.json b/data/as/4873739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..84c4b13d0e
--- /dev/null
+++ b/data/as/4873739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873771/BillingService/BusinessService.json b/data/as/4873771/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e12fba7d3
--- /dev/null
+++ b/data/as/4873771/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873771",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873771/egov-location/boundary-data.json b/data/as/4873771/egov-location/boundary-data.json
new file mode 100644
index 0000000000..66e261afae
--- /dev/null
+++ b/data/as/4873771/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873771",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR GAROPARA PWSS",
+                "localname": "MILANPUR GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873771",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR GAROPARA PWSS",
+                        "localname": "MILANPUR GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR GAROPARA PWSS",
+                "localname": "MILANPUR GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873771",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR GAROPARA PWSS",
+                        "localname": "MILANPUR GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873771/ws-services-calculation/Penalty.json b/data/as/4873771/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59ddf791a9
--- /dev/null
+++ b/data/as/4873771/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873771",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873771/ws-services-calculation/WCBillingSlab.json b/data/as/4873771/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10caa411ae
--- /dev/null
+++ b/data/as/4873771/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873771",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873867/BillingService/BusinessService.json b/data/as/4873867/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f257e17e69
--- /dev/null
+++ b/data/as/4873867/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873867",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873867/egov-location/boundary-data.json b/data/as/4873867/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae39b8cd15
--- /dev/null
+++ b/data/as/4873867/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873867",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDUCHAR PWSS",
+                "localname": "BUDUCHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDUCHAR PWSS",
+                        "localname": "BUDUCHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDUCHAR PWSS",
+                "localname": "BUDUCHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDUCHAR PWSS",
+                        "localname": "BUDUCHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873867/ws-services-calculation/Penalty.json b/data/as/4873867/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ae1bf2c156
--- /dev/null
+++ b/data/as/4873867/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873867",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873867/ws-services-calculation/WCBillingSlab.json b/data/as/4873867/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2c84649c04
--- /dev/null
+++ b/data/as/4873867/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873867",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873898/BillingService/BusinessService.json b/data/as/4873898/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d6c0881f19
--- /dev/null
+++ b/data/as/4873898/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4873898",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873898/egov-location/boundary-data.json b/data/as/4873898/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b371a1d142
--- /dev/null
+++ b/data/as/4873898/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4873898",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIGAM PWSS",
+                "localname": "NIGAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIGAM PWSS",
+                        "localname": "NIGAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIGAM PWSS",
+                "localname": "NIGAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4873898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIGAM PWSS",
+                        "localname": "NIGAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873898/ws-services-calculation/Penalty.json b/data/as/4873898/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b7df092790
--- /dev/null
+++ b/data/as/4873898/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4873898",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4873898/ws-services-calculation/WCBillingSlab.json b/data/as/4873898/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7cf4293144
--- /dev/null
+++ b/data/as/4873898/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4873898",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887720/BillingService/BusinessService.json b/data/as/4887720/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cfb7bb0ed8
--- /dev/null
+++ b/data/as/4887720/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4887720",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887720/egov-location/boundary-data.json b/data/as/4887720/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cb010ef693
--- /dev/null
+++ b/data/as/4887720/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4887720",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAIRONG CELAPARA PWSS",
+                "localname": "DAIRONG CELAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAIRONG CELAPARA PWSS",
+                        "localname": "DAIRONG CELAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAIRONG CELAPARA PWSS",
+                "localname": "DAIRONG CELAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAIRONG CELAPARA PWSS",
+                        "localname": "DAIRONG CELAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887720/ws-services-calculation/Penalty.json b/data/as/4887720/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1db72daa4
--- /dev/null
+++ b/data/as/4887720/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4887720",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887720/ws-services-calculation/WCBillingSlab.json b/data/as/4887720/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6da315435e
--- /dev/null
+++ b/data/as/4887720/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4887720",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887740/BillingService/BusinessService.json b/data/as/4887740/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87444f4583
--- /dev/null
+++ b/data/as/4887740/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4887740",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887740/egov-location/boundary-data.json b/data/as/4887740/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b8cf25704
--- /dev/null
+++ b/data/as/4887740/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4887740",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARUPURARTARY PWSS",
+                "localname": "GARUPURARTARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARUPURARTARY PWSS",
+                        "localname": "GARUPURARTARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARUPURARTARY PWSS",
+                "localname": "GARUPURARTARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARUPURARTARY PWSS",
+                        "localname": "GARUPURARTARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887740/ws-services-calculation/Penalty.json b/data/as/4887740/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..53dbdfb893
--- /dev/null
+++ b/data/as/4887740/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4887740",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887740/ws-services-calculation/WCBillingSlab.json b/data/as/4887740/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d4a399f27c
--- /dev/null
+++ b/data/as/4887740/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4887740",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887755/BillingService/BusinessService.json b/data/as/4887755/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6e8fea9e1d
--- /dev/null
+++ b/data/as/4887755/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4887755",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887755/egov-location/boundary-data.json b/data/as/4887755/egov-location/boundary-data.json
new file mode 100644
index 0000000000..21dbd2186f
--- /dev/null
+++ b/data/as/4887755/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4887755",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIBARI PWSS",
+                "localname": "CHOIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887755",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIBARI PWSS",
+                        "localname": "CHOIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIBARI PWSS",
+                "localname": "CHOIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887755",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIBARI PWSS",
+                        "localname": "CHOIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887755/ws-services-calculation/Penalty.json b/data/as/4887755/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19f0aa890e
--- /dev/null
+++ b/data/as/4887755/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4887755",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887755/ws-services-calculation/WCBillingSlab.json b/data/as/4887755/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..71a8766fbc
--- /dev/null
+++ b/data/as/4887755/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4887755",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887898/BillingService/BusinessService.json b/data/as/4887898/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4a1ca22d34
--- /dev/null
+++ b/data/as/4887898/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4887898",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887898/egov-location/boundary-data.json b/data/as/4887898/egov-location/boundary-data.json
new file mode 100644
index 0000000000..39829a8544
--- /dev/null
+++ b/data/as/4887898/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4887898",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULGURI PWSS",
+                "localname": "DEULGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULGURI PWSS",
+                        "localname": "DEULGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULGURI PWSS",
+                "localname": "DEULGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULGURI PWSS",
+                        "localname": "DEULGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887898/ws-services-calculation/Penalty.json b/data/as/4887898/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d131533bb5
--- /dev/null
+++ b/data/as/4887898/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4887898",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887898/ws-services-calculation/WCBillingSlab.json b/data/as/4887898/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..433e2bbb33
--- /dev/null
+++ b/data/as/4887898/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4887898",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887947/BillingService/BusinessService.json b/data/as/4887947/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fce978f5d9
--- /dev/null
+++ b/data/as/4887947/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4887947",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887947/egov-location/boundary-data.json b/data/as/4887947/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d0d79ea75
--- /dev/null
+++ b/data/as/4887947/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4887947",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI PT I PWSS",
+                "localname": "TIPLAI PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI PT I PWSS",
+                        "localname": "TIPLAI PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI PT I PWSS",
+                "localname": "TIPLAI PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4887947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI PT I PWSS",
+                        "localname": "TIPLAI PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887947/ws-services-calculation/Penalty.json b/data/as/4887947/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5492a09738
--- /dev/null
+++ b/data/as/4887947/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4887947",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4887947/ws-services-calculation/WCBillingSlab.json b/data/as/4887947/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ccb73ae60c
--- /dev/null
+++ b/data/as/4887947/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4887947",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888080/BillingService/BusinessService.json b/data/as/4888080/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5126ca54b
--- /dev/null
+++ b/data/as/4888080/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4888080",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888080/egov-location/boundary-data.json b/data/as/4888080/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6183733cb5
--- /dev/null
+++ b/data/as/4888080/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4888080",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIRCHALA BATABARI PWSS",
+                "localname": "KARIRCHALA BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIRCHALA BATABARI PWSS",
+                        "localname": "KARIRCHALA BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIRCHALA BATABARI PWSS",
+                "localname": "KARIRCHALA BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIRCHALA BATABARI PWSS",
+                        "localname": "KARIRCHALA BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888080/ws-services-calculation/Penalty.json b/data/as/4888080/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..18d6f4df49
--- /dev/null
+++ b/data/as/4888080/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4888080",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888080/ws-services-calculation/WCBillingSlab.json b/data/as/4888080/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49c0c68927
--- /dev/null
+++ b/data/as/4888080/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4888080",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888114/BillingService/BusinessService.json b/data/as/4888114/BillingService/BusinessService.json
new file mode 100644
index 0000000000..321eec25eb
--- /dev/null
+++ b/data/as/4888114/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4888114",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888114/egov-location/boundary-data.json b/data/as/4888114/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1b7c2b8573
--- /dev/null
+++ b/data/as/4888114/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4888114",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNPARA PWSS",
+                "localname": "BAMUNPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNPARA PWSS",
+                        "localname": "BAMUNPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNPARA PWSS",
+                "localname": "BAMUNPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNPARA PWSS",
+                        "localname": "BAMUNPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888114/ws-services-calculation/Penalty.json b/data/as/4888114/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ac44f25d1
--- /dev/null
+++ b/data/as/4888114/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4888114",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888114/ws-services-calculation/WCBillingSlab.json b/data/as/4888114/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33ff849f52
--- /dev/null
+++ b/data/as/4888114/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4888114",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888263/BillingService/BusinessService.json b/data/as/4888263/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ea0f3e3e1b
--- /dev/null
+++ b/data/as/4888263/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4888263",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888263/egov-location/boundary-data.json b/data/as/4888263/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce8e3e8f4c
--- /dev/null
+++ b/data/as/4888263/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4888263",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANYAKUCHI PWSS",
+                "localname": "KANYAKUCHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888263",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANYAKUCHI PWSS",
+                        "localname": "KANYAKUCHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANYAKUCHI PWSS",
+                "localname": "KANYAKUCHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888263",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANYAKUCHI PWSS",
+                        "localname": "KANYAKUCHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888263/ws-services-calculation/Penalty.json b/data/as/4888263/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cbc54d160b
--- /dev/null
+++ b/data/as/4888263/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4888263",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888263/ws-services-calculation/WCBillingSlab.json b/data/as/4888263/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d6c7f9ade1
--- /dev/null
+++ b/data/as/4888263/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4888263",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888294/BillingService/BusinessService.json b/data/as/4888294/BillingService/BusinessService.json
new file mode 100644
index 0000000000..24a34440f4
--- /dev/null
+++ b/data/as/4888294/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4888294",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888294/egov-location/boundary-data.json b/data/as/4888294/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3497f4fe2
--- /dev/null
+++ b/data/as/4888294/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4888294",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALDOBA PWSS",
+                "localname": "NALDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888294",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALDOBA PWSS",
+                        "localname": "NALDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALDOBA PWSS",
+                "localname": "NALDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4888294",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALDOBA PWSS",
+                        "localname": "NALDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888294/ws-services-calculation/Penalty.json b/data/as/4888294/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d489b02eb6
--- /dev/null
+++ b/data/as/4888294/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4888294",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4888294/ws-services-calculation/WCBillingSlab.json b/data/as/4888294/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d68f13cc31
--- /dev/null
+++ b/data/as/4888294/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4888294",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492155/BillingService/BusinessService.json b/data/as/492155/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a62b9e2869
--- /dev/null
+++ b/data/as/492155/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492155",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492155/egov-location/boundary-data.json b/data/as/492155/egov-location/boundary-data.json
new file mode 100644
index 0000000000..676b6f78fc
--- /dev/null
+++ b/data/as/492155/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492155",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANATIKA PWSS",
+                "localname": "KATANATIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492155",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANATIKA PWSS",
+                        "localname": "KATANATIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANATIKA PWSS",
+                "localname": "KATANATIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492155",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANATIKA PWSS",
+                        "localname": "KATANATIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492155/ws-services-calculation/Penalty.json b/data/as/492155/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..98f0d350c8
--- /dev/null
+++ b/data/as/492155/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492155",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492155/ws-services-calculation/WCBillingSlab.json b/data/as/492155/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9dd4d02bc
--- /dev/null
+++ b/data/as/492155/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492155",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492158/BillingService/BusinessService.json b/data/as/492158/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c86216900
--- /dev/null
+++ b/data/as/492158/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492158",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492158/egov-location/boundary-data.json b/data/as/492158/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e917f2d97b
--- /dev/null
+++ b/data/as/492158/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492158",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAPORA CHUBURI PWSS",
+                "localname": "SAPORA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAPORA CHUBURI PWSS",
+                        "localname": "SAPORA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAPORA CHUBURI PWSS",
+                "localname": "SAPORA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAPORA CHUBURI PWSS",
+                        "localname": "SAPORA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492158/ws-services-calculation/Penalty.json b/data/as/492158/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..53c375d65c
--- /dev/null
+++ b/data/as/492158/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492158",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492158/ws-services-calculation/WCBillingSlab.json b/data/as/492158/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b4bd2cd661
--- /dev/null
+++ b/data/as/492158/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492158",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492161/BillingService/BusinessService.json b/data/as/492161/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19626c503d
--- /dev/null
+++ b/data/as/492161/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492161",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492161/egov-location/boundary-data.json b/data/as/492161/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e99ffa2ecd
--- /dev/null
+++ b/data/as/492161/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492161",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEBEJIA PWSS",
+                "localname": "BEBEJIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492161",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEBEJIA PWSS",
+                        "localname": "BEBEJIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEBEJIA PWSS",
+                "localname": "BEBEJIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492161",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEBEJIA PWSS",
+                        "localname": "BEBEJIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492161/ws-services-calculation/Penalty.json b/data/as/492161/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb60b9f323
--- /dev/null
+++ b/data/as/492161/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492161",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492161/ws-services-calculation/WCBillingSlab.json b/data/as/492161/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..12ee33b489
--- /dev/null
+++ b/data/as/492161/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492161",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492165/BillingService/BusinessService.json b/data/as/492165/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2f17d12d60
--- /dev/null
+++ b/data/as/492165/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492165",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492165/egov-location/boundary-data.json b/data/as/492165/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c77069ca6b
--- /dev/null
+++ b/data/as/492165/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492165",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZGAON PWSS",
+                "localname": "MAZGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZGAON PWSS",
+                        "localname": "MAZGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZGAON PWSS",
+                "localname": "MAZGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZGAON PWSS",
+                        "localname": "MAZGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492165/ws-services-calculation/Penalty.json b/data/as/492165/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc4e25cb27
--- /dev/null
+++ b/data/as/492165/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492165",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492165/ws-services-calculation/WCBillingSlab.json b/data/as/492165/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a4a3a771d
--- /dev/null
+++ b/data/as/492165/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492165",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492168/BillingService/BusinessService.json b/data/as/492168/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b9c75bd71
--- /dev/null
+++ b/data/as/492168/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492168",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492168/egov-location/boundary-data.json b/data/as/492168/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8eff53eae2
--- /dev/null
+++ b/data/as/492168/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492168",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEORIGAON PWSS",
+                "localname": "DEORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEORIGAON PWSS",
+                        "localname": "DEORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEORIGAON PWSS",
+                "localname": "DEORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEORIGAON PWSS",
+                        "localname": "DEORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492168/ws-services-calculation/Penalty.json b/data/as/492168/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0a5a549d91
--- /dev/null
+++ b/data/as/492168/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492168",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492168/ws-services-calculation/WCBillingSlab.json b/data/as/492168/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d6911ba260
--- /dev/null
+++ b/data/as/492168/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492168",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492177/BillingService/BusinessService.json b/data/as/492177/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8dba856b88
--- /dev/null
+++ b/data/as/492177/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492177",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492177/egov-location/boundary-data.json b/data/as/492177/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5465b8c519
--- /dev/null
+++ b/data/as/492177/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492177",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARIKA CHUBURI PWSS",
+                "localname": "BARIKA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARIKA CHUBURI PWSS",
+                        "localname": "BARIKA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARIKA CHUBURI PWSS",
+                "localname": "BARIKA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARIKA CHUBURI PWSS",
+                        "localname": "BARIKA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492177/ws-services-calculation/Penalty.json b/data/as/492177/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..af591f7b35
--- /dev/null
+++ b/data/as/492177/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492177",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492177/ws-services-calculation/WCBillingSlab.json b/data/as/492177/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5dc3651a03
--- /dev/null
+++ b/data/as/492177/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492177",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492182/BillingService/BusinessService.json b/data/as/492182/BillingService/BusinessService.json
new file mode 100644
index 0000000000..73fe20f4ef
--- /dev/null
+++ b/data/as/492182/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.492182",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492182/egov-location/boundary-data.json b/data/as/492182/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f8f8fd869
--- /dev/null
+++ b/data/as/492182/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.492182",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM PARBATIA PWSS",
+                "localname": "BAM PARBATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492182",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM PARBATIA PWSS",
+                        "localname": "BAM PARBATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM PARBATIA PWSS",
+                "localname": "BAM PARBATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.492182",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM PARBATIA PWSS",
+                        "localname": "BAM PARBATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492182/ws-services-calculation/Penalty.json b/data/as/492182/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d12b5440ed
--- /dev/null
+++ b/data/as/492182/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.492182",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/492182/ws-services-calculation/WCBillingSlab.json b/data/as/492182/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc25bd35f1
--- /dev/null
+++ b/data/as/492182/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.492182",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4963515/BillingService/BusinessService.json b/data/as/4963515/BillingService/BusinessService.json
new file mode 100644
index 0000000000..464e68113e
--- /dev/null
+++ b/data/as/4963515/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.4963515",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4963515/egov-location/boundary-data.json b/data/as/4963515/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e7e3831cff
--- /dev/null
+++ b/data/as/4963515/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.4963515",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHONAR PUBPAR PWSS",
+                "localname": "KHONAR PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4963515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHONAR PUBPAR PWSS",
+                        "localname": "KHONAR PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHONAR PUBPAR PWSS",
+                "localname": "KHONAR PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.4963515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHONAR PUBPAR PWSS",
+                        "localname": "KHONAR PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4963515/ws-services-calculation/Penalty.json b/data/as/4963515/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..39add5981d
--- /dev/null
+++ b/data/as/4963515/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.4963515",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/4963515/ws-services-calculation/WCBillingSlab.json b/data/as/4963515/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf3c134b99
--- /dev/null
+++ b/data/as/4963515/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.4963515",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072706/BillingService/BusinessService.json b/data/as/5072706/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eb4b14853f
--- /dev/null
+++ b/data/as/5072706/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5072706",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072706/egov-location/boundary-data.json b/data/as/5072706/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9a7a312db9
--- /dev/null
+++ b/data/as/5072706/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5072706",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MISSAMARI PWSS",
+                "localname": "MISSAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MISSAMARI PWSS",
+                        "localname": "MISSAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MISSAMARI PWSS",
+                "localname": "MISSAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MISSAMARI PWSS",
+                        "localname": "MISSAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072706/ws-services-calculation/Penalty.json b/data/as/5072706/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..92d376c8e5
--- /dev/null
+++ b/data/as/5072706/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5072706",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072706/ws-services-calculation/WCBillingSlab.json b/data/as/5072706/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9aa772656c
--- /dev/null
+++ b/data/as/5072706/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5072706",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072752/BillingService/BusinessService.json b/data/as/5072752/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c3b1ec2189
--- /dev/null
+++ b/data/as/5072752/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5072752",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072752/egov-location/boundary-data.json b/data/as/5072752/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2d32daab82
--- /dev/null
+++ b/data/as/5072752/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5072752",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI PWSS",
+                "localname": "SITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072752",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI PWSS",
+                        "localname": "SITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI PWSS",
+                "localname": "SITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072752",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI PWSS",
+                        "localname": "SITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072752/ws-services-calculation/Penalty.json b/data/as/5072752/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d92a53429
--- /dev/null
+++ b/data/as/5072752/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5072752",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072752/ws-services-calculation/WCBillingSlab.json b/data/as/5072752/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21a5808065
--- /dev/null
+++ b/data/as/5072752/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5072752",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072807/BillingService/BusinessService.json b/data/as/5072807/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6288eb59e
--- /dev/null
+++ b/data/as/5072807/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5072807",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072807/egov-location/boundary-data.json b/data/as/5072807/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5866305a7
--- /dev/null
+++ b/data/as/5072807/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5072807",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BIHAGURI PWSS",
+                "localname": "NIZ-BIHAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BIHAGURI PWSS",
+                        "localname": "NIZ-BIHAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BIHAGURI PWSS",
+                "localname": "NIZ-BIHAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BIHAGURI PWSS",
+                        "localname": "NIZ-BIHAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072807/ws-services-calculation/Penalty.json b/data/as/5072807/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f268b08210
--- /dev/null
+++ b/data/as/5072807/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5072807",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072807/ws-services-calculation/WCBillingSlab.json b/data/as/5072807/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07f15748d7
--- /dev/null
+++ b/data/as/5072807/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5072807",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072821/BillingService/BusinessService.json b/data/as/5072821/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46ac4e18d3
--- /dev/null
+++ b/data/as/5072821/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5072821",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072821/egov-location/boundary-data.json b/data/as/5072821/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b99e864861
--- /dev/null
+++ b/data/as/5072821/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5072821",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PITHAKHOWA PWSS",
+                "localname": "PITHAKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PITHAKHOWA PWSS",
+                        "localname": "PITHAKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PITHAKHOWA PWSS",
+                "localname": "PITHAKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PITHAKHOWA PWSS",
+                        "localname": "PITHAKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072821/ws-services-calculation/Penalty.json b/data/as/5072821/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..818a894aed
--- /dev/null
+++ b/data/as/5072821/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5072821",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072821/ws-services-calculation/WCBillingSlab.json b/data/as/5072821/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33b3e07ca5
--- /dev/null
+++ b/data/as/5072821/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5072821",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072838/BillingService/BusinessService.json b/data/as/5072838/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee860ad0d2
--- /dev/null
+++ b/data/as/5072838/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5072838",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072838/egov-location/boundary-data.json b/data/as/5072838/egov-location/boundary-data.json
new file mode 100644
index 0000000000..277145caa7
--- /dev/null
+++ b/data/as/5072838/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5072838",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOWAMARI PWSS",
+                "localname": "MOWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072838",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOWAMARI PWSS",
+                        "localname": "MOWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOWAMARI PWSS",
+                "localname": "MOWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072838",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOWAMARI PWSS",
+                        "localname": "MOWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072838/ws-services-calculation/Penalty.json b/data/as/5072838/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0137a73e9a
--- /dev/null
+++ b/data/as/5072838/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5072838",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072838/ws-services-calculation/WCBillingSlab.json b/data/as/5072838/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d2450abd0
--- /dev/null
+++ b/data/as/5072838/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5072838",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072844/BillingService/BusinessService.json b/data/as/5072844/BillingService/BusinessService.json
new file mode 100644
index 0000000000..699923e9f6
--- /dev/null
+++ b/data/as/5072844/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5072844",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072844/egov-location/boundary-data.json b/data/as/5072844/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f640fdf0c
--- /dev/null
+++ b/data/as/5072844/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5072844",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARMARI PWSS",
+                "localname": "BANDARMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARMARI PWSS",
+                        "localname": "BANDARMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARMARI PWSS",
+                "localname": "BANDARMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5072844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARMARI PWSS",
+                        "localname": "BANDARMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072844/ws-services-calculation/Penalty.json b/data/as/5072844/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5ecb20097
--- /dev/null
+++ b/data/as/5072844/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5072844",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5072844/ws-services-calculation/WCBillingSlab.json b/data/as/5072844/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7a5cd72839
--- /dev/null
+++ b/data/as/5072844/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5072844",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073321/BillingService/BusinessService.json b/data/as/5073321/BillingService/BusinessService.json
new file mode 100644
index 0000000000..642e9e87f1
--- /dev/null
+++ b/data/as/5073321/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5073321",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073321/egov-location/boundary-data.json b/data/as/5073321/egov-location/boundary-data.json
new file mode 100644
index 0000000000..155fb4adad
--- /dev/null
+++ b/data/as/5073321/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5073321",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORATI PWSS",
+                "localname": "BORATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073321",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORATI PWSS",
+                        "localname": "BORATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORATI PWSS",
+                "localname": "BORATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073321",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORATI PWSS",
+                        "localname": "BORATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073321/ws-services-calculation/Penalty.json b/data/as/5073321/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f92efea59a
--- /dev/null
+++ b/data/as/5073321/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5073321",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073321/ws-services-calculation/WCBillingSlab.json b/data/as/5073321/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..acca6d6df1
--- /dev/null
+++ b/data/as/5073321/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5073321",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073330/BillingService/BusinessService.json b/data/as/5073330/BillingService/BusinessService.json
new file mode 100644
index 0000000000..381fac7157
--- /dev/null
+++ b/data/as/5073330/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5073330",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073330/egov-location/boundary-data.json b/data/as/5073330/egov-location/boundary-data.json
new file mode 100644
index 0000000000..73a1e5f51b
--- /dev/null
+++ b/data/as/5073330/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5073330",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUNIONI PWSS",
+                "localname": "PUNIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUNIONI PWSS",
+                        "localname": "PUNIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUNIONI PWSS",
+                "localname": "PUNIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUNIONI PWSS",
+                        "localname": "PUNIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073330/ws-services-calculation/Penalty.json b/data/as/5073330/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ebd44737f
--- /dev/null
+++ b/data/as/5073330/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5073330",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073330/ws-services-calculation/WCBillingSlab.json b/data/as/5073330/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f0d286176
--- /dev/null
+++ b/data/as/5073330/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5073330",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073372/BillingService/BusinessService.json b/data/as/5073372/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cfa5397167
--- /dev/null
+++ b/data/as/5073372/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5073372",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073372/egov-location/boundary-data.json b/data/as/5073372/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c9d37fd07
--- /dev/null
+++ b/data/as/5073372/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5073372",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEGHAI ATI  PWSS",
+                "localname": "MEGHAI ATI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073372",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEGHAI ATI  PWSS",
+                        "localname": "MEGHAI ATI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEGHAI ATI  PWSS",
+                "localname": "MEGHAI ATI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073372",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEGHAI ATI  PWSS",
+                        "localname": "MEGHAI ATI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073372/ws-services-calculation/Penalty.json b/data/as/5073372/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..633705250d
--- /dev/null
+++ b/data/as/5073372/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5073372",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073372/ws-services-calculation/WCBillingSlab.json b/data/as/5073372/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c011da6e6c
--- /dev/null
+++ b/data/as/5073372/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5073372",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073861/BillingService/BusinessService.json b/data/as/5073861/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56c32b8f3d
--- /dev/null
+++ b/data/as/5073861/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5073861",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073861/egov-location/boundary-data.json b/data/as/5073861/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4304a4ef1e
--- /dev/null
+++ b/data/as/5073861/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5073861",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERGAON PWSS",
+                "localname": "BHERGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERGAON PWSS",
+                        "localname": "BHERGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERGAON PWSS",
+                "localname": "BHERGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERGAON PWSS",
+                        "localname": "BHERGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073861/ws-services-calculation/Penalty.json b/data/as/5073861/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4224ecbe82
--- /dev/null
+++ b/data/as/5073861/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5073861",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073861/ws-services-calculation/WCBillingSlab.json b/data/as/5073861/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a310d34158
--- /dev/null
+++ b/data/as/5073861/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5073861",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073879/BillingService/BusinessService.json b/data/as/5073879/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9589a9caeb
--- /dev/null
+++ b/data/as/5073879/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5073879",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073879/egov-location/boundary-data.json b/data/as/5073879/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea0a1ab611
--- /dev/null
+++ b/data/as/5073879/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5073879",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILIKHABARI PWSS",
+                "localname": "SILIKHABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILIKHABARI PWSS",
+                        "localname": "SILIKHABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILIKHABARI PWSS",
+                "localname": "SILIKHABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILIKHABARI PWSS",
+                        "localname": "SILIKHABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073879/ws-services-calculation/Penalty.json b/data/as/5073879/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7403386d67
--- /dev/null
+++ b/data/as/5073879/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5073879",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073879/ws-services-calculation/WCBillingSlab.json b/data/as/5073879/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..639b3cdbb5
--- /dev/null
+++ b/data/as/5073879/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5073879",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073951/BillingService/BusinessService.json b/data/as/5073951/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b915089f2
--- /dev/null
+++ b/data/as/5073951/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5073951",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073951/egov-location/boundary-data.json b/data/as/5073951/egov-location/boundary-data.json
new file mode 100644
index 0000000000..283236c29d
--- /dev/null
+++ b/data/as/5073951/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5073951",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANIGAON PWSS",
+                "localname": "KATANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073951",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANIGAON PWSS",
+                        "localname": "KATANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANIGAON PWSS",
+                "localname": "KATANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5073951",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANIGAON PWSS",
+                        "localname": "KATANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073951/ws-services-calculation/Penalty.json b/data/as/5073951/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15d9d52c20
--- /dev/null
+++ b/data/as/5073951/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5073951",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5073951/ws-services-calculation/WCBillingSlab.json b/data/as/5073951/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f8efb1ac25
--- /dev/null
+++ b/data/as/5073951/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5073951",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074126/BillingService/BusinessService.json b/data/as/5074126/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f830bcbb42
--- /dev/null
+++ b/data/as/5074126/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5074126",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074126/egov-location/boundary-data.json b/data/as/5074126/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4733f01ee7
--- /dev/null
+++ b/data/as/5074126/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5074126",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BIHAGURI PWSS",
+                "localname": "NIZ-BIHAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5074126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BIHAGURI PWSS",
+                        "localname": "NIZ-BIHAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BIHAGURI PWSS",
+                "localname": "NIZ-BIHAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5074126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BIHAGURI PWSS",
+                        "localname": "NIZ-BIHAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074126/ws-services-calculation/Penalty.json b/data/as/5074126/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c0ae2b4708
--- /dev/null
+++ b/data/as/5074126/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5074126",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074126/ws-services-calculation/WCBillingSlab.json b/data/as/5074126/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49beb2f257
--- /dev/null
+++ b/data/as/5074126/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5074126",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074129/BillingService/BusinessService.json b/data/as/5074129/BillingService/BusinessService.json
new file mode 100644
index 0000000000..071fdb5a1c
--- /dev/null
+++ b/data/as/5074129/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5074129",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074129/egov-location/boundary-data.json b/data/as/5074129/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c882a3a2c1
--- /dev/null
+++ b/data/as/5074129/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5074129",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAKALBHAGHI PWSS",
+                "localname": "KAKALBHAGHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5074129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAKALBHAGHI PWSS",
+                        "localname": "KAKALBHAGHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAKALBHAGHI PWSS",
+                "localname": "KAKALBHAGHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5074129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAKALBHAGHI PWSS",
+                        "localname": "KAKALBHAGHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074129/ws-services-calculation/Penalty.json b/data/as/5074129/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b221e23e5
--- /dev/null
+++ b/data/as/5074129/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5074129",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074129/ws-services-calculation/WCBillingSlab.json b/data/as/5074129/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ef6e711092
--- /dev/null
+++ b/data/as/5074129/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5074129",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074133/BillingService/BusinessService.json b/data/as/5074133/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92476dcb47
--- /dev/null
+++ b/data/as/5074133/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5074133",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074133/egov-location/boundary-data.json b/data/as/5074133/egov-location/boundary-data.json
new file mode 100644
index 0000000000..658247a8ab
--- /dev/null
+++ b/data/as/5074133/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5074133",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINKHARIA PWSS",
+                "localname": "TINKHARIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5074133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINKHARIA PWSS",
+                        "localname": "TINKHARIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINKHARIA PWSS",
+                "localname": "TINKHARIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5074133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINKHARIA PWSS",
+                        "localname": "TINKHARIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074133/ws-services-calculation/Penalty.json b/data/as/5074133/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c7b5db58f
--- /dev/null
+++ b/data/as/5074133/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5074133",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5074133/ws-services-calculation/WCBillingSlab.json b/data/as/5074133/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69be34ea03
--- /dev/null
+++ b/data/as/5074133/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5074133",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/50796/BillingService/BusinessService.json b/data/as/50796/BillingService/BusinessService.json
new file mode 100644
index 0000000000..750b9c28f1
--- /dev/null
+++ b/data/as/50796/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.50796",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/50796/egov-location/boundary-data.json b/data/as/50796/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd7d7adb2e
--- /dev/null
+++ b/data/as/50796/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.50796",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAGRA KACHARI PWSS",
+                "localname": "GHAGRA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.50796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAGRA KACHARI PWSS",
+                        "localname": "GHAGRA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAGRA KACHARI PWSS",
+                "localname": "GHAGRA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.50796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAGRA KACHARI PWSS",
+                        "localname": "GHAGRA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/50796/ws-services-calculation/Penalty.json b/data/as/50796/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..632b5422d8
--- /dev/null
+++ b/data/as/50796/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.50796",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/50796/ws-services-calculation/WCBillingSlab.json b/data/as/50796/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..50425ff22a
--- /dev/null
+++ b/data/as/50796/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.50796",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102401/BillingService/BusinessService.json b/data/as/5102401/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4c34c4d1e2
--- /dev/null
+++ b/data/as/5102401/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5102401",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102401/egov-location/boundary-data.json b/data/as/5102401/egov-location/boundary-data.json
new file mode 100644
index 0000000000..928f78666d
--- /dev/null
+++ b/data/as/5102401/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5102401",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARSON PWSS",
+                "localname": "BARSON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5102401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARSON PWSS",
+                        "localname": "BARSON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARSON PWSS",
+                "localname": "BARSON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5102401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARSON PWSS",
+                        "localname": "BARSON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102401/ws-services-calculation/Penalty.json b/data/as/5102401/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2dbcf58397
--- /dev/null
+++ b/data/as/5102401/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5102401",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102401/ws-services-calculation/WCBillingSlab.json b/data/as/5102401/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f159065d3f
--- /dev/null
+++ b/data/as/5102401/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5102401",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102996/BillingService/BusinessService.json b/data/as/5102996/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46ab6a02bd
--- /dev/null
+++ b/data/as/5102996/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5102996",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102996/egov-location/boundary-data.json b/data/as/5102996/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9164e018d9
--- /dev/null
+++ b/data/as/5102996/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5102996",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BAHBARI  PWSS",
+                "localname": "NIZ BAHBARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5102996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BAHBARI  PWSS",
+                        "localname": "NIZ BAHBARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BAHBARI  PWSS",
+                "localname": "NIZ BAHBARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5102996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BAHBARI  PWSS",
+                        "localname": "NIZ BAHBARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102996/ws-services-calculation/Penalty.json b/data/as/5102996/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c7b58888e5
--- /dev/null
+++ b/data/as/5102996/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5102996",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5102996/ws-services-calculation/WCBillingSlab.json b/data/as/5102996/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17023fd6f2
--- /dev/null
+++ b/data/as/5102996/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5102996",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5103007/BillingService/BusinessService.json b/data/as/5103007/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6bc336e37
--- /dev/null
+++ b/data/as/5103007/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5103007",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5103007/egov-location/boundary-data.json b/data/as/5103007/egov-location/boundary-data.json
new file mode 100644
index 0000000000..510882d28d
--- /dev/null
+++ b/data/as/5103007/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5103007",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OLD  GHOGRA  PWSS",
+                "localname": "OLD  GHOGRA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5103007",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OLD  GHOGRA  PWSS",
+                        "localname": "OLD  GHOGRA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OLD  GHOGRA  PWSS",
+                "localname": "OLD  GHOGRA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5103007",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OLD  GHOGRA  PWSS",
+                        "localname": "OLD  GHOGRA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5103007/ws-services-calculation/Penalty.json b/data/as/5103007/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3327cbe399
--- /dev/null
+++ b/data/as/5103007/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5103007",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5103007/ws-services-calculation/WCBillingSlab.json b/data/as/5103007/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eea76b108c
--- /dev/null
+++ b/data/as/5103007/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5103007",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51526/BillingService/BusinessService.json b/data/as/51526/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e4692b327
--- /dev/null
+++ b/data/as/51526/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.51526",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51526/egov-location/boundary-data.json b/data/as/51526/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a3fcc182f
--- /dev/null
+++ b/data/as/51526/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.51526",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHI CHUBURI  PWSS",
+                "localname": "MEDHI CHUBURI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.51526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHI CHUBURI  PWSS",
+                        "localname": "MEDHI CHUBURI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHI CHUBURI  PWSS",
+                "localname": "MEDHI CHUBURI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.51526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHI CHUBURI  PWSS",
+                        "localname": "MEDHI CHUBURI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51526/ws-services-calculation/Penalty.json b/data/as/51526/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..768137ad25
--- /dev/null
+++ b/data/as/51526/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.51526",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51526/ws-services-calculation/WCBillingSlab.json b/data/as/51526/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..06717babeb
--- /dev/null
+++ b/data/as/51526/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.51526",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51536/BillingService/BusinessService.json b/data/as/51536/BillingService/BusinessService.json
new file mode 100644
index 0000000000..74df4b0925
--- /dev/null
+++ b/data/as/51536/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.51536",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51536/egov-location/boundary-data.json b/data/as/51536/egov-location/boundary-data.json
new file mode 100644
index 0000000000..28160cdb82
--- /dev/null
+++ b/data/as/51536/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.51536",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHAL DAL PWSS",
+                "localname": "DIGHAL DAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.51536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHAL DAL PWSS",
+                        "localname": "DIGHAL DAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHAL DAL PWSS",
+                "localname": "DIGHAL DAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.51536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHAL DAL PWSS",
+                        "localname": "DIGHAL DAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51536/ws-services-calculation/Penalty.json b/data/as/51536/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a0ae7f8840
--- /dev/null
+++ b/data/as/51536/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.51536",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/51536/ws-services-calculation/WCBillingSlab.json b/data/as/51536/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f36ffa35b
--- /dev/null
+++ b/data/as/51536/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.51536",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5182812/BillingService/BusinessService.json b/data/as/5182812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c63b22e70f
--- /dev/null
+++ b/data/as/5182812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5182812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5182812/egov-location/boundary-data.json b/data/as/5182812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c6b625fcb3
--- /dev/null
+++ b/data/as/5182812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5182812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZGAON PWSS(UPGRADATION)",
+                "localname": "MAZGAON PWSS(UPGRADATION)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5182812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZGAON PWSS(UPGRADATION)",
+                        "localname": "MAZGAON PWSS(UPGRADATION)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZGAON PWSS(UPGRADATION)",
+                "localname": "MAZGAON PWSS(UPGRADATION)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5182812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZGAON PWSS(UPGRADATION)",
+                        "localname": "MAZGAON PWSS(UPGRADATION)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5182812/ws-services-calculation/Penalty.json b/data/as/5182812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32471f674e
--- /dev/null
+++ b/data/as/5182812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5182812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5182812/ws-services-calculation/WCBillingSlab.json b/data/as/5182812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d1746885aa
--- /dev/null
+++ b/data/as/5182812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5182812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183548/BillingService/BusinessService.json b/data/as/5183548/BillingService/BusinessService.json
new file mode 100644
index 0000000000..64d72c0206
--- /dev/null
+++ b/data/as/5183548/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5183548",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183548/egov-location/boundary-data.json b/data/as/5183548/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dde1e3e570
--- /dev/null
+++ b/data/as/5183548/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5183548",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA PWSS",
+                "localname": "DIPLONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5183548",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA PWSS",
+                        "localname": "DIPLONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA PWSS",
+                "localname": "DIPLONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5183548",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA PWSS",
+                        "localname": "DIPLONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183548/ws-services-calculation/Penalty.json b/data/as/5183548/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aed32a7d2e
--- /dev/null
+++ b/data/as/5183548/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5183548",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183548/ws-services-calculation/WCBillingSlab.json b/data/as/5183548/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c864eeed39
--- /dev/null
+++ b/data/as/5183548/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5183548",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183964/BillingService/BusinessService.json b/data/as/5183964/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ea673a6d5b
--- /dev/null
+++ b/data/as/5183964/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5183964",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183964/egov-location/boundary-data.json b/data/as/5183964/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ac265c342
--- /dev/null
+++ b/data/as/5183964/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5183964",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGSANKAR PWSS",
+                "localname": "NAGSANKAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5183964",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGSANKAR PWSS",
+                        "localname": "NAGSANKAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGSANKAR PWSS",
+                "localname": "NAGSANKAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5183964",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGSANKAR PWSS",
+                        "localname": "NAGSANKAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183964/ws-services-calculation/Penalty.json b/data/as/5183964/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..01497a9763
--- /dev/null
+++ b/data/as/5183964/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5183964",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5183964/ws-services-calculation/WCBillingSlab.json b/data/as/5183964/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..210c5637fa
--- /dev/null
+++ b/data/as/5183964/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5183964",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5184373/BillingService/BusinessService.json b/data/as/5184373/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4a43e40d9d
--- /dev/null
+++ b/data/as/5184373/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5184373",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5184373/egov-location/boundary-data.json b/data/as/5184373/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b6f35557b
--- /dev/null
+++ b/data/as/5184373/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5184373",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIGAON PWSS",
+                "localname": "HARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5184373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIGAON PWSS",
+                        "localname": "HARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIGAON PWSS",
+                "localname": "HARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5184373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIGAON PWSS",
+                        "localname": "HARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5184373/ws-services-calculation/Penalty.json b/data/as/5184373/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a1e414211
--- /dev/null
+++ b/data/as/5184373/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5184373",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5184373/ws-services-calculation/WCBillingSlab.json b/data/as/5184373/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ef5fb983ce
--- /dev/null
+++ b/data/as/5184373/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5184373",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185351/BillingService/BusinessService.json b/data/as/5185351/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b374ba1abf
--- /dev/null
+++ b/data/as/5185351/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185351",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185351/egov-location/boundary-data.json b/data/as/5185351/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ee0ee947fb
--- /dev/null
+++ b/data/as/5185351/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185351",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALAGAON PWSS",
+                "localname": "CHALAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185351",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALAGAON PWSS",
+                        "localname": "CHALAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALAGAON PWSS",
+                "localname": "CHALAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185351",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALAGAON PWSS",
+                        "localname": "CHALAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185351/ws-services-calculation/Penalty.json b/data/as/5185351/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9d82e205e
--- /dev/null
+++ b/data/as/5185351/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185351",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185351/ws-services-calculation/WCBillingSlab.json b/data/as/5185351/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9e9eb67fc2
--- /dev/null
+++ b/data/as/5185351/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185351",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185356/BillingService/BusinessService.json b/data/as/5185356/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f8c6387cb
--- /dev/null
+++ b/data/as/5185356/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185356",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185356/egov-location/boundary-data.json b/data/as/5185356/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bc419935f4
--- /dev/null
+++ b/data/as/5185356/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185356",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BATABARI PWSS",
+                "localname": "NO.1 BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BATABARI PWSS",
+                        "localname": "NO.1 BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BATABARI PWSS",
+                "localname": "NO.1 BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BATABARI PWSS",
+                        "localname": "NO.1 BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185356/ws-services-calculation/Penalty.json b/data/as/5185356/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0eb00ae984
--- /dev/null
+++ b/data/as/5185356/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185356",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185356/ws-services-calculation/WCBillingSlab.json b/data/as/5185356/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a4311572d9
--- /dev/null
+++ b/data/as/5185356/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185356",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185535/BillingService/BusinessService.json b/data/as/5185535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3f87917bb
--- /dev/null
+++ b/data/as/5185535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185535/egov-location/boundary-data.json b/data/as/5185535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b601f729ff
--- /dev/null
+++ b/data/as/5185535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAIJANIA PWSS",
+                "localname": "CHARAIJANIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAIJANIA PWSS",
+                        "localname": "CHARAIJANIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAIJANIA PWSS",
+                "localname": "CHARAIJANIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAIJANIA PWSS",
+                        "localname": "CHARAIJANIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185535/ws-services-calculation/Penalty.json b/data/as/5185535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..451a34fbbf
--- /dev/null
+++ b/data/as/5185535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185535/ws-services-calculation/WCBillingSlab.json b/data/as/5185535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a7db9ff7d8
--- /dev/null
+++ b/data/as/5185535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185541/BillingService/BusinessService.json b/data/as/5185541/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31514c60e3
--- /dev/null
+++ b/data/as/5185541/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185541",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185541/egov-location/boundary-data.json b/data/as/5185541/egov-location/boundary-data.json
new file mode 100644
index 0000000000..af7e805cea
--- /dev/null
+++ b/data/as/5185541/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185541",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AOLATOLI PWSS",
+                "localname": "AOLATOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185541",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AOLATOLI PWSS",
+                        "localname": "AOLATOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AOLATOLI PWSS",
+                "localname": "AOLATOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185541",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AOLATOLI PWSS",
+                        "localname": "AOLATOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185541/ws-services-calculation/Penalty.json b/data/as/5185541/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89bcfea7ff
--- /dev/null
+++ b/data/as/5185541/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185541",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185541/ws-services-calculation/WCBillingSlab.json b/data/as/5185541/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4cb42a9e2f
--- /dev/null
+++ b/data/as/5185541/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185541",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185549/BillingService/BusinessService.json b/data/as/5185549/BillingService/BusinessService.json
new file mode 100644
index 0000000000..413832678d
--- /dev/null
+++ b/data/as/5185549/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185549",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185549/egov-location/boundary-data.json b/data/as/5185549/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f138340e66
--- /dev/null
+++ b/data/as/5185549/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185549",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NORTH SOOTEA PWSS",
+                "localname": "NORTH SOOTEA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NORTH SOOTEA PWSS",
+                        "localname": "NORTH SOOTEA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NORTH SOOTEA PWSS",
+                "localname": "NORTH SOOTEA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NORTH SOOTEA PWSS",
+                        "localname": "NORTH SOOTEA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185549/ws-services-calculation/Penalty.json b/data/as/5185549/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..43f4d1fae1
--- /dev/null
+++ b/data/as/5185549/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185549",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185549/ws-services-calculation/WCBillingSlab.json b/data/as/5185549/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a78e3e5bd
--- /dev/null
+++ b/data/as/5185549/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185549",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185556/BillingService/BusinessService.json b/data/as/5185556/BillingService/BusinessService.json
new file mode 100644
index 0000000000..640a8d20a7
--- /dev/null
+++ b/data/as/5185556/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185556",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185556/egov-location/boundary-data.json b/data/as/5185556/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab0fc01c4f
--- /dev/null
+++ b/data/as/5185556/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185556",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHANAMUKH PWSS",
+                "localname": "KHANAMUKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHANAMUKH PWSS",
+                        "localname": "KHANAMUKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHANAMUKH PWSS",
+                "localname": "KHANAMUKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHANAMUKH PWSS",
+                        "localname": "KHANAMUKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185556/ws-services-calculation/Penalty.json b/data/as/5185556/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ffe848b105
--- /dev/null
+++ b/data/as/5185556/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185556",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185556/ws-services-calculation/WCBillingSlab.json b/data/as/5185556/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3000badf5f
--- /dev/null
+++ b/data/as/5185556/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185556",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185570/BillingService/BusinessService.json b/data/as/5185570/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc9cb2551b
--- /dev/null
+++ b/data/as/5185570/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185570",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185570/egov-location/boundary-data.json b/data/as/5185570/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d84d3c0858
--- /dev/null
+++ b/data/as/5185570/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185570",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDAL PWSS",
+                "localname": "DAKAIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDAL PWSS",
+                        "localname": "DAKAIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDAL PWSS",
+                "localname": "DAKAIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDAL PWSS",
+                        "localname": "DAKAIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185570/ws-services-calculation/Penalty.json b/data/as/5185570/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..973bcd1531
--- /dev/null
+++ b/data/as/5185570/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185570",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185570/ws-services-calculation/WCBillingSlab.json b/data/as/5185570/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f12c0196c5
--- /dev/null
+++ b/data/as/5185570/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185570",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185575/BillingService/BusinessService.json b/data/as/5185575/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a53c7919b
--- /dev/null
+++ b/data/as/5185575/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185575",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185575/egov-location/boundary-data.json b/data/as/5185575/egov-location/boundary-data.json
new file mode 100644
index 0000000000..72972f21b6
--- /dev/null
+++ b/data/as/5185575/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185575",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDAL PWSS",
+                "localname": "DAKAIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDAL PWSS",
+                        "localname": "DAKAIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDAL PWSS",
+                "localname": "DAKAIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDAL PWSS",
+                        "localname": "DAKAIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185575/ws-services-calculation/Penalty.json b/data/as/5185575/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13f01dbec0
--- /dev/null
+++ b/data/as/5185575/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185575",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185575/ws-services-calculation/WCBillingSlab.json b/data/as/5185575/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6044fea89f
--- /dev/null
+++ b/data/as/5185575/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185575",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185587/BillingService/BusinessService.json b/data/as/5185587/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88ff544346
--- /dev/null
+++ b/data/as/5185587/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185587",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185587/egov-location/boundary-data.json b/data/as/5185587/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bd900fd0e0
--- /dev/null
+++ b/data/as/5185587/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185587",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BADIARPARA PWSS",
+                "localname": "BADIARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BADIARPARA PWSS",
+                        "localname": "BADIARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BADIARPARA PWSS",
+                "localname": "BADIARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BADIARPARA PWSS",
+                        "localname": "BADIARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185587/ws-services-calculation/Penalty.json b/data/as/5185587/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b061a74327
--- /dev/null
+++ b/data/as/5185587/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185587",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185587/ws-services-calculation/WCBillingSlab.json b/data/as/5185587/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4987a69f7
--- /dev/null
+++ b/data/as/5185587/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185587",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185591/BillingService/BusinessService.json b/data/as/5185591/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0c9f6ecc88
--- /dev/null
+++ b/data/as/5185591/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185591",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185591/egov-location/boundary-data.json b/data/as/5185591/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c376400b8c
--- /dev/null
+++ b/data/as/5185591/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185591",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA PWSS UPGRADATION",
+                "localname": "DIPLONGA PWSS UPGRADATION",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185591",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA PWSS UPGRADATION",
+                        "localname": "DIPLONGA PWSS UPGRADATION",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA PWSS UPGRADATION",
+                "localname": "DIPLONGA PWSS UPGRADATION",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185591",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA PWSS UPGRADATION",
+                        "localname": "DIPLONGA PWSS UPGRADATION",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185591/ws-services-calculation/Penalty.json b/data/as/5185591/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59383f8ee7
--- /dev/null
+++ b/data/as/5185591/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185591",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185591/ws-services-calculation/WCBillingSlab.json b/data/as/5185591/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..279f6e84b4
--- /dev/null
+++ b/data/as/5185591/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185591",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185615/BillingService/BusinessService.json b/data/as/5185615/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e6cbbe235
--- /dev/null
+++ b/data/as/5185615/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185615",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185615/egov-location/boundary-data.json b/data/as/5185615/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ecd7b69591
--- /dev/null
+++ b/data/as/5185615/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185615",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYPUR GEREKI PWSS",
+                "localname": "JOYPUR GEREKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYPUR GEREKI PWSS",
+                        "localname": "JOYPUR GEREKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYPUR GEREKI PWSS",
+                "localname": "JOYPUR GEREKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYPUR GEREKI PWSS",
+                        "localname": "JOYPUR GEREKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185615/ws-services-calculation/Penalty.json b/data/as/5185615/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41f45655f3
--- /dev/null
+++ b/data/as/5185615/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185615",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185615/ws-services-calculation/WCBillingSlab.json b/data/as/5185615/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc96c90a49
--- /dev/null
+++ b/data/as/5185615/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185615",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185635/BillingService/BusinessService.json b/data/as/5185635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ebba4357a
--- /dev/null
+++ b/data/as/5185635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185635/egov-location/boundary-data.json b/data/as/5185635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87565dbe98
--- /dev/null
+++ b/data/as/5185635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MESSELKHOWA PWSS",
+                "localname": "MESSELKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MESSELKHOWA PWSS",
+                        "localname": "MESSELKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MESSELKHOWA PWSS",
+                "localname": "MESSELKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MESSELKHOWA PWSS",
+                        "localname": "MESSELKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185635/ws-services-calculation/Penalty.json b/data/as/5185635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d16dd02e38
--- /dev/null
+++ b/data/as/5185635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185635/ws-services-calculation/WCBillingSlab.json b/data/as/5185635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c3c705c3a4
--- /dev/null
+++ b/data/as/5185635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185650/BillingService/BusinessService.json b/data/as/5185650/BillingService/BusinessService.json
new file mode 100644
index 0000000000..62f6ec7ac3
--- /dev/null
+++ b/data/as/5185650/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185650",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185650/egov-location/boundary-data.json b/data/as/5185650/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed74bff428
--- /dev/null
+++ b/data/as/5185650/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185650",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MESSELKHOWA PWSS",
+                "localname": "MESSELKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MESSELKHOWA PWSS",
+                        "localname": "MESSELKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MESSELKHOWA PWSS",
+                "localname": "MESSELKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MESSELKHOWA PWSS",
+                        "localname": "MESSELKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185650/ws-services-calculation/Penalty.json b/data/as/5185650/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dae6dba9c6
--- /dev/null
+++ b/data/as/5185650/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185650",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185650/ws-services-calculation/WCBillingSlab.json b/data/as/5185650/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d715a97dd
--- /dev/null
+++ b/data/as/5185650/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185650",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185655/BillingService/BusinessService.json b/data/as/5185655/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e0b51699d
--- /dev/null
+++ b/data/as/5185655/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185655",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185655/egov-location/boundary-data.json b/data/as/5185655/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ff84a87a7
--- /dev/null
+++ b/data/as/5185655/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185655",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA HADIGAON PWSS",
+                "localname": "TUKURA HADIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA HADIGAON PWSS",
+                        "localname": "TUKURA HADIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA HADIGAON PWSS",
+                "localname": "TUKURA HADIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA HADIGAON PWSS",
+                        "localname": "TUKURA HADIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185655/ws-services-calculation/Penalty.json b/data/as/5185655/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1582651a81
--- /dev/null
+++ b/data/as/5185655/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185655",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185655/ws-services-calculation/WCBillingSlab.json b/data/as/5185655/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1d99e9333
--- /dev/null
+++ b/data/as/5185655/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185655",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185659/BillingService/BusinessService.json b/data/as/5185659/BillingService/BusinessService.json
new file mode 100644
index 0000000000..645b9daec5
--- /dev/null
+++ b/data/as/5185659/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185659",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185659/egov-location/boundary-data.json b/data/as/5185659/egov-location/boundary-data.json
new file mode 100644
index 0000000000..943608dfe1
--- /dev/null
+++ b/data/as/5185659/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185659",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA HADIGAON PWSS",
+                "localname": "TUKURA HADIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185659",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA HADIGAON PWSS",
+                        "localname": "TUKURA HADIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA HADIGAON PWSS",
+                "localname": "TUKURA HADIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185659",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA HADIGAON PWSS",
+                        "localname": "TUKURA HADIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185659/ws-services-calculation/Penalty.json b/data/as/5185659/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..97058c3cd2
--- /dev/null
+++ b/data/as/5185659/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185659",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185659/ws-services-calculation/WCBillingSlab.json b/data/as/5185659/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de6d39b10a
--- /dev/null
+++ b/data/as/5185659/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185659",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185665/BillingService/BusinessService.json b/data/as/5185665/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2099ff475f
--- /dev/null
+++ b/data/as/5185665/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185665",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185665/egov-location/boundary-data.json b/data/as/5185665/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c98939754
--- /dev/null
+++ b/data/as/5185665/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185665",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PWSS",
+                "localname": "THEKASHU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PWSS",
+                        "localname": "THEKASHU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PWSS",
+                "localname": "THEKASHU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PWSS",
+                        "localname": "THEKASHU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185665/ws-services-calculation/Penalty.json b/data/as/5185665/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a4f525af9d
--- /dev/null
+++ b/data/as/5185665/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185665",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185665/ws-services-calculation/WCBillingSlab.json b/data/as/5185665/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33deda4517
--- /dev/null
+++ b/data/as/5185665/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185665",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185685/BillingService/BusinessService.json b/data/as/5185685/BillingService/BusinessService.json
new file mode 100644
index 0000000000..47dfc4213e
--- /dev/null
+++ b/data/as/5185685/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185685",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185685/egov-location/boundary-data.json b/data/as/5185685/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9ec363c05
--- /dev/null
+++ b/data/as/5185685/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185685",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA PWSS",
+                "localname": "DAMRA PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA PWSS",
+                        "localname": "DAMRA PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA PWSS",
+                "localname": "DAMRA PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA PWSS",
+                        "localname": "DAMRA PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185685/ws-services-calculation/Penalty.json b/data/as/5185685/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9c25efd31
--- /dev/null
+++ b/data/as/5185685/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185685",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185685/ws-services-calculation/WCBillingSlab.json b/data/as/5185685/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..356102b265
--- /dev/null
+++ b/data/as/5185685/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185685",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185693/BillingService/BusinessService.json b/data/as/5185693/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27796d264c
--- /dev/null
+++ b/data/as/5185693/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185693",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185693/egov-location/boundary-data.json b/data/as/5185693/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7247aa9ddf
--- /dev/null
+++ b/data/as/5185693/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185693",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR PWSS",
+                "localname": "JALESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR PWSS",
+                        "localname": "JALESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR PWSS",
+                "localname": "JALESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR PWSS",
+                        "localname": "JALESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185693/ws-services-calculation/Penalty.json b/data/as/5185693/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7da75d5f68
--- /dev/null
+++ b/data/as/5185693/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185693",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185693/ws-services-calculation/WCBillingSlab.json b/data/as/5185693/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f4bf67b646
--- /dev/null
+++ b/data/as/5185693/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185693",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185707/BillingService/BusinessService.json b/data/as/5185707/BillingService/BusinessService.json
new file mode 100644
index 0000000000..039418c09d
--- /dev/null
+++ b/data/as/5185707/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185707",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185707/egov-location/boundary-data.json b/data/as/5185707/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f90aae04bf
--- /dev/null
+++ b/data/as/5185707/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185707",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PWSS",
+                "localname": "KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185707",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PWSS",
+                        "localname": "KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PWSS",
+                "localname": "KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185707",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PWSS",
+                        "localname": "KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185707/ws-services-calculation/Penalty.json b/data/as/5185707/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bcae40efba
--- /dev/null
+++ b/data/as/5185707/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185707",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185707/ws-services-calculation/WCBillingSlab.json b/data/as/5185707/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..634eb2bf3e
--- /dev/null
+++ b/data/as/5185707/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185707",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185717/BillingService/BusinessService.json b/data/as/5185717/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d1463fdf9b
--- /dev/null
+++ b/data/as/5185717/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185717",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185717/egov-location/boundary-data.json b/data/as/5185717/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c2385f12e1
--- /dev/null
+++ b/data/as/5185717/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185717",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PWSS",
+                "localname": "KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PWSS",
+                        "localname": "KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PWSS",
+                "localname": "KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PWSS",
+                        "localname": "KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185717/ws-services-calculation/Penalty.json b/data/as/5185717/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9de6197138
--- /dev/null
+++ b/data/as/5185717/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185717",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185717/ws-services-calculation/WCBillingSlab.json b/data/as/5185717/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0fea52d10a
--- /dev/null
+++ b/data/as/5185717/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185717",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185887/BillingService/BusinessService.json b/data/as/5185887/BillingService/BusinessService.json
new file mode 100644
index 0000000000..84b39d7d83
--- /dev/null
+++ b/data/as/5185887/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5185887",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185887/egov-location/boundary-data.json b/data/as/5185887/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c5468aeb98
--- /dev/null
+++ b/data/as/5185887/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5185887",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAPEKHATI PWSS(UPGRADATION)",
+                "localname": "SAPEKHATI PWSS(UPGRADATION)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185887",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAPEKHATI PWSS(UPGRADATION)",
+                        "localname": "SAPEKHATI PWSS(UPGRADATION)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAPEKHATI PWSS(UPGRADATION)",
+                "localname": "SAPEKHATI PWSS(UPGRADATION)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5185887",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAPEKHATI PWSS(UPGRADATION)",
+                        "localname": "SAPEKHATI PWSS(UPGRADATION)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185887/ws-services-calculation/Penalty.json b/data/as/5185887/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df6e8a8adb
--- /dev/null
+++ b/data/as/5185887/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5185887",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5185887/ws-services-calculation/WCBillingSlab.json b/data/as/5185887/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5e78b0872a
--- /dev/null
+++ b/data/as/5185887/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5185887",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186387/BillingService/BusinessService.json b/data/as/5186387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe3ea57da5
--- /dev/null
+++ b/data/as/5186387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186387/egov-location/boundary-data.json b/data/as/5186387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad0bceda19
--- /dev/null
+++ b/data/as/5186387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI BAGUAN PWSS",
+                "localname": "AMBARI BAGUAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI BAGUAN PWSS",
+                        "localname": "AMBARI BAGUAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI BAGUAN PWSS",
+                "localname": "AMBARI BAGUAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI BAGUAN PWSS",
+                        "localname": "AMBARI BAGUAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186387/ws-services-calculation/Penalty.json b/data/as/5186387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a315c57035
--- /dev/null
+++ b/data/as/5186387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186387/ws-services-calculation/WCBillingSlab.json b/data/as/5186387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e1eb6be73
--- /dev/null
+++ b/data/as/5186387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186420/BillingService/BusinessService.json b/data/as/5186420/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9f5c46dca
--- /dev/null
+++ b/data/as/5186420/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186420",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186420/egov-location/boundary-data.json b/data/as/5186420/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8771ddaf42
--- /dev/null
+++ b/data/as/5186420/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186420",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARANGAPUR PWSS",
+                "localname": "TARANGAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARANGAPUR PWSS",
+                        "localname": "TARANGAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARANGAPUR PWSS",
+                "localname": "TARANGAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARANGAPUR PWSS",
+                        "localname": "TARANGAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186420/ws-services-calculation/Penalty.json b/data/as/5186420/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d8fc58345
--- /dev/null
+++ b/data/as/5186420/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186420",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186420/ws-services-calculation/WCBillingSlab.json b/data/as/5186420/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..43a6cca9de
--- /dev/null
+++ b/data/as/5186420/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186420",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186446/BillingService/BusinessService.json b/data/as/5186446/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e63a69a8e6
--- /dev/null
+++ b/data/as/5186446/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186446",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186446/egov-location/boundary-data.json b/data/as/5186446/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc5f7eaec9
--- /dev/null
+++ b/data/as/5186446/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186446",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADANG PWSS",
+                "localname": "MADANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADANG PWSS",
+                        "localname": "MADANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADANG PWSS",
+                "localname": "MADANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADANG PWSS",
+                        "localname": "MADANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186446/ws-services-calculation/Penalty.json b/data/as/5186446/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce02662736
--- /dev/null
+++ b/data/as/5186446/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186446",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186446/ws-services-calculation/WCBillingSlab.json b/data/as/5186446/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..34cea43aeb
--- /dev/null
+++ b/data/as/5186446/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186446",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186457/BillingService/BusinessService.json b/data/as/5186457/BillingService/BusinessService.json
new file mode 100644
index 0000000000..846a3da184
--- /dev/null
+++ b/data/as/5186457/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186457",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186457/egov-location/boundary-data.json b/data/as/5186457/egov-location/boundary-data.json
new file mode 100644
index 0000000000..417048232b
--- /dev/null
+++ b/data/as/5186457/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186457",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA PWSS",
+                "localname": "SAKTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA PWSS",
+                        "localname": "SAKTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA PWSS",
+                "localname": "SAKTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA PWSS",
+                        "localname": "SAKTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186457/ws-services-calculation/Penalty.json b/data/as/5186457/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8dc53f5bab
--- /dev/null
+++ b/data/as/5186457/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186457",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186457/ws-services-calculation/WCBillingSlab.json b/data/as/5186457/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..79e19fdad8
--- /dev/null
+++ b/data/as/5186457/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186457",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186463/BillingService/BusinessService.json b/data/as/5186463/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0c1742bc65
--- /dev/null
+++ b/data/as/5186463/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186463",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186463/egov-location/boundary-data.json b/data/as/5186463/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ade226438e
--- /dev/null
+++ b/data/as/5186463/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186463",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA PWSS",
+                "localname": "SAKTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186463",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA PWSS",
+                        "localname": "SAKTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA PWSS",
+                "localname": "SAKTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186463",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA PWSS",
+                        "localname": "SAKTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186463/ws-services-calculation/Penalty.json b/data/as/5186463/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d8158f5109
--- /dev/null
+++ b/data/as/5186463/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186463",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186463/ws-services-calculation/WCBillingSlab.json b/data/as/5186463/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..89517adde6
--- /dev/null
+++ b/data/as/5186463/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186463",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186493/BillingService/BusinessService.json b/data/as/5186493/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec4799a087
--- /dev/null
+++ b/data/as/5186493/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186493",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186493/egov-location/boundary-data.json b/data/as/5186493/egov-location/boundary-data.json
new file mode 100644
index 0000000000..55d747c38b
--- /dev/null
+++ b/data/as/5186493/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186493",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PWSS",
+                "localname": "BAMUNDANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186493",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PWSS",
+                        "localname": "BAMUNDANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PWSS",
+                "localname": "BAMUNDANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186493",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PWSS",
+                        "localname": "BAMUNDANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186493/ws-services-calculation/Penalty.json b/data/as/5186493/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6e02d8f4d8
--- /dev/null
+++ b/data/as/5186493/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186493",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186493/ws-services-calculation/WCBillingSlab.json b/data/as/5186493/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b9c02999b4
--- /dev/null
+++ b/data/as/5186493/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186493",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186499/BillingService/BusinessService.json b/data/as/5186499/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57e59bd0ec
--- /dev/null
+++ b/data/as/5186499/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186499",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186499/egov-location/boundary-data.json b/data/as/5186499/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9485962d47
--- /dev/null
+++ b/data/as/5186499/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186499",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PWSS",
+                "localname": "BAMUNDANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186499",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PWSS",
+                        "localname": "BAMUNDANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PWSS",
+                "localname": "BAMUNDANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186499",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PWSS",
+                        "localname": "BAMUNDANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186499/ws-services-calculation/Penalty.json b/data/as/5186499/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce5143965d
--- /dev/null
+++ b/data/as/5186499/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186499",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186499/ws-services-calculation/WCBillingSlab.json b/data/as/5186499/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed958f9765
--- /dev/null
+++ b/data/as/5186499/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186499",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186506/BillingService/BusinessService.json b/data/as/5186506/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1afe79c3bc
--- /dev/null
+++ b/data/as/5186506/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186506",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186506/egov-location/boundary-data.json b/data/as/5186506/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54031f7351
--- /dev/null
+++ b/data/as/5186506/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186506",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOHELA PWSS",
+                "localname": "DOHELA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOHELA PWSS",
+                        "localname": "DOHELA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOHELA PWSS",
+                "localname": "DOHELA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOHELA PWSS",
+                        "localname": "DOHELA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186506/ws-services-calculation/Penalty.json b/data/as/5186506/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a82268d23
--- /dev/null
+++ b/data/as/5186506/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186506",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186506/ws-services-calculation/WCBillingSlab.json b/data/as/5186506/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cab93b15f0
--- /dev/null
+++ b/data/as/5186506/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186506",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186513/BillingService/BusinessService.json b/data/as/5186513/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bbe1d411a2
--- /dev/null
+++ b/data/as/5186513/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5186513",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186513/egov-location/boundary-data.json b/data/as/5186513/egov-location/boundary-data.json
new file mode 100644
index 0000000000..154d7ef027
--- /dev/null
+++ b/data/as/5186513/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5186513",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOHELA PWSS",
+                "localname": "DOHELA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186513",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOHELA PWSS",
+                        "localname": "DOHELA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOHELA PWSS",
+                "localname": "DOHELA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5186513",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOHELA PWSS",
+                        "localname": "DOHELA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186513/ws-services-calculation/Penalty.json b/data/as/5186513/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec9cee11b0
--- /dev/null
+++ b/data/as/5186513/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5186513",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5186513/ws-services-calculation/WCBillingSlab.json b/data/as/5186513/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0cb5bc4abd
--- /dev/null
+++ b/data/as/5186513/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5186513",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5206914/BillingService/BusinessService.json b/data/as/5206914/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b366344239
--- /dev/null
+++ b/data/as/5206914/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5206914",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5206914/egov-location/boundary-data.json b/data/as/5206914/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4611512c9d
--- /dev/null
+++ b/data/as/5206914/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5206914",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE  PWSS",
+                "localname": "SOPAI TE  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5206914",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE  PWSS",
+                        "localname": "SOPAI TE  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE  PWSS",
+                "localname": "SOPAI TE  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5206914",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE  PWSS",
+                        "localname": "SOPAI TE  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5206914/ws-services-calculation/Penalty.json b/data/as/5206914/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a0c26afc65
--- /dev/null
+++ b/data/as/5206914/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5206914",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5206914/ws-services-calculation/WCBillingSlab.json b/data/as/5206914/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8e0aa1fda
--- /dev/null
+++ b/data/as/5206914/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5206914",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230312/BillingService/BusinessService.json b/data/as/5230312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fdfb5e057c
--- /dev/null
+++ b/data/as/5230312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5230312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230312/egov-location/boundary-data.json b/data/as/5230312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1abcf42290
--- /dev/null
+++ b/data/as/5230312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5230312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGAJAN PWSS",
+                "localname": "RONGAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5230312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGAJAN PWSS",
+                        "localname": "RONGAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGAJAN PWSS",
+                "localname": "RONGAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5230312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGAJAN PWSS",
+                        "localname": "RONGAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230312/ws-services-calculation/Penalty.json b/data/as/5230312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81edba151c
--- /dev/null
+++ b/data/as/5230312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5230312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230312/ws-services-calculation/WCBillingSlab.json b/data/as/5230312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c0947add06
--- /dev/null
+++ b/data/as/5230312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5230312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230346/BillingService/BusinessService.json b/data/as/5230346/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55f579bd42
--- /dev/null
+++ b/data/as/5230346/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5230346",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230346/egov-location/boundary-data.json b/data/as/5230346/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6608b60ac5
--- /dev/null
+++ b/data/as/5230346/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5230346",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGAGORAH PWSS",
+                "localname": "RONGAGORAH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5230346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGAGORAH PWSS",
+                        "localname": "RONGAGORAH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGAGORAH PWSS",
+                "localname": "RONGAGORAH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5230346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGAGORAH PWSS",
+                        "localname": "RONGAGORAH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230346/ws-services-calculation/Penalty.json b/data/as/5230346/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d9e109a385
--- /dev/null
+++ b/data/as/5230346/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5230346",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230346/ws-services-calculation/WCBillingSlab.json b/data/as/5230346/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6468f03c0e
--- /dev/null
+++ b/data/as/5230346/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5230346",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230398/BillingService/BusinessService.json b/data/as/5230398/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2f8560fe79
--- /dev/null
+++ b/data/as/5230398/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5230398",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230398/egov-location/boundary-data.json b/data/as/5230398/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e09e282e83
--- /dev/null
+++ b/data/as/5230398/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5230398",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DORAPARA PWSS",
+                "localname": "DORAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5230398",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DORAPARA PWSS",
+                        "localname": "DORAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DORAPARA PWSS",
+                "localname": "DORAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5230398",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DORAPARA PWSS",
+                        "localname": "DORAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230398/ws-services-calculation/Penalty.json b/data/as/5230398/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f9bd07bb19
--- /dev/null
+++ b/data/as/5230398/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5230398",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5230398/ws-services-calculation/WCBillingSlab.json b/data/as/5230398/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba7c13ca4e
--- /dev/null
+++ b/data/as/5230398/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5230398",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/52793/BillingService/BusinessService.json b/data/as/52793/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9448b8d780
--- /dev/null
+++ b/data/as/52793/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.52793",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/52793/egov-location/boundary-data.json b/data/as/52793/egov-location/boundary-data.json
new file mode 100644
index 0000000000..85463fb61c
--- /dev/null
+++ b/data/as/52793/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.52793",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ERASUTI JUNGLE PWSS",
+                "localname": "ERASUTI JUNGLE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.52793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ERASUTI JUNGLE PWSS",
+                        "localname": "ERASUTI JUNGLE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ERASUTI JUNGLE PWSS",
+                "localname": "ERASUTI JUNGLE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.52793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ERASUTI JUNGLE PWSS",
+                        "localname": "ERASUTI JUNGLE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/52793/ws-services-calculation/Penalty.json b/data/as/52793/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b69ad973b9
--- /dev/null
+++ b/data/as/52793/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.52793",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/52793/ws-services-calculation/WCBillingSlab.json b/data/as/52793/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b056bcebe
--- /dev/null
+++ b/data/as/52793/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.52793",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5344027/BillingService/BusinessService.json b/data/as/5344027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..459329e42d
--- /dev/null
+++ b/data/as/5344027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5344027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5344027/egov-location/boundary-data.json b/data/as/5344027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44ce91ff79
--- /dev/null
+++ b/data/as/5344027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5344027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DA-ATI",
+                "localname": "DA-ATI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5344027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DA-ATI",
+                        "localname": "DA-ATI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DA-ATI",
+                "localname": "DA-ATI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5344027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DA-ATI",
+                        "localname": "DA-ATI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5344027/ws-services-calculation/Penalty.json b/data/as/5344027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1b681e14f
--- /dev/null
+++ b/data/as/5344027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5344027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5344027/ws-services-calculation/WCBillingSlab.json b/data/as/5344027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b82834449e
--- /dev/null
+++ b/data/as/5344027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5344027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349626/BillingService/BusinessService.json b/data/as/5349626/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9aff8bed27
--- /dev/null
+++ b/data/as/5349626/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5349626",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349626/egov-location/boundary-data.json b/data/as/5349626/egov-location/boundary-data.json
new file mode 100644
index 0000000000..45d30c3cc6
--- /dev/null
+++ b/data/as/5349626/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5349626",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TALAKABARI BENGALI PWSS",
+                "localname": "TALAKABARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5349626",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TALAKABARI BENGALI PWSS",
+                        "localname": "TALAKABARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TALAKABARI BENGALI PWSS",
+                "localname": "TALAKABARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5349626",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TALAKABARI BENGALI PWSS",
+                        "localname": "TALAKABARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349626/ws-services-calculation/Penalty.json b/data/as/5349626/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d597751d86
--- /dev/null
+++ b/data/as/5349626/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5349626",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349626/ws-services-calculation/WCBillingSlab.json b/data/as/5349626/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6d765233b
--- /dev/null
+++ b/data/as/5349626/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5349626",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349656/BillingService/BusinessService.json b/data/as/5349656/BillingService/BusinessService.json
new file mode 100644
index 0000000000..06b9810f02
--- /dev/null
+++ b/data/as/5349656/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5349656",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349656/egov-location/boundary-data.json b/data/as/5349656/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca445c4e9b
--- /dev/null
+++ b/data/as/5349656/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5349656",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NANDIKESWAR PWSS",
+                "localname": "NANDIKESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5349656",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NANDIKESWAR PWSS",
+                        "localname": "NANDIKESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NANDIKESWAR PWSS",
+                "localname": "NANDIKESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5349656",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NANDIKESWAR PWSS",
+                        "localname": "NANDIKESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349656/ws-services-calculation/Penalty.json b/data/as/5349656/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..39042f4743
--- /dev/null
+++ b/data/as/5349656/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5349656",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349656/ws-services-calculation/WCBillingSlab.json b/data/as/5349656/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e1ccdade17
--- /dev/null
+++ b/data/as/5349656/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5349656",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349682/BillingService/BusinessService.json b/data/as/5349682/BillingService/BusinessService.json
new file mode 100644
index 0000000000..82ab90f564
--- /dev/null
+++ b/data/as/5349682/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5349682",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349682/egov-location/boundary-data.json b/data/as/5349682/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b7f5bb77d
--- /dev/null
+++ b/data/as/5349682/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5349682",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJORCHUK PWSS",
+                "localname": "MAJORCHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5349682",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJORCHUK PWSS",
+                        "localname": "MAJORCHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJORCHUK PWSS",
+                "localname": "MAJORCHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5349682",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJORCHUK PWSS",
+                        "localname": "MAJORCHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349682/ws-services-calculation/Penalty.json b/data/as/5349682/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a4c28b2f54
--- /dev/null
+++ b/data/as/5349682/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5349682",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5349682/ws-services-calculation/WCBillingSlab.json b/data/as/5349682/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1405244c99
--- /dev/null
+++ b/data/as/5349682/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5349682",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5357091/BillingService/BusinessService.json b/data/as/5357091/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0a540cb989
--- /dev/null
+++ b/data/as/5357091/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5357091",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5357091/egov-location/boundary-data.json b/data/as/5357091/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a3e792d31
--- /dev/null
+++ b/data/as/5357091/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5357091",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANI PWSS",
+                "localname": "NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5357091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANI PWSS",
+                        "localname": "NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANI PWSS",
+                "localname": "NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5357091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANI PWSS",
+                        "localname": "NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5357091/ws-services-calculation/Penalty.json b/data/as/5357091/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4bd36e862
--- /dev/null
+++ b/data/as/5357091/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5357091",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5357091/ws-services-calculation/WCBillingSlab.json b/data/as/5357091/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e345ffef0
--- /dev/null
+++ b/data/as/5357091/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5357091",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362300/BillingService/BusinessService.json b/data/as/5362300/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1d726f43bb
--- /dev/null
+++ b/data/as/5362300/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5362300",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362300/egov-location/boundary-data.json b/data/as/5362300/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea59674d13
--- /dev/null
+++ b/data/as/5362300/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5362300",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI PWSS",
+                "localname": "MORISUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5362300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI PWSS",
+                        "localname": "MORISUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI PWSS",
+                "localname": "MORISUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5362300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI PWSS",
+                        "localname": "MORISUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362300/ws-services-calculation/Penalty.json b/data/as/5362300/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26b10f3653
--- /dev/null
+++ b/data/as/5362300/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5362300",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362300/ws-services-calculation/WCBillingSlab.json b/data/as/5362300/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02dab7c048
--- /dev/null
+++ b/data/as/5362300/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5362300",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362332/BillingService/BusinessService.json b/data/as/5362332/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd3f63cc5a
--- /dev/null
+++ b/data/as/5362332/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5362332",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362332/egov-location/boundary-data.json b/data/as/5362332/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8663a12249
--- /dev/null
+++ b/data/as/5362332/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5362332",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGACHAKUWA PWSS",
+                "localname": "RANGACHAKUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5362332",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGACHAKUWA PWSS",
+                        "localname": "RANGACHAKUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGACHAKUWA PWSS",
+                "localname": "RANGACHAKUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5362332",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGACHAKUWA PWSS",
+                        "localname": "RANGACHAKUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362332/ws-services-calculation/Penalty.json b/data/as/5362332/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c032d3307a
--- /dev/null
+++ b/data/as/5362332/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5362332",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5362332/ws-services-calculation/WCBillingSlab.json b/data/as/5362332/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69ab032c25
--- /dev/null
+++ b/data/as/5362332/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5362332",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379654/BillingService/BusinessService.json b/data/as/5379654/BillingService/BusinessService.json
new file mode 100644
index 0000000000..15350164c0
--- /dev/null
+++ b/data/as/5379654/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5379654",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379654/egov-location/boundary-data.json b/data/as/5379654/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc62ee12ac
--- /dev/null
+++ b/data/as/5379654/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5379654",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIDURI PWSS",
+                "localname": "DARIDURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5379654",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIDURI PWSS",
+                        "localname": "DARIDURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIDURI PWSS",
+                "localname": "DARIDURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5379654",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIDURI PWSS",
+                        "localname": "DARIDURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379654/ws-services-calculation/Penalty.json b/data/as/5379654/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9197053ba
--- /dev/null
+++ b/data/as/5379654/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5379654",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379654/ws-services-calculation/WCBillingSlab.json b/data/as/5379654/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67bfae53cc
--- /dev/null
+++ b/data/as/5379654/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5379654",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379810/BillingService/BusinessService.json b/data/as/5379810/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1fbb395880
--- /dev/null
+++ b/data/as/5379810/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5379810",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379810/egov-location/boundary-data.json b/data/as/5379810/egov-location/boundary-data.json
new file mode 100644
index 0000000000..182539fa2c
--- /dev/null
+++ b/data/as/5379810/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5379810",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAKH PWSS",
+                "localname": "DARAKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5379810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAKH PWSS",
+                        "localname": "DARAKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAKH PWSS",
+                "localname": "DARAKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5379810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAKH PWSS",
+                        "localname": "DARAKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379810/ws-services-calculation/Penalty.json b/data/as/5379810/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..34c2767f60
--- /dev/null
+++ b/data/as/5379810/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5379810",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5379810/ws-services-calculation/WCBillingSlab.json b/data/as/5379810/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49ca47953b
--- /dev/null
+++ b/data/as/5379810/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5379810",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404892/BillingService/BusinessService.json b/data/as/5404892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e02ebebfd7
--- /dev/null
+++ b/data/as/5404892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5404892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404892/egov-location/boundary-data.json b/data/as/5404892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..898a16f90c
--- /dev/null
+++ b/data/as/5404892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5404892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDIKORAI NO.2 PWSS",
+                "localname": "BORDIKORAI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5404892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDIKORAI NO.2 PWSS",
+                        "localname": "BORDIKORAI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDIKORAI NO.2 PWSS",
+                "localname": "BORDIKORAI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5404892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDIKORAI NO.2 PWSS",
+                        "localname": "BORDIKORAI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404892/ws-services-calculation/Penalty.json b/data/as/5404892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..63cdfdee81
--- /dev/null
+++ b/data/as/5404892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5404892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404892/ws-services-calculation/WCBillingSlab.json b/data/as/5404892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9db157bfff
--- /dev/null
+++ b/data/as/5404892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5404892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404904/BillingService/BusinessService.json b/data/as/5404904/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d74b7c52e
--- /dev/null
+++ b/data/as/5404904/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5404904",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404904/egov-location/boundary-data.json b/data/as/5404904/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1794cfa6f7
--- /dev/null
+++ b/data/as/5404904/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5404904",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAIBARI PWSS",
+                "localname": "CHAIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5404904",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAIBARI PWSS",
+                        "localname": "CHAIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAIBARI PWSS",
+                "localname": "CHAIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5404904",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAIBARI PWSS",
+                        "localname": "CHAIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404904/ws-services-calculation/Penalty.json b/data/as/5404904/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a4a14c9e4d
--- /dev/null
+++ b/data/as/5404904/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5404904",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404904/ws-services-calculation/WCBillingSlab.json b/data/as/5404904/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1edd220b2a
--- /dev/null
+++ b/data/as/5404904/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5404904",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404932/BillingService/BusinessService.json b/data/as/5404932/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7275d778b0
--- /dev/null
+++ b/data/as/5404932/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5404932",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404932/egov-location/boundary-data.json b/data/as/5404932/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7c761eb32
--- /dev/null
+++ b/data/as/5404932/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5404932",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MURHADOL PWSS",
+                "localname": "MURHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5404932",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MURHADOL PWSS",
+                        "localname": "MURHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MURHADOL PWSS",
+                "localname": "MURHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5404932",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MURHADOL PWSS",
+                        "localname": "MURHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404932/ws-services-calculation/Penalty.json b/data/as/5404932/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ee96e5498
--- /dev/null
+++ b/data/as/5404932/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5404932",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5404932/ws-services-calculation/WCBillingSlab.json b/data/as/5404932/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..af88895f63
--- /dev/null
+++ b/data/as/5404932/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5404932",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407809/BillingService/BusinessService.json b/data/as/5407809/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d9ac2479a9
--- /dev/null
+++ b/data/as/5407809/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5407809",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407809/egov-location/boundary-data.json b/data/as/5407809/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d30e485148
--- /dev/null
+++ b/data/as/5407809/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5407809",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRIJAN TE PWSS",
+                "localname": "RETROFITTING OF SINGRIJAN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407809",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRIJAN TE PWSS",
+                        "localname": "RETROFITTING OF SINGRIJAN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRIJAN TE PWSS",
+                "localname": "RETROFITTING OF SINGRIJAN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407809",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRIJAN TE PWSS",
+                        "localname": "RETROFITTING OF SINGRIJAN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407809/ws-services-calculation/Penalty.json b/data/as/5407809/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3c7076b8a
--- /dev/null
+++ b/data/as/5407809/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5407809",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407809/ws-services-calculation/WCBillingSlab.json b/data/as/5407809/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4927d3673e
--- /dev/null
+++ b/data/as/5407809/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5407809",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407828/BillingService/BusinessService.json b/data/as/5407828/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a85b79bbd0
--- /dev/null
+++ b/data/as/5407828/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5407828",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407828/egov-location/boundary-data.json b/data/as/5407828/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be885c9509
--- /dev/null
+++ b/data/as/5407828/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5407828",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DURUNG TE PWSS",
+                "localname": "RETROFITTING OF DURUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DURUNG TE PWSS",
+                        "localname": "RETROFITTING OF DURUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DURUNG TE PWSS",
+                "localname": "RETROFITTING OF DURUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DURUNG TE PWSS",
+                        "localname": "RETROFITTING OF DURUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407828/ws-services-calculation/Penalty.json b/data/as/5407828/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..066d50e18e
--- /dev/null
+++ b/data/as/5407828/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5407828",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407828/ws-services-calculation/WCBillingSlab.json b/data/as/5407828/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f4d72644e
--- /dev/null
+++ b/data/as/5407828/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5407828",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407846/BillingService/BusinessService.json b/data/as/5407846/BillingService/BusinessService.json
new file mode 100644
index 0000000000..34c14136ee
--- /dev/null
+++ b/data/as/5407846/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5407846",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407846/egov-location/boundary-data.json b/data/as/5407846/egov-location/boundary-data.json
new file mode 100644
index 0000000000..25191f3494
--- /dev/null
+++ b/data/as/5407846/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5407846",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGIBIL PWSS (QA)",
+                "localname": "BAGIBIL PWSS (QA)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407846",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGIBIL PWSS (QA)",
+                        "localname": "BAGIBIL PWSS (QA)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGIBIL PWSS (QA)",
+                "localname": "BAGIBIL PWSS (QA)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407846",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGIBIL PWSS (QA)",
+                        "localname": "BAGIBIL PWSS (QA)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407846/ws-services-calculation/Penalty.json b/data/as/5407846/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fae30facc7
--- /dev/null
+++ b/data/as/5407846/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5407846",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407846/ws-services-calculation/WCBillingSlab.json b/data/as/5407846/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3cbbb6a4c6
--- /dev/null
+++ b/data/as/5407846/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5407846",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407857/BillingService/BusinessService.json b/data/as/5407857/BillingService/BusinessService.json
new file mode 100644
index 0000000000..80beba11ac
--- /dev/null
+++ b/data/as/5407857/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5407857",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407857/egov-location/boundary-data.json b/data/as/5407857/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ffb74feab
--- /dev/null
+++ b/data/as/5407857/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5407857",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARBARI PWSS",
+                "localname": "RETROFITTING OF NAHARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407857",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARBARI PWSS",
+                        "localname": "RETROFITTING OF NAHARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARBARI PWSS",
+                "localname": "RETROFITTING OF NAHARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5407857",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARBARI PWSS",
+                        "localname": "RETROFITTING OF NAHARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407857/ws-services-calculation/Penalty.json b/data/as/5407857/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c405b7e05f
--- /dev/null
+++ b/data/as/5407857/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5407857",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5407857/ws-services-calculation/WCBillingSlab.json b/data/as/5407857/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b9e158397
--- /dev/null
+++ b/data/as/5407857/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5407857",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408096/BillingService/BusinessService.json b/data/as/5408096/BillingService/BusinessService.json
new file mode 100644
index 0000000000..964d03f8d4
--- /dev/null
+++ b/data/as/5408096/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408096",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408096/egov-location/boundary-data.json b/data/as/5408096/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ce19a5f2c
--- /dev/null
+++ b/data/as/5408096/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408096",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOSSAICHUK PWSS",
+                "localname": "RETROFITTING OF GOSSAICHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOSSAICHUK PWSS",
+                        "localname": "RETROFITTING OF GOSSAICHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOSSAICHUK PWSS",
+                "localname": "RETROFITTING OF GOSSAICHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOSSAICHUK PWSS",
+                        "localname": "RETROFITTING OF GOSSAICHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408096/ws-services-calculation/Penalty.json b/data/as/5408096/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f2e34299f0
--- /dev/null
+++ b/data/as/5408096/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408096",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408096/ws-services-calculation/WCBillingSlab.json b/data/as/5408096/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0688cbc94
--- /dev/null
+++ b/data/as/5408096/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408096",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408108/BillingService/BusinessService.json b/data/as/5408108/BillingService/BusinessService.json
new file mode 100644
index 0000000000..165b79b063
--- /dev/null
+++ b/data/as/5408108/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408108",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408108/egov-location/boundary-data.json b/data/as/5408108/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c77d9bd2d
--- /dev/null
+++ b/data/as/5408108/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408108",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMOLAPAM PWSS",
+                "localname": "RETROFITTING OF AMOLAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408108",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMOLAPAM PWSS",
+                        "localname": "RETROFITTING OF AMOLAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMOLAPAM PWSS",
+                "localname": "RETROFITTING OF AMOLAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408108",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMOLAPAM PWSS",
+                        "localname": "RETROFITTING OF AMOLAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408108/ws-services-calculation/Penalty.json b/data/as/5408108/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..55f3b99ada
--- /dev/null
+++ b/data/as/5408108/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408108",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408108/ws-services-calculation/WCBillingSlab.json b/data/as/5408108/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..911b29296d
--- /dev/null
+++ b/data/as/5408108/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408108",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408187/BillingService/BusinessService.json b/data/as/5408187/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8391063bda
--- /dev/null
+++ b/data/as/5408187/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408187",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408187/egov-location/boundary-data.json b/data/as/5408187/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fed1b1cc7b
--- /dev/null
+++ b/data/as/5408187/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408187",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HAZARAPAR PWSS",
+                "localname": "RETROFITTING OF HAZARAPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408187",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HAZARAPAR PWSS",
+                        "localname": "RETROFITTING OF HAZARAPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HAZARAPAR PWSS",
+                "localname": "RETROFITTING OF HAZARAPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408187",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HAZARAPAR PWSS",
+                        "localname": "RETROFITTING OF HAZARAPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408187/ws-services-calculation/Penalty.json b/data/as/5408187/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f441b1a7a
--- /dev/null
+++ b/data/as/5408187/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408187",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408187/ws-services-calculation/WCBillingSlab.json b/data/as/5408187/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..434785a419
--- /dev/null
+++ b/data/as/5408187/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408187",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408224/BillingService/BusinessService.json b/data/as/5408224/BillingService/BusinessService.json
new file mode 100644
index 0000000000..782b263a75
--- /dev/null
+++ b/data/as/5408224/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408224",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408224/egov-location/boundary-data.json b/data/as/5408224/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1997272c2d
--- /dev/null
+++ b/data/as/5408224/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408224",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KEKAKULI PWSS",
+                "localname": "RETROFITTING OF KEKAKULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KEKAKULI PWSS",
+                        "localname": "RETROFITTING OF KEKAKULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KEKAKULI PWSS",
+                "localname": "RETROFITTING OF KEKAKULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KEKAKULI PWSS",
+                        "localname": "RETROFITTING OF KEKAKULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408224/ws-services-calculation/Penalty.json b/data/as/5408224/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26c4640aa9
--- /dev/null
+++ b/data/as/5408224/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408224",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408224/ws-services-calculation/WCBillingSlab.json b/data/as/5408224/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..685eb9140f
--- /dev/null
+++ b/data/as/5408224/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408224",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408248/BillingService/BusinessService.json b/data/as/5408248/BillingService/BusinessService.json
new file mode 100644
index 0000000000..576556c71f
--- /dev/null
+++ b/data/as/5408248/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408248",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408248/egov-location/boundary-data.json b/data/as/5408248/egov-location/boundary-data.json
new file mode 100644
index 0000000000..56dea4ce6d
--- /dev/null
+++ b/data/as/5408248/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408248",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUNDARBARI PWSS",
+                "localname": "RETROFITTING OF KUNDARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408248",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUNDARBARI PWSS",
+                        "localname": "RETROFITTING OF KUNDARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUNDARBARI PWSS",
+                "localname": "RETROFITTING OF KUNDARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408248",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUNDARBARI PWSS",
+                        "localname": "RETROFITTING OF KUNDARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408248/ws-services-calculation/Penalty.json b/data/as/5408248/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a2f2f258d
--- /dev/null
+++ b/data/as/5408248/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408248",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408248/ws-services-calculation/WCBillingSlab.json b/data/as/5408248/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..debc2ba100
--- /dev/null
+++ b/data/as/5408248/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408248",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408300/BillingService/BusinessService.json b/data/as/5408300/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9ff071a341
--- /dev/null
+++ b/data/as/5408300/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408300",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408300/egov-location/boundary-data.json b/data/as/5408300/egov-location/boundary-data.json
new file mode 100644
index 0000000000..98a778189f
--- /dev/null
+++ b/data/as/5408300/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408300",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HABIDOLONI PWSS",
+                "localname": "RETROFITTING OF HABIDOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HABIDOLONI PWSS",
+                        "localname": "RETROFITTING OF HABIDOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HABIDOLONI PWSS",
+                "localname": "RETROFITTING OF HABIDOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HABIDOLONI PWSS",
+                        "localname": "RETROFITTING OF HABIDOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408300/ws-services-calculation/Penalty.json b/data/as/5408300/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..307d048d1f
--- /dev/null
+++ b/data/as/5408300/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408300",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408300/ws-services-calculation/WCBillingSlab.json b/data/as/5408300/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..acb6a9bdfa
--- /dev/null
+++ b/data/as/5408300/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408300",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408316/BillingService/BusinessService.json b/data/as/5408316/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c33565020c
--- /dev/null
+++ b/data/as/5408316/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408316",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408316/egov-location/boundary-data.json b/data/as/5408316/egov-location/boundary-data.json
new file mode 100644
index 0000000000..440ac7c642
--- /dev/null
+++ b/data/as/5408316/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408316",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ARABARI PWSS",
+                "localname": "RETROFITTING OF ARABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ARABARI PWSS",
+                        "localname": "RETROFITTING OF ARABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ARABARI PWSS",
+                "localname": "RETROFITTING OF ARABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ARABARI PWSS",
+                        "localname": "RETROFITTING OF ARABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408316/ws-services-calculation/Penalty.json b/data/as/5408316/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4fdb47f95b
--- /dev/null
+++ b/data/as/5408316/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408316",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408316/ws-services-calculation/WCBillingSlab.json b/data/as/5408316/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e33c9f54ca
--- /dev/null
+++ b/data/as/5408316/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408316",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408332/BillingService/BusinessService.json b/data/as/5408332/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79f54e17a1
--- /dev/null
+++ b/data/as/5408332/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408332",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408332/egov-location/boundary-data.json b/data/as/5408332/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35fcce9dc3
--- /dev/null
+++ b/data/as/5408332/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408332",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HOKAJAN PWSS",
+                "localname": "RETROFITTING OF HOKAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408332",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HOKAJAN PWSS",
+                        "localname": "RETROFITTING OF HOKAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HOKAJAN PWSS",
+                "localname": "RETROFITTING OF HOKAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408332",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HOKAJAN PWSS",
+                        "localname": "RETROFITTING OF HOKAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408332/ws-services-calculation/Penalty.json b/data/as/5408332/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7456c61452
--- /dev/null
+++ b/data/as/5408332/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408332",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408332/ws-services-calculation/WCBillingSlab.json b/data/as/5408332/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2b96a0f563
--- /dev/null
+++ b/data/as/5408332/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408332",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408704/BillingService/BusinessService.json b/data/as/5408704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1cd89ce63a
--- /dev/null
+++ b/data/as/5408704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408704/egov-location/boundary-data.json b/data/as/5408704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bee15ffcfe
--- /dev/null
+++ b/data/as/5408704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANGAMANDIR PWSS (QA)",
+                "localname": "BHANGAMANDIR PWSS (QA)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANGAMANDIR PWSS (QA)",
+                        "localname": "BHANGAMANDIR PWSS (QA)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANGAMANDIR PWSS (QA)",
+                "localname": "BHANGAMANDIR PWSS (QA)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANGAMANDIR PWSS (QA)",
+                        "localname": "BHANGAMANDIR PWSS (QA)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408704/ws-services-calculation/Penalty.json b/data/as/5408704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37de2bbe37
--- /dev/null
+++ b/data/as/5408704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408704/ws-services-calculation/WCBillingSlab.json b/data/as/5408704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02f182bccd
--- /dev/null
+++ b/data/as/5408704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408793/BillingService/BusinessService.json b/data/as/5408793/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f4f7ff2a80
--- /dev/null
+++ b/data/as/5408793/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408793",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408793/egov-location/boundary-data.json b/data/as/5408793/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0666d2fd94
--- /dev/null
+++ b/data/as/5408793/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408793",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                "localname": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                        "localname": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                "localname": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                        "localname": "NO.2 NARAYANPUR BAGAN PWSS (NQ)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408793/ws-services-calculation/Penalty.json b/data/as/5408793/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..93c21759b0
--- /dev/null
+++ b/data/as/5408793/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408793",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408793/ws-services-calculation/WCBillingSlab.json b/data/as/5408793/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d89cce27d2
--- /dev/null
+++ b/data/as/5408793/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408793",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408854/BillingService/BusinessService.json b/data/as/5408854/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f1946cfe56
--- /dev/null
+++ b/data/as/5408854/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408854",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408854/egov-location/boundary-data.json b/data/as/5408854/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43a8aa04cf
--- /dev/null
+++ b/data/as/5408854/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408854",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                "localname": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                        "localname": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                "localname": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                        "localname": "RETROFITTING OF MAN MUHINIPUR  PWSS (NQ)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408854/ws-services-calculation/Penalty.json b/data/as/5408854/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3d08b634e
--- /dev/null
+++ b/data/as/5408854/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408854",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408854/ws-services-calculation/WCBillingSlab.json b/data/as/5408854/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cb97d98fd1
--- /dev/null
+++ b/data/as/5408854/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408854",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408891/BillingService/BusinessService.json b/data/as/5408891/BillingService/BusinessService.json
new file mode 100644
index 0000000000..13716bfdc7
--- /dev/null
+++ b/data/as/5408891/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5408891",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408891/egov-location/boundary-data.json b/data/as/5408891/egov-location/boundary-data.json
new file mode 100644
index 0000000000..00068f3547
--- /dev/null
+++ b/data/as/5408891/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5408891",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NICHALA MARI PWSS (NQ)",
+                "localname": "NICHALA MARI PWSS (NQ)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408891",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NICHALA MARI PWSS (NQ)",
+                        "localname": "NICHALA MARI PWSS (NQ)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NICHALA MARI PWSS (NQ)",
+                "localname": "NICHALA MARI PWSS (NQ)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5408891",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NICHALA MARI PWSS (NQ)",
+                        "localname": "NICHALA MARI PWSS (NQ)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408891/ws-services-calculation/Penalty.json b/data/as/5408891/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..575bf018a2
--- /dev/null
+++ b/data/as/5408891/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5408891",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5408891/ws-services-calculation/WCBillingSlab.json b/data/as/5408891/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df632f2b35
--- /dev/null
+++ b/data/as/5408891/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5408891",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464190/BillingService/BusinessService.json b/data/as/5464190/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c4e595f139
--- /dev/null
+++ b/data/as/5464190/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5464190",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464190/egov-location/boundary-data.json b/data/as/5464190/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e231004ac5
--- /dev/null
+++ b/data/as/5464190/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5464190",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUDHKONWAR PWSS",
+                "localname": "DUDHKONWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464190",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUDHKONWAR PWSS",
+                        "localname": "DUDHKONWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUDHKONWAR PWSS",
+                "localname": "DUDHKONWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464190",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUDHKONWAR PWSS",
+                        "localname": "DUDHKONWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464190/ws-services-calculation/Penalty.json b/data/as/5464190/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ec62f2cbd
--- /dev/null
+++ b/data/as/5464190/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5464190",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464190/ws-services-calculation/WCBillingSlab.json b/data/as/5464190/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7389f75693
--- /dev/null
+++ b/data/as/5464190/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5464190",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464241/BillingService/BusinessService.json b/data/as/5464241/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3cb0cf31fd
--- /dev/null
+++ b/data/as/5464241/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5464241",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464241/egov-location/boundary-data.json b/data/as/5464241/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8486a40a8
--- /dev/null
+++ b/data/as/5464241/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5464241",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODALDHOWA PWSS",
+                "localname": "KODALDHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODALDHOWA PWSS",
+                        "localname": "KODALDHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODALDHOWA PWSS",
+                "localname": "KODALDHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODALDHOWA PWSS",
+                        "localname": "KODALDHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464241/ws-services-calculation/Penalty.json b/data/as/5464241/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f1e2299c3
--- /dev/null
+++ b/data/as/5464241/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5464241",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464241/ws-services-calculation/WCBillingSlab.json b/data/as/5464241/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a22d415f93
--- /dev/null
+++ b/data/as/5464241/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5464241",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464278/BillingService/BusinessService.json b/data/as/5464278/BillingService/BusinessService.json
new file mode 100644
index 0000000000..af8d014ef8
--- /dev/null
+++ b/data/as/5464278/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5464278",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464278/egov-location/boundary-data.json b/data/as/5464278/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4aeae0ce7f
--- /dev/null
+++ b/data/as/5464278/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5464278",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                "localname": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                        "localname": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                "localname": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                        "localname": "RETROFITTING OF UDMARI BALIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464278/ws-services-calculation/Penalty.json b/data/as/5464278/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..084c09b0ad
--- /dev/null
+++ b/data/as/5464278/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5464278",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464278/ws-services-calculation/WCBillingSlab.json b/data/as/5464278/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9cad884d85
--- /dev/null
+++ b/data/as/5464278/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5464278",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464342/BillingService/BusinessService.json b/data/as/5464342/BillingService/BusinessService.json
new file mode 100644
index 0000000000..48fde41a57
--- /dev/null
+++ b/data/as/5464342/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5464342",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464342/egov-location/boundary-data.json b/data/as/5464342/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d9bba86012
--- /dev/null
+++ b/data/as/5464342/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5464342",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB SIMULBARI PWSS",
+                "localname": "PUB SIMULBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB SIMULBARI PWSS",
+                        "localname": "PUB SIMULBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB SIMULBARI PWSS",
+                "localname": "PUB SIMULBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB SIMULBARI PWSS",
+                        "localname": "PUB SIMULBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464342/ws-services-calculation/Penalty.json b/data/as/5464342/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eb848b4ebb
--- /dev/null
+++ b/data/as/5464342/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5464342",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464342/ws-services-calculation/WCBillingSlab.json b/data/as/5464342/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..95c1fd1735
--- /dev/null
+++ b/data/as/5464342/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5464342",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464413/BillingService/BusinessService.json b/data/as/5464413/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cbead1bf78
--- /dev/null
+++ b/data/as/5464413/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5464413",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464413/egov-location/boundary-data.json b/data/as/5464413/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fecea3001d
--- /dev/null
+++ b/data/as/5464413/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5464413",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJMITA PWSS",
+                "localname": "RAJMITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJMITA PWSS",
+                        "localname": "RAJMITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJMITA PWSS",
+                "localname": "RAJMITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJMITA PWSS",
+                        "localname": "RAJMITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464413/ws-services-calculation/Penalty.json b/data/as/5464413/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6851ad13ab
--- /dev/null
+++ b/data/as/5464413/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5464413",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464413/ws-services-calculation/WCBillingSlab.json b/data/as/5464413/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0e15cae866
--- /dev/null
+++ b/data/as/5464413/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5464413",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464439/BillingService/BusinessService.json b/data/as/5464439/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e45d75c6cd
--- /dev/null
+++ b/data/as/5464439/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5464439",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464439/egov-location/boundary-data.json b/data/as/5464439/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf6c8e038b
--- /dev/null
+++ b/data/as/5464439/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5464439",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5464439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464439/ws-services-calculation/Penalty.json b/data/as/5464439/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1794c246e
--- /dev/null
+++ b/data/as/5464439/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5464439",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5464439/ws-services-calculation/WCBillingSlab.json b/data/as/5464439/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e6958b128
--- /dev/null
+++ b/data/as/5464439/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5464439",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5475220/BillingService/BusinessService.json b/data/as/5475220/BillingService/BusinessService.json
new file mode 100644
index 0000000000..860507e227
--- /dev/null
+++ b/data/as/5475220/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5475220",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5475220/egov-location/boundary-data.json b/data/as/5475220/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9292e6ea51
--- /dev/null
+++ b/data/as/5475220/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5475220",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHYASINI GAROPARA PT I PWSS",
+                "localname": "RAKHYASINI GAROPARA PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5475220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHYASINI GAROPARA PT I PWSS",
+                        "localname": "RAKHYASINI GAROPARA PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHYASINI GAROPARA PT I PWSS",
+                "localname": "RAKHYASINI GAROPARA PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5475220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHYASINI GAROPARA PT I PWSS",
+                        "localname": "RAKHYASINI GAROPARA PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5475220/ws-services-calculation/Penalty.json b/data/as/5475220/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb20f39136
--- /dev/null
+++ b/data/as/5475220/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5475220",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5475220/ws-services-calculation/WCBillingSlab.json b/data/as/5475220/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d2643a4c43
--- /dev/null
+++ b/data/as/5475220/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5475220",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519133/BillingService/BusinessService.json b/data/as/5519133/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b352d39542
--- /dev/null
+++ b/data/as/5519133/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5519133",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519133/egov-location/boundary-data.json b/data/as/5519133/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eae4ed27a4
--- /dev/null
+++ b/data/as/5519133/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5519133",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMLOGA PATHAR PWSS",
+                "localname": "AMLOGA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5519133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMLOGA PATHAR PWSS",
+                        "localname": "AMLOGA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMLOGA PATHAR PWSS",
+                "localname": "AMLOGA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5519133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMLOGA PATHAR PWSS",
+                        "localname": "AMLOGA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519133/ws-services-calculation/Penalty.json b/data/as/5519133/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..357304bd58
--- /dev/null
+++ b/data/as/5519133/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5519133",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519133/ws-services-calculation/WCBillingSlab.json b/data/as/5519133/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6df4c665b1
--- /dev/null
+++ b/data/as/5519133/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5519133",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519203/BillingService/BusinessService.json b/data/as/5519203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..537534c68c
--- /dev/null
+++ b/data/as/5519203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5519203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519203/egov-location/boundary-data.json b/data/as/5519203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b31c154953
--- /dev/null
+++ b/data/as/5519203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5519203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOTAMORA PWSS",
+                "localname": "GOTAMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5519203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOTAMORA PWSS",
+                        "localname": "GOTAMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOTAMORA PWSS",
+                "localname": "GOTAMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5519203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOTAMORA PWSS",
+                        "localname": "GOTAMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519203/ws-services-calculation/Penalty.json b/data/as/5519203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a58f9ead6f
--- /dev/null
+++ b/data/as/5519203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5519203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5519203/ws-services-calculation/WCBillingSlab.json b/data/as/5519203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc2f5b55a2
--- /dev/null
+++ b/data/as/5519203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5519203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5523260/BillingService/BusinessService.json b/data/as/5523260/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3796ac2abc
--- /dev/null
+++ b/data/as/5523260/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5523260",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5523260/egov-location/boundary-data.json b/data/as/5523260/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47250e1933
--- /dev/null
+++ b/data/as/5523260/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5523260",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UDMARI PWSS",
+                "localname": "UDMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5523260",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UDMARI PWSS",
+                        "localname": "UDMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UDMARI PWSS",
+                "localname": "UDMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5523260",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UDMARI PWSS",
+                        "localname": "UDMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5523260/ws-services-calculation/Penalty.json b/data/as/5523260/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2c50f975c2
--- /dev/null
+++ b/data/as/5523260/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5523260",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5523260/ws-services-calculation/WCBillingSlab.json b/data/as/5523260/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1bd8175fb
--- /dev/null
+++ b/data/as/5523260/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5523260",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5527478/BillingService/BusinessService.json b/data/as/5527478/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9361c2dc1b
--- /dev/null
+++ b/data/as/5527478/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5527478",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5527478/egov-location/boundary-data.json b/data/as/5527478/egov-location/boundary-data.json
new file mode 100644
index 0000000000..708b626a82
--- /dev/null
+++ b/data/as/5527478/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5527478",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARIDUAR PWSS",
+                "localname": "CHARIDUAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5527478",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARIDUAR PWSS",
+                        "localname": "CHARIDUAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARIDUAR PWSS",
+                "localname": "CHARIDUAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5527478",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARIDUAR PWSS",
+                        "localname": "CHARIDUAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5527478/ws-services-calculation/Penalty.json b/data/as/5527478/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ba5cdfe36
--- /dev/null
+++ b/data/as/5527478/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5527478",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5527478/ws-services-calculation/WCBillingSlab.json b/data/as/5527478/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a541dc72a4
--- /dev/null
+++ b/data/as/5527478/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5527478",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5528384/BillingService/BusinessService.json b/data/as/5528384/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bab7efff4b
--- /dev/null
+++ b/data/as/5528384/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5528384",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5528384/egov-location/boundary-data.json b/data/as/5528384/egov-location/boundary-data.json
new file mode 100644
index 0000000000..675a85cadd
--- /dev/null
+++ b/data/as/5528384/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5528384",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TALAKABARI PWSS",
+                "localname": "TALAKABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5528384",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TALAKABARI PWSS",
+                        "localname": "TALAKABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TALAKABARI PWSS",
+                "localname": "TALAKABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5528384",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TALAKABARI PWSS",
+                        "localname": "TALAKABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5528384/ws-services-calculation/Penalty.json b/data/as/5528384/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..991c377ad5
--- /dev/null
+++ b/data/as/5528384/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5528384",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5528384/ws-services-calculation/WCBillingSlab.json b/data/as/5528384/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed3ca0d17c
--- /dev/null
+++ b/data/as/5528384/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5528384",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5531603/BillingService/BusinessService.json b/data/as/5531603/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f2fa3c062
--- /dev/null
+++ b/data/as/5531603/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5531603",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5531603/egov-location/boundary-data.json b/data/as/5531603/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7019ccb56f
--- /dev/null
+++ b/data/as/5531603/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5531603",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIACHUBURI PWSS",
+                "localname": "PATIACHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5531603",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIACHUBURI PWSS",
+                        "localname": "PATIACHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIACHUBURI PWSS",
+                "localname": "PATIACHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5531603",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIACHUBURI PWSS",
+                        "localname": "PATIACHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5531603/ws-services-calculation/Penalty.json b/data/as/5531603/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00280c0f8a
--- /dev/null
+++ b/data/as/5531603/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5531603",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5531603/ws-services-calculation/WCBillingSlab.json b/data/as/5531603/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db71f15642
--- /dev/null
+++ b/data/as/5531603/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5531603",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5532932/BillingService/BusinessService.json b/data/as/5532932/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f1a3f62465
--- /dev/null
+++ b/data/as/5532932/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5532932",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5532932/egov-location/boundary-data.json b/data/as/5532932/egov-location/boundary-data.json
new file mode 100644
index 0000000000..72ff7c7fbc
--- /dev/null
+++ b/data/as/5532932/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5532932",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOTONGA KAHDOL PWSS",
+                "localname": "GOTONGA KAHDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5532932",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOTONGA KAHDOL PWSS",
+                        "localname": "GOTONGA KAHDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOTONGA KAHDOL PWSS",
+                "localname": "GOTONGA KAHDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5532932",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOTONGA KAHDOL PWSS",
+                        "localname": "GOTONGA KAHDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5532932/ws-services-calculation/Penalty.json b/data/as/5532932/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f920284f0
--- /dev/null
+++ b/data/as/5532932/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5532932",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5532932/ws-services-calculation/WCBillingSlab.json b/data/as/5532932/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30005907f1
--- /dev/null
+++ b/data/as/5532932/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5532932",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5533989/BillingService/BusinessService.json b/data/as/5533989/BillingService/BusinessService.json
new file mode 100644
index 0000000000..337ac189c0
--- /dev/null
+++ b/data/as/5533989/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5533989",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5533989/egov-location/boundary-data.json b/data/as/5533989/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03719746e3
--- /dev/null
+++ b/data/as/5533989/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5533989",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MODOPI PWSS",
+                "localname": "MODOPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5533989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MODOPI PWSS",
+                        "localname": "MODOPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MODOPI PWSS",
+                "localname": "MODOPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5533989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MODOPI PWSS",
+                        "localname": "MODOPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5533989/ws-services-calculation/Penalty.json b/data/as/5533989/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9d922a24f2
--- /dev/null
+++ b/data/as/5533989/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5533989",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5533989/ws-services-calculation/WCBillingSlab.json b/data/as/5533989/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0eae275999
--- /dev/null
+++ b/data/as/5533989/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5533989",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534043/BillingService/BusinessService.json b/data/as/5534043/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf0364342a
--- /dev/null
+++ b/data/as/5534043/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5534043",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534043/egov-location/boundary-data.json b/data/as/5534043/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b6682e5aa
--- /dev/null
+++ b/data/as/5534043/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5534043",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHIAJHAR PWSS",
+                "localname": "PAKHIAJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5534043",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHIAJHAR PWSS",
+                        "localname": "PAKHIAJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHIAJHAR PWSS",
+                "localname": "PAKHIAJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5534043",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHIAJHAR PWSS",
+                        "localname": "PAKHIAJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534043/ws-services-calculation/Penalty.json b/data/as/5534043/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9777428fa2
--- /dev/null
+++ b/data/as/5534043/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5534043",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534043/ws-services-calculation/WCBillingSlab.json b/data/as/5534043/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..14fbafdcd2
--- /dev/null
+++ b/data/as/5534043/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5534043",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534657/BillingService/BusinessService.json b/data/as/5534657/BillingService/BusinessService.json
new file mode 100644
index 0000000000..145e4ca910
--- /dev/null
+++ b/data/as/5534657/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5534657",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534657/egov-location/boundary-data.json b/data/as/5534657/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12b39d55bb
--- /dev/null
+++ b/data/as/5534657/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5534657",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOROIMARI BORPUKHURI PWSS",
+                "localname": "GOROIMARI BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5534657",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOROIMARI BORPUKHURI PWSS",
+                        "localname": "GOROIMARI BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOROIMARI BORPUKHURI PWSS",
+                "localname": "GOROIMARI BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5534657",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOROIMARI BORPUKHURI PWSS",
+                        "localname": "GOROIMARI BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534657/ws-services-calculation/Penalty.json b/data/as/5534657/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a7cd16e48
--- /dev/null
+++ b/data/as/5534657/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5534657",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5534657/ws-services-calculation/WCBillingSlab.json b/data/as/5534657/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a3f809774
--- /dev/null
+++ b/data/as/5534657/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5534657",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5544794/BillingService/BusinessService.json b/data/as/5544794/BillingService/BusinessService.json
new file mode 100644
index 0000000000..89fd4f79ee
--- /dev/null
+++ b/data/as/5544794/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5544794",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5544794/egov-location/boundary-data.json b/data/as/5544794/egov-location/boundary-data.json
new file mode 100644
index 0000000000..51904655a5
--- /dev/null
+++ b/data/as/5544794/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5544794",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIDOL PWSS",
+                "localname": "DHEKIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5544794",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIDOL PWSS",
+                        "localname": "DHEKIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIDOL PWSS",
+                "localname": "DHEKIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5544794",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIDOL PWSS",
+                        "localname": "DHEKIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5544794/ws-services-calculation/Penalty.json b/data/as/5544794/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2edf4da7b1
--- /dev/null
+++ b/data/as/5544794/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5544794",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5544794/ws-services-calculation/WCBillingSlab.json b/data/as/5544794/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b5d62f3b2
--- /dev/null
+++ b/data/as/5544794/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5544794",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547805/BillingService/BusinessService.json b/data/as/5547805/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5d3e5de8c3
--- /dev/null
+++ b/data/as/5547805/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547805",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547805/egov-location/boundary-data.json b/data/as/5547805/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4546631cc6
--- /dev/null
+++ b/data/as/5547805/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547805",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKPUNG NO.2 PWSS",
+                "localname": "BHALUKPUNG NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKPUNG NO.2 PWSS",
+                        "localname": "BHALUKPUNG NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKPUNG NO.2 PWSS",
+                "localname": "BHALUKPUNG NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKPUNG NO.2 PWSS",
+                        "localname": "BHALUKPUNG NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547805/ws-services-calculation/Penalty.json b/data/as/5547805/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b00e654d40
--- /dev/null
+++ b/data/as/5547805/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547805",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547805/ws-services-calculation/WCBillingSlab.json b/data/as/5547805/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8828ef132
--- /dev/null
+++ b/data/as/5547805/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547805",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547815/BillingService/BusinessService.json b/data/as/5547815/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb37039ec0
--- /dev/null
+++ b/data/as/5547815/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547815",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547815/egov-location/boundary-data.json b/data/as/5547815/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b41b04540a
--- /dev/null
+++ b/data/as/5547815/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547815",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKMARI PWSS",
+                "localname": "BHALUKMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547815",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKMARI PWSS",
+                        "localname": "BHALUKMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKMARI PWSS",
+                "localname": "BHALUKMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547815",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKMARI PWSS",
+                        "localname": "BHALUKMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547815/ws-services-calculation/Penalty.json b/data/as/5547815/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00ff5fa087
--- /dev/null
+++ b/data/as/5547815/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547815",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547815/ws-services-calculation/WCBillingSlab.json b/data/as/5547815/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6026642863
--- /dev/null
+++ b/data/as/5547815/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547815",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547824/BillingService/BusinessService.json b/data/as/5547824/BillingService/BusinessService.json
new file mode 100644
index 0000000000..244cafc8e9
--- /dev/null
+++ b/data/as/5547824/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547824",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547824/egov-location/boundary-data.json b/data/as/5547824/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4dc59326ee
--- /dev/null
+++ b/data/as/5547824/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547824",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLONGBASTI PWSS",
+                "localname": "DOLONGBASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLONGBASTI PWSS",
+                        "localname": "DOLONGBASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLONGBASTI PWSS",
+                "localname": "DOLONGBASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLONGBASTI PWSS",
+                        "localname": "DOLONGBASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547824/ws-services-calculation/Penalty.json b/data/as/5547824/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a8db4d9d86
--- /dev/null
+++ b/data/as/5547824/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547824",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547824/ws-services-calculation/WCBillingSlab.json b/data/as/5547824/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce43ab9edc
--- /dev/null
+++ b/data/as/5547824/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547824",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547832/BillingService/BusinessService.json b/data/as/5547832/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa33f213e3
--- /dev/null
+++ b/data/as/5547832/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547832",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547832/egov-location/boundary-data.json b/data/as/5547832/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a2a566cd6
--- /dev/null
+++ b/data/as/5547832/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547832",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAKHRA DAFOLA PWSS",
+                "localname": "LAKHRA DAFOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAKHRA DAFOLA PWSS",
+                        "localname": "LAKHRA DAFOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAKHRA DAFOLA PWSS",
+                "localname": "LAKHRA DAFOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAKHRA DAFOLA PWSS",
+                        "localname": "LAKHRA DAFOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547832/ws-services-calculation/Penalty.json b/data/as/5547832/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3a3fc23cd
--- /dev/null
+++ b/data/as/5547832/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547832",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547832/ws-services-calculation/WCBillingSlab.json b/data/as/5547832/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2623e0bf50
--- /dev/null
+++ b/data/as/5547832/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547832",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547843/BillingService/BusinessService.json b/data/as/5547843/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97ba89e7f5
--- /dev/null
+++ b/data/as/5547843/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547843",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547843/egov-location/boundary-data.json b/data/as/5547843/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ffe2c1a0e3
--- /dev/null
+++ b/data/as/5547843/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547843",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGAON PWSS",
+                "localname": "BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547843",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGAON PWSS",
+                        "localname": "BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGAON PWSS",
+                "localname": "BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547843",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGAON PWSS",
+                        "localname": "BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547843/ws-services-calculation/Penalty.json b/data/as/5547843/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a6211818f7
--- /dev/null
+++ b/data/as/5547843/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547843",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547843/ws-services-calculation/WCBillingSlab.json b/data/as/5547843/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e94b0bc16a
--- /dev/null
+++ b/data/as/5547843/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547843",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/600587/BillingService/BusinessService.json b/data/as/600587/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4d47375b20
--- /dev/null
+++ b/data/as/600587/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.600587",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/600587/egov-location/boundary-data.json b/data/as/600587/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6db0e457ef
--- /dev/null
+++ b/data/as/600587/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.600587",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULAGURI PWSS",
+                "localname": "PHULAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.600587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULAGURI PWSS",
+                        "localname": "PHULAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULAGURI PWSS",
+                "localname": "PHULAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.600587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULAGURI PWSS",
+                        "localname": "PHULAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/600587/ws-services-calculation/Penalty.json b/data/as/600587/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eb7ac00c06
--- /dev/null
+++ b/data/as/600587/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.600587",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/600587/ws-services-calculation/WCBillingSlab.json b/data/as/600587/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a4e4c3dbe3
--- /dev/null
+++ b/data/as/600587/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.600587",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603120/BillingService/BusinessService.json b/data/as/603120/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f96e696e93
--- /dev/null
+++ b/data/as/603120/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.603120",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603120/egov-location/boundary-data.json b/data/as/603120/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cee839cf81
--- /dev/null
+++ b/data/as/603120/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.603120",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN BONGAON PWSS",
+                "localname": "TARAJAN BONGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.603120",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN BONGAON PWSS",
+                        "localname": "TARAJAN BONGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN BONGAON PWSS",
+                "localname": "TARAJAN BONGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.603120",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN BONGAON PWSS",
+                        "localname": "TARAJAN BONGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603120/ws-services-calculation/Penalty.json b/data/as/603120/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c81feb1e1
--- /dev/null
+++ b/data/as/603120/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.603120",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603120/ws-services-calculation/WCBillingSlab.json b/data/as/603120/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..736b98c7c8
--- /dev/null
+++ b/data/as/603120/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.603120",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603277/BillingService/BusinessService.json b/data/as/603277/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ba1e975b6
--- /dev/null
+++ b/data/as/603277/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.603277",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603277/egov-location/boundary-data.json b/data/as/603277/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cee327c6d3
--- /dev/null
+++ b/data/as/603277/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.603277",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJULI GAON PWSS",
+                "localname": "TARAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.603277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJULI GAON PWSS",
+                        "localname": "TARAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJULI GAON PWSS",
+                "localname": "TARAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.603277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJULI GAON PWSS",
+                        "localname": "TARAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603277/ws-services-calculation/Penalty.json b/data/as/603277/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..23bf700e1e
--- /dev/null
+++ b/data/as/603277/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.603277",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603277/ws-services-calculation/WCBillingSlab.json b/data/as/603277/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d4716a4b46
--- /dev/null
+++ b/data/as/603277/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.603277",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603538/BillingService/BusinessService.json b/data/as/603538/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fbe45b6de2
--- /dev/null
+++ b/data/as/603538/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.603538",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603538/egov-location/boundary-data.json b/data/as/603538/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c0e968353d
--- /dev/null
+++ b/data/as/603538/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.603538",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJURI PWSS",
+                "localname": "BALIJURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.603538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJURI PWSS",
+                        "localname": "BALIJURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJURI PWSS",
+                "localname": "BALIJURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.603538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJURI PWSS",
+                        "localname": "BALIJURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603538/ws-services-calculation/Penalty.json b/data/as/603538/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6af27a6a1a
--- /dev/null
+++ b/data/as/603538/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.603538",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/603538/ws-services-calculation/WCBillingSlab.json b/data/as/603538/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc37ad1b37
--- /dev/null
+++ b/data/as/603538/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.603538",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729083/BillingService/BusinessService.json b/data/as/729083/BillingService/BusinessService.json
new file mode 100644
index 0000000000..33e7014710
--- /dev/null
+++ b/data/as/729083/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.729083",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729083/egov-location/boundary-data.json b/data/as/729083/egov-location/boundary-data.json
new file mode 100644
index 0000000000..21881c6737
--- /dev/null
+++ b/data/as/729083/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.729083",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHRISTIAN BOSTI PWSS",
+                "localname": "CHRISTIAN BOSTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.729083",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHRISTIAN BOSTI PWSS",
+                        "localname": "CHRISTIAN BOSTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHRISTIAN BOSTI PWSS",
+                "localname": "CHRISTIAN BOSTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.729083",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHRISTIAN BOSTI PWSS",
+                        "localname": "CHRISTIAN BOSTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729083/ws-services-calculation/Penalty.json b/data/as/729083/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d44ed1018
--- /dev/null
+++ b/data/as/729083/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.729083",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729083/ws-services-calculation/WCBillingSlab.json b/data/as/729083/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..351bdbd80b
--- /dev/null
+++ b/data/as/729083/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.729083",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729086/BillingService/BusinessService.json b/data/as/729086/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed6527ca00
--- /dev/null
+++ b/data/as/729086/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.729086",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729086/egov-location/boundary-data.json b/data/as/729086/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba9b19e199
--- /dev/null
+++ b/data/as/729086/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.729086",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKATA PWSS",
+                "localname": "DHOBAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.729086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKATA PWSS",
+                        "localname": "DHOBAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKATA PWSS",
+                "localname": "DHOBAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.729086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKATA PWSS",
+                        "localname": "DHOBAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729086/ws-services-calculation/Penalty.json b/data/as/729086/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f98a100ed2
--- /dev/null
+++ b/data/as/729086/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.729086",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/729086/ws-services-calculation/WCBillingSlab.json b/data/as/729086/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32bfdbd4f2
--- /dev/null
+++ b/data/as/729086/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.729086",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/874344/BillingService/BusinessService.json b/data/as/874344/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3e2756489a
--- /dev/null
+++ b/data/as/874344/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.874344",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/874344/egov-location/boundary-data.json b/data/as/874344/egov-location/boundary-data.json
new file mode 100644
index 0000000000..932dae98a8
--- /dev/null
+++ b/data/as/874344/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.874344",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIPELOWA PWSS",
+                "localname": "DHEKIPELOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.874344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIPELOWA PWSS",
+                        "localname": "DHEKIPELOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIPELOWA PWSS",
+                "localname": "DHEKIPELOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.874344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIPELOWA PWSS",
+                        "localname": "DHEKIPELOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/874344/ws-services-calculation/Penalty.json b/data/as/874344/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78db849ab0
--- /dev/null
+++ b/data/as/874344/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.874344",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/874344/ws-services-calculation/WCBillingSlab.json b/data/as/874344/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db37036b28
--- /dev/null
+++ b/data/as/874344/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.874344",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877925/BillingService/BusinessService.json b/data/as/877925/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98ea4116ef
--- /dev/null
+++ b/data/as/877925/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.877925",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877925/egov-location/boundary-data.json b/data/as/877925/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ceb6f3f8d1
--- /dev/null
+++ b/data/as/877925/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.877925",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIDOI BHERELA  PWSS",
+                "localname": "PATIDOI BHERELA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.877925",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIDOI BHERELA  PWSS",
+                        "localname": "PATIDOI BHERELA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIDOI BHERELA  PWSS",
+                "localname": "PATIDOI BHERELA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.877925",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIDOI BHERELA  PWSS",
+                        "localname": "PATIDOI BHERELA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877925/ws-services-calculation/Penalty.json b/data/as/877925/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1f0b39f3e
--- /dev/null
+++ b/data/as/877925/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.877925",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877925/ws-services-calculation/WCBillingSlab.json b/data/as/877925/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d08009da77
--- /dev/null
+++ b/data/as/877925/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.877925",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877934/BillingService/BusinessService.json b/data/as/877934/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e24b26ef5
--- /dev/null
+++ b/data/as/877934/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.877934",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877934/egov-location/boundary-data.json b/data/as/877934/egov-location/boundary-data.json
new file mode 100644
index 0000000000..889fb2b913
--- /dev/null
+++ b/data/as/877934/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.877934",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHURIBIL PWSS",
+                "localname": "MADHURIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.877934",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHURIBIL PWSS",
+                        "localname": "MADHURIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHURIBIL PWSS",
+                "localname": "MADHURIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.877934",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHURIBIL PWSS",
+                        "localname": "MADHURIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877934/ws-services-calculation/Penalty.json b/data/as/877934/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..10037d9cab
--- /dev/null
+++ b/data/as/877934/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.877934",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/877934/ws-services-calculation/WCBillingSlab.json b/data/as/877934/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e46f58985b
--- /dev/null
+++ b/data/as/877934/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.877934",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/tenant/tenants.json b/data/as/tenant/tenants.json
index 232e4d9849..4477d16e9f 100644
--- a/data/as/tenant/tenants.json
+++ b/data/as/tenant/tenants.json
@@ -1,481 +1,114721 @@
 {
-    "tenantId": "as",
-    "moduleName": "tenant",
-    "tenants": [
-        {
-            "code": "as",
-            "name": "Assam",
-            "description": "Assam",
-            "logoId": "https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.jalandhar/logo.png",
-            "imageId": "https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.jalandhar/logo.png",
-            "domainUrl": "www.mcjalandhar.in",
-            "type": "CITY",
-            "twitterUrl": "https://twitter.com/search?q=%23jalandhar",
-            "facebookUrl": "https://www.facebook.com/city/jalandhar-Punjab",
-            "emailId": "complaints.mcj@gmail.com",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "city": {
-                "name": "Assam State",
-                "localName": null,
-                "districtCode": null,
-                "districtName": null,
-                "regionName": null,
-                "ulbGrade": "ST",
-                "longitude": 75.5761829,
-                "latitude": 31.3260152,
-                "shapeFileLocation": null,
-                "captcha": null,
-                "code": "15",
-                "ddrName": "Assam",
-                "projectId": "15"
-            },
-            "address": "Assam-144001",
-            "pincode": [],
-            "contactNumber": "0181-2227015",
-            "pdfHeader": "PB_PDF_HEADER",
-            "pdfContactDetails": "PB_CONTACT_DETAILS"
-        },
-        {
-            "code": "as.30176539",
-            "name": "BAPUJINAGAR PWSS",
-            "description": "BAPUJINAGAR PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "BAPUJINAGAR PWSS",
-                "localName": "BAPUJINAGAR PWSS",
-                "districtCode": "44",
-                "districtName": "Goalpara",
-                "blockcode": "1188",
-                "blockname": "Krishnai ",
-                "panchayatcode": "22437",
-                "panchayatname": "Zira",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "30176539",
-                "ddrName": "BAPUJINAGAR PWSS",
-                "projectId": "30176539",
-                "regionName": "1188",
-                "villageName": "Bamun Panikhowa",
-                "villageCode": "33304"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "BAPUJINAGAR PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.30177874",
-            "name": "BHEBHERI 2 PWSS",
-            "description": "BHEBHERI 2 PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "BHEBHERI 2 PWSS",
-                "localName": "BHEBHERI 2 PWSS",
-                "districtCode": "44",
-                "districtName": "Goalpara",
-                "blockcode": "1188",
-                "blockname": "Krishnai ",
-                "panchayatcode": "22437",
-                "panchayatname": "Zira",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "30177874",
-                "ddrName": "BHEBHERI 2 PWSS",
-                "projectId": "30177874",
-                "regionName": "1188",
-                "villageName": "Bamun Panikhowa",
-                "villageCode": "33304"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "BHEBHERI 2 PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.30207980",
-            "name": "MUGALPARA PWSS",
-            "description": "MUGALPARA PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "MUGALPARA PWSS",
-                "localName": "MUGALPARA PWSS",
-                "districtCode": "44",
-                "districtName": "Goalpara",
-                "blockcode": "1190",
-                "blockname": "Jaleswar",
-                "panchayatcode": "22463",
-                "panchayatname": "Rajmita",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "30207980",
-                "ddrName": "MUGALPARA PWSS",
-                "projectId": "30207980",
-                "regionName": "1190",
-                "villageName": "Rajmitapantai",
-                "villageCode": "33507"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "MUGALPARA PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.30014441",
-            "name": "Shyamaguri PWSS",
-            "description": "Shyamaguri PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "Shyamaguri PWSS",
-                "localName": "Shyamaguri PWSS",
-                "districtCode": "44",
-                "districtName": "Goalpara",
-                "blockcode": "1184",
-                "blockname": "Balijana",
-                "panchayatcode": "22399",
-                "panchayatname": "Kalyanpur",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "30014441",
-                "ddrName": "Shyamaguri PWSS",
-                "projectId": "30014441",
-                "regionName": "1184",
-                "villageName": "Chamaguri",
-                "villageCode": "32953"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "Shyamaguri PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.30046142",
-            "name": "TISIMPUR PWSS",
-            "description": "TISIMPUR PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "TISIMPUR PWSS",
-                "localName": "TISIMPUR PWSS",
-                "districtCode": "44",
-                "districtName": "Goalpara",
-                "blockcode": "1184",
-                "blockname": "Balijana",
-                "panchayatcode": "22400",
-                "panchayatname": "Agia",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "30046142",
-                "ddrName": "TISIMPUR PWSS",
-                "projectId": "30046142",
-                "regionName": "1184",
-                "villageName": "Tisimpur",
-                "villageCode": "32983"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "TISIMPUR PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.8153399",
-            "name": "BARIKA CHUBURI PWSS",
-            "description": "BARIKA CHUBURI PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "BARIKA CHUBURI PWSS",
-                "localName": "BARIKA CHUBURI PWSS",
-                "districtCode": "49",
-                "districtName": "Sonitpur",
-                "blockcode": "1245",
-                "blockname": "Gabhoru",
-                "panchayatcode": "23082",
-                "panchayatname": "Ushapur",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "8153399",
-                "ddrName": "BARIKA CHUBURI PWSS",
-                "projectId": "8153399",
-                "regionName": "1245",
-                "villageName": "Barika Chuburi (ct)",
-                "villageCode": "38262"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "BARIKA CHUBURI PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.8192456",
-            "name": "DEORIGAON PWSS",
-            "description": "DEORIGAON PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "DEORIGAON PWSS",
-                "localName": "DEORIGAON PWSS",
-                "districtCode": "49",
-                "districtName": "Sonitpur",
-                "blockcode": "1245",
-                "blockname": "Gabhoru",
-                "panchayatcode": "23081",
-                "panchayatname": "Mazgaon",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "8192456",
-                "ddrName": "DEORIGAON PWSS",
-                "projectId": "8192456",
-                "regionName": "1245",
-                "villageName": "Majgaon (ct)",
-                "villageCode": "38253"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "DEORIGAON PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.8192257",
-            "name": "MAZGAON PWSS",
-            "description": "MAZGAON PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "MAZGAON PWSS",
-                "localName": "MAZGAON PWSS",
-                "districtCode": "49",
-                "districtName": "Sonitpur",
-                "blockcode": "1245",
-                "blockname": "Gabhoru",
-                "panchayatcode": "23081",
-                "panchayatname": "Mazgaon",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "8192257",
-                "ddrName": "MAZGAON PWSS",
-                "projectId": "8192257",
-                "regionName": "1245",
-                "villageName": "Majgaon (ct)",
-                "villageCode": "38253"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "MAZGAON PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.8184281",
-            "name": "KALIBARI PWSS",
-            "description": "KALIBARI PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "KALIBARI PWSS",
-                "localName": "KALIBARI PWSS",
-                "districtCode": "49",
-                "districtName": "Sonitpur",
-                "blockcode": "1245",
-                "blockname": "Gabhoru",
-                "panchayatcode": "23082",
-                "panchayatname": "Ushapur",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "8184281",
-                "ddrName": "KALIBARI PWSS",
-                "projectId": "8184281",
-                "regionName": "1245",
-                "villageName": "Kali Bari Rajah Chahar",
-                "villageCode": "38260"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "KALIBARI PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.1842301",
-            "name": "Balichapari PWSS",
-            "description": "Balichapari PWSS",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-                "name": "Balichapari PWSS",
-                "localName": "Balichapari PWSS",
-                "districtCode": "49",
-                "districtName": "Sonitpur",
-                "blockcode": "1245",
-                "blockname": "Gabhoru",
-                "panchayatcode": "23082",
-                "panchayatname": "Ushapur",
-                "ulbGrade": "",
-                "longitude": null,
-                "latitude": null,
-                "captcha": null,
-                "shapeFileLocation": null,
-                "code": "1842301",
-                "ddrName": "Balichapari PWSS",
-                "projectId": "1842301",
-                "regionName": "1245",
-                "villageName": "Bali Chapari",
-                "villageCode": "38265"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-                "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "Balichapari PWSS",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-        },
-        {
-            "code": "as.testing",
-            "name": "testing",
-            "description": "testing",
-            "logoId": "",
-            "imageId": null,
-            "domainUrl": "",
-            "city": {
-              "name": "testing",
-              "localName": "testing",
-              "districtCode": "204",
-              "districtName": "Shivamogga",
-              "blockcode": "2595",
-              "blockname": "Soraba",
-              "panchayatcode": "63625",
-              "panchayatname": "Udri",
-              "ulbGrade": "",
-              "longitude": null,
-              "latitude": null,
-              "captcha": null,
-              "shapeFileLocation": null,
-              "code": "testing",
-              "ddrName": "testing",
-              "projectId": "testing",
-              "regionName": "2595",
-              "villageName": "Bamun Panikhowa",
-              "villageCode": "33304"
-            },
-            "twitterUrl": null,
-            "facebookUrl": null,
-            "emailId": "",
-            "OfficeTimings": {
-              "Mon - Fri": "9.00 AM - 6.00 PM"
-            },
-            "address": "testing",
-            "pincode": [],
-            "contactNumber": "",
-            "pdfHeader": "",
-            "pdfContactDetails": ""
-          }
-    ]
-}
\ No newline at end of file
+  "tenantId": "as",
+  "moduleName": "tenant",
+  "tenants": [
+    {
+      "code": "as",
+      "name": "Assam",
+      "description": "Assam",
+      "logoId": "https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.jalandhar/logo.png",
+      "imageId": "https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.jalandhar/logo.png",
+      "domainUrl": "www.mcjalandhar.in",
+      "type": "CITY",
+      "twitterUrl": "https://twitter.com/search?q=%23jalandhar",
+      "facebookUrl": "https://www.facebook.com/city/jalandhar-Punjab",
+      "emailId": "complaints.mcj@gmail.com",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "city": {
+        "name": "Assam State",
+        "localName": null,
+        "districtCode": null,
+        "districtName": null,
+        "regionName": null,
+        "ulbGrade": "ST",
+        "longitude": 75.5761829,
+        "latitude": 31.3260152,
+        "shapeFileLocation": null,
+        "captcha": null,
+        "code": "15",
+        "ddrName": "Assam",
+        "projectId": "15"
+      },
+      "address": "Assam-144001",
+      "pincode": [],
+      "contactNumber": "0181-2227015",
+      "pdfHeader": "PB_PDF_HEADER",
+      "pdfContactDetails": "PB_CONTACT_DETAILS"
+    },
+    {
+      "code": "as.30224596",
+      "name": "Batiaroka Part 1 PWSS",
+      "description": "Batiaroka Part 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batiaroka Part 1 PWSS",
+        "localName": "Batiaroka Part 1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "587250",
+        "villageName": "Batia Roka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224596",
+        "ddrName": "Batiaroka Part 1 PWSS",
+        "projectId": "30224596",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batiaroka Part 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224594",
+      "name": "Batiaroka Part 2 PWSS",
+      "description": "Batiaroka Part 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batiaroka Part 2 PWSS",
+        "localName": "Batiaroka Part 2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "587250",
+        "villageName": "Batia Roka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224594",
+        "ddrName": "Batiaroka Part 2 PWSS",
+        "projectId": "30224594",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batiaroka Part 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224592",
+      "name": "Batiaroka Part 3 PWSS",
+      "description": "Batiaroka Part 3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batiaroka Part 3 PWSS",
+        "localName": "Batiaroka Part 3 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "587250",
+        "villageName": "Batia Roka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224592",
+        "ddrName": "Batiaroka Part 3 PWSS",
+        "projectId": "30224592",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batiaroka Part 3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177227",
+      "name": "Bokabil PWSS",
+      "description": "Bokabil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bokabil PWSS",
+        "localName": "Bokabil PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39228",
+        "villageName": "Boka Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177227",
+        "ddrName": "Bokabil PWSS",
+        "projectId": "30177227",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bokabil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155070",
+      "name": "RETROFITTING OF SOMARDOLONI PWSS",
+      "description": "RETROFITTING OF SOMARDOLONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOMARDOLONI PWSS",
+        "localName": "RETROFITTING OF SOMARDOLONI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39227",
+        "villageName": "Chamar Doloni",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155070",
+        "ddrName": "RETROFITTING OF SOMARDOLONI PWSS",
+        "projectId": "8155070",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOMARDOLONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177275",
+      "name": "Chamardoloni-1 PWSS",
+      "description": "Chamardoloni-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chamardoloni-1 PWSS",
+        "localName": "Chamardoloni-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39227",
+        "villageName": "Chamar Doloni",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177275",
+        "ddrName": "Chamardoloni-1 PWSS",
+        "projectId": "30177275",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chamardoloni-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3321879",
+      "name": "Somordoloni PWSS",
+      "description": "Somordoloni PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Somordoloni PWSS",
+        "localName": "Somordoloni PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39227",
+        "villageName": "Chamar Doloni",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3321879",
+        "ddrName": "Somordoloni PWSS",
+        "projectId": "3321879",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Somordoloni PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8202278",
+      "name": "RETROFITTING OF NAGSANKAR PWSS",
+      "description": "RETROFITTING OF NAGSANKAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAGSANKAR PWSS",
+        "localName": "RETROFITTING OF NAGSANKAR PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39229",
+        "villageName": "Nag-sankar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8202278",
+        "ddrName": "RETROFITTING OF NAGSANKAR PWSS",
+        "projectId": "8202278",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAGSANKAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5183964",
+      "name": "NAGSANKAR PWSS",
+      "description": "NAGSANKAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAGSANKAR PWSS",
+        "localName": "NAGSANKAR PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39229",
+        "villageName": "Nag-sankar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5183964",
+        "ddrName": "NAGSANKAR PWSS",
+        "projectId": "5183964",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAGSANKAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408096",
+      "name": "RETROFITTING OF GOSSAICHUK PWSS",
+      "description": "RETROFITTING OF GOSSAICHUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GOSSAICHUK PWSS",
+        "localName": "RETROFITTING OF GOSSAICHUK PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39229",
+        "villageName": "Nag-sankar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408096",
+        "ddrName": "RETROFITTING OF GOSSAICHUK PWSS",
+        "projectId": "5408096",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GOSSAICHUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216214",
+      "name": "Mangalbaria Bazaar Multi Village PWSS",
+      "description": "Mangalbaria Bazaar Multi Village PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mangalbaria Bazaar Multi Village PWSS",
+        "localName": "Mangalbaria Bazaar Multi Village PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "39229",
+        "villageName": "Nag-sankar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216214",
+        "ddrName": "Mangalbaria Bazaar Multi Village PWSS",
+        "projectId": "30216214",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mangalbaria Bazaar Multi Village PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174745",
+      "name": "No.1 Gosain Chapori PWSS",
+      "description": "No.1 Gosain Chapori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Gosain Chapori PWSS",
+        "localName": "No.1 Gosain Chapori PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23185",
+        "panchayatname": "Dakhin Nagsankar",
+        "villageCode": "587243",
+        "villageName": "No.1 Gosain Chapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174745",
+        "ddrName": "No.1 Gosain Chapori PWSS",
+        "projectId": "30174745",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Gosain Chapori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155041",
+      "name": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+      "description": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+        "localName": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39205",
+        "villageName": "Bebejia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155041",
+        "ddrName": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+        "projectId": "8155041",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4637728",
+      "name": "Bebejia PWSS",
+      "description": "Bebejia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bebejia PWSS",
+        "localName": "Bebejia PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39205",
+        "villageName": "Bebejia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4637728",
+        "ddrName": "Bebejia PWSS",
+        "projectId": "4637728",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bebejia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155206",
+      "name": "RETROFITTING OF CHENGAMARI PWSS",
+      "description": "RETROFITTING OF CHENGAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHENGAMARI PWSS",
+        "localName": "RETROFITTING OF CHENGAMARI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39203",
+        "villageName": "Chengamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155206",
+        "ddrName": "RETROFITTING OF CHENGAMARI PWSS",
+        "projectId": "8155206",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHENGAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177297",
+      "name": "Chengamari-1 PWSS",
+      "description": "Chengamari-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chengamari-1 PWSS",
+        "localName": "Chengamari-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39203",
+        "villageName": "Chengamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177297",
+        "ddrName": "Chengamari-1 PWSS",
+        "projectId": "30177297",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chengamari-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3328767",
+      "name": "Chengamari PWSS",
+      "description": "Chengamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chengamari PWSS",
+        "localName": "Chengamari PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39203",
+        "villageName": "Chengamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3328767",
+        "ddrName": "Chengamari PWSS",
+        "projectId": "3328767",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chengamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6347427",
+      "name": "Dikoraipam PWSS (MNP)",
+      "description": "Dikoraipam PWSS (MNP)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dikoraipam PWSS (MNP)",
+        "localName": "Dikoraipam PWSS (MNP)",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "586994",
+        "villageName": "Dikarai Pam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6347427",
+        "ddrName": "Dikoraipam PWSS (MNP)",
+        "projectId": "6347427",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dikoraipam PWSS (MNP)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5571476",
+      "name": "DIKARAIPAM PWSS",
+      "description": "DIKARAIPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIKARAIPAM PWSS",
+        "localName": "DIKARAIPAM PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "586994",
+        "villageName": "Dikarai Pam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5571476",
+        "ddrName": "DIKARAIPAM PWSS",
+        "projectId": "5571476",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIKARAIPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408300",
+      "name": "RETROFITTING OF HABIDOLONI PWSS",
+      "description": "RETROFITTING OF HABIDOLONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HABIDOLONI PWSS",
+        "localName": "RETROFITTING OF HABIDOLONI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39200",
+        "villageName": "Habidoloni",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408300",
+        "ddrName": "RETROFITTING OF HABIDOLONI PWSS",
+        "projectId": "5408300",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HABIDOLONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408332",
+      "name": "RETROFITTING OF HOKAJAN PWSS",
+      "description": "RETROFITTING OF HOKAJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HOKAJAN PWSS",
+        "localName": "RETROFITTING OF HOKAJAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39199",
+        "villageName": "Metera",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408332",
+        "ddrName": "RETROFITTING OF HOKAJAN PWSS",
+        "projectId": "5408332",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HOKAJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8250626",
+      "name": "Hokajan",
+      "description": "Hokajan",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hokajan",
+        "localName": "Hokajan",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "39199",
+        "villageName": "Metera",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8250626",
+        "ddrName": "Hokajan",
+        "projectId": "8250626",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hokajan",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214551",
+      "name": "Sadaibora Part-1 PWSS",
+      "description": "Sadaibora Part-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sadaibora Part-1 PWSS",
+        "localName": "Sadaibora Part-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "MADHYA NAGSANKAR",
+        "villageCode": "39198",
+        "villageName": "Nal-Tali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214551",
+        "ddrName": "Sadaibora Part-1 PWSS",
+        "projectId": "30214551",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sadaibora Part-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174546",
+      "name": "Sadaibora Part-2 PWSS",
+      "description": "Sadaibora Part-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sadaibora Part-2 PWSS",
+        "localName": "Sadaibora Part-2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23182",
+        "panchayatname": "Madhya Nagsankar",
+        "villageCode": "587037",
+        "villageName": "Sadai Bora",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174546",
+        "ddrName": "Sadaibora Part-2 PWSS",
+        "projectId": "30174546",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sadaibora Part-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174211",
+      "name": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+      "description": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+        "localName": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "PUB NAGSANKAR",
+        "villageCode": "39212",
+        "villageName": "F.S. 14/9 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174211",
+        "ddrName": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+        "projectId": "30174211",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173251",
+      "name": "BHELOGURI HANUPAM 2 PWSS",
+      "description": "BHELOGURI HANUPAM 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHELOGURI HANUPAM 2 PWSS",
+        "localName": "BHELOGURI HANUPAM 2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "39212",
+        "villageName": "F.s. 14/9 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173251",
+        "ddrName": "BHELOGURI HANUPAM 2 PWSS",
+        "projectId": "30173251",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHELOGURI HANUPAM 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8162079",
+      "name": "RETROFITTING OF DIPLONGA PWSS",
+      "description": "RETROFITTING OF DIPLONGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DIPLONGA PWSS",
+        "localName": "RETROFITTING OF DIPLONGA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "39212",
+        "villageName": "F.s. 14/9 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8162079",
+        "ddrName": "RETROFITTING OF DIPLONGA PWSS",
+        "projectId": "8162079",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DIPLONGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174125",
+      "name": "MERENA BORABHUYAN PART 1 PWSS",
+      "description": "MERENA BORABHUYAN PART 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MERENA BORABHUYAN PART 1 PWSS",
+        "localName": "MERENA BORABHUYAN PART 1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "39215",
+        "villageName": "F.s. 15/7 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174125",
+        "ddrName": "MERENA BORABHUYAN PART 1 PWSS",
+        "projectId": "30174125",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MERENA BORABHUYAN PART 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075998",
+      "name": "DIPLONGA TE PWSS",
+      "description": "DIPLONGA TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIPLONGA TE PWSS",
+        "localName": "DIPLONGA TE PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "648174",
+        "villageName": "F.s. 33/3 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075998",
+        "ddrName": "DIPLONGA TE PWSS",
+        "projectId": "30075998",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIPLONGA TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185591",
+      "name": "Diplonga PWSS upgradation",
+      "description": "Diplonga PWSS upgradation",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Diplonga PWSS upgradation",
+        "localName": "Diplonga PWSS upgradation",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "648174",
+        "villageName": "F.s. 33/3 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185591",
+        "ddrName": "Diplonga PWSS upgradation",
+        "projectId": "5185591",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Diplonga PWSS upgradation",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140613",
+      "name": "MONAI TE PWSS",
+      "description": "MONAI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONAI TE PWSS",
+        "localName": "MONAI TE PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "587244",
+        "villageName": "Nlr 17/56 M.c. Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140613",
+        "ddrName": "MONAI TE PWSS",
+        "projectId": "30140613",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONAI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174139",
+      "name": "MONAI BAGAN PWSS",
+      "description": "MONAI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONAI BAGAN PWSS",
+        "localName": "MONAI BAGAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "39213",
+        "villageName": "Nlr225/374monaibagisa(no.1jai-",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174139",
+        "ddrName": "MONAI BAGAN PWSS",
+        "projectId": "30174139",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONAI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173284",
+      "name": "MONAPUR PWSS",
+      "description": "MONAPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONAPUR PWSS",
+        "localName": "MONAPUR PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "648214",
+        "villageName": "No. 2 Tongia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173284",
+        "ddrName": "MONAPUR PWSS",
+        "projectId": "30173284",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONAPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173072",
+      "name": "BHELUGIRI HANUPAM PWSS",
+      "description": "BHELUGIRI HANUPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHELUGIRI HANUPAM PWSS",
+        "localName": "BHELUGIRI HANUPAM PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "587237",
+        "villageName": "No.1 Chenga Mari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173072",
+        "ddrName": "BHELUGIRI HANUPAM PWSS",
+        "projectId": "30173072",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHELUGIRI HANUPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224626",
+      "name": "2 No. Notun Farm PWSS",
+      "description": "2 No. Notun Farm PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "2 No. Notun Farm PWSS",
+        "localName": "2 No. Notun Farm PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "PUB NAGSANKAR",
+        "villageCode": "587121",
+        "villageName": "No.1 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224626",
+        "ddrName": "2 No. Notun Farm PWSS",
+        "projectId": "30224626",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "2 No. Notun Farm PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224621",
+      "name": "DIPLONGA BAGAN PWSS",
+      "description": "DIPLONGA BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIPLONGA BAGAN PWSS",
+        "localName": "DIPLONGA BAGAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "PUB NAGSANKAR",
+        "villageCode": "587121",
+        "villageName": "No.1 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224621",
+        "ddrName": "DIPLONGA BAGAN PWSS",
+        "projectId": "30224621",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIPLONGA BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224638",
+      "name": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+      "description": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+        "localName": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "587121",
+        "villageName": "No.1 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224638",
+        "ddrName": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+        "projectId": "30224638",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173317",
+      "name": "NAGPUR PWSS",
+      "description": "NAGPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAGPUR PWSS",
+        "localName": "NAGPUR PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "587233",
+        "villageName": "No.2 Chenga Mari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173317",
+        "ddrName": "NAGPUR PWSS",
+        "projectId": "30173317",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAGPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224629",
+      "name": "JOY SIDHI PWSS",
+      "description": "JOY SIDHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOY SIDHI PWSS",
+        "localName": "JOY SIDHI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "PUB NAGSANKAR",
+        "villageCode": "39209",
+        "villageName": "No.2 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224629",
+        "ddrName": "JOY SIDHI PWSS",
+        "projectId": "30224629",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOY SIDHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224634",
+      "name": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+      "description": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+        "localName": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "39209",
+        "villageName": "No.2 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224634",
+        "ddrName": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+        "projectId": "30224634",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5183548",
+      "name": "DIPLONGA PWSS",
+      "description": "DIPLONGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIPLONGA PWSS",
+        "localName": "DIPLONGA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "Pub Nagsankar",
+        "villageCode": "39209",
+        "villageName": "No.2 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5183548",
+        "ddrName": "DIPLONGA PWSS",
+        "projectId": "5183548",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIPLONGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173172",
+      "name": "MERENA BORABHUYAN PART 2 PWSS",
+      "description": "MERENA BORABHUYAN PART 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MERENA BORABHUYAN PART 2 PWSS",
+        "localName": "MERENA BORABHUYAN PART 2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23183",
+        "panchayatname": "PUB NAGSANKAR",
+        "villageCode": "587241",
+        "villageName": "No.3 Diplonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173172",
+        "ddrName": "MERENA BORABHUYAN PART 2 PWSS",
+        "projectId": "30173172",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MERENA BORABHUYAN PART 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216269",
+      "name": "Adabheti Part 2 PWSS",
+      "description": "Adabheti Part 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adabheti Part 2 PWSS",
+        "localName": "Adabheti Part 2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "SOOTEA NO.1",
+        "villageCode": "39149",
+        "villageName": "Adabheti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216269",
+        "ddrName": "Adabheti Part 2 PWSS",
+        "projectId": "30216269",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adabheti Part 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224601",
+      "name": "Adabheti Part 1 PWSS",
+      "description": "Adabheti Part 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adabheti Part 1 PWSS",
+        "localName": "Adabheti Part 1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "SOOTEA NO.1",
+        "villageCode": "39149",
+        "villageName": "Adabheti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224601",
+        "ddrName": "Adabheti Part 1 PWSS",
+        "projectId": "30224601",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adabheti Part 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216258",
+      "name": "Adabheti Part 3 PWSS",
+      "description": "Adabheti Part 3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adabheti Part 3 PWSS",
+        "localName": "Adabheti Part 3 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "SOOTEA NO.1",
+        "villageCode": "39149",
+        "villageName": "Adabheti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216258",
+        "ddrName": "Adabheti Part 3 PWSS",
+        "projectId": "30216258",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adabheti Part 3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175784",
+      "name": "Ghiladharimukh Part-2 PWSS",
+      "description": "Ghiladharimukh Part-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghiladharimukh Part-2 PWSS",
+        "localName": "Ghiladharimukh Part-2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "SOOTEA NO.1",
+        "villageCode": "39149",
+        "villageName": "Adabheti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175784",
+        "ddrName": "Ghiladharimukh Part-2 PWSS",
+        "projectId": "30175784",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghiladharimukh Part-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175827",
+      "name": "Ghiladharimukh Part-1 PWSS",
+      "description": "Ghiladharimukh Part-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghiladharimukh Part-1 PWSS",
+        "localName": "Ghiladharimukh Part-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "39150",
+        "villageName": "Ghiladhari Mukh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175827",
+        "ddrName": "Ghiladharimukh Part-1 PWSS",
+        "projectId": "30175827",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghiladharimukh Part-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175767",
+      "name": "Ghiladharimukh Part-3 PWSS",
+      "description": "Ghiladharimukh Part-3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghiladharimukh Part-3 PWSS",
+        "localName": "Ghiladharimukh Part-3 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "39150",
+        "villageName": "Ghiladhari Mukh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175767",
+        "ddrName": "Ghiladharimukh Part-3 PWSS",
+        "projectId": "30175767",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghiladharimukh Part-3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30217976",
+      "name": "No.2 Bhojmari PWSS",
+      "description": "No.2 Bhojmari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Bhojmari PWSS",
+        "localName": "No.2 Bhojmari PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "39147",
+        "villageName": "Kalakati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30217976",
+        "ddrName": "No.2 Bhojmari PWSS",
+        "projectId": "30217976",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Bhojmari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175446",
+      "name": "Kalakati PWSS",
+      "description": "Kalakati PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalakati PWSS",
+        "localName": "Kalakati PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "39147",
+        "villageName": "Kalakati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175446",
+        "ddrName": "Kalakati PWSS",
+        "projectId": "30175446",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalakati PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214623",
+      "name": "No. 4 Bhojmari Part-2 PWSS",
+      "description": "No. 4 Bhojmari Part-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 4 Bhojmari Part-2 PWSS",
+        "localName": "No. 4 Bhojmari Part-2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "39147",
+        "villageName": "Kalakati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214623",
+        "ddrName": "No. 4 Bhojmari Part-2 PWSS",
+        "projectId": "30214623",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 4 Bhojmari Part-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8202287",
+      "name": "RETROFITTING OF KOROIONI PWSS (SD II)",
+      "description": "RETROFITTING OF KOROIONI PWSS (SD II)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KOROIONI PWSS (SD II)",
+        "localName": "RETROFITTING OF KOROIONI PWSS (SD II)",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "39147",
+        "villageName": "Kalakati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8202287",
+        "ddrName": "RETROFITTING OF KOROIONI PWSS (SD II)",
+        "projectId": "8202287",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KOROIONI PWSS (SD II)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177242",
+      "name": "Boralimora PWSS",
+      "description": "Boralimora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boralimora PWSS",
+        "localName": "Boralimora PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "649511",
+        "villageName": "Koroini",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177242",
+        "ddrName": "Boralimora PWSS",
+        "projectId": "30177242",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boralimora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4655617",
+      "name": "KOROIANI PWSS",
+      "description": "KOROIANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOROIANI PWSS",
+        "localName": "KOROIANI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "649511",
+        "villageName": "Koroini",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4655617",
+        "ddrName": "KOROIANI PWSS",
+        "projectId": "4655617",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOROIANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214635",
+      "name": "No.4 Bhojmari Part -1 PWSS",
+      "description": "No.4 Bhojmari Part -1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.4 Bhojmari Part -1 PWSS",
+        "localName": "No.4 Bhojmari Part -1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "649511",
+        "villageName": "Koroini",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214635",
+        "ddrName": "No.4 Bhojmari Part -1 PWSS",
+        "projectId": "30214635",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.4 Bhojmari Part -1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174610",
+      "name": "Phulbari Pt WSS",
+      "description": "Phulbari Pt WSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Phulbari Pt WSS",
+        "localName": "Phulbari Pt WSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "586539",
+        "villageName": "No.4 Bhojmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174610",
+        "ddrName": "Phulbari Pt WSS",
+        "projectId": "30174610",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Phulbari Pt WSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174651",
+      "name": "Ovota WSS",
+      "description": "Ovota WSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ovota WSS",
+        "localName": "Ovota WSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23177",
+        "panchayatname": "Sootea No.1",
+        "villageCode": "586548",
+        "villageName": "Obhota Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174651",
+        "ddrName": "Ovota WSS",
+        "projectId": "30174651",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ovota WSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7894596",
+      "name": "Retrofitting of Sootea No. 2 (SAGY)",
+      "description": "Retrofitting of Sootea No. 2 (SAGY)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Sootea No. 2 (SAGY)",
+        "localName": "Retrofitting of Sootea No. 2 (SAGY)",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23178",
+        "panchayatname": "Sootea No.2",
+        "villageCode": "39155",
+        "villageName": "Niz-gorpal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7894596",
+        "ddrName": "Retrofitting of Sootea No. 2 (SAGY)",
+        "projectId": "7894596",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Sootea No. 2 (SAGY)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4640480",
+      "name": "Nizgorpal PWSS",
+      "description": "Nizgorpal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nizgorpal PWSS",
+        "localName": "Nizgorpal PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23178",
+        "panchayatname": "Sootea No.2",
+        "villageCode": "39155",
+        "villageName": "Niz-gorpal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4640480",
+        "ddrName": "Nizgorpal PWSS",
+        "projectId": "4640480",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nizgorpal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6151001",
+      "name": "NIZ GORPAL PWSS (UPGRADATION)",
+      "description": "NIZ GORPAL PWSS (UPGRADATION)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ GORPAL PWSS (UPGRADATION)",
+        "localName": "NIZ GORPAL PWSS (UPGRADATION)",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23178",
+        "panchayatname": "Sootea No.2",
+        "villageCode": "39155",
+        "villageName": "Niz-gorpal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6151001",
+        "ddrName": "NIZ GORPAL PWSS (UPGRADATION)",
+        "projectId": "6151001",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ GORPAL PWSS (UPGRADATION)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4637711",
+      "name": "RETROFITTING OF BHUYANPARA PWSS",
+      "description": "RETROFITTING OF BHUYANPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHUYANPARA PWSS",
+        "localName": "RETROFITTING OF BHUYANPARA PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "SOOTEA NO.3",
+        "villageCode": "587043",
+        "villageName": "Bhuyan Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4637711",
+        "ddrName": "RETROFITTING OF BHUYANPARA PWSS",
+        "projectId": "4637711",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHUYANPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174419",
+      "name": "Tezalpatty PWSS",
+      "description": "Tezalpatty PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tezalpatty PWSS",
+        "localName": "Tezalpatty PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39166",
+        "villageName": "Chaporial",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174419",
+        "ddrName": "Tezalpatty PWSS",
+        "projectId": "30174419",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tezalpatty PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173471",
+      "name": "Kartigaon PWSS",
+      "description": "Kartigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kartigaon PWSS",
+        "localName": "Kartigaon PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39166",
+        "villageName": "Chaporial",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173471",
+        "ddrName": "Kartigaon PWSS",
+        "projectId": "30173471",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kartigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1845900",
+      "name": "Pahuchowa PWSS",
+      "description": "Pahuchowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pahuchowa PWSS",
+        "localName": "Pahuchowa PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39166",
+        "villageName": "Chaporial",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1845900",
+        "ddrName": "Pahuchowa PWSS",
+        "projectId": "1845900",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pahuchowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155271",
+      "name": "RETROFITTING OF POHUSOWA PWSS",
+      "description": "RETROFITTING OF POHUSOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF POHUSOWA PWSS",
+        "localName": "RETROFITTING OF POHUSOWA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39166",
+        "villageName": "Chaporial",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155271",
+        "ddrName": "RETROFITTING OF POHUSOWA PWSS",
+        "projectId": "8155271",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF POHUSOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173455",
+      "name": "Pochowa Gaon PWSS",
+      "description": "Pochowa Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pochowa Gaon PWSS",
+        "localName": "Pochowa Gaon PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39166",
+        "villageName": "Chaporial",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173455",
+        "ddrName": "Pochowa Gaon PWSS",
+        "projectId": "30173455",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pochowa Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173509",
+      "name": "Amiokhiati Malor Gaon PWSS",
+      "description": "Amiokhiati Malor Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amiokhiati Malor Gaon PWSS",
+        "localName": "Amiokhiati Malor Gaon PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39171",
+        "villageName": "Dakhin Dol",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173509",
+        "ddrName": "Amiokhiati Malor Gaon PWSS",
+        "projectId": "30173509",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amiokhiati Malor Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174375",
+      "name": "Solar Sonar PWSS",
+      "description": "Solar Sonar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Solar Sonar PWSS",
+        "localName": "Solar Sonar PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39171",
+        "villageName": "Dakhin Dol",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174375",
+        "ddrName": "Solar Sonar PWSS",
+        "projectId": "30174375",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Solar Sonar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224681",
+      "name": "LB Roadpub Malor PWSS",
+      "description": "LB Roadpub Malor PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LB Roadpub Malor PWSS",
+        "localName": "LB Roadpub Malor PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39170",
+        "villageName": "Niz-chatia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224681",
+        "ddrName": "LB Roadpub Malor PWSS",
+        "projectId": "30224681",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LB Roadpub Malor PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173535",
+      "name": "Kacharigaon Bagalibari PWSS",
+      "description": "Kacharigaon Bagalibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kacharigaon Bagalibari PWSS",
+        "localName": "Kacharigaon Bagalibari PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39170",
+        "villageName": "Niz-chatia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173535",
+        "ddrName": "Kacharigaon Bagalibari PWSS",
+        "projectId": "30173535",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kacharigaon Bagalibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173496",
+      "name": "Chatial Bahuabari PWSS",
+      "description": "Chatial Bahuabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chatial Bahuabari PWSS",
+        "localName": "Chatial Bahuabari PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "Sootea No.3",
+        "villageCode": "39170",
+        "villageName": "Niz-chatia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173496",
+        "ddrName": "Chatial Bahuabari PWSS",
+        "projectId": "30173496",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chatial Bahuabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173442",
+      "name": "Chariania PWSS",
+      "description": "Chariania PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chariania PWSS",
+        "localName": "Chariania PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "SOOTEA NO.3",
+        "villageCode": "39170",
+        "villageName": "Niz-Chatia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173442",
+        "ddrName": "Chariania PWSS",
+        "projectId": "30173442",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chariania PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1050454",
+      "name": "KUMARGAON PWSS",
+      "description": "KUMARGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUMARGAON PWSS",
+        "localName": "KUMARGAON PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23179",
+        "panchayatname": "SOOTEA NO.3",
+        "villageCode": "39202",
+        "villageName": "Pathaka Kuri (Pathor)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1050454",
+        "ddrName": "KUMARGAON PWSS",
+        "projectId": "1050454",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUMARGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176279",
+      "name": "Bakarapattta PWSS",
+      "description": "Bakarapattta PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakarapattta PWSS",
+        "localName": "Bakarapattta PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39236",
+        "villageName": "Bakara Patta",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176279",
+        "ddrName": "Bakarapattta PWSS",
+        "projectId": "30176279",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakarapattta PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385545",
+      "name": "BORBHETI PWSS -QA",
+      "description": "BORBHETI PWSS -QA",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBHETI PWSS -QA",
+        "localName": "BORBHETI PWSS -QA",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39240",
+        "villageName": "Barbhati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385545",
+        "ddrName": "BORBHETI PWSS -QA",
+        "projectId": "6385545",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBHETI PWSS -QA",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30235506",
+      "name": "Borbheti 1 PWSS",
+      "description": "Borbheti 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borbheti 1 PWSS",
+        "localName": "Borbheti 1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39240",
+        "villageName": "Barbhati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30235506",
+        "ddrName": "Borbheti 1 PWSS",
+        "projectId": "30235506",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borbheti 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185615",
+      "name": "Joypur Gereki PWSS",
+      "description": "Joypur Gereki PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Joypur Gereki PWSS",
+        "localName": "Joypur Gereki PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "586706",
+        "villageName": "Gareki Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185615",
+        "ddrName": "Joypur Gereki PWSS",
+        "projectId": "5185615",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Joypur Gereki PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177334",
+      "name": "Gerekigrant PWSS",
+      "description": "Gerekigrant PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gerekigrant PWSS",
+        "localName": "Gerekigrant PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "586706",
+        "villageName": "Gareki Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177334",
+        "ddrName": "Gerekigrant PWSS",
+        "projectId": "30177334",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gerekigrant PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155026",
+      "name": "RETROFITTING OF JOYPUR GEREKI PWSS",
+      "description": "RETROFITTING OF JOYPUR GEREKI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JOYPUR GEREKI PWSS",
+        "localName": "RETROFITTING OF JOYPUR GEREKI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "586706",
+        "villageName": "Gareki Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155026",
+        "ddrName": "RETROFITTING OF JOYPUR GEREKI PWSS",
+        "projectId": "8155026",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JOYPUR GEREKI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385536",
+      "name": "RETROFITTING OF KHATOWAL PWSS",
+      "description": "RETROFITTING OF KHATOWAL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KHATOWAL PWSS",
+        "localName": "RETROFITTING OF KHATOWAL PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39233",
+        "villageName": "Khatowal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385536",
+        "ddrName": "RETROFITTING OF KHATOWAL PWSS",
+        "projectId": "6385536",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KHATOWAL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175228",
+      "name": "Khatowal 1 PWSS",
+      "description": "Khatowal 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khatowal 1 PWSS",
+        "localName": "Khatowal 1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39233",
+        "villageName": "Khatowal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175228",
+        "ddrName": "Khatowal 1 PWSS",
+        "projectId": "30175228",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khatowal 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175204",
+      "name": "Kurhati PWSS",
+      "description": "Kurhati PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kurhati PWSS",
+        "localName": "Kurhati PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39237",
+        "villageName": "Kurhati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175204",
+        "ddrName": "Kurhati PWSS",
+        "projectId": "30175204",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kurhati PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174729",
+      "name": "No.1 Nalbari WSS",
+      "description": "No.1 Nalbari WSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Nalbari WSS",
+        "localName": "No.1 Nalbari WSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39243",
+        "villageName": "No.1 Nalbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174729",
+        "ddrName": "No.1 Nalbari WSS",
+        "projectId": "30174729",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Nalbari WSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174688",
+      "name": "No. 3 Nalbari PWSS",
+      "description": "No. 3 Nalbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 3 Nalbari PWSS",
+        "localName": "No. 3 Nalbari PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "586666",
+        "villageName": "No.3 Nalbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174688",
+        "ddrName": "No. 3 Nalbari PWSS",
+        "projectId": "30174688",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 3 Nalbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174633",
+      "name": "Palasoni PWSS",
+      "description": "Palasoni PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Palasoni PWSS",
+        "localName": "Palasoni PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "39234",
+        "villageName": "Palasani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174633",
+        "ddrName": "Palasoni PWSS",
+        "projectId": "30174633",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Palasoni PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185535",
+      "name": "Charaijania PWSS",
+      "description": "Charaijania PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Charaijania PWSS",
+        "localName": "Charaijania PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "586804",
+        "villageName": "Sarai Jania",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185535",
+        "ddrName": "Charaijania PWSS",
+        "projectId": "5185535",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Charaijania PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8234493",
+      "name": "RETROFITTING OF CHARAIJONIA PWSS",
+      "description": "RETROFITTING OF CHARAIJONIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHARAIJONIA PWSS",
+        "localName": "RETROFITTING OF CHARAIJONIA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23186",
+        "panchayatname": "Sootea No.4",
+        "villageCode": "586804",
+        "villageName": "Sarai Jania",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8234493",
+        "ddrName": "RETROFITTING OF CHARAIJONIA PWSS",
+        "projectId": "8234493",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHARAIJONIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174541",
+      "name": "BEJARHOLA PWSS",
+      "description": "BEJARHOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BEJARHOLA PWSS",
+        "localName": "BEJARHOLA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39186",
+        "villageName": "Bajar Hola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174541",
+        "ddrName": "BEJARHOLA PWSS",
+        "projectId": "30174541",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BEJARHOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173409",
+      "name": "2 NO BEJARHOLA PWSS",
+      "description": "2 NO BEJARHOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "2 NO BEJARHOLA PWSS",
+        "localName": "2 NO BEJARHOLA PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39186",
+        "villageName": "Bajar Hola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173409",
+        "ddrName": "2 NO BEJARHOLA PWSS",
+        "projectId": "30173409",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "2 NO BEJARHOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8162166",
+      "name": "RETROFITTING OF SAPEKHATI PWSS",
+      "description": "RETROFITTING OF SAPEKHATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SAPEKHATI PWSS",
+        "localName": "RETROFITTING OF SAPEKHATI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39186",
+        "villageName": "Bajar Hola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8162166",
+        "ddrName": "RETROFITTING OF SAPEKHATI PWSS",
+        "projectId": "8162166",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SAPEKHATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155344",
+      "name": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+      "description": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+        "localName": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39179",
+        "villageName": "Barpam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155344",
+        "ddrName": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+        "projectId": "8155344",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173400",
+      "name": "MAJGAON PWSS",
+      "description": "MAJGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAJGAON PWSS",
+        "localName": "MAJGAON PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39179",
+        "villageName": "Barpam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173400",
+        "ddrName": "MAJGAON PWSS",
+        "projectId": "30173400",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAJGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174314",
+      "name": "KASITAR MINI PWSS",
+      "description": "KASITAR MINI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KASITAR MINI PWSS",
+        "localName": "KASITAR MINI PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39179",
+        "villageName": "Barpam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174314",
+        "ddrName": "KASITAR MINI PWSS",
+        "projectId": "30174314",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KASITAR MINI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155279",
+      "name": "RETROFITTING OF SAMAGURI PWSS",
+      "description": "RETROFITTING OF SAMAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SAMAGURI PWSS",
+        "localName": "RETROFITTING OF SAMAGURI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39175",
+        "villageName": "Chamaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155279",
+        "ddrName": "RETROFITTING OF SAMAGURI PWSS",
+        "projectId": "8155279",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SAMAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1846172",
+      "name": "Samaguri PWSS",
+      "description": "Samaguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Samaguri PWSS",
+        "localName": "Samaguri PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39175",
+        "villageName": "Chamaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1846172",
+        "ddrName": "Samaguri PWSS",
+        "projectId": "1846172",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Samaguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173395",
+      "name": "GHILADHARI NEW LINE PWSS",
+      "description": "GHILADHARI NEW LINE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHILADHARI NEW LINE PWSS",
+        "localName": "GHILADHARI NEW LINE PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "648152",
+        "villageName": "Ghiladhari Basti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173395",
+        "ddrName": "GHILADHARI NEW LINE PWSS",
+        "projectId": "30173395",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHILADHARI NEW LINE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4639994",
+      "name": "Ghiladharigaon PWSS",
+      "description": "Ghiladharigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghiladharigaon PWSS",
+        "localName": "Ghiladharigaon PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "648152",
+        "villageName": "Ghiladhari Basti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4639994",
+        "ddrName": "Ghiladharigaon PWSS",
+        "projectId": "4639994",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghiladharigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173097",
+      "name": "NC GHILADHARI PWSS",
+      "description": "NC GHILADHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NC GHILADHARI PWSS",
+        "localName": "NC GHILADHARI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39176",
+        "villageName": "Ghiladhari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173097",
+        "ddrName": "NC GHILADHARI PWSS",
+        "projectId": "30173097",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NC GHILADHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8157519",
+      "name": "RETROFITTING OF GHILADHARIGAON PWSS",
+      "description": "RETROFITTING OF GHILADHARIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GHILADHARIGAON PWSS",
+        "localName": "RETROFITTING OF GHILADHARIGAON PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39176",
+        "villageName": "Ghiladhari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8157519",
+        "ddrName": "RETROFITTING OF GHILADHARIGAON PWSS",
+        "projectId": "8157519",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GHILADHARIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173084",
+      "name": "GHILADHARI 6 NO LINE PWSS",
+      "description": "GHILADHARI 6 NO LINE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHILADHARI 6 NO LINE PWSS",
+        "localName": "GHILADHARI 6 NO LINE PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39176",
+        "villageName": "Ghiladhari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173084",
+        "ddrName": "GHILADHARI 6 NO LINE PWSS",
+        "projectId": "30173084",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHILADHARI 6 NO LINE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174241",
+      "name": "PHUKANSANG MINI PWSS",
+      "description": "PHUKANSANG MINI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PHUKANSANG MINI PWSS",
+        "localName": "PHUKANSANG MINI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39176",
+        "villageName": "Ghiladhari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174241",
+        "ddrName": "PHUKANSANG MINI PWSS",
+        "projectId": "30174241",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PHUKANSANG MINI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173427",
+      "name": "ALIGURI KURMIGAON PWSS",
+      "description": "ALIGURI KURMIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ALIGURI KURMIGAON PWSS",
+        "localName": "ALIGURI KURMIGAON PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39174",
+        "villageName": "Magurmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173427",
+        "ddrName": "ALIGURI KURMIGAON PWSS",
+        "projectId": "30173427",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ALIGURI KURMIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185549",
+      "name": "North Sootea PWSS",
+      "description": "North Sootea PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "North Sootea PWSS",
+        "localName": "North Sootea PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39174",
+        "villageName": "Magurmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185549",
+        "ddrName": "North Sootea PWSS",
+        "projectId": "5185549",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "North Sootea PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200395",
+      "name": "Retrofitting of North Sootea PWSS",
+      "description": "Retrofitting of North Sootea PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of North Sootea PWSS",
+        "localName": "Retrofitting of North Sootea PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39174",
+        "villageName": "Magurmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200395",
+        "ddrName": "Retrofitting of North Sootea PWSS",
+        "projectId": "30200395",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of North Sootea PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173419",
+      "name": "MAGURMARA PWSS",
+      "description": "MAGURMARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAGURMARA PWSS",
+        "localName": "MAGURMARA PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39174",
+        "villageName": "Magurmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173419",
+        "ddrName": "MAGURMARA PWSS",
+        "projectId": "30173419",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAGURMARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174286",
+      "name": "BORDOL MINI PWSS",
+      "description": "BORDOL MINI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDOL MINI PWSS",
+        "localName": "BORDOL MINI PWSS",
+        "districtCode": "775",
+        "districtName": "BISWANATH",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "SOOTEA NO.5",
+        "villageCode": "39174",
+        "villageName": "Magurmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174286",
+        "ddrName": "BORDOL MINI PWSS",
+        "projectId": "30174286",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDOL MINI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1846063",
+      "name": "Sapekhati PWSS",
+      "description": "Sapekhati PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sapekhati PWSS",
+        "localName": "Sapekhati PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39181",
+        "villageName": "Sapeichaiti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1846063",
+        "ddrName": "Sapekhati PWSS",
+        "projectId": "1846063",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sapekhati PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185887",
+      "name": "Sapekhati PWSS(Upgradation)",
+      "description": "Sapekhati PWSS(Upgradation)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sapekhati PWSS(Upgradation)",
+        "localName": "Sapekhati PWSS(Upgradation)",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23180",
+        "panchayatname": "Sootea No.5",
+        "villageCode": "39181",
+        "villageName": "Sapeichaiti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185887",
+        "ddrName": "Sapekhati PWSS(Upgradation)",
+        "projectId": "5185887",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sapekhati PWSS(Upgradation)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175490",
+      "name": "Hatisal PWSS",
+      "description": "Hatisal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatisal PWSS",
+        "localName": "Hatisal PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39187",
+        "villageName": "Bora-bhuyan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175490",
+        "ddrName": "Hatisal PWSS",
+        "projectId": "30175490",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatisal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175272",
+      "name": "Kalita Keot Chuburi PWSS",
+      "description": "Kalita Keot Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalita Keot Chuburi PWSS",
+        "localName": "Kalita Keot Chuburi PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39187",
+        "villageName": "Bora-bhuyan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175272",
+        "ddrName": "Kalita Keot Chuburi PWSS",
+        "projectId": "30175272",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalita Keot Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5571455",
+      "name": "BORABHUYAN PWSS",
+      "description": "BORABHUYAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORABHUYAN PWSS",
+        "localName": "BORABHUYAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39187",
+        "villageName": "Bora-bhuyan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5571455",
+        "ddrName": "BORABHUYAN PWSS",
+        "projectId": "5571455",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORABHUYAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155055",
+      "name": "RETROFITTING OF BAROBHUYAN PWSS",
+      "description": "RETROFITTING OF BAROBHUYAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAROBHUYAN PWSS",
+        "localName": "RETROFITTING OF BAROBHUYAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39187",
+        "villageName": "Bora-bhuyan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155055",
+        "ddrName": "RETROFITTING OF BAROBHUYAN PWSS",
+        "projectId": "8155055",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAROBHUYAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177314",
+      "name": "Choipur WSS",
+      "description": "Choipur WSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Choipur WSS",
+        "localName": "Choipur WSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39197",
+        "villageName": "Ghahi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177314",
+        "ddrName": "Choipur WSS",
+        "projectId": "30177314",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Choipur WSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175888",
+      "name": "Ghahi Tatipara WSS",
+      "description": "Ghahi Tatipara WSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghahi Tatipara WSS",
+        "localName": "Ghahi Tatipara WSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39197",
+        "villageName": "Ghahi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175888",
+        "ddrName": "Ghahi Tatipara WSS",
+        "projectId": "30175888",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghahi Tatipara WSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214731",
+      "name": "Ghahi Muslim Part-2 PWSS",
+      "description": "Ghahi Muslim Part-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghahi Muslim Part-2 PWSS",
+        "localName": "Ghahi Muslim Part-2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39197",
+        "villageName": "Ghahi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214731",
+        "ddrName": "Ghahi Muslim Part-2 PWSS",
+        "projectId": "30214731",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghahi Muslim Part-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155168",
+      "name": "RETROFITTING OF GHAHIGAON PWSS",
+      "description": "RETROFITTING OF GHAHIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GHAHIGAON PWSS",
+        "localName": "RETROFITTING OF GHAHIGAON PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39197",
+        "villageName": "Ghahi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155168",
+        "ddrName": "RETROFITTING OF GHAHIGAON PWSS",
+        "projectId": "8155168",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GHAHIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175854",
+      "name": "Ghahigaon-1 PWSS",
+      "description": "Ghahigaon-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghahigaon-1 PWSS",
+        "localName": "Ghahigaon-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39197",
+        "villageName": "Ghahi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175854",
+        "ddrName": "Ghahigaon-1 PWSS",
+        "projectId": "30175854",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghahigaon-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177375",
+      "name": "Ghahi Muslim Part-1 PWSS",
+      "description": "Ghahi Muslim Part-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghahi Muslim Part-1 PWSS",
+        "localName": "Ghahi Muslim Part-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39197",
+        "villageName": "Ghahi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177375",
+        "ddrName": "Ghahi Muslim Part-1 PWSS",
+        "projectId": "30177375",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghahi Muslim Part-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175474",
+      "name": "Hokajan-1 PWSS",
+      "description": "Hokajan-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hokajan-1 PWSS",
+        "localName": "Hokajan-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39195",
+        "villageName": "Hokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175474",
+        "ddrName": "Hokajan-1 PWSS",
+        "projectId": "30175474",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hokajan-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174222",
+      "name": "CHANGAMARI HOKAJAN PWSS",
+      "description": "CHANGAMARI HOKAJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHANGAMARI HOKAJAN PWSS",
+        "localName": "CHANGAMARI HOKAJAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23181",
+        "panchayatname": "Sootea No.6",
+        "villageCode": "39195",
+        "villageName": "Hokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174222",
+        "ddrName": "CHANGAMARI HOKAJAN PWSS",
+        "projectId": "30174222",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHANGAMARI HOKAJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8162057",
+      "name": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+      "description": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+        "localName": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "590458",
+        "villageName": "F/s 4/6 D.c. Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8162057",
+        "ddrName": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+        "projectId": "8162057",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3328647",
+      "name": "Dikorai T E NLR 4/6 PWSS",
+      "description": "Dikorai T E NLR 4/6 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dikorai T E NLR 4/6 PWSS",
+        "localName": "Dikorai T E NLR 4/6 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "590458",
+        "villageName": "F/s 4/6 D.c. Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3328647",
+        "ddrName": "Dikorai T E NLR 4/6 PWSS",
+        "projectId": "3328647",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dikorai T E NLR 4/6 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140642",
+      "name": "DIKORAI TE PWSS",
+      "description": "DIKORAI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIKORAI TE PWSS",
+        "localName": "DIKORAI TE PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "648206",
+        "villageName": "Nlr 34/7 Dikari Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140642",
+        "ddrName": "DIKORAI TE PWSS",
+        "projectId": "30140642",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIKORAI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235807",
+      "name": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+      "description": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+        "localName": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "590457",
+        "villageName": "Nlr 42/42 Dikari Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235807",
+        "ddrName": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+        "projectId": "8235807",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5571515",
+      "name": "DIKARAI TE NLR 42/42 PWSS",
+      "description": "DIKARAI TE NLR 42/42 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIKARAI TE NLR 42/42 PWSS",
+        "localName": "DIKARAI TE NLR 42/42 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "590457",
+        "villageName": "Nlr 42/42 Dikari Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5571515",
+        "ddrName": "DIKARAI TE NLR 42/42 PWSS",
+        "projectId": "5571515",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIKARAI TE NLR 42/42 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4637724",
+      "name": "RETROFITTING OF GUTIBARI PWSS",
+      "description": "RETROFITTING OF GUTIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GUTIBARI PWSS",
+        "localName": "RETROFITTING OF GUTIBARI PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39220",
+        "villageName": "Nlr365/639 Dikari Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4637724",
+        "ddrName": "RETROFITTING OF GUTIBARI PWSS",
+        "projectId": "4637724",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GUTIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175464",
+      "name": "Itakhola-1 PWSS",
+      "description": "Itakhola-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Itakhola-1 PWSS",
+        "localName": "Itakhola-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39224",
+        "villageName": "No.1 Itakhola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175464",
+        "ddrName": "Itakhola-1 PWSS",
+        "projectId": "30175464",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Itakhola-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155090",
+      "name": "RETROFITTING OF ITAKHOLA PWSS",
+      "description": "RETROFITTING OF ITAKHOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ITAKHOLA PWSS",
+        "localName": "RETROFITTING OF ITAKHOLA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39224",
+        "villageName": "No.1 Itakhola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155090",
+        "ddrName": "RETROFITTING OF ITAKHOLA PWSS",
+        "projectId": "8155090",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ITAKHOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5571465",
+      "name": "ITAKHALA PWSS",
+      "description": "ITAKHALA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ITAKHALA PWSS",
+        "localName": "ITAKHALA PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39224",
+        "villageName": "No.1 Itakhola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5571465",
+        "ddrName": "ITAKHALA PWSS",
+        "projectId": "5571465",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ITAKHALA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140620",
+      "name": "TEZALPATTY TE PWSS",
+      "description": "TEZALPATTY TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TEZALPATTY TE PWSS",
+        "localName": "TEZALPATTY TE PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "UTTAR NAGSANKAR",
+        "villageCode": "587255",
+        "villageName": "No.1 Tezalpati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140620",
+        "ddrName": "TEZALPATTY TE PWSS",
+        "projectId": "30140620",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TEZALPATTY TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214686",
+      "name": "No.3 Balijuri Part-1 PWSS",
+      "description": "No.3 Balijuri Part-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.3 Balijuri Part-1 PWSS",
+        "localName": "No.3 Balijuri Part-1 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39225",
+        "villageName": "No.2 Balijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214686",
+        "ddrName": "No.3 Balijuri Part-1 PWSS",
+        "projectId": "30214686",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.3 Balijuri Part-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174186",
+      "name": "SANTIPOOR BAGAN PWSS",
+      "description": "SANTIPOOR BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SANTIPOOR BAGAN PWSS",
+        "localName": "SANTIPOOR BAGAN PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "590456",
+        "villageName": "No.2 Itakhola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174186",
+        "ddrName": "SANTIPOOR BAGAN PWSS",
+        "projectId": "30174186",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SANTIPOOR BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174694",
+      "name": "No. 3 Balijuri Part-2 PWSS",
+      "description": "No. 3 Balijuri Part-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 3 Balijuri Part-2 PWSS",
+        "localName": "No. 3 Balijuri Part-2 PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39222",
+        "villageName": "No.3 Balijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174694",
+        "ddrName": "No. 3 Balijuri Part-2 PWSS",
+        "projectId": "30174694",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 3 Balijuri Part-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174538",
+      "name": "Tengabasti PWSS",
+      "description": "Tengabasti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tengabasti PWSS",
+        "localName": "Tengabasti PWSS",
+        "districtCode": "775",
+        "districtName": "Biswanath",
+        "blockcode": "1254",
+        "blockname": "Sootea",
+        "panchayatcode": "23184",
+        "panchayatname": "Uttar Nagsankar",
+        "villageCode": "39219",
+        "villageName": "Tengabasti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174538",
+        "ddrName": "Tengabasti PWSS",
+        "projectId": "30174538",
+        "regionName": "1254"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tengabasti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161861",
+      "name": "RETROFITTING OF ADABARI PWSS",
+      "description": "RETROFITTING OF ADABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ADABARI PWSS",
+        "localName": "RETROFITTING OF ADABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38329",
+        "villageName": "Adabari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161861",
+        "ddrName": "RETROFITTING OF ADABARI PWSS",
+        "projectId": "8161861",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ADABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167823",
+      "name": "Adabari TE No. 1 PWSS",
+      "description": "Adabari TE No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adabari TE No. 1 PWSS",
+        "localName": "Adabari TE No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38329",
+        "villageName": "Adabari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167823",
+        "ddrName": "Adabari TE No. 1 PWSS",
+        "projectId": "30167823",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adabari TE No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3319750",
+      "name": "Adabarigaon PWSS",
+      "description": "Adabarigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adabarigaon PWSS",
+        "localName": "Adabarigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38329",
+        "villageName": "Adabari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3319750",
+        "ddrName": "Adabarigaon PWSS",
+        "projectId": "3319750",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adabarigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1854331",
+      "name": "Adabari",
+      "description": "Adabari",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adabari",
+        "localName": "Adabari",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38329",
+        "villageName": "Adabari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1854331",
+        "ddrName": "Adabari",
+        "projectId": "1854331",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adabari",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185317",
+      "name": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+      "description": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+        "localName": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38335",
+        "villageName": "Bam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185317",
+        "ddrName": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+        "projectId": "8185317",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132799",
+      "name": "10 No Line PWSS",
+      "description": "10 No Line PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "10 No Line PWSS",
+        "localName": "10 No Line PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38328",
+        "villageName": "Bam Gaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132799",
+        "ddrName": "10 No Line PWSS",
+        "projectId": "30132799",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "10 No Line PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169472",
+      "name": "Bamgaon No. 1 PWSS",
+      "description": "Bamgaon No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamgaon No. 1 PWSS",
+        "localName": "Bamgaon No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23090",
+        "panchayatname": "BALIPARA",
+        "villageCode": "38328",
+        "villageName": "Bam Gaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169472",
+        "ddrName": "Bamgaon No. 1 PWSS",
+        "projectId": "30169472",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamgaon No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6516224",
+      "name": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+      "description": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+        "localName": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23090",
+        "panchayatname": "BALIPARA",
+        "villageCode": "38328",
+        "villageName": "Bam Gaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6516224",
+        "ddrName": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+        "projectId": "6516224",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1854436",
+      "name": "Bam Gaon Ghoramari",
+      "description": "Bam Gaon Ghoramari",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bam Gaon Ghoramari",
+        "localName": "Bam Gaon Ghoramari",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38328",
+        "villageName": "Bam Gaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1854436",
+        "ddrName": "Bam Gaon Ghoramari",
+        "projectId": "1854436",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bam Gaon Ghoramari",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019686",
+      "name": "Bamgaon No. 2 PWSS",
+      "description": "Bamgaon No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamgaon No. 2 PWSS",
+        "localName": "Bamgaon No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "647385",
+        "villageName": "Bam Gaon No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019686",
+        "ddrName": "Bamgaon No. 2 PWSS",
+        "projectId": "30019686",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamgaon No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175821",
+      "name": "Amaribari PWSS",
+      "description": "Amaribari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amaribari PWSS",
+        "localName": "Amaribari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38331",
+        "villageName": "Bherbheri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175821",
+        "ddrName": "Amaribari PWSS",
+        "projectId": "30175821",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amaribari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3333586",
+      "name": "Bherbheri PWSS",
+      "description": "Bherbheri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bherbheri PWSS",
+        "localName": "Bherbheri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38331",
+        "villageName": "Bherbheri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3333586",
+        "ddrName": "Bherbheri PWSS",
+        "projectId": "3333586",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bherbheri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161918",
+      "name": "RETROFITTING OF BHERBHERI PWSS",
+      "description": "RETROFITTING OF BHERBHERI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHERBHERI PWSS",
+        "localName": "RETROFITTING OF BHERBHERI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38331",
+        "villageName": "Bherbheri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161918",
+        "ddrName": "RETROFITTING OF BHERBHERI PWSS",
+        "projectId": "8161918",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHERBHERI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174150",
+      "name": "New Bherbheri PWSS",
+      "description": "New Bherbheri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Bherbheri PWSS",
+        "localName": "New Bherbheri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38331",
+        "villageName": "Bherbheri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174150",
+        "ddrName": "New Bherbheri PWSS",
+        "projectId": "30174150",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Bherbheri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178929",
+      "name": "RETROFITTING OF BOKAGAON PWSS",
+      "description": "RETROFITTING OF BOKAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BOKAGAON PWSS",
+        "localName": "RETROFITTING OF BOKAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38330",
+        "villageName": "Bokagaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178929",
+        "ddrName": "RETROFITTING OF BOKAGAON PWSS",
+        "projectId": "8178929",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BOKAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1859895",
+      "name": "BOKAGAON pwss",
+      "description": "BOKAGAON pwss",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOKAGAON pwss",
+        "localName": "BOKAGAON pwss",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38330",
+        "villageName": "Bokagaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1859895",
+        "ddrName": "BOKAGAON pwss",
+        "projectId": "1859895",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOKAGAON pwss",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174068",
+      "name": "Upper Kachari East MPWSS",
+      "description": "Upper Kachari East MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upper Kachari East MPWSS",
+        "localName": "Upper Kachari East MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23090",
+        "panchayatname": "BALIPARA",
+        "villageCode": "38330",
+        "villageName": "Bokagaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174068",
+        "ddrName": "Upper Kachari East MPWSS",
+        "projectId": "30174068",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upper Kachari East MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077173",
+      "name": "Molan Pukhuri PWSS",
+      "description": "Molan Pukhuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Molan Pukhuri PWSS",
+        "localName": "Molan Pukhuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38334",
+        "villageName": "Molan Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077173",
+        "ddrName": "Molan Pukhuri PWSS",
+        "projectId": "30077173",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Molan Pukhuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174357",
+      "name": "JANGAL BASTI MPWSS",
+      "description": "JANGAL BASTI MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JANGAL BASTI MPWSS",
+        "localName": "JANGAL BASTI MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38334",
+        "villageName": "Molan Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174357",
+        "ddrName": "JANGAL BASTI MPWSS",
+        "projectId": "30174357",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JANGAL BASTI MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174058",
+      "name": "MOLON PUKHURI -B PWSS",
+      "description": "MOLON PUKHURI -B PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOLON PUKHURI -B PWSS",
+        "localName": "MOLON PUKHURI -B PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38334",
+        "villageName": "Molan Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174058",
+        "ddrName": "MOLON PUKHURI -B PWSS",
+        "projectId": "30174058",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOLON PUKHURI -B PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037953",
+      "name": "Pak Bil PWSS",
+      "description": "Pak Bil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pak Bil PWSS",
+        "localName": "Pak Bil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23090",
+        "panchayatname": "Balipara",
+        "villageCode": "38333",
+        "villageName": "Pak Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037953",
+        "ddrName": "Pak Bil PWSS",
+        "projectId": "30037953",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pak Bil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408248",
+      "name": "RETROFITTING OF KUNDARBARI PWSS",
+      "description": "RETROFITTING OF KUNDARBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KUNDARBARI PWSS",
+        "localName": "RETROFITTING OF KUNDARBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38477",
+        "villageName": "Deka Chuburi Kudar Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408248",
+        "ddrName": "RETROFITTING OF KUNDARBARI PWSS",
+        "projectId": "5408248",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KUNDARBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30062320",
+      "name": "Dihingia Gaon PWSS",
+      "description": "Dihingia Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dihingia Gaon PWSS",
+        "localName": "Dihingia Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38479",
+        "villageName": "Dihingia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30062320",
+        "ddrName": "Dihingia Gaon PWSS",
+        "projectId": "30062320",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dihingia Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161786",
+      "name": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+      "description": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+        "localName": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38479",
+        "villageName": "Dihingia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161786",
+        "ddrName": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+        "projectId": "8161786",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6350831",
+      "name": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+      "description": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+        "localName": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38479",
+        "villageName": "Dihingia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6350831",
+        "ddrName": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+        "projectId": "6350831",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169629",
+      "name": "Dipota PWSS",
+      "description": "Dipota PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dipota PWSS",
+        "localName": "Dipota PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38475",
+        "villageName": "Dipotahat Khola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169629",
+        "ddrName": "Dipota PWSS",
+        "projectId": "30169629",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dipota PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1853350",
+      "name": "Depota Hatkhola PWSS",
+      "description": "Depota Hatkhola PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Depota Hatkhola PWSS",
+        "localName": "Depota Hatkhola PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38475",
+        "villageName": "Dipotahat Khola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1853350",
+        "ddrName": "Depota Hatkhola PWSS",
+        "projectId": "1853350",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Depota Hatkhola PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200209",
+      "name": "Retrofitting of Gatanga Kahdol PWSS",
+      "description": "Retrofitting of Gatanga Kahdol PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Gatanga Kahdol PWSS",
+        "localName": "Retrofitting of Gatanga Kahdol PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38475",
+        "villageName": "Dipotahat Khola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200209",
+        "ddrName": "Retrofitting of Gatanga Kahdol PWSS",
+        "projectId": "30200209",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Gatanga Kahdol PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8188301",
+      "name": "RETROFITTING OF MODOPI PWSS",
+      "description": "RETROFITTING OF MODOPI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MODOPI PWSS",
+        "localName": "RETROFITTING OF MODOPI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38475",
+        "villageName": "Dipotahat Khola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8188301",
+        "ddrName": "RETROFITTING OF MODOPI PWSS",
+        "projectId": "8188301",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MODOPI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5533989",
+      "name": "MODOPI PWSS",
+      "description": "MODOPI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MODOPI PWSS",
+        "localName": "MODOPI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38475",
+        "villageName": "Dipotahat Khola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5533989",
+        "ddrName": "MODOPI PWSS",
+        "projectId": "5533989",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MODOPI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067418",
+      "name": "New Gatanga Kahdol PWSS",
+      "description": "New Gatanga Kahdol PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Gatanga Kahdol PWSS",
+        "localName": "New Gatanga Kahdol PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38476",
+        "villageName": "Gatanga Kahdol",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067418",
+        "ddrName": "New Gatanga Kahdol PWSS",
+        "projectId": "30067418",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Gatanga Kahdol PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202047",
+      "name": "Balipukhuri PWSS",
+      "description": "Balipukhuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balipukhuri PWSS",
+        "localName": "Balipukhuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38476",
+        "villageName": "Gatanga Kahdol",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202047",
+        "ddrName": "Balipukhuri PWSS",
+        "projectId": "30202047",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balipukhuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5532932",
+      "name": "GOTONGA KAHDOL PWSS",
+      "description": "GOTONGA KAHDOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOTONGA KAHDOL PWSS",
+        "localName": "GOTONGA KAHDOL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "38476",
+        "villageName": "Gatanga Kahdol",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5532932",
+        "ddrName": "GOTONGA KAHDOL PWSS",
+        "projectId": "5532932",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOTONGA KAHDOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30066345",
+      "name": "No. 2 Madapi TE PWSS",
+      "description": "No. 2 Madapi TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Madapi TE PWSS",
+        "localName": "No. 2 Madapi TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23106",
+        "panchayatname": "Balipukhuri",
+        "villageCode": "647860",
+        "villageName": "No.2 Madapi T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30066345",
+        "ddrName": "No. 2 Madapi TE PWSS",
+        "projectId": "30066345",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Madapi TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4656990",
+      "name": "RETROFITTING OF ARALILOGA PWSS",
+      "description": "RETROFITTING OF ARALILOGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ARALILOGA PWSS",
+        "localName": "RETROFITTING OF ARALILOGA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38378",
+        "villageName": "Araliloga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4656990",
+        "ddrName": "RETROFITTING OF ARALILOGA PWSS",
+        "projectId": "4656990",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ARALILOGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547815",
+      "name": "BHALUKMARI PWSS",
+      "description": "BHALUKMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKMARI PWSS",
+        "localName": "BHALUKMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "647446",
+        "villageName": "Bhaluk Mari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547815",
+        "ddrName": "BHALUKMARI PWSS",
+        "projectId": "5547815",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153690",
+      "name": "RETROFITTING OF BHALUKMARI PWSS",
+      "description": "RETROFITTING OF BHALUKMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHALUKMARI PWSS",
+        "localName": "RETROFITTING OF BHALUKMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "647446",
+        "villageName": "Bhaluk Mari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153690",
+        "ddrName": "RETROFITTING OF BHALUKMARI PWSS",
+        "projectId": "8153690",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHALUKMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174158",
+      "name": "Bhalukmari Gaon PWSS",
+      "description": "Bhalukmari Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhalukmari Gaon PWSS",
+        "localName": "Bhalukmari Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "647446",
+        "villageName": "Bhaluk Mari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174158",
+        "ddrName": "Bhalukmari Gaon PWSS",
+        "projectId": "30174158",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhalukmari Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174190",
+      "name": "Samlaga PWSS",
+      "description": "Samlaga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Samlaga PWSS",
+        "localName": "Samlaga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "647841",
+        "villageName": "Bhaluk Mari Pathar No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174190",
+        "ddrName": "Samlaga PWSS",
+        "projectId": "30174190",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Samlaga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202462",
+      "name": "Bhalukpung Nigam PWSS",
+      "description": "Bhalukpung Nigam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhalukpung Nigam PWSS",
+        "localName": "Bhalukpung Nigam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38382",
+        "villageName": "Bhaluk Pung No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202462",
+        "ddrName": "Bhalukpung Nigam PWSS",
+        "projectId": "30202462",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhalukpung Nigam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547805",
+      "name": "BHALUKPUNG NO.2 PWSS",
+      "description": "BHALUKPUNG NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKPUNG NO.2 PWSS",
+        "localName": "BHALUKPUNG NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38379",
+        "villageName": "Bhaluk Pung No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547805",
+        "ddrName": "BHALUKPUNG NO.2 PWSS",
+        "projectId": "5547805",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKPUNG NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185418",
+      "name": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+      "description": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+        "localName": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38379",
+        "villageName": "Bhaluk Pung No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185418",
+        "ddrName": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+        "projectId": "8185418",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181639",
+      "name": "North Bhalukpong PWSS",
+      "description": "North Bhalukpong PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "North Bhalukpong PWSS",
+        "localName": "North Bhalukpong PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "647840",
+        "villageName": "Bhaluk-pung Nigam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181639",
+        "ddrName": "North Bhalukpong PWSS",
+        "projectId": "30181639",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "North Bhalukpong PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161897",
+      "name": "RETROFITTING OF DHARIKATI PWSS",
+      "description": "RETROFITTING OF DHARIKATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHARIKATI PWSS",
+        "localName": "RETROFITTING OF DHARIKATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38376",
+        "villageName": "Dharikati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161897",
+        "ddrName": "RETROFITTING OF DHARIKATI PWSS",
+        "projectId": "8161897",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHARIKATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175831",
+      "name": "New Dharikati PWSS",
+      "description": "New Dharikati PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Dharikati PWSS",
+        "localName": "New Dharikati PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38376",
+        "villageName": "Dharikati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175831",
+        "ddrName": "New Dharikati PWSS",
+        "projectId": "30175831",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Dharikati PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4659024",
+      "name": "Dharikati  PWSS",
+      "description": "Dharikati  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dharikati  PWSS",
+        "localName": "Dharikati  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38376",
+        "villageName": "Dharikati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4659024",
+        "ddrName": "Dharikati  PWSS",
+        "projectId": "4659024",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dharikati  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547824",
+      "name": "DOLONGBASTI PWSS",
+      "description": "DOLONGBASTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DOLONGBASTI PWSS",
+        "localName": "DOLONGBASTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "586663",
+        "villageName": "Dolang Basti F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547824",
+        "ddrName": "DOLONGBASTI PWSS",
+        "projectId": "5547824",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DOLONGBASTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169643",
+      "name": "Gamani Ban Gaon PWSS",
+      "description": "Gamani Ban Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gamani Ban Gaon PWSS",
+        "localName": "Gamani Ban Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38381",
+        "villageName": "Gamani Ban Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169643",
+        "ddrName": "Gamani Ban Gaon PWSS",
+        "projectId": "30169643",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gamani Ban Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30139203",
+      "name": "Sotai Bongaon PWSS",
+      "description": "Sotai Bongaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sotai Bongaon PWSS",
+        "localName": "Sotai Bongaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38380",
+        "villageName": "Satai Ban Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30139203",
+        "ddrName": "Sotai Bongaon PWSS",
+        "projectId": "30139203",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sotai Bongaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173162",
+      "name": "Rihaljuli Koch Gaon PWSS",
+      "description": "Rihaljuli Koch Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rihaljuli Koch Gaon PWSS",
+        "localName": "Rihaljuli Koch Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38380",
+        "villageName": "Satai Ban Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173162",
+        "ddrName": "Rihaljuli Koch Gaon PWSS",
+        "projectId": "30173162",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rihaljuli Koch Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183072",
+      "name": "Satai Namile PWSS",
+      "description": "Satai Namile PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Satai Namile PWSS",
+        "localName": "Satai Namile PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "649494",
+        "villageName": "Satai Namile",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183072",
+        "ddrName": "Satai Namile PWSS",
+        "projectId": "30183072",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Satai Namile PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183077",
+      "name": "Sopaloga PWSS",
+      "description": "Sopaloga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopaloga PWSS",
+        "localName": "Sopaloga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "38383",
+        "villageName": "Sopaloga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183077",
+        "ddrName": "Sopaloga PWSS",
+        "projectId": "30183077",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopaloga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30186307",
+      "name": "Tarajan Mekhani PWSS",
+      "description": "Tarajan Mekhani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajan Mekhani PWSS",
+        "localName": "Tarajan Mekhani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "649496",
+        "villageName": "Tarajan Mekhani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30186307",
+        "ddrName": "Tarajan Mekhani PWSS",
+        "projectId": "30186307",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajan Mekhani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.603120",
+      "name": "Tarajan Bongaon PWSS",
+      "description": "Tarajan Bongaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajan Bongaon PWSS",
+        "localName": "Tarajan Bongaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23096",
+        "panchayatname": "Bhalukmari",
+        "villageCode": "649496",
+        "villageName": "Tarajan Mekhani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "603120",
+        "ddrName": "Tarajan Bongaon PWSS",
+        "projectId": "603120",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajan Bongaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8184246",
+      "name": "RETROFITTING OF PAKHIAJHAR PWSS",
+      "description": "RETROFITTING OF PAKHIAJHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PAKHIAJHAR PWSS",
+        "localName": "RETROFITTING OF PAKHIAJHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "586918",
+        "villageName": "Barpakhia Jhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8184246",
+        "ddrName": "RETROFITTING OF PAKHIAJHAR PWSS",
+        "projectId": "8184246",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PAKHIAJHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5534043",
+      "name": "PAKHIAJHAR PWSS",
+      "description": "PAKHIAJHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAKHIAJHAR PWSS",
+        "localName": "PAKHIAJHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38402",
+        "villageName": "Bindukuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5534043",
+        "ddrName": "PAKHIAJHAR PWSS",
+        "projectId": "5534043",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAKHIAJHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020637",
+      "name": "Bindukuri PWSS",
+      "description": "Bindukuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bindukuri PWSS",
+        "localName": "Bindukuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38402",
+        "villageName": "Bindukuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020637",
+        "ddrName": "Bindukuri PWSS",
+        "projectId": "30020637",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bindukuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30144955",
+      "name": "Bindukuri No. 2 PWSS",
+      "description": "Bindukuri No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bindukuri No. 2 PWSS",
+        "localName": "Bindukuri No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "647770",
+        "villageName": "Bindukuri T.e.(grant)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30144955",
+        "ddrName": "Bindukuri No. 2 PWSS",
+        "projectId": "30144955",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bindukuri No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30003558",
+      "name": "No. 1 Kathalguri TE PWSS",
+      "description": "No. 1 Kathalguri TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Kathalguri TE PWSS",
+        "localName": "No. 1 Kathalguri TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "586919",
+        "villageName": "Kathal Guri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30003558",
+        "ddrName": "No. 1 Kathalguri TE PWSS",
+        "projectId": "30003558",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Kathalguri TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011891",
+      "name": "Kathal Guri TE PWSS",
+      "description": "Kathal Guri TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kathal Guri TE PWSS",
+        "localName": "Kathal Guri TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "647820",
+        "villageName": "Kathal Guri T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011891",
+        "ddrName": "Kathal Guri TE PWSS",
+        "projectId": "30011891",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kathal Guri TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060740",
+      "name": "Kenduguri PWSS",
+      "description": "Kenduguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kenduguri PWSS",
+        "localName": "Kenduguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38401",
+        "villageName": "Kenduguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060740",
+        "ddrName": "Kenduguri PWSS",
+        "projectId": "30060740",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kenduguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059510",
+      "name": "Khola Guti Kachari Gaon PWSS",
+      "description": "Khola Guti Kachari Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khola Guti Kachari Gaon PWSS",
+        "localName": "Khola Guti Kachari Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38406",
+        "villageName": "Khola Guti Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059510",
+        "ddrName": "Khola Guti Kachari Gaon PWSS",
+        "projectId": "30059510",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khola Guti Kachari Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014184",
+      "name": "Uhanipathar No. 1 PWSS",
+      "description": "Uhanipathar No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uhanipathar No. 1 PWSS",
+        "localName": "Uhanipathar No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "586920",
+        "villageName": "Lihani Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014184",
+        "ddrName": "Uhanipathar No. 1 PWSS",
+        "projectId": "30014184",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uhanipathar No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174088",
+      "name": "NO. 2 KATHALGURI MPWSS",
+      "description": "NO. 2 KATHALGURI MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 2 KATHALGURI MPWSS",
+        "localName": "NO. 2 KATHALGURI MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "647821",
+        "villageName": "No.2 Kathalguri T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174088",
+        "ddrName": "NO. 2 KATHALGURI MPWSS",
+        "projectId": "30174088",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 2 KATHALGURI MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178440",
+      "name": "Uhani Pathar No. 2 PWSS",
+      "description": "Uhani Pathar No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uhani Pathar No. 2 PWSS",
+        "localName": "Uhani Pathar No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38397",
+        "villageName": "Saikia Chuburi Barjhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178440",
+        "ddrName": "Uhani Pathar No. 2 PWSS",
+        "projectId": "30178440",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uhani Pathar No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178821",
+      "name": "RETROFITTING OF DEKARGAON PWSS",
+      "description": "RETROFITTING OF DEKARGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DEKARGAON PWSS",
+        "localName": "RETROFITTING OF DEKARGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38399",
+        "villageName": "Saikia Chuburi Teleria",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178821",
+        "ddrName": "RETROFITTING OF DEKARGAON PWSS",
+        "projectId": "8178821",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DEKARGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30115981",
+      "name": "Saikia Chuburi Teleria PWSS",
+      "description": "Saikia Chuburi Teleria PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Saikia Chuburi Teleria PWSS",
+        "localName": "Saikia Chuburi Teleria PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23098",
+        "panchayatname": "Bindukuri",
+        "villageCode": "38399",
+        "villageName": "Saikia Chuburi Teleria",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30115981",
+        "ddrName": "Saikia Chuburi Teleria PWSS",
+        "projectId": "30115981",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Saikia Chuburi Teleria PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5519133",
+      "name": "AMLOGA PATHAR PWSS",
+      "description": "AMLOGA PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMLOGA PATHAR PWSS",
+        "localName": "AMLOGA PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "38432",
+        "villageName": "Amloga No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5519133",
+        "ddrName": "AMLOGA PATHAR PWSS",
+        "projectId": "5519133",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMLOGA PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201845",
+      "name": "Amloga No. 2 PWSS",
+      "description": "Amloga No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amloga No. 2 PWSS",
+        "localName": "Amloga No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647463",
+        "villageName": "Amloga No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201845",
+        "ddrName": "Amloga No. 2 PWSS",
+        "projectId": "30201845",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amloga No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8189158",
+      "name": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+      "description": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+        "localName": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "38435",
+        "villageName": "Bakola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8189158",
+        "ddrName": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+        "projectId": "8189158",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169470",
+      "name": "Bakola Gaon PWSS",
+      "description": "Bakola Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakola Gaon PWSS",
+        "localName": "Bakola Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "38435",
+        "villageName": "Bakola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169470",
+        "ddrName": "Bakola Gaon PWSS",
+        "projectId": "30169470",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakola Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201884",
+      "name": "Bakula Pathar PWSS",
+      "description": "Bakula Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakula Pathar PWSS",
+        "localName": "Bakula Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647457",
+        "villageName": "Bakola Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201884",
+        "ddrName": "Bakula Pathar PWSS",
+        "projectId": "30201884",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakula Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175853",
+      "name": "New Charduar Gaon PWSS",
+      "description": "New Charduar Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Charduar Gaon PWSS",
+        "localName": "New Charduar Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "38429",
+        "villageName": "Chari Duar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175853",
+        "ddrName": "New Charduar Gaon PWSS",
+        "projectId": "30175853",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Charduar Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178861",
+      "name": "RETROFITTING OF CHARIDUAR PWSS",
+      "description": "RETROFITTING OF CHARIDUAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHARIDUAR PWSS",
+        "localName": "RETROFITTING OF CHARIDUAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "38429",
+        "villageName": "Chari Duar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178861",
+        "ddrName": "RETROFITTING OF CHARIDUAR PWSS",
+        "projectId": "8178861",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHARIDUAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5527478",
+      "name": "CHARIDUAR PWSS",
+      "description": "CHARIDUAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHARIDUAR PWSS",
+        "localName": "CHARIDUAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "38429",
+        "villageName": "Chari Duar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5527478",
+        "ddrName": "CHARIDUAR PWSS",
+        "projectId": "5527478",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHARIDUAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30079783",
+      "name": "Chengelimari Pathar PWSS",
+      "description": "Chengelimari Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chengelimari Pathar PWSS",
+        "localName": "Chengelimari Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647794",
+        "villageName": "Chengeli Mari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30079783",
+        "ddrName": "Chengelimari Pathar PWSS",
+        "projectId": "30079783",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chengelimari Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216372",
+      "name": "New Chengelimara RF PWSS",
+      "description": "New Chengelimara RF PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Chengelimara RF PWSS",
+        "localName": "New Chengelimara RF PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23101",
+        "panchayatname": "CHARIDUAR",
+        "villageCode": "586705",
+        "villageName": "Chengelimari R.F.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216372",
+        "ddrName": "New Chengelimara RF PWSS",
+        "projectId": "30216372",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Chengelimara RF PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175876",
+      "name": "Jayanta Pur PWSS",
+      "description": "Jayanta Pur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jayanta Pur PWSS",
+        "localName": "Jayanta Pur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647801",
+        "villageName": "Jayanta Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175876",
+        "ddrName": "Jayanta Pur PWSS",
+        "projectId": "30175876",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jayanta Pur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30185152",
+      "name": "Kacharigaon Pambasti PWSS",
+      "description": "Kacharigaon Pambasti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kacharigaon Pambasti PWSS",
+        "localName": "Kacharigaon Pambasti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "649474",
+        "villageName": "Kachari Gaon Pambasti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30185152",
+        "ddrName": "Kacharigaon Pambasti PWSS",
+        "projectId": "30185152",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kacharigaon Pambasti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216676",
+      "name": "Pub Phuloguri PWSS",
+      "description": "Pub Phuloguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pub Phuloguri PWSS",
+        "localName": "Pub Phuloguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647458",
+        "villageName": "Phulaguri Garo Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216676",
+        "ddrName": "Pub Phuloguri PWSS",
+        "projectId": "30216676",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pub Phuloguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181824",
+      "name": "Phuloguri Garogaon PWSS",
+      "description": "Phuloguri Garogaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Phuloguri Garogaon PWSS",
+        "localName": "Phuloguri Garogaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647458",
+        "villageName": "Phulaguri Garo Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181824",
+        "ddrName": "Phuloguri Garogaon PWSS",
+        "projectId": "30181824",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Phuloguri Garogaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30226845",
+      "name": "Phulaguri Nishi -Kacharigaon PWSS",
+      "description": "Phulaguri Nishi -Kacharigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Phulaguri Nishi -Kacharigaon PWSS",
+        "localName": "Phulaguri Nishi -Kacharigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23101",
+        "panchayatname": "Chariduar",
+        "villageCode": "647461",
+        "villageName": "Phulaguri Kachari No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30226845",
+        "ddrName": "Phulaguri Nishi -Kacharigaon PWSS",
+        "projectId": "30226845",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Phulaguri Nishi -Kacharigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169600",
+      "name": "Deka Chuburi PWSS",
+      "description": "Deka Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Deka Chuburi PWSS",
+        "localName": "Deka Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "647495",
+        "villageName": "Deka Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169600",
+        "ddrName": "Deka Chuburi PWSS",
+        "projectId": "30169600",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Deka Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200338",
+      "name": "Retrofitting of Patiachuburi PWSS",
+      "description": "Retrofitting of Patiachuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Patiachuburi PWSS",
+        "localName": "Retrofitting of Patiachuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "647495",
+        "villageName": "Deka Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200338",
+        "ddrName": "Retrofitting of Patiachuburi PWSS",
+        "projectId": "30200338",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Patiachuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5531603",
+      "name": "PATIACHUBURI PWSS",
+      "description": "PATIACHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PATIACHUBURI PWSS",
+        "localName": "PATIACHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "647495",
+        "villageName": "Deka Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5531603",
+        "ddrName": "PATIACHUBURI PWSS",
+        "projectId": "5531603",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PATIACHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30163627",
+      "name": "New Dekargaon PWSS",
+      "description": "New Dekargaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Dekargaon PWSS",
+        "localName": "New Dekargaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "647541",
+        "villageName": "Dekar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30163627",
+        "ddrName": "New Dekargaon PWSS",
+        "projectId": "30163627",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Dekargaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30040815",
+      "name": "New Harigaon No. 2 PWSS",
+      "description": "New Harigaon No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Harigaon No. 2 PWSS",
+        "localName": "New Harigaon No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38438",
+        "villageName": "Hari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30040815",
+        "ddrName": "New Harigaon No. 2 PWSS",
+        "projectId": "30040815",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Harigaon No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30003640",
+      "name": "New Harigaon No. 1 PWSS",
+      "description": "New Harigaon No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Harigaon No. 1 PWSS",
+        "localName": "New Harigaon No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38438",
+        "villageName": "Hari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30003640",
+        "ddrName": "New Harigaon No. 1 PWSS",
+        "projectId": "30003640",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Harigaon No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385905",
+      "name": "RETROFITTING OF BORTOL PWSS",
+      "description": "RETROFITTING OF BORTOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORTOL PWSS",
+        "localName": "RETROFITTING OF BORTOL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38438",
+        "villageName": "Hari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385905",
+        "ddrName": "RETROFITTING OF BORTOL PWSS",
+        "projectId": "6385905",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORTOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185242",
+      "name": "RETROFITTING OF HARIGAON PWSS",
+      "description": "RETROFITTING OF HARIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HARIGAON PWSS",
+        "localName": "RETROFITTING OF HARIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38438",
+        "villageName": "Hari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185242",
+        "ddrName": "RETROFITTING OF HARIGAON PWSS",
+        "projectId": "8185242",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HARIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5184373",
+      "name": "Harigaon PWSS",
+      "description": "Harigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Harigaon PWSS",
+        "localName": "Harigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38438",
+        "villageName": "Hari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5184373",
+        "ddrName": "Harigaon PWSS",
+        "projectId": "5184373",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Harigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019793",
+      "name": "Parowa Bagicha No. 1 PWSS",
+      "description": "Parowa Bagicha No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Parowa Bagicha No. 1 PWSS",
+        "localName": "Parowa Bagicha No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38443",
+        "villageName": "Parowa Bagicha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019793",
+        "ddrName": "Parowa Bagicha No. 1 PWSS",
+        "projectId": "30019793",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Parowa Bagicha No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30193693",
+      "name": "Parowa Bagicha No. 2 PWSS",
+      "description": "Parowa Bagicha No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Parowa Bagicha No. 2 PWSS",
+        "localName": "Parowa Bagicha No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38442",
+        "villageName": "Puthi Khati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30193693",
+        "ddrName": "Parowa Bagicha No. 2 PWSS",
+        "projectId": "30193693",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Parowa Bagicha No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178172",
+      "name": "RETROFITTING OF PUTHIKHATI PWSS",
+      "description": "RETROFITTING OF PUTHIKHATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PUTHIKHATI PWSS",
+        "localName": "RETROFITTING OF PUTHIKHATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38442",
+        "villageName": "Puthi Khati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178172",
+        "ddrName": "RETROFITTING OF PUTHIKHATI PWSS",
+        "projectId": "8178172",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PUTHIKHATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30163717",
+      "name": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+      "description": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+        "localName": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38481",
+        "villageName": "Saikia Chuburi Dekar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30163717",
+        "ddrName": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+        "projectId": "30163717",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202908",
+      "name": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+      "description": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+        "localName": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38481",
+        "villageName": "Saikia Chuburi Dekar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202908",
+        "ddrName": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+        "projectId": "30202908",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068345",
+      "name": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+      "description": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+        "localName": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38481",
+        "villageName": "Saikia Chuburi Dekar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068345",
+        "ddrName": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+        "projectId": "30068345",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071787",
+      "name": "Udmari Barjhar PWSS",
+      "description": "Udmari Barjhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Udmari Barjhar PWSS",
+        "localName": "Udmari Barjhar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23102",
+        "panchayatname": "Dekargaon",
+        "villageCode": "38441",
+        "villageName": "Udmari Barjhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071787",
+        "ddrName": "Udmari Barjhar PWSS",
+        "projectId": "30071787",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Udmari Barjhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017720",
+      "name": "Baitha Bhanga Bangali PWSS",
+      "description": "Baitha Bhanga Bangali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baitha Bhanga Bangali PWSS",
+        "localName": "Baitha Bhanga Bangali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "587009",
+        "villageName": "Baitha Bhanga Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017720",
+        "ddrName": "Baitha Bhanga Bangali PWSS",
+        "projectId": "30017720",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baitha Bhanga Bangali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30002848",
+      "name": "Barpat Gaon PWSS",
+      "description": "Barpat Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barpat Gaon PWSS",
+        "localName": "Barpat Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "586969",
+        "villageName": "Barpat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30002848",
+        "ddrName": "Barpat Gaon PWSS",
+        "projectId": "30002848",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barpat Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200348",
+      "name": "Retrofitting of Dhekidol PWSS",
+      "description": "Retrofitting of Dhekidol PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dhekidol PWSS",
+        "localName": "Retrofitting of Dhekidol PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38462",
+        "villageName": "Bata Bari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200348",
+        "ddrName": "Retrofitting of Dhekidol PWSS",
+        "projectId": "30200348",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dhekidol PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8183933",
+      "name": "RETROFITTING OF NO. 1 BATABARI PWSS",
+      "description": "RETROFITTING OF NO. 1 BATABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NO. 1 BATABARI PWSS",
+        "localName": "RETROFITTING OF NO. 1 BATABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38462",
+        "villageName": "Bata Bari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8183933",
+        "ddrName": "RETROFITTING OF NO. 1 BATABARI PWSS",
+        "projectId": "8183933",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NO. 1 BATABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5544794",
+      "name": "DHEKIDOL PWSS",
+      "description": "DHEKIDOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHEKIDOL PWSS",
+        "localName": "DHEKIDOL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38462",
+        "villageName": "Bata Bari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5544794",
+        "ddrName": "DHEKIDOL PWSS",
+        "projectId": "5544794",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHEKIDOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185356",
+      "name": "No.1 Batabari PWSS",
+      "description": "No.1 Batabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Batabari PWSS",
+        "localName": "No.1 Batabari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38462",
+        "villageName": "Bata Bari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185356",
+        "ddrName": "No.1 Batabari PWSS",
+        "projectId": "5185356",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Batabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6515973",
+      "name": "RETROFITTING OF CHAPAGURI PWSS",
+      "description": "RETROFITTING OF CHAPAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHAPAGURI PWSS",
+        "localName": "RETROFITTING OF CHAPAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38463",
+        "villageName": "Chapaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6515973",
+        "ddrName": "RETROFITTING OF CHAPAGURI PWSS",
+        "projectId": "6515973",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHAPAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3328873",
+      "name": "Hahchora PWSS",
+      "description": "Hahchora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hahchora PWSS",
+        "localName": "Hahchora PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38463",
+        "villageName": "Chapaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3328873",
+        "ddrName": "Hahchora PWSS",
+        "projectId": "3328873",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hahchora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185270",
+      "name": "RETROFITTING OF HAHCHURA PWSS",
+      "description": "RETROFITTING OF HAHCHURA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HAHCHURA PWSS",
+        "localName": "RETROFITTING OF HAHCHURA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38463",
+        "villageName": "Chapaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185270",
+        "ddrName": "RETROFITTING OF HAHCHURA PWSS",
+        "projectId": "8185270",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HAHCHURA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30002858",
+      "name": "Ghoramora PWSS",
+      "description": "Ghoramora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghoramora PWSS",
+        "localName": "Ghoramora PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38467",
+        "villageName": "Ghoramora",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30002858",
+        "ddrName": "Ghoramora PWSS",
+        "projectId": "30002858",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghoramora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181769",
+      "name": "Panbari PWSS",
+      "description": "Panbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panbari PWSS",
+        "localName": "Panbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38460",
+        "villageName": "Panbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181769",
+        "ddrName": "Panbari PWSS",
+        "projectId": "30181769",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013839",
+      "name": "Sarupatgaon PWSS",
+      "description": "Sarupatgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sarupatgaon PWSS",
+        "localName": "Sarupatgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38465",
+        "villageName": "Sarupat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013839",
+        "ddrName": "Sarupatgaon PWSS",
+        "projectId": "30013839",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sarupatgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013853",
+      "name": "Tubukijhar PWSS",
+      "description": "Tubukijhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tubukijhar PWSS",
+        "localName": "Tubukijhar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "38464",
+        "villageName": "Tubuki Jar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013853",
+        "ddrName": "Tubukijhar PWSS",
+        "projectId": "30013853",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tubukijhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176403",
+      "name": "Uhani Pathar Batabari No. 1 PWSS",
+      "description": "Uhani Pathar Batabari No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uhani Pathar Batabari No. 1 PWSS",
+        "localName": "Uhani Pathar Batabari No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "647785",
+        "villageName": "Uhani Pathar Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176403",
+        "ddrName": "Uhani Pathar Batabari No. 1 PWSS",
+        "projectId": "30176403",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uhani Pathar Batabari No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076546",
+      "name": "Uhani Pathar Batabari No. 2 PWSS",
+      "description": "Uhani Pathar Batabari No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uhani Pathar Batabari No. 2 PWSS",
+        "localName": "Uhani Pathar Batabari No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "647785",
+        "villageName": "Uhani Pathar Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076546",
+        "ddrName": "Uhani Pathar Batabari No. 2 PWSS",
+        "projectId": "30076546",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uhani Pathar Batabari No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30145080",
+      "name": "Uhani Pathar Dhekidal PWSS",
+      "description": "Uhani Pathar Dhekidal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uhani Pathar Dhekidal PWSS",
+        "localName": "Uhani Pathar Dhekidal PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23104",
+        "panchayatname": "Ghoramari",
+        "villageCode": "647786",
+        "villageName": "Uhani Pathar Dhekidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30145080",
+        "ddrName": "Uhani Pathar Dhekidal PWSS",
+        "projectId": "30145080",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uhani Pathar Dhekidal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175812",
+      "name": "Azarbari PWSS",
+      "description": "Azarbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Azarbari PWSS",
+        "localName": "Azarbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "593896",
+        "villageName": "Azar Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175812",
+        "ddrName": "Azarbari PWSS",
+        "projectId": "30175812",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Azarbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175883",
+      "name": "BALAPARA NO.1 MPWSS",
+      "description": "BALAPARA NO.1 MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALAPARA NO.1 MPWSS",
+        "localName": "BALAPARA NO.1 MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587139",
+        "villageName": "Balapara (a) No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175883",
+        "ddrName": "BALAPARA NO.1 MPWSS",
+        "projectId": "30175883",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALAPARA NO.1 MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202436",
+      "name": "Barkhapur MPWS",
+      "description": "Barkhapur MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barkhapur MPWS",
+        "localName": "Barkhapur MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "649469",
+        "villageName": "Barkhapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202436",
+        "ddrName": "Barkhapur MPWS",
+        "projectId": "30202436",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barkhapur MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060709",
+      "name": "New Bogibil PWSS",
+      "description": "New Bogibil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Bogibil PWSS",
+        "localName": "New Bogibil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38473",
+        "villageName": "Bogibil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060709",
+        "ddrName": "New Bogibil PWSS",
+        "projectId": "30060709",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Bogibil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216427",
+      "name": "Pachim Bogibil PWSS",
+      "description": "Pachim Bogibil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pachim Bogibil PWSS",
+        "localName": "Pachim Bogibil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38473",
+        "villageName": "Bogibil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216427",
+        "ddrName": "Pachim Bogibil PWSS",
+        "projectId": "30216427",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pachim Bogibil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216577",
+      "name": "Pub Bogibil PWSS",
+      "description": "Pub Bogibil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pub Bogibil PWSS",
+        "localName": "Pub Bogibil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38473",
+        "villageName": "Bogibil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216577",
+        "ddrName": "Pub Bogibil PWSS",
+        "projectId": "30216577",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pub Bogibil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202510",
+      "name": "Bogijuli No. 1 PWSS",
+      "description": "Bogijuli No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bogijuli No. 1 PWSS",
+        "localName": "Bogijuli No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "586800",
+        "villageName": "Bongijuli No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202510",
+        "ddrName": "Bogijuli No. 1 PWSS",
+        "projectId": "30202510",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bogijuli No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213603",
+      "name": "Dafala Bil PWSS",
+      "description": "Dafala Bil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dafala Bil PWSS",
+        "localName": "Dafala Bil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587189",
+        "villageName": "Dafala Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213603",
+        "ddrName": "Dafala Bil PWSS",
+        "projectId": "30213603",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dafala Bil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214069",
+      "name": "Dipanjali PWSS",
+      "description": "Dipanjali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dipanjali PWSS",
+        "localName": "Dipanjali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587167",
+        "villageName": "Dipanjali Part (a)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214069",
+        "ddrName": "Dipanjali PWSS",
+        "projectId": "30214069",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dipanjali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185807",
+      "name": "RETROFITTING OF DOPDOPI PWSS",
+      "description": "RETROFITTING OF DOPDOPI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DOPDOPI PWSS",
+        "localName": "RETROFITTING OF DOPDOPI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38471",
+        "villageName": "Dopdopi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185807",
+        "ddrName": "RETROFITTING OF DOPDOPI PWSS",
+        "projectId": "8185807",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DOPDOPI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214148",
+      "name": "DOPDOPI RANGPUR PWSS",
+      "description": "DOPDOPI RANGPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DOPDOPI RANGPUR PWSS",
+        "localName": "DOPDOPI RANGPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647813",
+        "villageName": "Dopdopi Rangapur (a)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214148",
+        "ddrName": "DOPDOPI RANGPUR PWSS",
+        "projectId": "30214148",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DOPDOPI RANGPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214152",
+      "name": "GANESHPUR MPWS",
+      "description": "GANESHPUR MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GANESHPUR MPWS",
+        "localName": "GANESHPUR MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "593899",
+        "villageName": "Ganesh Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214152",
+        "ddrName": "GANESHPUR MPWS",
+        "projectId": "30214152",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GANESHPUR MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214157",
+      "name": "GANESHPUR NO.4 MPWS",
+      "description": "GANESHPUR NO.4 MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GANESHPUR NO.4 MPWS",
+        "localName": "GANESHPUR NO.4 MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647810",
+        "villageName": "Ganeshpur No.4",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214157",
+        "ddrName": "GANESHPUR NO.4 MPWS",
+        "projectId": "30214157",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GANESHPUR NO.4 MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214168",
+      "name": "Gaonjan Bil PWSS",
+      "description": "Gaonjan Bil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gaonjan Bil PWSS",
+        "localName": "Gaonjan Bil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587173",
+        "villageName": "Gaor Jan Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214168",
+        "ddrName": "Gaonjan Bil PWSS",
+        "projectId": "30214168",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gaonjan Bil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214174",
+      "name": "Gerjuli PWSS",
+      "description": "Gerjuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gerjuli PWSS",
+        "localName": "Gerjuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647818",
+        "villageName": "Gergua Juli No.3",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214174",
+        "ddrName": "Gerjuli PWSS",
+        "projectId": "30214174",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gerjuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213729",
+      "name": "No. 1 GERGUAJULI PWSS",
+      "description": "No. 1 GERGUAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 GERGUAJULI PWSS",
+        "localName": "No. 1 GERGUAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647817",
+        "villageName": "Gerjuli No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213729",
+        "ddrName": "No. 1 GERGUAJULI PWSS",
+        "projectId": "30213729",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 GERGUAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161790",
+      "name": "RETROFITTING OF GOTAMORA PWSS",
+      "description": "RETROFITTING OF GOTAMORA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GOTAMORA PWSS",
+        "localName": "RETROFITTING OF GOTAMORA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38472",
+        "villageName": "Gor Mara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161790",
+        "ddrName": "RETROFITTING OF GOTAMORA PWSS",
+        "projectId": "8161790",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GOTAMORA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174199",
+      "name": "2 No. Gormora PWSS",
+      "description": "2 No. Gormora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "2 No. Gormora PWSS",
+        "localName": "2 No. Gormora PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38472",
+        "villageName": "Gor Mara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174199",
+        "ddrName": "2 No. Gormora PWSS",
+        "projectId": "30174199",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "2 No. Gormora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5519203",
+      "name": "GOTAMORA PWSS",
+      "description": "GOTAMORA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOTAMORA PWSS",
+        "localName": "GOTAMORA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38472",
+        "villageName": "Gor Mara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5519203",
+        "ddrName": "GOTAMORA PWSS",
+        "projectId": "5519203",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOTAMORA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175891",
+      "name": "GORMORA JOYPUR MPWSS",
+      "description": "GORMORA JOYPUR MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GORMORA JOYPUR MPWSS",
+        "localName": "GORMORA JOYPUR MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "649473",
+        "villageName": "Joy Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175891",
+        "ddrName": "GORMORA JOYPUR MPWSS",
+        "projectId": "30175891",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GORMORA JOYPUR MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30244996",
+      "name": "Kalabil PWSS",
+      "description": "Kalabil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalabil PWSS",
+        "localName": "Kalabil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647638",
+        "villageName": "Kalabil No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30244996",
+        "ddrName": "Kalabil PWSS",
+        "projectId": "30244996",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalabil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004648",
+      "name": "Kalany TE PWSS",
+      "description": "Kalany TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalany TE PWSS",
+        "localName": "Kalany TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647788",
+        "villageName": "Kalany T.e. (1)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004648",
+        "ddrName": "Kalany TE PWSS",
+        "projectId": "30004648",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalany TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004669",
+      "name": "No. 1 Kalani PWSS",
+      "description": "No. 1 Kalani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Kalani PWSS",
+        "localName": "No. 1 Kalani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647788",
+        "villageName": "Kalany T.e. (1)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004669",
+        "ddrName": "No. 1 Kalani PWSS",
+        "projectId": "30004669",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Kalani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214413",
+      "name": "Kailajuli PWSS",
+      "description": "Kailajuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kailajuli PWSS",
+        "localName": "Kailajuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587236",
+        "villageName": "Kaliajuli No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214413",
+        "ddrName": "Kailajuli PWSS",
+        "projectId": "30214413",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kailajuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214478",
+      "name": "Kerimari MPWS",
+      "description": "Kerimari MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kerimari MPWS",
+        "localName": "Kerimari MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587176",
+        "villageName": "Kerimari Betbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214478",
+        "ddrName": "Kerimari MPWS",
+        "projectId": "30214478",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kerimari MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214579",
+      "name": "LAIGANGPARA PWSS",
+      "description": "LAIGANGPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LAIGANGPARA PWSS",
+        "localName": "LAIGANGPARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587168",
+        "villageName": "Laigang Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214579",
+        "ddrName": "LAIGANGPARA PWSS",
+        "projectId": "30214579",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LAIGANGPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214524",
+      "name": "Lal Barahi PWSS",
+      "description": "Lal Barahi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Lal Barahi PWSS",
+        "localName": "Lal Barahi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587144",
+        "villageName": "Lal-barahi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214524",
+        "ddrName": "Lal Barahi PWSS",
+        "projectId": "30214524",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Lal Barahi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214533",
+      "name": "Lal Barahi No.1 PWSS",
+      "description": "Lal Barahi No.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Lal Barahi No.1 PWSS",
+        "localName": "Lal Barahi No.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647632",
+        "villageName": "Lal-barahi No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214533",
+        "ddrName": "Lal Barahi No.1 PWSS",
+        "projectId": "30214533",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Lal Barahi No.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071722",
+      "name": "MILANPUR No. 1 PWSS",
+      "description": "MILANPUR No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MILANPUR No. 1 PWSS",
+        "localName": "MILANPUR No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587155",
+        "villageName": "Milan Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071722",
+        "ddrName": "MILANPUR No. 1 PWSS",
+        "projectId": "30071722",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MILANPUR No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214038",
+      "name": "MILANPUR No. 2 PWSS",
+      "description": "MILANPUR No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MILANPUR No. 2 PWSS",
+        "localName": "MILANPUR No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587155",
+        "villageName": "Milan Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214038",
+        "ddrName": "MILANPUR No. 2 PWSS",
+        "projectId": "30214038",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MILANPUR No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30186115",
+      "name": "Uttar Molan Gaon PWSS",
+      "description": "Uttar Molan Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uttar Molan Gaon PWSS",
+        "localName": "Uttar Molan Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38470",
+        "villageName": "Molan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30186115",
+        "ddrName": "Uttar Molan Gaon PWSS",
+        "projectId": "30186115",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uttar Molan Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181188",
+      "name": "No.12 Molangaon PWSS",
+      "description": "No.12 Molangaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.12 Molangaon PWSS",
+        "localName": "No.12 Molangaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647631",
+        "villageName": "Molan Gaon No.12",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181188",
+        "ddrName": "No.12 Molangaon PWSS",
+        "projectId": "30181188",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.12 Molangaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213935",
+      "name": "Dakhin Molan Gaon PWSS",
+      "description": "Dakhin Molan Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dakhin Molan Gaon PWSS",
+        "localName": "Dakhin Molan Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647631",
+        "villageName": "Molan Gaon No.12",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213935",
+        "ddrName": "Dakhin Molan Gaon PWSS",
+        "projectId": "30213935",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dakhin Molan Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213877",
+      "name": "Nalghagari PWSS",
+      "description": "Nalghagari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nalghagari PWSS",
+        "localName": "Nalghagari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587060",
+        "villageName": "Nalghagari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213877",
+        "ddrName": "Nalghagari PWSS",
+        "projectId": "30213877",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nalghagari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207281",
+      "name": "Oujuli Rangagora PWSS",
+      "description": "Oujuli Rangagora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Oujuli Rangagora PWSS",
+        "localName": "Oujuli Rangagora PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587145",
+        "villageName": "Oujuli Rangagora",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207281",
+        "ddrName": "Oujuli Rangagora PWSS",
+        "projectId": "30207281",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Oujuli Rangagora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214334",
+      "name": "Mansiri Sonapur PWSS",
+      "description": "Mansiri Sonapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mansiri Sonapur PWSS",
+        "localName": "Mansiri Sonapur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "593897",
+        "villageName": "Pachim Mansiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214334",
+        "ddrName": "Mansiri Sonapur PWSS",
+        "projectId": "30214334",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mansiri Sonapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216841",
+      "name": "Sourangjuli PWSS",
+      "description": "Sourangjuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sourangjuli PWSS",
+        "localName": "Sourangjuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587172",
+        "villageName": "Sourang Juli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216841",
+        "ddrName": "Sourangjuli PWSS",
+        "projectId": "30216841",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sourangjuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202118",
+      "name": "Tarabari PWSS",
+      "description": "Tarabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarabari PWSS",
+        "localName": "Tarabari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647811",
+        "villageName": "Tara Bari (a)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202118",
+        "ddrName": "Tarabari PWSS",
+        "projectId": "30202118",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30081197",
+      "name": "Dholkoba Line No. 1 PWSS",
+      "description": "Dholkoba Line No. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dholkoba Line No. 1 PWSS",
+        "localName": "Dholkoba Line No. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587177",
+        "villageName": "Tenga Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30081197",
+        "ddrName": "Dholkoba Line No. 1 PWSS",
+        "projectId": "30081197",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dholkoba Line No. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201982",
+      "name": "Tenga bil PWSS",
+      "description": "Tenga bil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tenga bil PWSS",
+        "localName": "Tenga bil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587177",
+        "villageName": "Tenga Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201982",
+        "ddrName": "Tenga bil PWSS",
+        "projectId": "30201982",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tenga bil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30081199",
+      "name": "Dholkoba Line 9 MPWS",
+      "description": "Dholkoba Line 9 MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dholkoba Line 9 MPWS",
+        "localName": "Dholkoba Line 9 MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587177",
+        "villageName": "Tenga Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30081199",
+        "ddrName": "Dholkoba Line 9 MPWS",
+        "projectId": "30081199",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dholkoba Line 9 MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201998",
+      "name": "Thaigir Bari PWSS",
+      "description": "Thaigir Bari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thaigir Bari PWSS",
+        "localName": "Thaigir Bari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "587137",
+        "villageName": "Thaighir Bori (a.b.c.)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201998",
+        "ddrName": "Thaigir Bari PWSS",
+        "projectId": "30201998",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thaigir Bari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202048",
+      "name": "Thekeraloga PWSS",
+      "description": "Thekeraloga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thekeraloga PWSS",
+        "localName": "Thekeraloga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "38431",
+        "villageName": "Thekeraloga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202048",
+        "ddrName": "Thekeraloga PWSS",
+        "projectId": "30202048",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thekeraloga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30186145",
+      "name": "Uppar Molagaon PWSS",
+      "description": "Uppar Molagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uppar Molagaon PWSS",
+        "localName": "Uppar Molagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "647807",
+        "villageName": "Uppar Molan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30186145",
+        "ddrName": "Uppar Molagaon PWSS",
+        "projectId": "30186145",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uppar Molagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4659210",
+      "name": "JOGIBIL PWSS",
+      "description": "JOGIBIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGIBIL PWSS",
+        "localName": "JOGIBIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "622873",
+        "villageName": "Urohiloga Ban Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4659210",
+        "ddrName": "JOGIBIL PWSS",
+        "projectId": "4659210",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGIBIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8239822",
+      "name": "RETROFITTING OF JOGIBIL PWSS",
+      "description": "RETROFITTING OF JOGIBIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JOGIBIL PWSS",
+        "localName": "RETROFITTING OF JOGIBIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "622873",
+        "villageName": "Urohiloga Ban Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8239822",
+        "ddrName": "RETROFITTING OF JOGIBIL PWSS",
+        "projectId": "8239822",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JOGIBIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174416",
+      "name": "Uttar Mansiri PWSS",
+      "description": "Uttar Mansiri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uttar Mansiri PWSS",
+        "localName": "Uttar Mansiri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23105",
+        "panchayatname": "Gormara",
+        "villageCode": "649467",
+        "villageName": "Uttar Niansiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174416",
+        "ddrName": "Uttar Mansiri PWSS",
+        "projectId": "30174416",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uttar Mansiri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013836",
+      "name": "Betani Jhar PWSS",
+      "description": "Betani Jhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Betani Jhar PWSS",
+        "localName": "Betani Jhar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38425",
+        "villageName": "Betani Jhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013836",
+        "ddrName": "Betani Jhar PWSS",
+        "projectId": "30013836",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Betani Jhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4668398",
+      "name": "Chitabosti  PWSS",
+      "description": "Chitabosti  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chitabosti  PWSS",
+        "localName": "Chitabosti  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38425",
+        "villageName": "Betani Jhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4668398",
+        "ddrName": "Chitabosti  PWSS",
+        "projectId": "4668398",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chitabosti  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161778",
+      "name": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+      "description": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+        "localName": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38420",
+        "villageName": "Goroi Mari Borpukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161778",
+        "ddrName": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+        "projectId": "8161778",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4657126",
+      "name": "Renganijar PWSS",
+      "description": "Renganijar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Renganijar PWSS",
+        "localName": "Renganijar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38420",
+        "villageName": "Goroi Mari Borpukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4657126",
+        "ddrName": "Renganijar PWSS",
+        "projectId": "4657126",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Renganijar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5534657",
+      "name": "GOROIMARI BORPUKHURI PWSS",
+      "description": "GOROIMARI BORPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOROIMARI BORPUKHURI PWSS",
+        "localName": "GOROIMARI BORPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38420",
+        "villageName": "Goroi Mari Borpukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5534657",
+        "ddrName": "GOROIMARI BORPUKHURI PWSS",
+        "projectId": "5534657",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOROIMARI BORPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1853326",
+      "name": "Niz Haleswar PWSS",
+      "description": "Niz Haleswar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Niz Haleswar PWSS",
+        "localName": "Niz Haleswar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38422",
+        "villageName": "Holeswar Devalaya",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1853326",
+        "ddrName": "Niz Haleswar PWSS",
+        "projectId": "1853326",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Niz Haleswar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8184256",
+      "name": "RETROFITTING OF NIZ HALESWAR PWSS",
+      "description": "RETROFITTING OF NIZ HALESWAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NIZ HALESWAR PWSS",
+        "localName": "RETROFITTING OF NIZ HALESWAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38422",
+        "villageName": "Holeswar Devalaya",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8184256",
+        "ddrName": "RETROFITTING OF NIZ HALESWAR PWSS",
+        "projectId": "8184256",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NIZ HALESWAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175708",
+      "name": "New Haleswar",
+      "description": "New Haleswar",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Haleswar",
+        "localName": "New Haleswar",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38424",
+        "villageName": "Niz-haleswar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175708",
+        "ddrName": "New Haleswar",
+        "projectId": "30175708",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Haleswar",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30001504",
+      "name": "No.1 Ghogora T.E. PWSS",
+      "description": "No.1 Ghogora T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Ghogora T.E. PWSS",
+        "localName": "No.1 Ghogora T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "647543",
+        "villageName": "No.1 Ghogora T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30001504",
+        "ddrName": "No.1 Ghogora T.E. PWSS",
+        "projectId": "30001504",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Ghogora T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8181912",
+      "name": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+      "description": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+        "localName": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38426",
+        "villageName": "No.2 Ghogora T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8181912",
+        "ddrName": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+        "projectId": "8181912",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043879",
+      "name": "No. 2 Ghogora T.E.(East) PWSS",
+      "description": "No. 2 Ghogora T.E.(East) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Ghogora T.E.(East) PWSS",
+        "localName": "No. 2 Ghogora T.E.(East) PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "648219",
+        "villageName": "No.2 Ghogra R.g.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043879",
+        "ddrName": "No. 2 Ghogora T.E.(East) PWSS",
+        "projectId": "30043879",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Ghogora T.E.(East) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8162125",
+      "name": "RETROFITTING OF RENGANIJHAR PWSS",
+      "description": "RETROFITTING OF RENGANIJHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RENGANIJHAR PWSS",
+        "localName": "RETROFITTING OF RENGANIJHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23100",
+        "panchayatname": "Haleswar",
+        "villageCode": "38418",
+        "villageName": "Rengani Jhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8162125",
+        "ddrName": "RETROFITTING OF RENGANIJHAR PWSS",
+        "projectId": "8162125",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RENGANIJHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214095",
+      "name": "Dolongbasti Dafala PWSS",
+      "description": "Dolongbasti Dafala PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dolongbasti Dafala PWSS",
+        "localName": "Dolongbasti Dafala PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "649387",
+        "villageName": "Dalang Basti Dafala",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214095",
+        "ddrName": "Dolongbasti Dafala PWSS",
+        "projectId": "30214095",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dolongbasti Dafala PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30245010",
+      "name": "Dafala Pathar PWSS",
+      "description": "Dafala Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dafala Pathar PWSS",
+        "localName": "Dafala Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23095",
+        "panchayatname": "LOKRA",
+        "villageCode": "647837",
+        "villageName": "Dofala Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30245010",
+        "ddrName": "Dafala Pathar PWSS",
+        "projectId": "30245010",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dafala Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214145",
+      "name": "Dolongbasti FV PWSS",
+      "description": "Dolongbasti FV PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dolongbasti FV PWSS",
+        "localName": "Dolongbasti FV PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "38372",
+        "villageName": "Dowang Bari Dafala",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214145",
+        "ddrName": "Dolongbasti FV PWSS",
+        "projectId": "30214145",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dolongbasti FV PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161960",
+      "name": "RETROFITTING OF LAKHRA DAFALA PWSS",
+      "description": "RETROFITTING OF LAKHRA DAFALA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF LAKHRA DAFALA PWSS",
+        "localName": "RETROFITTING OF LAKHRA DAFALA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "647605",
+        "villageName": "Lokra Dafala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161960",
+        "ddrName": "RETROFITTING OF LAKHRA DAFALA PWSS",
+        "projectId": "8161960",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF LAKHRA DAFALA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547832",
+      "name": "LAKHRA DAFOLA PWSS",
+      "description": "LAKHRA DAFOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LAKHRA DAFOLA PWSS",
+        "localName": "LAKHRA DAFOLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "647605",
+        "villageName": "Lokra Dafala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547832",
+        "ddrName": "LAKHRA DAFOLA PWSS",
+        "projectId": "5547832",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LAKHRA DAFOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214059",
+      "name": "Meherbasti PWSS",
+      "description": "Meherbasti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Meherbasti PWSS",
+        "localName": "Meherbasti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "649478",
+        "villageName": "Meher Basti Forest",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214059",
+        "ddrName": "Meherbasti PWSS",
+        "projectId": "30214059",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Meherbasti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068648",
+      "name": "Sonai Miri Gaon PWSS",
+      "description": "Sonai Miri Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonai Miri Gaon PWSS",
+        "localName": "Sonai Miri Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "586650",
+        "villageName": "Sonai Miri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068648",
+        "ddrName": "Sonai Miri Gaon PWSS",
+        "projectId": "30068648",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonai Miri Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071743",
+      "name": "Sonai Nepali PWSS",
+      "description": "Sonai Nepali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonai Nepali PWSS",
+        "localName": "Sonai Nepali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "647838",
+        "villageName": "Sonai Nepali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071743",
+        "ddrName": "Sonai Nepali PWSS",
+        "projectId": "30071743",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonai Nepali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202484",
+      "name": "Sonai Pam Gaon PWSS",
+      "description": "Sonai Pam Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonai Pam Gaon PWSS",
+        "localName": "Sonai Pam Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23095",
+        "panchayatname": "Lokra",
+        "villageCode": "38375",
+        "villageName": "Sonai Pam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202484",
+        "ddrName": "Sonai Pam Gaon PWSS",
+        "projectId": "30202484",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonai Pam Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6520124",
+      "name": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+      "description": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+        "localName": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38358",
+        "villageName": "Baitha Bhanga Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6520124",
+        "ddrName": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+        "projectId": "6520124",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385925",
+      "name": "RETROFITTING OF BORGHULI PWSS",
+      "description": "RETROFITTING OF BORGHULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORGHULI PWSS",
+        "localName": "RETROFITTING OF BORGHULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38360",
+        "villageName": "Barghuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385925",
+        "ddrName": "RETROFITTING OF BORGHULI PWSS",
+        "projectId": "6385925",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORGHULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214398",
+      "name": "Kachu Bil PWSS",
+      "description": "Kachu Bil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kachu Bil PWSS",
+        "localName": "Kachu Bil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38356",
+        "villageName": "Kachu Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214398",
+        "ddrName": "Kachu Bil PWSS",
+        "projectId": "30214398",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kachu Bil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153746",
+      "name": "RETROFITTING OF KALIABHATA PWSS",
+      "description": "RETROFITTING OF KALIABHATA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KALIABHATA PWSS",
+        "localName": "RETROFITTING OF KALIABHATA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38357",
+        "villageName": "Mansiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153746",
+        "ddrName": "RETROFITTING OF KALIABHATA PWSS",
+        "projectId": "8153746",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KALIABHATA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1846743",
+      "name": "Kaliabhata PWSS",
+      "description": "Kaliabhata PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kaliabhata PWSS",
+        "localName": "Kaliabhata PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38357",
+        "villageName": "Mansiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1846743",
+        "ddrName": "Kaliabhata PWSS",
+        "projectId": "1846743",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kaliabhata PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174562",
+      "name": "Pubmansiri MPWS",
+      "description": "Pubmansiri MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pubmansiri MPWS",
+        "localName": "Pubmansiri MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "647863",
+        "villageName": "Pubmansiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174562",
+        "ddrName": "Pubmansiri MPWS",
+        "projectId": "30174562",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pubmansiri MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4657189",
+      "name": "Berajan PWSS",
+      "description": "Berajan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Berajan PWSS",
+        "localName": "Berajan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "647863",
+        "villageName": "Pubmansiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4657189",
+        "ddrName": "Berajan PWSS",
+        "projectId": "4657189",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Berajan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30199656",
+      "name": "Ran Gajan Miri Pathar PWSS",
+      "description": "Ran Gajan Miri Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ran Gajan Miri Pathar PWSS",
+        "localName": "Ran Gajan Miri Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38359",
+        "villageName": "Ran Gajan Miri Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30199656",
+        "ddrName": "Ran Gajan Miri Pathar PWSS",
+        "projectId": "30199656",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ran Gajan Miri Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048408",
+      "name": "Rangajan Miri Gaon PWSS",
+      "description": "Rangajan Miri Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rangajan Miri Gaon PWSS",
+        "localName": "Rangajan Miri Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23093",
+        "panchayatname": "MANSIRI",
+        "villageCode": "647616",
+        "villageName": "Ranga Jan Miri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048408",
+        "ddrName": "Rangajan Miri Gaon PWSS",
+        "projectId": "30048408",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rangajan Miri Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174577",
+      "name": "Raumari Pathar PWSS",
+      "description": "Raumari Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Raumari Pathar PWSS",
+        "localName": "Raumari Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "647823",
+        "villageName": "Raumari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174577",
+        "ddrName": "Raumari Pathar PWSS",
+        "projectId": "30174577",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Raumari Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181850",
+      "name": "Roumari Gaon PWSS",
+      "description": "Roumari Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Roumari Gaon PWSS",
+        "localName": "Roumari Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38361",
+        "villageName": "Roumari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181850",
+        "ddrName": "Roumari Gaon PWSS",
+        "projectId": "30181850",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Roumari Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385531",
+      "name": "RETROFITTING OF SILGHAGARI PWSS",
+      "description": "RETROFITTING OF SILGHAGARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SILGHAGARI PWSS",
+        "localName": "RETROFITTING OF SILGHAGARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "38355",
+        "villageName": "Silghagari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385531",
+        "ddrName": "RETROFITTING OF SILGHAGARI PWSS",
+        "projectId": "6385531",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SILGHAGARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181958",
+      "name": "Silghagari Pathar PWSS",
+      "description": "Silghagari Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Silghagari Pathar PWSS",
+        "localName": "Silghagari Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23093",
+        "panchayatname": "Mansiri",
+        "villageCode": "647824",
+        "villageName": "Silghagari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181958",
+        "ddrName": "Silghagari Pathar PWSS",
+        "projectId": "30181958",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Silghagari Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043797",
+      "name": "Ahata Guri Gaon PWSS",
+      "description": "Ahata Guri Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ahata Guri Gaon PWSS",
+        "localName": "Ahata Guri Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "586947",
+        "villageName": "Ahata Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043797",
+        "ddrName": "Ahata Guri Gaon PWSS",
+        "projectId": "30043797",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ahata Guri Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153800",
+      "name": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+      "description": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+        "localName": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "586947",
+        "villageName": "Ahata Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153800",
+        "ddrName": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+        "projectId": "8153800",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5548125",
+      "name": "BAGHSUNG BALITIKA PWSS",
+      "description": "BAGHSUNG BALITIKA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGHSUNG BALITIKA PWSS",
+        "localName": "BAGHSUNG BALITIKA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "586947",
+        "villageName": "Ahata Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5548125",
+        "ddrName": "BAGHSUNG BALITIKA PWSS",
+        "projectId": "5548125",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGHSUNG BALITIKA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408108",
+      "name": "RETROFITTING OF AMOLAPAM PWSS",
+      "description": "RETROFITTING OF AMOLAPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF AMOLAPAM PWSS",
+        "localName": "RETROFITTING OF AMOLAPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38450",
+        "villageName": "Amola Pam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408108",
+        "ddrName": "RETROFITTING OF AMOLAPAM PWSS",
+        "projectId": "5408108",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF AMOLAPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017735",
+      "name": "Bhaluk Jharani PWSS",
+      "description": "Bhaluk Jharani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhaluk Jharani PWSS",
+        "localName": "Bhaluk Jharani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "586926",
+        "villageName": "Bhaluk Jharani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017735",
+        "ddrName": "Bhaluk Jharani PWSS",
+        "projectId": "30017735",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhaluk Jharani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153703",
+      "name": "RETROFITTING OF JUGLONI PWSS",
+      "description": "RETROFITTING OF JUGLONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JUGLONI PWSS",
+        "localName": "RETROFITTING OF JUGLONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23103",
+        "panchayatname": "NAPAM",
+        "villageCode": "586926",
+        "villageName": "Bhaluk Jharani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153703",
+        "ddrName": "RETROFITTING OF JUGLONI PWSS",
+        "projectId": "8153703",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JUGLONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049608",
+      "name": "Bhitor Parowa Gaon PWSS",
+      "description": "Bhitor Parowa Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhitor Parowa Gaon PWSS",
+        "localName": "Bhitor Parowa Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38439",
+        "villageName": "Bhitor Parowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049608",
+        "ddrName": "Bhitor Parowa Gaon PWSS",
+        "projectId": "30049608",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhitor Parowa Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8157739",
+      "name": "RETROFITTING OF BORGURI PWSS",
+      "description": "RETROFITTING OF BORGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORGURI PWSS",
+        "localName": "RETROFITTING OF BORGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38455",
+        "villageName": "Borguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8157739",
+        "ddrName": "RETROFITTING OF BORGURI PWSS",
+        "projectId": "8157739",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4658923",
+      "name": "Boraguri PWSS",
+      "description": "Boraguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boraguri PWSS",
+        "localName": "Boraguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38455",
+        "villageName": "Borguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4658923",
+        "ddrName": "Boraguri PWSS",
+        "projectId": "4658923",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boraguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.453185",
+      "name": "JUGLANI PWSS",
+      "description": "JUGLANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JUGLANI PWSS",
+        "localName": "JUGLANI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38459",
+        "villageName": "Jaglowani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "453185",
+        "ddrName": "JUGLANI PWSS",
+        "projectId": "453185",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JUGLANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057745",
+      "name": "Kasha Kani Gaon PWSS",
+      "description": "Kasha Kani Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kasha Kani Gaon PWSS",
+        "localName": "Kasha Kani Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38457",
+        "villageName": "Kasha Kani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057745",
+        "ddrName": "Kasha Kani Gaon PWSS",
+        "projectId": "30057745",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kasha Kani Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153777",
+      "name": "RETROFITTING OF NAPAM PWSS",
+      "description": "RETROFITTING OF NAPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAPAM PWSS",
+        "localName": "RETROFITTING OF NAPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38449",
+        "villageName": "Na-pam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153777",
+        "ddrName": "RETROFITTING OF NAPAM PWSS",
+        "projectId": "8153777",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547870",
+      "name": "NAPAM PWSS",
+      "description": "NAPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAPAM PWSS",
+        "localName": "NAPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38449",
+        "villageName": "Na-pam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547870",
+        "ddrName": "NAPAM PWSS",
+        "projectId": "5547870",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005536",
+      "name": "Napam North PWSS",
+      "description": "Napam North PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Napam North PWSS",
+        "localName": "Napam North PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38449",
+        "villageName": "Na-pam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005536",
+        "ddrName": "Napam North PWSS",
+        "projectId": "30005536",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Napam North PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014698",
+      "name": "Parmaighuli PWSS",
+      "description": "Parmaighuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Parmaighuli PWSS",
+        "localName": "Parmaighuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38454",
+        "villageName": "Parmai Gauli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014698",
+        "ddrName": "Parmaighuli PWSS",
+        "projectId": "30014698",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Parmaighuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014701",
+      "name": "Parmaighuli South PWSS",
+      "description": "Parmaighuli South PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Parmaighuli South PWSS",
+        "localName": "Parmaighuli South PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38454",
+        "villageName": "Parmai Gauli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014701",
+        "ddrName": "Parmaighuli South PWSS",
+        "projectId": "30014701",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Parmaighuli South PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063152",
+      "name": "Bam Parowa PWSS",
+      "description": "Bam Parowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bam Parowa PWSS",
+        "localName": "Bam Parowa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38453",
+        "villageName": "Parowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063152",
+        "ddrName": "Bam Parowa PWSS",
+        "projectId": "30063152",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bam Parowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037948",
+      "name": "Parowa PWSS",
+      "description": "Parowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Parowa PWSS",
+        "localName": "Parowa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38453",
+        "villageName": "Parowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037948",
+        "ddrName": "Parowa PWSS",
+        "projectId": "30037948",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Parowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017715",
+      "name": "New  P u n i o n i  PWSS",
+      "description": "New  P u n i o n i  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New  P u n i o n i  PWSS",
+        "localName": "New  P u n i o n i  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38451",
+        "villageName": "Puniani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017715",
+        "ddrName": "New  P u n i o n i  PWSS",
+        "projectId": "30017715",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New  P u n i o n i  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1852364",
+      "name": "PUNIONI PWSS",
+      "description": "PUNIONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUNIONI PWSS",
+        "localName": "PUNIONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38451",
+        "villageName": "Puniani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1852364",
+        "ddrName": "PUNIONI PWSS",
+        "projectId": "1852364",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUNIONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153766",
+      "name": "RETROFITTING OF PUNIONI PWSS",
+      "description": "RETROFITTING OF PUNIONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PUNIONI PWSS",
+        "localName": "RETROFITTING OF PUNIONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38451",
+        "villageName": "Puniani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153766",
+        "ddrName": "RETROFITTING OF PUNIONI PWSS",
+        "projectId": "8153766",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PUNIONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055936",
+      "name": "Rupkuria No. 2 PWSS",
+      "description": "Rupkuria No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rupkuria No. 2 PWSS",
+        "localName": "Rupkuria No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38456",
+        "villageName": "Rupkuria Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055936",
+        "ddrName": "Rupkuria No. 2 PWSS",
+        "projectId": "30055936",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rupkuria No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057746",
+      "name": "Rupkuria PWSS",
+      "description": "Rupkuria PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rupkuria PWSS",
+        "localName": "Rupkuria PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38456",
+        "villageName": "Rupkuria Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057746",
+        "ddrName": "Rupkuria PWSS",
+        "projectId": "30057746",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rupkuria PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30127414",
+      "name": "Salmara Gaon PWSS",
+      "description": "Salmara Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Salmara Gaon PWSS",
+        "localName": "Salmara Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23103",
+        "panchayatname": "Napam",
+        "villageCode": "38458",
+        "villageName": "Salmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30127414",
+        "ddrName": "Salmara Gaon PWSS",
+        "projectId": "30127414",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Salmara Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048267",
+      "name": "Bokajan No. 2 PWSS",
+      "description": "Bokajan No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bokajan No. 2 PWSS",
+        "localName": "Bokajan No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38321",
+        "villageName": "Bokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048267",
+        "ddrName": "Bokajan No. 2 PWSS",
+        "projectId": "30048267",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bokajan No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175807",
+      "name": "Bokajan No 1",
+      "description": "Bokajan No 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bokajan No 1",
+        "localName": "Bokajan No 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38321",
+        "villageName": "Bokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175807",
+        "ddrName": "Bokajan No 1",
+        "projectId": "30175807",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bokajan No 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1853306",
+      "name": "Malijan PWSS",
+      "description": "Malijan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Malijan PWSS",
+        "localName": "Malijan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38321",
+        "villageName": "Bokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1853306",
+        "ddrName": "Malijan PWSS",
+        "projectId": "1853306",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Malijan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185128",
+      "name": "RETROFITTING OF MALIJAN PWSS",
+      "description": "RETROFITTING OF MALIJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MALIJAN PWSS",
+        "localName": "RETROFITTING OF MALIJAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38321",
+        "villageName": "Bokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185128",
+        "ddrName": "RETROFITTING OF MALIJAN PWSS",
+        "projectId": "8185128",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MALIJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192597",
+      "name": "RETROFITTING OF SONABIL TE PWSS",
+      "description": "RETROFITTING OF SONABIL TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SONABIL TE PWSS",
+        "localName": "RETROFITTING OF SONABIL TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38321",
+        "villageName": "Bokajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192597",
+        "ddrName": "RETROFITTING OF SONABIL TE PWSS",
+        "projectId": "8192597",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SONABIL TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011609",
+      "name": "Chala TE PWSS",
+      "description": "Chala TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chala TE PWSS",
+        "localName": "Chala TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "647628",
+        "villageName": "Chala T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011609",
+        "ddrName": "Chala TE PWSS",
+        "projectId": "30011609",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chala TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169537",
+      "name": "Chalabasti Gaon PWSS",
+      "description": "Chalabasti Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chalabasti Gaon PWSS",
+        "localName": "Chalabasti Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38327",
+        "villageName": "Chalabasti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169537",
+        "ddrName": "Chalabasti Gaon PWSS",
+        "projectId": "30169537",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chalabasti Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8184539",
+      "name": "RETROFITTING OF CHALAGAON PWSS",
+      "description": "RETROFITTING OF CHALAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHALAGAON PWSS",
+        "localName": "RETROFITTING OF CHALAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38327",
+        "villageName": "Chalabasti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8184539",
+        "ddrName": "RETROFITTING OF CHALAGAON PWSS",
+        "projectId": "8184539",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHALAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185772",
+      "name": "RETROFITTING OF CHITABASTI PWSS",
+      "description": "RETROFITTING OF CHITABASTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHITABASTI PWSS",
+        "localName": "RETROFITTING OF CHITABASTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38327",
+        "villageName": "Chalabasti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185772",
+        "ddrName": "RETROFITTING OF CHITABASTI PWSS",
+        "projectId": "8185772",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHITABASTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185351",
+      "name": "Chalagaon PWSS",
+      "description": "Chalagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chalagaon PWSS",
+        "localName": "Chalagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "647627",
+        "villageName": "Chola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185351",
+        "ddrName": "Chalagaon PWSS",
+        "projectId": "5185351",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chalagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169583",
+      "name": "Chola Gaon PWSS",
+      "description": "Chola Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chola Gaon PWSS",
+        "localName": "Chola Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "647627",
+        "villageName": "Chola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169583",
+        "ddrName": "Chola Gaon PWSS",
+        "projectId": "30169583",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chola Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180855",
+      "name": "Sonabil PWSS",
+      "description": "Sonabil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonabil PWSS",
+        "localName": "Sonabil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38323",
+        "villageName": "Goraimari (niz)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180855",
+        "ddrName": "Sonabil PWSS",
+        "projectId": "30180855",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonabil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30199561",
+      "name": "Goraimari PWSS",
+      "description": "Goraimari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Goraimari PWSS",
+        "localName": "Goraimari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "38323",
+        "villageName": "Goraimari (niz)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30199561",
+        "ddrName": "Goraimari PWSS",
+        "projectId": "30199561",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Goraimari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013848",
+      "name": "No. 1 Malijan PWSS",
+      "description": "No. 1 Malijan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Malijan PWSS",
+        "localName": "No. 1 Malijan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23089",
+        "panchayatname": "Niz-goroimari",
+        "villageCode": "647625",
+        "villageName": "No.1 Malijan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013848",
+        "ddrName": "No. 1 Malijan PWSS",
+        "projectId": "30013848",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Malijan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043851",
+      "name": "Akabasti Bengali PWSS",
+      "description": "Akabasti Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Akabasti Bengali PWSS",
+        "localName": "Akabasti Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38341",
+        "villageName": "Akabasti Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043851",
+        "ddrName": "Akabasti Bengali PWSS",
+        "projectId": "30043851",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Akabasti Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161907",
+      "name": "RETROFITTING OF AKABASTI PWSS",
+      "description": "RETROFITTING OF AKABASTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF AKABASTI PWSS",
+        "localName": "RETROFITTING OF AKABASTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38341",
+        "villageName": "Akabasti Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161907",
+        "ddrName": "RETROFITTING OF AKABASTI PWSS",
+        "projectId": "8161907",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF AKABASTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4657250",
+      "name": "Akabasti PWSS",
+      "description": "Akabasti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Akabasti PWSS",
+        "localName": "Akabasti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38415",
+        "villageName": "Akabasti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4657250",
+        "ddrName": "Akabasti PWSS",
+        "projectId": "4657250",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Akabasti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30163652",
+      "name": "Bokagaon Chapori PWSS",
+      "description": "Bokagaon Chapori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bokagaon Chapori PWSS",
+        "localName": "Bokagaon Chapori PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "647389",
+        "villageName": "Boka Gaon Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30163652",
+        "ddrName": "Bokagaon Chapori PWSS",
+        "projectId": "30163652",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bokagaon Chapori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060825",
+      "name": "Gorali PWSS",
+      "description": "Gorali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gorali PWSS",
+        "localName": "Gorali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38346",
+        "villageName": "Gorali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060825",
+        "ddrName": "Gorali PWSS",
+        "projectId": "30060825",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gorali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547867",
+      "name": "GUDAMGHAT PWSS",
+      "description": "GUDAMGHAT PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GUDAMGHAT PWSS",
+        "localName": "GUDAMGHAT PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38339",
+        "villageName": "Gudamghat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547867",
+        "ddrName": "GUDAMGHAT PWSS",
+        "projectId": "5547867",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GUDAMGHAT PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161794",
+      "name": "RETROFITTING OF GUDAMGHAT PWSS",
+      "description": "RETROFITTING OF GUDAMGHAT PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GUDAMGHAT PWSS",
+        "localName": "RETROFITTING OF GUDAMGHAT PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38339",
+        "villageName": "Gudamghat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161794",
+        "ddrName": "RETROFITTING OF GUDAMGHAT PWSS",
+        "projectId": "8161794",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GUDAMGHAT PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30062312",
+      "name": "Gudamghat Kachari PWSS",
+      "description": "Gudamghat Kachari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gudamghat Kachari PWSS",
+        "localName": "Gudamghat Kachari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "647610",
+        "villageName": "Gudamghat Gaon Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30062312",
+        "ddrName": "Gudamghat Kachari PWSS",
+        "projectId": "30062312",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gudamghat Kachari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019799",
+      "name": "Gudamghat Miri PWSS",
+      "description": "Gudamghat Miri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gudamghat Miri PWSS",
+        "localName": "Gudamghat Miri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38345",
+        "villageName": "Gudamghat Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019799",
+        "ddrName": "Gudamghat Miri PWSS",
+        "projectId": "30019799",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gudamghat Miri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077015",
+      "name": "Kanyaghat PWSS",
+      "description": "Kanyaghat PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kanyaghat PWSS",
+        "localName": "Kanyaghat PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "647609",
+        "villageName": "Gudamghat P.g.r.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077015",
+        "ddrName": "Kanyaghat PWSS",
+        "projectId": "30077015",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kanyaghat PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408224",
+      "name": "RETROFITTING OF KEKAKULI PWSS",
+      "description": "RETROFITTING OF KEKAKULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KEKAKULI PWSS",
+        "localName": "RETROFITTING OF KEKAKULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38343",
+        "villageName": "Kekokali Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408224",
+        "ddrName": "RETROFITTING OF KEKAKULI PWSS",
+        "projectId": "5408224",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KEKAKULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076496",
+      "name": "Kekokoli Nepali PWSS",
+      "description": "Kekokoli Nepali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kekokoli Nepali PWSS",
+        "localName": "Kekokoli Nepali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38348",
+        "villageName": "Kekokali Nepali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076496",
+        "ddrName": "Kekokoli Nepali PWSS",
+        "projectId": "30076496",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kekokoli Nepali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30083450",
+      "name": "Dakhin Khanamukh PWSS",
+      "description": "Dakhin Khanamukh PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dakhin Khanamukh PWSS",
+        "localName": "Dakhin Khanamukh PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38338",
+        "villageName": "Khonamukh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30083450",
+        "ddrName": "Dakhin Khanamukh PWSS",
+        "projectId": "30083450",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dakhin Khanamukh PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185556",
+      "name": "Khanamukh PWSS",
+      "description": "Khanamukh PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khanamukh PWSS",
+        "localName": "Khanamukh PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38338",
+        "villageName": "Khonamukh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185556",
+        "ddrName": "Khanamukh PWSS",
+        "projectId": "5185556",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khanamukh PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161943",
+      "name": "RETROFITTING OF KHANAMUKH PWSS",
+      "description": "RETROFITTING OF KHANAMUKH PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KHANAMUKH PWSS",
+        "localName": "RETROFITTING OF KHANAMUKH PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38338",
+        "villageName": "Khonamukh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161943",
+        "ddrName": "RETROFITTING OF KHANAMUKH PWSS",
+        "projectId": "8161943",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KHANAMUKH PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30027681",
+      "name": "No. 2 Miri Pathar PWSS",
+      "description": "No. 2 Miri Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Miri Pathar PWSS",
+        "localName": "No. 2 Miri Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38340",
+        "villageName": "No.2 Miri Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30027681",
+        "ddrName": "No. 2 Miri Pathar PWSS",
+        "projectId": "30027681",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Miri Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216401",
+      "name": "No. 2 Miri pathar (Rajgarh) PWSS",
+      "description": "No. 2 Miri pathar (Rajgarh) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Miri pathar (Rajgarh) PWSS",
+        "localName": "No. 2 Miri pathar (Rajgarh) PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38340",
+        "villageName": "No.2 Miri Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216401",
+        "ddrName": "No. 2 Miri pathar (Rajgarh) PWSS",
+        "projectId": "30216401",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Miri pathar (Rajgarh) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017080",
+      "name": "Rangajan PWSS",
+      "description": "Rangajan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rangajan PWSS",
+        "localName": "Rangajan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23091",
+        "panchayatname": "Rangajan",
+        "villageCode": "38347",
+        "villageName": "Rangajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017080",
+        "ddrName": "Rangajan PWSS",
+        "projectId": "30017080",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rangajan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037943",
+      "name": "Barghat PWSS",
+      "description": "Barghat PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barghat PWSS",
+        "localName": "Barghat PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "647444",
+        "villageName": "Barghat",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037943",
+        "ddrName": "Barghat PWSS",
+        "projectId": "30037943",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barghat PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169525",
+      "name": "Bihia Gaon PWSS",
+      "description": "Bihia Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bihia Gaon PWSS",
+        "localName": "Bihia Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "38352",
+        "villageName": "Bihia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169525",
+        "ddrName": "Bihia Gaon PWSS",
+        "projectId": "30169525",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bihia Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5548175",
+      "name": "SAMDHARA PWSS",
+      "description": "SAMDHARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAMDHARA PWSS",
+        "localName": "SAMDHARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "38351",
+        "villageName": "Cham Dhara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5548175",
+        "ddrName": "SAMDHARA PWSS",
+        "projectId": "5548175",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAMDHARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200365",
+      "name": "Retrofitting of Chamdhara PWSS",
+      "description": "Retrofitting of Chamdhara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Chamdhara PWSS",
+        "localName": "Retrofitting of Chamdhara PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "38351",
+        "villageName": "Cham Dhara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200365",
+        "ddrName": "Retrofitting of Chamdhara PWSS",
+        "projectId": "30200365",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Chamdhara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153723",
+      "name": "RETROFITTING OF DIKORAIJAN PWSS",
+      "description": "RETROFITTING OF DIKORAIJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DIKORAIJAN PWSS",
+        "localName": "RETROFITTING OF DIKORAIJAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "38349",
+        "villageName": "Dikrai Jan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153723",
+        "ddrName": "RETROFITTING OF DIKORAIJAN PWSS",
+        "projectId": "8153723",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DIKORAIJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5557007",
+      "name": "DIKORAIJAN PWSS",
+      "description": "DIKORAIJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIKORAIJAN PWSS",
+        "localName": "DIKORAIJAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "38349",
+        "villageName": "Dikrai Jan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5557007",
+        "ddrName": "DIKORAIJAN PWSS",
+        "projectId": "5557007",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIKORAIJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037951",
+      "name": "Korokani PWSS",
+      "description": "Korokani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Korokani PWSS",
+        "localName": "Korokani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23092",
+        "panchayatname": "Samdhara",
+        "villageCode": "38350",
+        "villageName": "Korokani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037951",
+        "ddrName": "Korokani PWSS",
+        "projectId": "30037951",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Korokani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011866",
+      "name": "New Akabasti Miri PWSS",
+      "description": "New Akabasti Miri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Akabasti Miri PWSS",
+        "localName": "New Akabasti Miri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647608",
+        "villageName": "Akabasti Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011866",
+        "ddrName": "New Akabasti Miri PWSS",
+        "projectId": "30011866",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Akabasti Miri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054045",
+      "name": "Bali Gaon Miri PWSS",
+      "description": "Bali Gaon Miri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bali Gaon Miri PWSS",
+        "localName": "Bali Gaon Miri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38410",
+        "villageName": "Bali Gaon Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054045",
+        "ddrName": "Bali Gaon Miri PWSS",
+        "projectId": "30054045",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bali Gaon Miri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161882",
+      "name": "RETROFITTING OF SILONI PWSS",
+      "description": "RETROFITTING OF SILONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SILONI PWSS",
+        "localName": "RETROFITTING OF SILONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38410",
+        "villageName": "Bali Gaon Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161882",
+        "ddrName": "RETROFITTING OF SILONI PWSS",
+        "projectId": "8161882",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SILONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004629",
+      "name": " Bharali Chapori No. 2 PWSS",
+      "description": " Bharali Chapori No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": " Bharali Chapori No. 2 PWSS",
+        "localName": " Bharali Chapori No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647448",
+        "villageName": "Bharali Chapari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004629",
+        "ddrName": " Bharali Chapori No. 2 PWSS",
+        "projectId": "30004629",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": " Bharali Chapori No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004770",
+      "name": "New Bharali Chapori PWSS",
+      "description": "New Bharali Chapori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Bharali Chapori PWSS",
+        "localName": "New Bharali Chapori PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "BALIPARA",
+        "panchayatcode": "23099",
+        "panchayatname": "SILONI",
+        "villageCode": "647449",
+        "villageName": "Bharali Chapari No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004770",
+        "ddrName": "New Bharali Chapori PWSS",
+        "projectId": "30004770",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Bharali Chapori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054048",
+      "name": "Boka Gaon Miri PWSS",
+      "description": "Boka Gaon Miri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boka Gaon Miri PWSS",
+        "localName": "Boka Gaon Miri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "586991",
+        "villageName": "Boka Gaon Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054048",
+        "ddrName": "Boka Gaon Miri PWSS",
+        "projectId": "30054048",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boka Gaon Miri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017697",
+      "name": "New Buragaon PWSS",
+      "description": "New Buragaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Buragaon PWSS",
+        "localName": "New Buragaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647603",
+        "villageName": "Bura Gaon No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017697",
+        "ddrName": "New Buragaon PWSS",
+        "projectId": "30017697",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Buragaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178895",
+      "name": "RETROFITTING OF BURAGAON PWSS",
+      "description": "RETROFITTING OF BURAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BURAGAON PWSS",
+        "localName": "RETROFITTING OF BURAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647603",
+        "villageName": "Bura Gaon No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178895",
+        "ddrName": "RETROFITTING OF BURAGAON PWSS",
+        "projectId": "8178895",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BURAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547843",
+      "name": "BURAGAON PWSS",
+      "description": "BURAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BURAGAON PWSS",
+        "localName": "BURAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647603",
+        "villageName": "Bura Gaon No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547843",
+        "ddrName": "BURAGAON PWSS",
+        "projectId": "5547843",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BURAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30081194",
+      "name": "Buragaon No. 2 PWSS",
+      "description": "Buragaon No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Buragaon No. 2 PWSS",
+        "localName": "Buragaon No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647602",
+        "villageName": "Buragaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30081194",
+        "ddrName": "Buragaon No. 2 PWSS",
+        "projectId": "30081194",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Buragaon No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055929",
+      "name": "New Buragaon T.E PWSS",
+      "description": "New Buragaon T.E PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Buragaon T.E PWSS",
+        "localName": "New Buragaon T.E PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38412",
+        "villageName": "Buragaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055929",
+        "ddrName": "New Buragaon T.E PWSS",
+        "projectId": "30055929",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Buragaon T.E PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174291",
+      "name": "New Chillani Bengali PWSS",
+      "description": "New Chillani Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Chillani Bengali PWSS",
+        "localName": "New Chillani Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647606",
+        "villageName": "Chilani Bengali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174291",
+        "ddrName": "New Chillani Bengali PWSS",
+        "projectId": "30174291",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Chillani Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4656202",
+      "name": "Siloni PWSS",
+      "description": "Siloni PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Siloni PWSS",
+        "localName": "Siloni PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647606",
+        "villageName": "Chilani Bengali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4656202",
+        "ddrName": "Siloni PWSS",
+        "projectId": "4656202",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Siloni PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169560",
+      "name": "Chiloni Bengali PWSS",
+      "description": "Chiloni Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chiloni Bengali PWSS",
+        "localName": "Chiloni Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "647606",
+        "villageName": "Chilani Bengali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169560",
+        "ddrName": "Chiloni Bengali PWSS",
+        "projectId": "30169560",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chiloni Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054057",
+      "name": "Chilanigaon PWSS",
+      "description": "Chilanigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chilanigaon PWSS",
+        "localName": "Chilanigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38408",
+        "villageName": "Chilani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054057",
+        "ddrName": "Chilanigaon PWSS",
+        "projectId": "30054057",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chilanigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174244",
+      "name": "Chillani Nepali PWSS",
+      "description": "Chillani Nepali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chillani Nepali PWSS",
+        "localName": "Chillani Nepali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38413",
+        "villageName": "Chilani Nepali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174244",
+        "ddrName": "Chillani Nepali PWSS",
+        "projectId": "30174244",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chillani Nepali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068533",
+      "name": "Dowang Bari Dafala PWSS",
+      "description": "Dowang Bari Dafala PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dowang Bari Dafala PWSS",
+        "localName": "Dowang Bari Dafala PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "586923",
+        "villageName": "Ghoramari Bura Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068533",
+        "ddrName": "Dowang Bari Dafala PWSS",
+        "projectId": "30068533",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dowang Bari Dafala PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185286",
+      "name": "RETROFITTING OF GORMORA BURAGAON PWSS",
+      "description": "RETROFITTING OF GORMORA BURAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GORMORA BURAGAON PWSS",
+        "localName": "RETROFITTING OF GORMORA BURAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "586923",
+        "villageName": "Ghoramari Bura Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185286",
+        "ddrName": "RETROFITTING OF GORMORA BURAGAON PWSS",
+        "projectId": "8185286",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GORMORA BURAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30002704",
+      "name": "Kolabari PWSS",
+      "description": "Kolabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kolabari PWSS",
+        "localName": "Kolabari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38414",
+        "villageName": "Kolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30002704",
+        "ddrName": "Kolabari PWSS",
+        "projectId": "30002704",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kolabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30053173",
+      "name": "No. 1 Miri Pathar PWSS",
+      "description": "No. 1 Miri Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Miri Pathar PWSS",
+        "localName": "No. 1 Miri Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23099",
+        "panchayatname": "Siloni",
+        "villageCode": "38417",
+        "villageName": "No.1 Miri Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30053173",
+        "ddrName": "No. 1 Miri Pathar PWSS",
+        "projectId": "30053173",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Miri Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206824",
+      "name": "RETROFITTING OF BERAJAN PWSS",
+      "description": "RETROFITTING OF BERAJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BERAJAN PWSS",
+        "localName": "RETROFITTING OF BERAJAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "586604",
+        "villageName": "Berajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206824",
+        "ddrName": "RETROFITTING OF BERAJAN PWSS",
+        "projectId": "8206824",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BERAJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077189",
+      "name": "Khaliha Mari PWSS",
+      "description": "Khaliha Mari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khaliha Mari PWSS",
+        "localName": "Khaliha Mari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "38365",
+        "villageName": "Khaliha Mari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077189",
+        "ddrName": "Khaliha Mari PWSS",
+        "projectId": "30077189",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khaliha Mari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037960",
+      "name": "Pung Pani Bangali PWSS",
+      "description": "Pung Pani Bangali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pung Pani Bangali PWSS",
+        "localName": "Pung Pani Bangali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "38368",
+        "villageName": "Pung Pani Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037960",
+        "ddrName": "Pung Pani Bangali PWSS",
+        "projectId": "30037960",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pung Pani Bangali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071758",
+      "name": "Rajgor PWSS",
+      "description": "Rajgor PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rajgor PWSS",
+        "localName": "Rajgor PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "38362",
+        "villageName": "Rajgor",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071758",
+        "ddrName": "Rajgor PWSS",
+        "projectId": "30071758",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rajgor PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056490",
+      "name": " Rajgorh Gaon PWSS",
+      "description": " Rajgorh Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": " Rajgorh Gaon PWSS",
+        "localName": " Rajgorh Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "647825",
+        "villageName": "Rajgorh Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056490",
+        "ddrName": " Rajgorh Gaon PWSS",
+        "projectId": "30056490",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": " Rajgorh Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153823",
+      "name": "RETROFITTING OF SINGRITOLI PWSS",
+      "description": "RETROFITTING OF SINGRITOLI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SINGRITOLI PWSS",
+        "localName": "RETROFITTING OF SINGRITOLI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "38366",
+        "villageName": "Singitali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153823",
+        "ddrName": "RETROFITTING OF SINGRITOLI PWSS",
+        "projectId": "8153823",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SINGRITOLI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5548215",
+      "name": "SINGRITOLI PWSS",
+      "description": "SINGRITOLI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRITOLI PWSS",
+        "localName": "SINGRITOLI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "38366",
+        "villageName": "Singitali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5548215",
+        "ddrName": "SINGRITOLI PWSS",
+        "projectId": "5548215",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRITOLI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30052787",
+      "name": "Tinikhari Miri Gaon PWSS",
+      "description": "Tinikhari Miri Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tinikhari Miri Gaon PWSS",
+        "localName": "Tinikhari Miri Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23094",
+        "panchayatname": "Singitoli",
+        "villageCode": "38364",
+        "villageName": "Tinikhari Miri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30052787",
+        "ddrName": "Tinikhari Miri Gaon PWSS",
+        "projectId": "30052787",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tinikhari Miri Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1858924",
+      "name": "Eragaon PWSS",
+      "description": "Eragaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Eragaon PWSS",
+        "localName": "Eragaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38387",
+        "villageName": "Ara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1858924",
+        "ddrName": "Eragaon PWSS",
+        "projectId": "1858924",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Eragaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161985",
+      "name": "RETROFITTING OF ERAGAON PWSS",
+      "description": "RETROFITTING OF ERAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ERAGAON PWSS",
+        "localName": "RETROFITTING OF ERAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38387",
+        "villageName": "Ara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161985",
+        "ddrName": "RETROFITTING OF ERAGAON PWSS",
+        "projectId": "8161985",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ERAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076178",
+      "name": "New Aragaon PWSS",
+      "description": "New Aragaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Aragaon PWSS",
+        "localName": "New Aragaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38387",
+        "villageName": "Ara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076178",
+        "ddrName": "New Aragaon PWSS",
+        "projectId": "30076178",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Aragaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5464278",
+      "name": "RETROFITTING OF UDMARI BALIGAON PWSS",
+      "description": "RETROFITTING OF UDMARI BALIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF UDMARI BALIGAON PWSS",
+        "localName": "RETROFITTING OF UDMARI BALIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38387",
+        "villageName": "Ara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5464278",
+        "ddrName": "RETROFITTING OF UDMARI BALIGAON PWSS",
+        "projectId": "5464278",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF UDMARI BALIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169516",
+      "name": "Bhobolagaon PWSS",
+      "description": "Bhobolagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhobolagaon PWSS",
+        "localName": "Bhobolagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38395",
+        "villageName": "Bhobola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169516",
+        "ddrName": "Bhobolagaon PWSS",
+        "projectId": "30169516",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhobolagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063149",
+      "name": "Bhobolagaon Bangali PWSS",
+      "description": "Bhobolagaon Bangali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhobolagaon Bangali PWSS",
+        "localName": "Bhobolagaon Bangali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "647392",
+        "villageName": "Bhobola Gaon Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063149",
+        "ddrName": "Bhobolagaon Bangali PWSS",
+        "projectId": "30063149",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhobolagaon Bangali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178783",
+      "name": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+      "description": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+        "localName": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38392",
+        "villageName": "Dhekeri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178783",
+        "ddrName": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+        "projectId": "8178783",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213638",
+      "name": "New Dighaligaon MPWS",
+      "description": "New Dighaligaon MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Dighaligaon MPWS",
+        "localName": "New Dighaligaon MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38388",
+        "villageName": "Dighali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213638",
+        "ddrName": "New Dighaligaon MPWS",
+        "projectId": "30213638",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Dighaligaon MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174064",
+      "name": "Dighali Balijan MPWSS",
+      "description": "Dighali Balijan MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dighali Balijan MPWSS",
+        "localName": "Dighali Balijan MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38388",
+        "villageName": "Dighali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174064",
+        "ddrName": "Dighali Balijan MPWSS",
+        "projectId": "30174064",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dighali Balijan MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174210",
+      "name": "Dighaligaon East PWSS",
+      "description": "Dighaligaon East PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dighaligaon East PWSS",
+        "localName": "Dighaligaon East PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38388",
+        "villageName": "Dighali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174210",
+        "ddrName": "Dighaligaon East PWSS",
+        "projectId": "30174210",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dighaligaon East PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185789",
+      "name": "RETROFITTING OF DIGHALIGAON PWSS",
+      "description": "RETROFITTING OF DIGHALIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DIGHALIGAON PWSS",
+        "localName": "RETROFITTING OF DIGHALIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38388",
+        "villageName": "Dighali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185789",
+        "ddrName": "RETROFITTING OF DIGHALIGAON PWSS",
+        "projectId": "8185789",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DIGHALIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30052737",
+      "name": "Molan Gaon Kachari PWSS",
+      "description": "Molan Gaon Kachari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Molan Gaon Kachari PWSS",
+        "localName": "Molan Gaon Kachari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38396",
+        "villageName": "Molan Gaon Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30052737",
+        "ddrName": "Molan Gaon Kachari PWSS",
+        "projectId": "30052737",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Molan Gaon Kachari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174082",
+      "name": "OUHOLA GAON B MPWSS",
+      "description": "OUHOLA GAON B MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "OUHOLA GAON B MPWSS",
+        "localName": "OUHOLA GAON B MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38386",
+        "villageName": "Ouhola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174082",
+        "ddrName": "OUHOLA GAON B MPWSS",
+        "projectId": "30174082",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "OUHOLA GAON B MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216505",
+      "name": "Ouhola Gaon PWSS",
+      "description": "Ouhola Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ouhola Gaon PWSS",
+        "localName": "Ouhola Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38386",
+        "villageName": "Ouhola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216505",
+        "ddrName": "Ouhola Gaon PWSS",
+        "projectId": "30216505",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ouhola Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010291",
+      "name": "New Udmari PWSS",
+      "description": "New Udmari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Udmari PWSS",
+        "localName": "New Udmari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38389",
+        "villageName": "Udmari Gaon (1)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010291",
+        "ddrName": "New Udmari PWSS",
+        "projectId": "30010291",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Udmari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5523260",
+      "name": "UDMARI PWSS",
+      "description": "UDMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UDMARI PWSS",
+        "localName": "UDMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38389",
+        "villageName": "Udmari Gaon (1)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5523260",
+        "ddrName": "UDMARI PWSS",
+        "projectId": "5523260",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UDMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8181875",
+      "name": "RETROFITTING OF UDMARI PWSS",
+      "description": "RETROFITTING OF UDMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF UDMARI PWSS",
+        "localName": "RETROFITTING OF UDMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38389",
+        "villageName": "Udmari Gaon (1)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8181875",
+        "ddrName": "RETROFITTING OF UDMARI PWSS",
+        "projectId": "8181875",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF UDMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185354",
+      "name": "RETROFITTING OF BHAKATGAON PWSS",
+      "description": "RETROFITTING OF BHAKATGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHAKATGAON PWSS",
+        "localName": "RETROFITTING OF BHAKATGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1246",
+        "blockname": "Balipara",
+        "panchayatcode": "23097",
+        "panchayatname": "Udmari",
+        "villageCode": "38390",
+        "villageName": "Udmari Gaon (2)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185354",
+        "ddrName": "RETROFITTING OF BHAKATGAON PWSS",
+        "projectId": "8185354",
+        "regionName": "1246"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHAKATGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153234",
+      "name": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+      "description": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+        "localName": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38306",
+        "villageName": "Bebezia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153234",
+        "ddrName": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+        "projectId": "8153234",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492161",
+      "name": "Bebejia PWSS",
+      "description": "Bebejia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bebejia PWSS",
+        "localName": "Bebejia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38306",
+        "villageName": "Bebezia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492161",
+        "ddrName": "Bebejia PWSS",
+        "projectId": "492161",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bebejia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4653590",
+      "name": "Singia PWSS",
+      "description": "Singia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Singia PWSS",
+        "localName": "Singia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38306",
+        "villageName": "Bebezia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4653590",
+        "ddrName": "Singia PWSS",
+        "projectId": "4653590",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Singia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153230",
+      "name": "RETROFITTING OF SINGIA PWSS",
+      "description": "RETROFITTING OF SINGIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SINGIA PWSS",
+        "localName": "RETROFITTING OF SINGIA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38306",
+        "villageName": "Bebezia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153230",
+        "ddrName": "RETROFITTING OF SINGIA PWSS",
+        "projectId": "8153230",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SINGIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174721",
+      "name": "Da Besseria PWSS",
+      "description": "Da Besseria PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Da Besseria PWSS",
+        "localName": "Da Besseria PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38307",
+        "villageName": "Da-gaon Pukhuria",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174721",
+        "ddrName": "Da Besseria PWSS",
+        "projectId": "30174721",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Da Besseria PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174700",
+      "name": "Baga Bora Chuburi PWSS",
+      "description": "Baga Bora Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baga Bora Chuburi PWSS",
+        "localName": "Baga Bora Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38307",
+        "villageName": "Da-gaon Pukhuria",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174700",
+        "ddrName": "Baga Bora Chuburi PWSS",
+        "projectId": "30174700",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baga Bora Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153248",
+      "name": "RETROFITTING OF KALITA GAON PWSS",
+      "description": "RETROFITTING OF KALITA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KALITA GAON PWSS",
+        "localName": "RETROFITTING OF KALITA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38307",
+        "villageName": "Da-gaon Pukhuria",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153248",
+        "ddrName": "RETROFITTING OF KALITA GAON PWSS",
+        "projectId": "8153248",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KALITA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492155",
+      "name": "Katanatika PWSS",
+      "description": "Katanatika PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Katanatika PWSS",
+        "localName": "Katanatika PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38305",
+        "villageName": "Sopora Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492155",
+        "ddrName": "Katanatika PWSS",
+        "projectId": "492155",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Katanatika PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153287",
+      "name": "RETROFITTING OF KATANATIKA PWSS",
+      "description": "RETROFITTING OF KATANATIKA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KATANATIKA PWSS",
+        "localName": "RETROFITTING OF KATANATIKA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38305",
+        "villageName": "Sopora Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153287",
+        "ddrName": "RETROFITTING OF KATANATIKA PWSS",
+        "projectId": "8153287",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KATANATIKA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174622",
+      "name": "Bam Besseria PWSS",
+      "description": "Bam Besseria PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bam Besseria PWSS",
+        "localName": "Bam Besseria PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38305",
+        "villageName": "Sopora Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174622",
+        "ddrName": "Bam Besseria PWSS",
+        "projectId": "30174622",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bam Besseria PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192570",
+      "name": "RETROFITTING OF SOPORA CHUBURI PWSS",
+      "description": "RETROFITTING OF SOPORA CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOPORA CHUBURI PWSS",
+        "localName": "RETROFITTING OF SOPORA CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38305",
+        "villageName": "Sopora Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192570",
+        "ddrName": "RETROFITTING OF SOPORA CHUBURI PWSS",
+        "projectId": "8192570",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOPORA CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174593",
+      "name": "Bamgaon PWSS",
+      "description": "Bamgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamgaon PWSS",
+        "localName": "Bamgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38305",
+        "villageName": "Sopora Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174593",
+        "ddrName": "Bamgaon PWSS",
+        "projectId": "30174593",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492158",
+      "name": "Sapora Chuburi PWSS",
+      "description": "Sapora Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sapora Chuburi PWSS",
+        "localName": "Sapora Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23087",
+        "panchayatname": "Beseria",
+        "villageCode": "38305",
+        "villageName": "Sopora Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492158",
+        "ddrName": "Sapora Chuburi PWSS",
+        "projectId": "492158",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sapora Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153482",
+      "name": "RETROFITTING OF BATAMARIGAON PWSS",
+      "description": "RETROFITTING OF BATAMARIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BATAMARIGAON PWSS",
+        "localName": "RETROFITTING OF BATAMARIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38280",
+        "villageName": "Batamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153482",
+        "ddrName": "RETROFITTING OF BATAMARIGAON PWSS",
+        "projectId": "8153482",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BATAMARIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842244",
+      "name": "Batamarigaon PWSS",
+      "description": "Batamarigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batamarigaon PWSS",
+        "localName": "Batamarigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38280",
+        "villageName": "Batamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842244",
+        "ddrName": "Batamarigaon PWSS",
+        "projectId": "1842244",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batamarigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174796",
+      "name": "Batamari-B PWSS",
+      "description": "Batamari-B PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batamari-B PWSS",
+        "localName": "Batamari-B PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38280",
+        "villageName": "Batamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174796",
+        "ddrName": "Batamari-B PWSS",
+        "projectId": "30174796",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batamari-B PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067407",
+      "name": "Bhojkhowa Gaon PWSS",
+      "description": "Bhojkhowa Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhojkhowa Gaon PWSS",
+        "localName": "Bhojkhowa Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38281",
+        "villageName": "Bhoj Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067407",
+        "ddrName": "Bhojkhowa Gaon PWSS",
+        "projectId": "30067407",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhojkhowa Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174826",
+      "name": "New Bhojkhowa Chapori PWSS",
+      "description": "New Bhojkhowa Chapori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Bhojkhowa Chapori PWSS",
+        "localName": "New Bhojkhowa Chapori PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38288",
+        "villageName": "Bhojkhowa Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174826",
+        "ddrName": "New Bhojkhowa Chapori PWSS",
+        "projectId": "30174826",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Bhojkhowa Chapori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206811",
+      "name": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+      "description": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+        "localName": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38288",
+        "villageName": "Bhojkhowa Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206811",
+        "ddrName": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+        "projectId": "8206811",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6150005",
+      "name": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+      "description": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+        "localName": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38288",
+        "villageName": "Bhojkhowa Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6150005",
+        "ddrName": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+        "projectId": "6150005",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4658962",
+      "name": "Bhomoraguri PWSS",
+      "description": "Bhomoraguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhomoraguri PWSS",
+        "localName": "Bhomoraguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38285",
+        "villageName": "Bhomoraguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4658962",
+        "ddrName": "Bhomoraguri PWSS",
+        "projectId": "4658962",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhomoraguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185387",
+      "name": "RETROFITTING OF BHOMORAGURI PWSS",
+      "description": "RETROFITTING OF BHOMORAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHOMORAGURI PWSS",
+        "localName": "RETROFITTING OF BHOMORAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38285",
+        "villageName": "Bhomoraguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185387",
+        "ddrName": "RETROFITTING OF BHOMORAGURI PWSS",
+        "projectId": "8185387",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHOMORAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174847",
+      "name": "New Bhomoraguri PWSS",
+      "description": "New Bhomoraguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Bhomoraguri PWSS",
+        "localName": "New Bhomoraguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38285",
+        "villageName": "Bhomoraguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174847",
+        "ddrName": "New Bhomoraguri PWSS",
+        "projectId": "30174847",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Bhomoraguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176170",
+      "name": "Bhomoraguri RF MPWS",
+      "description": "Bhomoraguri RF MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhomoraguri RF MPWS",
+        "localName": "Bhomoraguri RF MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38282",
+        "villageName": "Bhomoraguri R.f.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176170",
+        "ddrName": "Bhomoraguri RF MPWS",
+        "projectId": "30176170",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhomoraguri RF MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6349286",
+      "name": "RETROFITTING OF CHATAI CHAPORI PWSS",
+      "description": "RETROFITTING OF CHATAI CHAPORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHATAI CHAPORI PWSS",
+        "localName": "RETROFITTING OF CHATAI CHAPORI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38287",
+        "villageName": "Chatai Chapari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6349286",
+        "ddrName": "RETROFITTING OF CHATAI CHAPORI PWSS",
+        "projectId": "6349286",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHATAI CHAPORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8266441",
+      "name": "Chatai Chapori F AWC",
+      "description": "Chatai Chapori F AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chatai Chapori F AWC",
+        "localName": "Chatai Chapori F AWC",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38287",
+        "villageName": "Chatai Chapari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8266441",
+        "ddrName": "Chatai Chapori F AWC",
+        "projectId": "8266441",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chatai Chapori F AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6150048",
+      "name": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+      "description": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+        "localName": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38286",
+        "villageName": "Kachari Pam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6150048",
+        "ddrName": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+        "projectId": "6150048",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174854",
+      "name": "Kacharipam PWSS",
+      "description": "Kacharipam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kacharipam PWSS",
+        "localName": "Kacharipam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38286",
+        "villageName": "Kachari Pam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174854",
+        "ddrName": "Kacharipam PWSS",
+        "projectId": "30174854",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kacharipam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192432",
+      "name": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+      "description": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+        "localName": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23084",
+        "panchayatname": "Bhomoraguri",
+        "villageCode": "38286",
+        "villageName": "Kachari Pam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192432",
+        "ddrName": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+        "projectId": "8192432",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214651",
+      "name": "Sutichuk PWSS",
+      "description": "Sutichuk PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sutichuk PWSS",
+        "localName": "Sutichuk PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38295",
+        "villageName": "Bhito Suti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214651",
+        "ddrName": "Sutichuk PWSS",
+        "projectId": "30214651",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sutichuk PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153337",
+      "name": "RETROFITTING OF BHITORSUTI PWSS",
+      "description": "RETROFITTING OF BHITORSUTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHITORSUTI PWSS",
+        "localName": "RETROFITTING OF BHITORSUTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38295",
+        "villageName": "Bhito Suti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153337",
+        "ddrName": "RETROFITTING OF BHITORSUTI PWSS",
+        "projectId": "8153337",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHITORSUTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1845765",
+      "name": "Bhitarsuti PWSS",
+      "description": "Bhitarsuti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhitarsuti PWSS",
+        "localName": "Bhitarsuti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38295",
+        "villageName": "Bhito Suti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1845765",
+        "ddrName": "Bhitarsuti PWSS",
+        "projectId": "1845765",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhitarsuti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169665",
+      "name": "Gandhinagar PWSS",
+      "description": "Gandhinagar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gandhinagar PWSS",
+        "localName": "Gandhinagar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38290",
+        "villageName": "Gutlong Gaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169665",
+        "ddrName": "Gandhinagar PWSS",
+        "projectId": "30169665",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gandhinagar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037954",
+      "name": "Nayabasti PWSS",
+      "description": "Nayabasti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nayabasti PWSS",
+        "localName": "Nayabasti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38290",
+        "villageName": "Gutlong Gaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037954",
+        "ddrName": "Nayabasti PWSS",
+        "projectId": "30037954",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nayabasti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153374",
+      "name": "RETROFITTING OF GOTLONG PWSS",
+      "description": "RETROFITTING OF GOTLONG PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GOTLONG PWSS",
+        "localName": "RETROFITTING OF GOTLONG PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38290",
+        "villageName": "Gutlong Gaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153374",
+        "ddrName": "RETROFITTING OF GOTLONG PWSS",
+        "projectId": "8153374",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GOTLONG PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.452628",
+      "name": "Gotlong PWSS",
+      "description": "Gotlong PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gotlong PWSS",
+        "localName": "Gotlong PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38290",
+        "villageName": "Gutlong Gaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "452628",
+        "ddrName": "Gotlong PWSS",
+        "projectId": "452628",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gotlong PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060718",
+      "name": "Santipara PWSS",
+      "description": "Santipara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Santipara PWSS",
+        "localName": "Santipara PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38290",
+        "villageName": "Gutlong Gaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060718",
+        "ddrName": "Santipara PWSS",
+        "projectId": "30060718",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Santipara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067307",
+      "name": "Jahajdoba PWSS",
+      "description": "Jahajdoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jahajdoba PWSS",
+        "localName": "Jahajdoba PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38291",
+        "villageName": "Jahajduba Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067307",
+        "ddrName": "Jahajdoba PWSS",
+        "projectId": "30067307",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jahajdoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067308",
+      "name": "Khanamukh New PWSS",
+      "description": "Khanamukh New PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khanamukh New PWSS",
+        "localName": "Khanamukh New PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38293",
+        "villageName": "Khanamukh Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067308",
+        "ddrName": "Khanamukh New PWSS",
+        "projectId": "30067308",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khanamukh New PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037950",
+      "name": "Mazartika PWSS",
+      "description": "Mazartika PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mazartika PWSS",
+        "localName": "Mazartika PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38293",
+        "villageName": "Khanamukh Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037950",
+        "ddrName": "Mazartika PWSS",
+        "projectId": "30037950",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mazartika PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153355",
+      "name": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+      "description": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+        "localName": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38292",
+        "villageName": "No.1 Dolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153355",
+        "ddrName": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+        "projectId": "8153355",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1846605",
+      "name": "No1 Dolabari PWSS",
+      "description": "No1 Dolabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No1 Dolabari PWSS",
+        "localName": "No1 Dolabari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38292",
+        "villageName": "No.1 Dolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1846605",
+        "ddrName": "No1 Dolabari PWSS",
+        "projectId": "1846605",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No1 Dolabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153302",
+      "name": "RETROFITTING OF DOLABARI PWSS",
+      "description": "RETROFITTING OF DOLABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DOLABARI PWSS",
+        "localName": "RETROFITTING OF DOLABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38296",
+        "villageName": "No.2 Dolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153302",
+        "ddrName": "RETROFITTING OF DOLABARI PWSS",
+        "projectId": "8153302",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DOLABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547877",
+      "name": "DOLABARI PWSS",
+      "description": "DOLABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DOLABARI PWSS",
+        "localName": "DOLABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38296",
+        "villageName": "No.2 Dolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547877",
+        "ddrName": "DOLABARI PWSS",
+        "projectId": "5547877",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DOLABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059589",
+      "name": "Suraj PWSS",
+      "description": "Suraj PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Suraj PWSS",
+        "localName": "Suraj PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23085",
+        "panchayatname": "Dolabari",
+        "villageCode": "38296",
+        "villageName": "No.2 Dolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059589",
+        "ddrName": "Suraj PWSS",
+        "projectId": "30059589",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Suraj PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408187",
+      "name": "RETROFITTING OF HAZARAPAR PWSS",
+      "description": "RETROFITTING OF HAZARAPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HAZARAPAR PWSS",
+        "localName": "RETROFITTING OF HAZARAPAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "668078",
+        "villageName": "Dekargaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408187",
+        "ddrName": "RETROFITTING OF HAZARAPAR PWSS",
+        "projectId": "5408187",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HAZARAPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178282",
+      "name": "RETROFITTING OF KETEKIBARI PWSS",
+      "description": "RETROFITTING OF KETEKIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KETEKIBARI PWSS",
+        "localName": "RETROFITTING OF KETEKIBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "668078",
+        "villageName": "Dekargaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178282",
+        "ddrName": "RETROFITTING OF KETEKIBARI PWSS",
+        "projectId": "8178282",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KETEKIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192456",
+      "name": "RETROFITTING OF DEORIGAON PWSS",
+      "description": "RETROFITTING OF DEORIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DEORIGAON PWSS",
+        "localName": "RETROFITTING OF DEORIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38258",
+        "villageName": "Kumar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192456",
+        "ddrName": "RETROFITTING OF DEORIGAON PWSS",
+        "projectId": "8192456",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DEORIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492168",
+      "name": "Deorigaon PWSS",
+      "description": "Deorigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Deorigaon PWSS",
+        "localName": "Deorigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38258",
+        "villageName": "Kumar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492168",
+        "ddrName": "Deorigaon PWSS",
+        "projectId": "492168",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Deorigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192622",
+      "name": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+      "description": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+        "localName": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192622",
+        "ddrName": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+        "projectId": "8192622",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192673",
+      "name": "RETROFITTING OF MARABHARALIPAR PWSS",
+      "description": "RETROFITTING OF MARABHARALIPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MARABHARALIPAR PWSS",
+        "localName": "RETROFITTING OF MARABHARALIPAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192673",
+        "ddrName": "RETROFITTING OF MARABHARALIPAR PWSS",
+        "projectId": "8192673",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MARABHARALIPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492165",
+      "name": "Mazgaon PWSS",
+      "description": "Mazgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mazgaon PWSS",
+        "localName": "Mazgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492165",
+        "ddrName": "Mazgaon PWSS",
+        "projectId": "492165",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mazgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1774472",
+      "name": "Marabharalipar PWSS",
+      "description": "Marabharalipar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Marabharalipar PWSS",
+        "localName": "Marabharalipar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1774472",
+        "ddrName": "Marabharalipar PWSS",
+        "projectId": "1774472",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Marabharalipar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1774890",
+      "name": "Marabharalipar PWSS",
+      "description": "Marabharalipar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Marabharalipar PWSS",
+        "localName": "Marabharalipar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1774890",
+        "ddrName": "Marabharalipar PWSS",
+        "projectId": "1774890",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Marabharalipar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206851",
+      "name": "RETROFITTING OF BASANTIPUR PWSS",
+      "description": "RETROFITTING OF BASANTIPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BASANTIPUR PWSS",
+        "localName": "RETROFITTING OF BASANTIPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206851",
+        "ddrName": "RETROFITTING OF BASANTIPUR PWSS",
+        "projectId": "8206851",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BASANTIPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192257",
+      "name": "RETROFITTING OF MAZGAON PWSS",
+      "description": "RETROFITTING OF MAZGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MAZGAON PWSS",
+        "localName": "RETROFITTING OF MAZGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192257",
+        "ddrName": "RETROFITTING OF MAZGAON PWSS",
+        "projectId": "8192257",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MAZGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216319",
+      "name": "Mission Chariali MPWS",
+      "description": "Mission Chariali MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mission Chariali MPWS",
+        "localName": "Mission Chariali MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216319",
+        "ddrName": "Mission Chariali MPWS",
+        "projectId": "30216319",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mission Chariali MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174961",
+      "name": "New Mazgaon PWSS",
+      "description": "New Mazgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Mazgaon PWSS",
+        "localName": "New Mazgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174961",
+        "ddrName": "New Mazgaon PWSS",
+        "projectId": "30174961",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Mazgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5182812",
+      "name": "Mazgaon PWSS(Upgradation)",
+      "description": "Mazgaon PWSS(Upgradation)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mazgaon PWSS(Upgradation)",
+        "localName": "Mazgaon PWSS(Upgradation)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5182812",
+        "ddrName": "Mazgaon PWSS(Upgradation)",
+        "projectId": "5182812",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mazgaon PWSS(Upgradation)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842161",
+      "name": "Usha Nagar-Murha Teteli PWSS",
+      "description": "Usha Nagar-Murha Teteli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Usha Nagar-Murha Teteli PWSS",
+        "localName": "Usha Nagar-Murha Teteli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "villageCode": "38253",
+        "villageName": "Majgaon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842161",
+        "ddrName": "Usha Nagar-Murha Teteli PWSS",
+        "projectId": "1842161",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Usha Nagar-Murha Teteli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038014",
+      "name": "Panchmile MVS",
+      "description": "Panchmile MVS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panchmile MVS",
+        "localName": "Panchmile MVS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38277",
+        "villageName": "Ali Singa Urium Guri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038014",
+        "ddrName": "Panchmile MVS",
+        "projectId": "30038014",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panchmile MVS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1852774",
+      "name": "Panchmile PWSS",
+      "description": "Panchmile PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panchmile PWSS",
+        "localName": "Panchmile PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38277",
+        "villageName": "Ali Singa Urium Guri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1852774",
+        "ddrName": "Panchmile PWSS",
+        "projectId": "1852774",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panchmile PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8250038",
+      "name": "Ali Singa Urium Guri",
+      "description": "Ali Singa Urium Guri",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ali Singa Urium Guri",
+        "localName": "Ali Singa Urium Guri",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38277",
+        "villageName": "Ali Singa Urium Guri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8250038",
+        "ddrName": "Ali Singa Urium Guri",
+        "projectId": "8250038",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ali Singa Urium Guri",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192631",
+      "name": "RETROFITTING OF PURONI ALIMUR PWSS",
+      "description": "RETROFITTING OF PURONI ALIMUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PURONI ALIMUR PWSS",
+        "localName": "RETROFITTING OF PURONI ALIMUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38274",
+        "villageName": "Alisinga Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192631",
+        "ddrName": "RETROFITTING OF PURONI ALIMUR PWSS",
+        "projectId": "8192631",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PURONI ALIMUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068340",
+      "name": "Makua Chapari PWSS",
+      "description": "Makua Chapari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Makua Chapari PWSS",
+        "localName": "Makua Chapari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "586393",
+        "villageName": "No.1 Makua Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068340",
+        "ddrName": "Makua Chapari PWSS",
+        "projectId": "30068340",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Makua Chapari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8246724",
+      "name": "BIHIYA GAON TINI ALI LPS",
+      "description": "BIHIYA GAON TINI ALI LPS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BIHIYA GAON TINI ALI LPS",
+        "localName": "BIHIYA GAON TINI ALI LPS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "586393",
+        "villageName": "No.1 Makua Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8246724",
+        "ddrName": "BIHIYA GAON TINI ALI LPS",
+        "projectId": "8246724",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BIHIYA GAON TINI ALI LPS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.452685",
+      "name": "Purani Alimur PWSS",
+      "description": "Purani Alimur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Purani Alimur PWSS",
+        "localName": "Purani Alimur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38276",
+        "villageName": "Purani Alimur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "452685",
+        "ddrName": "Purani Alimur PWSS",
+        "projectId": "452685",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Purani Alimur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1852987",
+      "name": "Tinimile PWSS",
+      "description": "Tinimile PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tinimile PWSS",
+        "localName": "Tinimile PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38271",
+        "villageName": "Urium Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1852987",
+        "ddrName": "Tinimile PWSS",
+        "projectId": "1852987",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tinimile PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153320",
+      "name": "RETROFITTING OF TINIMILE PWSS",
+      "description": "RETROFITTING OF TINIMILE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF TINIMILE PWSS",
+        "localName": "RETROFITTING OF TINIMILE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38271",
+        "villageName": "Urium Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153320",
+        "ddrName": "RETROFITTING OF TINIMILE PWSS",
+        "projectId": "8153320",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF TINIMILE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153195",
+      "name": "RETROFITTING OF URIAMGURI PWSS",
+      "description": "RETROFITTING OF URIAMGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF URIAMGURI PWSS",
+        "localName": "RETROFITTING OF URIAMGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38271",
+        "villageName": "Urium Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153195",
+        "ddrName": "RETROFITTING OF URIAMGURI PWSS",
+        "projectId": "8153195",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF URIAMGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5547899",
+      "name": "URIUMGURI PWSS",
+      "description": "URIUMGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "URIUMGURI PWSS",
+        "localName": "URIUMGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38271",
+        "villageName": "Urium Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5547899",
+        "ddrName": "URIUMGURI PWSS",
+        "projectId": "5547899",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "URIUMGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8261877",
+      "name": "1 NO URIAMGURI LPS",
+      "description": "1 NO URIAMGURI LPS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "1 NO URIAMGURI LPS",
+        "localName": "1 NO URIAMGURI LPS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23083",
+        "panchayatname": "Panch Mile",
+        "villageCode": "38271",
+        "villageName": "Urium Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8261877",
+        "ddrName": "1 NO URIAMGURI LPS",
+        "projectId": "8261877",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "1 NO URIAMGURI LPS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206789",
+      "name": "RETROFITTING OF DA ATI PWSS",
+      "description": "RETROFITTING OF DA ATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DA ATI PWSS",
+        "localName": "RETROFITTING OF DA ATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38304",
+        "villageName": "Da-ati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206789",
+        "ddrName": "RETROFITTING OF DA ATI PWSS",
+        "projectId": "8206789",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DA ATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174178",
+      "name": "Sonarigaon PWSS",
+      "description": "Sonarigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonarigaon PWSS",
+        "localName": "Sonarigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38304",
+        "villageName": "Da-ati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174178",
+        "ddrName": "Sonarigaon PWSS",
+        "projectId": "30174178",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonarigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5344027",
+      "name": "DA-ATI",
+      "description": "DA-ATI",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DA-ATI",
+        "localName": "DA-ATI",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38304",
+        "villageName": "Da-ati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5344027",
+        "ddrName": "DA-ATI",
+        "projectId": "5344027",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DA-ATI",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8181830",
+      "name": "RETROFITTING OF BAM PARBATIA PWSS",
+      "description": "RETROFITTING OF BAM PARBATIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAM PARBATIA PWSS",
+        "localName": "RETROFITTING OF BAM PARBATIA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8181830",
+        "ddrName": "RETROFITTING OF BAM PARBATIA PWSS",
+        "projectId": "8181830",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAM PARBATIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175053",
+      "name": "New Bam Parbatia PWSS",
+      "description": "New Bam Parbatia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Bam Parbatia PWSS",
+        "localName": "New Bam Parbatia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175053",
+        "ddrName": "New Bam Parbatia PWSS",
+        "projectId": "30175053",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Bam Parbatia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492182",
+      "name": "Bam Parbatia PWSS",
+      "description": "Bam Parbatia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bam Parbatia PWSS",
+        "localName": "Bam Parbatia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492182",
+        "ddrName": "Bam Parbatia PWSS",
+        "projectId": "492182",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bam Parbatia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174143",
+      "name": "NEW DA-ATI PWSS",
+      "description": "NEW DA-ATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NEW DA-ATI PWSS",
+        "localName": "NEW DA-ATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174143",
+        "ddrName": "NEW DA-ATI PWSS",
+        "projectId": "30174143",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NEW DA-ATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158312",
+      "name": "Deuri Chuk PWSS",
+      "description": "Deuri Chuk PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Deuri Chuk PWSS",
+        "localName": "Deuri Chuk PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158312",
+        "ddrName": "Deuri Chuk PWSS",
+        "projectId": "30158312",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Deuri Chuk PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192716",
+      "name": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+      "description": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+        "localName": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192716",
+        "ddrName": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+        "projectId": "8192716",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1774711",
+      "name": "Lachitnagar-Rudrapath PWSS",
+      "description": "Lachitnagar-Rudrapath PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Lachitnagar-Rudrapath PWSS",
+        "localName": "Lachitnagar-Rudrapath PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1774711",
+        "ddrName": "Lachitnagar-Rudrapath PWSS",
+        "projectId": "1774711",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Lachitnagar-Rudrapath PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175021",
+      "name": "Tarajan Kumargaon PWSS",
+      "description": "Tarajan Kumargaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajan Kumargaon PWSS",
+        "localName": "Tarajan Kumargaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23086",
+        "panchayatname": "Parbatia",
+        "villageCode": "38297",
+        "villageName": "Da-parbatia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175021",
+        "ddrName": "Tarajan Kumargaon PWSS",
+        "projectId": "30175021",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajan Kumargaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185212",
+      "name": "RETROFITTING OF JORGARH PWSS",
+      "description": "RETROFITTING OF JORGARH PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JORGARH PWSS",
+        "localName": "RETROFITTING OF JORGARH PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38311",
+        "villageName": "Jorgarh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185212",
+        "ddrName": "RETROFITTING OF JORGARH PWSS",
+        "projectId": "8185212",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JORGARH PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6150033",
+      "name": "JORGARH PWSS (ARP)",
+      "description": "JORGARH PWSS (ARP)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JORGARH PWSS (ARP)",
+        "localName": "JORGARH PWSS (ARP)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38311",
+        "villageName": "Jorgarh",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6150033",
+        "ddrName": "JORGARH PWSS (ARP)",
+        "projectId": "6150033",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JORGARH PWSS (ARP)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185176",
+      "name": "RETROFITTING OF KOROIONI PWSS (SD I)",
+      "description": "RETROFITTING OF KOROIONI PWSS (SD I)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KOROIONI PWSS (SD I)",
+        "localName": "RETROFITTING OF KOROIONI PWSS (SD I)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38315",
+        "villageName": "Karaiani Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185176",
+        "ddrName": "RETROFITTING OF KOROIONI PWSS (SD I)",
+        "projectId": "8185176",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KOROIONI PWSS (SD I)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6149983",
+      "name": "KAROINI PWSS (MNP)",
+      "description": "KAROINI PWSS (MNP)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAROINI PWSS (MNP)",
+        "localName": "KAROINI PWSS (MNP)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38315",
+        "villageName": "Karaiani Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6149983",
+        "ddrName": "KAROINI PWSS (MNP)",
+        "projectId": "6149983",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAROINI PWSS (MNP)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842378",
+      "name": "Islampur PWSS",
+      "description": "Islampur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Islampur PWSS",
+        "localName": "Islampur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38313",
+        "villageName": "Karaiani Nepali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842378",
+        "ddrName": "Islampur PWSS",
+        "projectId": "1842378",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Islampur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30199580",
+      "name": "No. 1 Siruani MPWS",
+      "description": "No. 1 Siruani MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Siruani MPWS",
+        "localName": "No. 1 Siruani MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38312",
+        "villageName": "No.1 Siruani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30199580",
+        "ddrName": "No. 1 Siruani MPWS",
+        "projectId": "30199580",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Siruani MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181621",
+      "name": "No. 4 Siruani PWSS",
+      "description": "No. 4 Siruani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 4 Siruani PWSS",
+        "localName": "No. 4 Siruani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23088",
+        "panchayatname": "Rajgarh",
+        "villageCode": "38314",
+        "villageName": "No.4 Siruani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181621",
+        "ddrName": "No. 4 Siruani PWSS",
+        "projectId": "30181621",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 4 Siruani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842301",
+      "name": "Balichapari PWSS",
+      "description": "Balichapari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balichapari PWSS",
+        "localName": "Balichapari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38265",
+        "villageName": "Bali Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842301",
+        "ddrName": "Balichapari PWSS",
+        "projectId": "1842301",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balichapari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153241",
+      "name": "RETROFITTING OF BURACHAPORI PWSS",
+      "description": "RETROFITTING OF BURACHAPORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BURACHAPORI PWSS",
+        "localName": "RETROFITTING OF BURACHAPORI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38265",
+        "villageName": "Bali Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153241",
+        "ddrName": "RETROFITTING OF BURACHAPORI PWSS",
+        "projectId": "8153241",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BURACHAPORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174870",
+      "name": "New Balichapori PWSS",
+      "description": "New Balichapori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Balichapori PWSS",
+        "localName": "New Balichapori PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38265",
+        "villageName": "Bali Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174870",
+        "ddrName": "New Balichapori PWSS",
+        "projectId": "30174870",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Balichapori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153399",
+      "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
+      "description": "RETROFITTING OF BARIKA CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
+        "localName": "RETROFITTING OF BARIKA CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153399",
+        "ddrName": "RETROFITTING OF BARIKA CHUBURI PWSS",
+        "projectId": "8153399",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BARIKA CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174732",
+      "name": "Bamungaon PWSS",
+      "description": "Bamungaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamungaon PWSS",
+        "localName": "Bamungaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174732",
+        "ddrName": "Bamungaon PWSS",
+        "projectId": "30174732",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamungaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.492177",
+      "name": "Barika Chuburi PWSS",
+      "description": "Barika Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barika Chuburi PWSS",
+        "localName": "Barika Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "492177",
+        "ddrName": "Barika Chuburi PWSS",
+        "projectId": "492177",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barika Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174344",
+      "name": "Darikial Gaon PWSS",
+      "description": "Darikial Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Darikial Gaon PWSS",
+        "localName": "Darikial Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174344",
+        "ddrName": "Darikial Gaon PWSS",
+        "projectId": "30174344",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Darikial Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153228",
+      "name": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+      "description": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+        "localName": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153228",
+        "ddrName": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+        "projectId": "8153228",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1775011",
+      "name": "Rubber Bagan-Indira Nagar PWSS",
+      "description": "Rubber Bagan-Indira Nagar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rubber Bagan-Indira Nagar PWSS",
+        "localName": "Rubber Bagan-Indira Nagar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1775011",
+        "ddrName": "Rubber Bagan-Indira Nagar PWSS",
+        "projectId": "1775011",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rubber Bagan-Indira Nagar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181144",
+      "name": "Muslim Gaon PWSS",
+      "description": "Muslim Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Muslim Gaon PWSS",
+        "localName": "Muslim Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38262",
+        "villageName": "Barika Chuburi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181144",
+        "ddrName": "Muslim Gaon PWSS",
+        "projectId": "30181144",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Muslim Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8184281",
+      "name": "RETROFITTING OF NEW KALIBARI PWSS",
+      "description": "RETROFITTING OF NEW KALIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NEW KALIBARI PWSS",
+        "localName": "RETROFITTING OF NEW KALIBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38260",
+        "villageName": "Kali Bari Rajah Chahar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8184281",
+        "ddrName": "RETROFITTING OF NEW KALIBARI PWSS",
+        "projectId": "8184281",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NEW KALIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201910",
+      "name": "Upper Gereki MPWS",
+      "description": "Upper Gereki MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upper Gereki MPWS",
+        "localName": "Upper Gereki MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38260",
+        "villageName": "Kali Bari Rajah Chahar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201910",
+        "ddrName": "Upper Gereki MPWS",
+        "projectId": "30201910",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upper Gereki MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037947",
+      "name": "Kolibari PWSS",
+      "description": "Kolibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kolibari PWSS",
+        "localName": "Kolibari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "villageCode": "38260",
+        "villageName": "Kali Bari Rajah Chahar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037947",
+        "ddrName": "Kolibari PWSS",
+        "projectId": "30037947",
+        "regionName": "1245"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kolibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1843358",
+      "name": "Batiamari PWSS",
+      "description": "Batiamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batiamari PWSS",
+        "localName": "Batiamari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38601",
+        "villageName": "BATIAMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1843358",
+        "ddrName": "Batiamari PWSS",
+        "projectId": "1843358",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batiamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187585",
+      "name": "RETROFITTING OF BATIAMARI PWSS",
+      "description": "RETROFITTING OF BATIAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BATIAMARI PWSS",
+        "localName": "RETROFITTING OF BATIAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38601",
+        "villageName": "BATIAMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187585",
+        "ddrName": "RETROFITTING OF BATIAMARI PWSS",
+        "projectId": "8187585",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BATIAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175493",
+      "name": "BATIAMARI BHAIRABI PWSS",
+      "description": "BATIAMARI BHAIRABI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BATIAMARI BHAIRABI PWSS",
+        "localName": "BATIAMARI BHAIRABI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38601",
+        "villageName": "BATIAMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175493",
+        "ddrName": "BATIAMARI BHAIRABI PWSS",
+        "projectId": "30175493",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BATIAMARI BHAIRABI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30130411",
+      "name": "Chaki Ghat PWSS",
+      "description": "Chaki Ghat PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chaki Ghat PWSS",
+        "localName": "Chaki Ghat PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "647382",
+        "villageName": "CHAKI GHAT",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30130411",
+        "ddrName": "Chaki Ghat PWSS",
+        "projectId": "30130411",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chaki Ghat PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8157595",
+      "name": "RETROFITTING OF CHITOLMARI PWSS",
+      "description": "RETROFITTING OF CHITOLMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHITOLMARI PWSS",
+        "localName": "RETROFITTING OF CHITOLMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "586856",
+        "villageName": "CHITAL MARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8157595",
+        "ddrName": "RETROFITTING OF CHITOLMARI PWSS",
+        "projectId": "8157595",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHITOLMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3370880",
+      "name": "Chitolmari PWSS",
+      "description": "Chitolmari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chitolmari PWSS",
+        "localName": "Chitolmari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "586856",
+        "villageName": "CHITAL MARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3370880",
+        "ddrName": "Chitolmari PWSS",
+        "projectId": "3370880",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chitolmari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408316",
+      "name": "RETROFITTING OF ARABARI PWSS",
+      "description": "RETROFITTING OF ARABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ARABARI PWSS",
+        "localName": "RETROFITTING OF ARABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38606",
+        "villageName": "GOAL GAON",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408316",
+        "ddrName": "RETROFITTING OF ARABARI PWSS",
+        "projectId": "5408316",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ARABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174085",
+      "name": "KUAMARA PWSS",
+      "description": "KUAMARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUAMARA PWSS",
+        "localName": "KUAMARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38606",
+        "villageName": "GOAL GAON",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174085",
+        "ddrName": "KUAMARA PWSS",
+        "projectId": "30174085",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUAMARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30030458",
+      "name": "Goal Gaon PWSS",
+      "description": "Goal Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Goal Gaon PWSS",
+        "localName": "Goal Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38604",
+        "villageName": "HATBOR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30030458",
+        "ddrName": "Goal Gaon PWSS",
+        "projectId": "30030458",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Goal Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30130399",
+      "name": "Hatbor PWSS",
+      "description": "Hatbor PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatbor PWSS",
+        "localName": "Hatbor PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38604",
+        "villageName": "HATBOR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30130399",
+        "ddrName": "Hatbor PWSS",
+        "projectId": "30130399",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatbor PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30130381",
+      "name": "Hokoma PWSS",
+      "description": "Hokoma PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hokoma PWSS",
+        "localName": "Hokoma PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38594",
+        "villageName": "HOKOMA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30130381",
+        "ddrName": "Hokoma PWSS",
+        "projectId": "30130381",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hokoma PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30130374",
+      "name": "Thuletika PWSS",
+      "description": "Thuletika PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thuletika PWSS",
+        "localName": "Thuletika PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38599",
+        "villageName": "KHALIHAMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30130374",
+        "ddrName": "Thuletika PWSS",
+        "projectId": "30130374",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thuletika PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1843088",
+      "name": "Khalihamari PWSS",
+      "description": "Khalihamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khalihamari PWSS",
+        "localName": "Khalihamari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38599",
+        "villageName": "KHALIHAMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1843088",
+        "ddrName": "Khalihamari PWSS",
+        "projectId": "1843088",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khalihamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153219",
+      "name": "RETROFITTING OF KHALIHAMARI PWSS",
+      "description": "RETROFITTING OF KHALIHAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KHALIHAMARI PWSS",
+        "localName": "RETROFITTING OF KHALIHAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38599",
+        "villageName": "KHALIHAMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153219",
+        "ddrName": "RETROFITTING OF KHALIHAMARI PWSS",
+        "projectId": "8153219",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KHALIHAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214502",
+      "name": "Lal Tapu PWSS",
+      "description": "Lal Tapu PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Lal Tapu PWSS",
+        "localName": "Lal Tapu PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "586780",
+        "villageName": "LAL TAPU",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214502",
+        "ddrName": "Lal Tapu PWSS",
+        "projectId": "30214502",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Lal Tapu PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016458",
+      "name": "Panpur PWSS",
+      "description": "Panpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panpur PWSS",
+        "localName": "Panpur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38595",
+        "villageName": "No.4 PANPUR GHAT",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016458",
+        "ddrName": "Panpur PWSS",
+        "projectId": "30016458",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213581",
+      "name": "Chutium PWSS",
+      "description": "Chutium PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chutium PWSS",
+        "localName": "Chutium PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23116",
+        "panchayatname": "DAKHIN CHILABANDHA",
+        "villageCode": "38602",
+        "villageName": "SOTIAM",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213581",
+        "ddrName": "Chutium PWSS",
+        "projectId": "30213581",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chutium PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148193",
+      "name": "RETROFITTING OF BORMOTA PWSS",
+      "description": "RETROFITTING OF BORMOTA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORMOTA PWSS",
+        "localName": "RETROFITTING OF BORMOTA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38488",
+        "villageName": "Bormota",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148193",
+        "ddrName": "RETROFITTING OF BORMOTA PWSS",
+        "projectId": "8148193",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORMOTA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010156",
+      "name": "Bormota A PWSS",
+      "description": "Bormota A PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bormota A PWSS",
+        "localName": "Bormota A PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38488",
+        "villageName": "Bormota",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010156",
+        "ddrName": "Bormota A PWSS",
+        "projectId": "30010156",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bormota A PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3321276",
+      "name": "Bormota PWSS",
+      "description": "Bormota PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bormota PWSS",
+        "localName": "Bormota PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38488",
+        "villageName": "Bormota",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3321276",
+        "ddrName": "Bormota PWSS",
+        "projectId": "3321276",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bormota PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175239",
+      "name": "Dharmapur PWSS",
+      "description": "Dharmapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dharmapur PWSS",
+        "localName": "Dharmapur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38491",
+        "villageName": "Dhalai Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175239",
+        "ddrName": "Dharmapur PWSS",
+        "projectId": "30175239",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dharmapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148198",
+      "name": "RETROFITTING OF DHOLAIBIL PWSS",
+      "description": "RETROFITTING OF DHOLAIBIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHOLAIBIL PWSS",
+        "localName": "RETROFITTING OF DHOLAIBIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38491",
+        "villageName": "Dhalai Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148198",
+        "ddrName": "RETROFITTING OF DHOLAIBIL PWSS",
+        "projectId": "8148198",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHOLAIBIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3164535",
+      "name": "Dholaibil PWss",
+      "description": "Dholaibil PWss",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dholaibil PWss",
+        "localName": "Dholaibil PWss",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38491",
+        "villageName": "Dhalai Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3164535",
+        "ddrName": "Dholaibil PWss",
+        "projectId": "3164535",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dholaibil PWss",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202311",
+      "name": "Banga Basti PWSS",
+      "description": "Banga Basti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Banga Basti PWSS",
+        "localName": "Banga Basti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38492",
+        "villageName": "Na-bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202311",
+        "ddrName": "Banga Basti PWSS",
+        "projectId": "30202311",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Banga Basti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30027151",
+      "name": "Nabil Boro Chuburi PWSS",
+      "description": "Nabil Boro Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nabil Boro Chuburi PWSS",
+        "localName": "Nabil Boro Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38492",
+        "villageName": "Na-bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30027151",
+        "ddrName": "Nabil Boro Chuburi PWSS",
+        "projectId": "30027151",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nabil Boro Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153209",
+      "name": "RETROFITTING OF TOUBHANGA PWSS",
+      "description": "RETROFITTING OF TOUBHANGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF TOUBHANGA PWSS",
+        "localName": "RETROFITTING OF TOUBHANGA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38492",
+        "villageName": "Na-bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153209",
+        "ddrName": "RETROFITTING OF TOUBHANGA PWSS",
+        "projectId": "8153209",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF TOUBHANGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1843430",
+      "name": "Toubhanga PWSS",
+      "description": "Toubhanga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Toubhanga PWSS",
+        "localName": "Toubhanga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38492",
+        "villageName": "Na-bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1843430",
+        "ddrName": "Toubhanga PWSS",
+        "projectId": "1843430",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Toubhanga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004828",
+      "name": "No. 1 Barpathar PWSS",
+      "description": "No. 1 Barpathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Barpathar PWSS",
+        "localName": "No. 1 Barpathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38484",
+        "villageName": "No.1 Barpathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004828",
+        "ddrName": "No. 1 Barpathar PWSS",
+        "projectId": "30004828",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Barpathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010223",
+      "name": "No. 2 Barpathar PWSS",
+      "description": "No. 2 Barpathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Barpathar PWSS",
+        "localName": "No. 2 Barpathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38490",
+        "villageName": "No.2 Barpathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010223",
+        "ddrName": "No. 2 Barpathar PWSS",
+        "projectId": "30010223",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Barpathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216449",
+      "name": "Pachim Towbhanga PWSS",
+      "description": "Pachim Towbhanga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pachim Towbhanga PWSS",
+        "localName": "Pachim Towbhanga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38485",
+        "villageName": "Tou Bhanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216449",
+        "ddrName": "Pachim Towbhanga PWSS",
+        "projectId": "30216449",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pachim Towbhanga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30186206",
+      "name": "Tou Bhanga Missing PWSS",
+      "description": "Tou Bhanga Missing PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tou Bhanga Missing PWSS",
+        "localName": "Tou Bhanga Missing PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38485",
+        "villageName": "Tou Bhanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30186206",
+        "ddrName": "Tou Bhanga Missing PWSS",
+        "projectId": "30186206",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tou Bhanga Missing PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216378",
+      "name": "New Tupia PWSS",
+      "description": "New Tupia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Tupia PWSS",
+        "localName": "New Tupia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38486",
+        "villageName": "Tupia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216378",
+        "ddrName": "New Tupia PWSS",
+        "projectId": "30216378",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Tupia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30130420",
+      "name": "Tupia Gaon West PWSS",
+      "description": "Tupia Gaon West PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tupia Gaon West PWSS",
+        "localName": "Tupia Gaon West PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38486",
+        "villageName": "Tupia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30130420",
+        "ddrName": "Tupia Gaon West PWSS",
+        "projectId": "30130420",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tupia Gaon West PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192615",
+      "name": "RETROFITTING OF TUPIA PWSS",
+      "description": "RETROFITTING OF TUPIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF TUPIA PWSS",
+        "localName": "RETROFITTING OF TUPIA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38486",
+        "villageName": "Tupia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192615",
+        "ddrName": "RETROFITTING OF TUPIA PWSS",
+        "projectId": "8192615",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF TUPIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30130435",
+      "name": "Batguri PWSS",
+      "description": "Batguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batguri PWSS",
+        "localName": "Batguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38489",
+        "villageName": "Tupia Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30130435",
+        "ddrName": "Batguri PWSS",
+        "projectId": "30130435",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016472",
+      "name": "Tupia Grant PWSS",
+      "description": "Tupia Grant PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tupia Grant PWSS",
+        "localName": "Tupia Grant PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23107",
+        "panchayatname": "Dakhin Murhadol",
+        "villageCode": "38489",
+        "villageName": "Tupia Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016472",
+        "ddrName": "Tupia Grant PWSS",
+        "projectId": "30016472",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tupia Grant PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010193",
+      "name": "Gerelua Chuk PWSS",
+      "description": "Gerelua Chuk PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gerelua Chuk PWSS",
+        "localName": "Gerelua Chuk PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38552",
+        "villageName": "Garikuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010193",
+        "ddrName": "Gerelua Chuk PWSS",
+        "projectId": "30010193",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gerelua Chuk PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5349656",
+      "name": "Nandikeswar PWSS",
+      "description": "Nandikeswar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nandikeswar PWSS",
+        "localName": "Nandikeswar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38552",
+        "villageName": "Garikuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5349656",
+        "ddrName": "Nandikeswar PWSS",
+        "projectId": "5349656",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nandikeswar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5349682",
+      "name": "Majorchuk PWSS",
+      "description": "Majorchuk PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Majorchuk PWSS",
+        "localName": "Majorchuk PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "586454",
+        "villageName": "MAJOR CHUK",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5349682",
+        "ddrName": "Majorchuk PWSS",
+        "projectId": "5349682",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Majorchuk PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161782",
+      "name": "RETROFITTING OF MAJORCHUK PWSS",
+      "description": "RETROFITTING OF MAJORCHUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MAJORCHUK PWSS",
+        "localName": "RETROFITTING OF MAJORCHUK PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "586454",
+        "villageName": "MAJOR CHUK",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161782",
+        "ddrName": "RETROFITTING OF MAJORCHUK PWSS",
+        "projectId": "8161782",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MAJORCHUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4638859",
+      "name": "RETROFITTING OF KAMARCHUK PWSS",
+      "description": "RETROFITTING OF KAMARCHUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KAMARCHUK PWSS",
+        "localName": "RETROFITTING OF KAMARCHUK PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "586454",
+        "villageName": "MAJOR CHUK",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4638859",
+        "ddrName": "RETROFITTING OF KAMARCHUK PWSS",
+        "projectId": "4638859",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KAMARCHUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161998",
+      "name": "RETROFITTING OF NANDIKESWAR PWSS",
+      "description": "RETROFITTING OF NANDIKESWAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NANDIKESWAR PWSS",
+        "localName": "RETROFITTING OF NANDIKESWAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38555",
+        "villageName": "Nandikeswar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161998",
+        "ddrName": "RETROFITTING OF NANDIKESWAR PWSS",
+        "projectId": "8161998",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NANDIKESWAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30030309",
+      "name": "Bharali Chapori PWSS",
+      "description": "Bharali Chapori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bharali Chapori PWSS",
+        "localName": "Bharali Chapori PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38551",
+        "villageName": "Niz-Chilabandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30030309",
+        "ddrName": "Bharali Chapori PWSS",
+        "projectId": "30030309",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bharali Chapori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6526646",
+      "name": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+      "description": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+        "localName": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38551",
+        "villageName": "Niz-Chilabandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6526646",
+        "ddrName": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+        "projectId": "6526646",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016452",
+      "name": "Gataimara No 1 PWSS",
+      "description": "Gataimara No 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gataimara No 1 PWSS",
+        "localName": "Gataimara No 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38354",
+        "villageName": "NO.1 GATAIMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016452",
+        "ddrName": "Gataimara No 1 PWSS",
+        "projectId": "30016452",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gataimara No 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004842",
+      "name": "Gataimara No. 2 PWSS",
+      "description": "Gataimara No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gataimara No. 2 PWSS",
+        "localName": "Gataimara No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23112",
+        "panchayatname": "MADHYA CHILABANDHA",
+        "villageCode": "38553",
+        "villageName": "NO.2 GATAIMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004842",
+        "ddrName": "Gataimara No. 2 PWSS",
+        "projectId": "30004842",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gataimara No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174059",
+      "name": "Chengelimara Bishnupur PWSS",
+      "description": "Chengelimara Bishnupur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chengelimara Bishnupur PWSS",
+        "localName": "Chengelimara Bishnupur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23113",
+        "panchayatname": "PACHIM BORBHAGIA",
+        "villageCode": "38559",
+        "villageName": "Chengeli Mara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174059",
+        "ddrName": "Chengelimara Bishnupur PWSS",
+        "projectId": "30174059",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chengelimara Bishnupur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30064069",
+      "name": "Mallo Basti PWSS",
+      "description": "Mallo Basti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mallo Basti PWSS",
+        "localName": "Mallo Basti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38559",
+        "villageName": "Chengeli Mara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30064069",
+        "ddrName": "Mallo Basti PWSS",
+        "projectId": "30064069",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mallo Basti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187548",
+      "name": "RETROFITTING OF CHENGELIMORA PWSS",
+      "description": "RETROFITTING OF CHENGELIMORA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHENGELIMORA PWSS",
+        "localName": "RETROFITTING OF CHENGELIMORA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38559",
+        "villageName": "Chengeli Mara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187548",
+        "ddrName": "RETROFITTING OF CHENGELIMORA PWSS",
+        "projectId": "8187548",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHENGELIMORA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5548360",
+      "name": "CHENGELIMORA PWSS",
+      "description": "CHENGELIMORA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENGELIMORA PWSS",
+        "localName": "CHENGELIMORA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38559",
+        "villageName": "Chengeli Mara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5548360",
+        "ddrName": "CHENGELIMORA PWSS",
+        "projectId": "5548360",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENGELIMORA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6526593",
+      "name": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+      "description": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+        "localName": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38562",
+        "villageName": "Deka Sundar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6526593",
+        "ddrName": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+        "projectId": "6526593",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5548227",
+      "name": "PASSIGAON PWSS",
+      "description": "PASSIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PASSIGAON PWSS",
+        "localName": "PASSIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38562",
+        "villageName": "Deka Sundar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5548227",
+        "ddrName": "PASSIGAON PWSS",
+        "projectId": "5548227",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PASSIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161801",
+      "name": "RETROFITTING OF PASSIGAON PWSS",
+      "description": "RETROFITTING OF PASSIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PASSIGAON PWSS",
+        "localName": "RETROFITTING OF PASSIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38562",
+        "villageName": "Deka Sundar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161801",
+        "ddrName": "RETROFITTING OF PASSIGAON PWSS",
+        "projectId": "8161801",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PASSIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174062",
+      "name": "Passigaon Mohmora PWSS",
+      "description": "Passigaon Mohmora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Passigaon Mohmora PWSS",
+        "localName": "Passigaon Mohmora PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23113",
+        "panchayatname": "Pachim Borbhagia",
+        "villageCode": "38596",
+        "villageName": "Pachi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174062",
+        "ddrName": "Passigaon Mohmora PWSS",
+        "projectId": "30174062",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Passigaon Mohmora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148159",
+      "name": "RETROFITTING OF AGRIPAM PWSS",
+      "description": "RETROFITTING OF AGRIPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF AGRIPAM PWSS",
+        "localName": "RETROFITTING OF AGRIPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38501",
+        "villageName": "Agripam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148159",
+        "ddrName": "RETROFITTING OF AGRIPAM PWSS",
+        "projectId": "8148159",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF AGRIPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6173095",
+      "name": "AGRIPAM PWSS (STATE PLAN)",
+      "description": "AGRIPAM PWSS (STATE PLAN)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AGRIPAM PWSS (STATE PLAN)",
+        "localName": "AGRIPAM PWSS (STATE PLAN)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38501",
+        "villageName": "Agripam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6173095",
+        "ddrName": "AGRIPAM PWSS (STATE PLAN)",
+        "projectId": "6173095",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AGRIPAM PWSS (STATE PLAN)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202288",
+      "name": "BAMUNIPAM PWSS",
+      "description": "BAMUNIPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNIPAM PWSS",
+        "localName": "BAMUNIPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38500",
+        "villageName": "Bamunipam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202288",
+        "ddrName": "BAMUNIPAM PWSS",
+        "projectId": "30202288",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNIPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202346",
+      "name": "Bar Dikarai Bali Chapori MPWS",
+      "description": "Bar Dikarai Bali Chapori MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bar Dikarai Bali Chapori MPWS",
+        "localName": "Bar Dikarai Bali Chapori MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38495",
+        "villageName": "Bar Dikarai Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202346",
+        "ddrName": "Bar Dikarai Bali Chapori MPWS",
+        "projectId": "30202346",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bar Dikarai Bali Chapori MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148116",
+      "name": "RETROFITTING OF BORDIKORAI PWSS",
+      "description": "RETROFITTING OF BORDIKORAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORDIKORAI PWSS",
+        "localName": "RETROFITTING OF BORDIKORAI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38495",
+        "villageName": "Bar Dikarai Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148116",
+        "ddrName": "RETROFITTING OF BORDIKORAI PWSS",
+        "projectId": "8148116",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORDIKORAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175264",
+      "name": "Bar Dikarai Miri PWSS",
+      "description": "Bar Dikarai Miri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bar Dikarai Miri PWSS",
+        "localName": "Bar Dikarai Miri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38495",
+        "villageName": "Bar Dikarai Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175264",
+        "ddrName": "Bar Dikarai Miri PWSS",
+        "projectId": "30175264",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bar Dikarai Miri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4655542",
+      "name": "Bordikarai PWSS",
+      "description": "Bordikarai PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bordikarai PWSS",
+        "localName": "Bordikarai PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38495",
+        "villageName": "Bar Dikarai Miri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4655542",
+        "ddrName": "Bordikarai PWSS",
+        "projectId": "4655542",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bordikarai PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175295",
+      "name": "Chari Pukhuri Dakhin MPWSS",
+      "description": "Chari Pukhuri Dakhin MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chari Pukhuri Dakhin MPWSS",
+        "localName": "Chari Pukhuri Dakhin MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "590466",
+        "villageName": "Chari Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175295",
+        "ddrName": "Chari Pukhuri Dakhin MPWSS",
+        "projectId": "30175295",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chari Pukhuri Dakhin MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4654670",
+      "name": "Batamari PWSS",
+      "description": "Batamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batamari PWSS",
+        "localName": "Batamari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "590466",
+        "villageName": "Chari Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4654670",
+        "ddrName": "Batamari PWSS",
+        "projectId": "4654670",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385567",
+      "name": "RETROFITTING OF GADERIJAN PWSS",
+      "description": "RETROFITTING OF GADERIJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GADERIJAN PWSS",
+        "localName": "RETROFITTING OF GADERIJAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "590467",
+        "villageName": "Gederijan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385567",
+        "ddrName": "RETROFITTING OF GADERIJAN PWSS",
+        "projectId": "6385567",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GADERIJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1845703",
+      "name": "Gorbil Silonipam PWSS",
+      "description": "Gorbil Silonipam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gorbil Silonipam PWSS",
+        "localName": "Gorbil Silonipam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "648037",
+        "villageName": "Gorbil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1845703",
+        "ddrName": "Gorbil Silonipam PWSS",
+        "projectId": "1845703",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gorbil Silonipam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148257",
+      "name": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+      "description": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+        "localName": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "648037",
+        "villageName": "Gorbil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148257",
+        "ddrName": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+        "projectId": "8148257",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175334",
+      "name": "No.1 Batamari PWSS",
+      "description": "No.1 Batamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Batamari PWSS",
+        "localName": "No.1 Batamari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38494",
+        "villageName": "No.1 Batamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175334",
+        "ddrName": "No.1 Batamari PWSS",
+        "projectId": "30175334",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Batamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8177941",
+      "name": "RETROFITTING OF BATAMARI PWSS",
+      "description": "RETROFITTING OF BATAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BATAMARI PWSS",
+        "localName": "RETROFITTING OF BATAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38494",
+        "villageName": "No.1 Batamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8177941",
+        "ddrName": "RETROFITTING OF BATAMARI PWSS",
+        "projectId": "8177941",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BATAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212948",
+      "name": "No.2 Batamari PWSS",
+      "description": "No.2 Batamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Batamari PWSS",
+        "localName": "No.2 Batamari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "648151",
+        "villageName": "No.2 Batamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212948",
+        "ddrName": "No.2 Batamari PWSS",
+        "projectId": "30212948",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Batamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213788",
+      "name": "New Pat Gaon PWSS",
+      "description": "New Pat Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Pat Gaon PWSS",
+        "localName": "New Pat Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38497",
+        "villageName": "Pat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213788",
+        "ddrName": "New Pat Gaon PWSS",
+        "projectId": "30213788",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Pat Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201868",
+      "name": "AUHOLAGAON MPWS",
+      "description": "AUHOLAGAON MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AUHOLAGAON MPWS",
+        "localName": "AUHOLAGAON MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38499",
+        "villageName": "Ranga Chakua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201868",
+        "ddrName": "AUHOLAGAON MPWS",
+        "projectId": "30201868",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AUHOLAGAON MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202651",
+      "name": "SANTIPUR PWSS",
+      "description": "SANTIPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SANTIPUR PWSS",
+        "localName": "SANTIPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38499",
+        "villageName": "Ranga Chakua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202651",
+        "ddrName": "SANTIPUR PWSS",
+        "projectId": "30202651",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SANTIPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161776",
+      "name": "RETROFITTING OF RANGACHAKUWA PWSS",
+      "description": "RETROFITTING OF RANGACHAKUWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RANGACHAKUWA PWSS",
+        "localName": "RETROFITTING OF RANGACHAKUWA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38499",
+        "villageName": "Ranga Chakua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161776",
+        "ddrName": "RETROFITTING OF RANGACHAKUWA PWSS",
+        "projectId": "8161776",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RANGACHAKUWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5362332",
+      "name": "RANGACHAKUWA PWSS",
+      "description": "RANGACHAKUWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGACHAKUWA PWSS",
+        "localName": "RANGACHAKUWA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38499",
+        "villageName": "Ranga Chakua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5362332",
+        "ddrName": "RANGACHAKUWA PWSS",
+        "projectId": "5362332",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGACHAKUWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158126",
+      "name": "Randupam PWSS",
+      "description": "Randupam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Randupam PWSS",
+        "localName": "Randupam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38499",
+        "villageName": "Ranga Chakua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158126",
+        "ddrName": "Randupam PWSS",
+        "projectId": "30158126",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Randupam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213862",
+      "name": "NAYAK BASTI MPWS",
+      "description": "NAYAK BASTI MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAK BASTI MPWS",
+        "localName": "NAYAK BASTI MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23108",
+        "panchayatname": "Pachim Murhadol",
+        "villageCode": "38499",
+        "villageName": "Ranga Chakua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213862",
+        "ddrName": "NAYAK BASTI MPWS",
+        "projectId": "30213862",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAK BASTI MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4639900",
+      "name": "RETROFITTING OF BORPUKHURIPAR PWSS",
+      "description": "RETROFITTING OF BORPUKHURIPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORPUKHURIPAR PWSS",
+        "localName": "RETROFITTING OF BORPUKHURIPAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "647560",
+        "villageName": "Hukai Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4639900",
+        "ddrName": "RETROFITTING OF BORPUKHURIPAR PWSS",
+        "projectId": "4639900",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORPUKHURIPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30030288",
+      "name": "Hukain Gaon PWSS",
+      "description": "Hukain Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hukain Gaon PWSS",
+        "localName": "Hukain Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "647560",
+        "villageName": "Hukai Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30030288",
+        "ddrName": "Hukain Gaon PWSS",
+        "projectId": "30030288",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hukain Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161808",
+      "name": "RETROFITTING OF KORSONTOLA PWSS",
+      "description": "RETROFITTING OF KORSONTOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KORSONTOLA PWSS",
+        "localName": "RETROFITTING OF KORSONTOLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38584",
+        "villageName": "Karchan Tola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161808",
+        "ddrName": "RETROFITTING OF KORSONTOLA PWSS",
+        "projectId": "8161808",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KORSONTOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5548257",
+      "name": "KORSONTOLA PWSS",
+      "description": "KORSONTOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KORSONTOLA PWSS",
+        "localName": "KORSONTOLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38584",
+        "villageName": "Karchan Tola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5548257",
+        "ddrName": "KORSONTOLA PWSS",
+        "projectId": "5548257",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KORSONTOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161779",
+      "name": "RETROFITTING OF PITHAGURIDOL PWSS",
+      "description": "RETROFITTING OF PITHAGURIDOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PITHAGURIDOL PWSS",
+        "localName": "RETROFITTING OF PITHAGURIDOL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38584",
+        "villageName": "Karchan Tola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161779",
+        "ddrName": "RETROFITTING OF PITHAGURIDOL PWSS",
+        "projectId": "8161779",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PITHAGURIDOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4656070",
+      "name": "Pithaguridol PWSS",
+      "description": "Pithaguridol PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pithaguridol PWSS",
+        "localName": "Pithaguridol PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38584",
+        "villageName": "Karchan Tola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4656070",
+        "ddrName": "Pithaguridol PWSS",
+        "projectId": "4656070",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pithaguridol PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4639926",
+      "name": "Gomiripal PWSS",
+      "description": "Gomiripal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gomiripal PWSS",
+        "localName": "Gomiripal PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "586611",
+        "villageName": "Kumar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4639926",
+        "ddrName": "Gomiripal PWSS",
+        "projectId": "4639926",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gomiripal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8157593",
+      "name": "RETROFITTING OF GAMIRIPAL PWSS",
+      "description": "RETROFITTING OF GAMIRIPAL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GAMIRIPAL PWSS",
+        "localName": "RETROFITTING OF GAMIRIPAL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "586611",
+        "villageName": "Kumar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8157593",
+        "ddrName": "RETROFITTING OF GAMIRIPAL PWSS",
+        "projectId": "8157593",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GAMIRIPAL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175539",
+      "name": "New Kumar Gaon PWSS",
+      "description": "New Kumar Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Kumar Gaon PWSS",
+        "localName": "New Kumar Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "586611",
+        "villageName": "Kumar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175539",
+        "ddrName": "New Kumar Gaon PWSS",
+        "projectId": "30175539",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Kumar Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175554",
+      "name": "Mohmara PWSS",
+      "description": "Mohmara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mohmara PWSS",
+        "localName": "Mohmara PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38561",
+        "villageName": "Mohmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175554",
+        "ddrName": "Mohmara PWSS",
+        "projectId": "30175554",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mohmara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202080",
+      "name": "Upar Talakabari PWSS",
+      "description": "Upar Talakabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upar Talakabari PWSS",
+        "localName": "Upar Talakabari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38585",
+        "villageName": "Talaka Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202080",
+        "ddrName": "Upar Talakabari PWSS",
+        "projectId": "30202080",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upar Talakabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148068",
+      "name": "RETROFITTING OF TALAKABARI PWSS",
+      "description": "RETROFITTING OF TALAKABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF TALAKABARI PWSS",
+        "localName": "RETROFITTING OF TALAKABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38585",
+        "villageName": "Talaka Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148068",
+        "ddrName": "RETROFITTING OF TALAKABARI PWSS",
+        "projectId": "8148068",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF TALAKABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8255134",
+      "name": "BORPUKHURIPAR",
+      "description": "BORPUKHURIPAR",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORPUKHURIPAR",
+        "localName": "BORPUKHURIPAR",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38585",
+        "villageName": "Talaka Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8255134",
+        "ddrName": "BORPUKHURIPAR",
+        "projectId": "8255134",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORPUKHURIPAR",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5528384",
+      "name": "TALAKABARI PWSS",
+      "description": "TALAKABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TALAKABARI PWSS",
+        "localName": "TALAKABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38585",
+        "villageName": "Talaka Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5528384",
+        "ddrName": "TALAKABARI PWSS",
+        "projectId": "5528384",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TALAKABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175635",
+      "name": "Nadidhar PWSS",
+      "description": "Nadidhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nadidhar PWSS",
+        "localName": "Nadidhar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "647558",
+        "villageName": "Talaka Bari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175635",
+        "ddrName": "Nadidhar PWSS",
+        "projectId": "30175635",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nadidhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148081",
+      "name": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+      "description": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+        "localName": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38592",
+        "villageName": "Talakabari Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148081",
+        "ddrName": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+        "projectId": "8148081",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174072",
+      "name": "Sensuwa PWSS",
+      "description": "Sensuwa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sensuwa PWSS",
+        "localName": "Sensuwa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38592",
+        "villageName": "Talakabari Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174072",
+        "ddrName": "Sensuwa PWSS",
+        "projectId": "30174072",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sensuwa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5349626",
+      "name": "Talakabari Bengali PWSS",
+      "description": "Talakabari Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Talakabari Bengali PWSS",
+        "localName": "Talakabari Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23115",
+        "panchayatname": "Pub Borbhagia",
+        "villageCode": "38592",
+        "villageName": "Talakabari Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5349626",
+        "ddrName": "Talakabari Bengali PWSS",
+        "projectId": "5349626",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Talakabari Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30003616",
+      "name": "Bakola PWSS",
+      "description": "Bakola PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakola PWSS",
+        "localName": "Bakola PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30003616",
+        "ddrName": "Bakola PWSS",
+        "projectId": "30003616",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakola PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174053",
+      "name": "BAKOLA WEST PWSS",
+      "description": "BAKOLA WEST PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAKOLA WEST PWSS",
+        "localName": "BAKOLA WEST PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174053",
+        "ddrName": "BAKOLA WEST PWSS",
+        "projectId": "30174053",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAKOLA WEST PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5404932",
+      "name": "MURHADOL PWSS",
+      "description": "MURHADOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MURHADOL PWSS",
+        "localName": "MURHADOL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5404932",
+        "ddrName": "MURHADOL PWSS",
+        "projectId": "5404932",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MURHADOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214044",
+      "name": "Dhubighat Khilkowari MPWSS",
+      "description": "Dhubighat Khilkowari MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhubighat Khilkowari MPWSS",
+        "localName": "Dhubighat Khilkowari MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214044",
+        "ddrName": "Dhubighat Khilkowari MPWSS",
+        "projectId": "30214044",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhubighat Khilkowari MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6526507",
+      "name": "RETROFITTING OF JOYPUR PWSS",
+      "description": "RETROFITTING OF JOYPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JOYPUR PWSS",
+        "localName": "RETROFITTING OF JOYPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6526507",
+        "ddrName": "RETROFITTING OF JOYPUR PWSS",
+        "projectId": "6526507",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JOYPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214330",
+      "name": "Holakan PWSS",
+      "description": "Holakan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Holakan PWSS",
+        "localName": "Holakan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214330",
+        "ddrName": "Holakan PWSS",
+        "projectId": "30214330",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Holakan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5404904",
+      "name": "CHAIBARI PWSS",
+      "description": "CHAIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAIBARI PWSS",
+        "localName": "CHAIBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38503",
+        "villageName": "Bakola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5404904",
+        "ddrName": "CHAIBARI PWSS",
+        "projectId": "5404904",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148097",
+      "name": "RETROFITTING OF CHAIBARI PWSS",
+      "description": "RETROFITTING OF CHAIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHAIBARI PWSS",
+        "localName": "RETROFITTING OF CHAIBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "586383",
+        "villageName": "Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148097",
+        "ddrName": "RETROFITTING OF CHAIBARI PWSS",
+        "projectId": "8148097",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHAIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202611",
+      "name": "Borigaon PWSS",
+      "description": "Borigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borigaon PWSS",
+        "localName": "Borigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "586383",
+        "villageName": "Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202611",
+        "ddrName": "Borigaon PWSS",
+        "projectId": "30202611",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1846500",
+      "name": "HATINGA PWSS",
+      "description": "HATINGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATINGA PWSS",
+        "localName": "HATINGA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "586383",
+        "villageName": "Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1846500",
+        "ddrName": "HATINGA PWSS",
+        "projectId": "1846500",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATINGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158662",
+      "name": "GELAHATINGA TE PWSS",
+      "description": "GELAHATINGA TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GELAHATINGA TE PWSS",
+        "localName": "GELAHATINGA TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38511",
+        "villageName": "Gelahatinga Te",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158662",
+        "ddrName": "GELAHATINGA TE PWSS",
+        "projectId": "30158662",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GELAHATINGA TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214437",
+      "name": "Line No. 8/16 Gelahatinga TE MPWS",
+      "description": "Line No. 8/16 Gelahatinga TE MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Line No. 8/16 Gelahatinga TE MPWS",
+        "localName": "Line No. 8/16 Gelahatinga TE MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38511",
+        "villageName": "Gelahatinga Te",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214437",
+        "ddrName": "Line No. 8/16 Gelahatinga TE MPWS",
+        "projectId": "30214437",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Line No. 8/16 Gelahatinga TE MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202636",
+      "name": "BURBURI PWSS",
+      "description": "BURBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BURBURI PWSS",
+        "localName": "BURBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38511",
+        "villageName": "Gelahatinga Te",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202636",
+        "ddrName": "BURBURI PWSS",
+        "projectId": "30202636",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BURBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077516",
+      "name": "Kharbari PWSS",
+      "description": "Kharbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kharbari PWSS",
+        "localName": "Kharbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38511",
+        "villageName": "Gelahatinga Te",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077516",
+        "ddrName": "Kharbari PWSS",
+        "projectId": "30077516",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kharbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216849",
+      "name": "SHANTIPUR PWSS",
+      "description": "SHANTIPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SHANTIPUR PWSS",
+        "localName": "SHANTIPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38510",
+        "villageName": "Hatinga Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216849",
+        "ddrName": "SHANTIPUR PWSS",
+        "projectId": "30216849",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SHANTIPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161774",
+      "name": "RETROFITTING OF HATINGA PWSS",
+      "description": "RETROFITTING OF HATINGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HATINGA PWSS",
+        "localName": "RETROFITTING OF HATINGA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38510",
+        "villageName": "Hatinga Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161774",
+        "ddrName": "RETROFITTING OF HATINGA PWSS",
+        "projectId": "8161774",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HATINGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202537",
+      "name": "Silkowari Khanda PWSS",
+      "description": "Silkowari Khanda PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Silkowari Khanda PWSS",
+        "localName": "Silkowari Khanda PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38510",
+        "villageName": "Hatinga Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202537",
+        "ddrName": "Silkowari Khanda PWSS",
+        "projectId": "30202537",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Silkowari Khanda PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3328455",
+      "name": "Choibaribengali PWSS",
+      "description": "Choibaribengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Choibaribengali PWSS",
+        "localName": "Choibaribengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38506",
+        "villageName": "Maz-gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3328455",
+        "ddrName": "Choibaribengali PWSS",
+        "projectId": "3328455",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Choibaribengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214454",
+      "name": "Kathabari MPWS",
+      "description": "Kathabari MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kathabari MPWS",
+        "localName": "Kathabari MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38506",
+        "villageName": "Maz-gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214454",
+        "ddrName": "Kathabari MPWS",
+        "projectId": "30214454",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kathabari MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202570",
+      "name": "SIALMARI PWSS",
+      "description": "SIALMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIALMARI PWSS",
+        "localName": "SIALMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38506",
+        "villageName": "Maz-gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202570",
+        "ddrName": "SIALMARI PWSS",
+        "projectId": "30202570",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIALMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148181",
+      "name": "RETROFITTING OF MURHADOL PWSS",
+      "description": "RETROFITTING OF MURHADOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MURHADOL PWSS",
+        "localName": "RETROFITTING OF MURHADOL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38509",
+        "villageName": "Murha Dal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148181",
+        "ddrName": "RETROFITTING OF MURHADOL PWSS",
+        "projectId": "8148181",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MURHADOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174454",
+      "name": "Baruah Chuburi PWSS",
+      "description": "Baruah Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baruah Chuburi PWSS",
+        "localName": "Baruah Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38509",
+        "villageName": "Murha Dal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174454",
+        "ddrName": "Baruah Chuburi PWSS",
+        "projectId": "30174454",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baruah Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5407857",
+      "name": "RETROFITTING OF NAHARBARI PWSS",
+      "description": "RETROFITTING OF NAHARBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAHARBARI PWSS",
+        "localName": "RETROFITTING OF NAHARBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38509",
+        "villageName": "Murha Dal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5407857",
+        "ddrName": "RETROFITTING OF NAHARBARI PWSS",
+        "projectId": "5407857",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAHARBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5573206",
+      "name": "PANIGAON PWSS",
+      "description": "PANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PANIGAON PWSS",
+        "localName": "PANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38509",
+        "villageName": "Murha Dal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5573206",
+        "ddrName": "PANIGAON PWSS",
+        "projectId": "5573206",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216472",
+      "name": "Padumani PWSS",
+      "description": "Padumani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Padumani PWSS",
+        "localName": "Padumani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38504",
+        "villageName": "Padumani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216472",
+        "ddrName": "Padumani PWSS",
+        "projectId": "30216472",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Padumani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214704",
+      "name": "RATNAPUR MPWS",
+      "description": "RATNAPUR MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RATNAPUR MPWS",
+        "localName": "RATNAPUR MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23109",
+        "panchayatname": "Pub Murhadol",
+        "villageCode": "38505",
+        "villageName": "Ratnapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214704",
+        "ddrName": "RATNAPUR MPWS",
+        "projectId": "30214704",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RATNAPUR MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385554",
+      "name": "RETROFITTING OF PADMAPUR PWSS",
+      "description": "RETROFITTING OF PADMAPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PADMAPUR PWSS",
+        "localName": "RETROFITTING OF PADMAPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38577",
+        "villageName": "Bori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385554",
+        "ddrName": "RETROFITTING OF PADMAPUR PWSS",
+        "projectId": "6385554",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PADMAPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216302",
+      "name": "Borigaon Siva Mandir Borigaon PWSS",
+      "description": "Borigaon Siva Mandir Borigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borigaon Siva Mandir Borigaon PWSS",
+        "localName": "Borigaon Siva Mandir Borigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38577",
+        "villageName": "Bori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216302",
+        "ddrName": "Borigaon Siva Mandir Borigaon PWSS",
+        "projectId": "30216302",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borigaon Siva Mandir Borigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8162013",
+      "name": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+      "description": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+        "localName": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38577",
+        "villageName": "Bori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8162013",
+        "ddrName": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+        "projectId": "8162013",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4627074",
+      "name": "Korsontola Borigaon",
+      "description": "Korsontola Borigaon",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Korsontola Borigaon",
+        "localName": "Korsontola Borigaon",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38577",
+        "villageName": "Bori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4627074",
+        "ddrName": "Korsontola Borigaon",
+        "projectId": "4627074",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Korsontola Borigaon",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1853696",
+      "name": "Bamunbari PWSS",
+      "description": "Bamunbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamunbari PWSS",
+        "localName": "Bamunbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1853696",
+        "ddrName": "Bamunbari PWSS",
+        "projectId": "1853696",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamunbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161828",
+      "name": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+      "description": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+        "localName": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161828",
+        "ddrName": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+        "projectId": "8161828",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153201",
+      "name": "RETROFITTING OF BAMUNBARI PWSS",
+      "description": "RETROFITTING OF BAMUNBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAMUNBARI PWSS",
+        "localName": "RETROFITTING OF BAMUNBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153201",
+        "ddrName": "RETROFITTING OF BAMUNBARI PWSS",
+        "projectId": "8153201",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAMUNBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174439",
+      "name": "Barfalia PWSS",
+      "description": "Barfalia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barfalia PWSS",
+        "localName": "Barfalia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174439",
+        "ddrName": "Barfalia PWSS",
+        "projectId": "30174439",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barfalia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202595",
+      "name": "BORACHUK PWSS",
+      "description": "BORACHUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORACHUK PWSS",
+        "localName": "BORACHUK PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202595",
+        "ddrName": "BORACHUK PWSS",
+        "projectId": "30202595",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORACHUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153205",
+      "name": "RETROFITTING OF DHOBAKATA PWSS",
+      "description": "RETROFITTING OF DHOBAKATA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHOBAKATA PWSS",
+        "localName": "RETROFITTING OF DHOBAKATA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153205",
+        "ddrName": "RETROFITTING OF DHOBAKATA PWSS",
+        "projectId": "8153205",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHOBAKATA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.729086",
+      "name": "Dhobakata PWSS",
+      "description": "Dhobakata PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhobakata PWSS",
+        "localName": "Dhobakata PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "729086",
+        "ddrName": "Dhobakata PWSS",
+        "projectId": "729086",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhobakata PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216295",
+      "name": "Keranipam PWSS",
+      "description": "Keranipam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Keranipam PWSS",
+        "localName": "Keranipam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38571",
+        "villageName": "Choibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216295",
+        "ddrName": "Keranipam PWSS",
+        "projectId": "30216295",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Keranipam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153214",
+      "name": "RETROFITTING OF DHEKERIGAON PWSS",
+      "description": "RETROFITTING OF DHEKERIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHEKERIGAON PWSS",
+        "localName": "RETROFITTING OF DHEKERIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38579",
+        "villageName": "Dhakarigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153214",
+        "ddrName": "RETROFITTING OF DHEKERIGAON PWSS",
+        "projectId": "8153214",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHEKERIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5573300",
+      "name": "DHEKERIGAON PWSS",
+      "description": "DHEKERIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHEKERIGAON PWSS",
+        "localName": "DHEKERIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38579",
+        "villageName": "Dhakarigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5573300",
+        "ddrName": "DHEKERIGAON PWSS",
+        "projectId": "5573300",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHEKERIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4627137",
+      "name": "Kathobari Bhagowatichuk PWSS",
+      "description": "Kathobari Bhagowatichuk PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kathobari Bhagowatichuk PWSS",
+        "localName": "Kathobari Bhagowatichuk PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "647548",
+        "villageName": "Madhav Barhampur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4627137",
+        "ddrName": "Kathobari Bhagowatichuk PWSS",
+        "projectId": "4627137",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kathobari Bhagowatichuk PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161819",
+      "name": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+      "description": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+        "localName": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "647548",
+        "villageName": "Madhav Barhampur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161819",
+        "ddrName": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+        "projectId": "8161819",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153198",
+      "name": "RETROFITTING OF SOLOGURI PWSS",
+      "description": "RETROFITTING OF SOLOGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOLOGURI PWSS",
+        "localName": "RETROFITTING OF SOLOGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38578",
+        "villageName": "Uparkuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153198",
+        "ddrName": "RETROFITTING OF SOLOGURI PWSS",
+        "projectId": "8153198",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOLOGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1845373",
+      "name": "Sologuri PWSS",
+      "description": "Sologuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sologuri PWSS",
+        "localName": "Sologuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23114",
+        "panchayatname": "Uttar Borbhagia",
+        "villageCode": "38578",
+        "villageName": "Uparkuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1845373",
+        "ddrName": "Sologuri PWSS",
+        "projectId": "1845373",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sologuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8157600",
+      "name": "RETROFITTING OF BOGABIL PWSS",
+      "description": "RETROFITTING OF BOGABIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BOGABIL PWSS",
+        "localName": "RETROFITTING OF BOGABIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38530",
+        "villageName": "Bogabil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8157600",
+        "ddrName": "RETROFITTING OF BOGABIL PWSS",
+        "projectId": "8157600",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BOGABIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5407846",
+      "name": "BAGIBIL PWSS (QA)",
+      "description": "BAGIBIL PWSS (QA)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGIBIL PWSS (QA)",
+        "localName": "BAGIBIL PWSS (QA)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38530",
+        "villageName": "Bogabil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5407846",
+        "ddrName": "BAGIBIL PWSS (QA)",
+        "projectId": "5407846",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGIBIL PWSS (QA)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020202",
+      "name": "Bill Donga PWSS",
+      "description": "Bill Donga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bill Donga PWSS",
+        "localName": "Bill Donga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38530",
+        "villageName": "Bogabil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020202",
+        "ddrName": "Bill Donga PWSS",
+        "projectId": "30020202",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bill Donga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224607",
+      "name": "Chamdhara Brahmagaon PWSS",
+      "description": "Chamdhara Brahmagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chamdhara Brahmagaon PWSS",
+        "localName": "Chamdhara Brahmagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38533",
+        "villageName": "Chamdhara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224607",
+        "ddrName": "Chamdhara Brahmagaon PWSS",
+        "projectId": "30224607",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chamdhara Brahmagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30224611",
+      "name": "CHAMDHARA MAJHIGAON PWSS",
+      "description": "CHAMDHARA MAJHIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAMDHARA MAJHIGAON PWSS",
+        "localName": "CHAMDHARA MAJHIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38533",
+        "villageName": "Chamdhara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30224611",
+        "ddrName": "CHAMDHARA MAJHIGAON PWSS",
+        "projectId": "30224611",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAMDHARA MAJHIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4639802",
+      "name": "Sonarigaon PWSS.",
+      "description": "Sonarigaon PWSS.",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonarigaon PWSS.",
+        "localName": "Sonarigaon PWSS.",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38543",
+        "villageName": "Chilabandha Sonari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4639802",
+        "ddrName": "Sonarigaon PWSS.",
+        "projectId": "4639802",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonarigaon PWSS.",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8157602",
+      "name": "RETROFITTING OF SONARIGAON PWSS",
+      "description": "RETROFITTING OF SONARIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SONARIGAON PWSS",
+        "localName": "RETROFITTING OF SONARIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38543",
+        "villageName": "Chilabandha Sonari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8157602",
+        "ddrName": "RETROFITTING OF SONARIGAON PWSS",
+        "projectId": "8157602",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SONARIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004862",
+      "name": "Nabapur PWSS",
+      "description": "Nabapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nabapur PWSS",
+        "localName": "Nabapur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38535",
+        "villageName": "Moronakuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004862",
+        "ddrName": "Nabapur PWSS",
+        "projectId": "30004862",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nabapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201927",
+      "name": "Upor Moronakuri PWSS",
+      "description": "Upor Moronakuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upor Moronakuri PWSS",
+        "localName": "Upor Moronakuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38535",
+        "villageName": "Moronakuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201927",
+        "ddrName": "Upor Moronakuri PWSS",
+        "projectId": "30201927",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upor Moronakuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200373",
+      "name": "Retrofitting of Moronakuri PWSS",
+      "description": "Retrofitting of Moronakuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Moronakuri PWSS",
+        "localName": "Retrofitting of Moronakuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38535",
+        "villageName": "Moronakuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200373",
+        "ddrName": "Retrofitting of Moronakuri PWSS",
+        "projectId": "30200373",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Moronakuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4655460",
+      "name": "Maranakuri PWSS",
+      "description": "Maranakuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Maranakuri PWSS",
+        "localName": "Maranakuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38535",
+        "villageName": "Moronakuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4655460",
+        "ddrName": "Maranakuri PWSS",
+        "projectId": "4655460",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Maranakuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153224",
+      "name": "RETROFITTING OF PANIGAON PWSS",
+      "description": "RETROFITTING OF PANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PANIGAON PWSS",
+        "localName": "RETROFITTING OF PANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38532",
+        "villageName": "Panigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153224",
+        "ddrName": "RETROFITTING OF PANIGAON PWSS",
+        "projectId": "8153224",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6517821",
+      "name": "Extention of PANIGAON PWSS",
+      "description": "Extention of PANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Extention of PANIGAON PWSS",
+        "localName": "Extention of PANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38532",
+        "villageName": "Panigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6517821",
+        "ddrName": "Extention of PANIGAON PWSS",
+        "projectId": "6517821",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Extention of PANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3327425",
+      "name": "Kochgaon PWSS",
+      "description": "Kochgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kochgaon PWSS",
+        "localName": "Kochgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "586453",
+        "villageName": "Sangia Major Chuk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3327425",
+        "ddrName": "Kochgaon PWSS",
+        "projectId": "3327425",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kochgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161841",
+      "name": "RETROFITTING OF KOCHGAON PWSS",
+      "description": "RETROFITTING OF KOCHGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KOCHGAON PWSS",
+        "localName": "RETROFITTING OF KOCHGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "586453",
+        "villageName": "Sangia Major Chuk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161841",
+        "ddrName": "RETROFITTING OF KOCHGAON PWSS",
+        "projectId": "8161841",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KOCHGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169825",
+      "name": "Madhupur PWSS",
+      "description": "Madhupur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Madhupur PWSS",
+        "localName": "Madhupur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "586453",
+        "villageName": "Sangia Major Chuk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169825",
+        "ddrName": "Madhupur PWSS",
+        "projectId": "30169825",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Madhupur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175783",
+      "name": "Herapuwa PWSS",
+      "description": "Herapuwa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Herapuwa PWSS",
+        "localName": "Herapuwa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38542",
+        "villageName": "Solaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175783",
+        "ddrName": "Herapuwa PWSS",
+        "projectId": "30175783",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Herapuwa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30186275",
+      "name": "Tarajan PWSS",
+      "description": "Tarajan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajan PWSS",
+        "localName": "Tarajan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "NADUAR",
+        "panchayatcode": "23111",
+        "panchayatname": "UTTAR CHILABANDHA",
+        "villageCode": "38536",
+        "villageName": "Tarajan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30186275",
+        "ddrName": "Tarajan PWSS",
+        "projectId": "30186275",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174055",
+      "name": "KAFLA CHUBURI PWSS",
+      "description": "KAFLA CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAFLA CHUBURI PWSS",
+        "localName": "KAFLA CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38522",
+        "villageName": "Balijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174055",
+        "ddrName": "KAFLA CHUBURI PWSS",
+        "projectId": "30174055",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAFLA CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8185824",
+      "name": "RETROFITTING OF BALIJURI PWSS",
+      "description": "RETROFITTING OF BALIJURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BALIJURI PWSS",
+        "localName": "RETROFITTING OF BALIJURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38522",
+        "villageName": "Balijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8185824",
+        "ddrName": "RETROFITTING OF BALIJURI PWSS",
+        "projectId": "8185824",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BALIJURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181099",
+      "name": "MASKIGON PWSS",
+      "description": "MASKIGON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MASKIGON PWSS",
+        "localName": "MASKIGON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38522",
+        "villageName": "Balijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181099",
+        "ddrName": "MASKIGON PWSS",
+        "projectId": "30181099",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MASKIGON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.603538",
+      "name": "Balijuri PWSS",
+      "description": "Balijuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balijuri PWSS",
+        "localName": "Balijuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38522",
+        "villageName": "Balijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "603538",
+        "ddrName": "Balijuri PWSS",
+        "projectId": "603538",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balijuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214444",
+      "name": "KARAITAPU MPWS",
+      "description": "KARAITAPU MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARAITAPU MPWS",
+        "localName": "KARAITAPU MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214444",
+        "ddrName": "KARAITAPU MPWS",
+        "projectId": "30214444",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARAITAPU MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201859",
+      "name": "ANADIKORAI PWSS",
+      "description": "ANADIKORAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ANADIKORAI PWSS",
+        "localName": "ANADIKORAI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201859",
+        "ddrName": "ANADIKORAI PWSS",
+        "projectId": "30201859",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ANADIKORAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214559",
+      "name": "LAKHIPATHAR PWSS",
+      "description": "LAKHIPATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LAKHIPATHAR PWSS",
+        "localName": "LAKHIPATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214559",
+        "ddrName": "LAKHIPATHAR PWSS",
+        "projectId": "30214559",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LAKHIPATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214051",
+      "name": "MILANPUR MPWS",
+      "description": "MILANPUR MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MILANPUR MPWS",
+        "localName": "MILANPUR MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214051",
+        "ddrName": "MILANPUR MPWS",
+        "projectId": "30214051",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MILANPUR MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213850",
+      "name": "NAYAN PUR MPWS",
+      "description": "NAYAN PUR MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAN PUR MPWS",
+        "localName": "NAYAN PUR MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213850",
+        "ddrName": "NAYAN PUR MPWS",
+        "projectId": "30213850",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAN PUR MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213716",
+      "name": "NO. 1 JOYPAM PWSS",
+      "description": "NO. 1 JOYPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 1 JOYPAM PWSS",
+        "localName": "NO. 1 JOYPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213716",
+        "ddrName": "NO. 1 JOYPAM PWSS",
+        "projectId": "30213716",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 1 JOYPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212996",
+      "name": "NO. 2 & 3 JOYPAM PWSS",
+      "description": "NO. 2 & 3 JOYPAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 2 & 3 JOYPAM PWSS",
+        "localName": "NO. 2 & 3 JOYPAM PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212996",
+        "ddrName": "NO. 2 & 3 JOYPAM PWSS",
+        "projectId": "30212996",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 2 & 3 JOYPAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212906",
+      "name": "NO. 4,5 & 6 JOYPUR PWSS",
+      "description": "NO. 4,5 & 6 JOYPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 4,5 & 6 JOYPUR PWSS",
+        "localName": "NO. 4,5 & 6 JOYPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "648204",
+        "villageName": "Bordikarai Balichapori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212906",
+        "ddrName": "NO. 4,5 & 6 JOYPUR PWSS",
+        "projectId": "30212906",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 4,5 & 6 JOYPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175392",
+      "name": "Bang Gaon PWSS",
+      "description": "Bang Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bang Gaon PWSS",
+        "localName": "Bang Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38520",
+        "villageName": "Christan Basti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175392",
+        "ddrName": "Bang Gaon PWSS",
+        "projectId": "30175392",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bang Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213569",
+      "name": "Christan Basti No. 2 PWSS",
+      "description": "Christan Basti No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Christan Basti No. 2 PWSS",
+        "localName": "Christan Basti No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38520",
+        "villageName": "Christan Basti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213569",
+        "ddrName": "Christan Basti No. 2 PWSS",
+        "projectId": "30213569",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Christan Basti No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148173",
+      "name": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+      "description": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+        "localName": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38520",
+        "villageName": "Christan Basti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148173",
+        "ddrName": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+        "projectId": "8148173",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.729083",
+      "name": "Christian Bosti PWSS",
+      "description": "Christian Bosti PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Christian Bosti PWSS",
+        "localName": "Christian Bosti PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38520",
+        "villageName": "Christan Basti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "729083",
+        "ddrName": "Christian Bosti PWSS",
+        "projectId": "729083",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Christian Bosti PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214062",
+      "name": "DHUBIKHOLA MPWS",
+      "description": "DHUBIKHOLA MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHUBIKHOLA MPWS",
+        "localName": "DHUBIKHOLA MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38524",
+        "villageName": "Dhubikhola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214062",
+        "ddrName": "DHUBIKHOLA MPWS",
+        "projectId": "30214062",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHUBIKHOLA MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30204586",
+      "name": "PACHMUKH MPWS",
+      "description": "PACHMUKH MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHMUKH MPWS",
+        "localName": "PACHMUKH MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38524",
+        "villageName": "Dhubikhola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30204586",
+        "ddrName": "PACHMUKH MPWS",
+        "projectId": "30204586",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHMUKH MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175466",
+      "name": "Morisuti Topubasti MPWS",
+      "description": "Morisuti Topubasti MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Morisuti Topubasti MPWS",
+        "localName": "Morisuti Topubasti MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175466",
+        "ddrName": "Morisuti Topubasti MPWS",
+        "projectId": "30175466",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Morisuti Topubasti MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174165",
+      "name": "Morisuti Thakurbari PWSS",
+      "description": "Morisuti Thakurbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Morisuti Thakurbari PWSS",
+        "localName": "Morisuti Thakurbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174165",
+        "ddrName": "Morisuti Thakurbari PWSS",
+        "projectId": "30174165",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Morisuti Thakurbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5362300",
+      "name": "MORISUTI PWSS",
+      "description": "MORISUTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MORISUTI PWSS",
+        "localName": "MORISUTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5362300",
+        "ddrName": "MORISUTI PWSS",
+        "projectId": "5362300",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MORISUTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148105",
+      "name": "RETROFITTING OF MORISUTI PWSS",
+      "description": "RETROFITTING OF MORISUTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MORISUTI PWSS",
+        "localName": "RETROFITTING OF MORISUTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148105",
+        "ddrName": "RETROFITTING OF MORISUTI PWSS",
+        "projectId": "8148105",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MORISUTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216336",
+      "name": "Morisuti Khergola PWSS",
+      "description": "Morisuti Khergola PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Morisuti Khergola PWSS",
+        "localName": "Morisuti Khergola PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216336",
+        "ddrName": "Morisuti Khergola PWSS",
+        "projectId": "30216336",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Morisuti Khergola PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175367",
+      "name": "Morisuti Gopsar PWSS",
+      "description": "Morisuti Gopsar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Morisuti Gopsar PWSS",
+        "localName": "Morisuti Gopsar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175367",
+        "ddrName": "Morisuti Gopsar PWSS",
+        "projectId": "30175367",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Morisuti Gopsar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213916",
+      "name": "Munda Basti MPWS",
+      "description": "Munda Basti MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Munda Basti MPWS",
+        "localName": "Munda Basti MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38516",
+        "villageName": "Morisuti No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213916",
+        "ddrName": "Munda Basti MPWS",
+        "projectId": "30213916",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Munda Basti MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175425",
+      "name": "New No.1 Bar Dikarai PWSS",
+      "description": "New No.1 Bar Dikarai PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New No.1 Bar Dikarai PWSS",
+        "localName": "New No.1 Bar Dikarai PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38521",
+        "villageName": "No.1 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175425",
+        "ddrName": "New No.1 Bar Dikarai PWSS",
+        "projectId": "30175425",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New No.1 Bar Dikarai PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1970469",
+      "name": "BORDIKORAI -I  PWSS",
+      "description": "BORDIKORAI -I  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDIKORAI -I  PWSS",
+        "localName": "BORDIKORAI -I  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38521",
+        "villageName": "No.1 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1970469",
+        "ddrName": "BORDIKORAI -I  PWSS",
+        "projectId": "1970469",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDIKORAI -I  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148125",
+      "name": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+      "description": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+        "localName": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38521",
+        "villageName": "No.1 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148125",
+        "ddrName": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+        "projectId": "8148125",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214632",
+      "name": "Tamang Gaon PWSS",
+      "description": "Tamang Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tamang Gaon PWSS",
+        "localName": "Tamang Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "38521",
+        "villageName": "No.1 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214632",
+        "ddrName": "Tamang Gaon PWSS",
+        "projectId": "30214632",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tamang Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30201829",
+      "name": "Adibashi Chuburi PWSS",
+      "description": "Adibashi Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adibashi Chuburi PWSS",
+        "localName": "Adibashi Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30201829",
+        "ddrName": "Adibashi Chuburi PWSS",
+        "projectId": "30201829",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adibashi Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30214298",
+      "name": "Gouripam PWSS",
+      "description": "Gouripam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gouripam PWSS",
+        "localName": "Gouripam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30214298",
+        "ddrName": "Gouripam PWSS",
+        "projectId": "30214298",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gouripam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8148137",
+      "name": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+      "description": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+        "localName": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8148137",
+        "ddrName": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+        "projectId": "8148137",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5404892",
+      "name": "BORDIKORAI NO.2 PWSS",
+      "description": "BORDIKORAI NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDIKORAI NO.2 PWSS",
+        "localName": "BORDIKORAI NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5404892",
+        "ddrName": "BORDIKORAI NO.2 PWSS",
+        "projectId": "5404892",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDIKORAI NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140608",
+      "name": "Missing Chuburi PWSS",
+      "description": "Missing Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Missing Chuburi PWSS",
+        "localName": "Missing Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140608",
+        "ddrName": "Missing Chuburi PWSS",
+        "projectId": "30140608",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Missing Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213839",
+      "name": "Nepali Chuburi PWSS",
+      "description": "Nepali Chuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nepali Chuburi PWSS",
+        "localName": "Nepali Chuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213839",
+        "ddrName": "Nepali Chuburi PWSS",
+        "projectId": "30213839",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nepali Chuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30202964",
+      "name": "Raigaon PWSS",
+      "description": "Raigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Raigaon PWSS",
+        "localName": "Raigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1247",
+        "blockname": "Naduar",
+        "panchayatcode": "23110",
+        "panchayatname": "Uttar Murhadol",
+        "villageCode": "590465",
+        "villageName": "No.2 Bordikarai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30202964",
+        "ddrName": "Raigaon PWSS",
+        "projectId": "30202964",
+        "regionName": "1247"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Raigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076501",
+      "name": "Bhuyan Gaon PWSS",
+      "description": "Bhuyan Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhuyan Gaon PWSS",
+        "localName": "Bhuyan Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39133",
+        "villageName": "Barjuli Sonajuli Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076501",
+        "ddrName": "Bhuyan Gaon PWSS",
+        "projectId": "30076501",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhuyan Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5552526",
+      "name": "SONAJULI TE PWSS",
+      "description": "SONAJULI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONAJULI TE PWSS",
+        "localName": "SONAJULI TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39133",
+        "villageName": "Barjuli Sonajuli Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5552526",
+        "ddrName": "SONAJULI TE PWSS",
+        "projectId": "5552526",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONAJULI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192523",
+      "name": "RETROFITTING OF SONAJULI TE PWSS",
+      "description": "RETROFITTING OF SONAJULI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SONAJULI TE PWSS",
+        "localName": "RETROFITTING OF SONAJULI TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39133",
+        "villageName": "Barjuli Sonajuli Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192523",
+        "ddrName": "RETROFITTING OF SONAJULI TE PWSS",
+        "projectId": "8192523",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SONAJULI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30081191",
+      "name": "Buragaon T.E PWSS",
+      "description": "Buragaon T.E PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Buragaon T.E PWSS",
+        "localName": "Buragaon T.E PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39133",
+        "villageName": "Barjuli Sonajuli Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30081191",
+        "ddrName": "Buragaon T.E PWSS",
+        "projectId": "30081191",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Buragaon T.E PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013844",
+      "name": "Barjuli TE No. 17 Line PWSS",
+      "description": "Barjuli TE No. 17 Line PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barjuli TE No. 17 Line PWSS",
+        "localName": "Barjuli TE No. 17 Line PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39134",
+        "villageName": "Barjuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013844",
+        "ddrName": "Barjuli TE No. 17 Line PWSS",
+        "projectId": "30013844",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barjuli TE No. 17 Line PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174094",
+      "name": "BARJULI HAT KHOLA PWSS",
+      "description": "BARJULI HAT KHOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARJULI HAT KHOLA PWSS",
+        "localName": "BARJULI HAT KHOLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39134",
+        "villageName": "Barjuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174094",
+        "ddrName": "BARJULI HAT KHOLA PWSS",
+        "projectId": "30174094",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARJULI HAT KHOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059517",
+      "name": "BARJULI TE NO. 5 PWSS",
+      "description": "BARJULI TE NO. 5 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARJULI TE NO. 5 PWSS",
+        "localName": "BARJULI TE NO. 5 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39134",
+        "villageName": "Barjuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059517",
+        "ddrName": "BARJULI TE NO. 5 PWSS",
+        "projectId": "30059517",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARJULI TE NO. 5 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30127370",
+      "name": "Barjuli TE Dhipa Line PWSS",
+      "description": "Barjuli TE Dhipa Line PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barjuli TE Dhipa Line PWSS",
+        "localName": "Barjuli TE Dhipa Line PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39134",
+        "villageName": "Barjuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30127370",
+        "ddrName": "Barjuli TE Dhipa Line PWSS",
+        "projectId": "30127370",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barjuli TE Dhipa Line PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038150",
+      "name": "Dholkoba TE. PWSS",
+      "description": "Dholkoba TE. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dholkoba TE. PWSS",
+        "localName": "Dholkoba TE. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "39129",
+        "villageName": "Dholkoba T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038150",
+        "ddrName": "Dholkoba TE. PWSS",
+        "projectId": "30038150",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dholkoba TE. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175075",
+      "name": "Bhelatar gaon MPWSS",
+      "description": "Bhelatar gaon MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhelatar gaon MPWSS",
+        "localName": "Bhelatar gaon MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "586459",
+        "villageName": "No.1 Bhelatar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175075",
+        "ddrName": "Bhelatar gaon MPWSS",
+        "projectId": "30175075",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhelatar gaon MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5552515",
+      "name": "BARJULI TE PWSS",
+      "description": "BARJULI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARJULI TE PWSS",
+        "localName": "BARJULI TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "586459",
+        "villageName": "No.1 Bhelatar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5552515",
+        "ddrName": "BARJULI TE PWSS",
+        "projectId": "5552515",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARJULI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013915",
+      "name": "No. 2 Rangapara TE PWSS",
+      "description": "No. 2 Rangapara TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Rangapara TE PWSS",
+        "localName": "No. 2 Rangapara TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23175",
+        "panchayatname": "Barjuli",
+        "villageCode": "647828",
+        "villageName": "No.2 Rangapara T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013915",
+        "ddrName": "No. 2 Rangapara TE PWSS",
+        "projectId": "30013915",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Rangapara TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077169",
+      "name": "Harchura Reo Grant PWSS",
+      "description": "Harchura Reo Grant PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Harchura Reo Grant PWSS",
+        "localName": "Harchura Reo Grant PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39113",
+        "villageName": "Harchura Reo Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077169",
+        "ddrName": "Harchura Reo Grant PWSS",
+        "projectId": "30077169",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Harchura Reo Grant PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213798",
+      "name": "New Namgaon T.E. PWSS",
+      "description": "New Namgaon T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Namgaon T.E. PWSS",
+        "localName": "New Namgaon T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39116",
+        "villageName": "Nam Gaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213798",
+        "ddrName": "New Namgaon T.E. PWSS",
+        "projectId": "30213798",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Namgaon T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4657150",
+      "name": "RETROFITTING OF HARCHURA PWSS",
+      "description": "RETROFITTING OF HARCHURA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HARCHURA PWSS",
+        "localName": "RETROFITTING OF HARCHURA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39114",
+        "villageName": "No.1 Harchura T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4657150",
+        "ddrName": "RETROFITTING OF HARCHURA PWSS",
+        "projectId": "4657150",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HARCHURA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126334",
+      "name": "New Harchura PWSS",
+      "description": "New Harchura PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Harchura PWSS",
+        "localName": "New Harchura PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39114",
+        "villageName": "No.1 Harchura T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126334",
+        "ddrName": "New Harchura PWSS",
+        "projectId": "30126334",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Harchura PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30062583",
+      "name": "No. 1 Hatibari TE PWSS",
+      "description": "No. 1 Hatibari TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Hatibari TE PWSS",
+        "localName": "No. 1 Hatibari TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39112",
+        "villageName": "No.1 Hatibari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30062583",
+        "ddrName": "No. 1 Hatibari TE PWSS",
+        "projectId": "30062583",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Hatibari TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30119702",
+      "name": "No. 1 Namgaon TE PWSS",
+      "description": "No. 1 Namgaon TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Namgaon TE PWSS",
+        "localName": "No. 1 Namgaon TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "647864",
+        "villageName": "No.1 Nam Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30119702",
+        "ddrName": "No. 1 Namgaon TE PWSS",
+        "projectId": "30119702",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Namgaon TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30199609",
+      "name": "No. 2 Hatibari T.E. PWSS",
+      "description": "No. 2 Hatibari T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Hatibari T.E. PWSS",
+        "localName": "No. 2 Hatibari T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "647768",
+        "villageName": "No.2 Hatibari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30199609",
+        "ddrName": "No. 2 Hatibari T.E. PWSS",
+        "projectId": "30199609",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Hatibari T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010783",
+      "name": "No. 2 Namgaon T.E. PWSS",
+      "description": "No. 2 Namgaon T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Namgaon T.E. PWSS",
+        "localName": "No. 2 Namgaon T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "647865",
+        "villageName": "No.2 Namgaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010783",
+        "ddrName": "No. 2 Namgaon T.E. PWSS",
+        "projectId": "30010783",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Namgaon T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212926",
+      "name": "No. 3 Hatibari T.E. PWSS",
+      "description": "No. 3 Hatibari T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 3 Hatibari T.E. PWSS",
+        "localName": "No. 3 Hatibari T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39118",
+        "villageName": "No.3 Hatibari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212926",
+        "ddrName": "No. 3 Hatibari T.E. PWSS",
+        "projectId": "30212926",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 3 Hatibari T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181604",
+      "name": "No. 4 Hatibari T.E. MPWS",
+      "description": "No. 4 Hatibari T.E. MPWS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 4 Hatibari T.E. MPWS",
+        "localName": "No. 4 Hatibari T.E. MPWS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "647767",
+        "villageName": "No.4 Hatibari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181604",
+        "ddrName": "No. 4 Hatibari T.E. MPWS",
+        "projectId": "30181604",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 4 Hatibari T.E. MPWS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077183",
+      "name": "Harchura Patgaon PWSS",
+      "description": "Harchura Patgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Harchura Patgaon PWSS",
+        "localName": "Harchura Patgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23173",
+        "panchayatname": "Hatibari",
+        "villageCode": "39115",
+        "villageName": "Patgaon T.e. (harchura)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077183",
+        "ddrName": "Harchura Patgaon PWSS",
+        "projectId": "30077183",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Harchura Patgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051391",
+      "name": "New Kacharigaon PWSS",
+      "description": "New Kacharigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Kacharigaon PWSS",
+        "localName": "New Kacharigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "647826",
+        "villageName": "Kachari Gaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051391",
+        "ddrName": "New Kacharigaon PWSS",
+        "projectId": "30051391",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Kacharigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4657198",
+      "name": "Kacharigaon TE PWSS",
+      "description": "Kacharigaon TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kacharigaon TE PWSS",
+        "localName": "Kacharigaon TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "647826",
+        "villageName": "Kachari Gaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4657198",
+        "ddrName": "Kacharigaon TE PWSS",
+        "projectId": "4657198",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kacharigaon TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178343",
+      "name": "RETROFITTING OF KACHARIGAON TE PWSS",
+      "description": "RETROFITTING OF KACHARIGAON TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KACHARIGAON TE PWSS",
+        "localName": "RETROFITTING OF KACHARIGAON TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "647826",
+        "villageName": "Kachari Gaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178343",
+        "ddrName": "RETROFITTING OF KACHARIGAON TE PWSS",
+        "projectId": "8178343",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KACHARIGAON TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175213",
+      "name": "Naharanigaon PWSS",
+      "description": "Naharanigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharanigaon PWSS",
+        "localName": "Naharanigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "647826",
+        "villageName": "Kachari Gaon T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175213",
+        "ddrName": "Naharanigaon PWSS",
+        "projectId": "30175213",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharanigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013863",
+      "name": "Pachim  Naharani PWSS",
+      "description": "Pachim  Naharani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pachim  Naharani PWSS",
+        "localName": "Pachim  Naharani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "586371",
+        "villageName": "Naharani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013863",
+        "ddrName": "Pachim  Naharani PWSS",
+        "projectId": "30013863",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pachim  Naharani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30080805",
+      "name": "Uttar Naharani T.E. PWSS",
+      "description": "Uttar Naharani T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uttar Naharani T.E. PWSS",
+        "localName": "Uttar Naharani T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "586371",
+        "villageName": "Naharani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30080805",
+        "ddrName": "Uttar Naharani T.E. PWSS",
+        "projectId": "30080805",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uttar Naharani T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30080792",
+      "name": "No. 2 Naharani T.E. PWSS",
+      "description": "No. 2 Naharani T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Naharani T.E. PWSS",
+        "localName": "No. 2 Naharani T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "586371",
+        "villageName": "Naharani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30080792",
+        "ddrName": "No. 2 Naharani T.E. PWSS",
+        "projectId": "30080792",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Naharani T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037949",
+      "name": "Naharani Reserve Grant PWSS",
+      "description": "Naharani Reserve Grant PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharani Reserve Grant PWSS",
+        "localName": "Naharani Reserve Grant PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "39079",
+        "villageName": "Naharani Reserve Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037949",
+        "ddrName": "Naharani Reserve Grant PWSS",
+        "projectId": "30037949",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharani Reserve Grant PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30002810",
+      "name": "No. 1 Amaribari TE PWSS",
+      "description": "No. 1 Amaribari TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Amaribari TE PWSS",
+        "localName": "No. 1 Amaribari TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "39083",
+        "villageName": "No.1 Amaribari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30002810",
+        "ddrName": "No. 1 Amaribari TE PWSS",
+        "projectId": "30002810",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Amaribari TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072834",
+      "name": "Tin Line PWSS",
+      "description": "Tin Line PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tin Line PWSS",
+        "localName": "Tin Line PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "39083",
+        "villageName": "No.1 Amaribari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072834",
+        "ddrName": "Tin Line PWSS",
+        "projectId": "30072834",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tin Line PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051501",
+      "name": "Pub Naharani PWSS",
+      "description": "Pub Naharani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pub Naharani PWSS",
+        "localName": "Pub Naharani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "39082",
+        "villageName": "No.1 Naharani T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051501",
+        "ddrName": "Pub Naharani PWSS",
+        "projectId": "30051501",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pub Naharani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30003730",
+      "name": "No. 3 Naharani TE PWSS",
+      "description": "No. 3 Naharani TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 3 Naharani TE PWSS",
+        "localName": "No. 3 Naharani TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "647769",
+        "villageName": "No.3 Naharani T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30003730",
+        "ddrName": "No. 3 Naharani TE PWSS",
+        "projectId": "30003730",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 3 Naharani TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051373",
+      "name": "Upar Kachari PWSS",
+      "description": "Upar Kachari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upar Kachari PWSS",
+        "localName": "Upar Kachari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "39080",
+        "villageName": "Upar Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051373",
+        "ddrName": "Upar Kachari PWSS",
+        "projectId": "30051373",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upar Kachari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8257091",
+      "name": "Upor Kochari",
+      "description": "Upor Kochari",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upor Kochari",
+        "localName": "Upor Kochari",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23169",
+        "panchayatname": "Naharani",
+        "villageCode": "39080",
+        "villageName": "Upar Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8257091",
+        "ddrName": "Upor Kochari",
+        "projectId": "8257091",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upor Kochari",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016510",
+      "name": "Dhulapadung Gaon PWSS",
+      "description": "Dhulapadung Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhulapadung Gaon PWSS",
+        "localName": "Dhulapadung Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39123",
+        "villageName": "Dhula Padung Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016510",
+        "ddrName": "Dhulapadung Gaon PWSS",
+        "projectId": "30016510",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhulapadung Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8189136",
+      "name": "RETROFITTING OF DHULAPADUNG PWSS",
+      "description": "RETROFITTING OF DHULAPADUNG PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHULAPADUNG PWSS",
+        "localName": "RETROFITTING OF DHULAPADUNG PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39123",
+        "villageName": "Dhula Padung Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8189136",
+        "ddrName": "RETROFITTING OF DHULAPADUNG PWSS",
+        "projectId": "8189136",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHULAPADUNG PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173387",
+      "name": "BORO KACHUMARI PWSS",
+      "description": "BORO KACHUMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORO KACHUMARI PWSS",
+        "localName": "BORO KACHUMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23174",
+        "panchayatname": "NAMANIGAON",
+        "villageCode": "39122",
+        "villageName": "DURUNG  T.E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173387",
+        "ddrName": "BORO KACHUMARI PWSS",
+        "projectId": "30173387",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORO KACHUMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5407828",
+      "name": "RETROFITTING OF DURUNG TE PWSS",
+      "description": "RETROFITTING OF DURUNG TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DURUNG TE PWSS",
+        "localName": "RETROFITTING OF DURUNG TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23174",
+        "panchayatname": "NAMANIGAON",
+        "villageCode": "39122",
+        "villageName": "DURUNG  T.E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5407828",
+        "ddrName": "RETROFITTING OF DURUNG TE PWSS",
+        "projectId": "5407828",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DURUNG TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174887",
+      "name": "Namani Gaon No.2 PWSS",
+      "description": "Namani Gaon No.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Namani Gaon No.2 PWSS",
+        "localName": "Namani Gaon No.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23174",
+        "panchayatname": "NAMANIGAON",
+        "villageCode": "39122",
+        "villageName": "DURUNG  T.E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174887",
+        "ddrName": "Namani Gaon No.2 PWSS",
+        "projectId": "30174887",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Namani Gaon No.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153639",
+      "name": "RETROFITTING OF NAMGAON TE PWSS",
+      "description": "RETROFITTING OF NAMGAON TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAMGAON TE PWSS",
+        "localName": "RETROFITTING OF NAMGAON TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23174",
+        "panchayatname": "NAMANIGAON",
+        "villageCode": "39122",
+        "villageName": "DURUNG  T.E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153639",
+        "ddrName": "RETROFITTING OF NAMGAON TE PWSS",
+        "projectId": "8153639",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAMGAON TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4637354",
+      "name": "Namanigaon PWSS",
+      "description": "Namanigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Namanigaon PWSS",
+        "localName": "Namanigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23174",
+        "panchayatname": "NAMANIGAON",
+        "villageCode": "39122",
+        "villageName": "DURUNG  T.E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4637354",
+        "ddrName": "Namanigaon PWSS",
+        "projectId": "4637354",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Namanigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068331",
+      "name": "Nagapathar PWSS",
+      "description": "Nagapathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nagapathar PWSS",
+        "localName": "Nagapathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39127",
+        "villageName": "Nagapathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068331",
+        "ddrName": "Nagapathar PWSS",
+        "projectId": "30068331",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nagapathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200381",
+      "name": "Retrofitting of Sessa TE PWSS",
+      "description": "Retrofitting of Sessa TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Sessa TE PWSS",
+        "localName": "Retrofitting of Sessa TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39127",
+        "villageName": "Nagapathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200381",
+        "ddrName": "Retrofitting of Sessa TE PWSS",
+        "projectId": "30200381",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Sessa TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5552472",
+      "name": "SESSA TE PWSS",
+      "description": "SESSA TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SESSA TE PWSS",
+        "localName": "SESSA TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39127",
+        "villageName": "Nagapathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5552472",
+        "ddrName": "SESSA TE PWSS",
+        "projectId": "5552472",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SESSA TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174747",
+      "name": "Namani Gaon No.1 PWSS",
+      "description": "Namani Gaon No.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Namani Gaon No.1 PWSS",
+        "localName": "Namani Gaon No.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39128",
+        "villageName": "Namani Gaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174747",
+        "ddrName": "Namani Gaon No.1 PWSS",
+        "projectId": "30174747",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Namani Gaon No.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153665",
+      "name": "RETROFITTING OF NAMANIGAON PWSS",
+      "description": "RETROFITTING OF NAMANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAMANIGAON PWSS",
+        "localName": "RETROFITTING OF NAMANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39128",
+        "villageName": "Namani Gaon No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153665",
+        "ddrName": "RETROFITTING OF NAMANIGAON PWSS",
+        "projectId": "8153665",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAMANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30082892",
+      "name": "Sessa TE No 1 PWSS",
+      "description": "Sessa TE No 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sessa TE No 1 PWSS",
+        "localName": "Sessa TE No 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "590453",
+        "villageName": "Sessa T.e. No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30082892",
+        "ddrName": "Sessa TE No 1 PWSS",
+        "projectId": "30082892",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sessa TE No 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048127",
+      "name": "Sessa TE No. 2 PWSS",
+      "description": "Sessa TE No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sessa TE No. 2 PWSS",
+        "localName": "Sessa TE No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39121",
+        "villageName": "Sessa T.e. No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048127",
+        "ddrName": "Sessa TE No. 2 PWSS",
+        "projectId": "30048127",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sessa TE No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206800",
+      "name": "RETROFITTING OF SESSA PANBARI PWSS",
+      "description": "RETROFITTING OF SESSA PANBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SESSA PANBARI PWSS",
+        "localName": "RETROFITTING OF SESSA PANBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39121",
+        "villageName": "Sessa T.e. No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206800",
+        "ddrName": "RETROFITTING OF SESSA PANBARI PWSS",
+        "projectId": "8206800",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SESSA PANBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1853501",
+      "name": "Sessa Panbari PWSS",
+      "description": "Sessa Panbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sessa Panbari PWSS",
+        "localName": "Sessa Panbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39121",
+        "villageName": "Sessa T.e. No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1853501",
+        "ddrName": "Sessa Panbari PWSS",
+        "projectId": "1853501",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sessa Panbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30083052",
+      "name": "Sessa TE No 3 PWSS",
+      "description": "Sessa TE No 3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sessa TE No 3 PWSS",
+        "localName": "Sessa TE No 3 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39124",
+        "villageName": "Sessa T.e. No.3",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30083052",
+        "ddrName": "Sessa TE No 3 PWSS",
+        "projectId": "30083052",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sessa TE No 3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012439",
+      "name": "Sessa TE No. 4 PWSS",
+      "description": "Sessa TE No. 4 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sessa TE No. 4 PWSS",
+        "localName": "Sessa TE No. 4 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "590452",
+        "villageName": "Sessa T.e. No.4",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012439",
+        "ddrName": "Sessa TE No. 4 PWSS",
+        "projectId": "30012439",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sessa TE No. 4 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30009627",
+      "name": "New Singrijan TE PWSS",
+      "description": "New Singrijan TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Singrijan TE PWSS",
+        "localName": "New Singrijan TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39119",
+        "villageName": "Singari Jan T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30009627",
+        "ddrName": "New Singrijan TE PWSS",
+        "projectId": "30009627",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Singrijan TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5407809",
+      "name": "RETROFITTING OF SINGRIJAN TE PWSS",
+      "description": "RETROFITTING OF SINGRIJAN TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SINGRIJAN TE PWSS",
+        "localName": "RETROFITTING OF SINGRIJAN TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23174",
+        "panchayatname": "Namanigaon",
+        "villageCode": "39119",
+        "villageName": "Singari Jan T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5407809",
+        "ddrName": "RETROFITTING OF SINGRIJAN TE PWSS",
+        "projectId": "5407809",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SINGRIJAN TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013177",
+      "name": "New Adabari TE PWSS (Zone-I)",
+      "description": "New Adabari TE PWSS (Zone-I)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Adabari TE PWSS (Zone-I)",
+        "localName": "New Adabari TE PWSS (Zone-I)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39092",
+        "villageName": "Adabari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013177",
+        "ddrName": "New Adabari TE PWSS (Zone-I)",
+        "projectId": "30013177",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Adabari TE PWSS (Zone-I)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016693",
+      "name": "Natun Adabari TE PWSS",
+      "description": "Natun Adabari TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Natun Adabari TE PWSS",
+        "localName": "Natun Adabari TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39091",
+        "villageName": "Natun Adabari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016693",
+        "ddrName": "Natun Adabari TE PWSS",
+        "projectId": "30016693",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Natun Adabari TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010046",
+      "name": "No. 1 Panipota TE PWSS",
+      "description": "No. 1 Panipota TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Panipota TE PWSS",
+        "localName": "No. 1 Panipota TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "647819",
+        "villageName": "No.1 Panipota T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010046",
+        "ddrName": "No. 1 Panipota TE PWSS",
+        "projectId": "30010046",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Panipota TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206834",
+      "name": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+      "description": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+        "localName": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39087",
+        "villageName": "No.2 Panipota T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206834",
+        "ddrName": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+        "projectId": "8206834",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004691",
+      "name": "No. 2 Panipota PWSS",
+      "description": "No. 2 Panipota PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Panipota PWSS",
+        "localName": "No. 2 Panipota PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39087",
+        "villageName": "No.2 Panipota T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004691",
+        "ddrName": "No. 2 Panipota PWSS",
+        "projectId": "30004691",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Panipota PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174070",
+      "name": "Panipota 10 No. Line MPWSS",
+      "description": "Panipota 10 No. Line MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panipota 10 No. Line MPWSS",
+        "localName": "Panipota 10 No. Line MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39089",
+        "villageName": "Panipota T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174070",
+        "ddrName": "Panipota 10 No. Line MPWSS",
+        "projectId": "30174070",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panipota 10 No. Line MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8298009",
+      "name": "Panipota T.E. 18306120212",
+      "description": "Panipota T.E. 18306120212",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panipota T.E. 18306120212",
+        "localName": "Panipota T.E. 18306120212",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39089",
+        "villageName": "Panipota T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8298009",
+        "ddrName": "Panipota T.E. 18306120212",
+        "projectId": "8298009",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panipota T.E. 18306120212",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004793",
+      "name": "Panipota TE PWSS",
+      "description": "Panipota TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Panipota TE PWSS",
+        "localName": "Panipota TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39089",
+        "villageName": "Panipota T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004793",
+        "ddrName": "Panipota TE PWSS",
+        "projectId": "30004793",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Panipota TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181168",
+      "name": "New Phulbari TE PWSS",
+      "description": "New Phulbari TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Phulbari TE PWSS",
+        "localName": "New Phulbari TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39085",
+        "villageName": "Phulbari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181168",
+        "ddrName": "New Phulbari TE PWSS",
+        "projectId": "30181168",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Phulbari TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174407",
+      "name": "Phulbari Railgate MPWSS",
+      "description": "Phulbari Railgate MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Phulbari Railgate MPWSS",
+        "localName": "Phulbari Railgate MPWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23170",
+        "panchayatname": "Phulbari",
+        "villageCode": "39085",
+        "villageName": "Phulbari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174407",
+        "ddrName": "Phulbari Railgate MPWSS",
+        "projectId": "30174407",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Phulbari Railgate MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158825",
+      "name": "Amtal Benagali PWSS",
+      "description": "Amtal Benagali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amtal Benagali PWSS",
+        "localName": "Amtal Benagali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39105",
+        "villageName": "Aamtal Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158825",
+        "ddrName": "Amtal Benagali PWSS",
+        "projectId": "30158825",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amtal Benagali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175155",
+      "name": "Hatidubi Gaon PWSS",
+      "description": "Hatidubi Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatidubi Gaon PWSS",
+        "localName": "Hatidubi Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39101",
+        "villageName": "Hatidubi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175155",
+        "ddrName": "Hatidubi Gaon PWSS",
+        "projectId": "30175155",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatidubi Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192655",
+      "name": "RETROFITTING OF PHULAGURI PWSS",
+      "description": "RETROFITTING OF PHULAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PHULAGURI PWSS",
+        "localName": "RETROFITTING OF PHULAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39101",
+        "villageName": "Hatidubi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192655",
+        "ddrName": "RETROFITTING OF PHULAGURI PWSS",
+        "projectId": "8192655",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PHULAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.600587",
+      "name": "Phulaguri PWSS",
+      "description": "Phulaguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Phulaguri PWSS",
+        "localName": "Phulaguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39101",
+        "villageName": "Hatidubi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "600587",
+        "ddrName": "Phulaguri PWSS",
+        "projectId": "600587",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Phulaguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175190",
+      "name": "Hatipukhuri North PWSS",
+      "description": "Hatipukhuri North PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatipukhuri North PWSS",
+        "localName": "Hatipukhuri North PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39106",
+        "villageName": "Hatipukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175190",
+        "ddrName": "Hatipukhuri North PWSS",
+        "projectId": "30175190",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatipukhuri North PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8178428",
+      "name": "RETROFITTING OF HATIPUKHURI PWSS",
+      "description": "RETROFITTING OF HATIPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HATIPUKHURI PWSS",
+        "localName": "RETROFITTING OF HATIPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39106",
+        "villageName": "Hatipukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8178428",
+        "ddrName": "RETROFITTING OF HATIPUKHURI PWSS",
+        "projectId": "8178428",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HATIPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2615100",
+      "name": "Hatipukhuri PWSS",
+      "description": "Hatipukhuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatipukhuri PWSS",
+        "localName": "Hatipukhuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39106",
+        "villageName": "Hatipukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2615100",
+        "ddrName": "Hatipukhuri PWSS",
+        "projectId": "2615100",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatipukhuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175169",
+      "name": "No.1 Bahumari Gaon PWSS",
+      "description": "No.1 Bahumari Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Bahumari Gaon PWSS",
+        "localName": "No.1 Bahumari Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "647831",
+        "villageName": "No.1 Bahumari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175169",
+        "ddrName": "No.1 Bahumari Gaon PWSS",
+        "projectId": "30175169",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Bahumari Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8181848",
+      "name": "RETROFITTING OF BAHUMARI PWSS",
+      "description": "RETROFITTING OF BAHUMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAHUMARI PWSS",
+        "localName": "RETROFITTING OF BAHUMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39103",
+        "villageName": "No.2 Bahumari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8181848",
+        "ddrName": "RETROFITTING OF BAHUMARI PWSS",
+        "projectId": "8181848",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAHUMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5552540",
+      "name": "BAHUMARI PWSS",
+      "description": "BAHUMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHUMARI PWSS",
+        "localName": "BAHUMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39103",
+        "villageName": "No.2 Bahumari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5552540",
+        "ddrName": "BAHUMARI PWSS",
+        "projectId": "5552540",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHUMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30127284",
+      "name": "No. 2 Dhulapadung TE PWSS",
+      "description": "No. 2 Dhulapadung TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Dhulapadung TE PWSS",
+        "localName": "No. 2 Dhulapadung TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23172",
+        "panchayatname": "PHULGURI",
+        "villageCode": "39104",
+        "villageName": "No.2 Dhulapadung T.E.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30127284",
+        "ddrName": "No. 2 Dhulapadung TE PWSS",
+        "projectId": "30127284",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Dhulapadung TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174097",
+      "name": "DHULAPADUNG GARDEN PWSS",
+      "description": "DHULAPADUNG GARDEN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHULAPADUNG GARDEN PWSS",
+        "localName": "DHULAPADUNG GARDEN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23172",
+        "panchayatname": "PHULGURI",
+        "villageCode": "39104",
+        "villageName": "No.2 Dhulapadung T.E.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174097",
+        "ddrName": "DHULAPADUNG GARDEN PWSS",
+        "projectId": "30174097",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHULAPADUNG GARDEN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2429111",
+      "name": "Const. of Dhulapadung PWSS",
+      "description": "Const. of Dhulapadung PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Const. of Dhulapadung PWSS",
+        "localName": "Const. of Dhulapadung PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23172",
+        "panchayatname": "PHULGURI",
+        "villageCode": "39104",
+        "villageName": "No.2 Dhulapadung T.E.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2429111",
+        "ddrName": "Const. of Dhulapadung PWSS",
+        "projectId": "2429111",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Const. of Dhulapadung PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037952",
+      "name": "No. 2 Mainajuli TE PWSS",
+      "description": "No. 2 Mainajuli TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Mainajuli TE PWSS",
+        "localName": "No. 2 Mainajuli TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39102",
+        "villageName": "No.2 Mainajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037952",
+        "ddrName": "No. 2 Mainajuli TE PWSS",
+        "projectId": "30037952",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Mainajuli TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174123",
+      "name": "GHANA PHULAGURI PWSS",
+      "description": "GHANA PHULAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHANA PHULAGURI PWSS",
+        "localName": "GHANA PHULAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "647832",
+        "villageName": "Phulguri Nepali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174123",
+        "ddrName": "GHANA PHULAGURI PWSS",
+        "projectId": "30174123",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHANA PHULAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046465",
+      "name": "Phulaguri Nepali PWSS",
+      "description": "Phulaguri Nepali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Phulaguri Nepali PWSS",
+        "localName": "Phulaguri Nepali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "647832",
+        "villageName": "Phulguri Nepali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046465",
+        "ddrName": "Phulaguri Nepali PWSS",
+        "projectId": "30046465",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Phulaguri Nepali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175203",
+      "name": "Samukia Kachari PWSS",
+      "description": "Samukia Kachari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Samukia Kachari PWSS",
+        "localName": "Samukia Kachari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23172",
+        "panchayatname": "Phulguri",
+        "villageCode": "39109",
+        "villageName": "Samukia Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175203",
+        "ddrName": "Samukia Kachari PWSS",
+        "projectId": "30175203",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Samukia Kachari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6385915",
+      "name": "RETROFITTING OF DHENDAI PWSS",
+      "description": "RETROFITTING OF DHENDAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHENDAI PWSS",
+        "localName": "RETROFITTING OF DHENDAI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39095",
+        "villageName": "No.1 Dhendai T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6385915",
+        "ddrName": "RETROFITTING OF DHENDAI PWSS",
+        "projectId": "6385915",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHENDAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067304",
+      "name": "Palang PWSS",
+      "description": "Palang PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Palang PWSS",
+        "localName": "Palang PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39097",
+        "villageName": "No.1 Sonajuli T E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067304",
+        "ddrName": "Palang PWSS",
+        "projectId": "30067304",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Palang PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30045635",
+      "name": "No. 1 Sonajuli TE PWSS",
+      "description": "No. 1 Sonajuli TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Sonajuli TE PWSS",
+        "localName": "No. 1 Sonajuli TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39097",
+        "villageName": "No.1 Sonajuli T E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30045635",
+        "ddrName": "No. 1 Sonajuli TE PWSS",
+        "projectId": "30045635",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Sonajuli TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043846",
+      "name": "Tarajuli TE PWSS",
+      "description": "Tarajuli TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajuli TE PWSS",
+        "localName": "Tarajuli TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39098",
+        "villageName": "No.1 Tarajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043846",
+        "ddrName": "Tarajuli TE PWSS",
+        "projectId": "30043846",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajuli TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051507",
+      "name": "Pub Tarajuli PWSS",
+      "description": "Pub Tarajuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pub Tarajuli PWSS",
+        "localName": "Pub Tarajuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39098",
+        "villageName": "No.1 Tarajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051507",
+        "ddrName": "Pub Tarajuli PWSS",
+        "projectId": "30051507",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pub Tarajuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30081237",
+      "name": "No. 1 Tarajuli T.E. PWSS",
+      "description": "No. 1 Tarajuli T.E. PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Tarajuli T.E. PWSS",
+        "localName": "No. 1 Tarajuli T.E. PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39098",
+        "villageName": "No.1 Tarajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30081237",
+        "ddrName": "No. 1 Tarajuli T.E. PWSS",
+        "projectId": "30081237",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Tarajuli T.E. PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180675",
+      "name": "Dhendai TE No. 2 PWSS",
+      "description": "Dhendai TE No. 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhendai TE No. 2 PWSS",
+        "localName": "Dhendai TE No. 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39094",
+        "villageName": "No.2 Dhendai T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180675",
+        "ddrName": "Dhendai TE No. 2 PWSS",
+        "projectId": "30180675",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhendai TE No. 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037955",
+      "name": "No. 2 Sonajuli T E PWSS",
+      "description": "No. 2 Sonajuli T E PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Sonajuli T E PWSS",
+        "localName": "No. 2 Sonajuli T E PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39096",
+        "villageName": "No.2 Sonajuli T E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037955",
+        "ddrName": "No. 2 Sonajuli T E PWSS",
+        "projectId": "30037955",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Sonajuli T E PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180663",
+      "name": "No. 2 Tarajuli PWSS",
+      "description": "No. 2 Tarajuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Tarajuli PWSS",
+        "localName": "No. 2 Tarajuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "649398",
+        "villageName": "No.2 Tarajuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180663",
+        "ddrName": "No. 2 Tarajuli PWSS",
+        "projectId": "30180663",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Tarajuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30045632",
+      "name": "No. 3 Sonajuli TE PWSS",
+      "description": "No. 3 Sonajuli TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 3 Sonajuli TE PWSS",
+        "localName": "No. 3 Sonajuli TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "39099",
+        "villageName": "No.3 Sonajuli T E",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30045632",
+        "ddrName": "No. 3 Sonajuli TE PWSS",
+        "projectId": "30045632",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 3 Sonajuli TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30200390",
+      "name": "Retrofitting of Tarajuligaon PWSS",
+      "description": "Retrofitting of Tarajuligaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Tarajuligaon PWSS",
+        "localName": "Retrofitting of Tarajuligaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "647827",
+        "villageName": "Tarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30200390",
+        "ddrName": "Retrofitting of Tarajuligaon PWSS",
+        "projectId": "30200390",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Tarajuligaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.603277",
+      "name": "Tarajuli Gaon PWSS",
+      "description": "Tarajuli Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajuli Gaon PWSS",
+        "localName": "Tarajuli Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23171",
+        "panchayatname": "Sonajuli",
+        "villageCode": "647827",
+        "villageName": "Tarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "603277",
+        "ddrName": "Tarajuli Gaon PWSS",
+        "projectId": "603277",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajuli Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013193",
+      "name": "Kachamari Grant PWSS",
+      "description": "Kachamari Grant PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kachamari Grant PWSS",
+        "localName": "Kachamari Grant PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "647861",
+        "villageName": "Kachamari Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013193",
+        "ddrName": "Kachamari Grant PWSS",
+        "projectId": "30013193",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kachamari Grant PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30139213",
+      "name": "Kachamari Madapi PWSS",
+      "description": "Kachamari Madapi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kachamari Madapi PWSS",
+        "localName": "Kachamari Madapi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "RANGAPARA",
+        "panchayatcode": "23176",
+        "panchayatname": "THAKURBARI",
+        "villageCode": "647862",
+        "villageName": "Kachamari Under Madapi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30139213",
+        "ddrName": "Kachamari Madapi PWSS",
+        "projectId": "30139213",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kachamari Madapi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013223",
+      "name": "Mainajuli Grant PWSS",
+      "description": "Mainajuli Grant PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mainajuli Grant PWSS",
+        "localName": "Mainajuli Grant PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "647830",
+        "villageName": "Mainajuli Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013223",
+        "ddrName": "Mainajuli Grant PWSS",
+        "projectId": "30013223",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mainajuli Grant PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30113305",
+      "name": "No. 1 Dhulapadung TE PWSS",
+      "description": "No. 1 Dhulapadung TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Dhulapadung TE PWSS",
+        "localName": "No. 1 Dhulapadung TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39144",
+        "villageName": "No.1 Dhulapadung T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30113305",
+        "ddrName": "No. 1 Dhulapadung TE PWSS",
+        "projectId": "30113305",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Dhulapadung TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013181",
+      "name": "Ghoirali TE No.1 PWSS",
+      "description": "Ghoirali TE No.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghoirali TE No.1 PWSS",
+        "localName": "Ghoirali TE No.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39141",
+        "villageName": "No.1 Ghoirali T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013181",
+        "ddrName": "Ghoirali TE No.1 PWSS",
+        "projectId": "30013181",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghoirali TE No.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013208",
+      "name": "No. 1 Mainajuli TE PWSS",
+      "description": "No. 1 Mainajuli TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Mainajuli TE PWSS",
+        "localName": "No. 1 Mainajuli TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39146",
+        "villageName": "No.1 Mainajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013208",
+        "ddrName": "No. 1 Mainajuli TE PWSS",
+        "projectId": "30013208",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Mainajuli TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6350854",
+      "name": "RETROFITTING OF THAKURBARI PWSS",
+      "description": "RETROFITTING OF THAKURBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF THAKURBARI PWSS",
+        "localName": "RETROFITTING OF THAKURBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39145",
+        "villageName": "No.1 Thakurbari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6350854",
+        "ddrName": "RETROFITTING OF THAKURBARI PWSS",
+        "projectId": "6350854",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF THAKURBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004720",
+      "name": "Bhelowater Gaon PWSS",
+      "description": "Bhelowater Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhelowater Gaon PWSS",
+        "localName": "Bhelowater Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39140",
+        "villageName": "No.2 Bhelowater Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004720",
+        "ddrName": "Bhelowater Gaon PWSS",
+        "projectId": "30004720",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhelowater Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013179",
+      "name": "No. 2 Ghoirali TE PWSS",
+      "description": "No. 2 Ghoirali TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 2 Ghoirali TE PWSS",
+        "localName": "No. 2 Ghoirali TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "647833",
+        "villageName": "No.2 Gorali T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013179",
+        "ddrName": "No. 2 Ghoirali TE PWSS",
+        "projectId": "30013179",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 2 Ghoirali TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30127356",
+      "name": "New Thakurbari PWSS",
+      "description": "New Thakurbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "New Thakurbari PWSS",
+        "localName": "New Thakurbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39138",
+        "villageName": "No.2 Thakurbari T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30127356",
+        "ddrName": "New Thakurbari PWSS",
+        "projectId": "30127356",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "New Thakurbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057748",
+      "name": "No. 3 Dhulapadung TE PWSS",
+      "description": "No. 3 Dhulapadung TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 3 Dhulapadung TE PWSS",
+        "localName": "No. 3 Dhulapadung TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "647835",
+        "villageName": "No.3 Dhulapadung T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057748",
+        "ddrName": "No. 3 Dhulapadung TE PWSS",
+        "projectId": "30057748",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 3 Dhulapadung TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8252919",
+      "name": "Pogola Bil",
+      "description": "Pogola Bil",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pogola Bil",
+        "localName": "Pogola Bil",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39142",
+        "villageName": "Pagala Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8252919",
+        "ddrName": "Pogola Bil",
+        "projectId": "8252919",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pogola Bil",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013855",
+      "name": "Pagla Bil Gaon PWSS",
+      "description": "Pagla Bil Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pagla Bil Gaon PWSS",
+        "localName": "Pagla Bil Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1253",
+        "blockname": "Rangapara",
+        "panchayatcode": "23176",
+        "panchayatname": "Thakurbari",
+        "villageCode": "39142",
+        "villageName": "Pagala Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013855",
+        "ddrName": "Pagla Bil Gaon PWSS",
+        "projectId": "30013855",
+        "regionName": "1253"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pagla Bil Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057972",
+      "name": "BAHBARI BAGISA PWSS",
+      "description": "BAHBARI BAGISA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHBARI BAGISA PWSS",
+        "localName": "BAHBARI BAGISA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39077",
+        "villageName": "Bahabari Bagisa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057972",
+        "ddrName": "BAHBARI BAGISA PWSS",
+        "projectId": "30057972",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHBARI BAGISA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5102996",
+      "name": "Niz Bahbari  PWSS",
+      "description": "Niz Bahbari  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Niz Bahbari  PWSS",
+        "localName": "Niz Bahbari  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39075",
+        "villageName": "Bahbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5102996",
+        "ddrName": "Niz Bahbari  PWSS",
+        "projectId": "5102996",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Niz Bahbari  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187270",
+      "name": "Retrofitting of Niz Bahbari PWSS",
+      "description": "Retrofitting of Niz Bahbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Niz Bahbari PWSS",
+        "localName": "Retrofitting of Niz Bahbari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39075",
+        "villageName": "Bahbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187270",
+        "ddrName": "Retrofitting of Niz Bahbari PWSS",
+        "projectId": "8187270",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Niz Bahbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187278",
+      "name": "Retrofitting of Barson PWSS",
+      "description": "Retrofitting of Barson PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Barson PWSS",
+        "localName": "Retrofitting of Barson PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39076",
+        "villageName": "Barson Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187278",
+        "ddrName": "Retrofitting of Barson PWSS",
+        "projectId": "8187278",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Barson PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5102401",
+      "name": "BARSON PWSS",
+      "description": "BARSON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARSON PWSS",
+        "localName": "BARSON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39076",
+        "villageName": "Barson Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5102401",
+        "ddrName": "BARSON PWSS",
+        "projectId": "5102401",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARSON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056016",
+      "name": "GANDURA BIL PWSS",
+      "description": "GANDURA BIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GANDURA BIL PWSS",
+        "localName": "GANDURA BIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39072",
+        "villageName": "Gandura Bil",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056016",
+        "ddrName": "GANDURA BIL PWSS",
+        "projectId": "30056016",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GANDURA BIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215102",
+      "name": "Retrofitting of Manijarani PWSS",
+      "description": "Retrofitting of Manijarani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Manijarani PWSS",
+        "localName": "Retrofitting of Manijarani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39069",
+        "villageName": "Manijarani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215102",
+        "ddrName": "Retrofitting of Manijarani PWSS",
+        "projectId": "8215102",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Manijarani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1812780",
+      "name": "Manijarani PWSS",
+      "description": "Manijarani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Manijarani PWSS",
+        "localName": "Manijarani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39069",
+        "villageName": "Manijarani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1812780",
+        "ddrName": "Manijarani PWSS",
+        "projectId": "1812780",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Manijarani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156393",
+      "name": "RETROFITTING OF NAHARANI PATHAR PWSS",
+      "description": "RETROFITTING OF NAHARANI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAHARANI PATHAR PWSS",
+        "localName": "RETROFITTING OF NAHARANI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "647836",
+        "villageName": "Naharani Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156393",
+        "ddrName": "RETROFITTING OF NAHARANI PATHAR PWSS",
+        "projectId": "8156393",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAHARANI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5357091",
+      "name": "Naharani PWSS",
+      "description": "Naharani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharani PWSS",
+        "localName": "Naharani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "647836",
+        "villageName": "Naharani Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5357091",
+        "ddrName": "Naharani PWSS",
+        "projectId": "5357091",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30146665",
+      "name": "BAHBARI GAON PWSS",
+      "description": "BAHBARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHBARI GAON PWSS",
+        "localName": "BAHBARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "586711",
+        "villageName": "Niz-bahbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30146665",
+        "ddrName": "BAHBARI GAON PWSS",
+        "projectId": "30146665",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHBARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8228832",
+      "name": "Retrofitting of Ghagra TE PWSS",
+      "description": "Retrofitting of Ghagra TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Ghagra TE PWSS",
+        "localName": "Retrofitting of Ghagra TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "647507",
+        "villageName": "No.1 Ghogora Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8228832",
+        "ddrName": "Retrofitting of Ghagra TE PWSS",
+        "projectId": "8228832",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Ghagra TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187290",
+      "name": "Retrofitting of Old Ghagra PWSS",
+      "description": "Retrofitting of Old Ghagra PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Old Ghagra PWSS",
+        "localName": "Retrofitting of Old Ghagra PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "647507",
+        "villageName": "No.1 Ghogora Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187290",
+        "ddrName": "Retrofitting of Old Ghagra PWSS",
+        "projectId": "8187290",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Old Ghagra PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172507",
+      "name": "NEW GHOGRA PWSS",
+      "description": "NEW GHOGRA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NEW GHOGRA PWSS",
+        "localName": "NEW GHOGRA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "647507",
+        "villageName": "No.1 Ghogora Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172507",
+        "ddrName": "NEW GHOGRA PWSS",
+        "projectId": "30172507",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NEW GHOGRA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5103007",
+      "name": "Old  Ghogra  PWSS",
+      "description": "Old  Ghogra  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Old  Ghogra  PWSS",
+        "localName": "Old  Ghogra  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "647507",
+        "villageName": "No.1 Ghogora Req Grant",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5103007",
+        "ddrName": "Old  Ghogra  PWSS",
+        "projectId": "5103007",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Old  Ghogra  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203729",
+      "name": "RETROFITTING OF RUPAJULI PWSS",
+      "description": "RETROFITTING OF RUPAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RUPAJULI PWSS",
+        "localName": "RETROFITTING OF RUPAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39074",
+        "villageName": "No.1 Rupajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203729",
+        "ddrName": "RETROFITTING OF RUPAJULI PWSS",
+        "projectId": "8203729",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RUPAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4516012",
+      "name": "RUPAJULI PWSS",
+      "description": "RUPAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RUPAJULI PWSS",
+        "localName": "RUPAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23168",
+        "panchayatname": "Bahbari",
+        "villageCode": "39074",
+        "villageName": "No.1 Rupajuli T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4516012",
+        "ddrName": "RUPAJULI PWSS",
+        "projectId": "4516012",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RUPAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018921",
+      "name": "BALISIHA KACHARI PWSS",
+      "description": "BALISIHA KACHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALISIHA KACHARI PWSS",
+        "localName": "BALISIHA KACHARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39045",
+        "villageName": "Balisiha Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018921",
+        "ddrName": "BALISIHA KACHARI PWSS",
+        "projectId": "30018921",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALISIHA KACHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141666",
+      "name": "RETROFITTING OF BANDARMARI PWSS",
+      "description": "RETROFITTING OF BANDARMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BANDARMARI PWSS",
+        "localName": "RETROFITTING OF BANDARMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "650892",
+        "villageName": "Bandar Mari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141666",
+        "ddrName": "RETROFITTING OF BANDARMARI PWSS",
+        "projectId": "8141666",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BANDARMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5072844",
+      "name": "BANDARMARI PWSS",
+      "description": "BANDARMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANDARMARI PWSS",
+        "localName": "BANDARMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39042",
+        "villageName": "Bandarmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5072844",
+        "ddrName": "BANDARMARI PWSS",
+        "projectId": "5072844",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANDARMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004991",
+      "name": "Borghop PWSS",
+      "description": "Borghop PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borghop PWSS",
+        "localName": "Borghop PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39052",
+        "villageName": "Borghop",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004991",
+        "ddrName": "Borghop PWSS",
+        "projectId": "30004991",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borghop PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057974",
+      "name": "GARAKHIYA PUKHURI PWSS",
+      "description": "GARAKHIYA PUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARAKHIYA PUKHURI PWSS",
+        "localName": "GARAKHIYA PUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39046",
+        "villageName": "Garakhia Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057974",
+        "ddrName": "GARAKHIYA PUKHURI PWSS",
+        "projectId": "30057974",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARAKHIYA PUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056027",
+      "name": "GHATUA CHUBURI PWSS",
+      "description": "GHATUA CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHATUA CHUBURI PWSS",
+        "localName": "GHATUA CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39049",
+        "villageName": "Ghatua Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056027",
+        "ddrName": "GHATUA CHUBURI PWSS",
+        "projectId": "30056027",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHATUA CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141686",
+      "name": "RETROFITTING OF KAKALBHANGI PWSS",
+      "description": "RETROFITTING OF KAKALBHANGI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KAKALBHANGI PWSS",
+        "localName": "RETROFITTING OF KAKALBHANGI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39044",
+        "villageName": "Kakal Bhagi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141686",
+        "ddrName": "RETROFITTING OF KAKALBHANGI PWSS",
+        "projectId": "8141686",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KAKALBHANGI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5074129",
+      "name": "KAKALBHAGHI PWSS",
+      "description": "KAKALBHAGHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAKALBHAGHI PWSS",
+        "localName": "KAKALBHAGHI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39044",
+        "villageName": "Kakal Bhagi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5074129",
+        "ddrName": "KAKALBHAGHI PWSS",
+        "projectId": "5074129",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAKALBHAGHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6241823",
+      "name": "Retrofitting of Saraka PWSS ( NQ )",
+      "description": "Retrofitting of Saraka PWSS ( NQ )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Saraka PWSS ( NQ )",
+        "localName": "Retrofitting of Saraka PWSS ( NQ )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39044",
+        "villageName": "Kakal Bhagi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6241823",
+        "ddrName": "Retrofitting of Saraka PWSS ( NQ )",
+        "projectId": "6241823",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Saraka PWSS ( NQ )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30015700",
+      "name": "2 NO KAKALBHAGI AWC",
+      "description": "2 NO KAKALBHAGI AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "2 NO KAKALBHAGI AWC",
+        "localName": "2 NO KAKALBHAGI AWC",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39044",
+        "villageName": "Kakal Bhagi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30015700",
+        "ddrName": "2 NO KAKALBHAGI AWC",
+        "projectId": "30015700",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "2 NO KAKALBHAGI AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057979",
+      "name": "MAZOR HOLA PWSS",
+      "description": "MAZOR HOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAZOR HOLA PWSS",
+        "localName": "MAZOR HOLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39051",
+        "villageName": "Majar Hola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057979",
+        "ddrName": "MAZOR HOLA PWSS",
+        "projectId": "30057979",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAZOR HOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057993",
+      "name": "NIRAIATI GAON PWSS",
+      "description": "NIRAIATI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIRAIATI GAON PWSS",
+        "localName": "NIRAIATI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23165",
+        "panchayatname": "BANDARMARI",
+        "villageCode": "586728",
+        "villageName": "Niraiati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057993",
+        "ddrName": "NIRAIATI GAON PWSS",
+        "projectId": "30057993",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIRAIATI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057983",
+      "name": "GABHARU GRANT NO.1 PWSS",
+      "description": "GABHARU GRANT NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GABHARU GRANT NO.1 PWSS",
+        "localName": "GABHARU GRANT NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "586684",
+        "villageName": "No.1 Gabharu T.e. (grant)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057983",
+        "ddrName": "GABHARU GRANT NO.1 PWSS",
+        "projectId": "30057983",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GABHARU GRANT NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018941",
+      "name": "GABHARU GRANT NO 2",
+      "description": "GABHARU GRANT NO 2",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GABHARU GRANT NO 2",
+        "localName": "GABHARU GRANT NO 2",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "653614",
+        "villageName": "No.2 Gabharu T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018941",
+        "ddrName": "GABHARU GRANT NO 2",
+        "projectId": "30018941",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GABHARU GRANT NO 2",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6241939",
+      "name": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+      "description": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+        "localName": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23165",
+        "panchayatname": "Bandarmari",
+        "villageCode": "39047",
+        "villageName": "Samukia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6241939",
+        "ddrName": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+        "projectId": "6241939",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.52793",
+      "name": "ERASUTI JUNGLE PWSS",
+      "description": "ERASUTI JUNGLE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ERASUTI JUNGLE PWSS",
+        "localName": "ERASUTI JUNGLE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39056",
+        "villageName": "Arasuti Janghal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "52793",
+        "ddrName": "ERASUTI JUNGLE PWSS",
+        "projectId": "52793",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ERASUTI JUNGLE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198205",
+      "name": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+      "description": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+        "localName": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39056",
+        "villageName": "Arasuti Janghal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198205",
+        "ddrName": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+        "projectId": "8198205",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198213",
+      "name": "RETROFITTING OF PATIAPUKHURI PWSS",
+      "description": "RETROFITTING OF PATIAPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PATIAPUKHURI PWSS",
+        "localName": "RETROFITTING OF PATIAPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39056",
+        "villageName": "Arasuti Janghal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198213",
+        "ddrName": "RETROFITTING OF PATIAPUKHURI PWSS",
+        "projectId": "8198213",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PATIAPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057989",
+      "name": "ERASUTI JUNGLE NO.1 PWSS",
+      "description": "ERASUTI JUNGLE NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ERASUTI JUNGLE NO.1 PWSS",
+        "localName": "ERASUTI JUNGLE NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39056",
+        "villageName": "Arasuti Janghal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057989",
+        "ddrName": "ERASUTI JUNGLE NO.1 PWSS",
+        "projectId": "30057989",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ERASUTI JUNGLE NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218812",
+      "name": "BOWALGURI SOLAR PWSS",
+      "description": "BOWALGURI SOLAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOWALGURI SOLAR PWSS",
+        "localName": "BOWALGURI SOLAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39056",
+        "villageName": "Arasuti Janghal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218812",
+        "ddrName": "BOWALGURI SOLAR PWSS",
+        "projectId": "30218812",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOWALGURI SOLAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198223",
+      "name": "RETROFITTING OF BORIGAON PWSS",
+      "description": "RETROFITTING OF BORIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORIGAON PWSS",
+        "localName": "RETROFITTING OF BORIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39055",
+        "villageName": "Bargon Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198223",
+        "ddrName": "RETROFITTING OF BORIGAON PWSS",
+        "projectId": "8198223",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30039714",
+      "name": "BORIGAON NO. 1",
+      "description": "BORIGAON NO. 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORIGAON NO. 1",
+        "localName": "BORIGAON NO. 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39055",
+        "villageName": "Bargon Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30039714",
+        "ddrName": "BORIGAON NO. 1",
+        "projectId": "30039714",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORIGAON NO. 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057363",
+      "name": "HOZAI GAON PWSS",
+      "description": "HOZAI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HOZAI GAON PWSS",
+        "localName": "HOZAI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39057",
+        "villageName": "Hozai Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057363",
+        "ddrName": "HOZAI GAON PWSS",
+        "projectId": "30057363",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HOZAI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057369",
+      "name": "NIJ BARGAON PWSS",
+      "description": "NIJ BARGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIJ BARGAON PWSS",
+        "localName": "NIJ BARGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39053",
+        "villageName": "Nij Bargaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057369",
+        "ddrName": "NIJ BARGAON PWSS",
+        "projectId": "30057369",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIJ BARGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198230",
+      "name": "RETROFITTING OF SIPORIA BATABARI PWSS",
+      "description": "RETROFITTING OF SIPORIA BATABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SIPORIA BATABARI PWSS",
+        "localName": "RETROFITTING OF SIPORIA BATABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23166",
+        "panchayatname": "BARGAON",
+        "villageCode": "39053",
+        "villageName": "Nij Bargaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198230",
+        "ddrName": "RETROFITTING OF SIPORIA BATABARI PWSS",
+        "projectId": "8198230",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SIPORIA BATABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3800160",
+      "name": "SIPORIA BATABARI PWSS",
+      "description": "SIPORIA BATABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIPORIA BATABARI PWSS",
+        "localName": "SIPORIA BATABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "586712",
+        "villageName": "Siparia Batabari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3800160",
+        "ddrName": "SIPORIA BATABARI PWSS",
+        "projectId": "3800160",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIPORIA BATABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067084",
+      "name": "TELIAGAON NO.1 PWSS",
+      "description": "TELIAGAON NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TELIAGAON NO.1 PWSS",
+        "localName": "TELIAGAON NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39054",
+        "villageName": "Telia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067084",
+        "ddrName": "TELIAGAON NO.1 PWSS",
+        "projectId": "30067084",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TELIAGAON NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215406",
+      "name": "RETROFITTING OF TELIAGAON PWSS",
+      "description": "RETROFITTING OF TELIAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF TELIAGAON PWSS",
+        "localName": "RETROFITTING OF TELIAGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39054",
+        "villageName": "Telia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215406",
+        "ddrName": "RETROFITTING OF TELIAGAON PWSS",
+        "projectId": "8215406",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF TELIAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1841150",
+      "name": "Teliagaon",
+      "description": "Teliagaon",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Teliagaon",
+        "localName": "Teliagaon",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23166",
+        "panchayatname": "Bargaon",
+        "villageCode": "39054",
+        "villageName": "Telia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1841150",
+        "ddrName": "Teliagaon",
+        "projectId": "1841150",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Teliagaon",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056640",
+      "name": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+      "description": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+        "localName": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "647834",
+        "villageName": "Arimara Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056640",
+        "ddrName": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+        "projectId": "30056640",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056087",
+      "name": "CHINGA CHUBURI PWSS",
+      "description": "CHINGA CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHINGA CHUBURI PWSS",
+        "localName": "CHINGA CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39009",
+        "villageName": "Chinga Chuburi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056087",
+        "ddrName": "CHINGA CHUBURI PWSS",
+        "projectId": "30056087",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHINGA CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172409",
+      "name": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+      "description": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+        "localName": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39006",
+        "villageName": "Duidi Pota Maz-pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172409",
+        "ddrName": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+        "projectId": "30172409",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141733",
+      "name": "RETROFITTING OF MUWAMARI PWSS",
+      "description": "RETROFITTING OF MUWAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MUWAMARI PWSS",
+        "localName": "RETROFITTING OF MUWAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39010",
+        "villageName": "Kalita Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141733",
+        "ddrName": "RETROFITTING OF MUWAMARI PWSS",
+        "projectId": "8141733",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MUWAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5072838",
+      "name": "MOWAMARI PWSS",
+      "description": "MOWAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOWAMARI PWSS",
+        "localName": "MOWAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39010",
+        "villageName": "Kalita Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5072838",
+        "ddrName": "MOWAMARI PWSS",
+        "projectId": "5072838",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOWAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056080",
+      "name": "KALITA GAON PWSS",
+      "description": "KALITA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALITA GAON PWSS",
+        "localName": "KALITA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39010",
+        "villageName": "Kalita Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056080",
+        "ddrName": "KALITA GAON PWSS",
+        "projectId": "30056080",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALITA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172412",
+      "name": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+      "description": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+        "localName": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "650885",
+        "villageName": "Latia Mari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172412",
+        "ddrName": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+        "projectId": "30172412",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218889",
+      "name": "JARANI SOLAR PWSS",
+      "description": "JARANI SOLAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JARANI SOLAR PWSS",
+        "localName": "JARANI SOLAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39008",
+        "villageName": "No.1 Jhaxwani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218889",
+        "ddrName": "JARANI SOLAR PWSS",
+        "projectId": "30218889",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JARANI SOLAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056072",
+      "name": "RANGAMATI GAON PWSS",
+      "description": "RANGAMATI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGAMATI GAON PWSS",
+        "localName": "RANGAMATI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23160",
+        "panchayatname": "Bihaguri No.1",
+        "villageCode": "39015",
+        "villageName": "Rangamati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056072",
+        "ddrName": "RANGAMATI GAON PWSS",
+        "projectId": "30056072",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGAMATI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141704",
+      "name": "RETROFITTING OF BHALUKEKHOWA PWSS",
+      "description": "RETROFITTING OF BHALUKEKHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHALUKEKHOWA PWSS",
+        "localName": "RETROFITTING OF BHALUKEKHOWA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39016",
+        "villageName": "Bhaluke Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141704",
+        "ddrName": "RETROFITTING OF BHALUKEKHOWA PWSS",
+        "projectId": "8141704",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHALUKEKHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30006954",
+      "name": "Bhalukekhowa Kamarchuburi PWSS",
+      "description": "Bhalukekhowa Kamarchuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhalukekhowa Kamarchuburi PWSS",
+        "localName": "Bhalukekhowa Kamarchuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39016",
+        "villageName": "Bhaluke Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30006954",
+        "ddrName": "Bhalukekhowa Kamarchuburi PWSS",
+        "projectId": "30006954",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhalukekhowa Kamarchuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2582386",
+      "name": "Bhalukekhowa PWSS",
+      "description": "Bhalukekhowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhalukekhowa PWSS",
+        "localName": "Bhalukekhowa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39016",
+        "villageName": "Bhaluke Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2582386",
+        "ddrName": "Bhalukekhowa PWSS",
+        "projectId": "2582386",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhalukekhowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055718",
+      "name": "BHALUKEHOWA BORDUBI PWSS",
+      "description": "BHALUKEHOWA BORDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKEHOWA BORDUBI PWSS",
+        "localName": "BHALUKEHOWA BORDUBI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39016",
+        "villageName": "Bhaluke Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055718",
+        "ddrName": "BHALUKEHOWA BORDUBI PWSS",
+        "projectId": "30055718",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKEHOWA BORDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057985",
+      "name": "MOILA GAON PWSS",
+      "description": "MOILA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOILA GAON PWSS",
+        "localName": "MOILA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39031",
+        "villageName": "Maila Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057985",
+        "ddrName": "MOILA GAON PWSS",
+        "projectId": "30057985",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOILA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215753",
+      "name": "RETROFITTING OF LIKHAKGAON PWSS",
+      "description": "RETROFITTING OF LIKHAKGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF LIKHAKGAON PWSS",
+        "localName": "RETROFITTING OF LIKHAKGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39031",
+        "villageName": "Maila Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215753",
+        "ddrName": "RETROFITTING OF LIKHAKGAON PWSS",
+        "projectId": "8215753",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF LIKHAKGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043782",
+      "name": "CHAGALI CHUBURI PWSS",
+      "description": "CHAGALI CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAGALI CHUBURI PWSS",
+        "localName": "CHAGALI CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39019",
+        "villageName": "Niz-bihaguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043782",
+        "ddrName": "CHAGALI CHUBURI PWSS",
+        "projectId": "30043782",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAGALI CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043820",
+      "name": "BORDUBIA PWSS",
+      "description": "BORDUBIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDUBIA PWSS",
+        "localName": "BORDUBIA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39019",
+        "villageName": "Niz-bihaguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043820",
+        "ddrName": "BORDUBIA PWSS",
+        "projectId": "30043820",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDUBIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5074126",
+      "name": "NIZ-BIHAGURI PWSS",
+      "description": "NIZ-BIHAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ-BIHAGURI PWSS",
+        "localName": "NIZ-BIHAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39019",
+        "villageName": "Niz-bihaguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5074126",
+        "ddrName": "NIZ-BIHAGURI PWSS",
+        "projectId": "5074126",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ-BIHAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5072807",
+      "name": "NIZ-BIHAGURI PWSS",
+      "description": "NIZ-BIHAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ-BIHAGURI PWSS",
+        "localName": "NIZ-BIHAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39019",
+        "villageName": "Niz-bihaguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5072807",
+        "ddrName": "NIZ-BIHAGURI PWSS",
+        "projectId": "5072807",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ-BIHAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141716",
+      "name": "RETROFITTING OF NIZ BIHAGURI PWSS",
+      "description": "RETROFITTING OF NIZ BIHAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NIZ BIHAGURI PWSS",
+        "localName": "RETROFITTING OF NIZ BIHAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23161",
+        "panchayatname": "Bihaguri No.2",
+        "villageCode": "39019",
+        "villageName": "Niz-bihaguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141716",
+        "ddrName": "RETROFITTING OF NIZ BIHAGURI PWSS",
+        "projectId": "8141716",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NIZ BIHAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30039748",
+      "name": "AMGURI CHAPARI PWSS",
+      "description": "AMGURI CHAPARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMGURI CHAPARI PWSS",
+        "localName": "AMGURI CHAPARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39060",
+        "villageName": "Amaguri Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30039748",
+        "ddrName": "AMGURI CHAPARI PWSS",
+        "projectId": "30039748",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMGURI CHAPARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215655",
+      "name": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+      "description": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+        "localName": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39060",
+        "villageName": "Amaguri Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215655",
+        "ddrName": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+        "projectId": "8215655",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156257",
+      "name": "RETROFITTING OF SILIKHABARI PWSS",
+      "description": "RETROFITTING OF SILIKHABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SILIKHABARI PWSS",
+        "localName": "RETROFITTING OF SILIKHABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23167",
+        "panchayatname": "PACHIM BARGAON",
+        "villageCode": "586674",
+        "villageName": "BAGHE TAPO",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156257",
+        "ddrName": "RETROFITTING OF SILIKHABARI PWSS",
+        "projectId": "8156257",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SILIKHABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060621",
+      "name": "Batalapam PWSS",
+      "description": "Batalapam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batalapam PWSS",
+        "localName": "Batalapam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39065",
+        "villageName": "Batala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060621",
+        "ddrName": "Batalapam PWSS",
+        "projectId": "30060621",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batalapam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014239",
+      "name": "BHARASINGRI JUNGLE PWSS",
+      "description": "BHARASINGRI JUNGLE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHARASINGRI JUNGLE PWSS",
+        "localName": "BHARASINGRI JUNGLE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39059",
+        "villageName": "Bhara Singari Janghal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014239",
+        "ddrName": "BHARASINGRI JUNGLE PWSS",
+        "projectId": "30014239",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHARASINGRI JUNGLE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057361",
+      "name": "Bura Garuduba No 1",
+      "description": "Bura Garuduba No 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bura Garuduba No 1",
+        "localName": "Bura Garuduba No 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39058",
+        "villageName": "Bura Garu Duba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057361",
+        "ddrName": "Bura Garuduba No 1",
+        "projectId": "30057361",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bura Garuduba No 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1861420",
+      "name": "Buragaruduba PWSS",
+      "description": "Buragaruduba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Buragaruduba PWSS",
+        "localName": "Buragaruduba PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39058",
+        "villageName": "Bura Garu Duba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1861420",
+        "ddrName": "Buragaruduba PWSS",
+        "projectId": "1861420",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Buragaruduba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132124",
+      "name": "Retrofitting of BuraGaruduba PWSS",
+      "description": "Retrofitting of BuraGaruduba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BuraGaruduba PWSS",
+        "localName": "Retrofitting of BuraGaruduba PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39058",
+        "villageName": "Bura Garu Duba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132124",
+        "ddrName": "Retrofitting of BuraGaruduba PWSS",
+        "projectId": "8132124",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BuraGaruduba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842653",
+      "name": "Buragaruduba PWSS",
+      "description": "Buragaruduba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Buragaruduba PWSS",
+        "localName": "Buragaruduba PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39058",
+        "villageName": "Bura Garu Duba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842653",
+        "ddrName": "Buragaruduba PWSS",
+        "projectId": "1842653",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Buragaruduba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172509",
+      "name": "BURA GARUDUBA NO.2 PWSS",
+      "description": "BURA GARUDUBA NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BURA GARUDUBA NO.2 PWSS",
+        "localName": "BURA GARUDUBA NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39058",
+        "villageName": "Bura Garu Duba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172509",
+        "ddrName": "BURA GARUDUBA NO.2 PWSS",
+        "projectId": "30172509",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BURA GARUDUBA NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004921",
+      "name": "CHENGA HILOI GAON PWSS",
+      "description": "CHENGA HILOI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENGA HILOI GAON PWSS",
+        "localName": "CHENGA HILOI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39066",
+        "villageName": "Changa Hiloi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004921",
+        "ddrName": "CHENGA HILOI GAON PWSS",
+        "projectId": "30004921",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENGA HILOI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5073879",
+      "name": "SILIKHABARI PWSS",
+      "description": "SILIKHABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILIKHABARI PWSS",
+        "localName": "SILIKHABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39066",
+        "villageName": "Changa Hiloi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5073879",
+        "ddrName": "SILIKHABARI PWSS",
+        "projectId": "5073879",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILIKHABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1783754",
+      "name": "Dhekerigaon PWSS",
+      "description": "Dhekerigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhekerigaon PWSS",
+        "localName": "Dhekerigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39063",
+        "villageName": "Dhekeri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1783754",
+        "ddrName": "Dhekerigaon PWSS",
+        "projectId": "1783754",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhekerigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8204267",
+      "name": "Retrofitting of Simaluguri Colony PWSS",
+      "description": "Retrofitting of Simaluguri Colony PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Simaluguri Colony PWSS",
+        "localName": "Retrofitting of Simaluguri Colony PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39061",
+        "villageName": "Silikha Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8204267",
+        "ddrName": "Retrofitting of Simaluguri Colony PWSS",
+        "projectId": "8204267",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Simaluguri Colony PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141643",
+      "name": "RETROFITTING OF SIMALUGURI PWSS",
+      "description": "RETROFITTING OF SIMALUGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SIMALUGURI PWSS",
+        "localName": "RETROFITTING OF SIMALUGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39062",
+        "villageName": "Simalu Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141643",
+        "ddrName": "RETROFITTING OF SIMALUGURI PWSS",
+        "projectId": "8141643",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SIMALUGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842776",
+      "name": "Simuluguri PWSS",
+      "description": "Simuluguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Simuluguri PWSS",
+        "localName": "Simuluguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23167",
+        "panchayatname": "Pachim Bargaon",
+        "villageCode": "39062",
+        "villageName": "Simalu Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842776",
+        "ddrName": "Simuluguri PWSS",
+        "projectId": "1842776",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Simuluguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6242875",
+      "name": "Retrofitting of Bogapani PWSS ( QA )",
+      "description": "Retrofitting of Bogapani PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bogapani PWSS ( QA )",
+        "localName": "Retrofitting of Bogapani PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39034",
+        "villageName": "Bagapani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6242875",
+        "ddrName": "Retrofitting of Bogapani PWSS ( QA )",
+        "projectId": "6242875",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bogapani PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068356",
+      "name": "JAHAMARI PWSS",
+      "description": "JAHAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAHAMARI PWSS",
+        "localName": "JAHAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39034",
+        "villageName": "Bagapani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068356",
+        "ddrName": "JAHAMARI PWSS",
+        "projectId": "30068356",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAHAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6524935",
+      "name": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+      "description": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+        "localName": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39038",
+        "villageName": "Barati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6524935",
+        "ddrName": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+        "projectId": "6524935",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8183542",
+      "name": "Retrofitting of Borpukhuri PWSS",
+      "description": "Retrofitting of Borpukhuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Borpukhuri PWSS",
+        "localName": "Retrofitting of Borpukhuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39036",
+        "villageName": "Barpukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8183542",
+        "ddrName": "Retrofitting of Borpukhuri PWSS",
+        "projectId": "8183542",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Borpukhuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6241704",
+      "name": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+      "description": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+        "localName": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39036",
+        "villageName": "Barpukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6241704",
+        "ddrName": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+        "projectId": "6241704",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1771140",
+      "name": "Borpukhuri PWSS",
+      "description": "Borpukhuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borpukhuri PWSS",
+        "localName": "Borpukhuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39036",
+        "villageName": "Barpukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1771140",
+        "ddrName": "Borpukhuri PWSS",
+        "projectId": "1771140",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borpukhuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176114",
+      "name": "BORBIL MORIONI PWSS",
+      "description": "BORBIL MORIONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBIL MORIONI PWSS",
+        "localName": "BORBIL MORIONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23164",
+        "panchayatname": "PUB BARGAON",
+        "villageCode": "586726",
+        "villageName": "BORBIL MARIANI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176114",
+        "ddrName": "BORBIL MORIONI PWSS",
+        "projectId": "30176114",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBIL MORIONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018227",
+      "name": "Gayia Gaon ",
+      "description": "Gayia Gaon ",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gayia Gaon ",
+        "localName": "Gayia Gaon ",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39040",
+        "villageName": "Gayia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018227",
+        "ddrName": "Gayia Gaon ",
+        "projectId": "30018227",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gayia Gaon ",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041901",
+      "name": "NO.1  NABIL KACHARI GAON PWSS",
+      "description": "NO.1  NABIL KACHARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1  NABIL KACHARI GAON PWSS",
+        "localName": "NO.1  NABIL KACHARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39037",
+        "villageName": "No.1 Nabil Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041901",
+        "ddrName": "NO.1  NABIL KACHARI GAON PWSS",
+        "projectId": "30041901",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1  NABIL KACHARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8365758",
+      "name": "Nabil Kachari AWC",
+      "description": "Nabil Kachari AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nabil Kachari AWC",
+        "localName": "Nabil Kachari AWC",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39037",
+        "villageName": "No.1 Nabil Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8365758",
+        "ddrName": "Nabil Kachari AWC",
+        "projectId": "8365758",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nabil Kachari AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041907",
+      "name": "NO.2 NABIL KACHARI GAON PWSS",
+      "description": "NO.2 NABIL KACHARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 NABIL KACHARI GAON PWSS",
+        "localName": "NO.2 NABIL KACHARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39039",
+        "villageName": "No.2 Nabil Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041907",
+        "ddrName": "NO.2 NABIL KACHARI GAON PWSS",
+        "projectId": "30041907",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 NABIL KACHARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215411",
+      "name": "RETROFITTING OF PUNIANI PWSS",
+      "description": "RETROFITTING OF PUNIANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PUNIANI PWSS",
+        "localName": "RETROFITTING OF PUNIANI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23164",
+        "panchayatname": "PUB BARGAON",
+        "villageCode": "39041",
+        "villageName": "Puniani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215411",
+        "ddrName": "RETROFITTING OF PUNIANI PWSS",
+        "projectId": "8215411",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PUNIANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5073330",
+      "name": "PUNIONI PWSS",
+      "description": "PUNIONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUNIONI PWSS",
+        "localName": "PUNIONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23164",
+        "panchayatname": "Pub Bargaon",
+        "villageCode": "39041",
+        "villageName": "Puniani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5073330",
+        "ddrName": "PUNIONI PWSS",
+        "projectId": "5073330",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUNIONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2497758",
+      "name": "BAPUBHETI P.W.S.S.",
+      "description": "BAPUBHETI P.W.S.S.",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPUBHETI P.W.S.S.",
+        "localName": "BAPUBHETI P.W.S.S.",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39023",
+        "villageName": "Bapu Bheti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2497758",
+        "ddrName": "BAPUBHETI P.W.S.S.",
+        "projectId": "2497758",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPUBHETI P.W.S.S.",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141631",
+      "name": "RETROFITTING OF BAPUBHETI  PWSS",
+      "description": "RETROFITTING OF BAPUBHETI  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAPUBHETI  PWSS",
+        "localName": "RETROFITTING OF BAPUBHETI  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39023",
+        "villageName": "Bapu Bheti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141631",
+        "ddrName": "RETROFITTING OF BAPUBHETI  PWSS",
+        "projectId": "8141631",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAPUBHETI  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141619",
+      "name": "RETROFITING OF BARUADOLONI PWSS",
+      "description": "RETROFITING OF BARUADOLONI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITING OF BARUADOLONI PWSS",
+        "localName": "RETROFITING OF BARUADOLONI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "650878",
+        "villageName": "Barua Doloni",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141619",
+        "ddrName": "RETROFITING OF BARUADOLONI PWSS",
+        "projectId": "8141619",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITING OF BARUADOLONI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1861320",
+      "name": "Boruadoloni PWSS",
+      "description": "Boruadoloni PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boruadoloni PWSS",
+        "localName": "Boruadoloni PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39022",
+        "villageName": "Barua Doloni Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1861320",
+        "ddrName": "Boruadoloni PWSS",
+        "projectId": "1861320",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boruadoloni PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842423",
+      "name": "Boruadoloni PWSS",
+      "description": "Boruadoloni PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boruadoloni PWSS",
+        "localName": "Boruadoloni PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39022",
+        "villageName": "Barua Doloni Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842423",
+        "ddrName": "Boruadoloni PWSS",
+        "projectId": "1842423",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boruadoloni PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141583",
+      "name": "RETROFITTING OF PUTHIMARI PWSS",
+      "description": "RETROFITTING OF PUTHIMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PUTHIMARI PWSS",
+        "localName": "RETROFITTING OF PUTHIMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23162",
+        "panchayatname": "PUTHIMARI",
+        "villageCode": "586729",
+        "villageName": "GADHARU MUKH CHAPARI GAON",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141583",
+        "ddrName": "RETROFITTING OF PUTHIMARI PWSS",
+        "projectId": "8141583",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PUTHIMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187298",
+      "name": "Retrofitting of Geruagaon PWSS",
+      "description": "Retrofitting of Geruagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Geruagaon PWSS",
+        "localName": "Retrofitting of Geruagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39032",
+        "villageName": "Gerua Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187298",
+        "ddrName": "Retrofitting of Geruagaon PWSS",
+        "projectId": "8187298",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Geruagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2480357",
+      "name": "PUTHIMARY P.W.S.S.",
+      "description": "PUTHIMARY P.W.S.S.",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUTHIMARY P.W.S.S.",
+        "localName": "PUTHIMARY P.W.S.S.",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39032",
+        "villageName": "Gerua Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2480357",
+        "ddrName": "PUTHIMARY P.W.S.S.",
+        "projectId": "2480357",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUTHIMARY P.W.S.S.",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018243",
+      "name": "No 3 Puthimari PWSS",
+      "description": "No 3 Puthimari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No 3 Puthimari PWSS",
+        "localName": "No 3 Puthimari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39026",
+        "villageName": "No.3 Puthimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018243",
+        "ddrName": "No 3 Puthimari PWSS",
+        "projectId": "30018243",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No 3 Puthimari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1770771",
+      "name": "Garuagaon PWSS",
+      "description": "Garuagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Garuagaon PWSS",
+        "localName": "Garuagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23162",
+        "panchayatname": "Puthimari",
+        "villageCode": "39026",
+        "villageName": "No.3 Puthimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1770771",
+        "ddrName": "Garuagaon PWSS",
+        "projectId": "1770771",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Garuagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056104",
+      "name": "PUTHIMARI GAON PWSS",
+      "description": "PUTHIMARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUTHIMARI GAON PWSS",
+        "localName": "PUTHIMARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "BIHAGURI",
+        "panchayatcode": "23162",
+        "panchayatname": "PUTHIMARI",
+        "villageCode": "39024",
+        "villageName": "Puthimari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056104",
+        "ddrName": "PUTHIMARI GAON PWSS",
+        "projectId": "30056104",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUTHIMARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056050",
+      "name": "BALI GAON PWSS",
+      "description": "BALI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALI GAON PWSS",
+        "localName": "BALI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39033",
+        "villageName": "Bali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056050",
+        "ddrName": "BALI GAON PWSS",
+        "projectId": "30056050",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056041",
+      "name": "GERUA PATHAR PWSS",
+      "description": "GERUA PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GERUA PATHAR PWSS",
+        "localName": "GERUA PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "586655",
+        "villageName": "Gerua Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056041",
+        "ddrName": "GERUA PATHAR PWSS",
+        "projectId": "30056041",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GERUA PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056609",
+      "name": "LIKHAKGAON NO.1 PWSS",
+      "description": "LIKHAKGAON NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LIKHAKGAON NO.1 PWSS",
+        "localName": "LIKHAKGAON NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39030",
+        "villageName": "Likhak Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056609",
+        "ddrName": "LIKHAKGAON NO.1 PWSS",
+        "projectId": "30056609",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LIKHAKGAON NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187307",
+      "name": "Retrofitting of Tumuki PWSS",
+      "description": "Retrofitting of Tumuki PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Tumuki PWSS",
+        "localName": "Retrofitting of Tumuki PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39030",
+        "villageName": "Likhak Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187307",
+        "ddrName": "Retrofitting of Tumuki PWSS",
+        "projectId": "8187307",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Tumuki PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1761428",
+      "name": "Likhokgaon PWSS",
+      "description": "Likhokgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Likhokgaon PWSS",
+        "localName": "Likhokgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39030",
+        "villageName": "Likhak Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1761428",
+        "ddrName": "Likhokgaon PWSS",
+        "projectId": "1761428",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Likhokgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30044254",
+      "name": "NIRAI ATI PWSS",
+      "description": "NIRAI ATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIRAI ATI PWSS",
+        "localName": "NIRAI ATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39029",
+        "villageName": "Nirai Ati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30044254",
+        "ddrName": "NIRAI ATI PWSS",
+        "projectId": "30044254",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIRAI ATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215757",
+      "name": "RETROFITTING OF PITHAKHOWA PWSS",
+      "description": "RETROFITTING OF PITHAKHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PITHAKHOWA PWSS",
+        "localName": "RETROFITTING OF PITHAKHOWA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39028",
+        "villageName": "Pitha Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215757",
+        "ddrName": "RETROFITTING OF PITHAKHOWA PWSS",
+        "projectId": "8215757",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PITHAKHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4516419",
+      "name": "TUMUKI PWSS",
+      "description": "TUMUKI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TUMUKI PWSS",
+        "localName": "TUMUKI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39028",
+        "villageName": "Pitha Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4516419",
+        "ddrName": "TUMUKI PWSS",
+        "projectId": "4516419",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TUMUKI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5072821",
+      "name": "PITHAKHOWA PWSS",
+      "description": "PITHAKHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PITHAKHOWA PWSS",
+        "localName": "PITHAKHOWA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1252",
+        "blockname": "Bihaguri",
+        "panchayatcode": "23163",
+        "panchayatname": "Tumuki",
+        "villageCode": "39028",
+        "villageName": "Pitha Khowa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5072821",
+        "ddrName": "PITHAKHOWA PWSS",
+        "projectId": "5072821",
+        "regionName": "1252"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PITHAKHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056810",
+      "name": "BORBHOGIA NO.2 PWSS",
+      "description": "BORBHOGIA NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBHOGIA NO.2 PWSS",
+        "localName": "BORBHOGIA NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "38999",
+        "villageName": "Bar Bhagia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056810",
+        "ddrName": "BORBHOGIA NO.2 PWSS",
+        "projectId": "30056810",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBHOGIA NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215759",
+      "name": "RETROFITTING OF BORBHOGIA PWSS",
+      "description": "RETROFITTING OF BORBHOGIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORBHOGIA PWSS",
+        "localName": "RETROFITTING OF BORBHOGIA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "38999",
+        "villageName": "Bar Bhagia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215759",
+        "ddrName": "RETROFITTING OF BORBHOGIA PWSS",
+        "projectId": "8215759",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORBHOGIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004901",
+      "name": "BORBHOGIA NO.1",
+      "description": "BORBHOGIA NO.1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBHOGIA NO.1",
+        "localName": "BORBHOGIA NO.1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "38999",
+        "villageName": "Bar Bhagia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004901",
+        "ddrName": "BORBHOGIA NO.1",
+        "projectId": "30004901",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBHOGIA NO.1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017896",
+      "name": "BORBHOGIA NO 3 WSS",
+      "description": "BORBHOGIA NO 3 WSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBHOGIA NO 3 WSS",
+        "localName": "BORBHOGIA NO 3 WSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "38999",
+        "villageName": "Bar Bhagia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017896",
+        "ddrName": "BORBHOGIA NO 3 WSS",
+        "projectId": "30017896",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBHOGIA NO 3 WSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408891",
+      "name": "Nichala Mari PWSS (NQ)",
+      "description": "Nichala Mari PWSS (NQ)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nichala Mari PWSS (NQ)",
+        "localName": "Nichala Mari PWSS (NQ)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "38999",
+        "villageName": "Bar Bhagia Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408891",
+        "ddrName": "Nichala Mari PWSS (NQ)",
+        "projectId": "5408891",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nichala Mari PWSS (NQ)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213521",
+      "name": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+      "description": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+        "localName": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "586644",
+        "villageName": "Belsiri Chapari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213521",
+        "ddrName": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+        "projectId": "30213521",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237581",
+      "name": "Retrofitting of Nichalamari PWSS",
+      "description": "Retrofitting of Nichalamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Nichalamari PWSS",
+        "localName": "Retrofitting of Nichalamari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "39004",
+        "villageName": "Nichala Mari Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237581",
+        "ddrName": "Retrofitting of Nichalamari PWSS",
+        "projectId": "8237581",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Nichalamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060692",
+      "name": "NO.2 BOCHASIMALU GAON PWSS",
+      "description": "NO.2 BOCHASIMALU GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 BOCHASIMALU GAON PWSS",
+        "localName": "NO.2 BOCHASIMALU GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23159",
+        "panchayatname": "Borbhagia Belsiri",
+        "villageCode": "586746",
+        "villageName": "No.2 Bochasimalu Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060692",
+        "ddrName": "NO.2 BOCHASIMALU GAON PWSS",
+        "projectId": "30060692",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 BOCHASIMALU GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132750",
+      "name": "RETROFITTING OF SITALMARI PWSS",
+      "description": "RETROFITTING OF SITALMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SITALMARI PWSS",
+        "localName": "RETROFITTING OF SITALMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586737",
+        "villageName": "No.1 Sitalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132750",
+        "ddrName": "RETROFITTING OF SITALMARI PWSS",
+        "projectId": "8132750",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SITALMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1770808",
+      "name": "Sitalmari Gopchar PWSS",
+      "description": "Sitalmari Gopchar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sitalmari Gopchar PWSS",
+        "localName": "Sitalmari Gopchar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586737",
+        "villageName": "No.1 Sitalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1770808",
+        "ddrName": "Sitalmari Gopchar PWSS",
+        "projectId": "1770808",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sitalmari Gopchar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8137635",
+      "name": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+      "description": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+        "localName": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586737",
+        "villageName": "No.1 Sitalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8137635",
+        "ddrName": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+        "projectId": "8137635",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060647",
+      "name": "NO.2 CHITALMARI PWSS",
+      "description": "NO.2 CHITALMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 CHITALMARI PWSS",
+        "localName": "NO.2 CHITALMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586740",
+        "villageName": "No.2 Sitalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060647",
+        "ddrName": "NO.2 CHITALMARI PWSS",
+        "projectId": "30060647",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 CHITALMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5072752",
+      "name": "SITALMARI PWSS",
+      "description": "SITALMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SITALMARI PWSS",
+        "localName": "SITALMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586740",
+        "villageName": "No.2 Sitalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5072752",
+        "ddrName": "SITALMARI PWSS",
+        "projectId": "5072752",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SITALMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056425",
+      "name": "NO.3 CHITALMARI PWSS",
+      "description": "NO.3 CHITALMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 CHITALMARI PWSS",
+        "localName": "NO.3 CHITALMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586742",
+        "villageName": "No.3 Sitalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056425",
+        "ddrName": "NO.3 CHITALMARI PWSS",
+        "projectId": "30056425",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 CHITALMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1784979",
+      "name": "Singri PWSS",
+      "description": "Singri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Singri PWSS",
+        "localName": "Singri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586733",
+        "villageName": "Singari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1784979",
+        "ddrName": "Singri PWSS",
+        "projectId": "1784979",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Singri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172437",
+      "name": "SINGRI-2 PART-1 PWSS",
+      "description": "SINGRI-2 PART-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRI-2 PART-1 PWSS",
+        "localName": "SINGRI-2 PART-1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586733",
+        "villageName": "Singari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172437",
+        "ddrName": "SINGRI-2 PART-1 PWSS",
+        "projectId": "30172437",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRI-2 PART-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056412",
+      "name": "SINGRI BANGALI PWSS",
+      "description": "SINGRI BANGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRI BANGALI PWSS",
+        "localName": "SINGRI BANGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586733",
+        "villageName": "Singari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056412",
+        "ddrName": "SINGRI BANGALI PWSS",
+        "projectId": "30056412",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRI BANGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132115",
+      "name": "Retrofitting of Singri PWSS",
+      "description": "Retrofitting of Singri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Singri PWSS",
+        "localName": "Retrofitting of Singri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586733",
+        "villageName": "Singari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132115",
+        "ddrName": "Retrofitting of Singri PWSS",
+        "projectId": "8132115",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Singri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172442",
+      "name": "SINGRI-2 PART-2 PWSS",
+      "description": "SINGRI-2 PART-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRI-2 PART-2 PWSS",
+        "localName": "SINGRI-2 PART-2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586733",
+        "villageName": "Singari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172442",
+        "ddrName": "SINGRI-2 PART-2 PWSS",
+        "projectId": "30172442",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRI-2 PART-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056417",
+      "name": "SINGRI TUTULA PWSS",
+      "description": "SINGRI TUTULA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRI TUTULA PWSS",
+        "localName": "SINGRI TUTULA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "650938",
+        "villageName": "Singari Tutala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056417",
+        "ddrName": "SINGRI TUTULA PWSS",
+        "projectId": "30056417",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRI TUTULA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172407",
+      "name": "SITALMARI PATHAR PWSS",
+      "description": "SITALMARI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SITALMARI PATHAR PWSS",
+        "localName": "SITALMARI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586951",
+        "villageName": "Sital Mari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172407",
+        "ddrName": "SITALMARI PATHAR PWSS",
+        "projectId": "30172407",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SITALMARI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056407",
+      "name": "SITALMARI CHAPORI PWSS",
+      "description": "SITALMARI CHAPORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SITALMARI CHAPORI PWSS",
+        "localName": "SITALMARI CHAPORI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "236224",
+        "panchayatname": "Dakhin Singri",
+        "villageCode": "586743",
+        "villageName": "Sitalmari Chapari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056407",
+        "ddrName": "SITALMARI CHAPORI PWSS",
+        "projectId": "30056407",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SITALMARI CHAPORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056141",
+      "name": "BALIJAN BENGALI PWSS",
+      "description": "BALIJAN BENGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIJAN BENGALI PWSS",
+        "localName": "BALIJAN BENGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38957",
+        "villageName": "Balijan Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056141",
+        "ddrName": "BALIJAN BENGALI PWSS",
+        "projectId": "30056141",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIJAN BENGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056146",
+      "name": "BALIJAN GAON PWSS",
+      "description": "BALIJAN GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIJAN GAON PWSS",
+        "localName": "BALIJAN GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "DHALAGURI",
+        "villageCode": "38954",
+        "villageName": "Balijan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056146",
+        "ddrName": "BALIJAN GAON PWSS",
+        "projectId": "30056146",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIJAN GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017895",
+      "name": "BALIJAN KACHARI PWSS",
+      "description": "BALIJAN KACHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIJAN KACHARI PWSS",
+        "localName": "BALIJAN KACHARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "586569",
+        "villageName": "Balijan Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017895",
+        "ddrName": "BALIJAN KACHARI PWSS",
+        "projectId": "30017895",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIJAN KACHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056913",
+      "name": "BALIJAN PATHAR PWSS",
+      "description": "BALIJAN PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIJAN PATHAR PWSS",
+        "localName": "BALIJAN PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38964",
+        "villageName": "Balijan Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056913",
+        "ddrName": "BALIJAN PATHAR PWSS",
+        "projectId": "30056913",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIJAN PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408704",
+      "name": "Bhangamandir PWSS (QA)",
+      "description": "Bhangamandir PWSS (QA)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhangamandir PWSS (QA)",
+        "localName": "Bhangamandir PWSS (QA)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38953",
+        "villageName": "Bhanga Mandir Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408704",
+        "ddrName": "Bhangamandir PWSS (QA)",
+        "projectId": "5408704",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhangamandir PWSS (QA)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156430",
+      "name": "RETROFITTING OF BHANGAMANDIR PWSS",
+      "description": "RETROFITTING OF BHANGAMANDIR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHANGAMANDIR PWSS",
+        "localName": "RETROFITTING OF BHANGAMANDIR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38953",
+        "villageName": "Bhanga Mandir Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156430",
+        "ddrName": "RETROFITTING OF BHANGAMANDIR PWSS",
+        "projectId": "8156430",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHANGAMANDIR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020972",
+      "name": "BHANGA MANDIR ANGANWADI",
+      "description": "BHANGA MANDIR ANGANWADI",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHANGA MANDIR ANGANWADI",
+        "localName": "BHANGA MANDIR ANGANWADI",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38953",
+        "villageName": "Bhanga Mandir Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020972",
+        "ddrName": "BHANGA MANDIR ANGANWADI",
+        "projectId": "30020972",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHANGA MANDIR ANGANWADI",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6242604",
+      "name": "Retrofitting of Satipukhuri PWSS ( QA )",
+      "description": "Retrofitting of Satipukhuri PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Satipukhuri PWSS ( QA )",
+        "localName": "Retrofitting of Satipukhuri PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38953",
+        "villageName": "Bhanga Mandir Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6242604",
+        "ddrName": "Retrofitting of Satipukhuri PWSS ( QA )",
+        "projectId": "6242604",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Satipukhuri PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6524893",
+      "name": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+      "description": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+        "localName": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38960",
+        "villageName": "Doul Guri Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6524893",
+        "ddrName": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+        "projectId": "6524893",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175537",
+      "name": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+      "description": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+        "localName": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "586563",
+        "villageName": "Mohkhua Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175537",
+        "ddrName": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+        "projectId": "6175537",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022693",
+      "name": "MORA BELSIRI PWSS",
+      "description": "MORA BELSIRI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MORA BELSIRI PWSS",
+        "localName": "MORA BELSIRI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "650940",
+        "villageName": "Mora Belsiri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022693",
+        "ddrName": "MORA BELSIRI PWSS",
+        "projectId": "30022693",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MORA BELSIRI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215762",
+      "name": "RETROFITTING OF DHALAGURI PWSS",
+      "description": "RETROFITTING OF DHALAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHALAGURI PWSS",
+        "localName": "RETROFITTING OF DHALAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38961",
+        "villageName": "No.1 Doul Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215762",
+        "ddrName": "RETROFITTING OF DHALAGURI PWSS",
+        "projectId": "8215762",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHALAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141972",
+      "name": "RETROFITTING OF PADUMPUKHURI PWSS",
+      "description": "RETROFITTING OF PADUMPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PADUMPUKHURI PWSS",
+        "localName": "RETROFITTING OF PADUMPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23154",
+        "panchayatname": "Dhalaguri",
+        "villageCode": "38962",
+        "villageName": "Padum Pukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141972",
+        "ddrName": "RETROFITTING OF PADUMPUKHURI PWSS",
+        "projectId": "8141972",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PADUMPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215767",
+      "name": "RETROFITTING OF ALIMABAD PWSS",
+      "description": "RETROFITTING OF ALIMABAD PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ALIMABAD PWSS",
+        "localName": "RETROFITTING OF ALIMABAD PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "586561",
+        "villageName": "Bhoira Guri Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215767",
+        "ddrName": "RETROFITTING OF ALIMABAD PWSS",
+        "projectId": "8215767",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ALIMABAD PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172573",
+      "name": "BHAIRAGURI PATHAR PWSS",
+      "description": "BHAIRAGURI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHAIRAGURI PATHAR PWSS",
+        "localName": "BHAIRAGURI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "38916",
+        "villageName": "Bhoira Guri Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172573",
+        "ddrName": "BHAIRAGURI PATHAR PWSS",
+        "projectId": "30172573",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHAIRAGURI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215769",
+      "name": "RETROFITTING OF DOOMDOMA PWSS",
+      "description": "RETROFITTING OF DOOMDOMA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DOOMDOMA PWSS",
+        "localName": "RETROFITTING OF DOOMDOMA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "38917",
+        "villageName": "Dumduma Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215769",
+        "ddrName": "RETROFITTING OF DOOMDOMA PWSS",
+        "projectId": "8215769",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DOOMDOMA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215771",
+      "name": "RETROFITTING OF RAHMANPUR  PWSS",
+      "description": "RETROFITTING OF RAHMANPUR  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RAHMANPUR  PWSS",
+        "localName": "RETROFITTING OF RAHMANPUR  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "586555",
+        "villageName": "No.3 Tiulip Bagan(rahmanpu",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215771",
+        "ddrName": "RETROFITTING OF RAHMANPUR  PWSS",
+        "projectId": "8215771",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RAHMANPUR  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056922",
+      "name": "TULIP KULLIE LINE PWSS",
+      "description": "TULIP KULLIE LINE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TULIP KULLIE LINE PWSS",
+        "localName": "TULIP KULLIE LINE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "586555",
+        "villageName": "No.3 Tiulip Bagan(rahmanpu",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056922",
+        "ddrName": "TULIP KULLIE LINE PWSS",
+        "projectId": "30056922",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TULIP KULLIE LINE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067790",
+      "name": "TUILIP NO.3 PWSS",
+      "description": "TUILIP NO.3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TUILIP NO.3 PWSS",
+        "localName": "TUILIP NO.3 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "586555",
+        "villageName": "No.3 Tiulip Bagan(rahmanpu",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067790",
+        "ddrName": "TUILIP NO.3 PWSS",
+        "projectId": "30067790",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TUILIP NO.3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187315",
+      "name": "Retrofitting of Singimari Bangali PWSS",
+      "description": "Retrofitting of Singimari Bangali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Singimari Bangali PWSS",
+        "localName": "Retrofitting of Singimari Bangali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "587077",
+        "villageName": "Singimari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187315",
+        "ddrName": "Retrofitting of Singimari Bangali PWSS",
+        "projectId": "8187315",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Singimari Bangali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5550585",
+      "name": "Singimari Bengali PWSS",
+      "description": "Singimari Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Singimari Bengali PWSS",
+        "localName": "Singimari Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "587077",
+        "villageName": "Singimari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5550585",
+        "ddrName": "Singimari Bengali PWSS",
+        "projectId": "5550585",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Singimari Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141761",
+      "name": "RETROFITING OF NATUNPAMGAON PWSS",
+      "description": "RETROFITING OF NATUNPAMGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITING OF NATUNPAMGAON PWSS",
+        "localName": "RETROFITING OF NATUNPAMGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "650939",
+        "villageName": "Singimari Kuch Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141761",
+        "ddrName": "RETROFITING OF NATUNPAMGAON PWSS",
+        "projectId": "8141761",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITING OF NATUNPAMGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056918",
+      "name": "SINGIMARI KUCH GAON PWSS",
+      "description": "SINGIMARI KUCH GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGIMARI KUCH GAON PWSS",
+        "localName": "SINGIMARI KUCH GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "650939",
+        "villageName": "Singimari Kuch Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056918",
+        "ddrName": "SINGIMARI KUCH GAON PWSS",
+        "projectId": "30056918",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGIMARI KUCH GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2582460",
+      "name": "Natunpam PWSS",
+      "description": "Natunpam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Natunpam PWSS",
+        "localName": "Natunpam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23150",
+        "panchayatname": "Dumdooma",
+        "villageCode": "650939",
+        "villageName": "Singimari Kuch Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2582460",
+        "ddrName": "Natunpam PWSS",
+        "projectId": "2582460",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Natunpam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30217255",
+      "name": "DHIRAI JARANI PWSS",
+      "description": "DHIRAI JARANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHIRAI JARANI PWSS",
+        "localName": "DHIRAI JARANI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "586579",
+        "villageName": "Dhirai Jarani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30217255",
+        "ddrName": "DHIRAI JARANI PWSS",
+        "projectId": "30217255",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHIRAI JARANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074916",
+      "name": "NO.5 SINGRI BAGAN PART-B PWSS",
+      "description": "NO.5 SINGRI BAGAN PART-B PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.5 SINGRI BAGAN PART-B PWSS",
+        "localName": "NO.5 SINGRI BAGAN PART-B PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "GUPTESWAR",
+        "villageCode": "38987",
+        "villageName": "Ghoramora",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074916",
+        "ddrName": "NO.5 SINGRI BAGAN PART-B PWSS",
+        "projectId": "30074916",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.5 SINGRI BAGAN PART-B PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3378587",
+      "name": "Singri Bagan PWSS",
+      "description": "Singri Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Singri Bagan PWSS",
+        "localName": "Singri Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "38985",
+        "villageName": "Ghuramara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3378587",
+        "ddrName": "Singri Bagan PWSS",
+        "projectId": "3378587",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Singri Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056431",
+      "name": "HORA MARA PATHAR GAON PWSS",
+      "description": "HORA MARA PATHAR GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HORA MARA PATHAR GAON PWSS",
+        "localName": "HORA MARA PATHAR GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "650902",
+        "villageName": "Hora Mara Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056431",
+        "ddrName": "HORA MARA PATHAR GAON PWSS",
+        "projectId": "30056431",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HORA MARA PATHAR GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8286607",
+      "name": "Retrofitting of Singri TE PWSS",
+      "description": "Retrofitting of Singri TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Singri TE PWSS",
+        "localName": "Retrofitting of Singri TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "38981",
+        "villageName": "No.1 Singari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8286607",
+        "ddrName": "Retrofitting of Singri TE PWSS",
+        "projectId": "8286607",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Singri TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010828",
+      "name": "No.2 Singari Bagan PWSS",
+      "description": "No.2 Singari Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Singari Bagan PWSS",
+        "localName": "No.2 Singari Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "38983",
+        "villageName": "No.2 Singari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010828",
+        "ddrName": "No.2 Singari Bagan PWSS",
+        "projectId": "30010828",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Singari Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004161",
+      "name": "No.4 Singri Bagan PWSS",
+      "description": "No.4 Singri Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.4 Singri Bagan PWSS",
+        "localName": "No.4 Singri Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "586574",
+        "villageName": "No.4 Singari Bagan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004161",
+        "ddrName": "No.4 Singri Bagan PWSS",
+        "projectId": "30004161",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.4 Singri Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004976",
+      "name": "No.5 Singri Bagan PWSS",
+      "description": "No.5 Singri Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.5 Singri Bagan PWSS",
+        "localName": "No.5 Singri Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "38984",
+        "villageName": "No.5 Singari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004976",
+        "ddrName": "No.5 Singri Bagan PWSS",
+        "projectId": "30004976",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.5 Singri Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054601",
+      "name": "SINGRI NEPALI GAON PWSS",
+      "description": "SINGRI NEPALI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRI NEPALI GAON PWSS",
+        "localName": "SINGRI NEPALI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23157",
+        "panchayatname": "Gupteswar",
+        "villageCode": "38988",
+        "villageName": "Singari Nepali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054601",
+        "ddrName": "SINGRI NEPALI GAON PWSS",
+        "projectId": "30054601",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRI NEPALI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6166583",
+      "name": "Retrofitting of Bher Nepali PWSS (QA )",
+      "description": "Retrofitting of Bher Nepali PWSS (QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bher Nepali PWSS (QA )",
+        "localName": "Retrofitting of Bher Nepali PWSS (QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38924",
+        "villageName": "Bher Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6166583",
+        "ddrName": "Retrofitting of Bher Nepali PWSS (QA )",
+        "projectId": "6166583",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bher Nepali PWSS (QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6242836",
+      "name": "Retrofitting of Rowmari PWSS QA )",
+      "description": "Retrofitting of Rowmari PWSS QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Rowmari PWSS QA )",
+        "localName": "Retrofitting of Rowmari PWSS QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38924",
+        "villageName": "Bher Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6242836",
+        "ddrName": "Retrofitting of Rowmari PWSS QA )",
+        "projectId": "6242836",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Rowmari PWSS QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141785",
+      "name": "RETROFITTING OF BHAIRAGURI PWSS",
+      "description": "RETROFITTING OF BHAIRAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHAIRAGURI PWSS",
+        "localName": "RETROFITTING OF BHAIRAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38929",
+        "villageName": "Bhoira Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141785",
+        "ddrName": "RETROFITTING OF BHAIRAGURI PWSS",
+        "projectId": "8141785",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHAIRAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1764917",
+      "name": "Bhairaguri PWSS",
+      "description": "Bhairaguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhairaguri PWSS",
+        "localName": "Bhairaguri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38929",
+        "villageName": "Bhoira Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1764917",
+        "ddrName": "Bhairaguri PWSS",
+        "projectId": "1764917",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhairaguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172498",
+      "name": "BHOIRAGURI GAON PWSS",
+      "description": "BHOIRAGURI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOIRAGURI GAON PWSS",
+        "localName": "BHOIRAGURI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "NATUN PAM",
+        "villageCode": "38929",
+        "villageName": "Bhoira Guri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172498",
+        "ddrName": "BHOIRAGURI GAON PWSS",
+        "projectId": "30172498",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOIRAGURI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058052",
+      "name": "MOLANPUKHURI-A PWSS",
+      "description": "MOLANPUKHURI-A PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOLANPUKHURI-A PWSS",
+        "localName": "MOLANPUKHURI-A PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38926",
+        "villageName": "Molan Pukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058052",
+        "ddrName": "MOLANPUKHURI-A PWSS",
+        "projectId": "30058052",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOLANPUKHURI-A PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058057",
+      "name": "MOLANPUKHURI-B PWSS",
+      "description": "MOLANPUKHURI-B PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOLANPUKHURI-B PWSS",
+        "localName": "MOLANPUKHURI-B PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38926",
+        "villageName": "Molan Pukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058057",
+        "ddrName": "MOLANPUKHURI-B PWSS",
+        "projectId": "30058057",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOLANPUKHURI-B PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058044",
+      "name": "NAPAM PATHAR PWSS",
+      "description": "NAPAM PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAPAM PATHAR PWSS",
+        "localName": "NAPAM PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "586586",
+        "villageName": "Napam Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058044",
+        "ddrName": "NAPAM PATHAR PWSS",
+        "projectId": "30058044",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAPAM PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172503",
+      "name": "NO.1 NURPURJUTE PART A PWSS",
+      "description": "NO.1 NURPURJUTE PART A PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 NURPURJUTE PART A PWSS",
+        "localName": "NO.1 NURPURJUTE PART A PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "NATUN PAM",
+        "villageCode": "38923",
+        "villageName": "No.1 Noorpur Jut",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172503",
+        "ddrName": "NO.1 NURPURJUTE PART A PWSS",
+        "projectId": "30172503",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 NURPURJUTE PART A PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014971",
+      "name": "NO.2 NOORPUR JUTE PWSS",
+      "description": "NO.2 NOORPUR JUTE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 NOORPUR JUTE PWSS",
+        "localName": "NO.2 NOORPUR JUTE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38923",
+        "villageName": "No.1 Noorpur Jut",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014971",
+        "ddrName": "NO.2 NOORPUR JUTE PWSS",
+        "projectId": "30014971",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 NOORPUR JUTE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156274",
+      "name": "RETROFITTING OF NOORPURJUT PWSS",
+      "description": "RETROFITTING OF NOORPURJUT PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NOORPURJUT PWSS",
+        "localName": "RETROFITTING OF NOORPURJUT PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38923",
+        "villageName": "No.1 Noorpur Jut",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156274",
+        "ddrName": "RETROFITTING OF NOORPURJUT PWSS",
+        "projectId": "8156274",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NOORPURJUT PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1432067",
+      "name": "Noorpurjute PWSS",
+      "description": "Noorpurjute PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Noorpurjute PWSS",
+        "localName": "Noorpurjute PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38923",
+        "villageName": "No.1 Noorpur Jut",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1432067",
+        "ddrName": "Noorpurjute PWSS",
+        "projectId": "1432067",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Noorpurjute PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156263",
+      "name": "RETROFITTONG OF TULIP TE PWSS",
+      "description": "RETROFITTONG OF TULIP TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTONG OF TULIP TE PWSS",
+        "localName": "RETROFITTONG OF TULIP TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38932",
+        "villageName": "No.1 Tiulip Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156263",
+        "ddrName": "RETROFITTONG OF TULIP TE PWSS",
+        "projectId": "8156263",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTONG OF TULIP TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1429340",
+      "name": "Tulip TE PWSS",
+      "description": "Tulip TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tulip TE PWSS",
+        "localName": "Tulip TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38932",
+        "villageName": "No.1 Tiulip Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1429340",
+        "ddrName": "Tulip TE PWSS",
+        "projectId": "1429340",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tulip TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4642317",
+      "name": "Tulip TE PWSS",
+      "description": "Tulip TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tulip TE PWSS",
+        "localName": "Tulip TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38932",
+        "villageName": "No.1 Tiulip Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4642317",
+        "ddrName": "Tulip TE PWSS",
+        "projectId": "4642317",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tulip TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012517",
+      "name": "No.2 Tiulip Bagan PWSS",
+      "description": "No.2 Tiulip Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Tiulip Bagan PWSS",
+        "localName": "No.2 Tiulip Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "38933",
+        "villageName": "No.2 Tiulip Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012517",
+        "ddrName": "No.2 Tiulip Bagan PWSS",
+        "projectId": "30012517",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Tiulip Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058047",
+      "name": "RAMNATHPUR PWSS",
+      "description": "RAMNATHPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMNATHPUR PWSS",
+        "localName": "RAMNATHPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23151",
+        "panchayatname": "Natun Pam",
+        "villageCode": "650936",
+        "villageName": "Ramnathpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058047",
+        "ddrName": "RAMNATHPUR PWSS",
+        "projectId": "30058047",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMNATHPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30050805",
+      "name": "BAGARI BARI GAON",
+      "description": "BAGARI BARI GAON",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGARI BARI GAON",
+        "localName": "BAGARI BARI GAON",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38996",
+        "villageName": "Bagari Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30050805",
+        "ddrName": "BAGARI BARI GAON",
+        "projectId": "30050805",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGARI BARI GAON",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4566832",
+      "name": "RATANJALI PWSS",
+      "description": "RATANJALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RATANJALI PWSS",
+        "localName": "RATANJALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38996",
+        "villageName": "Bagari Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4566832",
+        "ddrName": "RATANJALI PWSS",
+        "projectId": "4566832",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RATANJALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203693",
+      "name": "RETROFITTING OF RATANJULI PWSS",
+      "description": "RETROFITTING OF RATANJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RATANJULI PWSS",
+        "localName": "RETROFITTING OF RATANJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38996",
+        "villageName": "Bagari Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203693",
+        "ddrName": "RETROFITTING OF RATANJULI PWSS",
+        "projectId": "8203693",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RATANJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175518",
+      "name": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+      "description": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+        "localName": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38976",
+        "villageName": "Chirajuli Bagan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175518",
+        "ddrName": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+        "projectId": "6175518",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067179",
+      "name": "DHEKIAJULI BAGAN NO.1 PWSS",
+      "description": "DHEKIAJULI BAGAN NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHEKIAJULI BAGAN NO.1 PWSS",
+        "localName": "DHEKIAJULI BAGAN NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "586456",
+        "villageName": "Dhekiajuli Bagan No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067179",
+        "ddrName": "DHEKIAJULI BAGAN NO.1 PWSS",
+        "projectId": "30067179",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHEKIAJULI BAGAN NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023196",
+      "name": "No 1 Arun TE ",
+      "description": "No 1 Arun TE ",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No 1 Arun TE ",
+        "localName": "No 1 Arun TE ",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "650913",
+        "villageName": "No.1 Arun Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023196",
+        "ddrName": "No 1 Arun TE ",
+        "projectId": "30023196",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No 1 Arun TE ",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070230",
+      "name": "NO. 1 NATUN SIRAJULI PWSS",
+      "description": "NO. 1 NATUN SIRAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 1 NATUN SIRAJULI PWSS",
+        "localName": "NO. 1 NATUN SIRAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38972",
+        "villageName": "No.1 Natun Chirajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070230",
+        "ddrName": "NO. 1 NATUN SIRAJULI PWSS",
+        "projectId": "30070230",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 1 NATUN SIRAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132866",
+      "name": "RETROFITTING OF ARUN TE PWSS",
+      "description": "RETROFITTING OF ARUN TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF ARUN TE PWSS",
+        "localName": "RETROFITTING OF ARUN TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38980",
+        "villageName": "No.2 Arun Bagan (bernath)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132866",
+        "ddrName": "RETROFITTING OF ARUN TE PWSS",
+        "projectId": "8132866",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF ARUN TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5569877",
+      "name": "Arun T.E  P.W.S.S",
+      "description": "Arun T.E  P.W.S.S",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Arun T.E  P.W.S.S",
+        "localName": "Arun T.E  P.W.S.S",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38980",
+        "villageName": "No.2 Arun Bagan (bernath)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5569877",
+        "ddrName": "Arun T.E  P.W.S.S",
+        "projectId": "5569877",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Arun T.E  P.W.S.S",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020383",
+      "name": "No 2 Natun Sirajuli PWSS",
+      "description": "No 2 Natun Sirajuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No 2 Natun Sirajuli PWSS",
+        "localName": "No 2 Natun Sirajuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38977",
+        "villageName": "No.2 Natun Chirajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020383",
+        "ddrName": "No 2 Natun Sirajuli PWSS",
+        "projectId": "30020383",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No 2 Natun Sirajuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067829",
+      "name": "NO.3 ARUN TE PWSS",
+      "description": "NO.3 ARUN TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 ARUN TE PWSS",
+        "localName": "NO.3 ARUN TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38973",
+        "villageName": "No.3 Arun Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067829",
+        "ddrName": "NO.3 ARUN TE PWSS",
+        "projectId": "30067829",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 ARUN TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067065",
+      "name": "NO.4 ARUN TE PWSS",
+      "description": "NO.4 ARUN TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.4 ARUN TE PWSS",
+        "localName": "NO.4 ARUN TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "586558",
+        "villageName": "No.4 Arun Bagan (rampukhri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067065",
+        "ddrName": "NO.4 ARUN TE PWSS",
+        "projectId": "30067065",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.4 ARUN TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141831",
+      "name": "RETROFITTING OF NAM BOGORIBARI PWSS",
+      "description": "RETROFITTING OF NAM BOGORIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAM BOGORIBARI PWSS",
+        "localName": "RETROFITTING OF NAM BOGORIBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38974",
+        "villageName": "Num Bagari Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141831",
+        "ddrName": "RETROFITTING OF NAM BOGORIBARI PWSS",
+        "projectId": "8141831",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAM BOGORIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.452697",
+      "name": "NAM BAGARI BARI PWSS",
+      "description": "NAM BAGARI BARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAM BAGARI BARI PWSS",
+        "localName": "NAM BAGARI BARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23156",
+        "panchayatname": "Natun Sirajuli",
+        "villageCode": "38974",
+        "villageName": "Num Bagari Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "452697",
+        "ddrName": "NAM BAGARI BARI PWSS",
+        "projectId": "452697",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAM BAGARI BARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038176",
+      "name": "BARJHAR PWSS",
+      "description": "BARJHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARJHAR PWSS",
+        "localName": "BARJHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38948",
+        "villageName": "Barjhar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038176",
+        "ddrName": "BARJHAR PWSS",
+        "projectId": "30038176",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARJHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30033116",
+      "name": "DALBARI KACHARI PWSS",
+      "description": "DALBARI KACHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DALBARI KACHARI PWSS",
+        "localName": "DALBARI KACHARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38946",
+        "villageName": "Dala Bari Kachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30033116",
+        "ddrName": "DALBARI KACHARI PWSS",
+        "projectId": "30033116",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DALBARI KACHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30080812",
+      "name": "DURABARI GAON PWSS",
+      "description": "DURABARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DURABARI GAON PWSS",
+        "localName": "DURABARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "NIZ-BORCHOLA",
+        "villageCode": "38943",
+        "villageName": "Durabori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30080812",
+        "ddrName": "DURABARI GAON PWSS",
+        "projectId": "30080812",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DURABARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156419",
+      "name": "Retrofitting of Turipam PWSS",
+      "description": "Retrofitting of Turipam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Turipam PWSS",
+        "localName": "Retrofitting of Turipam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "NIZ-BORCHOLA",
+        "villageCode": "38943",
+        "villageName": "Durabori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156419",
+        "ddrName": "Retrofitting of Turipam PWSS",
+        "projectId": "8156419",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Turipam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30148279",
+      "name": "DURABARI PWSS",
+      "description": "DURABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DURABARI PWSS",
+        "localName": "DURABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "NIZ-BORCHOLA",
+        "villageCode": "38943",
+        "villageName": "Durabori Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30148279",
+        "ddrName": "DURABARI PWSS",
+        "projectId": "30148279",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DURABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036923",
+      "name": "GOROIMARI PATHAR PWSS",
+      "description": "GOROIMARI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOROIMARI PATHAR PWSS",
+        "localName": "GOROIMARI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38941",
+        "villageName": "Goroi Mari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036923",
+        "ddrName": "GOROIMARI PATHAR PWSS",
+        "projectId": "30036923",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOROIMARI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156424",
+      "name": "RETROFITTING OF JOORPUKHURI PWSS",
+      "description": "RETROFITTING OF JOORPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JOORPUKHURI PWSS",
+        "localName": "RETROFITTING OF JOORPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38941",
+        "villageName": "Goroi Mari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156424",
+        "ddrName": "RETROFITTING OF JOORPUKHURI PWSS",
+        "projectId": "8156424",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JOORPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1779266",
+      "name": "JOORPUKHURI PWSS",
+      "description": "JOORPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOORPUKHURI PWSS",
+        "localName": "JOORPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38945",
+        "villageName": "Joor Pukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1779266",
+        "ddrName": "JOORPUKHURI PWSS",
+        "projectId": "1779266",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOORPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067113",
+      "name": "KAR HANGA  GAON PWSS",
+      "description": "KAR HANGA  GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAR HANGA  GAON PWSS",
+        "localName": "KAR HANGA  GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "NIZ-BORCHOLA",
+        "villageCode": "38952",
+        "villageName": "Kar Hanga Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067113",
+        "ddrName": "KAR HANGA  GAON PWSS",
+        "projectId": "30067113",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAR HANGA  GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060256",
+      "name": "Karhana Pathar PWSS",
+      "description": "Karhana Pathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Karhana Pathar PWSS",
+        "localName": "Karhana Pathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "650908",
+        "villageName": "Kar Hanga Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060256",
+        "ddrName": "Karhana Pathar PWSS",
+        "projectId": "30060256",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Karhana Pathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30231032",
+      "name": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+      "description": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+        "localName": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "NIZ-BORCHOLA",
+        "villageCode": "39000",
+        "villageName": "Majuli Sar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30231032",
+        "ddrName": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+        "projectId": "30231032",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022299",
+      "name": "NIZ-BORCHALA-II PWSS",
+      "description": "NIZ-BORCHALA-II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ-BORCHALA-II PWSS",
+        "localName": "NIZ-BORCHALA-II PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38947",
+        "villageName": "Nij Bor Chola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022299",
+        "ddrName": "NIZ-BORCHALA-II PWSS",
+        "projectId": "30022299",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ-BORCHALA-II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156410",
+      "name": "RETROFITTING OF NIZ BORCHALLA PWSS",
+      "description": "RETROFITTING OF NIZ BORCHALLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NIZ BORCHALLA PWSS",
+        "localName": "RETROFITTING OF NIZ BORCHALLA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38947",
+        "villageName": "Nij Bor Chola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156410",
+        "ddrName": "RETROFITTING OF NIZ BORCHALLA PWSS",
+        "projectId": "8156410",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NIZ BORCHALLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060637",
+      "name": "NIZ-BORCHALA 1 PWSS",
+      "description": "NIZ-BORCHALA 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ-BORCHALA 1 PWSS",
+        "localName": "NIZ-BORCHALA 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38947",
+        "villageName": "Nij Bor Chola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060637",
+        "ddrName": "NIZ-BORCHALA 1 PWSS",
+        "projectId": "30060637",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ-BORCHALA 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7343676",
+      "name": "Niz Borchalla PWSS",
+      "description": "Niz Borchalla PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Niz Borchalla PWSS",
+        "localName": "Niz Borchalla PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38947",
+        "villageName": "Nij Bor Chola Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7343676",
+        "ddrName": "Niz Borchalla PWSS",
+        "projectId": "7343676",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Niz Borchalla PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3375765",
+      "name": "Toripam PWSS",
+      "description": "Toripam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Toripam PWSS",
+        "localName": "Toripam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23153",
+        "panchayatname": "Niz-borchola",
+        "villageCode": "38949",
+        "villageName": "Turipum Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3375765",
+        "ddrName": "Toripam PWSS",
+        "projectId": "3375765",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Toripam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8218304",
+      "name": "RETROFITTING OF BHAKUAMARI PWSS",
+      "description": "RETROFITTING OF BHAKUAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BHAKUAMARI PWSS",
+        "localName": "RETROFITTING OF BHAKUAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38937",
+        "villageName": "Bhokua Mari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8218304",
+        "ddrName": "RETROFITTING OF BHAKUAMARI PWSS",
+        "projectId": "8218304",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BHAKUAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187323",
+      "name": "Retrofitting of Alisinga PWSS",
+      "description": "Retrofitting of Alisinga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Alisinga PWSS",
+        "localName": "Retrofitting of Alisinga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38937",
+        "villageName": "Bhokua Mari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187323",
+        "ddrName": "Retrofitting of Alisinga PWSS",
+        "projectId": "8187323",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Alisinga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187332",
+      "name": "Retrofitting of Dhekiajuli TE PWSS",
+      "description": "Retrofitting of Dhekiajuli TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dhekiajuli TE PWSS",
+        "localName": "Retrofitting of Dhekiajuli TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38975",
+        "villageName": "Dhekiajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187332",
+        "ddrName": "Retrofitting of Dhekiajuli TE PWSS",
+        "projectId": "8187332",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dhekiajuli TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30044293",
+      "name": "DHEKIAJULI NO-1 PWSS",
+      "description": "DHEKIAJULI NO-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHEKIAJULI NO-1 PWSS",
+        "localName": "DHEKIAJULI NO-1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38975",
+        "villageName": "Dhekiajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30044293",
+        "ddrName": "DHEKIAJULI NO-1 PWSS",
+        "projectId": "30044293",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHEKIAJULI NO-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567143",
+      "name": "DHEKIAJULI TE PWSS",
+      "description": "DHEKIAJULI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHEKIAJULI TE PWSS",
+        "localName": "DHEKIAJULI TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38975",
+        "villageName": "Dhekiajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567143",
+        "ddrName": "DHEKIAJULI TE PWSS",
+        "projectId": "4567143",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHEKIAJULI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020369",
+      "name": "Dhekiajuli Bagan Line No 5",
+      "description": "Dhekiajuli Bagan Line No 5",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhekiajuli Bagan Line No 5",
+        "localName": "Dhekiajuli Bagan Line No 5",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38975",
+        "villageName": "Dhekiajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020369",
+        "ddrName": "Dhekiajuli Bagan Line No 5",
+        "projectId": "30020369",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhekiajuli Bagan Line No 5",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156289",
+      "name": "RETROFITTING OF JOYNAGAR PWSS",
+      "description": "RETROFITTING OF JOYNAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF JOYNAGAR PWSS",
+        "localName": "RETROFITTING OF JOYNAGAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38931",
+        "villageName": "No.1 Joynagar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156289",
+        "ddrName": "RETROFITTING OF JOYNAGAR PWSS",
+        "projectId": "8156289",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF JOYNAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2484678",
+      "name": "JOYNAGAR PWSS",
+      "description": "JOYNAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOYNAGAR PWSS",
+        "localName": "JOYNAGAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38931",
+        "villageName": "No.1 Joynagar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2484678",
+        "ddrName": "JOYNAGAR PWSS",
+        "projectId": "2484678",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOYNAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2484676",
+      "name": "ORIANTOLI PWSS",
+      "description": "ORIANTOLI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ORIANTOLI PWSS",
+        "localName": "ORIANTOLI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38934",
+        "villageName": "No.1 Oriontali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2484676",
+        "ddrName": "ORIANTOLI PWSS",
+        "projectId": "2484676",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ORIANTOLI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187337",
+      "name": "Retrofitting of Oriontoli PWSS",
+      "description": "Retrofitting of Oriontoli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Oriontoli PWSS",
+        "localName": "Retrofitting of Oriontoli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38934",
+        "villageName": "No.1 Oriontali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187337",
+        "ddrName": "Retrofitting of Oriontoli PWSS",
+        "projectId": "8187337",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Oriontoli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005446",
+      "name": "Palashbasti No.1 PWSS",
+      "description": "Palashbasti No.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Palashbasti No.1 PWSS",
+        "localName": "Palashbasti No.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "650921",
+        "villageName": "No.1 Palash Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005446",
+        "ddrName": "Palashbasti No.1 PWSS",
+        "projectId": "30005446",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Palashbasti No.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019680",
+      "name": "JOYNAGAR NO-2 PWSS",
+      "description": "JOYNAGAR NO-2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOYNAGAR NO-2 PWSS",
+        "localName": "JOYNAGAR NO-2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38935",
+        "villageName": "No.2 Joynagar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019680",
+        "ddrName": "JOYNAGAR NO-2 PWSS",
+        "projectId": "30019680",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOYNAGAR NO-2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8218315",
+      "name": "RETROFITTING OF DAKHINPAR PWSS",
+      "description": "RETROFITTING OF DAKHINPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DAKHINPAR PWSS",
+        "localName": "RETROFITTING OF DAKHINPAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38936",
+        "villageName": "Palasbasti No.2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8218315",
+        "ddrName": "RETROFITTING OF DAKHINPAR PWSS",
+        "projectId": "8218315",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DAKHINPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4640433",
+      "name": "PALASHBASTI PATHAR PWSS",
+      "description": "PALASHBASTI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PALASHBASTI PATHAR PWSS",
+        "localName": "PALASHBASTI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38940",
+        "villageName": "Palash Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4640433",
+        "ddrName": "PALASHBASTI PATHAR PWSS",
+        "projectId": "4640433",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PALASHBASTI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172420",
+      "name": "PALASHBASTI PATHAR-A PWSS",
+      "description": "PALASHBASTI PATHAR-A PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PALASHBASTI PATHAR-A PWSS",
+        "localName": "PALASHBASTI PATHAR-A PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38940",
+        "villageName": "Palash Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172420",
+        "ddrName": "PALASHBASTI PATHAR-A PWSS",
+        "projectId": "30172420",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PALASHBASTI PATHAR-A PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4642337",
+      "name": "PALASBASTI PATHAR",
+      "description": "PALASBASTI PATHAR",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PALASBASTI PATHAR",
+        "localName": "PALASBASTI PATHAR",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38940",
+        "villageName": "Palash Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4642337",
+        "ddrName": "PALASBASTI PATHAR",
+        "projectId": "4642337",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PALASBASTI PATHAR",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1844212",
+      "name": "Polashbosti Pather PWSS",
+      "description": "Polashbosti Pather PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Polashbosti Pather PWSS",
+        "localName": "Polashbosti Pather PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23152",
+        "panchayatname": "Palas Basti",
+        "villageCode": "38940",
+        "villageName": "Palash Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1844212",
+        "ddrName": "Polashbosti Pather PWSS",
+        "projectId": "1844212",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Polashbosti Pather PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30045140",
+      "name": "Benchimari Gaon PWSS",
+      "description": "Benchimari Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Benchimari Gaon PWSS",
+        "localName": "Benchimari Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38998",
+        "villageName": "Benchimari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30045140",
+        "ddrName": "Benchimari Gaon PWSS",
+        "projectId": "30045140",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Benchimari Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060910",
+      "name": "BONDAI JARANI PWSS",
+      "description": "BONDAI JARANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BONDAI JARANI PWSS",
+        "localName": "BONDAI JARANI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38992",
+        "villageName": "Bodaijaroni",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060910",
+        "ddrName": "BONDAI JARANI PWSS",
+        "projectId": "30060910",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BONDAI JARANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067122",
+      "name": "DHIRAI MAJULI PWSS",
+      "description": "DHIRAI MAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHIRAI MAJULI PWSS",
+        "localName": "DHIRAI MAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38989",
+        "villageName": "Dherai Majuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067122",
+        "ddrName": "DHIRAI MAJULI PWSS",
+        "projectId": "30067122",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHIRAI MAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076442",
+      "name": "DHIRAIATI GAON PWSS",
+      "description": "DHIRAIATI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHIRAIATI GAON PWSS",
+        "localName": "DHIRAIATI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "586971",
+        "villageName": "Dhiraiati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076442",
+        "ddrName": "DHIRAIATI GAON PWSS",
+        "projectId": "30076442",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHIRAIATI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8218486",
+      "name": "RETROFITTING OF LULUKAI PWSS",
+      "description": "RETROFITTING OF LULUKAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF LULUKAI PWSS",
+        "localName": "RETROFITTING OF LULUKAI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38990",
+        "villageName": "Lulukai Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8218486",
+        "ddrName": "RETROFITTING OF LULUKAI PWSS",
+        "projectId": "8218486",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF LULUKAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059318",
+      "name": "No.1 Pirakata Bengali PWSS",
+      "description": "No.1 Pirakata Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Pirakata Bengali PWSS",
+        "localName": "No.1 Pirakata Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "586549",
+        "villageName": "No.1 Pirakata Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059318",
+        "ddrName": "No.1 Pirakata Bengali PWSS",
+        "projectId": "30059318",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Pirakata Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175631",
+      "name": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+      "description": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+        "localName": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "586549",
+        "villageName": "No.1 Pirakata Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175631",
+        "ddrName": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+        "projectId": "6175631",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048696",
+      "name": "PIRAKATA NO 2 PWSS",
+      "description": "PIRAKATA NO 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PIRAKATA NO 2 PWSS",
+        "localName": "PIRAKATA NO 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38997",
+        "villageName": "No.2 Pirakata Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048696",
+        "ddrName": "PIRAKATA NO 2 PWSS",
+        "projectId": "30048696",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PIRAKATA NO 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187344",
+      "name": "Retrofitting of Pirakata PWSS",
+      "description": "Retrofitting of Pirakata PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Pirakata PWSS",
+        "localName": "Retrofitting of Pirakata PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38997",
+        "villageName": "No.2 Pirakata Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187344",
+        "ddrName": "Retrofitting of Pirakata PWSS",
+        "projectId": "8187344",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Pirakata PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1769703",
+      "name": "Pirakata PWSS",
+      "description": "Pirakata PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pirakata PWSS",
+        "localName": "Pirakata PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "Pirakata",
+        "villageCode": "38997",
+        "villageName": "No.2 Pirakata Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1769703",
+        "ddrName": "Pirakata PWSS",
+        "projectId": "1769703",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pirakata PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056433",
+      "name": "NO.3 SINGARI BAGAN PWSS",
+      "description": "NO.3 SINGARI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 SINGARI BAGAN PWSS",
+        "localName": "NO.3 SINGARI BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "PIRAKATA",
+        "villageCode": "38982",
+        "villageName": "No.3 Singari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056433",
+        "ddrName": "NO.3 SINGARI BAGAN PWSS",
+        "projectId": "30056433",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 SINGARI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158066",
+      "name": "NO.6 SINGRI BAGAN",
+      "description": "NO.6 SINGRI BAGAN",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.6 SINGRI BAGAN",
+        "localName": "NO.6 SINGRI BAGAN",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "PIRAKATA",
+        "villageCode": "650935",
+        "villageName": "No.6 Singari Bagan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158066",
+        "ddrName": "NO.6 SINGRI BAGAN",
+        "projectId": "30158066",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.6 SINGRI BAGAN",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060887",
+      "name": "SINGARI ATI GAON PWSS",
+      "description": "SINGARI ATI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGARI ATI GAON PWSS",
+        "localName": "SINGARI ATI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23158",
+        "panchayatname": "PIRAKATA",
+        "villageCode": "586939",
+        "villageName": "Singari Ati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060887",
+        "ddrName": "SINGARI ATI GAON PWSS",
+        "projectId": "30060887",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGARI ATI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132805",
+      "name": "RETROFITTING OF BALISIHA PWSS",
+      "description": "RETROFITTING OF BALISIHA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BALISIHA PWSS",
+        "localName": "RETROFITTING OF BALISIHA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38970",
+        "villageName": "Bali Siha Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132805",
+        "ddrName": "RETROFITTING OF BALISIHA PWSS",
+        "projectId": "8132805",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BALISIHA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1769128",
+      "name": "Balisiha PWSS",
+      "description": "Balisiha PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balisiha PWSS",
+        "localName": "Balisiha PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38970",
+        "villageName": "Bali Siha Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1769128",
+        "ddrName": "Balisiha PWSS",
+        "projectId": "1769128",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balisiha PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060901",
+      "name": "UPPER BALISIHA PWSS",
+      "description": "UPPER BALISIHA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UPPER BALISIHA PWSS",
+        "localName": "UPPER BALISIHA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38970",
+        "villageName": "Bali Siha Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060901",
+        "ddrName": "UPPER BALISIHA PWSS",
+        "projectId": "30060901",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UPPER BALISIHA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060893",
+      "name": "BHALUKDHARA PWSS",
+      "description": "BHALUKDHARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKDHARA PWSS",
+        "localName": "BHALUKDHARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38969",
+        "villageName": "Bhaluk Dhara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060893",
+        "ddrName": "BHALUKDHARA PWSS",
+        "projectId": "30060893",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKDHARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060313",
+      "name": "CHIRAJULI GAON PWSS",
+      "description": "CHIRAJULI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHIRAJULI GAON PWSS",
+        "localName": "CHIRAJULI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38968",
+        "villageName": "Chirajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060313",
+        "ddrName": "CHIRAJULI GAON PWSS",
+        "projectId": "30060313",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHIRAJULI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057288",
+      "name": "SIRAJULI PATHAR NO.1 PWSS",
+      "description": "SIRAJULI PATHAR NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIRAJULI PATHAR NO.1 PWSS",
+        "localName": "SIRAJULI PATHAR NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38967",
+        "villageName": "Chirajuli Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057288",
+        "ddrName": "SIRAJULI PATHAR NO.1 PWSS",
+        "projectId": "30057288",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIRAJULI PATHAR NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8218509",
+      "name": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+      "description": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+        "localName": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38967",
+        "villageName": "Chirajuli Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8218509",
+        "ddrName": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+        "projectId": "8218509",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013404",
+      "name": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+      "description": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+        "localName": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38966",
+        "villageName": "Keheru Khanda Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013404",
+        "ddrName": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+        "projectId": "30013404",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057297",
+      "name": "KEHERU KHANDA PATHER GAON PWSS",
+      "description": "KEHERU KHANDA PATHER GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KEHERU KHANDA PATHER GAON PWSS",
+        "localName": "KEHERU KHANDA PATHER GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38966",
+        "villageName": "Keheru Khanda Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057297",
+        "ddrName": "KEHERU KHANDA PATHER GAON PWSS",
+        "projectId": "30057297",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KEHERU KHANDA PATHER GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187350",
+      "name": "Retrofitting of Medhichuburi PWSS",
+      "description": "Retrofitting of Medhichuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Medhichuburi PWSS",
+        "localName": "Retrofitting of Medhichuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38966",
+        "villageName": "Keheru Khanda Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187350",
+        "ddrName": "Retrofitting of Medhichuburi PWSS",
+        "projectId": "8187350",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Medhichuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.51526",
+      "name": "MEDHI CHUBURI  PWSS",
+      "description": "MEDHI CHUBURI  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEDHI CHUBURI  PWSS",
+        "localName": "MEDHI CHUBURI  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38966",
+        "villageName": "Keheru Khanda Pather Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "51526",
+        "ddrName": "MEDHI CHUBURI  PWSS",
+        "projectId": "51526",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEDHI CHUBURI  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060667",
+      "name": "Medhichuburi No 1 PWSS",
+      "description": "Medhichuburi No 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Medhichuburi No 1 PWSS",
+        "localName": "Medhichuburi No 1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38971",
+        "villageName": "Medhi Chuburi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060667",
+        "ddrName": "Medhichuburi No 1 PWSS",
+        "projectId": "30060667",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Medhichuburi No 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060872",
+      "name": "MEDHICHUBURI GADAHAJULI PWSS",
+      "description": "MEDHICHUBURI GADAHAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEDHICHUBURI GADAHAJULI PWSS",
+        "localName": "MEDHICHUBURI GADAHAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "Sirajuli",
+        "villageCode": "38971",
+        "villageName": "Medhi Chuburi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060872",
+        "ddrName": "MEDHICHUBURI GADAHAJULI PWSS",
+        "projectId": "30060872",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEDHICHUBURI GADAHAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070802",
+      "name": "NO.1 RANGA GARA BIL GAON PWSS",
+      "description": "NO.1 RANGA GARA BIL GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 RANGA GARA BIL GAON PWSS",
+        "localName": "NO.1 RANGA GARA BIL GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "SIRAJULI",
+        "villageCode": "38965",
+        "villageName": "No.1 Ranga Gara Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070802",
+        "ddrName": "NO.1 RANGA GARA BIL GAON PWSS",
+        "projectId": "30070802",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 RANGA GARA BIL GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30217247",
+      "name": "NO.2 RANGAGARA BIL GAON PWSS",
+      "description": "NO.2 RANGAGARA BIL GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 RANGAGARA BIL GAON PWSS",
+        "localName": "NO.2 RANGAGARA BIL GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "SIRAJULI",
+        "villageCode": "38965",
+        "villageName": "No.1 Ranga Gara Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30217247",
+        "ddrName": "NO.2 RANGAGARA BIL GAON PWSS",
+        "projectId": "30217247",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 RANGAGARA BIL GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8218510",
+      "name": "RETROFITTING OF RANGAGARABIL PWSS",
+      "description": "RETROFITTING OF RANGAGARABIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF RANGAGARABIL PWSS",
+        "localName": "RETROFITTING OF RANGAGARABIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "SIRAJULI",
+        "villageCode": "650928",
+        "villageName": "No.2 Ranga Gara Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8218510",
+        "ddrName": "RETROFITTING OF RANGAGARABIL PWSS",
+        "projectId": "8218510",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF RANGAGARABIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057524",
+      "name": "NO.3 RANGA GARA BIL GAON PWSS",
+      "description": "NO.3 RANGA GARA BIL GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 RANGA GARA BIL GAON PWSS",
+        "localName": "NO.3 RANGA GARA BIL GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1251",
+        "blockname": "Borchala",
+        "panchayatcode": "23155",
+        "panchayatname": "SIRAJULI",
+        "villageCode": "650929",
+        "villageName": "No.3 Ranga Gara Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057524",
+        "ddrName": "NO.3 RANGA GARA BIL GAON PWSS",
+        "projectId": "30057524",
+        "regionName": "1251"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 RANGA GARA BIL GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237390",
+      "name": "Retrofitting of Sopai Rowmari PWSS",
+      "description": "Retrofitting of Sopai Rowmari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Sopai Rowmari PWSS",
+        "localName": "Retrofitting of Sopai Rowmari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38216",
+        "villageName": "Chapai Roumari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237390",
+        "ddrName": "Retrofitting of Sopai Rowmari PWSS",
+        "projectId": "8237390",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Sopai Rowmari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049922",
+      "name": "CHAPAI ROUMARI PATHAR",
+      "description": "CHAPAI ROUMARI PATHAR",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAPAI ROUMARI PATHAR",
+        "localName": "CHAPAI ROUMARI PATHAR",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "586724",
+        "villageName": "Chapai Roumari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049922",
+        "ddrName": "CHAPAI ROUMARI PATHAR",
+        "projectId": "30049922",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAPAI ROUMARI PATHAR",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30050030",
+      "name": "MADHUPUR BANGAON",
+      "description": "MADHUPUR BANGAON",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MADHUPUR BANGAON",
+        "localName": "MADHUPUR BANGAON",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38218",
+        "villageName": "Madhupur Ban Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30050030",
+        "ddrName": "MADHUPUR BANGAON",
+        "projectId": "30050030",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MADHUPUR BANGAON",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058023",
+      "name": "MAZ BALI GAON PWSS",
+      "description": "MAZ BALI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAZ BALI GAON PWSS",
+        "localName": "MAZ BALI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38217",
+        "villageName": "Majbali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058023",
+        "ddrName": "MAZ BALI GAON PWSS",
+        "projectId": "30058023",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAZ BALI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051529",
+      "name": "MAZGAON PATHAR PWSS",
+      "description": "MAZGAON PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAZGAON PATHAR PWSS",
+        "localName": "MAZGAON PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38215",
+        "villageName": "Majgaon Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051529",
+        "ddrName": "MAZGAON PATHAR PWSS",
+        "projectId": "30051529",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAZGAON PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156223",
+      "name": "RETROFITTING OF NARAYANKATI PWSS",
+      "description": "RETROFITTING OF NARAYANKATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NARAYANKATI PWSS",
+        "localName": "RETROFITTING OF NARAYANKATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38219",
+        "villageName": "Narayan Kati Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156223",
+        "ddrName": "RETROFITTING OF NARAYANKATI PWSS",
+        "projectId": "8156223",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NARAYANKATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068380",
+      "name": "NARENKATI BENGALI PWSS",
+      "description": "NARENKATI BENGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NARENKATI BENGALI PWSS",
+        "localName": "NARENKATI BENGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38219",
+        "villageName": "Narayan Kati Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068380",
+        "ddrName": "NARENKATI BENGALI PWSS",
+        "projectId": "30068380",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NARENKATI BENGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1763377",
+      "name": "Narengkati PWSS",
+      "description": "Narengkati PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Narengkati PWSS",
+        "localName": "Narengkati PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38219",
+        "villageName": "Narayan Kati Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1763377",
+        "ddrName": "Narengkati PWSS",
+        "projectId": "1763377",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Narengkati PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018935",
+      "name": "NARENKATI KACHARI PWSS",
+      "description": "NARENKATI KACHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NARENKATI KACHARI PWSS",
+        "localName": "NARENKATI KACHARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38220",
+        "villageName": "Narayan Kati Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018935",
+        "ddrName": "NARENKATI KACHARI PWSS",
+        "projectId": "30018935",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NARENKATI KACHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30050223",
+      "name": "PACHA BASTI PWSS",
+      "description": "PACHA BASTI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHA BASTI PWSS",
+        "localName": "PACHA BASTI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23077",
+        "panchayatname": "AMIYOPUR",
+        "villageCode": "38214",
+        "villageName": "Pacha Bast Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30050223",
+        "ddrName": "PACHA BASTI PWSS",
+        "projectId": "30050223",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHA BASTI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049949",
+      "name": "PACHNOI BANGALI PWSS",
+      "description": "PACHNOI BANGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHNOI BANGALI PWSS",
+        "localName": "PACHNOI BANGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38213",
+        "villageName": "Pachnoi Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049949",
+        "ddrName": "PACHNOI BANGALI PWSS",
+        "projectId": "30049949",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHNOI BANGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049941",
+      "name": "PACHNOI NEPALI PWSS",
+      "description": "PACHNOI NEPALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHNOI NEPALI PWSS",
+        "localName": "PACHNOI NEPALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "38212",
+        "villageName": "Pachnoi Nepali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049941",
+        "ddrName": "PACHNOI NEPALI PWSS",
+        "projectId": "30049941",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHNOI NEPALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058019",
+      "name": "PRAJABASTI GAON PWSS",
+      "description": "PRAJABASTI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PRAJABASTI GAON PWSS",
+        "localName": "PRAJABASTI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23077",
+        "panchayatname": "Amiyopur",
+        "villageCode": "586703",
+        "villageName": "Praja Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058019",
+        "ddrName": "PRAJABASTI GAON PWSS",
+        "projectId": "30058019",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PRAJABASTI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012662",
+      "name": "Arabari Gaon",
+      "description": "Arabari Gaon",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Arabari Gaon",
+        "localName": "Arabari Gaon",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38108",
+        "villageName": "Arabari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012662",
+        "ddrName": "Arabari Gaon",
+        "projectId": "30012662",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Arabari Gaon",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215261",
+      "name": "RETROFITTING OF BAHBERA PWSS",
+      "description": "RETROFITTING OF BAHBERA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BAHBERA PWSS",
+        "localName": "RETROFITTING OF BAHBERA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38103",
+        "villageName": "Bahbera Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215261",
+        "ddrName": "RETROFITTING OF BAHBERA PWSS",
+        "projectId": "8215261",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BAHBERA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30065673",
+      "name": "SOUTH BAHBERA PWSS",
+      "description": "SOUTH BAHBERA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SOUTH BAHBERA PWSS",
+        "localName": "SOUTH BAHBERA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38103",
+        "villageName": "Bahbera Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30065673",
+        "ddrName": "SOUTH BAHBERA PWSS",
+        "projectId": "30065673",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SOUTH BAHBERA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187077",
+      "name": "Retrofitting of Bangalgaon PWSS",
+      "description": "Retrofitting of Bangalgaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bangalgaon PWSS",
+        "localName": "Retrofitting of Bangalgaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38106",
+        "villageName": "Bangal Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187077",
+        "ddrName": "Retrofitting of Bangalgaon PWSS",
+        "projectId": "8187077",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bangalgaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187084",
+      "name": "Retrofitting of Dighaldal PWSS",
+      "description": "Retrofitting of Dighaldal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dighaldal PWSS",
+        "localName": "Retrofitting of Dighaldal PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38099",
+        "villageName": "Dighal Dal Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187084",
+        "ddrName": "Retrofitting of Dighaldal PWSS",
+        "projectId": "8187084",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dighaldal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.51536",
+      "name": "DIGHAL DAL PWSS",
+      "description": "DIGHAL DAL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIGHAL DAL PWSS",
+        "localName": "DIGHAL DAL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38099",
+        "villageName": "Dighal Dal Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "51536",
+        "ddrName": "DIGHAL DAL PWSS",
+        "projectId": "51536",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIGHAL DAL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30006456",
+      "name": "Kalakuchi Bagicha Gaon PWSS",
+      "description": "Kalakuchi Bagicha Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalakuchi Bagicha Gaon PWSS",
+        "localName": "Kalakuchi Bagicha Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38109",
+        "villageName": "Kalakuchi Bagicha Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30006456",
+        "ddrName": "Kalakuchi Bagicha Gaon PWSS",
+        "projectId": "30006456",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalakuchi Bagicha Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051624",
+      "name": "CHARIDUAR T.E. A",
+      "description": "CHARIDUAR T.E. A",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHARIDUAR T.E. A",
+        "localName": "CHARIDUAR T.E. A",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38109",
+        "villageName": "Kalakuchi Bagicha Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051624",
+        "ddrName": "CHARIDUAR T.E. A",
+        "projectId": "30051624",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHARIDUAR T.E. A",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8195974",
+      "name": "RETROFITTING OF KALAKUCHI PWSS",
+      "description": "RETROFITTING OF KALAKUCHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KALAKUCHI PWSS",
+        "localName": "RETROFITTING OF KALAKUCHI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38101",
+        "villageName": "Kalakuchi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8195974",
+        "ddrName": "RETROFITTING OF KALAKUCHI PWSS",
+        "projectId": "8195974",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KALAKUCHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4516046",
+      "name": "BONGALGAON PWSS",
+      "description": "BONGALGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BONGALGAON PWSS",
+        "localName": "BONGALGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38101",
+        "villageName": "Kalakuchi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4516046",
+        "ddrName": "BONGALGAON PWSS",
+        "projectId": "4516046",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BONGALGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30021055",
+      "name": "KALAKUCHI NO 1",
+      "description": "KALAKUCHI NO 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALAKUCHI NO 1",
+        "localName": "KALAKUCHI NO 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38101",
+        "villageName": "Kalakuchi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30021055",
+        "ddrName": "KALAKUCHI NO 1",
+        "projectId": "30021055",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALAKUCHI NO 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187090",
+      "name": "Retrofitting of Madhuribil PWSS",
+      "description": "Retrofitting of Madhuribil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Madhuribil PWSS",
+        "localName": "Retrofitting of Madhuribil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38107",
+        "villageName": "Khutaputa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187090",
+        "ddrName": "Retrofitting of Madhuribil PWSS",
+        "projectId": "8187090",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Madhuribil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.877934",
+      "name": "Madhuribil PWSS",
+      "description": "Madhuribil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Madhuribil PWSS",
+        "localName": "Madhuribil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38107",
+        "villageName": "Khutaputa Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "877934",
+        "ddrName": "Madhuribil PWSS",
+        "projectId": "877934",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Madhuribil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196020",
+      "name": "RETROFITTING OF LAKHUPARA PWSS",
+      "description": "RETROFITTING OF LAKHUPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF LAKHUPARA PWSS",
+        "localName": "RETROFITTING OF LAKHUPARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38105",
+        "villageName": "Lakhupara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196020",
+        "ddrName": "RETROFITTING OF LAKHUPARA PWSS",
+        "projectId": "8196020",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF LAKHUPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023708",
+      "name": "LUHARDUNG PWSS",
+      "description": "LUHARDUNG PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LUHARDUNG PWSS",
+        "localName": "LUHARDUNG PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23066",
+        "panchayatname": "Bahbera",
+        "villageCode": "38102",
+        "villageName": "Luhardung",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023708",
+        "ddrName": "LUHARDUNG PWSS",
+        "projectId": "30023708",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LUHARDUNG PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213556",
+      "name": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+      "description": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+        "localName": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23066",
+        "panchayatname": "BAHBERA",
+        "villageCode": "38104",
+        "villageName": "Siyalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213556",
+        "ddrName": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+        "projectId": "30213556",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30065876",
+      "name": "SIYALMARI GAON PWSS",
+      "description": "SIYALMARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIYALMARI GAON PWSS",
+        "localName": "SIYALMARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23066",
+        "panchayatname": "BAHBERA",
+        "villageCode": "38104",
+        "villageName": "Siyalmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30065876",
+        "ddrName": "SIYALMARI GAON PWSS",
+        "projectId": "30065876",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIYALMARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196023",
+      "name": "RETROFITTING OF THEKERAJULI PWSS",
+      "description": "RETROFITTING OF THEKERAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF THEKERAJULI PWSS",
+        "localName": "RETROFITTING OF THEKERAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23066",
+        "panchayatname": "BAHBERA",
+        "villageCode": "38100",
+        "villageName": "Thekarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196023",
+        "ddrName": "RETROFITTING OF THEKERAJULI PWSS",
+        "projectId": "8196023",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF THEKERAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172538",
+      "name": "THEKERAJULI NO.1 PWSS",
+      "description": "THEKERAJULI NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKERAJULI NO.1 PWSS",
+        "localName": "THEKERAJULI NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23066",
+        "panchayatname": "BAHBERA",
+        "villageCode": "38100",
+        "villageName": "Thekarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172538",
+        "ddrName": "THEKERAJULI NO.1 PWSS",
+        "projectId": "30172538",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKERAJULI NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8228831",
+      "name": "Retrofitting of Borbil Kachari PWSS",
+      "description": "Retrofitting of Borbil Kachari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Borbil Kachari PWSS",
+        "localName": "Retrofitting of Borbil Kachari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "586643",
+        "villageName": "Barbil Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8228831",
+        "ddrName": "Retrofitting of Borbil Kachari PWSS",
+        "projectId": "8228831",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Borbil Kachari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567264",
+      "name": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+      "description": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+        "localName": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "586643",
+        "villageName": "Barbil Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567264",
+        "ddrName": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+        "projectId": "4567264",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010634",
+      "name": "BORBIL PATHAR PWSS",
+      "description": "BORBIL PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBIL PATHAR PWSS",
+        "localName": "BORBIL PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38166",
+        "villageName": "Barbil Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010634",
+        "ddrName": "BORBIL PATHAR PWSS",
+        "projectId": "30010634",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBIL PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011655",
+      "name": "Dagaon PWSS",
+      "description": "Dagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dagaon PWSS",
+        "localName": "Dagaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38159",
+        "villageName": "Da Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011655",
+        "ddrName": "Dagaon PWSS",
+        "projectId": "30011655",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059500",
+      "name": "GABHARUPAR PWSS",
+      "description": "GABHARUPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GABHARUPAR PWSS",
+        "localName": "GABHARUPAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38170",
+        "villageName": "Gabharupar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059500",
+        "ddrName": "GABHARUPAR PWSS",
+        "projectId": "30059500",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GABHARUPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8138120",
+      "name": "RETROFITTING OF BORATI PWSS",
+      "description": "RETROFITTING OF BORATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BORATI PWSS",
+        "localName": "RETROFITTING OF BORATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38169",
+        "villageName": "Ghatua Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8138120",
+        "ddrName": "RETROFITTING OF BORATI PWSS",
+        "projectId": "8138120",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BORATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068419",
+      "name": "GHATUA PWSS",
+      "description": "GHATUA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHATUA PWSS",
+        "localName": "GHATUA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38169",
+        "villageName": "Ghatua Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068419",
+        "ddrName": "GHATUA PWSS",
+        "projectId": "30068419",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHATUA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8188715",
+      "name": "Retrofitting of Bamunpukhuri PWSS",
+      "description": "Retrofitting of Bamunpukhuri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bamunpukhuri PWSS",
+        "localName": "Retrofitting of Bamunpukhuri PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38165",
+        "villageName": "Habi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8188715",
+        "ddrName": "Retrofitting of Bamunpukhuri PWSS",
+        "projectId": "8188715",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bamunpukhuri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011141",
+      "name": "KACHARIGAON PWSS",
+      "description": "KACHARIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KACHARIGAON PWSS",
+        "localName": "KACHARIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38171",
+        "villageName": "Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011141",
+        "ddrName": "KACHARIGAON PWSS",
+        "projectId": "30011141",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KACHARIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011173",
+      "name": "Meghaijarani PWSS",
+      "description": "Meghaijarani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Meghaijarani PWSS",
+        "localName": "Meghaijarani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23071",
+        "panchayatname": "BAMUN PUKHURI",
+        "villageCode": "38163",
+        "villageName": "MEGAI PATHAR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011173",
+        "ddrName": "Meghaijarani PWSS",
+        "projectId": "30011173",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Meghaijarani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156231",
+      "name": "RETROFITTING OF MEGHAIATI PWSS",
+      "description": "RETROFITTING OF MEGHAIATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MEGHAIATI PWSS",
+        "localName": "RETROFITTING OF MEGHAIATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38164",
+        "villageName": "Meghaiati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156231",
+        "ddrName": "RETROFITTING OF MEGHAIATI PWSS",
+        "projectId": "8156231",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MEGHAIATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5073372",
+      "name": "MEGHAI ATI  PWSS",
+      "description": "MEGHAI ATI  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEGHAI ATI  PWSS",
+        "localName": "MEGHAI ATI  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38164",
+        "villageName": "Meghaiati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5073372",
+        "ddrName": "MEGHAI ATI  PWSS",
+        "projectId": "5073372",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEGHAI ATI  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057174",
+      "name": "Natun Ghatua PWSS",
+      "description": "Natun Ghatua PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Natun Ghatua PWSS",
+        "localName": "Natun Ghatua PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "39048",
+        "villageName": "Natun Ghatua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057174",
+        "ddrName": "Natun Ghatua PWSS",
+        "projectId": "30057174",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Natun Ghatua PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30062203",
+      "name": "BAMUNPUKHURI NO.1",
+      "description": "BAMUNPUKHURI NO.1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNPUKHURI NO.1",
+        "localName": "BAMUNPUKHURI NO.1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38168",
+        "villageName": "No.1 Bamun Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30062203",
+        "ddrName": "BAMUNPUKHURI NO.1",
+        "projectId": "30062203",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNPUKHURI NO.1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567271",
+      "name": "BAMUN PUKHURI PWSS",
+      "description": "BAMUN PUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUN PUKHURI PWSS",
+        "localName": "BAMUN PUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38168",
+        "villageName": "No.1 Bamun Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567271",
+        "ddrName": "BAMUN PUKHURI PWSS",
+        "projectId": "4567271",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUN PUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30007373",
+      "name": "Bamunpukhuri No 2 PWSS",
+      "description": "Bamunpukhuri No 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamunpukhuri No 2 PWSS",
+        "localName": "Bamunpukhuri No 2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38167",
+        "villageName": "No.2 Bamun Pukuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30007373",
+        "ddrName": "Bamunpukhuri No 2 PWSS",
+        "projectId": "30007373",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamunpukhuri No 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5073321",
+      "name": "BORATI PWSS",
+      "description": "BORATI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORATI PWSS",
+        "localName": "BORATI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38167",
+        "villageName": "No.2 Bamun Pukuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5073321",
+        "ddrName": "BORATI PWSS",
+        "projectId": "5073321",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORATI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058320",
+      "name": "OUBARI NO.1 PWSS",
+      "description": "OUBARI NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "OUBARI NO.1 PWSS",
+        "localName": "OUBARI NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38158",
+        "villageName": "Oubari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058320",
+        "ddrName": "OUBARI NO.1 PWSS",
+        "projectId": "30058320",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "OUBARI NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132803",
+      "name": "RETROFITTING OF OUBARI PWSS",
+      "description": "RETROFITTING OF OUBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF OUBARI PWSS",
+        "localName": "RETROFITTING OF OUBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38158",
+        "villageName": "Oubari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132803",
+        "ddrName": "RETROFITTING OF OUBARI PWSS",
+        "projectId": "8132803",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF OUBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6189867",
+      "name": "Oubari PWSS",
+      "description": "Oubari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Oubari PWSS",
+        "localName": "Oubari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38158",
+        "villageName": "Oubari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6189867",
+        "ddrName": "Oubari PWSS",
+        "projectId": "6189867",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Oubari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1844235",
+      "name": "Oubari PWSS",
+      "description": "Oubari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Oubari PWSS",
+        "localName": "Oubari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23071",
+        "panchayatname": "Bamun Pukhuri",
+        "villageCode": "38158",
+        "villageName": "Oubari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1844235",
+        "ddrName": "Oubari PWSS",
+        "projectId": "1844235",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Oubari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1758972",
+      "name": "Batachipur PWSS",
+      "description": "Batachipur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batachipur PWSS",
+        "localName": "Batachipur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38191",
+        "villageName": "Batachi Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1758972",
+        "ddrName": "Batachipur PWSS",
+        "projectId": "1758972",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batachipur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172452",
+      "name": "BATACHIPUR NO.1 PWSS",
+      "description": "BATACHIPUR NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BATACHIPUR NO.1 PWSS",
+        "localName": "BATACHIPUR NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38191",
+        "villageName": "Batachi Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172452",
+        "ddrName": "BATACHIPUR NO.1 PWSS",
+        "projectId": "30172452",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BATACHIPUR NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141062",
+      "name": "RETROFFITTING OF BATACHIPUR  PWSS",
+      "description": "RETROFFITTING OF BATACHIPUR  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFFITTING OF BATACHIPUR  PWSS",
+        "localName": "RETROFFITTING OF BATACHIPUR  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38191",
+        "villageName": "Batachi Pur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141062",
+        "ddrName": "RETROFFITTING OF BATACHIPUR  PWSS",
+        "projectId": "8141062",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFFITTING OF BATACHIPUR  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051569",
+      "name": "MADHUPUR GAON F.V PWSS",
+      "description": "MADHUPUR GAON F.V PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MADHUPUR GAON F.V PWSS",
+        "localName": "MADHUPUR GAON F.V PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38192",
+        "villageName": "Madhupur Gaon F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051569",
+        "ddrName": "MADHUPUR GAON F.V PWSS",
+        "projectId": "30051569",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MADHUPUR GAON F.V PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30065285",
+      "name": "No.1 Chamaguri Bagan PWSS",
+      "description": "No.1 Chamaguri Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Chamaguri Bagan PWSS",
+        "localName": "No.1 Chamaguri Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "650914",
+        "villageName": "No.1 Chamaguri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30065285",
+        "ddrName": "No.1 Chamaguri Bagan PWSS",
+        "projectId": "30065285",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Chamaguri Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141044",
+      "name": "RETROFITTING OF SHYMAGURI ",
+      "description": "RETROFITTING OF SHYMAGURI ",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SHYMAGURI ",
+        "localName": "RETROFITTING OF SHYMAGURI ",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "650914",
+        "villageName": "No.1 Chamaguri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141044",
+        "ddrName": "RETROFITTING OF SHYMAGURI ",
+        "projectId": "8141044",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SHYMAGURI ",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567167",
+      "name": "SHYMGURI PWSS",
+      "description": "SHYMGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SHYMGURI PWSS",
+        "localName": "SHYMGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "650914",
+        "villageName": "No.1 Chamaguri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567167",
+        "ddrName": "SHYMGURI PWSS",
+        "projectId": "4567167",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SHYMGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30003829",
+      "name": "No.1 Dibru Darrang(Part-A) PWSS",
+      "description": "No.1 Dibru Darrang(Part-A) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Dibru Darrang(Part-A) PWSS",
+        "localName": "No.1 Dibru Darrang(Part-A) PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38188",
+        "villageName": "No.1 Dibru Darrang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30003829",
+        "ddrName": "No.1 Dibru Darrang(Part-A) PWSS",
+        "projectId": "30003829",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Dibru Darrang(Part-A) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010625",
+      "name": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+      "description": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+        "localName": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38188",
+        "villageName": "No.1 Dibru Darrang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010625",
+        "ddrName": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+        "projectId": "30010625",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187157",
+      "name": "Retrofitting of Dibru Darang PWSS",
+      "description": "Retrofitting of Dibru Darang PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dibru Darang PWSS",
+        "localName": "Retrofitting of Dibru Darang PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38188",
+        "villageName": "No.1 Dibru Darrang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187157",
+        "ddrName": "Retrofitting of Dibru Darang PWSS",
+        "projectId": "8187157",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dibru Darang PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408854",
+      "name": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+      "description": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+        "localName": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38189",
+        "villageName": "No.1 Man Muhinipur Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408854",
+        "ddrName": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+        "projectId": "5408854",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005781",
+      "name": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+      "description": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+        "localName": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "650926",
+        "villageName": "No.2 Dibrudarang Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005781",
+        "ddrName": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+        "projectId": "30005781",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30003828",
+      "name": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+      "description": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+        "localName": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "650926",
+        "villageName": "No.2 Dibrudarang Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30003828",
+        "ddrName": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+        "projectId": "30003828",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051562",
+      "name": "NO.2 MANMUHINIPUR BAGAN PWSS",
+      "description": "NO.2 MANMUHINIPUR BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 MANMUHINIPUR BAGAN PWSS",
+        "localName": "NO.2 MANMUHINIPUR BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38190",
+        "villageName": "No.2 Man Muhinipur Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051562",
+        "ddrName": "NO.2 MANMUHINIPUR BAGAN PWSS",
+        "projectId": "30051562",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 MANMUHINIPUR BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036799",
+      "name": "NO.3 CHAMAGURI BAGAN PWSS",
+      "description": "NO.3 CHAMAGURI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 CHAMAGURI BAGAN PWSS",
+        "localName": "NO.3 CHAMAGURI BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "650933",
+        "villageName": "No.3 Chamaguri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036799",
+        "ddrName": "NO.3 CHAMAGURI BAGAN PWSS",
+        "projectId": "30036799",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 CHAMAGURI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30066318",
+      "name": "SHYAMGURI NO.1 PWSS",
+      "description": "SHYAMGURI NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SHYAMGURI NO.1 PWSS",
+        "localName": "SHYAMGURI NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23074",
+        "panchayatname": "Batachipur",
+        "villageCode": "38187",
+        "villageName": "Shyamguri Tea Estate",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30066318",
+        "ddrName": "SHYAMGURI NO.1 PWSS",
+        "projectId": "30066318",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SHYAMGURI NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1783019",
+      "name": "Alisinga PWSS",
+      "description": "Alisinga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Alisinga PWSS",
+        "localName": "Alisinga PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38200",
+        "villageName": "Bhotpara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1783019",
+        "ddrName": "Alisinga PWSS",
+        "projectId": "1783019",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Alisinga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172456",
+      "name": "BHOTPARA PWSS",
+      "description": "BHOTPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOTPARA PWSS",
+        "localName": "BHOTPARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38200",
+        "villageName": "Bhotpara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172456",
+        "ddrName": "BHOTPARA PWSS",
+        "projectId": "30172456",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOTPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30079745",
+      "name": "Borchalla Bagicha A PWSS",
+      "description": "Borchalla Bagicha A PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borchalla Bagicha A PWSS",
+        "localName": "Borchalla Bagicha A PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38199",
+        "villageName": "Bhotpara Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30079745",
+        "ddrName": "Borchalla Bagicha A PWSS",
+        "projectId": "30079745",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borchalla Bagicha A PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005283",
+      "name": "Dhekiajuli Gaon PWSS",
+      "description": "Dhekiajuli Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhekiajuli Gaon PWSS",
+        "localName": "Dhekiajuli Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38202",
+        "villageName": "Dhekiajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005283",
+        "ddrName": "Dhekiajuli Gaon PWSS",
+        "projectId": "30005283",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhekiajuli Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005154",
+      "name": "Manujuli Pathar Gaon",
+      "description": "Manujuli Pathar Gaon",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Manujuli Pathar Gaon",
+        "localName": "Manujuli Pathar Gaon",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38194",
+        "villageName": "Manujuli Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005154",
+        "ddrName": "Manujuli Pathar Gaon",
+        "projectId": "30005154",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Manujuli Pathar Gaon",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067468",
+      "name": "MOINAJULI GAON PWSS",
+      "description": "MOINAJULI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOINAJULI GAON PWSS",
+        "localName": "MOINAJULI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38197",
+        "villageName": "Moinajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067468",
+        "ddrName": "MOINAJULI GAON PWSS",
+        "projectId": "30067468",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOINAJULI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018712",
+      "name": "NO.1 BAGIPUKHURI GAON PWSS",
+      "description": "NO.1 BAGIPUKHURI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 BAGIPUKHURI GAON PWSS",
+        "localName": "NO.1 BAGIPUKHURI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23075",
+        "panchayatname": "BHOTPARA",
+        "villageCode": "38198",
+        "villageName": "No.1 Bagipukhuri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018712",
+        "ddrName": "NO.1 BAGIPUKHURI GAON PWSS",
+        "projectId": "30018712",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 BAGIPUKHURI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1439931",
+      "name": "Surjyapur PWSS",
+      "description": "Surjyapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Surjyapur PWSS",
+        "localName": "Surjyapur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38195",
+        "villageName": "No.1 Surjyapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1439931",
+        "ddrName": "Surjyapur PWSS",
+        "projectId": "1439931",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Surjyapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156440",
+      "name": "RETROFITTING OF SURYAPUR PWSS",
+      "description": "RETROFITTING OF SURYAPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SURYAPUR PWSS",
+        "localName": "RETROFITTING OF SURYAPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38195",
+        "villageName": "No.1 Surjyapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156440",
+        "ddrName": "RETROFITTING OF SURYAPUR PWSS",
+        "projectId": "8156440",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SURYAPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567157",
+      "name": "TINSORIA BAGAN PWSS",
+      "description": "TINSORIA BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TINSORIA BAGAN PWSS",
+        "localName": "TINSORIA BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38193",
+        "villageName": "No.1 Tinisoria Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567157",
+        "ddrName": "TINSORIA BAGAN PWSS",
+        "projectId": "4567157",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TINSORIA BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196027",
+      "name": "Retrofitting of Tinkharia PWSS",
+      "description": "Retrofitting of Tinkharia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Tinkharia PWSS",
+        "localName": "Retrofitting of Tinkharia PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38193",
+        "villageName": "No.1 Tinisoria Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196027",
+        "ddrName": "Retrofitting of Tinkharia PWSS",
+        "projectId": "8196027",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Tinkharia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018824",
+      "name": "NO 2 BAGIPUKHURI PWSS",
+      "description": "NO 2 BAGIPUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO 2 BAGIPUKHURI PWSS",
+        "localName": "NO 2 BAGIPUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "586638",
+        "villageName": "No.2 Bagipukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018824",
+        "ddrName": "NO 2 BAGIPUKHURI PWSS",
+        "projectId": "30018824",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO 2 BAGIPUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067475",
+      "name": "NO.2 SURJYAPUR PWSS",
+      "description": "NO.2 SURJYAPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 SURJYAPUR PWSS",
+        "localName": "NO.2 SURJYAPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "38196",
+        "villageName": "No.2 Surjyapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067475",
+        "ddrName": "NO.2 SURJYAPUR PWSS",
+        "projectId": "30067475",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 SURJYAPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8195888",
+      "name": "Retrofitting of Tinsoria Bagan PWSS",
+      "description": "Retrofitting of Tinsoria Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Tinsoria Bagan PWSS",
+        "localName": "Retrofitting of Tinsoria Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "586645",
+        "villageName": "No.2 Tinikhoria Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8195888",
+        "ddrName": "Retrofitting of Tinsoria Bagan PWSS",
+        "projectId": "8195888",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Tinsoria Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067942",
+      "name": "NO.3 TINISARIA BAGAN PWSS",
+      "description": "NO.3 TINISARIA BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 TINISARIA BAGAN PWSS",
+        "localName": "NO.3 TINISARIA BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "586651",
+        "villageName": "No.3 Tinisaria Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067942",
+        "ddrName": "NO.3 TINISARIA BAGAN PWSS",
+        "projectId": "30067942",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 TINISARIA BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30006497",
+      "name": "No. 4 Tinkharia",
+      "description": "No. 4 Tinkharia",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 4 Tinkharia",
+        "localName": "No. 4 Tinkharia",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "586657",
+        "villageName": "No.4 Tinkharia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30006497",
+        "ddrName": "No. 4 Tinkharia",
+        "projectId": "30006497",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 4 Tinkharia",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5074133",
+      "name": "TINKHARIA PWSS",
+      "description": "TINKHARIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TINKHARIA PWSS",
+        "localName": "TINKHARIA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "586657",
+        "villageName": "No.4 Tinkharia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5074133",
+        "ddrName": "TINKHARIA PWSS",
+        "projectId": "5074133",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TINKHARIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30015050",
+      "name": "No.5 Tinikhoria PWSS",
+      "description": "No.5 Tinikhoria PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.5 Tinikhoria PWSS",
+        "localName": "No.5 Tinikhoria PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23075",
+        "panchayatname": "Bhotpara",
+        "villageCode": "586667",
+        "villageName": "No.5 Tinikhoria",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30015050",
+        "ddrName": "No.5 Tinikhoria PWSS",
+        "projectId": "30015050",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.5 Tinikhoria PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567203",
+      "name": "CHENIMARI PWSS",
+      "description": "CHENIMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENIMARI PWSS",
+        "localName": "CHENIMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38173",
+        "villageName": "Barpeta Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567203",
+        "ddrName": "CHENIMARI PWSS",
+        "projectId": "4567203",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENIMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051263",
+      "name": "BARPETA GAON PWSS",
+      "description": "BARPETA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARPETA GAON PWSS",
+        "localName": "BARPETA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38173",
+        "villageName": "Barpeta Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051263",
+        "ddrName": "BARPETA GAON PWSS",
+        "projectId": "30051263",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARPETA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30056435",
+      "name": "BORCHOLA BAGAN PWSS",
+      "description": "BORCHOLA BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORCHOLA BAGAN PWSS",
+        "localName": "BORCHOLA BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38201",
+        "villageName": "Borchola Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30056435",
+        "ddrName": "BORCHOLA BAGAN PWSS",
+        "projectId": "30056435",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORCHOLA BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1819835",
+      "name": "Garpara PWSS",
+      "description": "Garpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Garpara PWSS",
+        "localName": "Garpara PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "586652",
+        "villageName": "Garpara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1819835",
+        "ddrName": "Garpara PWSS",
+        "projectId": "1819835",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Garpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156244",
+      "name": "RETROFITTING OF GARPARA PWSS",
+      "description": "RETROFITTING OF GARPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GARPARA PWSS",
+        "localName": "RETROFITTING OF GARPARA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "586652",
+        "villageName": "Garpara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156244",
+        "ddrName": "RETROFITTING OF GARPARA PWSS",
+        "projectId": "8156244",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GARPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30065865",
+      "name": "GARPARA PATHAR PWSS",
+      "description": "GARPARA PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARPARA PATHAR PWSS",
+        "localName": "GARPARA PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38175",
+        "villageName": "Garpara Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30065865",
+        "ddrName": "GARPARA PATHAR PWSS",
+        "projectId": "30065865",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARPARA PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8138164",
+      "name": "RETROFITTING OF GHAGRA KACHARI",
+      "description": "RETROFITTING OF GHAGRA KACHARI",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GHAGRA KACHARI",
+        "localName": "RETROFITTING OF GHAGRA KACHARI",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38174",
+        "villageName": "Ghagra Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8138164",
+        "ddrName": "RETROFITTING OF GHAGRA KACHARI",
+        "projectId": "8138164",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GHAGRA KACHARI",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.50796",
+      "name": "Ghagra Kachari PWSS",
+      "description": "Ghagra Kachari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghagra Kachari PWSS",
+        "localName": "Ghagra Kachari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38174",
+        "villageName": "Ghagra Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "50796",
+        "ddrName": "Ghagra Kachari PWSS",
+        "projectId": "50796",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghagra Kachari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005420",
+      "name": "Julia Bagan PWSS",
+      "description": "Julia Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Julia Bagan PWSS",
+        "localName": "Julia Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "612686",
+        "villageName": "Julia Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005420",
+        "ddrName": "Julia Bagan PWSS",
+        "projectId": "30005420",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Julia Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30078496",
+      "name": "MONUJULI NO.1 PWSS",
+      "description": "MONUJULI NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONUJULI NO.1 PWSS",
+        "localName": "MONUJULI NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "586649",
+        "villageName": "Monujuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30078496",
+        "ddrName": "MONUJULI NO.1 PWSS",
+        "projectId": "30078496",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONUJULI NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30078499",
+      "name": "MONUJULI NO.2 PWSS",
+      "description": "MONUJULI NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONUJULI NO.2 PWSS",
+        "localName": "MONUJULI NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "586649",
+        "villageName": "Monujuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30078499",
+        "ddrName": "MONUJULI NO.2 PWSS",
+        "projectId": "30078499",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONUJULI NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1860965",
+      "name": "Monojuli PWSS",
+      "description": "Monojuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Monojuli PWSS",
+        "localName": "Monojuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "586649",
+        "villageName": "Monujuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1860965",
+        "ddrName": "Monojuli PWSS",
+        "projectId": "1860965",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Monojuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132128",
+      "name": "Retrofitting of Monojuli PWSS",
+      "description": "Retrofitting of Monojuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Monojuli PWSS",
+        "localName": "Retrofitting of Monojuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "586649",
+        "villageName": "Monujuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132128",
+        "ddrName": "Retrofitting of Monojuli PWSS",
+        "projectId": "8132128",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Monojuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141109",
+      "name": "RETROFITTING OF CHENIMARI PWSS",
+      "description": "RETROFITTING OF CHENIMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF CHENIMARI PWSS",
+        "localName": "RETROFITTING OF CHENIMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23072",
+        "panchayatname": "Chenimari",
+        "villageCode": "38172",
+        "villageName": "No.1 Cheni Mari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141109",
+        "ddrName": "RETROFITTING OF CHENIMARI PWSS",
+        "projectId": "8141109",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF CHENIMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196029",
+      "name": "RETROFITTING OF BARBIL KACHARI PWSS",
+      "description": "RETROFITTING OF BARBIL KACHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BARBIL KACHARI PWSS",
+        "localName": "RETROFITTING OF BARBIL KACHARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "586935",
+        "villageName": "Akabil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196029",
+        "ddrName": "RETROFITTING OF BARBIL KACHARI PWSS",
+        "projectId": "8196029",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BARBIL KACHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215197",
+      "name": "Retrofitting of Dhekipelowa PWSS",
+      "description": "Retrofitting of Dhekipelowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Dhekipelowa PWSS",
+        "localName": "Retrofitting of Dhekipelowa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38098",
+        "villageName": "Dheki Peluya Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215197",
+        "ddrName": "Retrofitting of Dhekipelowa PWSS",
+        "projectId": "8215197",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Dhekipelowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.874344",
+      "name": "Dhekipelowa PWSS",
+      "description": "Dhekipelowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhekipelowa PWSS",
+        "localName": "Dhekipelowa PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38098",
+        "villageName": "Dheki Peluya Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "874344",
+        "ddrName": "Dhekipelowa PWSS",
+        "projectId": "874344",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhekipelowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.877925",
+      "name": "PATIDOI BHERELA  PWSS",
+      "description": "PATIDOI BHERELA  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PATIDOI BHERELA  PWSS",
+        "localName": "PATIDOI BHERELA  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "650897",
+        "villageName": "Dheki Peluya Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "877925",
+        "ddrName": "PATIDOI BHERELA  PWSS",
+        "projectId": "877925",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PATIDOI BHERELA  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196038",
+      "name": "RETROFITING OF MEJENGJULI PWSS",
+      "description": "RETROFITING OF MEJENGJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITING OF MEJENGJULI PWSS",
+        "localName": "RETROFITING OF MEJENGJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38093",
+        "villageName": "Megeng Juli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196038",
+        "ddrName": "RETROFITING OF MEJENGJULI PWSS",
+        "projectId": "8196038",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITING OF MEJENGJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215283",
+      "name": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+      "description": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+        "localName": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38092",
+        "villageName": "Nij-garubandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215283",
+        "ddrName": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+        "projectId": "8215283",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011158",
+      "name": "No. 1 Dhanmara Gaon",
+      "description": "No. 1 Dhanmara Gaon",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No. 1 Dhanmara Gaon",
+        "localName": "No. 1 Dhanmara Gaon",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23065",
+        "panchayatname": "GARUBANDHA",
+        "villageCode": "38110",
+        "villageName": "No.1 Dhanmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011158",
+        "ddrName": "No. 1 Dhanmara Gaon",
+        "projectId": "30011158",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No. 1 Dhanmara Gaon",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215285",
+      "name": "RETROFITTING OF DHANMORA NO.2 PWSS",
+      "description": "RETROFITTING OF DHANMORA NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHANMORA NO.2 PWSS",
+        "localName": "RETROFITTING OF DHANMORA NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38097",
+        "villageName": "No.2 Dhanmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215285",
+        "ddrName": "RETROFITTING OF DHANMORA NO.2 PWSS",
+        "projectId": "8215285",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHANMORA NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055696",
+      "name": "PAKARIGURI PATHAR GAON PWSS",
+      "description": "PAKARIGURI PATHAR GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAKARIGURI PATHAR GAON PWSS",
+        "localName": "PAKARIGURI PATHAR GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38096",
+        "villageName": "Pakariguri Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055696",
+        "ddrName": "PAKARIGURI PATHAR GAON PWSS",
+        "projectId": "30055696",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAKARIGURI PATHAR GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012221",
+      "name": "Patidoibherla Center",
+      "description": "Patidoibherla Center",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Patidoibherla Center",
+        "localName": "Patidoibherla Center",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38095",
+        "villageName": "Patidoi Bherala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012221",
+        "ddrName": "Patidoibherla Center",
+        "projectId": "30012221",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Patidoibherla Center",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017520",
+      "name": "PATIDOI BHERLA NO 1",
+      "description": "PATIDOI BHERLA NO 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PATIDOI BHERLA NO 1",
+        "localName": "PATIDOI BHERLA NO 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38095",
+        "villageName": "Patidoi Bherala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017520",
+        "ddrName": "PATIDOI BHERLA NO 1",
+        "projectId": "30017520",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PATIDOI BHERLA NO 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187146",
+      "name": "Retrofitting of Patidoi Bherla PWSS",
+      "description": "Retrofitting of Patidoi Bherla PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Patidoi Bherla PWSS",
+        "localName": "Retrofitting of Patidoi Bherla PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23065",
+        "panchayatname": "Garubandha",
+        "villageCode": "38095",
+        "villageName": "Patidoi Bherala Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187146",
+        "ddrName": "Retrofitting of Patidoi Bherla PWSS",
+        "projectId": "8187146",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Patidoi Bherla PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196774",
+      "name": "RETROFITTING OF BELSIRI TE PWSS",
+      "description": "RETROFITTING OF BELSIRI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BELSIRI TE PWSS",
+        "localName": "RETROFITTING OF BELSIRI TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "586642",
+        "villageName": "Belsiri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196774",
+        "ddrName": "RETROFITTING OF BELSIRI TE PWSS",
+        "projectId": "8196774",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BELSIRI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051272",
+      "name": "GARMARA BENGALI PWSS",
+      "description": "GARMARA BENGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARMARA BENGALI PWSS",
+        "localName": "GARMARA BENGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "650899",
+        "villageName": "Garmara Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051272",
+        "ddrName": "GARMARA BENGALI PWSS",
+        "projectId": "30051272",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARMARA BENGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187153",
+      "name": "Retrofitting of Garmora PWSS",
+      "description": "Retrofitting of Garmora PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Garmora PWSS",
+        "localName": "Retrofitting of Garmora PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38148",
+        "villageName": "Garmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187153",
+        "ddrName": "Retrofitting of Garmora PWSS",
+        "projectId": "8187153",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Garmora PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175650",
+      "name": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+      "description": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+        "localName": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38148",
+        "villageName": "Garmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175650",
+        "ddrName": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+        "projectId": "6175650",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196779",
+      "name": "RETROFITTING OF GORMORA KACHARI PWSS",
+      "description": "RETROFITTING OF GORMORA KACHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GORMORA KACHARI PWSS",
+        "localName": "RETROFITTING OF GORMORA KACHARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38151",
+        "villageName": "Garmara Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196779",
+        "ddrName": "RETROFITTING OF GORMORA KACHARI PWSS",
+        "projectId": "8196779",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GORMORA KACHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2480363",
+      "name": "GORMARA KACHARI",
+      "description": "GORMARA KACHARI",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GORMARA KACHARI",
+        "localName": "GORMARA KACHARI",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38146",
+        "villageName": "Garmara Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2480363",
+        "ddrName": "GORMARA KACHARI",
+        "projectId": "2480363",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GORMARA KACHARI",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196756",
+      "name": "RETROFITTING OF GARMORA SESABIL PWSS",
+      "description": "RETROFITTING OF GARMORA SESABIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GARMORA SESABIL PWSS",
+        "localName": "RETROFITTING OF GARMORA SESABIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38149",
+        "villageName": "Gormara Sesa Bil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196756",
+        "ddrName": "RETROFITTING OF GARMORA SESABIL PWSS",
+        "projectId": "8196756",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GARMORA SESABIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175645",
+      "name": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+      "description": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+        "localName": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38142",
+        "villageName": "Maduribil Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175645",
+        "ddrName": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+        "projectId": "6175645",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036747",
+      "name": "MADHURIBIL PATHAR PWSS",
+      "description": "MADHURIBIL PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MADHURIBIL PATHAR PWSS",
+        "localName": "MADHURIBIL PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "588674",
+        "villageName": "Maduribil Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036747",
+        "ddrName": "MADHURIBIL PATHAR PWSS",
+        "projectId": "30036747",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MADHURIBIL PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5550489",
+      "name": "Retrofitting of Matikhunda PWSS ( QA )",
+      "description": "Retrofitting of Matikhunda PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Matikhunda PWSS ( QA )",
+        "localName": "Retrofitting of Matikhunda PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38144",
+        "villageName": "Matikhunda Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5550489",
+        "ddrName": "Retrofitting of Matikhunda PWSS ( QA )",
+        "projectId": "5550489",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Matikhunda PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1759034",
+      "name": "Matikhunda Medhipam",
+      "description": "Matikhunda Medhipam",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Matikhunda Medhipam",
+        "localName": "Matikhunda Medhipam",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38144",
+        "villageName": "Matikhunda Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1759034",
+        "ddrName": "Matikhunda Medhipam",
+        "projectId": "1759034",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Matikhunda Medhipam",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187165",
+      "name": "Retrofitting of Matikhunda Medhipam PWSS",
+      "description": "Retrofitting of Matikhunda Medhipam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Matikhunda Medhipam PWSS",
+        "localName": "Retrofitting of Matikhunda Medhipam PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38144",
+        "villageName": "Matikhunda Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187165",
+        "ddrName": "Retrofitting of Matikhunda Medhipam PWSS",
+        "projectId": "8187165",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Matikhunda Medhipam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014264",
+      "name": "No 2. Belsiri Bagan",
+      "description": "No 2. Belsiri Bagan",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No 2. Belsiri Bagan",
+        "localName": "No 2. Belsiri Bagan",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "586823",
+        "villageName": "No.2 Belsiri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014264",
+        "ddrName": "No 2. Belsiri Bagan",
+        "projectId": "30014264",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No 2. Belsiri Bagan",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051276",
+      "name": "NO.2 GARMARA GAON PWSS",
+      "description": "NO.2 GARMARA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 GARMARA GAON PWSS",
+        "localName": "NO.2 GARMARA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "650927",
+        "villageName": "No.2 Garmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051276",
+        "ddrName": "NO.2 GARMARA GAON PWSS",
+        "projectId": "30051276",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 GARMARA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051492",
+      "name": "NO.3 BELSIRI BAGAN PWSS",
+      "description": "NO.3 BELSIRI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 BELSIRI BAGAN PWSS",
+        "localName": "NO.3 BELSIRI BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38156",
+        "villageName": "No.3 Belsiri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051492",
+        "ddrName": "NO.3 BELSIRI BAGAN PWSS",
+        "projectId": "30051492",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 BELSIRI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017259",
+      "name": "NO 4 BELSIRI BAGAN",
+      "description": "NO 4 BELSIRI BAGAN",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO 4 BELSIRI BAGAN",
+        "localName": "NO 4 BELSIRI BAGAN",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38141",
+        "villageName": "No.4 Belsiri Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017259",
+        "ddrName": "NO 4 BELSIRI BAGAN",
+        "projectId": "30017259",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO 4 BELSIRI BAGAN",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055216",
+      "name": "NO.6 JURUKHI PWSS",
+      "description": "NO.6 JURUKHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.6 JURUKHI PWSS",
+        "localName": "NO.6 JURUKHI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "586805",
+        "villageName": "No.6 Jurukhri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055216",
+        "ddrName": "NO.6 JURUKHI PWSS",
+        "projectId": "30055216",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.6 JURUKHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196786",
+      "name": "RETROFITTING OG PAVAMARI PWSS",
+      "description": "RETROFITTING OG PAVAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OG PAVAMARI PWSS",
+        "localName": "RETROFITTING OG PAVAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23070",
+        "panchayatname": "Gorhmara",
+        "villageCode": "38152",
+        "villageName": "Pabhamari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196786",
+        "ddrName": "RETROFITTING OG PAVAMARI PWSS",
+        "projectId": "8196786",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OG PAVAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141923",
+      "name": "RETROFITING OF BENGENAJULI PWSS",
+      "description": "RETROFITING OF BENGENAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITING OF BENGENAJULI PWSS",
+        "localName": "RETROFITING OF BENGENAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38072",
+        "villageName": "Bengana Juli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141923",
+        "ddrName": "RETROFITING OF BENGENAJULI PWSS",
+        "projectId": "8141923",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITING OF BENGENAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2486691",
+      "name": "BENGENAJULI PWSS",
+      "description": "BENGENAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BENGENAJULI PWSS",
+        "localName": "BENGENAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38072",
+        "villageName": "Bengana Juli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2486691",
+        "ddrName": "BENGENAJULI PWSS",
+        "projectId": "2486691",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BENGENAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215403",
+      "name": "RETROFITTING OF  BHERBHERIBIL PWSS",
+      "description": "RETROFITTING OF  BHERBHERIBIL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF  BHERBHERIBIL PWSS",
+        "localName": "RETROFITTING OF  BHERBHERIBIL PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38073",
+        "villageName": "Dighaljuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215403",
+        "ddrName": "RETROFITTING OF  BHERBHERIBIL PWSS",
+        "projectId": "8215403",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF  BHERBHERIBIL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055210",
+      "name": "KATHALGURI GAON PWSS",
+      "description": "KATHALGURI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATHALGURI GAON PWSS",
+        "localName": "KATHALGURI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38076",
+        "villageName": "Kathalguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055210",
+        "ddrName": "KATHALGURI GAON PWSS",
+        "projectId": "30055210",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATHALGURI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8228162",
+      "name": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+      "description": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+        "localName": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38071",
+        "villageName": "Naharani Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8228162",
+        "ddrName": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+        "projectId": "8228162",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1803054",
+      "name": "Naharani PWSS",
+      "description": "Naharani PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharani PWSS",
+        "localName": "Naharani PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38071",
+        "villageName": "Naharani Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1803054",
+        "ddrName": "Naharani PWSS",
+        "projectId": "1803054",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharani PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203725",
+      "name": "RETROFITTING OF MISSAMARI  PWSS",
+      "description": "RETROFITTING OF MISSAMARI  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MISSAMARI  PWSS",
+        "localName": "RETROFITTING OF MISSAMARI  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38079",
+        "villageName": "Nepali Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203725",
+        "ddrName": "RETROFITTING OF MISSAMARI  PWSS",
+        "projectId": "8203725",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MISSAMARI  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5072706",
+      "name": "MISSAMARI PWSS",
+      "description": "MISSAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MISSAMARI PWSS",
+        "localName": "MISSAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38079",
+        "villageName": "Nepali Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5072706",
+        "ddrName": "MISSAMARI PWSS",
+        "projectId": "5072706",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MISSAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196792",
+      "name": "RETROFITTING OG JIAGABHARU PWSS",
+      "description": "RETROFITTING OG JIAGABHARU PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OG JIAGABHARU PWSS",
+        "localName": "RETROFITTING OG JIAGABHARU PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38077",
+        "villageName": "No.1 Giya-gabharu",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196792",
+        "ddrName": "RETROFITTING OG JIAGABHARU PWSS",
+        "projectId": "8196792",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OG JIAGABHARU PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213489",
+      "name": "JIAGABHARU NO.1 PWSS",
+      "description": "JIAGABHARU NO.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JIAGABHARU NO.1 PWSS",
+        "localName": "JIAGABHARU NO.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38077",
+        "villageName": "No.1 Giya-gabharu",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213489",
+        "ddrName": "JIAGABHARU NO.1 PWSS",
+        "projectId": "30213489",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JIAGABHARU NO.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196816",
+      "name": "RETROFITTING OF REKAMARI PWSS",
+      "description": "RETROFITTING OF REKAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF REKAMARI PWSS",
+        "localName": "RETROFITTING OF REKAMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38080",
+        "villageName": "Rekamari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196816",
+        "ddrName": "RETROFITTING OF REKAMARI PWSS",
+        "projectId": "8196816",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF REKAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213598",
+      "name": "Tarajan Gaon PWSS",
+      "description": "Tarajan Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajan Gaon PWSS",
+        "localName": "Tarajan Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38080",
+        "villageName": "Rekamari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213598",
+        "ddrName": "Tarajan Gaon PWSS",
+        "projectId": "30213598",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajan Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054383",
+      "name": "TATSAL GAON",
+      "description": "TATSAL GAON",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TATSAL GAON",
+        "localName": "TATSAL GAON",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23063",
+        "panchayatname": "Jia-gabharu",
+        "villageCode": "38081",
+        "villageName": "Tatsal Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054383",
+        "ddrName": "TATSAL GAON",
+        "projectId": "30054383",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TATSAL GAON",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019266",
+      "name": "KATHALUDUB GAON PWSS",
+      "description": "KATHALUDUB GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATHALUDUB GAON PWSS",
+        "localName": "KATHALUDUB GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38140",
+        "villageName": "Katalu Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019266",
+        "ddrName": "KATHALUDUB GAON PWSS",
+        "projectId": "30019266",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATHALUDUB GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1450901",
+      "name": "Kathalupather PWSS",
+      "description": "Kathalupather PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kathalupather PWSS",
+        "localName": "Kathalupather PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38140",
+        "villageName": "Katalu Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1450901",
+        "ddrName": "Kathalupather PWSS",
+        "projectId": "1450901",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kathalupather PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8131608",
+      "name": "Retrofitting of Kathalupathar PWSS",
+      "description": "Retrofitting of Kathalupathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Kathalupathar PWSS",
+        "localName": "Retrofitting of Kathalupathar PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38140",
+        "villageName": "Katalu Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8131608",
+        "ddrName": "Retrofitting of Kathalupathar PWSS",
+        "projectId": "8131608",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Kathalupathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6166571",
+      "name": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+      "description": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+        "localName": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38139",
+        "villageName": "Kataludub Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6166571",
+        "ddrName": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+        "projectId": "6166571",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196837",
+      "name": "RETROFITTING OF KEHRUKHANDA PWSS",
+      "description": "RETROFITTING OF KEHRUKHANDA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KEHRUKHANDA PWSS",
+        "localName": "RETROFITTING OF KEHRUKHANDA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38137",
+        "villageName": "Keheru Khanda Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196837",
+        "ddrName": "RETROFITTING OF KEHRUKHANDA PWSS",
+        "projectId": "8196837",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KEHRUKHANDA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1844228",
+      "name": "Keherukhanda PWSS",
+      "description": "Keherukhanda PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Keherukhanda PWSS",
+        "localName": "Keherukhanda PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38137",
+        "villageName": "Keheru Khanda Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1844228",
+        "ddrName": "Keherukhanda PWSS",
+        "projectId": "1844228",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Keherukhanda PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196871",
+      "name": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+      "description": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+        "localName": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38134",
+        "villageName": "Numchuburi Panbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196871",
+        "ddrName": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+        "projectId": "8196871",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012538",
+      "name": "Namchuburi Panbari NO 1",
+      "description": "Namchuburi Panbari NO 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Namchuburi Panbari NO 1",
+        "localName": "Namchuburi Panbari NO 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38134",
+        "villageName": "Numchuburi Panbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012538",
+        "ddrName": "Namchuburi Panbari NO 1",
+        "projectId": "30012538",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Namchuburi Panbari NO 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8273083",
+      "name": "NAM CHUBURI  PANBARI ( 88) AWC",
+      "description": "NAM CHUBURI  PANBARI ( 88) AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAM CHUBURI  PANBARI ( 88) AWC",
+        "localName": "NAM CHUBURI  PANBARI ( 88) AWC",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38134",
+        "villageName": "Numchuburi Panbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8273083",
+        "ddrName": "NAM CHUBURI  PANBARI ( 88) AWC",
+        "projectId": "8273083",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAM CHUBURI  PANBARI ( 88) AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059502",
+      "name": "PANBARI GAON PWSS",
+      "description": "PANBARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PANBARI GAON PWSS",
+        "localName": "PANBARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23069",
+        "panchayatname": "KEHERUKHUNDA",
+        "villageCode": "38136",
+        "villageName": "Panbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059502",
+        "ddrName": "PANBARI GAON PWSS",
+        "projectId": "30059502",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PANBARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011048",
+      "name": "Tarajan Bengali",
+      "description": "Tarajan Bengali",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarajan Bengali",
+        "localName": "Tarajan Bengali",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23069",
+        "panchayatname": "Keherukhunda",
+        "villageCode": "38133",
+        "villageName": "Tarajan Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011048",
+        "ddrName": "Tarajan Bengali",
+        "projectId": "30011048",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarajan Bengali",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30044481",
+      "name": "Amtal Bali Gaon PWSS",
+      "description": "Amtal Bali Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amtal Bali Gaon PWSS",
+        "localName": "Amtal Bali Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38223",
+        "villageName": "Amtal Bali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30044481",
+        "ddrName": "Amtal Bali Gaon PWSS",
+        "projectId": "30044481",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amtal Bali Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30044491",
+      "name": "Amtol Bengali Gaon PWSS",
+      "description": "Amtol Bengali Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amtol Bengali Gaon PWSS",
+        "localName": "Amtol Bengali Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "586725",
+        "villageName": "Amtal Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30044491",
+        "ddrName": "Amtol Bengali Gaon PWSS",
+        "projectId": "30044491",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amtol Bengali Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196879",
+      "name": "RETROFITTING OF GEJENGAGURI PWSS",
+      "description": "RETROFITTING OF GEJENGAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF GEJENGAGURI PWSS",
+        "localName": "RETROFITTING OF GEJENGAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38222",
+        "villageName": "Amtal Bher Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196879",
+        "ddrName": "RETROFITTING OF GEJENGAGURI PWSS",
+        "projectId": "8196879",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF GEJENGAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30050939",
+      "name": "Balisuti Bengali Gaon PWSS",
+      "description": "Balisuti Bengali Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balisuti Bengali Gaon PWSS",
+        "localName": "Balisuti Bengali Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38233",
+        "villageName": "Balisuti Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30050939",
+        "ddrName": "Balisuti Bengali Gaon PWSS",
+        "projectId": "30050939",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balisuti Bengali Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051018",
+      "name": "GABHARUPAR GAON PWSS",
+      "description": "GABHARUPAR GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GABHARUPAR GAON PWSS",
+        "localName": "GABHARUPAR GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38234",
+        "villageName": "Gabharupar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051018",
+        "ddrName": "GABHARUPAR GAON PWSS",
+        "projectId": "30051018",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GABHARUPAR GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30053688",
+      "name": "GERUJULI GAON PWSS",
+      "description": "GERUJULI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GERUJULI GAON PWSS",
+        "localName": "GERUJULI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38226",
+        "villageName": "Gerujuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30053688",
+        "ddrName": "GERUJULI GAON PWSS",
+        "projectId": "30053688",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GERUJULI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051014",
+      "name": "GOHAIN ALI GAON PWSS",
+      "description": "GOHAIN ALI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOHAIN ALI GAON PWSS",
+        "localName": "GOHAIN ALI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38232",
+        "villageName": "Gohain Ali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051014",
+        "ddrName": "GOHAIN ALI GAON PWSS",
+        "projectId": "30051014",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOHAIN ALI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054598",
+      "name": "GOHAI BHETI GAON",
+      "description": "GOHAI BHETI GAON",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOHAI BHETI GAON",
+        "localName": "GOHAI BHETI GAON",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38230",
+        "villageName": "Gohain Bheti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054598",
+        "ddrName": "GOHAI BHETI GAON",
+        "projectId": "30054598",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOHAI BHETI GAON",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187171",
+      "name": "Retrofitting of Labarigaon PWSS",
+      "description": "Retrofitting of Labarigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Labarigaon PWSS",
+        "localName": "Retrofitting of Labarigaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38228",
+        "villageName": "Labari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187171",
+        "ddrName": "Retrofitting of Labarigaon PWSS",
+        "projectId": "8187171",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Labarigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1784527",
+      "name": "Labarigaon P,w.S.S",
+      "description": "Labarigaon P,w.S.S",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Labarigaon P,w.S.S",
+        "localName": "Labarigaon P,w.S.S",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38228",
+        "villageName": "Labari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1784527",
+        "ddrName": "Labarigaon P,w.S.S",
+        "projectId": "1784527",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Labarigaon P,w.S.S",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5569781",
+      "name": "Labarigaon P.W.S.S",
+      "description": "Labarigaon P.W.S.S",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Labarigaon P.W.S.S",
+        "localName": "Labarigaon P.W.S.S",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38228",
+        "villageName": "Labari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5569781",
+        "ddrName": "Labarigaon P.W.S.S",
+        "projectId": "5569781",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Labarigaon P.W.S.S",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30053615",
+      "name": "MAJ ROUMARI GAON PWSS",
+      "description": "MAJ ROUMARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAJ ROUMARI GAON PWSS",
+        "localName": "MAJ ROUMARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38224",
+        "villageName": "Majroumari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30053615",
+        "ddrName": "MAJ ROUMARI GAON PWSS",
+        "projectId": "30053615",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAJ ROUMARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172473",
+      "name": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+      "description": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+        "localName": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38224",
+        "villageName": "Majroumari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172473",
+        "ddrName": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+        "projectId": "30172473",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070620",
+      "name": "Majroumari Bangali Gaon PWSS",
+      "description": "Majroumari Bangali Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Majroumari Bangali Gaon PWSS",
+        "localName": "Majroumari Bangali Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23078",
+        "panchayatname": "MAZ-ROWMARI",
+        "villageCode": "703561",
+        "villageName": "MAJROUMARI GAON",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070620",
+        "ddrName": "Majroumari Bangali Gaon PWSS",
+        "projectId": "30070620",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Majroumari Bangali Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1784430",
+      "name": "Naharbari Bengali P.W.S.S",
+      "description": "Naharbari Bengali P.W.S.S",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharbari Bengali P.W.S.S",
+        "localName": "Naharbari Bengali P.W.S.S",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23078",
+        "panchayatname": "MAZ-ROWMARI",
+        "villageCode": "703561",
+        "villageName": "MAJROUMARI GAON",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1784430",
+        "ddrName": "Naharbari Bengali P.W.S.S",
+        "projectId": "1784430",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharbari Bengali P.W.S.S",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055680",
+      "name": "MAJROWMAMARI KACHARI GAON PWSS",
+      "description": "MAJROWMAMARI KACHARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAJROWMAMARI KACHARI GAON PWSS",
+        "localName": "MAJROWMAMARI KACHARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38235",
+        "villageName": "Majroumari Kachari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055680",
+        "ddrName": "MAJROWMAMARI KACHARI GAON PWSS",
+        "projectId": "30055680",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAJROWMAMARI KACHARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067509",
+      "name": "MAZBAT GAON PWSS",
+      "description": "MAZBAT GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAZBAT GAON PWSS",
+        "localName": "MAZBAT GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38231",
+        "villageName": "Mazbat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067509",
+        "ddrName": "MAZBAT GAON PWSS",
+        "projectId": "30067509",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAZBAT GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187175",
+      "name": "Retrofitting of Naharbari Bengali PWSS",
+      "description": "Retrofitting of Naharbari Bengali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Naharbari Bengali PWSS",
+        "localName": "Retrofitting of Naharbari Bengali PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38227",
+        "villageName": "Nahar Bari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187175",
+        "ddrName": "Retrofitting of Naharbari Bengali PWSS",
+        "projectId": "8187175",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Naharbari Bengali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067518",
+      "name": "NAHAR BARI BANGALI GAON PWSS",
+      "description": "NAHAR BARI BANGALI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAHAR BARI BANGALI GAON PWSS",
+        "localName": "NAHAR BARI BANGALI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38227",
+        "villageName": "Nahar Bari Bangali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067518",
+        "ddrName": "NAHAR BARI BANGALI GAON PWSS",
+        "projectId": "30067518",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAHAR BARI BANGALI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067536",
+      "name": "NO.2 SINGIMARI GAON PWSS",
+      "description": "NO.2 SINGIMARI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 SINGIMARI GAON PWSS",
+        "localName": "NO.2 SINGIMARI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23078",
+        "panchayatname": "Maz-rowmari",
+        "villageCode": "38229",
+        "villageName": "No.2 Singimari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067536",
+        "ddrName": "NO.2 SINGIMARI GAON PWSS",
+        "projectId": "30067536",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 SINGIMARI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196894",
+      "name": "RETROFITTING OF BANDARHAGI PWSS",
+      "description": "RETROFITTING OF BANDARHAGI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF BANDARHAGI PWSS",
+        "localName": "RETROFITTING OF BANDARHAGI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38084",
+        "villageName": "Bandarhagi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196894",
+        "ddrName": "RETROFITTING OF BANDARHAGI PWSS",
+        "projectId": "8196894",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF BANDARHAGI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020766",
+      "name": "BHERBHERI GAON PWSS",
+      "description": "BHERBHERI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHERBHERI GAON PWSS",
+        "localName": "BHERBHERI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "586708",
+        "villageName": "Bherbheri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020766",
+        "ddrName": "BHERBHERI GAON PWSS",
+        "projectId": "30020766",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHERBHERI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196903",
+      "name": "RETROFITTING OF DHANKHANABARI PWSS",
+      "description": "RETROFITTING OF DHANKHANABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF DHANKHANABARI PWSS",
+        "localName": "RETROFITTING OF DHANKHANABARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38090",
+        "villageName": "Dhan Khana Bari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196903",
+        "ddrName": "RETROFITTING OF DHANKHANABARI PWSS",
+        "projectId": "8196903",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF DHANKHANABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011088",
+      "name": "Michamari Gaon (Pt-A)",
+      "description": "Michamari Gaon (Pt-A)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Michamari Gaon (Pt-A)",
+        "localName": "Michamari Gaon (Pt-A)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38087",
+        "villageName": "Michamari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011088",
+        "ddrName": "Michamari Gaon (Pt-A)",
+        "projectId": "30011088",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Michamari Gaon (Pt-A)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012177",
+      "name": "Michamari Gaon (Pt-B)",
+      "description": "Michamari Gaon (Pt-B)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Michamari Gaon (Pt-B)",
+        "localName": "Michamari Gaon (Pt-B)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38087",
+        "villageName": "Michamari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012177",
+        "ddrName": "Michamari Gaon (Pt-B)",
+        "projectId": "30012177",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Michamari Gaon (Pt-B)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012178",
+      "name": "Michamari Gaon (Pt-C)",
+      "description": "Michamari Gaon (Pt-C)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Michamari Gaon (Pt-C)",
+        "localName": "Michamari Gaon (Pt-C)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38087",
+        "villageName": "Michamari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012178",
+        "ddrName": "Michamari Gaon (Pt-C)",
+        "projectId": "30012178",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Michamari Gaon (Pt-C)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196910",
+      "name": "RETROFITTING OF NABIL PATHER PWSS",
+      "description": "RETROFITTING OF NABIL PATHER PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NABIL PATHER PWSS",
+        "localName": "RETROFITTING OF NABIL PATHER PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38091",
+        "villageName": "Nabil Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196910",
+        "ddrName": "RETROFITTING OF NABIL PATHER PWSS",
+        "projectId": "8196910",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NABIL PATHER PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172543",
+      "name": "NABIL KISAN PWSS",
+      "description": "NABIL KISAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NABIL KISAN PWSS",
+        "localName": "NABIL KISAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38091",
+        "villageName": "Nabil Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172543",
+        "ddrName": "NABIL KISAN PWSS",
+        "projectId": "30172543",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NABIL KISAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30065681",
+      "name": "NAGA PARHAR GAON PWSS",
+      "description": "NAGA PARHAR GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAGA PARHAR GAON PWSS",
+        "localName": "NAGA PARHAR GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23064",
+        "panchayatname": "Missamari",
+        "villageCode": "38089",
+        "villageName": "Naga Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30065681",
+        "ddrName": "NAGA PARHAR GAON PWSS",
+        "projectId": "30065681",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAGA PARHAR GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070613",
+      "name": "BALI PUKHURI PWSS",
+      "description": "BALI PUKHURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALI PUKHURI PWSS",
+        "localName": "BALI PUKHURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38186",
+        "villageName": "Bali Pukhuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070613",
+        "ddrName": "BALI PUKHURI PWSS",
+        "projectId": "30070613",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALI PUKHURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005988",
+      "name": "Dhirai Bagan",
+      "description": "Dhirai Bagan",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhirai Bagan",
+        "localName": "Dhirai Bagan",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38184",
+        "villageName": "Dhirai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005988",
+        "ddrName": "Dhirai Bagan",
+        "projectId": "30005988",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhirai Bagan",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30052518",
+      "name": "GEJENGAGURI GAON PWSS",
+      "description": "GEJENGAGURI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GEJENGAGURI GAON PWSS",
+        "localName": "GEJENGAGURI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38176",
+        "villageName": "Gazanga Guri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30052518",
+        "ddrName": "GEJENGAGURI GAON PWSS",
+        "projectId": "30052518",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GEJENGAGURI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020777",
+      "name": "Goorbasti Gaon",
+      "description": "Goorbasti Gaon",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Goorbasti Gaon",
+        "localName": "Goorbasti Gaon",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38185",
+        "villageName": "Goor Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020777",
+        "ddrName": "Goorbasti Gaon",
+        "projectId": "30020777",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Goorbasti Gaon",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038635",
+      "name": "KHRISTANPARA GAON PWSS",
+      "description": "KHRISTANPARA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHRISTANPARA GAON PWSS",
+        "localName": "KHRISTANPARA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38178",
+        "villageName": "Khristanpara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038635",
+        "ddrName": "KHRISTANPARA GAON PWSS",
+        "projectId": "30038635",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHRISTANPARA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187179",
+      "name": "Retrofitting of Mizibari PWSS",
+      "description": "Retrofitting of Mizibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Mizibari PWSS",
+        "localName": "Retrofitting of Mizibari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "586744",
+        "villageName": "Mijibari Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187179",
+        "ddrName": "Retrofitting of Mizibari PWSS",
+        "projectId": "8187179",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Mizibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1441030",
+      "name": "Mizibari PWSS",
+      "description": "Mizibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mizibari PWSS",
+        "localName": "Mizibari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38179",
+        "villageName": "Mijibari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1441030",
+        "ddrName": "Mizibari PWSS",
+        "projectId": "1441030",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mizibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30148255",
+      "name": "MOILAALI NO.1",
+      "description": "MOILAALI NO.1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOILAALI NO.1",
+        "localName": "MOILAALI NO.1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38177",
+        "villageName": "Moila Ali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30148255",
+        "ddrName": "MOILAALI NO.1",
+        "projectId": "30148255",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOILAALI NO.1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198173",
+      "name": "RETROFITTING OF MOILAALI PWSS",
+      "description": "RETROFITTING OF MOILAALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF MOILAALI PWSS",
+        "localName": "RETROFITTING OF MOILAALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38177",
+        "villageName": "Moila Ali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198173",
+        "ddrName": "RETROFITTING OF MOILAALI PWSS",
+        "projectId": "8198173",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF MOILAALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198168",
+      "name": "RETROFITTING OF NARAYANPUR PWSS",
+      "description": "RETROFITTING OF NARAYANPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NARAYANPUR PWSS",
+        "localName": "RETROFITTING OF NARAYANPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38182",
+        "villageName": "Narayanpur Gaon (285619)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198168",
+        "ddrName": "RETROFITTING OF NARAYANPUR PWSS",
+        "projectId": "8198168",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NARAYANPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237444",
+      "name": "Retrofitting of No.2 Narayanpur PWSS",
+      "description": "Retrofitting of No.2 Narayanpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of No.2 Narayanpur PWSS",
+        "localName": "Retrofitting of No.2 Narayanpur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "586881",
+        "villageName": "Narayanpur Gaon (285663)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237444",
+        "ddrName": "Retrofitting of No.2 Narayanpur PWSS",
+        "projectId": "8237444",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of No.2 Narayanpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174442",
+      "name": "MIZIBARI PATHAR PWSS",
+      "description": "MIZIBARI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MIZIBARI PATHAR PWSS",
+        "localName": "MIZIBARI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23073",
+        "panchayatname": "MIZIBARI",
+        "villageCode": "38180",
+        "villageName": "No.1 Mizibari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174442",
+        "ddrName": "MIZIBARI PATHAR PWSS",
+        "projectId": "30174442",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MIZIBARI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5408793",
+      "name": "No.2 Narayanpur Bagan PWSS (NQ)",
+      "description": "No.2 Narayanpur Bagan PWSS (NQ)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Narayanpur Bagan PWSS (NQ)",
+        "localName": "No.2 Narayanpur Bagan PWSS (NQ)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23073",
+        "panchayatname": "MIZIBARI",
+        "villageCode": "38183",
+        "villageName": "No.1 Narayanpur Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5408793",
+        "ddrName": "No.2 Narayanpur Bagan PWSS (NQ)",
+        "projectId": "5408793",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Narayanpur Bagan PWSS (NQ)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020502",
+      "name": "NO.1 NARAYANPUR PATHAR PWSS",
+      "description": "NO.1 NARAYANPUR PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 NARAYANPUR PATHAR PWSS",
+        "localName": "NO.1 NARAYANPUR PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23073",
+        "panchayatname": "MIZIBARI",
+        "villageCode": "38183",
+        "villageName": "No.1 Narayanpur Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020502",
+        "ddrName": "NO.1 NARAYANPUR PATHAR PWSS",
+        "projectId": "30020502",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 NARAYANPUR PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051023",
+      "name": "NO.2 MIJIBARI PATHAR PWSS",
+      "description": "NO.2 MIJIBARI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 MIJIBARI PATHAR PWSS",
+        "localName": "NO.2 MIJIBARI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "586752",
+        "villageName": "No.2 Mijibari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051023",
+        "ddrName": "NO.2 MIJIBARI PATHAR PWSS",
+        "projectId": "30051023",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 MIJIBARI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051099",
+      "name": "NO.2 NARAYANPUR BAGAN PWSS",
+      "description": "NO.2 NARAYANPUR BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 NARAYANPUR BAGAN PWSS",
+        "localName": "NO.2 NARAYANPUR BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "586758",
+        "villageName": "No.2 Narayanpur Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051099",
+        "ddrName": "NO.2 NARAYANPUR BAGAN PWSS",
+        "projectId": "30051099",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 NARAYANPUR BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30010494",
+      "name": "NO. 3 NARAYANPUR BAGAN PWSS",
+      "description": "NO. 3 NARAYANPUR BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 3 NARAYANPUR BAGAN PWSS",
+        "localName": "NO. 3 NARAYANPUR BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23073",
+        "panchayatname": "MIZIBARI",
+        "villageCode": "586755",
+        "villageName": "No.3 Narayanpur Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30010494",
+        "ddrName": "NO. 3 NARAYANPUR BAGAN PWSS",
+        "projectId": "30010494",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 3 NARAYANPUR BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051021",
+      "name": "SAIKIA CHUBURI  PWSS",
+      "description": "SAIKIA CHUBURI  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAIKIA CHUBURI  PWSS",
+        "localName": "SAIKIA CHUBURI  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23073",
+        "panchayatname": "Mizibari",
+        "villageCode": "38181",
+        "villageName": "Saikia Chuburi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051021",
+        "ddrName": "SAIKIA CHUBURI  PWSS",
+        "projectId": "30051021",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAIKIA CHUBURI  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30054393",
+      "name": "ARASUTI PATHER PWSS",
+      "description": "ARASUTI PATHER PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ARASUTI PATHER PWSS",
+        "localName": "ARASUTI PATHER PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38128",
+        "villageName": "Arasuti Pather",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30054393",
+        "ddrName": "ARASUTI PATHER PWSS",
+        "projectId": "30054393",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ARASUTI PATHER PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014915",
+      "name": "BAGHMARA GAON PWSS",
+      "description": "BAGHMARA GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGHMARA GAON PWSS",
+        "localName": "BAGHMARA GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38124",
+        "villageName": "Baghmara Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014915",
+        "ddrName": "BAGHMARA GAON PWSS",
+        "projectId": "30014915",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGHMARA GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175393",
+      "name": "Retrofitting of Baligaon PWSS ( NQ )",
+      "description": "Retrofitting of Baligaon PWSS ( NQ )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Baligaon PWSS ( NQ )",
+        "localName": "Retrofitting of Baligaon PWSS ( NQ )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38122",
+        "villageName": "Bali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175393",
+        "ddrName": "Retrofitting of Baligaon PWSS ( NQ )",
+        "projectId": "6175393",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Baligaon PWSS ( NQ )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213587",
+      "name": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+      "description": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+        "localName": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23068",
+        "panchayatname": "NAHARBARI",
+        "villageCode": "38123",
+        "villageName": "Baligaon Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213587",
+        "ddrName": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+        "projectId": "30213587",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30172482",
+      "name": "BALIGAON BANGALI PWSS",
+      "description": "BALIGAON BANGALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIGAON BANGALI PWSS",
+        "localName": "BALIGAON BANGALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23068",
+        "panchayatname": "NAHARBARI",
+        "villageCode": "38123",
+        "villageName": "Baligaon Bangali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30172482",
+        "ddrName": "BALIGAON BANGALI PWSS",
+        "projectId": "30172482",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIGAON BANGALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067441",
+      "name": "BARDUBI PWSS",
+      "description": "BARDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARDUBI PWSS",
+        "localName": "BARDUBI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38129",
+        "villageName": "Bardubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067441",
+        "ddrName": "BARDUBI PWSS",
+        "projectId": "30067441",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187185",
+      "name": "Retrofitting of Bhergaon PWSS",
+      "description": "Retrofitting of Bhergaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bhergaon PWSS",
+        "localName": "Retrofitting of Bhergaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38126",
+        "villageName": "Bher Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187185",
+        "ddrName": "Retrofitting of Bhergaon PWSS",
+        "projectId": "8187185",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bhergaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5073861",
+      "name": "BHERGAON PWSS",
+      "description": "BHERGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHERGAON PWSS",
+        "localName": "BHERGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38126",
+        "villageName": "Bher Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5073861",
+        "ddrName": "BHERGAON PWSS",
+        "projectId": "5073861",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHERGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067449",
+      "name": "KAHIKUCHI GAON PWSS",
+      "description": "KAHIKUCHI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAHIKUCHI GAON PWSS",
+        "localName": "KAHIKUCHI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38127",
+        "villageName": "Kahi Kuchi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067449",
+        "ddrName": "KAHIKUCHI GAON PWSS",
+        "projectId": "30067449",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAHIKUCHI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30062205",
+      "name": "KHALAHU BARI PWSS",
+      "description": "KHALAHU BARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHALAHU BARI PWSS",
+        "localName": "KHALAHU BARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38131",
+        "villageName": "Khalahu Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30062205",
+        "ddrName": "KHALAHU BARI PWSS",
+        "projectId": "30062205",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHALAHU BARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005115",
+      "name": "Naharbari No.1 PWSS",
+      "description": "Naharbari No.1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharbari No.1 PWSS",
+        "localName": "Naharbari No.1 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38130",
+        "villageName": "Naharbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005115",
+        "ddrName": "Naharbari No.1 PWSS",
+        "projectId": "30005115",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharbari No.1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3375170",
+      "name": "Naharbari",
+      "description": "Naharbari",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naharbari",
+        "localName": "Naharbari",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38130",
+        "villageName": "Naharbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3375170",
+        "ddrName": "Naharbari",
+        "projectId": "3375170",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naharbari",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8140993",
+      "name": "RETROFITTING OF NAHARBARI PWSS",
+      "description": "RETROFITTING OF NAHARBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NAHARBARI PWSS",
+        "localName": "RETROFITTING OF NAHARBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38130",
+        "villageName": "Naharbari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8140993",
+        "ddrName": "RETROFITTING OF NAHARBARI PWSS",
+        "projectId": "8140993",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NAHARBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020760",
+      "name": "NO.1 ULUBARI",
+      "description": "NO.1 ULUBARI",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 ULUBARI",
+        "localName": "NO.1 ULUBARI",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "587322",
+        "villageName": "No.1 Ulubari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020760",
+        "ddrName": "NO.1 ULUBARI",
+        "projectId": "30020760",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 ULUBARI",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070611",
+      "name": "NO.2 ULUBARI PWSS",
+      "description": "NO.2 ULUBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 ULUBARI PWSS",
+        "localName": "NO.2 ULUBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38125",
+        "villageName": "No.2 Ulubari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070611",
+        "ddrName": "NO.2 ULUBARI PWSS",
+        "projectId": "30070611",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 ULUBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183135",
+      "name": "PATALIA KHOWA PWSS",
+      "description": "PATALIA KHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PATALIA KHOWA PWSS",
+        "localName": "PATALIA KHOWA PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38120",
+        "villageName": "Patalia Khowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183135",
+        "ddrName": "PATALIA KHOWA PWSS",
+        "projectId": "30183135",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PATALIA KHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055724",
+      "name": "SALMARI PWSS",
+      "description": "SALMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALMARI PWSS",
+        "localName": "SALMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23068",
+        "panchayatname": "Naharbari",
+        "villageCode": "38121",
+        "villageName": "Salmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055724",
+        "ddrName": "SALMARI PWSS",
+        "projectId": "30055724",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016893",
+      "name": "Garjuli Gaon PWSS",
+      "description": "Garjuli Gaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Garjuli Gaon PWSS",
+        "localName": "Garjuli Gaon PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "588676",
+        "villageName": "Garjuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016893",
+        "ddrName": "Garjuli Gaon PWSS",
+        "projectId": "30016893",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Garjuli Gaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6242892",
+      "name": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+      "description": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+        "localName": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38208",
+        "villageName": "Garjuli Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6242892",
+        "ddrName": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+        "projectId": "6242892",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071098",
+      "name": "GHOGRA NEW PWSS",
+      "description": "GHOGRA NEW PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHOGRA NEW PWSS",
+        "localName": "GHOGRA NEW PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38210",
+        "villageName": "Ghagra Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071098",
+        "ddrName": "GHOGRA NEW PWSS",
+        "projectId": "30071098",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHOGRA NEW PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049624",
+      "name": "No.1 Faijabad Bagan PWSS",
+      "description": "No.1 Faijabad Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.1 Faijabad Bagan PWSS",
+        "localName": "No.1 Faijabad Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650918",
+        "villageName": "No.1 Faijabad Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049624",
+        "ddrName": "No.1 Faijabad Bagan PWSS",
+        "projectId": "30049624",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.1 Faijabad Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8265409",
+      "name": "MANOBAG CHARCHOBARI LPS",
+      "description": "MANOBAG CHARCHOBARI LPS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANOBAG CHARCHOBARI LPS",
+        "localName": "MANOBAG CHARCHOBARI LPS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650918",
+        "villageName": "No.1 Faijabad Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8265409",
+        "ddrName": "MANOBAG CHARCHOBARI LPS",
+        "projectId": "8265409",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANOBAG CHARCHOBARI LPS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051495",
+      "name": "NO.1 GANGAPUR F.V.PWSS",
+      "description": "NO.1 GANGAPUR F.V.PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 GANGAPUR F.V.PWSS",
+        "localName": "NO.1 GANGAPUR F.V.PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650915",
+        "villageName": "No.1 Gangapur F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051495",
+        "ddrName": "NO.1 GANGAPUR F.V.PWSS",
+        "projectId": "30051495",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 GANGAPUR F.V.PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1817138",
+      "name": "SANTIPUR PWSS",
+      "description": "SANTIPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SANTIPUR PWSS",
+        "localName": "SANTIPUR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650915",
+        "villageName": "No.1 Gangapur F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1817138",
+        "ddrName": "SANTIPUR PWSS",
+        "projectId": "1817138",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SANTIPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005445",
+      "name": "No.2 Hirajuli Bagan",
+      "description": "No.2 Hirajuli Bagan",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Hirajuli Bagan",
+        "localName": "No.2 Hirajuli Bagan",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38203",
+        "villageName": "No.1 Hirajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005445",
+        "ddrName": "No.2 Hirajuli Bagan",
+        "projectId": "30005445",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Hirajuli Bagan",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141554",
+      "name": "RETROFITTING OF HIRAJULI TE II PWSS",
+      "description": "RETROFITTING OF HIRAJULI TE II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HIRAJULI TE II PWSS",
+        "localName": "RETROFITTING OF HIRAJULI TE II PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38203",
+        "villageName": "No.1 Hirajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141554",
+        "ddrName": "RETROFITTING OF HIRAJULI TE II PWSS",
+        "projectId": "8141554",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HIRAJULI TE II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3373443",
+      "name": "Hirajuli TE_II PWSS",
+      "description": "Hirajuli TE_II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hirajuli TE_II PWSS",
+        "localName": "Hirajuli TE_II PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38203",
+        "villageName": "No.1 Hirajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3373443",
+        "ddrName": "Hirajuli TE_II PWSS",
+        "projectId": "3373443",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hirajuli TE_II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005441",
+      "name": "No.3 Panbari Bagan PWSS",
+      "description": "No.3 Panbari Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.3 Panbari Bagan PWSS",
+        "localName": "No.3 Panbari Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650923",
+        "villageName": "No.1 Panbari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005441",
+        "ddrName": "No.3 Panbari Bagan PWSS",
+        "projectId": "30005441",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.3 Panbari Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8187193",
+      "name": "Retrofitting of Santipur PWSS",
+      "description": "Retrofitting of Santipur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Santipur PWSS",
+        "localName": "Retrofitting of Santipur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "586827",
+        "villageName": "No.1 Santipur F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8187193",
+        "ddrName": "Retrofitting of Santipur PWSS",
+        "projectId": "8187193",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Santipur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30004999",
+      "name": "No.2 Faizabad PWSS",
+      "description": "No.2 Faizabad PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No.2 Faizabad PWSS",
+        "localName": "No.2 Faizabad PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650917",
+        "villageName": "No.2 Faijabad Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30004999",
+        "ddrName": "No.2 Faizabad PWSS",
+        "projectId": "30004999",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No.2 Faizabad PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051497",
+      "name": "NO.2 GANGAPUR FV PWSS",
+      "description": "NO.2 GANGAPUR FV PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 GANGAPUR FV PWSS",
+        "localName": "NO.2 GANGAPUR FV PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "613286",
+        "villageName": "No.2 Gangapur F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051497",
+        "ddrName": "NO.2 GANGAPUR FV PWSS",
+        "projectId": "30051497",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 GANGAPUR FV PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070600",
+      "name": "NO.2 PANBARI BAGAN PWSS",
+      "description": "NO.2 PANBARI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.2 PANBARI BAGAN PWSS",
+        "localName": "NO.2 PANBARI BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38209",
+        "villageName": "No.2 Panbari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070600",
+        "ddrName": "NO.2 PANBARI BAGAN PWSS",
+        "projectId": "30070600",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.2 PANBARI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8141566",
+      "name": "RETROFITTING OF PANBARI BAGAN PWSS",
+      "description": "RETROFITTING OF PANBARI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF PANBARI BAGAN PWSS",
+        "localName": "RETROFITTING OF PANBARI BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38209",
+        "villageName": "No.2 Panbari Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8141566",
+        "ddrName": "RETROFITTING OF PANBARI BAGAN PWSS",
+        "projectId": "8141566",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF PANBARI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1817302",
+      "name": "Santipur PWSS",
+      "description": "Santipur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Santipur PWSS",
+        "localName": "Santipur PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38206",
+        "villageName": "No.2 Santipur F.v.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1817302",
+        "ddrName": "Santipur PWSS",
+        "projectId": "1817302",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Santipur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049632",
+      "name": "NO.4 FAIZABAD BAGAN PWSS",
+      "description": "NO.4 FAIZABAD BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.4 FAIZABAD BAGAN PWSS",
+        "localName": "NO.4 FAIZABAD BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650916",
+        "villageName": "No.3 Faijabad Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049632",
+        "ddrName": "NO.4 FAIZABAD BAGAN PWSS",
+        "projectId": "30049632",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.4 FAIZABAD BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30005412",
+      "name": "NO.3 FAIJABAD BAGAN PWSS",
+      "description": "NO.3 FAIJABAD BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 FAIJABAD BAGAN PWSS",
+        "localName": "NO.3 FAIJABAD BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "650916",
+        "villageName": "No.3 Faijabad Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30005412",
+        "ddrName": "NO.3 FAIJABAD BAGAN PWSS",
+        "projectId": "30005412",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 FAIJABAD BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016917",
+      "name": "No 3 Hirajuli Bagan PWSS",
+      "description": "No 3 Hirajuli Bagan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "No 3 Hirajuli Bagan PWSS",
+        "localName": "No 3 Hirajuli Bagan PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23076",
+        "panchayatname": "Panbari",
+        "villageCode": "38204",
+        "villageName": "No.3 Hirajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016917",
+        "ddrName": "No 3 Hirajuli Bagan PWSS",
+        "projectId": "30016917",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "No 3 Hirajuli Bagan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30009532",
+      "name": "1 NO. HUGRAJULI BAGAN",
+      "description": "1 NO. HUGRAJULI BAGAN",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "1 NO. HUGRAJULI BAGAN",
+        "localName": "1 NO. HUGRAJULI BAGAN",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38221",
+        "villageName": "1.no. Hugrajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30009532",
+        "ddrName": "1 NO. HUGRAJULI BAGAN",
+        "projectId": "30009532",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "1 NO. HUGRAJULI BAGAN",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30052437",
+      "name": "BHOLAGURI PWSS",
+      "description": "BHOLAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOLAGURI PWSS",
+        "localName": "BHOLAGURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38243",
+        "villageName": "Bholaguri Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30052437",
+        "ddrName": "BHOLAGURI PWSS",
+        "projectId": "30052437",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOLAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30052428",
+      "name": "BHUTIA ALI PWSS",
+      "description": "BHUTIA ALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHUTIA ALI PWSS",
+        "localName": "BHUTIA ALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38236",
+        "villageName": "Bhutiaali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30052428",
+        "ddrName": "BHUTIA ALI PWSS",
+        "projectId": "30052428",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHUTIA ALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132870",
+      "name": "RETROFITTING OF HUGRAJULI PWSS",
+      "description": "RETROFITTING OF HUGRAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF HUGRAJULI PWSS",
+        "localName": "RETROFITTING OF HUGRAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38246",
+        "villageName": "Hugrajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132870",
+        "ddrName": "RETROFITTING OF HUGRAJULI PWSS",
+        "projectId": "8132870",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF HUGRAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6189857",
+      "name": "Hugrajuli PWSS",
+      "description": "Hugrajuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hugrajuli PWSS",
+        "localName": "Hugrajuli PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "650905",
+        "villageName": "Hukurajilu",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6189857",
+        "ddrName": "Hugrajuli PWSS",
+        "projectId": "6189857",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hugrajuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018185",
+      "name": "NATUN BASTI GAON",
+      "description": "NATUN BASTI GAON",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NATUN BASTI GAON",
+        "localName": "NATUN BASTI GAON",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38237",
+        "villageName": "Natun Basti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018185",
+        "ddrName": "NATUN BASTI GAON",
+        "projectId": "30018185",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NATUN BASTI GAON",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036796",
+      "name": "NO. 1 CHARIALI PWSS",
+      "description": "NO. 1 CHARIALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO. 1 CHARIALI PWSS",
+        "localName": "NO. 1 CHARIALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38242",
+        "villageName": "No.1 Chariali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036796",
+        "ddrName": "NO. 1 CHARIALI PWSS",
+        "projectId": "30036796",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO. 1 CHARIALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070609",
+      "name": "NO.1 SANMILANI PWSS",
+      "description": "NO.1 SANMILANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.1 SANMILANI PWSS",
+        "localName": "NO.1 SANMILANI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38240",
+        "villageName": "No.1 Sanmilani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070609",
+        "ddrName": "NO.1 SANMILANI PWSS",
+        "projectId": "30070609",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.1 SANMILANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017213",
+      "name": "NO 2 HUGRAJULI BAGAN",
+      "description": "NO 2 HUGRAJULI BAGAN",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO 2 HUGRAJULI BAGAN",
+        "localName": "NO 2 HUGRAJULI BAGAN",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38245",
+        "villageName": "No.2 Hugajuli Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017213",
+        "ddrName": "NO 2 HUGRAJULI BAGAN",
+        "projectId": "30017213",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO 2 HUGRAJULI BAGAN",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017426",
+      "name": "NO 2 SANMILANI",
+      "description": "NO 2 SANMILANI",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO 2 SANMILANI",
+        "localName": "NO 2 SANMILANI",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38241",
+        "villageName": "No.2 Sanmilani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017426",
+        "ddrName": "NO 2 SANMILANI",
+        "projectId": "30017426",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO 2 SANMILANI",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8198179",
+      "name": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+      "description": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+        "localName": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38241",
+        "villageName": "No.2 Sanmilani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8198179",
+        "ddrName": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+        "projectId": "8198179",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30052432",
+      "name": "NO.3 HUGRAJULI BAGAN PWSS",
+      "description": "NO.3 HUGRAJULI BAGAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO.3 HUGRAJULI BAGAN PWSS",
+        "localName": "NO.3 HUGRAJULI BAGAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "651029",
+        "villageName": "No.3 Hugrajuli Bagan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30052432",
+        "ddrName": "NO.3 HUGRAJULI BAGAN PWSS",
+        "projectId": "30052432",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO.3 HUGRAJULI BAGAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132892",
+      "name": "RETROFITTING OF OSURMARI PWSS",
+      "description": "RETROFITTING OF OSURMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF OSURMARI PWSS",
+        "localName": "RETROFITTING OF OSURMARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38239",
+        "villageName": "Osurmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132892",
+        "ddrName": "RETROFITTING OF OSURMARI PWSS",
+        "projectId": "8132892",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF OSURMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7341547",
+      "name": "Assumari PWSS",
+      "description": "Assumari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Assumari PWSS",
+        "localName": "Assumari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38239",
+        "villageName": "Osurmari Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7341547",
+        "ddrName": "Assumari PWSS",
+        "projectId": "7341547",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Assumari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020076",
+      "name": "OSURMARI PATHAR PWSS",
+      "description": "OSURMARI PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "OSURMARI PATHAR PWSS",
+        "localName": "OSURMARI PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "650934",
+        "villageName": "Osurmari Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020076",
+        "ddrName": "OSURMARI PATHAR PWSS",
+        "projectId": "30020076",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "OSURMARI PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018441",
+      "name": "SEMRAJULI PWSS",
+      "description": "SEMRAJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SEMRAJULI PWSS",
+        "localName": "SEMRAJULI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23079",
+        "panchayatname": "Rakhashmari",
+        "villageCode": "38244",
+        "villageName": "Samarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018441",
+        "ddrName": "SEMRAJULI PWSS",
+        "projectId": "30018441",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SEMRAJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132861",
+      "name": "RETROFITTING OF SOPAI TE PWSS",
+      "description": "RETROFITTING OF SOPAI TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOPAI TE PWSS",
+        "localName": "RETROFITTING OF SOPAI TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23079",
+        "panchayatname": "RAKHASHMARI",
+        "villageCode": "38244",
+        "villageName": "Samarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132861",
+        "ddrName": "RETROFITTING OF SOPAI TE PWSS",
+        "projectId": "8132861",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOPAI TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2581909",
+      "name": "Sopai No.2 PWSS",
+      "description": "Sopai No.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopai No.2 PWSS",
+        "localName": "Sopai No.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23079",
+        "panchayatname": "RAKHASHMARI",
+        "villageCode": "38244",
+        "villageName": "Samarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2581909",
+        "ddrName": "Sopai No.2 PWSS",
+        "projectId": "2581909",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopai No.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5206914",
+      "name": "Sopai TE  PWSS",
+      "description": "Sopai TE  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopai TE  PWSS",
+        "localName": "Sopai TE  PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "DHEKIAJULI",
+        "panchayatcode": "23079",
+        "panchayatname": "RAKHASHMARI",
+        "villageCode": "38244",
+        "villageName": "Samarajuli Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5206914",
+        "ddrName": "Sopai TE  PWSS",
+        "projectId": "5206914",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopai TE  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132845",
+      "name": "RETROFITTING OF SOPAI NO.2 PWSS",
+      "description": "RETROFITTING OF SOPAI NO.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOPAI NO.2 PWSS",
+        "localName": "RETROFITTING OF SOPAI NO.2 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586685",
+        "villageName": "2.no. Chapai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132845",
+        "ddrName": "RETROFITTING OF SOPAI NO.2 PWSS",
+        "projectId": "8132845",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOPAI NO.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30082029",
+      "name": "JARGAON PWSS",
+      "description": "JARGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JARGAON PWSS",
+        "localName": "JARGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "38247",
+        "villageName": "Chapai Bali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30082029",
+        "ddrName": "JARGAON PWSS",
+        "projectId": "30082029",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JARGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6242561",
+      "name": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+      "description": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+        "localName": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "38247",
+        "villageName": "Chapai Bali Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6242561",
+        "ddrName": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+        "projectId": "6242561",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016761",
+      "name": "Sopai TE Kalghar Line",
+      "description": "Sopai TE Kalghar Line",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopai TE Kalghar Line",
+        "localName": "Sopai TE Kalghar Line",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "38250",
+        "villageName": "No.1 Chapai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016761",
+        "ddrName": "Sopai TE Kalghar Line",
+        "projectId": "30016761",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopai TE Kalghar Line",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30012531",
+      "name": "SOPAI TE NO.1",
+      "description": "SOPAI TE NO.1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SOPAI TE NO.1",
+        "localName": "SOPAI TE NO.1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "38250",
+        "villageName": "No.1 Chapai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30012531",
+        "ddrName": "SOPAI TE NO.1",
+        "projectId": "30012531",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SOPAI TE NO.1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3372158",
+      "name": "Sopai No 3 PWSS",
+      "description": "Sopai No 3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopai No 3 PWSS",
+        "localName": "Sopai No 3 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586692",
+        "villageName": "No.3 Chapai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3372158",
+        "ddrName": "Sopai No 3 PWSS",
+        "projectId": "3372158",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopai No 3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132847",
+      "name": "RETROFITTING OF SOPAI NO.3 PWSS",
+      "description": "RETROFITTING OF SOPAI NO.3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOPAI NO.3 PWSS",
+        "localName": "RETROFITTING OF SOPAI NO.3 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586692",
+        "villageName": "No.3 Chapai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132847",
+        "ddrName": "RETROFITTING OF SOPAI NO.3 PWSS",
+        "projectId": "8132847",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOPAI NO.3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30007375",
+      "name": "Sopai 3-A",
+      "description": "Sopai 3-A",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopai 3-A",
+        "localName": "Sopai 3-A",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586692",
+        "villageName": "No.3 Chapai Bagan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30007375",
+        "ddrName": "Sopai 3-A",
+        "projectId": "30007375",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopai 3-A",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1830310",
+      "name": "Sopai TE PWSS",
+      "description": "Sopai TE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sopai TE PWSS",
+        "localName": "Sopai TE PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586668",
+        "villageName": "No.3 Chariali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1830310",
+        "ddrName": "Sopai TE PWSS",
+        "projectId": "1830310",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sopai TE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019465",
+      "name": "NO 3 CHARIALI PWSS",
+      "description": "NO 3 CHARIALI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NO 3 CHARIALI PWSS",
+        "localName": "NO 3 CHARIALI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586668",
+        "villageName": "No.3 Chariali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019465",
+        "ddrName": "NO 3 CHARIALI PWSS",
+        "projectId": "30019465",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NO 3 CHARIALI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132850",
+      "name": "RETROFITTING OF SOPAI NO.4 PWSS",
+      "description": "RETROFITTING OF SOPAI NO.4 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF SOPAI NO.4 PWSS",
+        "localName": "RETROFITTING OF SOPAI NO.4 PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23080",
+        "panchayatname": "Sopai",
+        "villageCode": "586701",
+        "villageName": "Sapoi T.e. No.4",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132850",
+        "ddrName": "RETROFITTING OF SOPAI NO.4 PWSS",
+        "projectId": "8132850",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF SOPAI NO.4 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059497",
+      "name": "ARASUTI GAON PWSS",
+      "description": "ARASUTI GAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ARASUTI GAON PWSS",
+        "localName": "ARASUTI GAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38112",
+        "villageName": "Arasuti Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059497",
+        "ddrName": "ARASUTI GAON PWSS",
+        "projectId": "30059497",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ARASUTI GAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059495",
+      "name": "KAMARCHUBURI NO.1 ",
+      "description": "KAMARCHUBURI NO.1 ",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAMARCHUBURI NO.1 ",
+        "localName": "KAMARCHUBURI NO.1 ",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38117",
+        "villageName": "Kamar Chuburi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059495",
+        "ddrName": "KAMARCHUBURI NO.1 ",
+        "projectId": "30059495",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAMARCHUBURI NO.1 ",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8215107",
+      "name": "Retrofitting of Kamarchuburi PWSS",
+      "description": "Retrofitting of Kamarchuburi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Kamarchuburi PWSS",
+        "localName": "Retrofitting of Kamarchuburi PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38117",
+        "villageName": "Kamar Chuburi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8215107",
+        "ddrName": "Retrofitting of Kamarchuburi PWSS",
+        "projectId": "8215107",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Kamarchuburi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567258",
+      "name": "KAMARCHUBURI PWSS",
+      "description": "KAMARCHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAMARCHUBURI PWSS",
+        "localName": "KAMARCHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38117",
+        "villageName": "Kamar Chuburi Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567258",
+        "ddrName": "KAMARCHUBURI PWSS",
+        "projectId": "4567258",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAMARCHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156216",
+      "name": "RETROFITTING OF KAMARPATHER PWSS",
+      "description": "RETROFITTING OF KAMARPATHER PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KAMARPATHER PWSS",
+        "localName": "RETROFITTING OF KAMARPATHER PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38118",
+        "villageName": "Kamar Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156216",
+        "ddrName": "RETROFITTING OF KAMARPATHER PWSS",
+        "projectId": "8156216",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KAMARPATHER PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4567253",
+      "name": "KAMAR PATHAR PWSS",
+      "description": "KAMAR PATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAMAR PATHAR PWSS",
+        "localName": "KAMAR PATHAR PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38118",
+        "villageName": "Kamar Pathar Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4567253",
+        "ddrName": "KAMAR PATHAR PWSS",
+        "projectId": "4567253",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAMAR PATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30017892",
+      "name": "Kathanibari PWSS",
+      "description": "Kathanibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kathanibari PWSS",
+        "localName": "Kathanibari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38111",
+        "villageName": "Katani Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30017892",
+        "ddrName": "Kathanibari PWSS",
+        "projectId": "30017892",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kathanibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011133",
+      "name": "Katani Gaon No 1",
+      "description": "Katani Gaon No 1",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Katani Gaon No 1",
+        "localName": "Katani Gaon No 1",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "586550",
+        "villageName": "Katani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011133",
+        "ddrName": "Katani Gaon No 1",
+        "projectId": "30011133",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Katani Gaon No 1",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30011084",
+      "name": "KATANIGAON NO-II PWSS",
+      "description": "KATANIGAON NO-II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATANIGAON NO-II PWSS",
+        "localName": "KATANIGAON NO-II PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "586550",
+        "villageName": "Katani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30011084",
+        "ddrName": "KATANIGAON NO-II PWSS",
+        "projectId": "30011084",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATANIGAON NO-II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8132840",
+      "name": "RETROFITTING OF KATANIGAON PWSS",
+      "description": "RETROFITTING OF KATANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF KATANIGAON PWSS",
+        "localName": "RETROFITTING OF KATANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "586550",
+        "villageName": "Katani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8132840",
+        "ddrName": "RETROFITTING OF KATANIGAON PWSS",
+        "projectId": "8132840",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF KATANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5073951",
+      "name": "KATANIGAON PWSS",
+      "description": "KATANIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATANIGAON PWSS",
+        "localName": "KATANIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "586550",
+        "villageName": "Katani Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5073951",
+        "ddrName": "KATANIGAON PWSS",
+        "projectId": "5073951",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATANIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059490",
+      "name": "KHAGARIJAN PWSS",
+      "description": "KHAGARIJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAGARIJAN PWSS",
+        "localName": "KHAGARIJAN PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38113",
+        "villageName": "Khagarijan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059490",
+        "ddrName": "KHAGARIJAN PWSS",
+        "projectId": "30059490",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAGARIJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6175413",
+      "name": "Naliniduba PWSS ( NQ )",
+      "description": "Naliniduba PWSS ( NQ )",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naliniduba PWSS ( NQ )",
+        "localName": "Naliniduba PWSS ( NQ )",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38113",
+        "villageName": "Khagarijan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6175413",
+        "ddrName": "Naliniduba PWSS ( NQ )",
+        "projectId": "6175413",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naliniduba PWSS ( NQ )",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237611",
+      "name": "Retrofitting of Naliniduba PWSS",
+      "description": "Retrofitting of Naliniduba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Naliniduba PWSS",
+        "localName": "Retrofitting of Naliniduba PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38113",
+        "villageName": "Khagarijan Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237611",
+        "ddrName": "Retrofitting of Naliniduba PWSS",
+        "projectId": "8237611",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Naliniduba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013392",
+      "name": "KOCHGAON PWSS",
+      "description": "KOCHGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOCHGAON PWSS",
+        "localName": "KOCHGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38116",
+        "villageName": "Kuch Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013392",
+        "ddrName": "KOCHGAON PWSS",
+        "projectId": "30013392",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOCHGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059391",
+      "name": "Rohinibil PWSS",
+      "description": "Rohinibil PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rohinibil PWSS",
+        "localName": "Rohinibil PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "586559",
+        "villageName": "Rahani Bil Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059391",
+        "ddrName": "Rohinibil PWSS",
+        "projectId": "30059391",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rohinibil PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059492",
+      "name": "THELAMARGHATGAON PWSS",
+      "description": "THELAMARGHATGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THELAMARGHATGAON PWSS",
+        "localName": "THELAMARGHATGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1244",
+        "blockname": "Dhekiajuli",
+        "panchayatcode": "23067",
+        "panchayatname": "Thelamara",
+        "villageCode": "38119",
+        "villageName": "Thalamara Ghat Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059492",
+        "ddrName": "THELAMARGHATGAON PWSS",
+        "projectId": "30059492",
+        "regionName": "1244"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THELAMARGHATGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043349",
+      "name": "PAHARKATA PWSS (NEW)",
+      "description": "PAHARKATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAHARKATA PWSS (NEW)",
+        "localName": "PAHARKATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32968",
+        "villageName": "Agia Part-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043349",
+        "ddrName": "PAHARKATA PWSS (NEW)",
+        "projectId": "30043349",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAHARKATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175267",
+      "name": "Retrofitting of AGIA II PWSS",
+      "description": "Retrofitting of AGIA II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AGIA II PWSS",
+        "localName": "Retrofitting of AGIA II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32968",
+        "villageName": "Agia Part-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175267",
+        "ddrName": "Retrofitting of AGIA II PWSS",
+        "projectId": "8175267",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AGIA II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7347016",
+      "name": "Agia Pt II PWSS",
+      "description": "Agia Pt II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Agia Pt II PWSS",
+        "localName": "Agia Pt II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32968",
+        "villageName": "Agia Part-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7347016",
+        "ddrName": "Agia Pt II PWSS",
+        "projectId": "7347016",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Agia Pt II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30141193",
+      "name": "BHENDERA PWSS (NEW)",
+      "description": "BHENDERA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHENDERA PWSS (NEW)",
+        "localName": "BHENDERA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32967",
+        "villageName": "Agni Part-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30141193",
+        "ddrName": "BHENDERA PWSS (NEW)",
+        "projectId": "30141193",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHENDERA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203732",
+      "name": "Retrofitting of AGIA PWSS",
+      "description": "Retrofitting of AGIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AGIA PWSS",
+        "localName": "Retrofitting of AGIA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32967",
+        "villageName": "Agni Part-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203732",
+        "ddrName": "Retrofitting of AGIA PWSS",
+        "projectId": "8203732",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AGIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2426035",
+      "name": "Agia PWSS",
+      "description": "Agia PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Agia PWSS",
+        "localName": "Agia PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32967",
+        "villageName": "Agni Part-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2426035",
+        "ddrName": "Agia PWSS",
+        "projectId": "2426035",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Agia PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181246",
+      "name": "AGIA PT-I PWSS (NEW)",
+      "description": "AGIA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AGIA PT-I PWSS (NEW)",
+        "localName": "AGIA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32967",
+        "villageName": "Agni Part-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181246",
+        "ddrName": "AGIA PT-I PWSS (NEW)",
+        "projectId": "30181246",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AGIA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221554",
+      "name": "AJAGAR PAHAR PWSS (NEW)",
+      "description": "AJAGAR PAHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AJAGAR PAHAR PWSS (NEW)",
+        "localName": "AJAGAR PAHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32969",
+        "villageName": "AJAGAR PAHAR  N.C.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221554",
+        "ddrName": "AJAGAR PAHAR PWSS (NEW)",
+        "projectId": "30221554",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AJAGAR PAHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221533",
+      "name": "Chaplangkata PWSS (NEW)",
+      "description": "Chaplangkata PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chaplangkata PWSS (NEW)",
+        "localName": "Chaplangkata PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32972",
+        "villageName": "Chaplongkata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221533",
+        "ddrName": "Chaplangkata PWSS (NEW)",
+        "projectId": "30221533",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chaplangkata PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181327",
+      "name": "Chaplangkata M PWSS (NEW)",
+      "description": "Chaplangkata M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chaplangkata M PWSS (NEW)",
+        "localName": "Chaplangkata M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32972",
+        "villageName": "Chaplongkata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181327",
+        "ddrName": "Chaplangkata M PWSS (NEW)",
+        "projectId": "30181327",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chaplangkata M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182020",
+      "name": "DALOK PWSS (NEW)",
+      "description": "DALOK PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DALOK PWSS (NEW)",
+        "localName": "DALOK PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32973",
+        "villageName": "DALOK",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182020",
+        "ddrName": "DALOK PWSS (NEW)",
+        "projectId": "30182020",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DALOK PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181628",
+      "name": "DEULI IZARA PWSS (NEW)",
+      "description": "DEULI IZARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEULI IZARA PWSS (NEW)",
+        "localName": "DEULI IZARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32974",
+        "villageName": "DEWLIJARA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181628",
+        "ddrName": "DEULI IZARA PWSS (NEW)",
+        "projectId": "30181628",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEULI IZARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126191",
+      "name": "GOSAI GA DHAWA PWSS (NEW)",
+      "description": "GOSAI GA DHAWA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOSAI GA DHAWA PWSS (NEW)",
+        "localName": "GOSAI GA DHAWA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32975",
+        "villageName": "Gosai Gadhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126191",
+        "ddrName": "GOSAI GA DHAWA PWSS (NEW)",
+        "projectId": "30126191",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOSAI GA DHAWA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179767",
+      "name": "GOSAI GA DHAWA II M PWSS (NEW)",
+      "description": "GOSAI GA DHAWA II M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOSAI GA DHAWA II M PWSS (NEW)",
+        "localName": "GOSAI GA DHAWA II M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32975",
+        "villageName": "Gosai Gadhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179767",
+        "ddrName": "GOSAI GA DHAWA II M PWSS (NEW)",
+        "projectId": "30179767",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOSAI GA DHAWA II M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30125980",
+      "name": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+      "description": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+        "localName": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32978",
+        "villageName": "JAGNA RAJBANGSIPARA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30125980",
+        "ddrName": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+        "projectId": "30125980",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179793",
+      "name": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+      "description": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+        "localName": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32978",
+        "villageName": "JAGNA RAJBANGSIPARA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179793",
+        "ddrName": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+        "projectId": "30179793",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30141195",
+      "name": "JOGNAPARA DEREK PWSS (NEW)",
+      "description": "JOGNAPARA DEREK PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGNAPARA DEREK PWSS (NEW)",
+        "localName": "JOGNAPARA DEREK PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32977",
+        "villageName": "JOGGAPARA DEREK",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30141195",
+        "ddrName": "JOGNAPARA DEREK PWSS (NEW)",
+        "projectId": "30141195",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGNAPARA DEREK PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181457",
+      "name": "JOGNAPARA DEREK II PWSS (NEW)",
+      "description": "JOGNAPARA DEREK II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGNAPARA DEREK II PWSS (NEW)",
+        "localName": "JOGNAPARA DEREK II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32977",
+        "villageName": "JOGGAPARA DEREK",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181457",
+        "ddrName": "JOGNAPARA DEREK II PWSS (NEW)",
+        "projectId": "30181457",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGNAPARA DEREK II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063118",
+      "name": "KEOTPARA PWSS (NEW)",
+      "description": "KEOTPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KEOTPARA PWSS (NEW)",
+        "localName": "KEOTPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32979",
+        "villageName": "Keotpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063118",
+        "ddrName": "KEOTPARA PWSS (NEW)",
+        "projectId": "30063118",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KEOTPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150209",
+      "name": "KESHORIDOBI PT-II PWSS (NEW)",
+      "description": "KESHORIDOBI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KESHORIDOBI PT-II PWSS (NEW)",
+        "localName": "KESHORIDOBI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32980",
+        "villageName": "KISORDUBI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150209",
+        "ddrName": "KESHORIDOBI PT-II PWSS (NEW)",
+        "projectId": "30150209",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KESHORIDOBI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181935",
+      "name": "KESHORIDOBI PT-I PWSS (NEW)",
+      "description": "KESHORIDOBI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KESHORIDOBI PT-I PWSS (NEW)",
+        "localName": "KESHORIDOBI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32980",
+        "villageName": "KISORDUBI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181935",
+        "ddrName": "KESHORIDOBI PT-I PWSS (NEW)",
+        "projectId": "30181935",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KESHORIDOBI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221525",
+      "name": "Rajapara PWSS (NEW)",
+      "description": "Rajapara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rajapara PWSS (NEW)",
+        "localName": "Rajapara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32981",
+        "villageName": "Rajapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221525",
+        "ddrName": "Rajapara PWSS (NEW)",
+        "projectId": "30221525",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rajapara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205339",
+      "name": "Retrofitting of BAKMARA PWSS",
+      "description": "Retrofitting of BAKMARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAKMARA PWSS",
+        "localName": "Retrofitting of BAKMARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32981",
+        "villageName": "Rajapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205339",
+        "ddrName": "Retrofitting of BAKMARA PWSS",
+        "projectId": "8205339",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAKMARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386466",
+      "name": "Bakmara PWSS",
+      "description": "Bakmara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakmara PWSS",
+        "localName": "Bakmara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32981",
+        "villageName": "Rajapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386466",
+        "ddrName": "Bakmara PWSS",
+        "projectId": "3386466",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakmara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235347",
+      "name": "Retrofitting of SILSAK DAMAS PWSS",
+      "description": "Retrofitting of SILSAK DAMAS PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SILSAK DAMAS PWSS",
+        "localName": "Retrofitting of SILSAK DAMAS PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32982",
+        "villageName": "Silchak Domal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235347",
+        "ddrName": "Retrofitting of SILSAK DAMAS PWSS",
+        "projectId": "8235347",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SILSAK DAMAS PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096216",
+      "name": "SILSAK DOMAL PWSS (NEW)",
+      "description": "SILSAK DOMAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILSAK DOMAL PWSS (NEW)",
+        "localName": "SILSAK DOMAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32982",
+        "villageName": "Silchak Domal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096216",
+        "ddrName": "SILSAK DOMAL PWSS (NEW)",
+        "projectId": "30096216",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILSAK DOMAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937635",
+      "name": "Silsak Damas PWSS",
+      "description": "Silsak Damas PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Silsak Damas PWSS",
+        "localName": "Silsak Damas PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "villageCode": "32982",
+        "villageName": "Silchak Domal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937635",
+        "ddrName": "Silsak Damas PWSS",
+        "projectId": "1937635",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Silsak Damas PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046142",
+      "name": "TISIMPUR PWSS (NEW)",
+      "description": "TISIMPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TISIMPUR PWSS (NEW)",
+        "localName": "TISIMPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22400",
+        "panchayatname": "AGIA",
+        "villageCode": "32983",
+        "villageName": "TISIMPUR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046142",
+        "ddrName": "TISIMPUR PWSS (NEW)",
+        "projectId": "30046142",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TISIMPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213140",
+      "name": "MARIYOMNAGAR PT-II PWSS (NEW)",
+      "description": "MARIYOMNAGAR PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MARIYOMNAGAR PT-II PWSS (NEW)",
+        "localName": "MARIYOMNAGAR PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32951",
+        "villageName": "Boladmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213140",
+        "ddrName": "MARIYOMNAGAR PT-II PWSS (NEW)",
+        "projectId": "30213140",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MARIYOMNAGAR PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068669",
+      "name": "MARIAM NAGAR PWSS (NEW)",
+      "description": "MARIAM NAGAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MARIAM NAGAR PWSS (NEW)",
+        "localName": "MARIAM NAGAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32951",
+        "villageName": "Boladmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068669",
+        "ddrName": "MARIAM NAGAR PWSS (NEW)",
+        "projectId": "30068669",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MARIAM NAGAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182413",
+      "name": "GOBINDAPUR M PWSS (NEW)",
+      "description": "GOBINDAPUR M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOBINDAPUR M PWSS (NEW)",
+        "localName": "GOBINDAPUR M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182413",
+        "ddrName": "GOBINDAPUR M PWSS (NEW)",
+        "projectId": "30182413",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOBINDAPUR M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175227",
+      "name": "Retrofitting of CHALLA PWSS",
+      "description": "Retrofitting of CHALLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHALLA PWSS",
+        "localName": "Retrofitting of CHALLA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175227",
+        "ddrName": "Retrofitting of CHALLA PWSS",
+        "projectId": "8175227",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHALLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3385982",
+      "name": "Challa PWSS",
+      "description": "Challa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Challa PWSS",
+        "localName": "Challa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3385982",
+        "ddrName": "Challa PWSS",
+        "projectId": "3385982",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Challa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6260773",
+      "name": "Khograrpar PWSS",
+      "description": "Khograrpar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khograrpar PWSS",
+        "localName": "Khograrpar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6260773",
+        "ddrName": "Khograrpar PWSS",
+        "projectId": "6260773",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khograrpar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013810",
+      "name": "BOGULAMARI  PWSS (NEW)",
+      "description": "BOGULAMARI  PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOGULAMARI  PWSS (NEW)",
+        "localName": "BOGULAMARI  PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013810",
+        "ddrName": "BOGULAMARI  PWSS (NEW)",
+        "projectId": "30013810",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOGULAMARI  PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213205",
+      "name": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+      "description": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+        "localName": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213205",
+        "ddrName": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+        "projectId": "30213205",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205077",
+      "name": "Retrofitting of GOBINDAPUR PWSS",
+      "description": "Retrofitting of GOBINDAPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GOBINDAPUR PWSS",
+        "localName": "Retrofitting of GOBINDAPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205077",
+        "ddrName": "Retrofitting of GOBINDAPUR PWSS",
+        "projectId": "8205077",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GOBINDAPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213146",
+      "name": "UTTAR GOBINDOPUR PWSS (NEW)",
+      "description": "UTTAR GOBINDOPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UTTAR GOBINDOPUR PWSS (NEW)",
+        "localName": "UTTAR GOBINDOPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213146",
+        "ddrName": "UTTAR GOBINDOPUR PWSS (NEW)",
+        "projectId": "30213146",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UTTAR GOBINDOPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.454276",
+      "name": "Gobindapur PWSS",
+      "description": "Gobindapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gobindapur PWSS",
+        "localName": "Gobindapur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "454276",
+        "ddrName": "Gobindapur PWSS",
+        "projectId": "454276",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gobindapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166583",
+      "name": "ALINAGAR PWSS (NEW)",
+      "description": "ALINAGAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ALINAGAR PWSS (NEW)",
+        "localName": "ALINAGAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166583",
+        "ddrName": "ALINAGAR PWSS (NEW)",
+        "projectId": "30166583",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ALINAGAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213210",
+      "name": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+      "description": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+        "localName": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213210",
+        "ddrName": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+        "projectId": "30213210",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211530",
+      "name": "REHMATPUR TILA PWSS (NEW)",
+      "description": "REHMATPUR TILA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "REHMATPUR TILA PWSS (NEW)",
+        "localName": "REHMATPUR TILA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211530",
+        "ddrName": "REHMATPUR TILA PWSS (NEW)",
+        "projectId": "30211530",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "REHMATPUR TILA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016724",
+      "name": "Dorarpar PWSS (NEW)",
+      "description": "Dorarpar PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dorarpar PWSS (NEW)",
+        "localName": "Dorarpar PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016724",
+        "ddrName": "Dorarpar PWSS (NEW)",
+        "projectId": "30016724",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dorarpar PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221622",
+      "name": "Retrofitting of Rangagorah PWSS",
+      "description": "Retrofitting of Rangagorah PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Rangagorah PWSS",
+        "localName": "Retrofitting of Rangagorah PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221622",
+        "ddrName": "Retrofitting of Rangagorah PWSS",
+        "projectId": "30221622",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Rangagorah PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5230346",
+      "name": "Rongagorah PWSS",
+      "description": "Rongagorah PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rongagorah PWSS",
+        "localName": "Rongagorah PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5230346",
+        "ddrName": "Rongagorah PWSS",
+        "projectId": "5230346",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rongagorah PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213059",
+      "name": "RANGAPARA PWSS (NEW)",
+      "description": "RANGAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGAPARA PWSS (NEW)",
+        "localName": "RANGAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32952",
+        "villageName": "Gobindapur (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213059",
+        "ddrName": "RANGAPARA PWSS (NEW)",
+        "projectId": "30213059",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30149093",
+      "name": "BALADMARI PWSS (NEW)",
+      "description": "BALADMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALADMARI PWSS (NEW)",
+        "localName": "BALADMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32948",
+        "villageName": "Hasila Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30149093",
+        "ddrName": "BALADMARI PWSS (NEW)",
+        "projectId": "30149093",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALADMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182379",
+      "name": "HASILABEEL PUBPARA PWSS (NEW)",
+      "description": "HASILABEEL PUBPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HASILABEEL PUBPARA PWSS (NEW)",
+        "localName": "HASILABEEL PUBPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32948",
+        "villageName": "Hasila Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182379",
+        "ddrName": "HASILABEEL PUBPARA PWSS (NEW)",
+        "projectId": "30182379",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HASILABEEL PUBPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8172071",
+      "name": "Retrofitting of HASILA BEEL PWSS",
+      "description": "Retrofitting of HASILA BEEL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HASILA BEEL PWSS",
+        "localName": "Retrofitting of HASILA BEEL PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32948",
+        "villageName": "Hasila Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8172071",
+        "ddrName": "Retrofitting of HASILA BEEL PWSS",
+        "projectId": "8172071",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HASILA BEEL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516019",
+      "name": "Hasila Beel PWSS",
+      "description": "Hasila Beel PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hasila Beel PWSS",
+        "localName": "Hasila Beel PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32948",
+        "villageName": "Hasila Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516019",
+        "ddrName": "Hasila Beel PWSS",
+        "projectId": "2516019",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hasila Beel PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180952",
+      "name": "HASILAPARA M PWSS (NEW)",
+      "description": "HASILAPARA M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HASILAPARA M PWSS (NEW)",
+        "localName": "HASILAPARA M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32948",
+        "villageName": "Hasila Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180952",
+        "ddrName": "HASILAPARA M PWSS (NEW)",
+        "projectId": "30180952",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HASILAPARA M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180631",
+      "name": "HASILABEEL TILAPARA M PWSS (NEW)",
+      "description": "HASILABEEL TILAPARA M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HASILABEEL TILAPARA M PWSS (NEW)",
+        "localName": "HASILABEEL TILAPARA M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22398",
+        "panchayatname": "Baladmari",
+        "villageCode": "32948",
+        "villageName": "Hasila Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180631",
+        "ddrName": "HASILABEEL TILAPARA M PWSS (NEW)",
+        "projectId": "30180631",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HASILABEEL TILAPARA M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043606",
+      "name": "NARAYANPARA PWSS (NEW)",
+      "description": "NARAYANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NARAYANPARA PWSS (NEW)",
+        "localName": "NARAYANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32899",
+        "villageName": "Baikunthapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043606",
+        "ddrName": "NARAYANPARA PWSS (NEW)",
+        "projectId": "30043606",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NARAYANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126487",
+      "name": "BAPUPARA PT-I PWSS (NEW)",
+      "description": "BAPUPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPUPARA PT-I PWSS (NEW)",
+        "localName": "BAPUPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32903",
+        "villageName": "Balijana",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126487",
+        "ddrName": "BAPUPARA PT-I PWSS (NEW)",
+        "projectId": "30126487",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPUPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235328",
+      "name": "Retrofitting of FATEHPUR PWSS",
+      "description": "Retrofitting of FATEHPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of FATEHPUR PWSS",
+        "localName": "Retrofitting of FATEHPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32903",
+        "villageName": "Balijana",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235328",
+        "ddrName": "Retrofitting of FATEHPUR PWSS",
+        "projectId": "8235328",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of FATEHPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7893876",
+      "name": "RANGSAPARA PWSS",
+      "description": "RANGSAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGSAPARA PWSS",
+        "localName": "RANGSAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32897",
+        "villageName": "Bhetaipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7893876",
+        "ddrName": "RANGSAPARA PWSS",
+        "projectId": "7893876",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGSAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183758",
+      "name": "Budhipara PWSS (NEW)",
+      "description": "Budhipara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Budhipara PWSS (NEW)",
+        "localName": "Budhipara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32895",
+        "villageName": "Budhipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183758",
+        "ddrName": "Budhipara PWSS (NEW)",
+        "projectId": "30183758",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Budhipara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516135",
+      "name": "Debattar Bapupara PWSS",
+      "description": "Debattar Bapupara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Debattar Bapupara PWSS",
+        "localName": "Debattar Bapupara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32901",
+        "villageName": "Debattar Bapupara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516135",
+        "ddrName": "Debattar Bapupara PWSS",
+        "projectId": "2516135",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Debattar Bapupara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175232",
+      "name": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+      "description": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+        "localName": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32901",
+        "villageName": "Debattar Bapupara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175232",
+        "ddrName": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+        "projectId": "8175232",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016755",
+      "name": "Debattar Bapupara Pt-I PWSS (NEW)",
+      "description": "Debattar Bapupara Pt-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Debattar Bapupara Pt-I PWSS (NEW)",
+        "localName": "Debattar Bapupara Pt-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32900",
+        "villageName": "Debattar Bapupara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016755",
+        "ddrName": "Debattar Bapupara Pt-I PWSS (NEW)",
+        "projectId": "30016755",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Debattar Bapupara Pt-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014670",
+      "name": "Dorapara Pt-III PWSS (NEW)",
+      "description": "Dorapara Pt-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dorapara Pt-III PWSS (NEW)",
+        "localName": "Dorapara Pt-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32902",
+        "villageName": "Dorapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014670",
+        "ddrName": "Dorapara Pt-III PWSS (NEW)",
+        "projectId": "30014670",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dorapara Pt-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235338",
+      "name": "Retrofitting of DORAPARA PWSS",
+      "description": "Retrofitting of DORAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DORAPARA PWSS",
+        "localName": "Retrofitting of DORAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32902",
+        "villageName": "Dorapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235338",
+        "ddrName": "Retrofitting of DORAPARA PWSS",
+        "projectId": "8235338",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DORAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5230398",
+      "name": "Dorapara PWSS",
+      "description": "Dorapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dorapara PWSS",
+        "localName": "Dorapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32902",
+        "villageName": "Dorapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5230398",
+        "ddrName": "Dorapara PWSS",
+        "projectId": "5230398",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dorapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30091277",
+      "name": "TOKRAPARA PWSS (NEW)",
+      "description": "TOKRAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TOKRAPARA PWSS (NEW)",
+        "localName": "TOKRAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32898",
+        "villageName": "Jokrapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30091277",
+        "ddrName": "TOKRAPARA PWSS (NEW)",
+        "projectId": "30091277",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TOKRAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126582",
+      "name": "SARAPARA (BALIJANA) PWSS (NEW)",
+      "description": "SARAPARA (BALIJANA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SARAPARA (BALIJANA) PWSS (NEW)",
+        "localName": "SARAPARA (BALIJANA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32893",
+        "villageName": "Kochpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126582",
+        "ddrName": "SARAPARA (BALIJANA) PWSS (NEW)",
+        "projectId": "30126582",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SARAPARA (BALIJANA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063239",
+      "name": "KHOLBHANGA PWSS (NEW)",
+      "description": "KHOLBHANGA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHOLBHANGA PWSS (NEW)",
+        "localName": "KHOLBHANGA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32894",
+        "villageName": "Nichinta",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063239",
+        "ddrName": "KHOLBHANGA PWSS (NEW)",
+        "projectId": "30063239",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHOLBHANGA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8264422",
+      "name": "207 NO NICHINTA LPS",
+      "description": "207 NO NICHINTA LPS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "207 NO NICHINTA LPS",
+        "localName": "207 NO NICHINTA LPS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32894",
+        "villageName": "Nichinta",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8264422",
+        "ddrName": "207 NO NICHINTA LPS",
+        "projectId": "8264422",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "207 NO NICHINTA LPS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067067",
+      "name": "NICHINTA PWSS (NEW)",
+      "description": "NICHINTA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NICHINTA PWSS (NEW)",
+        "localName": "NICHINTA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32894",
+        "villageName": "Nichinta",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067067",
+        "ddrName": "NICHINTA PWSS (NEW)",
+        "projectId": "30067067",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NICHINTA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30115191",
+      "name": "ROKHAPARA PWSS (NEW)",
+      "description": "ROKHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROKHAPARA PWSS (NEW)",
+        "localName": "ROKHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22393",
+        "panchayatname": "Balijana",
+        "villageCode": "32896",
+        "villageName": "Rakhapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30115191",
+        "ddrName": "ROKHAPARA PWSS (NEW)",
+        "projectId": "30115191",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROKHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183330",
+      "name": "BENGKANDA M PWSS (NEW)",
+      "description": "BENGKANDA M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BENGKANDA M PWSS (NEW)",
+        "localName": "BENGKANDA M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32924",
+        "villageName": "Bang Kanda",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183330",
+        "ddrName": "BENGKANDA M PWSS (NEW)",
+        "projectId": "30183330",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BENGKANDA M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075836",
+      "name": "BARDAMAL PT-II PWSS (NEW)",
+      "description": "BARDAMAL PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARDAMAL PT-II PWSS (NEW)",
+        "localName": "BARDAMAL PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32923",
+        "villageName": "Bardamal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075836",
+        "ddrName": "BARDAMAL PT-II PWSS (NEW)",
+        "projectId": "30075836",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARDAMAL PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183379",
+      "name": "BHOISKHULI PT-II M PWSS (NEW)",
+      "description": "BHOISKHULI PT-II M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOISKHULI PT-II M PWSS (NEW)",
+        "localName": "BHOISKHULI PT-II M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32922",
+        "villageName": "Bhaiskhuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183379",
+        "ddrName": "BHOISKHULI PT-II M PWSS (NEW)",
+        "projectId": "30183379",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOISKHULI PT-II M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386544",
+      "name": "Bhoiskhuli PWSS",
+      "description": "Bhoiskhuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhoiskhuli PWSS",
+        "localName": "Bhoiskhuli PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32922",
+        "villageName": "Bhaiskhuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386544",
+        "ddrName": "Bhoiskhuli PWSS",
+        "projectId": "3386544",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhoiskhuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203721",
+      "name": "Retrofitting of Bhoiskhuli PWSS",
+      "description": "Retrofitting of Bhoiskhuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bhoiskhuli PWSS",
+        "localName": "Retrofitting of Bhoiskhuli PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32922",
+        "villageName": "Bhaiskhuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203721",
+        "ddrName": "Retrofitting of Bhoiskhuli PWSS",
+        "projectId": "8203721",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bhoiskhuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068194",
+      "name": "GHENGAMARI PWSS (NEW)",
+      "description": "GHENGAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHENGAMARI PWSS (NEW)",
+        "localName": "GHENGAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32922",
+        "villageName": "Bhaiskhuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068194",
+        "ddrName": "GHENGAMARI PWSS (NEW)",
+        "projectId": "30068194",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHENGAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213023",
+      "name": "KATHALGURI PWSS (NEW)",
+      "description": "KATHALGURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATHALGURI PWSS (NEW)",
+        "localName": "KATHALGURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32920",
+        "villageName": "Kathalguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213023",
+        "ddrName": "KATHALGURI PWSS (NEW)",
+        "projectId": "30213023",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATHALGURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183459",
+      "name": "MATIA M PWSS (NEW)",
+      "description": "MATIA M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MATIA M PWSS (NEW)",
+        "localName": "MATIA M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32919",
+        "villageName": "Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183459",
+        "ddrName": "MATIA M PWSS (NEW)",
+        "projectId": "30183459",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MATIA M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30184382",
+      "name": "MATIA PT-II PWSS (NEW)",
+      "description": "MATIA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MATIA PT-II PWSS (NEW)",
+        "localName": "MATIA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "622670",
+        "villageName": "Matia Garo Para Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30184382",
+        "ddrName": "MATIA PT-II PWSS (NEW)",
+        "projectId": "30184382",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MATIA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016777",
+      "name": "Rampur Pt-II PWSS (NEW)",
+      "description": "Rampur Pt-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rampur Pt-II PWSS (NEW)",
+        "localName": "Rampur Pt-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32927",
+        "villageName": "Rampur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016777",
+        "ddrName": "Rampur Pt-II PWSS (NEW)",
+        "projectId": "30016777",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rampur Pt-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872699",
+      "name": "Rampur PWSS",
+      "description": "Rampur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rampur PWSS",
+        "localName": "Rampur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32927",
+        "villageName": "Rampur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872699",
+        "ddrName": "Rampur PWSS",
+        "projectId": "4872699",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rampur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203855",
+      "name": "Retrofitting of RAMPUR PWSS",
+      "description": "Retrofitting of RAMPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RAMPUR PWSS",
+        "localName": "Retrofitting of RAMPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32927",
+        "villageName": "Rampur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203855",
+        "ddrName": "Retrofitting of RAMPUR PWSS",
+        "projectId": "8203855",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RAMPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30125919",
+      "name": "SAHARIA A PWSS (NEW)",
+      "description": "SAHARIA A PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAHARIA A PWSS (NEW)",
+        "localName": "SAHARIA A PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32928",
+        "villageName": "Saharia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30125919",
+        "ddrName": "SAHARIA A PWSS (NEW)",
+        "projectId": "30125919",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAHARIA A PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222386",
+      "name": "Retrofitting of SAHARI PWSS",
+      "description": "Retrofitting of SAHARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SAHARI PWSS",
+        "localName": "Retrofitting of SAHARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32928",
+        "villageName": "Saharia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222386",
+        "ddrName": "Retrofitting of SAHARI PWSS",
+        "projectId": "8222386",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SAHARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2404395",
+      "name": "Sahari PWSS",
+      "description": "Sahari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sahari PWSS",
+        "localName": "Sahari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32928",
+        "villageName": "Saharia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2404395",
+        "ddrName": "Sahari PWSS",
+        "projectId": "2404395",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sahari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183574",
+      "name": "SHILDANGA PWSS (NEW)",
+      "description": "SHILDANGA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SHILDANGA PWSS (NEW)",
+        "localName": "SHILDANGA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32928",
+        "villageName": "Saharia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183574",
+        "ddrName": "SHILDANGA PWSS (NEW)",
+        "projectId": "30183574",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SHILDANGA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212942",
+      "name": "BORJULI PWSS (NEW)",
+      "description": "BORJULI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORJULI PWSS (NEW)",
+        "localName": "BORJULI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32929",
+        "villageName": "Telipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212942",
+        "ddrName": "BORJULI PWSS (NEW)",
+        "projectId": "30212942",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORJULI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30125926",
+      "name": "TELIPARA PT-I PWSS (NEW)",
+      "description": "TELIPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TELIPARA PT-I PWSS (NEW)",
+        "localName": "TELIPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32929",
+        "villageName": "Telipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30125926",
+        "ddrName": "TELIPARA PT-I PWSS (NEW)",
+        "projectId": "30125926",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TELIPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203902",
+      "name": "Retrofitting of TELIPARA PWSS",
+      "description": "Retrofitting of TELIPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TELIPARA PWSS",
+        "localName": "Retrofitting of TELIPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32929",
+        "villageName": "Telipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203902",
+        "ddrName": "Retrofitting of TELIPARA PWSS",
+        "projectId": "8203902",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TELIPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5599446",
+      "name": "Telipara PWSS",
+      "description": "Telipara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Telipara PWSS",
+        "localName": "Telipara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22395",
+        "panchayatname": "Bardamal",
+        "villageCode": "32929",
+        "villageName": "Telipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5599446",
+        "ddrName": "Telipara PWSS",
+        "projectId": "5599446",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Telipara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221312",
+      "name": "BALGURIPARA PWSS (NEW)",
+      "description": "BALGURIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALGURIPARA PWSS (NEW)",
+        "localName": "BALGURIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "32995",
+        "villageName": "Badhapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221312",
+        "ddrName": "BALGURIPARA PWSS (NEW)",
+        "projectId": "30221312",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALGURIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181077",
+      "name": "BODAHPUR PWSS (NEW)",
+      "description": "BODAHPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BODAHPUR PWSS (NEW)",
+        "localName": "BODAHPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "32995",
+        "villageName": "Badhapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181077",
+        "ddrName": "BODAHPUR PWSS (NEW)",
+        "projectId": "30181077",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BODAHPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179815",
+      "name": "PAGOLAKONAPARA PWSS (NEW)",
+      "description": "PAGOLAKONAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAGOLAKONAPARA PWSS (NEW)",
+        "localName": "PAGOLAKONAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "32995",
+        "villageName": "Badhapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179815",
+        "ddrName": "PAGOLAKONAPARA PWSS (NEW)",
+        "projectId": "30179815",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAGOLAKONAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181411",
+      "name": "BAIJURI PWSS (NEW)",
+      "description": "BAIJURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAIJURI PWSS (NEW)",
+        "localName": "BAIJURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "32997",
+        "villageName": "Baijuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181411",
+        "ddrName": "BAIJURI PWSS (NEW)",
+        "projectId": "30181411",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAIJURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181126",
+      "name": "JARENGPARA PWSS (NEW)",
+      "description": "JARENGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JARENGPARA PWSS (NEW)",
+        "localName": "JARENGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "32998",
+        "villageName": "Barduk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181126",
+        "ddrName": "JARENGPARA PWSS (NEW)",
+        "projectId": "30181126",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JARENGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068210",
+      "name": "GENDRABARI PWSS (NEW)",
+      "description": "GENDRABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GENDRABARI PWSS (NEW)",
+        "localName": "GENDRABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33001",
+        "villageName": "Gendabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068210",
+        "ddrName": "GENDRABARI PWSS (NEW)",
+        "projectId": "30068210",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GENDRABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2517213",
+      "name": "Geradubi PWSS",
+      "description": "Geradubi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Geradubi PWSS",
+        "localName": "Geradubi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33002",
+        "villageName": "Geradubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2517213",
+        "ddrName": "Geradubi PWSS",
+        "projectId": "2517213",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Geradubi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203703",
+      "name": "Retrofitting of Geradubi PWSS",
+      "description": "Retrofitting of Geradubi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Geradubi PWSS",
+        "localName": "Retrofitting of Geradubi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33002",
+        "villageName": "Geradubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203703",
+        "ddrName": "Retrofitting of Geradubi PWSS",
+        "projectId": "8203703",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Geradubi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203689",
+      "name": "Retrofitting of HATIGAON PWSS",
+      "description": "Retrofitting of HATIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HATIGAON PWSS",
+        "localName": "Retrofitting of HATIGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33003",
+        "villageName": "Hati Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203689",
+        "ddrName": "Retrofitting of HATIGAON PWSS",
+        "projectId": "8203689",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HATIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182259",
+      "name": "KATASIBARI PWSS (NEW)",
+      "description": "KATASIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATASIBARI PWSS (NEW)",
+        "localName": "KATASIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33005",
+        "villageName": "Katasibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182259",
+        "ddrName": "KATASIBARI PWSS (NEW)",
+        "projectId": "30182259",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATASIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179802",
+      "name": "KHUKSIPARA PWSS (NEW)",
+      "description": "KHUKSIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHUKSIPARA PWSS (NEW)",
+        "localName": "KHUKSIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33004",
+        "villageName": "Khakshipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179802",
+        "ddrName": "KHUKSIPARA PWSS (NEW)",
+        "projectId": "30179802",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHUKSIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181400",
+      "name": "MEGADAM PWSS (NEW)",
+      "description": "MEGADAM PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEGADAM PWSS (NEW)",
+        "localName": "MEGADAM PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33006",
+        "villageName": "Megh Dam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181400",
+        "ddrName": "MEGADAM PWSS (NEW)",
+        "projectId": "30181400",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEGADAM PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181575",
+      "name": "MONGRAI PWSS (NEW)",
+      "description": "MONGRAI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONGRAI PWSS (NEW)",
+        "localName": "MONGRAI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33007",
+        "villageName": "Mongrai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181575",
+        "ddrName": "MONGRAI PWSS (NEW)",
+        "projectId": "30181575",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONGRAI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182346",
+      "name": "BAKRIPARA PWSS (NEW)",
+      "description": "BAKRIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAKRIPARA PWSS (NEW)",
+        "localName": "BAKRIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33008",
+        "villageName": "Rangchai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182346",
+        "ddrName": "BAKRIPARA PWSS (NEW)",
+        "projectId": "30182346",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAKRIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182076",
+      "name": "SALPARA PWSS (NEW)",
+      "description": "SALPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALPARA PWSS (NEW)",
+        "localName": "SALPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33008",
+        "villageName": "Rangchai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182076",
+        "ddrName": "SALPARA PWSS (NEW)",
+        "projectId": "30182076",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180698",
+      "name": "SIJUKONA MINI PWSS (NEW)",
+      "description": "SIJUKONA MINI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIJUKONA MINI PWSS (NEW)",
+        "localName": "SIJUKONA MINI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33009",
+        "villageName": "Sijukona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180698",
+        "ddrName": "SIJUKONA MINI PWSS (NEW)",
+        "projectId": "30180698",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIJUKONA MINI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212780",
+      "name": "KASHIKHAGRA WEST PWSS (NEW)",
+      "description": "KASHIKHAGRA WEST PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KASHIKHAGRA WEST PWSS (NEW)",
+        "localName": "KASHIKHAGRA WEST PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22402",
+        "panchayatname": "Bodahapur",
+        "villageCode": "33000",
+        "villageName": "Soto Kashi Khagra",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212780",
+        "ddrName": "KASHIKHAGRA WEST PWSS (NEW)",
+        "projectId": "30212780",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KASHIKHAGRA WEST PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072900",
+      "name": "NIZ SATRAPUR PWSS (NEW)",
+      "description": "NIZ SATRAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ SATRAPUR PWSS (NEW)",
+        "localName": "NIZ SATRAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32941",
+        "villageName": "Bamirampara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072900",
+        "ddrName": "NIZ SATRAPUR PWSS (NEW)",
+        "projectId": "30072900",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ SATRAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30079150",
+      "name": "BAMUNGHOPA PWSS (NEW)",
+      "description": "BAMUNGHOPA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNGHOPA PWSS (NEW)",
+        "localName": "BAMUNGHOPA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32933",
+        "villageName": "Dakur Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30079150",
+        "ddrName": "BAMUNGHOPA PWSS (NEW)",
+        "projectId": "30079150",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNGHOPA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182458",
+      "name": "BAMUNGHOPA PT-II M PWSS (NEW)",
+      "description": "BAMUNGHOPA PT-II M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNGHOPA PT-II M PWSS (NEW)",
+        "localName": "BAMUNGHOPA PT-II M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "BALIJANA",
+        "panchayatcode": "22396",
+        "panchayatname": "DARIDURI",
+        "villageCode": "32933",
+        "villageName": "DAKUR VITA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182458",
+        "ddrName": "BAMUNGHOPA PT-II M PWSS (NEW)",
+        "projectId": "30182458",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNGHOPA PT-II M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205289",
+      "name": "Retrofitting of MAKRI PWSS",
+      "description": "Retrofitting of MAKRI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MAKRI PWSS",
+        "localName": "Retrofitting of MAKRI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32933",
+        "villageName": "Dakur Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205289",
+        "ddrName": "Retrofitting of MAKRI PWSS",
+        "projectId": "8205289",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MAKRI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069124",
+      "name": "DAKURBHITA NC PWSS (NEW)",
+      "description": "DAKURBHITA NC PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAKURBHITA NC PWSS (NEW)",
+        "localName": "DAKURBHITA NC PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "650762",
+        "villageName": "Dakur Vita N.c.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069124",
+        "ddrName": "DAKURBHITA NC PWSS (NEW)",
+        "projectId": "30069124",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAKURBHITA NC PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5379654",
+      "name": "Dariduri PWSS",
+      "description": "Dariduri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dariduri PWSS",
+        "localName": "Dariduri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32934",
+        "villageName": "Dari Duri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5379654",
+        "ddrName": "Dariduri PWSS",
+        "projectId": "5379654",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dariduri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203915",
+      "name": "Retrofitting of DARIDURI PWSS",
+      "description": "Retrofitting of DARIDURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DARIDURI PWSS",
+        "localName": "Retrofitting of DARIDURI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32934",
+        "villageName": "Dari Duri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203915",
+        "ddrName": "Retrofitting of DARIDURI PWSS",
+        "projectId": "8203915",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DARIDURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183307",
+      "name": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+      "description": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+        "localName": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32934",
+        "villageName": "Dari Duri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183307",
+        "ddrName": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+        "projectId": "30183307",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6861642",
+      "name": "Makri PWSS",
+      "description": "Makri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Makri PWSS",
+        "localName": "Makri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32931",
+        "villageName": "Makri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6861642",
+        "ddrName": "Makri PWSS",
+        "projectId": "6861642",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Makri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182492",
+      "name": "Boro Makri M PWSS (NEW)",
+      "description": "Boro Makri M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boro Makri M PWSS (NEW)",
+        "localName": "Boro Makri M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32931",
+        "villageName": "Makri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182492",
+        "ddrName": "Boro Makri M PWSS (NEW)",
+        "projectId": "30182492",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boro Makri M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8202025",
+      "name": "Retrofitting of Niz Barbhita PWSS",
+      "description": "Retrofitting of Niz Barbhita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Niz Barbhita PWSS",
+        "localName": "Retrofitting of Niz Barbhita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32932",
+        "villageName": "Munsirvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8202025",
+        "ddrName": "Retrofitting of Niz Barbhita PWSS",
+        "projectId": "8202025",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Niz Barbhita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937917",
+      "name": "Niz  Barbhita PWSS",
+      "description": "Niz  Barbhita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Niz  Barbhita PWSS",
+        "localName": "Niz  Barbhita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32932",
+        "villageName": "Munsirvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937917",
+        "ddrName": "Niz  Barbhita PWSS",
+        "projectId": "1937917",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Niz  Barbhita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182502",
+      "name": "Paglat Tek PWSS (NEW)",
+      "description": "Paglat Tek PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Paglat Tek PWSS (NEW)",
+        "localName": "Paglat Tek PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32938",
+        "villageName": "Paglar Tag N.c.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182502",
+        "ddrName": "Paglat Tek PWSS (NEW)",
+        "projectId": "30182502",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Paglat Tek PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043314",
+      "name": "DAKURBHITA PWSS (NEW)",
+      "description": "DAKURBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAKURBHITA PWSS (NEW)",
+        "localName": "DAKURBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "622672",
+        "villageName": "Sal Forest(dakur Vita)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043314",
+        "ddrName": "DAKURBHITA PWSS (NEW)",
+        "projectId": "30043314",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAKURBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8312752",
+      "name": "Chutki AWC",
+      "description": "Chutki AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chutki AWC",
+        "localName": "Chutki AWC",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32939",
+        "villageName": "Sutki",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8312752",
+        "ddrName": "Chutki AWC",
+        "projectId": "8312752",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chutki AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068672",
+      "name": "SUTKI PWSS (NEW)",
+      "description": "SUTKI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUTKI PWSS (NEW)",
+        "localName": "SUTKI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32940",
+        "villageName": "Sutki N.c.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068672",
+        "ddrName": "SUTKI PWSS (NEW)",
+        "projectId": "30068672",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUTKI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30184393",
+      "name": "Taraibari PWSS (NEW)",
+      "description": "Taraibari PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Taraibari PWSS (NEW)",
+        "localName": "Taraibari PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22396",
+        "panchayatname": "Dariduri",
+        "villageCode": "32937",
+        "villageName": "Tarai Bari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30184393",
+        "ddrName": "Taraibari PWSS (NEW)",
+        "projectId": "30184393",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Taraibari PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016779",
+      "name": "Bairang PWSS",
+      "description": "Bairang PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bairang PWSS",
+        "localName": "Bairang PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32918",
+        "villageName": "Bairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016779",
+        "ddrName": "Bairang PWSS",
+        "projectId": "30016779",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bairang PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014427",
+      "name": "Bamundanga Pt-II PWSS (NEW)",
+      "description": "Bamundanga Pt-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamundanga Pt-II PWSS (NEW)",
+        "localName": "Bamundanga Pt-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32916",
+        "villageName": "Bamundanga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014427",
+        "ddrName": "Bamundanga Pt-II PWSS (NEW)",
+        "projectId": "30014427",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamundanga Pt-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205096",
+      "name": "Retrofitting of BAMUNDANGA PWSS",
+      "description": "Retrofitting of BAMUNDANGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAMUNDANGA PWSS",
+        "localName": "Retrofitting of BAMUNDANGA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32916",
+        "villageName": "Bamundanga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205096",
+        "ddrName": "Retrofitting of BAMUNDANGA PWSS",
+        "projectId": "8205096",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAMUNDANGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186499",
+      "name": "Bamundanga PWSS",
+      "description": "Bamundanga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamundanga PWSS",
+        "localName": "Bamundanga PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32916",
+        "villageName": "Bamundanga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186499",
+        "ddrName": "Bamundanga PWSS",
+        "projectId": "5186499",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamundanga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186493",
+      "name": "Bamundanga PWSS",
+      "description": "Bamundanga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamundanga PWSS",
+        "localName": "Bamundanga PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32916",
+        "villageName": "Bamundanga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186493",
+        "ddrName": "Bamundanga PWSS",
+        "projectId": "5186493",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamundanga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8201983",
+      "name": "Retrofitting of CHIPIN CHALA PWSS",
+      "description": "Retrofitting of CHIPIN CHALA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHIPIN CHALA PWSS",
+        "localName": "Retrofitting of CHIPIN CHALA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32917",
+        "villageName": "Bamundonga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8201983",
+        "ddrName": "Retrofitting of CHIPIN CHALA PWSS",
+        "projectId": "8201983",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHIPIN CHALA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188739",
+      "name": "BAMUNDANGA PT-I PWSS (NEW)",
+      "description": "BAMUNDANGA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNDANGA PT-I PWSS (NEW)",
+        "localName": "BAMUNDANGA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32917",
+        "villageName": "Bamundonga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188739",
+        "ddrName": "BAMUNDANGA PT-I PWSS (NEW)",
+        "projectId": "30188739",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNDANGA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30184401",
+      "name": "Borjhora PWSS (NEW)",
+      "description": "Borjhora PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Borjhora PWSS (NEW)",
+        "localName": "Borjhora PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32915",
+        "villageName": "Barjora No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30184401",
+        "ddrName": "Borjhora PWSS (NEW)",
+        "projectId": "30184401",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Borjhora PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221530",
+      "name": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+      "description": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+        "localName": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32909",
+        "villageName": "Dark Kacharipara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221530",
+        "ddrName": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+        "projectId": "30221530",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183414",
+      "name": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+      "description": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+        "localName": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32910",
+        "villageName": "Dark Rabhapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183414",
+        "ddrName": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+        "projectId": "30183414",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189256",
+      "name": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+      "description": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+        "localName": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32910",
+        "villageName": "Dark Rabhapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189256",
+        "ddrName": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+        "projectId": "30189256",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183392",
+      "name": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+      "description": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+        "localName": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32911",
+        "villageName": "Darka Kacharipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183392",
+        "ddrName": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+        "projectId": "30183392",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057164",
+      "name": "DEULI PWSS (NEW)",
+      "description": "DEULI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEULI PWSS (NEW)",
+        "localName": "DEULI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32908",
+        "villageName": "Deauli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057164",
+        "ddrName": "DEULI PWSS (NEW)",
+        "projectId": "30057164",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEULI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183980",
+      "name": "DEULI PT-II PWSS (NEW)",
+      "description": "DEULI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEULI PT-II PWSS (NEW)",
+        "localName": "DEULI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32908",
+        "villageName": "Deauli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183980",
+        "ddrName": "DEULI PT-II PWSS (NEW)",
+        "projectId": "30183980",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEULI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016776",
+      "name": "Ketkibari PWSS(NEW)",
+      "description": "Ketkibari PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ketkibari PWSS(NEW)",
+        "localName": "Ketkibari PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32907",
+        "villageName": "Ketkibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016776",
+        "ddrName": "Ketkibari PWSS(NEW)",
+        "projectId": "30016776",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ketkibari PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068187",
+      "name": "LAMPARA PWSS (NEW)",
+      "description": "LAMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LAMPARA PWSS (NEW)",
+        "localName": "LAMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32906",
+        "villageName": "Lampara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068187",
+        "ddrName": "LAMPARA PWSS (NEW)",
+        "projectId": "30068187",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LAMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014671",
+      "name": "Mojai Garopara/Rabhapara PWSS (NEW)",
+      "description": "Mojai Garopara/Rabhapara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mojai Garopara/Rabhapara PWSS (NEW)",
+        "localName": "Mojai Garopara/Rabhapara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "32904",
+        "villageName": "Mojai Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014671",
+        "ddrName": "Mojai Garopara/Rabhapara PWSS (NEW)",
+        "projectId": "30014671",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mojai Garopara/Rabhapara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183229",
+      "name": "Thakurbilla M PWSS (NEW)",
+      "description": "Thakurbilla M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thakurbilla M PWSS (NEW)",
+        "localName": "Thakurbilla M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22394",
+        "panchayatname": "Dwarka",
+        "villageCode": "650761",
+        "villageName": "Thakur Billa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183229",
+        "ddrName": "Thakurbilla M PWSS (NEW)",
+        "projectId": "30183229",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thakurbilla M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067958",
+      "name": "BARVITA PWSS (NEW)",
+      "description": "BARVITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARVITA PWSS (NEW)",
+        "localName": "BARVITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32984",
+        "villageName": "Bar Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067958",
+        "ddrName": "BARVITA PWSS (NEW)",
+        "projectId": "30067958",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARVITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042793",
+      "name": "SAT BAINI PT-III PWSS (NEW)",
+      "description": "SAT BAINI PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAT BAINI PT-III PWSS (NEW)",
+        "localName": "SAT BAINI PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32985",
+        "villageName": "Chandamari Sat Baini",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042793",
+        "ddrName": "SAT BAINI PT-III PWSS (NEW)",
+        "projectId": "30042793",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAT BAINI PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182059",
+      "name": "Sat Baini PWSS (NEW)",
+      "description": "Sat Baini PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sat Baini PWSS (NEW)",
+        "localName": "Sat Baini PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32985",
+        "villageName": "Chandamari Sat Baini",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182059",
+        "ddrName": "Sat Baini PWSS (NEW)",
+        "projectId": "30182059",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sat Baini PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051407",
+      "name": "SAT BAINI PT-II PWSS (NEW)",
+      "description": "SAT BAINI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAT BAINI PT-II PWSS (NEW)",
+        "localName": "SAT BAINI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32985",
+        "villageName": "Chandamari Sat Baini",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051407",
+        "ddrName": "SAT BAINI PT-II PWSS (NEW)",
+        "projectId": "30051407",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAT BAINI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126197",
+      "name": "CHANDAMARI PWSS (NEW)",
+      "description": "CHANDAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHANDAMARI PWSS (NEW)",
+        "localName": "CHANDAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32989",
+        "villageName": "Kal Pani Chandamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126197",
+        "ddrName": "CHANDAMARI PWSS (NEW)",
+        "projectId": "30126197",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHANDAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166533",
+      "name": "URPAD BEEL PWSS (NEW)",
+      "description": "URPAD BEEL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "URPAD BEEL PWSS (NEW)",
+        "localName": "URPAD BEEL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32989",
+        "villageName": "Kal Pani Chandamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166533",
+        "ddrName": "URPAD BEEL PWSS (NEW)",
+        "projectId": "30166533",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "URPAD BEEL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016769",
+      "name": "Chandamri Pt-II PWSS NEW)",
+      "description": "Chandamri Pt-II PWSS NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chandamri Pt-II PWSS NEW)",
+        "localName": "Chandamri Pt-II PWSS NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32989",
+        "villageName": "Kal Pani Chandamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016769",
+        "ddrName": "Chandamri Pt-II PWSS NEW)",
+        "projectId": "30016769",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chandamri Pt-II PWSS NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179812",
+      "name": "KALPANI GAROPARA PWSS (NEW)",
+      "description": "KALPANI GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALPANI GAROPARA PWSS (NEW)",
+        "localName": "KALPANI GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32990",
+        "villageName": "Kalapani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179812",
+        "ddrName": "KALPANI GAROPARA PWSS (NEW)",
+        "projectId": "30179812",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALPANI GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074989",
+      "name": "KALAPANI PT-I PWSS (NEW)",
+      "description": "KALAPANI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALAPANI PT-I PWSS (NEW)",
+        "localName": "KALAPANI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32990",
+        "villageName": "Kalapani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074989",
+        "ddrName": "KALAPANI PT-I PWSS (NEW)",
+        "projectId": "30074989",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALAPANI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235358",
+      "name": "Retrofitting of KALPANI PWSS",
+      "description": "Retrofitting of KALPANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KALPANI PWSS",
+        "localName": "Retrofitting of KALPANI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32990",
+        "villageName": "Kalapani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235358",
+        "ddrName": "Retrofitting of KALPANI PWSS",
+        "projectId": "8235358",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KALPANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074975",
+      "name": "KALAPANI PT-II PWSS (NEW)",
+      "description": "KALAPANI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALAPANI PT-II PWSS (NEW)",
+        "localName": "KALAPANI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32990",
+        "villageName": "Kalapani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074975",
+        "ddrName": "KALAPANI PT-II PWSS (NEW)",
+        "projectId": "30074975",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALAPANI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036349",
+      "name": "KALINDI DOBA PWSS (NEW) PWSS",
+      "description": "KALINDI DOBA PWSS (NEW) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALINDI DOBA PWSS (NEW) PWSS",
+        "localName": "KALINDI DOBA PWSS (NEW) PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32986",
+        "villageName": "Kalindi Doba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036349",
+        "ddrName": "KALINDI DOBA PWSS (NEW) PWSS",
+        "projectId": "30036349",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALINDI DOBA PWSS (NEW) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8201977",
+      "name": "Retrofitting of KOKIRA PWSS",
+      "description": "Retrofitting of KOKIRA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KOKIRA PWSS",
+        "localName": "Retrofitting of KOKIRA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32987",
+        "villageName": "Kukuria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8201977",
+        "ddrName": "Retrofitting of KOKIRA PWSS",
+        "projectId": "8201977",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KOKIRA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182130",
+      "name": "KUKURIA PT-II PWSS (NEW)",
+      "description": "KUKURIA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUKURIA PT-II PWSS (NEW)",
+        "localName": "KUKURIA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32988",
+        "villageName": "Kukuria Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182130",
+        "ddrName": "KUKURIA PT-II PWSS (NEW)",
+        "projectId": "30182130",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUKURIA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046274",
+      "name": "KUKURIA PT-I PWSS (NEW)",
+      "description": "KUKURIA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUKURIA PT-I PWSS (NEW)",
+        "localName": "KUKURIA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32988",
+        "villageName": "Kukuria Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046274",
+        "ddrName": "KUKURIA PT-I PWSS (NEW)",
+        "projectId": "30046274",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUKURIA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070288",
+      "name": "TILAPARA (Balijana) PWSS (NEW)",
+      "description": "TILAPARA (Balijana) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA (Balijana) PWSS (NEW)",
+        "localName": "TILAPARA (Balijana) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22401",
+        "panchayatname": "Kalpani Chandamari",
+        "villageCode": "32992",
+        "villageName": "Tilapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070288",
+        "ddrName": "TILAPARA (Balijana) PWSS (NEW)",
+        "projectId": "30070288",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA (Balijana) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30125970",
+      "name": "BHOISKHULI KALYANPUR PWSS (NEW)",
+      "description": "BHOISKHULI KALYANPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOISKHULI KALYANPUR PWSS (NEW)",
+        "localName": "BHOISKHULI KALYANPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32955",
+        "villageName": "Bhaiskhuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30125970",
+        "ddrName": "BHOISKHULI KALYANPUR PWSS (NEW)",
+        "projectId": "30125970",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOISKHULI KALYANPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2517201",
+      "name": "Gendra PWSS",
+      "description": "Gendra PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gendra PWSS",
+        "localName": "Gendra PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32955",
+        "villageName": "Bhaiskhuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2517201",
+        "ddrName": "Gendra PWSS",
+        "projectId": "2517201",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gendra PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068225",
+      "name": "BHALUKDUBI PT-II PWSS (NEW)",
+      "description": "BHALUKDUBI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKDUBI PT-II PWSS (NEW)",
+        "localName": "BHALUKDUBI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068225",
+        "ddrName": "BHALUKDUBI PT-II PWSS (NEW)",
+        "projectId": "30068225",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKDUBI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175220",
+      "name": "Retrofitting of BHALUKDUBI PWSS",
+      "description": "Retrofitting of BHALUKDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BHALUKDUBI PWSS",
+        "localName": "Retrofitting of BHALUKDUBI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175220",
+        "ddrName": "Retrofitting of BHALUKDUBI PWSS",
+        "projectId": "8175220",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BHALUKDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2496124",
+      "name": "Bhalukdubi PWSS",
+      "description": "Bhalukdubi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhalukdubi PWSS",
+        "localName": "Bhalukdubi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2496124",
+        "ddrName": "Bhalukdubi PWSS",
+        "projectId": "2496124",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhalukdubi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30125974",
+      "name": "BHALUKDUBI EAST PWSS (NEW)",
+      "description": "BHALUKDUBI EAST PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKDUBI EAST PWSS (NEW)",
+        "localName": "BHALUKDUBI EAST PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30125974",
+        "ddrName": "BHALUKDUBI EAST PWSS (NEW)",
+        "projectId": "30125974",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKDUBI EAST PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30079129",
+      "name": "BORPAHAR PWSS (NEW)",
+      "description": "BORPAHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORPAHAR PWSS (NEW)",
+        "localName": "BORPAHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30079129",
+        "ddrName": "BORPAHAR PWSS (NEW)",
+        "projectId": "30079129",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORPAHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6260027",
+      "name": "Jungle Block Pt II PWSS",
+      "description": "Jungle Block Pt II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jungle Block Pt II PWSS",
+        "localName": "Jungle Block Pt II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6260027",
+        "ddrName": "Jungle Block Pt II PWSS",
+        "projectId": "6260027",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jungle Block Pt II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213013",
+      "name": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+      "description": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+        "localName": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213013",
+        "ddrName": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+        "projectId": "30213013",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872849",
+      "name": "Milan Nagar PWSS",
+      "description": "Milan Nagar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Milan Nagar PWSS",
+        "localName": "Milan Nagar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872849",
+        "ddrName": "Milan Nagar PWSS",
+        "projectId": "4872849",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Milan Nagar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171872",
+      "name": "Retrofitting of MILAN NAGAR PWSS",
+      "description": "Retrofitting of MILAN NAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MILAN NAGAR PWSS",
+        "localName": "Retrofitting of MILAN NAGAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171872",
+        "ddrName": "Retrofitting of MILAN NAGAR PWSS",
+        "projectId": "8171872",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MILAN NAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219042",
+      "name": "Bhalukdubi PT-III PWSS (NEW)",
+      "description": "Bhalukdubi PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhalukdubi PT-III PWSS (NEW)",
+        "localName": "Bhalukdubi PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219042",
+        "ddrName": "Bhalukdubi PT-III PWSS (NEW)",
+        "projectId": "30219042",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhalukdubi PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218974",
+      "name": "PRIYANAGAR PWSS (NEW)",
+      "description": "PRIYANAGAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PRIYANAGAR PWSS (NEW)",
+        "localName": "PRIYANAGAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32954",
+        "villageName": "Bhalukdubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218974",
+        "ddrName": "PRIYANAGAR PWSS (NEW)",
+        "projectId": "30218974",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PRIYANAGAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014441",
+      "name": "Shyamaguri PWSS (NEW)",
+      "description": "Shyamaguri PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Shyamaguri PWSS (NEW)",
+        "localName": "Shyamaguri PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32953",
+        "villageName": "Chamaguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014441",
+        "ddrName": "Shyamaguri PWSS (NEW)",
+        "projectId": "30014441",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Shyamaguri PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179739",
+      "name": "Anand Bazar M PWSS (NEW)",
+      "description": "Anand Bazar M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Anand Bazar M PWSS (NEW)",
+        "localName": "Anand Bazar M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32956",
+        "villageName": "Dasarapara Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179739",
+        "ddrName": "Anand Bazar M PWSS (NEW)",
+        "projectId": "30179739",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Anand Bazar M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074179",
+      "name": "DOSORA MATIA PWSS (NEW)",
+      "description": "DOSORA MATIA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DOSORA MATIA PWSS (NEW)",
+        "localName": "DOSORA MATIA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32956",
+        "villageName": "Dasarapara Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074179",
+        "ddrName": "DOSORA MATIA PWSS (NEW)",
+        "projectId": "30074179",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DOSORA MATIA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175237",
+      "name": "Retrofitting of GENDRA PWSS",
+      "description": "Retrofitting of GENDRA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GENDRA PWSS",
+        "localName": "Retrofitting of GENDRA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32959",
+        "villageName": "Garo Kuta",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175237",
+        "ddrName": "Retrofitting of GENDRA PWSS",
+        "projectId": "8175237",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GENDRA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074189",
+      "name": "GENDRA NC PWSS (NEW)",
+      "description": "GENDRA NC PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GENDRA NC PWSS (NEW)",
+        "localName": "GENDRA NC PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32957",
+        "villageName": "Gendera",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074189",
+        "ddrName": "GENDRA NC PWSS (NEW)",
+        "projectId": "30074189",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GENDRA NC PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166762",
+      "name": "GORAIMARI PWSS (NEW)",
+      "description": "GORAIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GORAIMARI PWSS (NEW)",
+        "localName": "GORAIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32960",
+        "villageName": "Goraimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166762",
+        "ddrName": "GORAIMARI PWSS (NEW)",
+        "projectId": "30166762",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GORAIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182227",
+      "name": "Jungle Block Pt-I PWSS (NEW)",
+      "description": "Jungle Block Pt-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jungle Block Pt-I PWSS (NEW)",
+        "localName": "Jungle Block Pt-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32961",
+        "villageName": "Jungle Block No-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182227",
+        "ddrName": "Jungle Block Pt-I PWSS (NEW)",
+        "projectId": "30182227",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jungle Block Pt-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30013820",
+      "name": "J. BLOCK (II) M PWSS (NEW)",
+      "description": "J. BLOCK (II) M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "J. BLOCK (II) M PWSS (NEW)",
+        "localName": "J. BLOCK (II) M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32962",
+        "villageName": "Jungle Block No-2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30013820",
+        "ddrName": "J. BLOCK (II) M PWSS (NEW)",
+        "projectId": "30013820",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "J. BLOCK (II) M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126217",
+      "name": "HADLAPARA PWSS (NEW)",
+      "description": "HADLAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HADLAPARA PWSS (NEW)",
+        "localName": "HADLAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32964",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126217",
+        "ddrName": "HADLAPARA PWSS (NEW)",
+        "projectId": "30126217",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HADLAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016720",
+      "name": "Kalyanpur Pt-I PWSS (NEW)",
+      "description": "Kalyanpur Pt-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalyanpur Pt-I PWSS (NEW)",
+        "localName": "Kalyanpur Pt-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32964",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016720",
+        "ddrName": "Kalyanpur Pt-I PWSS (NEW)",
+        "projectId": "30016720",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalyanpur Pt-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179821",
+      "name": "KALYANPUR PT-II M PWSS (NEW)",
+      "description": "KALYANPUR PT-II M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALYANPUR PT-II M PWSS (NEW)",
+        "localName": "KALYANPUR PT-II M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32964",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179821",
+        "ddrName": "KALYANPUR PT-II M PWSS (NEW)",
+        "projectId": "30179821",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALYANPUR PT-II M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8310456",
+      "name": "208 NO HADLAPARA LP.",
+      "description": "208 NO HADLAPARA LP.",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "208 NO HADLAPARA LP.",
+        "localName": "208 NO HADLAPARA LP.",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32964",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8310456",
+        "ddrName": "208 NO HADLAPARA LP.",
+        "projectId": "8310456",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "208 NO HADLAPARA LP.",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068198",
+      "name": "KURUABHASHA PT-II PWSS (NEW)",
+      "description": "KURUABHASHA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KURUABHASHA PT-II PWSS (NEW)",
+        "localName": "KURUABHASHA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32965",
+        "villageName": "Kurowa Bhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068198",
+        "ddrName": "KURUABHASHA PT-II PWSS (NEW)",
+        "projectId": "30068198",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KURUABHASHA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171834",
+      "name": "Retrofitting of KURUABHASA PWSS",
+      "description": "Retrofitting of KURUABHASA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KURUABHASA PWSS",
+        "localName": "Retrofitting of KURUABHASA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32965",
+        "villageName": "Kurowa Bhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171834",
+        "ddrName": "Retrofitting of KURUABHASA PWSS",
+        "projectId": "8171834",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KURUABHASA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2421903",
+      "name": "Kuruabhasa PWSS",
+      "description": "Kuruabhasa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kuruabhasa PWSS",
+        "localName": "Kuruabhasa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32965",
+        "villageName": "Kurowa Bhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2421903",
+        "ddrName": "Kuruabhasa PWSS",
+        "projectId": "2421903",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kuruabhasa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175588",
+      "name": "Retrofiting of SOLMARI KALYANPUR PWSS",
+      "description": "Retrofiting of SOLMARI KALYANPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofiting of SOLMARI KALYANPUR PWSS",
+        "localName": "Retrofiting of SOLMARI KALYANPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32966",
+        "villageName": "Solmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175588",
+        "ddrName": "Retrofiting of SOLMARI KALYANPUR PWSS",
+        "projectId": "8175588",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofiting of SOLMARI KALYANPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5641311",
+      "name": "Soulmari Kalyanpur PWSS",
+      "description": "Soulmari Kalyanpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Soulmari Kalyanpur PWSS",
+        "localName": "Soulmari Kalyanpur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32966",
+        "villageName": "Solmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5641311",
+        "ddrName": "Soulmari Kalyanpur PWSS",
+        "projectId": "5641311",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Soulmari Kalyanpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096276",
+      "name": "SOLMARI TILAPARA M PWSS (NEW)",
+      "description": "SOLMARI TILAPARA M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SOLMARI TILAPARA M PWSS (NEW)",
+        "localName": "SOLMARI TILAPARA M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "villageCode": "32966",
+        "villageName": "Solmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096276",
+        "ddrName": "SOLMARI TILAPARA M PWSS (NEW)",
+        "projectId": "30096276",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SOLMARI TILAPARA M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166822",
+      "name": "HURKAKUCHI PWSS (NEW)",
+      "description": "HURKAKUCHI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HURKAKUCHI PWSS (NEW)",
+        "localName": "HURKAKUCHI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32942",
+        "villageName": "Hurpakuchi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166822",
+        "ddrName": "HURKAKUCHI PWSS (NEW)",
+        "projectId": "30166822",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HURKAKUCHI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183496",
+      "name": "Kumri Pt-II PWSS (NEW)",
+      "description": "Kumri Pt-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kumri Pt-II PWSS (NEW)",
+        "localName": "Kumri Pt-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32944",
+        "villageName": "Khar Boja",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183496",
+        "ddrName": "Kumri Pt-II PWSS (NEW)",
+        "projectId": "30183496",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kumri Pt-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126590",
+      "name": "KHUTAMARI WEST PWSS (NEW)",
+      "description": "KHUTAMARI WEST PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHUTAMARI WEST PWSS (NEW)",
+        "localName": "KHUTAMARI WEST PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32943",
+        "villageName": "Khutamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126590",
+        "ddrName": "KHUTAMARI WEST PWSS (NEW)",
+        "projectId": "30126590",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHUTAMARI WEST PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30016773",
+      "name": "Khutamari East PWSS (NEW)",
+      "description": "Khutamari East PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khutamari East PWSS (NEW)",
+        "localName": "Khutamari East PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32943",
+        "villageName": "Khutamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30016773",
+        "ddrName": "Khutamari East PWSS (NEW)",
+        "projectId": "30016773",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khutamari East PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166511",
+      "name": "KHUTAMARI PWSS (NEW)",
+      "description": "KHUTAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHUTAMARI PWSS (NEW)",
+        "localName": "KHUTAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32943",
+        "villageName": "Khutamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166511",
+        "ddrName": "KHUTAMARI PWSS (NEW)",
+        "projectId": "30166511",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHUTAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203872",
+      "name": "Retrofitting of KUMRI PWSS",
+      "description": "Retrofitting of KUMRI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KUMRI PWSS",
+        "localName": "Retrofitting of KUMRI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32943",
+        "villageName": "Khutamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203872",
+        "ddrName": "Retrofitting of KUMRI PWSS",
+        "projectId": "8203872",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KUMRI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182473",
+      "name": "Bamuntila M PWSS (NEW)",
+      "description": "Bamuntila M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamuntila M PWSS (NEW)",
+        "localName": "Bamuntila M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32943",
+        "villageName": "Khutamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182473",
+        "ddrName": "Bamuntila M PWSS (NEW)",
+        "projectId": "30182473",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamuntila M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30184384",
+      "name": "Pancharatna PWSS (NEW)",
+      "description": "Pancharatna PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pancharatna PWSS (NEW)",
+        "localName": "Pancharatna PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32945",
+        "villageName": "Pancha Ratna",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30184384",
+        "ddrName": "Pancharatna PWSS (NEW)",
+        "projectId": "30184384",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pancharatna PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067962",
+      "name": "PANCHARATNA NC PWSS (NEW)",
+      "description": "PANCHARATNA NC PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PANCHARATNA NC PWSS (NEW)",
+        "localName": "PANCHARATNA NC PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22397",
+        "panchayatname": "Kumri",
+        "villageCode": "32946",
+        "villageName": "Pancha Ratna N.c.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067962",
+        "ddrName": "PANCHARATNA NC PWSS (NEW)",
+        "projectId": "30067962",
+        "regionName": "1184"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PANCHARATNA NC PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075682",
+      "name": "BARMANPARA PWSS (NEW)",
+      "description": "BARMANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARMANPARA PWSS (NEW)",
+        "localName": "BARMANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33432",
+        "villageName": "Bausatari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075682",
+        "ddrName": "BARMANPARA PWSS (NEW)",
+        "projectId": "30075682",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARMANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070165",
+      "name": "BAUCHERTARI PWSS (NEW)",
+      "description": "BAUCHERTARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAUCHERTARI PWSS (NEW)",
+        "localName": "BAUCHERTARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33432",
+        "villageName": "Bausatari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070165",
+        "ddrName": "BAUCHERTARI PWSS (NEW)",
+        "projectId": "30070165",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAUCHERTARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191889",
+      "name": "CHAKLI DAMRIBHASA PWSS (NEW)",
+      "description": "CHAKLI DAMRIBHASA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAKLI DAMRIBHASA PWSS (NEW)",
+        "localName": "CHAKLI DAMRIBHASA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33432",
+        "villageName": "Bausatari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191889",
+        "ddrName": "CHAKLI DAMRIBHASA PWSS (NEW)",
+        "projectId": "30191889",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAKLI DAMRIBHASA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058339",
+      "name": "KUKULIPARA PWSS (NEW)",
+      "description": "KUKULIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUKULIPARA PWSS (NEW)",
+        "localName": "KUKULIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33433",
+        "villageName": "Dharai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058339",
+        "ddrName": "KUKULIPARA PWSS (NEW)",
+        "projectId": "30058339",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUKULIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8176607",
+      "name": "Retrofitting of HARUAFUTA PWSS",
+      "description": "Retrofitting of HARUAFUTA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HARUAFUTA PWSS",
+        "localName": "Retrofitting of HARUAFUTA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33433",
+        "villageName": "Dharai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8176607",
+        "ddrName": "Retrofitting of HARUAFUTA PWSS",
+        "projectId": "8176607",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HARUAFUTA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30159329",
+      "name": "DHARAI PWSS (NEW)",
+      "description": "DHARAI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHARAI PWSS (NEW)",
+        "localName": "DHARAI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33433",
+        "villageName": "Dharai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30159329",
+        "ddrName": "DHARAI PWSS (NEW)",
+        "projectId": "30159329",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHARAI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067709",
+      "name": "BATAPARA PWSS (NEW)",
+      "description": "BATAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BATAPARA PWSS (NEW)",
+        "localName": "BATAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33434",
+        "villageName": "Gosaidubi Hindupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067709",
+        "ddrName": "BATAPARA PWSS (NEW)",
+        "projectId": "30067709",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BATAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191816",
+      "name": "FALIMARI SASAN PWSS (NEW)",
+      "description": "FALIMARI SASAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FALIMARI SASAN PWSS (NEW)",
+        "localName": "FALIMARI SASAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33434",
+        "villageName": "Gosaidubi Hindupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191816",
+        "ddrName": "FALIMARI SASAN PWSS (NEW)",
+        "projectId": "30191816",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FALIMARI SASAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041849",
+      "name": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+      "description": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+        "localName": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33434",
+        "villageName": "Gosaidubi Hindupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041849",
+        "ddrName": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+        "projectId": "30041849",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067086",
+      "name": "KACHIARTARY PWSS (NEW)",
+      "description": "KACHIARTARY PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KACHIARTARY PWSS (NEW)",
+        "localName": "KACHIARTARY PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33434",
+        "villageName": "Gosaidubi Hindupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067086",
+        "ddrName": "KACHIARTARY PWSS (NEW)",
+        "projectId": "30067086",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KACHIARTARY PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30066211",
+      "name": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+      "description": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+        "localName": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33435",
+        "villageName": "Gosaidubi Muslimpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30066211",
+        "ddrName": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+        "projectId": "30066211",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189444",
+      "name": "BORMAHARU PWSS (NEW)",
+      "description": "BORMAHARU PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORMAHARU PWSS (NEW)",
+        "localName": "BORMAHARU PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22451",
+        "panchayatname": "Gossaidubi",
+        "villageCode": "33436",
+        "villageName": "Haruaphuta",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189444",
+        "ddrName": "BORMAHARU PWSS (NEW)",
+        "projectId": "30189444",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORMAHARU PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30061025",
+      "name": "CHOWKATOLA PWSS (NEW)",
+      "description": "CHOWKATOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOWKATOLA PWSS (NEW)",
+        "localName": "CHOWKATOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33503",
+        "villageName": "Choukatola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30061025",
+        "ddrName": "CHOWKATOLA PWSS (NEW)",
+        "projectId": "30061025",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOWKATOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126239",
+      "name": "HOLDIBARI PT-II PWSS (NEW)",
+      "description": "HOLDIBARI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HOLDIBARI PT-II PWSS (NEW)",
+        "localName": "HOLDIBARI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33504",
+        "villageName": "Holdibari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126239",
+        "ddrName": "HOLDIBARI PT-II PWSS (NEW)",
+        "projectId": "30126239",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HOLDIBARI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189615",
+      "name": "KOIMARI PWSS (NEW)",
+      "description": "KOIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOIMARI PWSS (NEW)",
+        "localName": "KOIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33506",
+        "villageName": "Koimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189615",
+        "ddrName": "KOIMARI PWSS (NEW)",
+        "projectId": "30189615",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067623",
+      "name": "SALBARI PT-I PWSS (NEW)",
+      "description": "SALBARI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALBARI PT-I PWSS (NEW)",
+        "localName": "SALBARI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33505",
+        "villageName": "Salbari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067623",
+        "ddrName": "SALBARI PT-I PWSS (NEW)",
+        "projectId": "30067623",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALBARI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041850",
+      "name": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+      "description": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+        "localName": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33505",
+        "villageName": "Salbari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041850",
+        "ddrName": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+        "projectId": "30041850",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075002",
+      "name": "DASPARA (JALESWAR) PWSS (NEW)",
+      "description": "DASPARA (JALESWAR) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DASPARA (JALESWAR) PWSS (NEW)",
+        "localName": "DASPARA (JALESWAR) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33505",
+        "villageName": "Salbari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075002",
+        "ddrName": "DASPARA (JALESWAR) PWSS (NEW)",
+        "projectId": "30075002",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DASPARA (JALESWAR) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8176578",
+      "name": "Retrofitting of GAURNAGAR PWSS",
+      "description": "Retrofitting of GAURNAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GAURNAGAR PWSS",
+        "localName": "Retrofitting of GAURNAGAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33505",
+        "villageName": "Salbari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8176578",
+        "ddrName": "Retrofitting of GAURNAGAR PWSS",
+        "projectId": "8176578",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GAURNAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2495922",
+      "name": "Gour Nagar PWSS",
+      "description": "Gour Nagar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gour Nagar PWSS",
+        "localName": "Gour Nagar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33505",
+        "villageName": "Salbari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2495922",
+        "ddrName": "Gour Nagar PWSS",
+        "projectId": "2495922",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gour Nagar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073521",
+      "name": "SALPARA PWSS (NEW)",
+      "description": "SALPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALPARA PWSS (NEW)",
+        "localName": "SALPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33505",
+        "villageName": "Salbari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073521",
+        "ddrName": "SALPARA PWSS (NEW)",
+        "projectId": "30073521",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074995",
+      "name": "SALDHOWA PWSS (NEW)",
+      "description": "SALDHOWA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALDHOWA PWSS (NEW)",
+        "localName": "SALDHOWA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22462",
+        "panchayatname": "Gour Nagar",
+        "villageCode": "33502",
+        "villageName": "Saldhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074995",
+        "ddrName": "SALDHOWA PWSS (NEW)",
+        "projectId": "30074995",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALDHOWA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068428",
+      "name": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+      "description": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+        "localName": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33437",
+        "villageName": "Holdibari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068428",
+        "ddrName": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+        "projectId": "30068428",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067611",
+      "name": "NEW HOLDIBARI PWSS (NEW)",
+      "description": "NEW HOLDIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NEW HOLDIBARI PWSS (NEW)",
+        "localName": "NEW HOLDIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33437",
+        "villageName": "Holdibari No.1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067611",
+        "ddrName": "NEW HOLDIBARI PWSS (NEW)",
+        "projectId": "30067611",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NEW HOLDIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076404",
+      "name": "GOLOKERPAM PWSS (NEW)",
+      "description": "GOLOKERPAM PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOLOKERPAM PWSS (NEW)",
+        "localName": "GOLOKERPAM PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33438",
+        "villageName": "Kartimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076404",
+        "ddrName": "GOLOKERPAM PWSS (NEW)",
+        "projectId": "30076404",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOLOKERPAM PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159954",
+      "name": "Retrofitting of KARTIMARI PWSS",
+      "description": "Retrofitting of KARTIMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KARTIMARI PWSS",
+        "localName": "Retrofitting of KARTIMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33438",
+        "villageName": "Kartimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159954",
+        "ddrName": "Retrofitting of KARTIMARI PWSS",
+        "projectId": "8159954",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KARTIMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189344",
+      "name": "MANDIRPARA PWSS (NEW)",
+      "description": "MANDIRPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANDIRPARA PWSS (NEW)",
+        "localName": "MANDIRPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33438",
+        "villageName": "Kartimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189344",
+        "ddrName": "MANDIRPARA PWSS (NEW)",
+        "projectId": "30189344",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANDIRPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872646",
+      "name": "Andurber PWSS",
+      "description": "Andurber PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Andurber PWSS",
+        "localName": "Andurber PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872646",
+        "ddrName": "Andurber PWSS",
+        "projectId": "4872646",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Andurber PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153844",
+      "name": "Retrofitting of ANDURBBER PWSS",
+      "description": "Retrofitting of ANDURBBER PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of ANDURBBER PWSS",
+        "localName": "Retrofitting of ANDURBBER PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153844",
+        "ddrName": "Retrofitting of ANDURBBER PWSS",
+        "projectId": "8153844",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of ANDURBBER PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068620",
+      "name": "BANSIR CHAR PWSS (NEW)",
+      "description": "BANSIR CHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANSIR CHAR PWSS (NEW)",
+        "localName": "BANSIR CHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068620",
+        "ddrName": "BANSIR CHAR PWSS (NEW)",
+        "projectId": "30068620",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANSIR CHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158694",
+      "name": "BARMANPARA DASPARA PWSS (NEW)",
+      "description": "BARMANPARA DASPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARMANPARA DASPARA PWSS (NEW)",
+        "localName": "BARMANPARA DASPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158694",
+        "ddrName": "BARMANPARA DASPARA PWSS (NEW)",
+        "projectId": "30158694",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARMANPARA DASPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019506",
+      "name": "Morishbari Ferrarjhar PWSS(NEW)",
+      "description": "Morishbari Ferrarjhar PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Morishbari Ferrarjhar PWSS(NEW)",
+        "localName": "Morishbari Ferrarjhar PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019506",
+        "ddrName": "Morishbari Ferrarjhar PWSS(NEW)",
+        "projectId": "30019506",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Morishbari Ferrarjhar PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019130",
+      "name": "Dhumer Ghat PWSS(NEW)",
+      "description": "Dhumer Ghat PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhumer Ghat PWSS(NEW)",
+        "localName": "Dhumer Ghat PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019130",
+        "ddrName": "Dhumer Ghat PWSS(NEW)",
+        "projectId": "30019130",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhumer Ghat PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191910",
+      "name": "KHERER CHAR PWSS (NEW)",
+      "description": "KHERER CHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHERER CHAR PWSS (NEW)",
+        "localName": "KHERER CHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191910",
+        "ddrName": "KHERER CHAR PWSS (NEW)",
+        "projectId": "30191910",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHERER CHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206469",
+      "name": "Retrofitting of MORISHBARI PWSS",
+      "description": "Retrofitting of MORISHBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MORISHBARI PWSS",
+        "localName": "Retrofitting of MORISHBARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22452",
+        "panchayatname": "Guriadhap",
+        "villageCode": "33440",
+        "villageName": "Morichbari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206469",
+        "ddrName": "Retrofitting of MORISHBARI PWSS",
+        "projectId": "8206469",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MORISHBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30021482",
+      "name": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+      "description": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+        "localName": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22460",
+        "panchayatname": "HAGURIPARA",
+        "villageCode": "33493",
+        "villageName": "CHULKANI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30021482",
+        "ddrName": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+        "projectId": "30021482",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191974",
+      "name": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+      "description": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+        "localName": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22460",
+        "panchayatname": "Haguripara",
+        "villageCode": "33495",
+        "villageName": "Haguripara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191974",
+        "ddrName": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+        "projectId": "30191974",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30159298",
+      "name": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+      "description": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+        "localName": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22460",
+        "panchayatname": "Haguripara",
+        "villageCode": "650774",
+        "villageName": "Thongpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30159298",
+        "ddrName": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+        "projectId": "30159298",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041853",
+      "name": "ANGTHIHARA PWSS (NEW)",
+      "description": "ANGTHIHARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ANGTHIHARA PWSS (NEW)",
+        "localName": "ANGTHIHARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33517",
+        "villageName": "Bandormatha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041853",
+        "ddrName": "ANGTHIHARA PWSS (NEW)",
+        "projectId": "30041853",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ANGTHIHARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072402",
+      "name": "BANDARMATHA PWSS (NEW)",
+      "description": "BANDARMATHA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANDARMATHA PWSS (NEW)",
+        "localName": "BANDARMATHA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33517",
+        "villageName": "Bandormatha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072402",
+        "ddrName": "BANDARMATHA PWSS (NEW)",
+        "projectId": "30072402",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANDARMATHA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037052",
+      "name": "HATIMURA PWSS (NEW)",
+      "description": "HATIMURA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATIMURA PWSS (NEW)",
+        "localName": "HATIMURA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33518",
+        "villageName": "Hatimura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037052",
+        "ddrName": "HATIMURA PWSS (NEW)",
+        "projectId": "30037052",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATIMURA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30192001",
+      "name": "BORO HASHDOBA PWSS (NEW)",
+      "description": "BORO HASHDOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORO HASHDOBA PWSS (NEW)",
+        "localName": "BORO HASHDOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33512",
+        "villageName": "Hosdoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30192001",
+        "ddrName": "BORO HASHDOBA PWSS (NEW)",
+        "projectId": "30192001",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORO HASHDOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159939",
+      "name": "Retrofitting of HASHDOBA PWSS",
+      "description": "Retrofitting of HASHDOBA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HASHDOBA PWSS",
+        "localName": "Retrofitting of HASHDOBA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33512",
+        "villageName": "Hosdoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159939",
+        "ddrName": "Retrofitting of HASHDOBA PWSS",
+        "projectId": "8159939",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HASHDOBA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4870307",
+      "name": "Hashdoba PWSS",
+      "description": "Hashdoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hashdoba PWSS",
+        "localName": "Hashdoba PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33512",
+        "villageName": "Hosdoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4870307",
+        "ddrName": "Hashdoba PWSS",
+        "projectId": "4870307",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hashdoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6260923",
+      "name": "Kantapur PWSS",
+      "description": "Kantapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kantapur PWSS",
+        "localName": "Kantapur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33511",
+        "villageName": "Kantapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6260923",
+        "ddrName": "Kantapur PWSS",
+        "projectId": "6260923",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kantapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30093111",
+      "name": "KANTAPUR CHAKADOBA PWSS (NEW)",
+      "description": "KANTAPUR CHAKADOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANTAPUR CHAKADOBA PWSS (NEW)",
+        "localName": "KANTAPUR CHAKADOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33511",
+        "villageName": "Kantapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30093111",
+        "ddrName": "KANTAPUR CHAKADOBA PWSS (NEW)",
+        "projectId": "30093111",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANTAPUR CHAKADOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068422",
+      "name": "KANTAPUR NAMAPARA PWSS (NEW)",
+      "description": "KANTAPUR NAMAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANTAPUR NAMAPARA PWSS (NEW)",
+        "localName": "KANTAPUR NAMAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33511",
+        "villageName": "Kantapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068422",
+        "ddrName": "KANTAPUR NAMAPARA PWSS (NEW)",
+        "projectId": "30068422",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANTAPUR NAMAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8279762",
+      "name": "AMZADIA ME MADRASSA",
+      "description": "AMZADIA ME MADRASSA",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMZADIA ME MADRASSA",
+        "localName": "AMZADIA ME MADRASSA",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33511",
+        "villageName": "Kantapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8279762",
+        "ddrName": "AMZADIA ME MADRASSA",
+        "projectId": "8279762",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMZADIA ME MADRASSA",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207923",
+      "name": "SIGRISALHANA PWSS (NEW)",
+      "description": "SIGRISALHANA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIGRISALHANA PWSS (NEW)",
+        "localName": "SIGRISALHANA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33515",
+        "villageName": "Khurshapakhiri Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207923",
+        "ddrName": "SIGRISALHANA PWSS (NEW)",
+        "projectId": "30207923",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIGRISALHANA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069223",
+      "name": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+      "description": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+        "localName": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33515",
+        "villageName": "Khurshapakhiri Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069223",
+        "ddrName": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+        "projectId": "30069223",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019163",
+      "name": "Hurkasingi PWSS(NEW)",
+      "description": "Hurkasingi PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hurkasingi PWSS(NEW)",
+        "localName": "Hurkasingi PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33516",
+        "villageName": "Khurshapakhiri Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019163",
+        "ddrName": "Hurkasingi PWSS(NEW)",
+        "projectId": "30019163",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hurkasingi PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041854",
+      "name": "KOLABARI PWSS (NEW)",
+      "description": "KOLABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOLABARI PWSS (NEW)",
+        "localName": "KOLABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33513",
+        "villageName": "Kolabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041854",
+        "ddrName": "KOLABARI PWSS (NEW)",
+        "projectId": "30041854",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOLABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8186783",
+      "name": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+      "description": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+        "localName": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33514",
+        "villageName": "Kursapakhri Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8186783",
+        "ddrName": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+        "projectId": "8186783",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069230",
+      "name": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+      "description": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+        "localName": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22464",
+        "panchayatname": "Hashdoba",
+        "villageCode": "33514",
+        "villageName": "Kursapakhri Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069230",
+        "ddrName": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+        "projectId": "30069230",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071208",
+      "name": "BAMUNER BHITA PWSS (NEW)",
+      "description": "BAMUNER BHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNER BHITA PWSS (NEW)",
+        "localName": "BAMUNER BHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33461",
+        "villageName": "Bamunervita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071208",
+        "ddrName": "BAMUNER BHITA PWSS (NEW)",
+        "projectId": "30071208",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNER BHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898570",
+      "name": "SHIALKANDA PWSS ( SWAJAL)",
+      "description": "SHIALKANDA PWSS ( SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SHIALKANDA PWSS ( SWAJAL)",
+        "localName": "SHIALKANDA PWSS ( SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33461",
+        "villageName": "Bamunervita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898570",
+        "ddrName": "SHIALKANDA PWSS ( SWAJAL)",
+        "projectId": "7898570",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SHIALKANDA PWSS ( SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071569",
+      "name": "CHARAKPARA PWSS (NEW)",
+      "description": "CHARAKPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHARAKPARA PWSS (NEW)",
+        "localName": "CHARAKPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33461",
+        "villageName": "Bamunervita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071569",
+        "ddrName": "CHARAKPARA PWSS (NEW)",
+        "projectId": "30071569",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHARAKPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3385844",
+      "name": "Banyaguri PWSS",
+      "description": "Banyaguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Banyaguri PWSS",
+        "localName": "Banyaguri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33469",
+        "villageName": "Bannyguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3385844",
+        "ddrName": "Banyaguri PWSS",
+        "projectId": "3385844",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Banyaguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166670",
+      "name": "BANYAGURI BAZAR PWSS (NEW)",
+      "description": "BANYAGURI BAZAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANYAGURI BAZAR PWSS (NEW)",
+        "localName": "BANYAGURI BAZAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33469",
+        "villageName": "Bannyguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166670",
+        "ddrName": "BANYAGURI BAZAR PWSS (NEW)",
+        "projectId": "30166670",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANYAGURI BAZAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159851",
+      "name": "Retrofitting of BANYAGURI PWSS",
+      "description": "Retrofitting of BANYAGURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BANYAGURI PWSS",
+        "localName": "Retrofitting of BANYAGURI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33469",
+        "villageName": "Bannyguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159851",
+        "ddrName": "Retrofitting of BANYAGURI PWSS",
+        "projectId": "8159851",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BANYAGURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067830",
+      "name": "BANYAGURI BEPARIPARA PWSS (NEW)",
+      "description": "BANYAGURI BEPARIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANYAGURI BEPARIPARA PWSS (NEW)",
+        "localName": "BANYAGURI BEPARIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33469",
+        "villageName": "Bannyguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067830",
+        "ddrName": "BANYAGURI BEPARIPARA PWSS (NEW)",
+        "projectId": "30067830",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANYAGURI BEPARIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150834",
+      "name": "CHOTO TANGBHITA PWSS (NEW)",
+      "description": "CHOTO TANGBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOTO TANGBHITA PWSS (NEW)",
+        "localName": "CHOTO TANGBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33464",
+        "villageName": "Barotang Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150834",
+        "ddrName": "CHOTO TANGBHITA PWSS (NEW)",
+        "projectId": "30150834",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOTO TANGBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043343",
+      "name": "BHALUKMARI PWSS (NEW)",
+      "description": "BHALUKMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKMARI PWSS (NEW)",
+        "localName": "BHALUKMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33457",
+        "villageName": "Bhalukmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043343",
+        "ddrName": "BHALUKMARI PWSS (NEW)",
+        "projectId": "30043343",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208644",
+      "name": "CHOTO UDMARI PWSS (NEW)",
+      "description": "CHOTO UDMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOTO UDMARI PWSS (NEW)",
+        "localName": "CHOTO UDMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33467",
+        "villageName": "Chatoudmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208644",
+        "ddrName": "CHOTO UDMARI PWSS (NEW)",
+        "projectId": "30208644",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOTO UDMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208033",
+      "name": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+      "description": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+        "localName": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33470",
+        "villageName": "Fashartari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208033",
+        "ddrName": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+        "projectId": "30208033",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167065",
+      "name": "JALESWAR BEEL PWSS (NEW)",
+      "description": "JALESWAR BEEL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JALESWAR BEEL PWSS (NEW)",
+        "localName": "JALESWAR BEEL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33456",
+        "villageName": "Jaleswar Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167065",
+        "ddrName": "JALESWAR BEEL PWSS (NEW)",
+        "projectId": "30167065",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JALESWAR BEEL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046241",
+      "name": "JALESWAR BEEL PUBPARA (NEW)",
+      "description": "JALESWAR BEEL PUBPARA (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JALESWAR BEEL PUBPARA (NEW)",
+        "localName": "JALESWAR BEEL PUBPARA (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33456",
+        "villageName": "Jaleswar Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046241",
+        "ddrName": "JALESWAR BEEL PUBPARA (NEW)",
+        "projectId": "30046241",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JALESWAR BEEL PUBPARA (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219100",
+      "name": "ROWARVITA PWSS (NEW)",
+      "description": "ROWARVITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROWARVITA PWSS (NEW)",
+        "localName": "ROWARVITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33465",
+        "villageName": "Rowarvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219100",
+        "ddrName": "ROWARVITA PWSS (NEW)",
+        "projectId": "30219100",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROWARVITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022854",
+      "name": "CHORPARA PWSS (NEW)",
+      "description": "CHORPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHORPARA PWSS (NEW)",
+        "localName": "CHORPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33458",
+        "villageName": "Shialkanda",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022854",
+        "ddrName": "CHORPARA PWSS (NEW)",
+        "projectId": "30022854",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHORPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075008",
+      "name": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+      "description": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+        "localName": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33458",
+        "villageName": "Shialkanda",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075008",
+        "ddrName": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+        "projectId": "30075008",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071202",
+      "name": "SIAL KANDA PWSS (NEW)",
+      "description": "SIAL KANDA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIAL KANDA PWSS (NEW)",
+        "localName": "SIAL KANDA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33458",
+        "villageName": "Shialkanda",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071202",
+        "ddrName": "SIAL KANDA PWSS (NEW)",
+        "projectId": "30071202",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIAL KANDA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189413",
+      "name": "TOKPARA M PWSS (NEW)",
+      "description": "TOKPARA M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TOKPARA M PWSS (NEW)",
+        "localName": "TOKPARA M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33458",
+        "villageName": "Shialkanda",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189413",
+        "ddrName": "TOKPARA M PWSS (NEW)",
+        "projectId": "30189413",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TOKPARA M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167107",
+      "name": "JALESWAR TAKIMARI PWSS (NEW)",
+      "description": "JALESWAR TAKIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JALESWAR TAKIMARI PWSS (NEW)",
+        "localName": "JALESWAR TAKIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33459",
+        "villageName": "Takimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167107",
+        "ddrName": "JALESWAR TAKIMARI PWSS (NEW)",
+        "projectId": "30167107",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JALESWAR TAKIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150785",
+      "name": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+      "description": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+        "localName": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33459",
+        "villageName": "Takimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150785",
+        "ddrName": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+        "projectId": "30150785",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071139",
+      "name": "TARIARBHITA PWSS (NEW)",
+      "description": "TARIARBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TARIARBHITA PWSS (NEW)",
+        "localName": "TARIARBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33460",
+        "villageName": "Tariar Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071139",
+        "ddrName": "TARIARBHITA PWSS (NEW)",
+        "projectId": "30071139",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TARIARBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036685",
+      "name": "UTTAR SATVENDI PWSS (NEW)",
+      "description": "UTTAR SATVENDI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UTTAR SATVENDI PWSS (NEW)",
+        "localName": "UTTAR SATVENDI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22455",
+        "panchayatname": "Jaleswar",
+        "villageCode": "33466",
+        "villageName": "Uttar Satvendi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036685",
+        "ddrName": "UTTAR SATVENDI PWSS (NEW)",
+        "projectId": "30036685",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UTTAR SATVENDI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150803",
+      "name": "BORO UDMARI PWSS (NEW)",
+      "description": "BORO UDMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORO UDMARI PWSS (NEW)",
+        "localName": "BORO UDMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33468",
+        "villageName": "Baroudmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150803",
+        "ddrName": "BORO UDMARI PWSS (NEW)",
+        "projectId": "30150803",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORO UDMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185693",
+      "name": "Jaleswar PWSS",
+      "description": "Jaleswar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jaleswar PWSS",
+        "localName": "Jaleswar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33497",
+        "villageName": "Basmura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185693",
+        "ddrName": "Jaleswar PWSS",
+        "projectId": "5185693",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jaleswar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019139",
+      "name": "Bashmura PWSS(NEW)",
+      "description": "Bashmura PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bashmura PWSS(NEW)",
+        "localName": "Bashmura PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33497",
+        "villageName": "Basmura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019139",
+        "ddrName": "Bashmura PWSS(NEW)",
+        "projectId": "30019139",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bashmura PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207883",
+      "name": "PASCHIM BASHMURA PWSS (NEW)",
+      "description": "PASCHIM BASHMURA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PASCHIM BASHMURA PWSS (NEW)",
+        "localName": "PASCHIM BASHMURA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33497",
+        "villageName": "Basmura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207883",
+        "ddrName": "PASCHIM BASHMURA PWSS (NEW)",
+        "projectId": "30207883",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PASCHIM BASHMURA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386322",
+      "name": "Damribhasa PWSS",
+      "description": "Damribhasa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Damribhasa PWSS",
+        "localName": "Damribhasa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33498",
+        "villageName": "Damribhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386322",
+        "ddrName": "Damribhasa PWSS",
+        "projectId": "3386322",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Damribhasa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019168",
+      "name": "Binyachal PWSS(NEW)",
+      "description": "Binyachal PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Binyachal PWSS(NEW)",
+        "localName": "Binyachal PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33498",
+        "villageName": "Damribhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019168",
+        "ddrName": "Binyachal PWSS(NEW)",
+        "projectId": "30019168",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Binyachal PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212973",
+      "name": "DAMRIBHASA TILAPARA PWSS (NEW)",
+      "description": "DAMRIBHASA TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMRIBHASA TILAPARA PWSS (NEW)",
+        "localName": "DAMRIBHASA TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33498",
+        "villageName": "Damribhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212973",
+        "ddrName": "DAMRIBHASA TILAPARA PWSS (NEW)",
+        "projectId": "30212973",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMRIBHASA TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159874",
+      "name": "Retrofitting of DAMRIBHASA PWSS",
+      "description": "Retrofitting of DAMRIBHASA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DAMRIBHASA PWSS",
+        "localName": "Retrofitting of DAMRIBHASA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33498",
+        "villageName": "Damribhasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159874",
+        "ddrName": "Retrofitting of DAMRIBHASA PWSS",
+        "projectId": "8159874",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DAMRIBHASA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067714",
+      "name": "DAMRIBHASA PT-I PWSS (NEW)",
+      "description": "DAMRIBHASA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMRIBHASA PT-I PWSS (NEW)",
+        "localName": "DAMRIBHASA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22461",
+        "panchayatname": "KATARIHARA",
+        "villageCode": "33498",
+        "villageName": "DAMRIBHASA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067714",
+        "ddrName": "DAMRIBHASA PT-I PWSS (NEW)",
+        "projectId": "30067714",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMRIBHASA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070606",
+      "name": "BELAPURI PWSS (NEW)",
+      "description": "BELAPURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BELAPURI PWSS (NEW)",
+        "localName": "BELAPURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070606",
+        "ddrName": "BELAPURI PWSS (NEW)",
+        "projectId": "30070606",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BELAPURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898571",
+      "name": "CHALAKURA PWSS (SWAJAL)",
+      "description": "CHALAKURA PWSS (SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHALAKURA PWSS (SWAJAL)",
+        "localName": "CHALAKURA PWSS (SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898571",
+        "ddrName": "CHALAKURA PWSS (SWAJAL)",
+        "projectId": "7898571",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHALAKURA PWSS (SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189455",
+      "name": "GARA PWSS (NEW)",
+      "description": "GARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARA PWSS (NEW)",
+        "localName": "GARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189455",
+        "ddrName": "GARA PWSS (NEW)",
+        "projectId": "30189455",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2421895",
+      "name": "Ghugudoba PWSS",
+      "description": "Ghugudoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ghugudoba PWSS",
+        "localName": "Ghugudoba PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2421895",
+        "ddrName": "Ghugudoba PWSS",
+        "projectId": "2421895",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ghugudoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159738",
+      "name": "Retrofitting of GHUGUDOBA PWSS",
+      "description": "Retrofitting of GHUGUDOBA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GHUGUDOBA PWSS",
+        "localName": "Retrofitting of GHUGUDOBA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159738",
+        "ddrName": "Retrofitting of GHUGUDOBA PWSS",
+        "projectId": "8159738",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GHUGUDOBA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30115208",
+      "name": "HARIBHANGA PWSS (NEW)",
+      "description": "HARIBHANGA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HARIBHANGA PWSS (NEW)",
+        "localName": "HARIBHANGA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30115208",
+        "ddrName": "HARIBHANGA PWSS (NEW)",
+        "projectId": "30115208",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HARIBHANGA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073354",
+      "name": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+      "description": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+        "localName": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073354",
+        "ddrName": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+        "projectId": "30073354",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207990",
+      "name": "THANGURIPARA PWSS (NEW)",
+      "description": "THANGURIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THANGURIPARA PWSS (NEW)",
+        "localName": "THANGURIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33501",
+        "villageName": "Ghugudoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207990",
+        "ddrName": "THANGURIPARA PWSS (NEW)",
+        "projectId": "30207990",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THANGURIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213135",
+      "name": "KATARIHARA SARAKPARA PWSS (NEW)",
+      "description": "KATARIHARA SARAKPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATARIHARA SARAKPARA PWSS (NEW)",
+        "localName": "KATARIHARA SARAKPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33496",
+        "villageName": "Katarihara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213135",
+        "ddrName": "KATARIHARA SARAKPARA PWSS (NEW)",
+        "projectId": "30213135",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATARIHARA SARAKPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30021475",
+      "name": "KATARIHARA PWSS (NEW)",
+      "description": "KATARIHARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATARIHARA PWSS (NEW)",
+        "localName": "KATARIHARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33496",
+        "villageName": "Katarihara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30021475",
+        "ddrName": "KATARIHARA PWSS (NEW)",
+        "projectId": "30021475",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATARIHARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036696",
+      "name": "SINGAHARA PWSS (NEW)",
+      "description": "SINGAHARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGAHARA PWSS (NEW)",
+        "localName": "SINGAHARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33496",
+        "villageName": "Katarihara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036696",
+        "ddrName": "SINGAHARA PWSS (NEW)",
+        "projectId": "30036696",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGAHARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067707",
+      "name": "PUB KATARIHARA PWSS (NEW)",
+      "description": "PUB KATARIHARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB KATARIHARA PWSS (NEW)",
+        "localName": "PUB KATARIHARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33496",
+        "villageName": "Katarihara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067707",
+        "ddrName": "PUB KATARIHARA PWSS (NEW)",
+        "projectId": "30067707",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB KATARIHARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067803",
+      "name": "PACHIM KATARIHARA PWSS (NEW)",
+      "description": "PACHIM KATARIHARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM KATARIHARA PWSS (NEW)",
+        "localName": "PACHIM KATARIHARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33496",
+        "villageName": "Katarihara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067803",
+        "ddrName": "PACHIM KATARIHARA PWSS (NEW)",
+        "projectId": "30067803",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM KATARIHARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037050",
+      "name": "TEKONA PWSS (NEW)",
+      "description": "TEKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TEKONA PWSS (NEW)",
+        "localName": "TEKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22461",
+        "panchayatname": "Katarihara",
+        "villageCode": "33499",
+        "villageName": "Tekona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037050",
+        "ddrName": "TEKONA PWSS (NEW)",
+        "projectId": "30037050",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TEKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068218",
+      "name": "KATHURI PWSS (NEW)",
+      "description": "KATHURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATHURI PWSS (NEW)",
+        "localName": "KATHURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22459",
+        "panchayatname": "Kathuri",
+        "villageCode": "33489",
+        "villageName": "Kathuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068218",
+        "ddrName": "KATHURI PWSS (NEW)",
+        "projectId": "30068218",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATHURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218744",
+      "name": "PUB KATHURI PWSS (NEW)",
+      "description": "PUB KATHURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB KATHURI PWSS (NEW)",
+        "localName": "PUB KATHURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22459",
+        "panchayatname": "Kathuri",
+        "villageCode": "33489",
+        "villageName": "Kathuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218744",
+        "ddrName": "PUB KATHURI PWSS (NEW)",
+        "projectId": "30218744",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB KATHURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014990",
+      "name": "PACHIM KATHURI PWSS (NEW)",
+      "description": "PACHIM KATHURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM KATHURI PWSS (NEW)",
+        "localName": "PACHIM KATHURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22459",
+        "panchayatname": "Kathuri",
+        "villageCode": "33489",
+        "villageName": "Kathuri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014990",
+        "ddrName": "PACHIM KATHURI PWSS (NEW)",
+        "projectId": "30014990",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM KATHURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041866",
+      "name": "PUTHIMARI PWSS (NEW)",
+      "description": "PUTHIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUTHIMARI PWSS (NEW)",
+        "localName": "PUTHIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33447",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041866",
+        "ddrName": "PUTHIMARI PWSS (NEW)",
+        "projectId": "30041866",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUTHIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206457",
+      "name": "Retrofitting of BHERBHERY PWSS",
+      "description": "Retrofitting of BHERBHERY PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BHERBHERY PWSS",
+        "localName": "Retrofitting of BHERBHERY PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33447",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206457",
+        "ddrName": "Retrofitting of BHERBHERY PWSS",
+        "projectId": "8206457",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BHERBHERY PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076423",
+      "name": "BHERBHERI PACHIM GAON PWSS (NEW)",
+      "description": "BHERBHERI PACHIM GAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHERBHERI PACHIM GAON PWSS (NEW)",
+        "localName": "BHERBHERI PACHIM GAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33447",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076423",
+        "ddrName": "BHERBHERI PACHIM GAON PWSS (NEW)",
+        "projectId": "30076423",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHERBHERI PACHIM GAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041886",
+      "name": "MOTIKHOWA PWSS (NEW)",
+      "description": "MOTIKHOWA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOTIKHOWA PWSS (NEW)",
+        "localName": "MOTIKHOWA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33441",
+        "villageName": "Bhimkhaj",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041886",
+        "ddrName": "MOTIKHOWA PWSS (NEW)",
+        "projectId": "30041886",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOTIKHOWA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019151",
+      "name": "Bhimkhoj PWSS(NEW)",
+      "description": "Bhimkhoj PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhimkhoj PWSS(NEW)",
+        "localName": "Bhimkhoj PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33441",
+        "villageName": "Bhimkhaj",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019151",
+        "ddrName": "Bhimkhoj PWSS(NEW)",
+        "projectId": "30019151",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhimkhoj PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898573",
+      "name": "KURARPAR PWSS (SWAJAL)",
+      "description": "KURARPAR PWSS (SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KURARPAR PWSS (SWAJAL)",
+        "localName": "KURARPAR PWSS (SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33441",
+        "villageName": "Bhimkhaj",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898573",
+        "ddrName": "KURARPAR PWSS (SWAJAL)",
+        "projectId": "7898573",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KURARPAR PWSS (SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060173",
+      "name": "KUKURAKATA PWSS (NEW)",
+      "description": "KUKURAKATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUKURAKATA PWSS (NEW)",
+        "localName": "KUKURAKATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33442",
+        "villageName": "Charaljhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060173",
+        "ddrName": "KUKURAKATA PWSS (NEW)",
+        "projectId": "30060173",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUKURAKATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060155",
+      "name": "JHARPARA PWSS (NEW)",
+      "description": "JHARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JHARPARA PWSS (NEW)",
+        "localName": "JHARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33442",
+        "villageName": "Charaljhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060155",
+        "ddrName": "JHARPARA PWSS (NEW)",
+        "projectId": "30060155",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JHARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041873",
+      "name": "CHARALJHAR PWSS (NEW)",
+      "description": "CHARALJHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHARALJHAR PWSS (NEW)",
+        "localName": "CHARALJHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33442",
+        "villageName": "Charaljhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041873",
+        "ddrName": "CHARALJHAR PWSS (NEW)",
+        "projectId": "30041873",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHARALJHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060146",
+      "name": "NATUNGAON PWSS (NEW)",
+      "description": "NATUNGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NATUNGAON PWSS (NEW)",
+        "localName": "NATUNGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33443",
+        "villageName": "Dapkarvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060146",
+        "ddrName": "NATUNGAON PWSS (NEW)",
+        "projectId": "30060146",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NATUNGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191837",
+      "name": "MANDALPARA PWSS (NEW)",
+      "description": "MANDALPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANDALPARA PWSS (NEW)",
+        "localName": "MANDALPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33443",
+        "villageName": "Dapkarvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191837",
+        "ddrName": "MANDALPARA PWSS (NEW)",
+        "projectId": "30191837",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANDALPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060169",
+      "name": "DAKARBHITA PWSS (NEW)",
+      "description": "DAKARBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAKARBHITA PWSS (NEW)",
+        "localName": "DAKARBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33443",
+        "villageName": "Dapkarvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060169",
+        "ddrName": "DAKARBHITA PWSS (NEW)",
+        "projectId": "30060169",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAKARBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041859",
+      "name": "KATLAMARI PWSS (NEW)",
+      "description": "KATLAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATLAMARI PWSS (NEW)",
+        "localName": "KATLAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33444",
+        "villageName": "Katlamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041859",
+        "ddrName": "KATLAMARI PWSS (NEW)",
+        "projectId": "30041859",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATLAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197098",
+      "name": "Retrofitting of KHALISABHITA PWSS",
+      "description": "Retrofitting of KHALISABHITA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHALISABHITA PWSS",
+        "localName": "Retrofitting of KHALISABHITA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33445",
+        "villageName": "Khalisavita Hindupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197098",
+        "ddrName": "Retrofitting of KHALISABHITA PWSS",
+        "projectId": "8197098",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHALISABHITA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30146239",
+      "name": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+      "description": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+        "localName": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33446",
+        "villageName": "Khalisavita Muslimpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30146239",
+        "ddrName": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+        "projectId": "30146239",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076417",
+      "name": "KHALISAVITA PT-I PWSS (NEW)",
+      "description": "KHALISAVITA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHALISAVITA PT-I PWSS (NEW)",
+        "localName": "KHALISAVITA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33446",
+        "villageName": "Khalisavita Muslimpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076417",
+        "ddrName": "KHALISAVITA PT-I PWSS (NEW)",
+        "projectId": "30076417",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHALISAVITA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060151",
+      "name": "SATSIAKHAMAR PWSS (NEW)",
+      "description": "SATSIAKHAMAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SATSIAKHAMAR PWSS (NEW)",
+        "localName": "SATSIAKHAMAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33448",
+        "villageName": "Satsia Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060151",
+        "ddrName": "SATSIAKHAMAR PWSS (NEW)",
+        "projectId": "30060151",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SATSIAKHAMAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191855",
+      "name": "PAMER BOLA PWSS (NEW)",
+      "description": "PAMER BOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAMER BOLA PWSS (NEW)",
+        "localName": "PAMER BOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22453",
+        "panchayatname": "Kholisarbhita",
+        "villageCode": "33448",
+        "villageName": "Satsia Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191855",
+        "ddrName": "PAMER BOLA PWSS (NEW)",
+        "projectId": "30191855",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAMER BOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189424",
+      "name": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+      "description": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+        "localName": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33482",
+        "villageName": "Bakpara Dineralga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189424",
+        "ddrName": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+        "projectId": "30189424",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189537",
+      "name": "CHIALDHORA SPB M PWSS (NEW)",
+      "description": "CHIALDHORA SPB M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHIALDHORA SPB M PWSS (NEW)",
+        "localName": "CHIALDHORA SPB M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33480",
+        "villageName": "Chaildhara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189537",
+        "ddrName": "CHIALDHORA SPB M PWSS (NEW)",
+        "projectId": "30189537",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHIALDHORA SPB M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191686",
+      "name": "CHERGERALGA SPB M PWSS (NEW)",
+      "description": "CHERGERALGA SPB M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHERGERALGA SPB M PWSS (NEW)",
+        "localName": "CHERGERALGA SPB M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33479",
+        "villageName": "Chergeralga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191686",
+        "ddrName": "CHERGERALGA SPB M PWSS (NEW)",
+        "projectId": "30191686",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHERGERALGA SPB M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191713",
+      "name": "FULKAKATA SPB M PWSS (NEW)",
+      "description": "FULKAKATA SPB M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FULKAKATA SPB M PWSS (NEW)",
+        "localName": "FULKAKATA SPB M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33481",
+        "villageName": "Fulkakata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191713",
+        "ddrName": "FULKAKATA SPB M PWSS (NEW)",
+        "projectId": "30191713",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FULKAKATA SPB M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189526",
+      "name": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+      "description": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+        "localName": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33483",
+        "villageName": "Ghunimari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189526",
+        "ddrName": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+        "projectId": "30189526",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191941",
+      "name": "PATAKATA PT-I SPB PWSS (NEW)",
+      "description": "PATAKATA PT-I SPB PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PATAKATA PT-I SPB PWSS (NEW)",
+        "localName": "PATAKATA PT-I SPB PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33485",
+        "villageName": "Pathakata Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191941",
+        "ddrName": "PATAKATA PT-I SPB PWSS (NEW)",
+        "projectId": "30191941",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PATAKATA PT-I SPB PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191743",
+      "name": "RAYCHANDCHAR SPB PWSS (NEW)",
+      "description": "RAYCHANDCHAR SPB PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAYCHANDCHAR SPB PWSS (NEW)",
+        "localName": "RAYCHANDCHAR SPB PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22457",
+        "panchayatname": "Monkala Chaildhara",
+        "villageCode": "33484",
+        "villageName": "Raichander Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191743",
+        "ddrName": "RAYCHANDCHAR SPB PWSS (NEW)",
+        "projectId": "30191743",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAYCHANDCHAR SPB PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3384921",
+      "name": "Dhobakura PWSS",
+      "description": "Dhobakura PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhobakura PWSS",
+        "localName": "Dhobakura PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33508",
+        "villageName": "Dhobakura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3384921",
+        "ddrName": "Dhobakura PWSS",
+        "projectId": "3384921",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhobakura PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218745",
+      "name": "DHOBAKURA SANTIPUR PWSS (NEW)",
+      "description": "DHOBAKURA SANTIPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHOBAKURA SANTIPUR PWSS (NEW)",
+        "localName": "DHOBAKURA SANTIPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33508",
+        "villageName": "Dhobakura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218745",
+        "ddrName": "DHOBAKURA SANTIPUR PWSS (NEW)",
+        "projectId": "30218745",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHOBAKURA SANTIPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073485",
+      "name": "KAWRA PWSS (NEW)",
+      "description": "KAWRA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAWRA PWSS (NEW)",
+        "localName": "KAWRA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33508",
+        "villageName": "Dhobakura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073485",
+        "ddrName": "KAWRA PWSS (NEW)",
+        "projectId": "30073485",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAWRA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067861",
+      "name": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+      "description": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+        "localName": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33508",
+        "villageName": "Dhobakura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067861",
+        "ddrName": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+        "projectId": "30067861",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019535",
+      "name": "Dhubakura Pubpara PWSS(NEW)",
+      "description": "Dhubakura Pubpara PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhubakura Pubpara PWSS(NEW)",
+        "localName": "Dhubakura Pubpara PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33508",
+        "villageName": "Dhobakura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019535",
+        "ddrName": "Dhubakura Pubpara PWSS(NEW)",
+        "projectId": "30019535",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhubakura Pubpara PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30066198",
+      "name": "KESARAPARA PWSS (NEW)",
+      "description": "KESARAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KESARAPARA PWSS (NEW)",
+        "localName": "KESARAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33509",
+        "villageName": "Kesarapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30066198",
+        "ddrName": "KESARAPARA PWSS (NEW)",
+        "projectId": "30066198",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KESARAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189431",
+      "name": "BAGUN TULI PWSS",
+      "description": "BAGUN TULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUN TULI PWSS",
+        "localName": "BAGUN TULI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189431",
+        "ddrName": "BAGUN TULI PWSS",
+        "projectId": "30189431",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUN TULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30129382",
+      "name": "BAISA PWSS (NEW)",
+      "description": "BAISA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAISA PWSS (NEW)",
+        "localName": "BAISA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30129382",
+        "ddrName": "BAISA PWSS (NEW)",
+        "projectId": "30129382",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAISA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067928",
+      "name": "KASHIKATA PWSS (NEW)",
+      "description": "KASHIKATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KASHIKATA PWSS (NEW)",
+        "localName": "KASHIKATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067928",
+        "ddrName": "KASHIKATA PWSS (NEW)",
+        "projectId": "30067928",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KASHIKATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019121",
+      "name": "Kharubhaj Bazar PWSS(NEW)",
+      "description": "Kharubhaj Bazar PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kharubhaj Bazar PWSS(NEW)",
+        "localName": "Kharubhaj Bazar PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019121",
+        "ddrName": "Kharubhaj Bazar PWSS(NEW)",
+        "projectId": "30019121",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kharubhaj Bazar PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189496",
+      "name": "NALGARA PWSS (NEW)",
+      "description": "NALGARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NALGARA PWSS (NEW)",
+        "localName": "NALGARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189496",
+        "ddrName": "NALGARA PWSS (NEW)",
+        "projectId": "30189496",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NALGARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126500",
+      "name": "NAMA FALIMARI PWSS (NEW)",
+      "description": "NAMA FALIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAMA FALIMARI PWSS (NEW)",
+        "localName": "NAMA FALIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126500",
+        "ddrName": "NAMA FALIMARI PWSS (NEW)",
+        "projectId": "30126500",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAMA FALIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898568",
+      "name": "SALPARA PWSS (SWAJAL)",
+      "description": "SALPARA PWSS (SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALPARA PWSS (SWAJAL)",
+        "localName": "SALPARA PWSS (SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33510",
+        "villageName": "Kharuvas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898568",
+        "ddrName": "SALPARA PWSS (SWAJAL)",
+        "projectId": "7898568",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALPARA PWSS (SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218738",
+      "name": "CHOLARCHARPARA PWSS",
+      "description": "CHOLARCHARPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOLARCHARPARA PWSS",
+        "localName": "CHOLARCHARPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33507",
+        "villageName": "Rajmitapantai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218738",
+        "ddrName": "CHOLARCHARPARA PWSS",
+        "projectId": "30218738",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOLARCHARPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5464413",
+      "name": "Rajmita PWSS",
+      "description": "Rajmita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rajmita PWSS",
+        "localName": "Rajmita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33507",
+        "villageName": "Rajmitapantai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5464413",
+        "ddrName": "Rajmita PWSS",
+        "projectId": "5464413",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rajmita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207980",
+      "name": "MUGALPARA PWSS (NEW)",
+      "description": "MUGALPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUGALPARA PWSS (NEW)",
+        "localName": "MUGALPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "villageCode": "33507",
+        "villageName": "Rajmitapantai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207980",
+        "ddrName": "MUGALPARA PWSS (NEW)",
+        "projectId": "30207980",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUGALPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159747",
+      "name": "Retrofitting of CHATAIMARI PWSS",
+      "description": "Retrofitting of CHATAIMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHATAIMARI PWSS",
+        "localName": "Retrofitting of CHATAIMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33449",
+        "villageName": "Chataimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159747",
+        "ddrName": "Retrofitting of CHATAIMARI PWSS",
+        "projectId": "8159747",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHATAIMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1941750",
+      "name": "Chataimari PWSS",
+      "description": "Chataimari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chataimari PWSS",
+        "localName": "Chataimari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33449",
+        "villageName": "Chataimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1941750",
+        "ddrName": "Chataimari PWSS",
+        "projectId": "1941750",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chataimari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036706",
+      "name": "EKLA SALBARI PWSS (NEW)",
+      "description": "EKLA SALBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "EKLA SALBARI PWSS (NEW)",
+        "localName": "EKLA SALBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33450",
+        "villageName": "Eklasalbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036706",
+        "ddrName": "EKLA SALBARI PWSS (NEW)",
+        "projectId": "30036706",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "EKLA SALBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898574",
+      "name": "PACHPARA PWSS (SWAJAL)",
+      "description": "PACHPARA PWSS (SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHPARA PWSS (SWAJAL)",
+        "localName": "PACHPARA PWSS (SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33450",
+        "villageName": "Eklasalbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898574",
+        "ddrName": "PACHPARA PWSS (SWAJAL)",
+        "projectId": "7898574",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHPARA PWSS (SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060114",
+      "name": "GAROJAN NO.3 PWSS (NEW)",
+      "description": "GAROJAN NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROJAN NO.3 PWSS (NEW)",
+        "localName": "GAROJAN NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22454",
+        "panchayatname": "SIMLABARI",
+        "villageCode": "33451",
+        "villageName": "GAROJAN",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060114",
+        "ddrName": "GAROJAN NO.3 PWSS (NEW)",
+        "projectId": "30060114",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROJAN NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30192045",
+      "name": "Garojan No.2 PWSS (NEW)",
+      "description": "Garojan No.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Garojan No.2 PWSS (NEW)",
+        "localName": "Garojan No.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22454",
+        "panchayatname": "SIMLABARI",
+        "villageCode": "33451",
+        "villageName": "GAROJAN",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30192045",
+        "ddrName": "Garojan No.2 PWSS (NEW)",
+        "projectId": "30192045",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Garojan No.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30192026",
+      "name": "GAROJAN NO.1 PWSS (NEW)",
+      "description": "GAROJAN NO.1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROJAN NO.1 PWSS (NEW)",
+        "localName": "GAROJAN NO.1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33451",
+        "villageName": "Garojan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30192026",
+        "ddrName": "GAROJAN NO.1 PWSS (NEW)",
+        "projectId": "30192026",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROJAN NO.1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30191765",
+      "name": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+      "description": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+        "localName": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33453",
+        "villageName": "Ghunghunivita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30191765",
+        "ddrName": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+        "projectId": "30191765",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160367",
+      "name": "Retrofitting of GUMAIJHAR PWSS",
+      "description": "Retrofitting of GUMAIJHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GUMAIJHAR PWSS",
+        "localName": "Retrofitting of GUMAIJHAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33452",
+        "villageName": "Gumaijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160367",
+        "ddrName": "Retrofitting of GUMAIJHAR PWSS",
+        "projectId": "8160367",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GUMAIJHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1941769",
+      "name": "Gumaijhar PWSS",
+      "description": "Gumaijhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gumaijhar PWSS",
+        "localName": "Gumaijhar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33452",
+        "villageName": "Gumaijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1941769",
+        "ddrName": "Gumaijhar PWSS",
+        "projectId": "1941769",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gumaijhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30192129",
+      "name": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+      "description": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+        "localName": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33452",
+        "villageName": "Gumaijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30192129",
+        "ddrName": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+        "projectId": "30192129",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218742",
+      "name": "GUMAIJHAR SASAN (NEW)",
+      "description": "GUMAIJHAR SASAN (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GUMAIJHAR SASAN (NEW)",
+        "localName": "GUMAIJHAR SASAN (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22454",
+        "panchayatname": "SIMLABARI",
+        "villageCode": "33452",
+        "villageName": "GUMAIJHAR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218742",
+        "ddrName": "GUMAIJHAR SASAN (NEW)",
+        "projectId": "30218742",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GUMAIJHAR SASAN (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218743",
+      "name": "GAROKHUTA PWSS (NEW)",
+      "description": "GAROKHUTA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROKHUTA PWSS (NEW)",
+        "localName": "GAROKHUTA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22454",
+        "panchayatname": "SIMLABARI",
+        "villageCode": "33454",
+        "villageName": "RAKHALKILLAH",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218743",
+        "ddrName": "GAROKHUTA PWSS (NEW)",
+        "projectId": "30218743",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROKHUTA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30064490",
+      "name": "PASERGAON PWSS (NEW)",
+      "description": "PASERGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PASERGAON PWSS (NEW)",
+        "localName": "PASERGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33454",
+        "villageName": "Rakhalkillah",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30064490",
+        "ddrName": "PASERGAON PWSS (NEW)",
+        "projectId": "30064490",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PASERGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020635",
+      "name": "RAKHALKILLAH PWSS (NEW)",
+      "description": "RAKHALKILLAH PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKHALKILLAH PWSS (NEW)",
+        "localName": "RAKHALKILLAH PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33454",
+        "villageName": "Rakhalkillah",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020635",
+        "ddrName": "RAKHALKILLAH PWSS (NEW)",
+        "projectId": "30020635",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKHALKILLAH PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30036712",
+      "name": "FULGASA PWSS (NEW)",
+      "description": "FULGASA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FULGASA PWSS (NEW)",
+        "localName": "FULGASA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33455",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30036712",
+        "ddrName": "FULGASA PWSS (NEW)",
+        "projectId": "30036712",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FULGASA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30192070",
+      "name": "HALOIPARA PWSS (NEW)",
+      "description": "HALOIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HALOIPARA PWSS (NEW)",
+        "localName": "HALOIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33455",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30192070",
+        "ddrName": "HALOIPARA PWSS (NEW)",
+        "projectId": "30192070",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HALOIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218741",
+      "name": "BHANGRPAR PWSS (NEW)",
+      "description": "BHANGRPAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHANGRPAR PWSS (NEW)",
+        "localName": "BHANGRPAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22454",
+        "panchayatname": "SIMLABARI",
+        "villageCode": "33455",
+        "villageName": "SIMLABARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218741",
+        "ddrName": "BHANGRPAR PWSS (NEW)",
+        "projectId": "30218741",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHANGRPAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014992",
+      "name": "KHERBARI (Jaleswar) PWSS (NEW)",
+      "description": "KHERBARI (Jaleswar) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHERBARI (Jaleswar) PWSS (NEW)",
+        "localName": "KHERBARI (Jaleswar) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33455",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014992",
+        "ddrName": "KHERBARI (Jaleswar) PWSS (NEW)",
+        "projectId": "30014992",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHERBARI (Jaleswar) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167121",
+      "name": "KOLABORI PWSS (Simlabari) (NEW)",
+      "description": "KOLABORI PWSS (Simlabari) (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOLABORI PWSS (Simlabari) (NEW)",
+        "localName": "KOLABORI PWSS (Simlabari) (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33455",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167121",
+        "ddrName": "KOLABORI PWSS (Simlabari) (NEW)",
+        "projectId": "30167121",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOLABORI PWSS (Simlabari) (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019135",
+      "name": "Simlabari Bazar PWSS(NEW)",
+      "description": "Simlabari Bazar PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Simlabari Bazar PWSS(NEW)",
+        "localName": "Simlabari Bazar PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22454",
+        "panchayatname": "Simlabari",
+        "villageCode": "33455",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019135",
+        "ddrName": "Simlabari Bazar PWSS(NEW)",
+        "projectId": "30019135",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Simlabari Bazar PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014991",
+      "name": "MANASPARA RESERVE PWSS (NEW)",
+      "description": "MANASPARA RESERVE PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANASPARA RESERVE PWSS (NEW)",
+        "localName": "MANASPARA RESERVE PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33487",
+        "villageName": "Manaspara Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014991",
+        "ddrName": "MANASPARA RESERVE PWSS (NEW)",
+        "projectId": "30014991",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANASPARA RESERVE PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060178",
+      "name": "MANASPARA SALAKURA PWSS (NEW)",
+      "description": "MANASPARA SALAKURA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANASPARA SALAKURA PWSS (NEW)",
+        "localName": "MANASPARA SALAKURA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33487",
+        "villageName": "Manaspara Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060178",
+        "ddrName": "MANASPARA SALAKURA PWSS (NEW)",
+        "projectId": "30060178",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANASPARA SALAKURA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30158752",
+      "name": "MANASPARA SIMULKANDI PWSS (NEW)",
+      "description": "MANASPARA SIMULKANDI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANASPARA SIMULKANDI PWSS (NEW)",
+        "localName": "MANASPARA SIMULKANDI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33487",
+        "villageName": "Manaspara Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30158752",
+        "ddrName": "MANASPARA SIMULKANDI PWSS (NEW)",
+        "projectId": "30158752",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANASPARA SIMULKANDI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872806",
+      "name": "Simulkandi PWSS",
+      "description": "Simulkandi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Simulkandi PWSS",
+        "localName": "Simulkandi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33488",
+        "villageName": "Simulkandi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872806",
+        "ddrName": "Simulkandi PWSS",
+        "projectId": "4872806",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Simulkandi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189562",
+      "name": "BIDYAPARA PWSS (NEW)",
+      "description": "BIDYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BIDYAPARA PWSS (NEW)",
+        "localName": "BIDYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189562",
+        "ddrName": "BIDYAPARA PWSS (NEW)",
+        "projectId": "30189562",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BIDYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042959",
+      "name": "BORBILA PWSS (NEW)",
+      "description": "BORBILA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORBILA PWSS (NEW)",
+        "localName": "BORBILA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042959",
+        "ddrName": "BORBILA PWSS (NEW)",
+        "projectId": "30042959",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORBILA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189571",
+      "name": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+      "description": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+        "localName": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189571",
+        "ddrName": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+        "projectId": "30189571",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159963",
+      "name": "Retrofitting of SIMULKANDI PWSS",
+      "description": "Retrofitting of SIMULKANDI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SIMULKANDI PWSS",
+        "localName": "Retrofitting of SIMULKANDI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159963",
+        "ddrName": "Retrofitting of SIMULKANDI PWSS",
+        "projectId": "8159963",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SIMULKANDI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067101",
+      "name": "TAKIMARI RESERVE PWSS (NEW)",
+      "description": "TAKIMARI RESERVE PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TAKIMARI RESERVE PWSS (NEW)",
+        "localName": "TAKIMARI RESERVE PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067101",
+        "ddrName": "TAKIMARI RESERVE PWSS (NEW)",
+        "projectId": "30067101",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TAKIMARI RESERVE PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218739",
+      "name": "KARAYAPARA PWSS (NEW)",
+      "description": "KARAYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARAYAPARA PWSS (NEW)",
+        "localName": "KARAYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218739",
+        "ddrName": "KARAYAPARA PWSS (NEW)",
+        "projectId": "30218739",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARAYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070166",
+      "name": "KARMAKARPARA PWSS (NEW)",
+      "description": "KARMAKARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARMAKARPARA PWSS (NEW)",
+        "localName": "KARMAKARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070166",
+        "ddrName": "KARMAKARPARA PWSS (NEW)",
+        "projectId": "30070166",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARMAKARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189551",
+      "name": "Mothabari PWSS (NEW) (Takimari)",
+      "description": "Mothabari PWSS (NEW) (Takimari)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mothabari PWSS (NEW) (Takimari)",
+        "localName": "Mothabari PWSS (NEW) (Takimari)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189551",
+        "ddrName": "Mothabari PWSS (NEW) (Takimari)",
+        "projectId": "30189551",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mothabari PWSS (NEW) (Takimari)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218740",
+      "name": "RATANGAON PWSS (NEW)",
+      "description": "RATANGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RATANGAON PWSS (NEW)",
+        "localName": "RATANGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22458",
+        "panchayatname": "Takimari",
+        "villageCode": "33486",
+        "villageName": "Takimari Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218740",
+        "ddrName": "RATANGAON PWSS (NEW)",
+        "projectId": "30218740",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RATANGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063294",
+      "name": "CHILARBHITA PWSS (NEW)",
+      "description": "CHILARBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHILARBHITA PWSS (NEW)",
+        "localName": "CHILARBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33474",
+        "villageName": "Chilarvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063294",
+        "ddrName": "CHILARBHITA PWSS (NEW)",
+        "projectId": "30063294",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHILARBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8176558",
+      "name": "Retrofitting of TARANGAPUR BAZAR PWSS",
+      "description": "Retrofitting of TARANGAPUR BAZAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TARANGAPUR BAZAR PWSS",
+        "localName": "Retrofitting of TARANGAPUR BAZAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33475",
+        "villageName": "Chotogandua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8176558",
+        "ddrName": "Retrofitting of TARANGAPUR BAZAR PWSS",
+        "projectId": "8176558",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TARANGAPUR BAZAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3384885",
+      "name": "Tarangapur Bazar PWSS",
+      "description": "Tarangapur Bazar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarangapur Bazar PWSS",
+        "localName": "Tarangapur Bazar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33475",
+        "villageName": "Chotogandua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3384885",
+        "ddrName": "Tarangapur Bazar PWSS",
+        "projectId": "3384885",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarangapur Bazar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019154",
+      "name": "Mowamari PWSS(NEW)",
+      "description": "Mowamari PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mowamari PWSS(NEW)",
+        "localName": "Mowamari PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33472",
+        "villageName": "Moamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019154",
+        "ddrName": "Mowamari PWSS(NEW)",
+        "projectId": "30019154",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mowamari PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070302",
+      "name": "SARDARBHITA PWSS (NEW)",
+      "description": "SARDARBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SARDARBHITA PWSS (NEW)",
+        "localName": "SARDARBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "JALESWAR",
+        "panchayatcode": "22456",
+        "panchayatname": "TARANGAPUR",
+        "villageCode": "33500",
+        "villageName": "SARDARVITA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070302",
+        "ddrName": "SARDARBHITA PWSS (NEW)",
+        "projectId": "30070302",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SARDARBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071579",
+      "name": "FEISHERTARY PWSS (NEW)",
+      "description": "FEISHERTARY PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FEISHERTARY PWSS (NEW)",
+        "localName": "FEISHERTARY PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33471",
+        "villageName": "Superivita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071579",
+        "ddrName": "FEISHERTARY PWSS (NEW)",
+        "projectId": "30071579",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FEISHERTARY PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2423434",
+      "name": "Superibhita PWSS",
+      "description": "Superibhita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Superibhita PWSS",
+        "localName": "Superibhita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33471",
+        "villageName": "Superivita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2423434",
+        "ddrName": "Superibhita PWSS",
+        "projectId": "2423434",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Superibhita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067938",
+      "name": "DAKHIN TARANGAPUR PWSS (NEW)",
+      "description": "DAKHIN TARANGAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAKHIN TARANGAPUR PWSS (NEW)",
+        "localName": "DAKHIN TARANGAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33473",
+        "villageName": "Tarangapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067938",
+        "ddrName": "DAKHIN TARANGAPUR PWSS (NEW)",
+        "projectId": "30067938",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAKHIN TARANGAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167130",
+      "name": "PUB TARANGAPUR PWSS (NEW)",
+      "description": "PUB TARANGAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB TARANGAPUR PWSS (NEW)",
+        "localName": "PUB TARANGAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33473",
+        "villageName": "Tarangapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167130",
+        "ddrName": "PUB TARANGAPUR PWSS (NEW)",
+        "projectId": "30167130",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB TARANGAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019144",
+      "name": "Uttar Tarangapur PWSS(NEW)",
+      "description": "Uttar Tarangapur PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Uttar Tarangapur PWSS(NEW)",
+        "localName": "Uttar Tarangapur PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33473",
+        "villageName": "Tarangapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019144",
+        "ddrName": "Uttar Tarangapur PWSS(NEW)",
+        "projectId": "30019144",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Uttar Tarangapur PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019544",
+      "name": "Jobdarvita PWSS(NEW)",
+      "description": "Jobdarvita PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jobdarvita PWSS(NEW)",
+        "localName": "Jobdarvita PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33473",
+        "villageName": "Tarangapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019544",
+        "ddrName": "Jobdarvita PWSS(NEW)",
+        "projectId": "30019544",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jobdarvita PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186420",
+      "name": "Tarangapur PWSS",
+      "description": "Tarangapur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tarangapur PWSS",
+        "localName": "Tarangapur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33473",
+        "villageName": "Tarangapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186420",
+        "ddrName": "Tarangapur PWSS",
+        "projectId": "5186420",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tarangapur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140232",
+      "name": "PACHIM TARANGAPUR PWSS (NEW)",
+      "description": "PACHIM TARANGAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM TARANGAPUR PWSS (NEW)",
+        "localName": "PACHIM TARANGAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22456",
+        "panchayatname": "Tarangapur",
+        "villageCode": "33473",
+        "villageName": "Tarangapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140232",
+        "ddrName": "PACHIM TARANGAPUR PWSS (NEW)",
+        "projectId": "30140232",
+        "regionName": "1190"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM TARANGAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022702",
+      "name": "KONAICHAPARA PWSS(NEW)",
+      "description": "KONAICHAPARA PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KONAICHAPARA PWSS(NEW)",
+        "localName": "KONAICHAPARA PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33355",
+        "villageName": "Ambari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022702",
+        "ddrName": "KONAICHAPARA PWSS(NEW)",
+        "projectId": "30022702",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KONAICHAPARA PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070375",
+      "name": "AMBARI PACHIM PWSS (NEW)",
+      "description": "AMBARI PACHIM PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMBARI PACHIM PWSS (NEW)",
+        "localName": "AMBARI PACHIM PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33355",
+        "villageName": "Ambari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070375",
+        "ddrName": "AMBARI PACHIM PWSS (NEW)",
+        "projectId": "30070375",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMBARI PACHIM PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203629",
+      "name": "Retrofitting of AMBARI BAGUAN PWSS",
+      "description": "Retrofitting of AMBARI BAGUAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AMBARI BAGUAN PWSS",
+        "localName": "Retrofitting of AMBARI BAGUAN PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33355",
+        "villageName": "Ambari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203629",
+        "ddrName": "Retrofitting of AMBARI BAGUAN PWSS",
+        "projectId": "8203629",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AMBARI BAGUAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186387",
+      "name": "Ambari Baguan PWSS",
+      "description": "Ambari Baguan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ambari Baguan PWSS",
+        "localName": "Ambari Baguan PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33355",
+        "villageName": "Ambari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186387",
+        "ddrName": "Ambari Baguan PWSS",
+        "projectId": "5186387",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ambari Baguan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038913",
+      "name": "AMBARI PUB PWSS (NEW)",
+      "description": "AMBARI PUB PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMBARI PUB PWSS (NEW)",
+        "localName": "AMBARI PUB PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33355",
+        "villageName": "Ambari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038913",
+        "ddrName": "AMBARI PUB PWSS (NEW)",
+        "projectId": "30038913",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMBARI PUB PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188761",
+      "name": "KADOTIKA PWSS (NEW)",
+      "description": "KADOTIKA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KADOTIKA PWSS (NEW)",
+        "localName": "KADOTIKA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33361",
+        "villageName": "Kadotika",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188761",
+        "ddrName": "KADOTIKA PWSS (NEW)",
+        "projectId": "30188761",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KADOTIKA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188524",
+      "name": "KADOTIKA PATHALIPARA PWSS (NEW)",
+      "description": "KADOTIKA PATHALIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KADOTIKA PATHALIPARA PWSS (NEW)",
+        "localName": "KADOTIKA PATHALIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33361",
+        "villageName": "Kadotika",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188524",
+        "ddrName": "KADOTIKA PATHALIPARA PWSS (NEW)",
+        "projectId": "30188524",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KADOTIKA PATHALIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30196757",
+      "name": "KALYANPUR PACHIMPARA PWSS (NEW)",
+      "description": "KALYANPUR PACHIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALYANPUR PACHIMPARA PWSS (NEW)",
+        "localName": "KALYANPUR PACHIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33356",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30196757",
+        "ddrName": "KALYANPUR PACHIMPARA PWSS (NEW)",
+        "projectId": "30196757",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALYANPUR PACHIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185717",
+      "name": "Kalyanpur PWSS",
+      "description": "Kalyanpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalyanpur PWSS",
+        "localName": "Kalyanpur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33356",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185717",
+        "ddrName": "Kalyanpur PWSS",
+        "projectId": "5185717",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalyanpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185707",
+      "name": "Kalyanpur PWSS",
+      "description": "Kalyanpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalyanpur PWSS",
+        "localName": "Kalyanpur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33356",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185707",
+        "ddrName": "Kalyanpur PWSS",
+        "projectId": "5185707",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalyanpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156157",
+      "name": "Retrofitting of KALYANPUR pwss",
+      "description": "Retrofitting of KALYANPUR pwss",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KALYANPUR pwss",
+        "localName": "Retrofitting of KALYANPUR pwss",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33356",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156157",
+        "ddrName": "Retrofitting of KALYANPUR pwss",
+        "projectId": "8156157",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KALYANPUR pwss",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219371",
+      "name": "Kalyanpur Pub PWSS (NEW)",
+      "description": "Kalyanpur Pub PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalyanpur Pub PWSS (NEW)",
+        "localName": "Kalyanpur Pub PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33356",
+        "villageName": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219371",
+        "ddrName": "Kalyanpur Pub PWSS (NEW)",
+        "projectId": "30219371",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalyanpur Pub PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068096",
+      "name": "KONGAIR PACHIMPAR PWSS (NEW)",
+      "description": "KONGAIR PACHIMPAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KONGAIR PACHIMPAR PWSS (NEW)",
+        "localName": "KONGAIR PACHIMPAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33360",
+        "villageName": "Kangai Pashimpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068096",
+        "ddrName": "KONGAIR PACHIMPAR PWSS (NEW)",
+        "projectId": "30068096",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KONGAIR PACHIMPAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219382",
+      "name": "Kodalkati PWSS (NEW)",
+      "description": "Kodalkati PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kodalkati PWSS (NEW)",
+        "localName": "Kodalkati PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33360",
+        "villageName": "Kangai Pashimpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219382",
+        "ddrName": "Kodalkati PWSS (NEW)",
+        "projectId": "30219382",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kodalkati PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30027587",
+      "name": "KATILAR TARI PWSS (NEW)",
+      "description": "KATILAR TARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATILAR TARI PWSS (NEW)",
+        "localName": "KATILAR TARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33359",
+        "villageName": "Katilar Tari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30027587",
+        "ddrName": "KATILAR TARI PWSS (NEW)",
+        "projectId": "30027587",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATILAR TARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213219",
+      "name": "SOULMARI PWSS (Kharmuza)(NEW)",
+      "description": "SOULMARI PWSS (Kharmuza)(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SOULMARI PWSS (Kharmuza)(NEW)",
+        "localName": "SOULMARI PWSS (Kharmuza)(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22442",
+        "panchayatname": "Ambari",
+        "villageCode": "33357",
+        "villageName": "Soulmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213219",
+        "ddrName": "SOULMARI PWSS (Kharmuza)(NEW)",
+        "projectId": "30213219",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SOULMARI PWSS (Kharmuza)(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075708",
+      "name": "BORO BOGUAN PWSS (NEW)",
+      "description": "BORO BOGUAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORO BOGUAN PWSS (NEW)",
+        "localName": "BORO BOGUAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33418",
+        "villageName": "Boro Boguan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075708",
+        "ddrName": "BORO BOGUAN PWSS (NEW)",
+        "projectId": "30075708",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORO BOGUAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213075",
+      "name": "BALURTARI PWSS (NEW)",
+      "description": "BALURTARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALURTARI PWSS (NEW)",
+        "localName": "BALURTARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33415",
+        "villageName": "Chatamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213075",
+        "ddrName": "BALURTARI PWSS (NEW)",
+        "projectId": "30213075",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALURTARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188820",
+      "name": "HALDIBARI PWSS (NEW)",
+      "description": "HALDIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HALDIBARI PWSS (NEW)",
+        "localName": "HALDIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33415",
+        "villageName": "Chatamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188820",
+        "ddrName": "HALDIBARI PWSS (NEW)",
+        "projectId": "30188820",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HALDIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051683",
+      "name": "CHATAMARI PWSS (NEW)",
+      "description": "CHATAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHATAMARI PWSS (NEW)",
+        "localName": "CHATAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33415",
+        "villageName": "Chatamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051683",
+        "ddrName": "CHATAMARI PWSS (NEW)",
+        "projectId": "30051683",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHATAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022947",
+      "name": "GARO BHAT KHAWA PWSS (NEW)",
+      "description": "GARO BHAT KHAWA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARO BHAT KHAWA PWSS (NEW)",
+        "localName": "GARO BHAT KHAWA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33414",
+        "villageName": "Garo Bhat Khawa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022947",
+        "ddrName": "GARO BHAT KHAWA PWSS (NEW)",
+        "projectId": "30022947",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARO BHAT KHAWA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8036124",
+      "name": "HARIDRA  BAGUAN PWSS SWAJAL",
+      "description": "HARIDRA  BAGUAN PWSS SWAJAL",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HARIDRA  BAGUAN PWSS SWAJAL",
+        "localName": "HARIDRA  BAGUAN PWSS SWAJAL",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33416",
+        "villageName": "Haridar Boguan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8036124",
+        "ddrName": "HARIDRA  BAGUAN PWSS SWAJAL",
+        "projectId": "8036124",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HARIDRA  BAGUAN PWSS SWAJAL",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150737",
+      "name": "HARIDAR BOGUAN PWSS (NEW)",
+      "description": "HARIDAR BOGUAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HARIDAR BOGUAN PWSS (NEW)",
+        "localName": "HARIDAR BOGUAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33416",
+        "villageName": "Haridar Boguan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150737",
+        "ddrName": "HARIDAR BOGUAN PWSS (NEW)",
+        "projectId": "30150737",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HARIDAR BOGUAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219434",
+      "name": "Latima PWSS (NEW)",
+      "description": "Latima PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Latima PWSS (NEW)",
+        "localName": "Latima PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33425",
+        "villageName": "Latima",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219434",
+        "ddrName": "Latima PWSS (NEW)",
+        "projectId": "30219434",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Latima PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171945",
+      "name": "Retrofitting of MURALIJHAR PWSS",
+      "description": "Retrofitting of MURALIJHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MURALIJHAR PWSS",
+        "localName": "Retrofitting of MURALIJHAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33424",
+        "villageName": "Muralijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171945",
+        "ddrName": "Retrofitting of MURALIJHAR PWSS",
+        "projectId": "8171945",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MURALIJHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219447",
+      "name": "Muralijhar-1 PWSS (NEW)",
+      "description": "Muralijhar-1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Muralijhar-1 PWSS (NEW)",
+        "localName": "Muralijhar-1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33424",
+        "villageName": "Muralijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219447",
+        "ddrName": "Muralijhar-1 PWSS (NEW)",
+        "projectId": "30219447",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Muralijhar-1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873634",
+      "name": "Muralijhar PWSS",
+      "description": "Muralijhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Muralijhar PWSS",
+        "localName": "Muralijhar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33424",
+        "villageName": "Muralijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873634",
+        "ddrName": "Muralijhar PWSS",
+        "projectId": "4873634",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Muralijhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072569",
+      "name": "TARIPARA PWSS (NEW)",
+      "description": "TARIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TARIPARA PWSS (NEW)",
+        "localName": "TARIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33424",
+        "villageName": "Muralijhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072569",
+        "ddrName": "TARIPARA PWSS (NEW)",
+        "projectId": "30072569",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TARIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022975",
+      "name": "NARANGABARI PWSS (NEW)",
+      "description": "NARANGABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NARANGABARI PWSS (NEW)",
+        "localName": "NARANGABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33413",
+        "villageName": "Narangabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022975",
+        "ddrName": "NARANGABARI PWSS (NEW)",
+        "projectId": "30022975",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NARANGABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30184383",
+      "name": "NARANGABARI PT-I PWSS (NEW)",
+      "description": "NARANGABARI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NARANGABARI PT-I PWSS (NEW)",
+        "localName": "NARANGABARI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33413",
+        "villageName": "Narangabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30184383",
+        "ddrName": "NARANGABARI PT-I PWSS (NEW)",
+        "projectId": "30184383",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NARANGABARI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070477",
+      "name": "PALASHBARI PWSS (NEW)",
+      "description": "PALASHBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PALASHBARI PWSS (NEW)",
+        "localName": "PALASHBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33419",
+        "villageName": "Palasbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070477",
+        "ddrName": "PALASHBARI PWSS (NEW)",
+        "projectId": "30070477",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PALASHBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070470",
+      "name": "PALASHBARI MADHYAPARA PWSS (NEW)",
+      "description": "PALASHBARI MADHYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PALASHBARI MADHYAPARA PWSS (NEW)",
+        "localName": "PALASHBARI MADHYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33419",
+        "villageName": "Palasbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070470",
+        "ddrName": "PALASHBARI MADHYAPARA PWSS (NEW)",
+        "projectId": "30070470",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PALASHBARI MADHYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037287",
+      "name": "SABAJI BAGUAN PWSS (NEW)",
+      "description": "SABAJI BAGUAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SABAJI BAGUAN PWSS (NEW)",
+        "localName": "SABAJI BAGUAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33420",
+        "villageName": "Sabaji Baguan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037287",
+        "ddrName": "SABAJI BAGUAN PWSS (NEW)",
+        "projectId": "30037287",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SABAJI BAGUAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188772",
+      "name": "SINABARI PWSS (NEW)",
+      "description": "SINABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINABARI PWSS (NEW)",
+        "localName": "SINABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33421",
+        "villageName": "Sinabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188772",
+        "ddrName": "SINABARI PWSS (NEW)",
+        "projectId": "30188772",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188848",
+      "name": "Sinabari Nayapara PWSS (NEW)",
+      "description": "Sinabari Nayapara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sinabari Nayapara PWSS (NEW)",
+        "localName": "Sinabari Nayapara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22449",
+        "panchayatname": "Baguan",
+        "villageCode": "33421",
+        "villageName": "Sinabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188848",
+        "ddrName": "Sinabari Nayapara PWSS (NEW)",
+        "projectId": "30188848",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sinabari Nayapara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188648",
+      "name": "ARABANDHA PWSS (NEW)",
+      "description": "ARABANDHA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ARABANDHA PWSS (NEW)",
+        "localName": "ARABANDHA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33403",
+        "villageName": "Ara Bhandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188648",
+        "ddrName": "ARABANDHA PWSS (NEW)",
+        "projectId": "30188648",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ARABANDHA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213148",
+      "name": "ARABANDHA BILPARA PWSS (NEW)",
+      "description": "ARABANDHA BILPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ARABANDHA BILPARA PWSS (NEW)",
+        "localName": "ARABANDHA BILPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33403",
+        "villageName": "Ara Bhandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213148",
+        "ddrName": "ARABANDHA BILPARA PWSS (NEW)",
+        "projectId": "30213148",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ARABANDHA BILPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259713",
+      "name": "Bangaljhar PWSS",
+      "description": "Bangaljhar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bangaljhar PWSS",
+        "localName": "Bangaljhar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33405",
+        "villageName": "Bangaljar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259713",
+        "ddrName": "Bangaljhar PWSS",
+        "projectId": "6259713",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bangaljhar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218711",
+      "name": "BANGALJHAR DESIPARA PWSS (NEW)",
+      "description": "BANGALJHAR DESIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANGALJHAR DESIPARA PWSS (NEW)",
+        "localName": "BANGALJHAR DESIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33405",
+        "villageName": "Bangaljar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218711",
+        "ddrName": "BANGALJHAR DESIPARA PWSS (NEW)",
+        "projectId": "30218711",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANGALJHAR DESIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218703",
+      "name": "BANGALJHAR DEVIPARA PWSS (NEW)",
+      "description": "BANGALJHAR DEVIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANGALJHAR DEVIPARA PWSS (NEW)",
+        "localName": "BANGALJHAR DEVIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33405",
+        "villageName": "Bangaljar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218703",
+        "ddrName": "BANGALJHAR DEVIPARA PWSS (NEW)",
+        "projectId": "30218703",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANGALJHAR DEVIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30091350",
+      "name": "MANIPARA PWSS (NEW)",
+      "description": "MANIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANIPARA PWSS (NEW)",
+        "localName": "MANIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33407",
+        "villageName": "Chakla Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30091350",
+        "ddrName": "MANIPARA PWSS (NEW)",
+        "projectId": "30091350",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171735",
+      "name": "Retrofitting of DHUMBANDHA PWSS",
+      "description": "Retrofitting of DHUMBANDHA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DHUMBANDHA PWSS",
+        "localName": "Retrofitting of DHUMBANDHA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33407",
+        "villageName": "Chakla Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171735",
+        "ddrName": "Retrofitting of DHUMBANDHA PWSS",
+        "projectId": "8171735",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DHUMBANDHA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069733",
+      "name": "CHAKLA GAON PWSS (NEW)",
+      "description": "CHAKLA GAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAKLA GAON PWSS (NEW)",
+        "localName": "CHAKLA GAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33407",
+        "villageName": "Chakla Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069733",
+        "ddrName": "CHAKLA GAON PWSS (NEW)",
+        "projectId": "30069733",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAKLA GAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873695",
+      "name": "Dhumbandha PWSS",
+      "description": "Dhumbandha PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhumbandha PWSS",
+        "localName": "Dhumbandha PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33407",
+        "villageName": "Chakla Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873695",
+        "ddrName": "Dhumbandha PWSS",
+        "projectId": "4873695",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhumbandha PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077065",
+      "name": "CHENGPATA PWSS (NEW)",
+      "description": "CHENGPATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENGPATA PWSS (NEW)",
+        "localName": "CHENGPATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33402",
+        "villageName": "Darirpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077065",
+        "ddrName": "CHENGPATA PWSS (NEW)",
+        "projectId": "30077065",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENGPATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171904",
+      "name": "Retrofitting of DARIARPAR PWSS",
+      "description": "Retrofitting of DARIARPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DARIARPAR PWSS",
+        "localName": "Retrofitting of DARIARPAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33402",
+        "villageName": "Darirpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171904",
+        "ddrName": "Retrofitting of DARIARPAR PWSS",
+        "projectId": "8171904",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DARIARPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038945",
+      "name": "DARIRPAR(A) (NEW)",
+      "description": "DARIRPAR(A) (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DARIRPAR(A) (NEW)",
+        "localName": "DARIRPAR(A) (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33402",
+        "villageName": "Darirpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038945",
+        "ddrName": "DARIRPAR(A) (NEW)",
+        "projectId": "30038945",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DARIRPAR(A) (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208625",
+      "name": "DARIARPAR UTTAR PWSS (NEW)",
+      "description": "DARIARPAR UTTAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DARIARPAR UTTAR PWSS (NEW)",
+        "localName": "DARIARPAR UTTAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33402",
+        "villageName": "Darirpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208625",
+        "ddrName": "DARIARPAR UTTAR PWSS (NEW)",
+        "projectId": "30208625",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DARIARPAR UTTAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070419",
+      "name": "MOTILAL PWSS (NEW)",
+      "description": "MOTILAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOTILAL PWSS (NEW)",
+        "localName": "MOTILAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33402",
+        "villageName": "Darirpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070419",
+        "ddrName": "MOTILAL PWSS (NEW)",
+        "projectId": "30070419",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOTILAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216018",
+      "name": "PUB DHUMBANDHA PWSS (NEW)",
+      "description": "PUB DHUMBANDHA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB DHUMBANDHA PWSS (NEW)",
+        "localName": "PUB DHUMBANDHA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33406",
+        "villageName": "Dhum Bandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216018",
+        "ddrName": "PUB DHUMBANDHA PWSS (NEW)",
+        "projectId": "30216018",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB DHUMBANDHA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188535",
+      "name": "DHUMBANDHA (D) PWSS (NEW)",
+      "description": "DHUMBANDHA (D) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHUMBANDHA (D) PWSS (NEW)",
+        "localName": "DHUMBANDHA (D) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33406",
+        "villageName": "Dhum Bandha",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188535",
+        "ddrName": "DHUMBANDHA (D) PWSS (NEW)",
+        "projectId": "30188535",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHUMBANDHA (D) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022858",
+      "name": "PAKHRITARI TITAPARA PWSS (NEW)",
+      "description": "PAKHRITARI TITAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAKHRITARI TITAPARA PWSS (NEW)",
+        "localName": "PAKHRITARI TITAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33404",
+        "villageName": "Phakritari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022858",
+        "ddrName": "PAKHRITARI TITAPARA PWSS (NEW)",
+        "projectId": "30022858",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAKHRITARI TITAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516326",
+      "name": "Pakhritary  PWSS",
+      "description": "Pakhritary  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pakhritary  PWSS",
+        "localName": "Pakhritary  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33404",
+        "villageName": "Phakritari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516326",
+        "ddrName": "Pakhritary  PWSS",
+        "projectId": "2516326",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pakhritary  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221603",
+      "name": "Retrofitting of Pakhritary PWSS",
+      "description": "Retrofitting of Pakhritary PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Pakhritary PWSS",
+        "localName": "Retrofitting of Pakhritary PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22447",
+        "panchayatname": "Bashbari",
+        "villageCode": "33404",
+        "villageName": "Phakritari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221603",
+        "ddrName": "Retrofitting of Pakhritary PWSS",
+        "projectId": "30221603",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Pakhritary PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189269",
+      "name": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+      "description": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+        "localName": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22444",
+        "panchayatname": "Khankhowa",
+        "villageCode": "33372",
+        "villageName": "Birsing Halang Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189269",
+        "ddrName": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+        "projectId": "30189269",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7971619",
+      "name": "BIRSING PT I MPWSS",
+      "description": "BIRSING PT I MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BIRSING PT I MPWSS",
+        "localName": "BIRSING PT I MPWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22444",
+        "panchayatname": "Khankhowa",
+        "villageCode": "33373",
+        "villageName": "Birsing Halanga Char Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7971619",
+        "ddrName": "BIRSING PT I MPWSS",
+        "projectId": "7971619",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BIRSING PT I MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237367",
+      "name": "Retrofitting of BIRSING PT I MPWSS",
+      "description": "Retrofitting of BIRSING PT I MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BIRSING PT I MPWSS",
+        "localName": "Retrofitting of BIRSING PT I MPWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22444",
+        "panchayatname": "Khankhowa",
+        "villageCode": "33373",
+        "villageName": "Birsing Halanga Char Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237367",
+        "ddrName": "Retrofitting of BIRSING PT I MPWSS",
+        "projectId": "8237367",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BIRSING PT I MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037282",
+      "name": "NUNKHOWAPARA PT-II PWSS (NEW)",
+      "description": "NUNKHOWAPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NUNKHOWAPARA PT-II PWSS (NEW)",
+        "localName": "NUNKHOWAPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22444",
+        "panchayatname": "Khankhowa",
+        "villageCode": "33382",
+        "villageName": "Nun Khawa Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037282",
+        "ddrName": "NUNKHOWAPARA PT-II PWSS (NEW)",
+        "projectId": "30037282",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NUNKHOWAPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386445",
+      "name": "Deodhuturi PWSS",
+      "description": "Deodhuturi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Deodhuturi PWSS",
+        "localName": "Deodhuturi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33390",
+        "villageName": "Deo Dhuturi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386445",
+        "ddrName": "Deodhuturi PWSS",
+        "projectId": "3386445",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Deodhuturi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070386",
+      "name": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+      "description": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+        "localName": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33390",
+        "villageName": "Deo Dhuturi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070386",
+        "ddrName": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+        "projectId": "30070386",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160338",
+      "name": "Retrofitting of DEODHUTURI PWSS",
+      "description": "Retrofitting of DEODHUTURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DEODHUTURI PWSS",
+        "localName": "Retrofitting of DEODHUTURI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33390",
+        "villageName": "Deo Dhuturi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160338",
+        "ddrName": "Retrofitting of DEODHUTURI PWSS",
+        "projectId": "8160338",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DEODHUTURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30031382",
+      "name": "HARIPUR KOROIKHOWA PWSS",
+      "description": "HARIPUR KOROIKHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HARIPUR KOROIKHOWA PWSS",
+        "localName": "HARIPUR KOROIKHOWA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33391",
+        "villageName": "Haripur Kawan Khawa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30031382",
+        "ddrName": "HARIPUR KOROIKHOWA PWSS",
+        "projectId": "30031382",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HARIPUR KOROIKHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216039",
+      "name": "NALBARI PWSS (NEW)",
+      "description": "NALBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NALBARI PWSS (NEW)",
+        "localName": "NALBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33391",
+        "villageName": "Haripur Kawan Khawa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216039",
+        "ddrName": "NALBARI PWSS (NEW)",
+        "projectId": "30216039",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NALBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188411",
+      "name": "KATLAMARI PWSS (NEW)",
+      "description": "KATLAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KATLAMARI PWSS (NEW)",
+        "localName": "KATLAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33394",
+        "villageName": "Katlamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188411",
+        "ddrName": "KATLAMARI PWSS (NEW)",
+        "projectId": "30188411",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KATLAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8227638",
+      "name": "Retrofitting of KHARMUZA PWSS",
+      "description": "Retrofitting of KHARMUZA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHARMUZA PWSS",
+        "localName": "Retrofitting of KHARMUZA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33397",
+        "villageName": "Kharmuja",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8227638",
+        "ddrName": "Retrofitting of KHARMUZA PWSS",
+        "projectId": "8227638",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHARMUZA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2406004",
+      "name": "Kharmuza PWSS",
+      "description": "Kharmuza PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kharmuza PWSS",
+        "localName": "Kharmuza PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33397",
+        "villageName": "Kharmuja",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2406004",
+        "ddrName": "Kharmuza PWSS",
+        "projectId": "2406004",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kharmuza PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069183",
+      "name": "KHARMUJA UJANPARA PWSS (NEW)",
+      "description": "KHARMUJA UJANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARMUJA UJANPARA PWSS (NEW)",
+        "localName": "KHARMUJA UJANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33397",
+        "villageName": "Kharmuja",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069183",
+        "ddrName": "KHARMUJA UJANPARA PWSS (NEW)",
+        "projectId": "30069183",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARMUJA UJANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070406",
+      "name": "KHARMUJA GHANAPARA PWSS (NEW)",
+      "description": "KHARMUJA GHANAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARMUJA GHANAPARA PWSS (NEW)",
+        "localName": "KHARMUJA GHANAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33397",
+        "villageName": "Kharmuja",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070406",
+        "ddrName": "KHARMUJA GHANAPARA PWSS (NEW)",
+        "projectId": "30070406",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARMUJA GHANAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160039",
+      "name": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+      "description": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+        "localName": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33397",
+        "villageName": "Kharmuja",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160039",
+        "ddrName": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+        "projectId": "8160039",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219463",
+      "name": "KHARMUJA CHAR PARA PWSS (NEW)",
+      "description": "KHARMUJA CHAR PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARMUJA CHAR PARA PWSS (NEW)",
+        "localName": "KHARMUJA CHAR PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "KHARMUJA",
+        "villageCode": "33397",
+        "villageName": "KHARMUJA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219463",
+        "ddrName": "KHARMUJA CHAR PARA PWSS (NEW)",
+        "projectId": "30219463",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARMUJA CHAR PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038636",
+      "name": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+      "description": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+        "localName": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33392",
+        "villageName": "Ramhari Char No-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038636",
+        "ddrName": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+        "projectId": "30038636",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218737",
+      "name": "HOJUARCHOR PT-II (NEW)",
+      "description": "HOJUARCHOR PT-II (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HOJUARCHOR PT-II (NEW)",
+        "localName": "HOJUARCHOR PT-II (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33392",
+        "villageName": "Ramhari Char No-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218737",
+        "ddrName": "HOJUARCHOR PT-II (NEW)",
+        "projectId": "30218737",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HOJUARCHOR PT-II (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218682",
+      "name": "NAKALIA PARA PWSS (NEW)",
+      "description": "NAKALIA PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAKALIA PARA PWSS (NEW)",
+        "localName": "NAKALIA PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33393",
+        "villageName": "Ramhari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218682",
+        "ddrName": "NAKALIA PARA PWSS (NEW)",
+        "projectId": "30218682",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAKALIA PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218684",
+      "name": "RAMHARIR CHAR PT-II PWSS (NEW)",
+      "description": "RAMHARIR CHAR PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMHARIR CHAR PT-II PWSS (NEW)",
+        "localName": "RAMHARIR CHAR PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33393",
+        "villageName": "Ramhari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218684",
+        "ddrName": "RAMHARIR CHAR PT-II PWSS (NEW)",
+        "projectId": "30218684",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMHARIR CHAR PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8326277",
+      "name": "Kharmuza Charpara A AWC",
+      "description": "Kharmuza Charpara A AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kharmuza Charpara A AWC",
+        "localName": "Kharmuza Charpara A AWC",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33393",
+        "villageName": "Ramhari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8326277",
+        "ddrName": "Kharmuza Charpara A AWC",
+        "projectId": "8326277",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kharmuza Charpara A AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048644",
+      "name": "SONEHERA PACHIMPARA PWSS (NEW)",
+      "description": "SONEHERA PACHIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONEHERA PACHIMPARA PWSS (NEW)",
+        "localName": "SONEHERA PACHIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33389",
+        "villageName": "Sonahara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048644",
+        "ddrName": "SONEHERA PACHIMPARA PWSS (NEW)",
+        "projectId": "30048644",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONEHERA PACHIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216056",
+      "name": "SONAHARA PART PWSS (NEW)",
+      "description": "SONAHARA PART PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONAHARA PART PWSS (NEW)",
+        "localName": "SONAHARA PART PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33389",
+        "villageName": "Sonahara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216056",
+        "ddrName": "SONAHARA PART PWSS (NEW)",
+        "projectId": "30216056",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONAHARA PART PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042807",
+      "name": "SONEHERA UTTARPARA PWSS (NEW)",
+      "description": "SONEHERA UTTARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONEHERA UTTARPARA PWSS (NEW)",
+        "localName": "SONEHERA UTTARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22445",
+        "panchayatname": "Kharmuja",
+        "villageCode": "33389",
+        "villageName": "Sonahara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042807",
+        "ddrName": "SONEHERA UTTARPARA PWSS (NEW)",
+        "projectId": "30042807",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONEHERA UTTARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022537",
+      "name": "ANGULKATI BATABARI PWSS (NEW)",
+      "description": "ANGULKATI BATABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ANGULKATI BATABARI PWSS (NEW)",
+        "localName": "ANGULKATI BATABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022537",
+        "ddrName": "ANGULKATI BATABARI PWSS (NEW)",
+        "projectId": "30022537",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ANGULKATI BATABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222322",
+      "name": "Retrofitting of BATABARI PWSS",
+      "description": "Retrofitting of BATABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BATABARI PWSS",
+        "localName": "Retrofitting of BATABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222322",
+        "ddrName": "Retrofitting of BATABARI PWSS",
+        "projectId": "8222322",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BATABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516787",
+      "name": "Batabari PWSS",
+      "description": "Batabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Batabari PWSS",
+        "localName": "Batabari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516787",
+        "ddrName": "Batabari PWSS",
+        "projectId": "2516787",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Batabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219482",
+      "name": "BATABARI KONGKAIRPARA PWSS (NEW)",
+      "description": "BATABARI KONGKAIRPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BATABARI KONGKAIRPARA PWSS (NEW)",
+        "localName": "BATABARI KONGKAIRPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219482",
+        "ddrName": "BATABARI KONGKAIRPARA PWSS (NEW)",
+        "projectId": "30219482",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BATABARI KONGKAIRPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4888080",
+      "name": "Karirchala Batabari PWSS",
+      "description": "Karirchala Batabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Karirchala Batabari PWSS",
+        "localName": "Karirchala Batabari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4888080",
+        "ddrName": "Karirchala Batabari PWSS",
+        "projectId": "4888080",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Karirchala Batabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042819",
+      "name": "KORIRCHALA BATABARI A PWSS (NEW)",
+      "description": "KORIRCHALA BATABARI A PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KORIRCHALA BATABARI A PWSS (NEW)",
+        "localName": "KORIRCHALA BATABARI A PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042819",
+        "ddrName": "KORIRCHALA BATABARI A PWSS (NEW)",
+        "projectId": "30042819",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KORIRCHALA BATABARI A PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038738",
+      "name": "KHAS BATABARI PWSS (NEW)",
+      "description": "KHAS BATABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAS BATABARI PWSS (NEW)",
+        "localName": "KHAS BATABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33401",
+        "villageName": "Batabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038738",
+        "ddrName": "KHAS BATABARI PWSS (NEW)",
+        "projectId": "30038738",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAS BATABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037284",
+      "name": "MADHYA KANGKAI PWSS (NEW)",
+      "description": "MADHYA KANGKAI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MADHYA KANGKAI PWSS (NEW)",
+        "localName": "MADHYA KANGKAI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33400",
+        "villageName": "Kangair Pubpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037284",
+        "ddrName": "MADHYA KANGKAI PWSS (NEW)",
+        "projectId": "30037284",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MADHYA KANGKAI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386526",
+      "name": "Konkair Pubpar PWSS",
+      "description": "Konkair Pubpar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Konkair Pubpar PWSS",
+        "localName": "Konkair Pubpar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33400",
+        "villageName": "Kangair Pubpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386526",
+        "ddrName": "Konkair Pubpar PWSS",
+        "projectId": "3386526",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Konkair Pubpar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8161016",
+      "name": "Retrofitting of KANGKAI PUBPAR PWSS",
+      "description": "Retrofitting of KANGKAI PUBPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KANGKAI PUBPAR PWSS",
+        "localName": "Retrofitting of KANGKAI PUBPAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33400",
+        "villageName": "Kangair Pubpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8161016",
+        "ddrName": "Retrofitting of KANGKAI PUBPAR PWSS",
+        "projectId": "8161016",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KANGKAI PUBPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160019",
+      "name": "Retrofitting of MARKULA PWSS",
+      "description": "Retrofitting of MARKULA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MARKULA PWSS",
+        "localName": "Retrofitting of MARKULA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33399",
+        "villageName": "Markula",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160019",
+        "ddrName": "Retrofitting of MARKULA PWSS",
+        "projectId": "8160019",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MARKULA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183728",
+      "name": "UTTAR MARKHULA PWSS (NEW)",
+      "description": "UTTAR MARKHULA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UTTAR MARKHULA PWSS (NEW)",
+        "localName": "UTTAR MARKHULA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33399",
+        "villageName": "Markula",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183728",
+        "ddrName": "UTTAR MARKHULA PWSS (NEW)",
+        "projectId": "30183728",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UTTAR MARKHULA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160027",
+      "name": "Retrofitting of MARKULA GAROPARA PWSS",
+      "description": "Retrofitting of MARKULA GAROPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MARKULA GAROPARA PWSS",
+        "localName": "Retrofitting of MARKULA GAROPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33399",
+        "villageName": "Markula",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160027",
+        "ddrName": "Retrofitting of MARKULA GAROPARA PWSS",
+        "projectId": "8160027",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MARKULA GAROPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873607",
+      "name": "Markula Garopara  PWSS",
+      "description": "Markula Garopara  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Markula Garopara  PWSS",
+        "localName": "Markula Garopara  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33399",
+        "villageName": "Markula",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873607",
+        "ddrName": "Markula Garopara  PWSS",
+        "projectId": "4873607",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Markula Garopara  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069165",
+      "name": "MARKULA PAHARTOLI PWSS (NEW)",
+      "description": "MARKULA PAHARTOLI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MARKULA PAHARTOLI PWSS (NEW)",
+        "localName": "MARKULA PAHARTOLI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33399",
+        "villageName": "Markula",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069165",
+        "ddrName": "MARKULA PAHARTOLI PWSS (NEW)",
+        "projectId": "30069165",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MARKULA PAHARTOLI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1872337",
+      "name": "Markula PWSS",
+      "description": "Markula PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Markula PWSS",
+        "localName": "Markula PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33399",
+        "villageName": "Markula",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1872337",
+        "ddrName": "Markula PWSS",
+        "projectId": "1872337",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Markula PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069157",
+      "name": "PACHIM PANDOBA PWSS (NEW)",
+      "description": "PACHIM PANDOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM PANDOBA PWSS (NEW)",
+        "localName": "PACHIM PANDOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33398",
+        "villageName": "Pandoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069157",
+        "ddrName": "PACHIM PANDOBA PWSS (NEW)",
+        "projectId": "30069157",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM PANDOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160000",
+      "name": "Retrofitting of PANDOBA PWSS",
+      "description": "Retrofitting of PANDOBA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of PANDOBA PWSS",
+        "localName": "Retrofitting of PANDOBA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33398",
+        "villageName": "Pandoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160000",
+        "ddrName": "Retrofitting of PANDOBA PWSS",
+        "projectId": "8160000",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of PANDOBA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022721",
+      "name": "PUB PANDOBA PWSS (NEW)",
+      "description": "PUB PANDOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB PANDOBA PWSS (NEW)",
+        "localName": "PUB PANDOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "MARKULA",
+        "villageCode": "33398",
+        "villageName": "PANDOBA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022721",
+        "ddrName": "PUB PANDOBA PWSS (NEW)",
+        "projectId": "30022721",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB PANDOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069148",
+      "name": "PANDOBA GAROPARA PWSS (NEW)",
+      "description": "PANDOBA GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PANDOBA GAROPARA PWSS (NEW)",
+        "localName": "PANDOBA GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33398",
+        "villageName": "Pandoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069148",
+        "ddrName": "PANDOBA GAROPARA PWSS (NEW)",
+        "projectId": "30069148",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PANDOBA GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6861639",
+      "name": "Pandoba PWSS",
+      "description": "Pandoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pandoba PWSS",
+        "localName": "Pandoba PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22446",
+        "panchayatname": "Markula",
+        "villageCode": "33398",
+        "villageName": "Pandoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6861639",
+        "ddrName": "Pandoba PWSS",
+        "projectId": "6861639",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pandoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022777",
+      "name": "NALANGA UJANPARA PWSS(NEW)",
+      "description": "NALANGA UJANPARA PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NALANGA UJANPARA PWSS(NEW)",
+        "localName": "NALANGA UJANPARA PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "NALANGA",
+        "villageCode": "33410",
+        "villageName": "NALANGA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022777",
+        "ddrName": "NALANGA UJANPARA PWSS(NEW)",
+        "projectId": "30022777",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NALANGA UJANPARA PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188583",
+      "name": "JUMKAIPARA PART PWSS (NEW)",
+      "description": "JUMKAIPARA PART PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JUMKAIPARA PART PWSS (NEW)",
+        "localName": "JUMKAIPARA PART PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33410",
+        "villageName": "Nalanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188583",
+        "ddrName": "JUMKAIPARA PART PWSS (NEW)",
+        "projectId": "30188583",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JUMKAIPARA PART PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022787",
+      "name": "NALANGA MAJERPARA PWSS (NEW)",
+      "description": "NALANGA MAJERPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NALANGA MAJERPARA PWSS (NEW)",
+        "localName": "NALANGA MAJERPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33410",
+        "villageName": "Nalanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022787",
+        "ddrName": "NALANGA MAJERPARA PWSS (NEW)",
+        "projectId": "30022787",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NALANGA MAJERPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203592",
+      "name": "Retrofitting of NALANGA RAWMARI PWSS",
+      "description": "Retrofitting of NALANGA RAWMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NALANGA RAWMARI PWSS",
+        "localName": "Retrofitting of NALANGA RAWMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33410",
+        "villageName": "Nalanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203592",
+        "ddrName": "Retrofitting of NALANGA RAWMARI PWSS",
+        "projectId": "8203592",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NALANGA RAWMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386515",
+      "name": "Nalanga Singimari PWSS",
+      "description": "Nalanga Singimari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nalanga Singimari PWSS",
+        "localName": "Nalanga Singimari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33410",
+        "villageName": "Nalanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386515",
+        "ddrName": "Nalanga Singimari PWSS",
+        "projectId": "3386515",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nalanga Singimari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188716",
+      "name": "NALANGA RABHAPARA PWSS (NEW)",
+      "description": "NALANGA RABHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NALANGA RABHAPARA PWSS (NEW)",
+        "localName": "NALANGA RABHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33410",
+        "villageName": "Nalanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188716",
+        "ddrName": "NALANGA RABHAPARA PWSS (NEW)",
+        "projectId": "30188716",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NALANGA RABHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160005",
+      "name": "Retrofitting of NALANGA SINGIMARI  PWSS",
+      "description": "Retrofitting of NALANGA SINGIMARI  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NALANGA SINGIMARI  PWSS",
+        "localName": "Retrofitting of NALANGA SINGIMARI  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33410",
+        "villageName": "Nalanga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160005",
+        "ddrName": "Retrofitting of NALANGA SINGIMARI  PWSS",
+        "projectId": "8160005",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NALANGA SINGIMARI  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160353",
+      "name": "Retrofitting of NALANGA PAHARTOLI PWSS",
+      "description": "Retrofitting of NALANGA PAHARTOLI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NALANGA PAHARTOLI PWSS",
+        "localName": "Retrofitting of NALANGA PAHARTOLI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33409",
+        "villageName": "Nalonga Pahartoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160353",
+        "ddrName": "Retrofitting of NALANGA PAHARTOLI PWSS",
+        "projectId": "8160353",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NALANGA PAHARTOLI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937960",
+      "name": "NAlanga Pahartoli PWSS",
+      "description": "NAlanga Pahartoli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAlanga Pahartoli PWSS",
+        "localName": "NAlanga Pahartoli PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33409",
+        "villageName": "Nalonga Pahartoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937960",
+        "ddrName": "NAlanga Pahartoli PWSS",
+        "projectId": "1937960",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAlanga Pahartoli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8036130",
+      "name": "RESERVE DAKHINPARA PWSS SWAJAL",
+      "description": "RESERVE DAKHINPARA PWSS SWAJAL",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RESERVE DAKHINPARA PWSS SWAJAL",
+        "localName": "RESERVE DAKHINPARA PWSS SWAJAL",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33409",
+        "villageName": "Nalonga Pahartoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8036130",
+        "ddrName": "RESERVE DAKHINPARA PWSS SWAJAL",
+        "projectId": "8036130",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RESERVE DAKHINPARA PWSS SWAJAL",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038960",
+      "name": "RESERVE MADHYAPARA PWSS (NEW)",
+      "description": "RESERVE MADHYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RESERVE MADHYAPARA PWSS (NEW)",
+        "localName": "RESERVE MADHYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33409",
+        "villageName": "Nalonga Pahartoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038960",
+        "ddrName": "RESERVE MADHYAPARA PWSS (NEW)",
+        "projectId": "30038960",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RESERVE MADHYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096898",
+      "name": "RESERVE UTTARPARA PWSS (NEW)",
+      "description": "RESERVE UTTARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RESERVE UTTARPARA PWSS (NEW)",
+        "localName": "RESERVE UTTARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33409",
+        "villageName": "Nalonga Pahartoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096898",
+        "ddrName": "RESERVE UTTARPARA PWSS (NEW)",
+        "projectId": "30096898",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RESERVE UTTARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070464",
+      "name": "PACHIM SIMLABARI PWSS (NEW)",
+      "description": "PACHIM SIMLABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM SIMLABARI PWSS (NEW)",
+        "localName": "PACHIM SIMLABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33412",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070464",
+        "ddrName": "PACHIM SIMLABARI PWSS (NEW)",
+        "projectId": "30070464",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM SIMLABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2404437",
+      "name": "Simlabari PWSS",
+      "description": "Simlabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Simlabari PWSS",
+        "localName": "Simlabari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33412",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2404437",
+        "ddrName": "Simlabari PWSS",
+        "projectId": "2404437",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Simlabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150700",
+      "name": "PUB SIMLABARI PWSS (NEW)",
+      "description": "PUB SIMLABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB SIMLABARI PWSS (NEW)",
+        "localName": "PUB SIMLABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33412",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150700",
+        "ddrName": "PUB SIMLABARI PWSS (NEW)",
+        "projectId": "30150700",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB SIMLABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235394",
+      "name": "Retrofitting of SIMLABARI PWSS",
+      "description": "Retrofitting of SIMLABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SIMLABARI PWSS",
+        "localName": "Retrofitting of SIMLABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33412",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235394",
+        "ddrName": "Retrofitting of SIMLABARI PWSS",
+        "projectId": "8235394",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SIMLABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069136",
+      "name": "SIMLABARI-A PWSS (NEW)",
+      "description": "SIMLABARI-A PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIMLABARI-A PWSS (NEW)",
+        "localName": "SIMLABARI-A PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33412",
+        "villageName": "Simlabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069136",
+        "ddrName": "SIMLABARI-A PWSS (NEW)",
+        "projectId": "30069136",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIMLABARI-A PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060309",
+      "name": "CHOPATOLA PWSS (NEW)",
+      "description": "CHOPATOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOPATOLA PWSS (NEW)",
+        "localName": "CHOPATOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33411",
+        "villageName": "Thepkai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060309",
+        "ddrName": "CHOPATOLA PWSS (NEW)",
+        "projectId": "30060309",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOPATOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235411",
+      "name": "Retrofitting of THEPKAI PWSS",
+      "description": "Retrofitting of THEPKAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of THEPKAI PWSS",
+        "localName": "Retrofitting of THEPKAI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33411",
+        "villageName": "Thepkai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235411",
+        "ddrName": "Retrofitting of THEPKAI PWSS",
+        "projectId": "8235411",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of THEPKAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069142",
+      "name": "THEPKAI PAHARTOLI PWSS (NEW)",
+      "description": "THEPKAI PAHARTOLI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEPKAI PAHARTOLI PWSS (NEW)",
+        "localName": "THEPKAI PAHARTOLI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22448",
+        "panchayatname": "Nalanga",
+        "villageCode": "33411",
+        "villageName": "Thepkai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069142",
+        "ddrName": "THEPKAI PAHARTOLI PWSS (NEW)",
+        "projectId": "30069142",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEPKAI PAHARTOLI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219492",
+      "name": "GENDAGURI PWSS (NEW)",
+      "description": "GENDAGURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GENDAGURI PWSS (NEW)",
+        "localName": "GENDAGURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33367",
+        "villageName": "Hajua Char No-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219492",
+        "ddrName": "GENDAGURI PWSS (NEW)",
+        "projectId": "30219492",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GENDAGURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188786",
+      "name": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+      "description": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+        "localName": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33366",
+        "villageName": "Hajua Char No-2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188786",
+        "ddrName": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+        "projectId": "30188786",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189323",
+      "name": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+      "description": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+        "localName": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "RAM HARIR CHAR",
+        "villageCode": "33364",
+        "villageName": "RAM HARI CHAR PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189323",
+        "ddrName": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+        "projectId": "30189323",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022800",
+      "name": "JAMADARPARA PWSS(NEW)",
+      "description": "JAMADARPARA PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAMADARPARA PWSS(NEW)",
+        "localName": "JAMADARPARA PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33364",
+        "villageName": "Ram Hari Char Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022800",
+        "ddrName": "JAMADARPARA PWSS(NEW)",
+        "projectId": "30022800",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAMADARPARA PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070483",
+      "name": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+      "description": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+        "localName": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33364",
+        "villageName": "Ram Hari Char Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070483",
+        "ddrName": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+        "projectId": "30070483",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219362",
+      "name": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+      "description": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+        "localName": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33364",
+        "villageName": "Ram Hari Char Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219362",
+        "ddrName": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+        "projectId": "30219362",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189315",
+      "name": "TIAPARA MADHYA PWSS (NEW)",
+      "description": "TIAPARA MADHYA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TIAPARA MADHYA PWSS (NEW)",
+        "localName": "TIAPARA MADHYA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33362",
+        "villageName": "Tiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189315",
+        "ddrName": "TIAPARA MADHYA PWSS (NEW)",
+        "projectId": "30189315",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TIAPARA MADHYA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038988",
+      "name": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+      "description": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+        "localName": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22443",
+        "panchayatname": "Ram Harir Char",
+        "villageCode": "33362",
+        "villageName": "Tiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038988",
+        "ddrName": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+        "projectId": "30038988",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038634",
+      "name": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+      "description": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+        "localName": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33429",
+        "villageName": "Abrar Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038634",
+        "ddrName": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+        "projectId": "30038634",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30184386",
+      "name": "BALARBHITA PWSS (NEW)",
+      "description": "BALARBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALARBHITA PWSS (NEW)",
+        "localName": "BALARBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33427",
+        "villageName": "Balar Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30184386",
+        "ddrName": "BALARBHITA PWSS (NEW)",
+        "projectId": "30184386",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALARBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188425",
+      "name": "KHATYATARI PWSS (NEW)",
+      "description": "KHATYATARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHATYATARI PWSS (NEW)",
+        "localName": "KHATYATARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33428",
+        "villageName": "Khateya Tari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188425",
+        "ddrName": "KHATYATARI PWSS (NEW)",
+        "projectId": "30188425",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHATYATARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30039003",
+      "name": "RAKHALDUBI PWSS (NEW)",
+      "description": "RAKHALDUBI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKHALDUBI PWSS (NEW)",
+        "localName": "RAKHALDUBI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33430",
+        "villageName": "Rakhal Dubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30039003",
+        "ddrName": "RAKHALDUBI PWSS (NEW)",
+        "projectId": "30039003",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKHALDUBI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203614",
+      "name": "Retrofitting of RAKHALDUBI PWSS",
+      "description": "Retrofitting of RAKHALDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RAKHALDUBI PWSS",
+        "localName": "Retrofitting of RAKHALDUBI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33430",
+        "villageName": "Rakhal Dubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203614",
+        "ddrName": "Retrofitting of RAKHALDUBI PWSS",
+        "projectId": "8203614",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RAKHALDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042816",
+      "name": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+      "description": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+        "localName": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33430",
+        "villageName": "Rakhal Dubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042816",
+        "ddrName": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+        "projectId": "30042816",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189277",
+      "name": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+      "description": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+        "localName": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33430",
+        "villageName": "Rakhal Dubi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189277",
+        "ddrName": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+        "projectId": "30189277",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6260844",
+      "name": "Rowmari Bazar PWSS",
+      "description": "Rowmari Bazar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rowmari Bazar PWSS",
+        "localName": "Rowmari Bazar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33431",
+        "villageName": "Roumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6260844",
+        "ddrName": "Rowmari Bazar PWSS",
+        "projectId": "6260844",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rowmari Bazar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188569",
+      "name": "ROWMARI BHUYANPARA PWSS (NEW)",
+      "description": "ROWMARI BHUYANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROWMARI BHUYANPARA PWSS (NEW)",
+        "localName": "ROWMARI BHUYANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33431",
+        "villageName": "Roumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188569",
+        "ddrName": "ROWMARI BHUYANPARA PWSS (NEW)",
+        "projectId": "30188569",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROWMARI BHUYANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183945",
+      "name": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+      "description": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+        "localName": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33431",
+        "villageName": "Roumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183945",
+        "ddrName": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+        "projectId": "30183945",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070590",
+      "name": "TAPARBHITA PWSS (NEW)",
+      "description": "TAPARBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TAPARBHITA PWSS (NEW)",
+        "localName": "TAPARBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1189",
+        "blockname": "Kharmuza",
+        "panchayatcode": "22450",
+        "panchayatname": "Rowmari",
+        "villageCode": "33426",
+        "villageName": "Tapar Vita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070590",
+        "ddrName": "TAPARBHITA PWSS (NEW)",
+        "projectId": "30070590",
+        "regionName": "1189"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TAPARBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071063",
+      "name": "BOLLA PWSS (NEW)",
+      "description": "BOLLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOLLA PWSS (NEW)",
+        "localName": "BOLLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33294",
+        "villageName": "Dhaigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071063",
+        "ddrName": "BOLLA PWSS (NEW)",
+        "projectId": "30071063",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOLLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221135",
+      "name": "Bolla No. 2 PWSS (NEW)",
+      "description": "Bolla No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bolla No. 2 PWSS (NEW)",
+        "localName": "Bolla No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33294",
+        "villageName": "Dhaigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221135",
+        "ddrName": "Bolla No. 2 PWSS (NEW)",
+        "projectId": "30221135",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bolla No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022418",
+      "name": "DHAIGOAN PWSS (NEW)",
+      "description": "DHAIGOAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHAIGOAN PWSS (NEW)",
+        "localName": "DHAIGOAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33294",
+        "villageName": "Dhaigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022418",
+        "ddrName": "DHAIGOAN PWSS (NEW)",
+        "projectId": "30022418",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHAIGOAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30129385",
+      "name": "SOULMARI PWSS  (NEW)",
+      "description": "SOULMARI PWSS  (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SOULMARI PWSS  (NEW)",
+        "localName": "SOULMARI PWSS  (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33294",
+        "villageName": "Dhaigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30129385",
+        "ddrName": "SOULMARI PWSS  (NEW)",
+        "projectId": "30129385",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SOULMARI PWSS  (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216053",
+      "name": "TILAPARA PWSS (Krishnai) NEW",
+      "description": "TILAPARA PWSS (Krishnai) NEW",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA PWSS (Krishnai) NEW",
+        "localName": "TILAPARA PWSS (Krishnai) NEW",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33294",
+        "villageName": "Dhaigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216053",
+        "ddrName": "TILAPARA PWSS (Krishnai) NEW",
+        "projectId": "30216053",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA PWSS (Krishnai) NEW",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235421",
+      "name": "Retrofitting of DHAIGAON DAMAS PWSS",
+      "description": "Retrofitting of DHAIGAON DAMAS PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DHAIGAON DAMAS PWSS",
+        "localName": "Retrofitting of DHAIGAON DAMAS PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33295",
+        "villageName": "Dhaigaon Damas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235421",
+        "ddrName": "Retrofitting of DHAIGAON DAMAS PWSS",
+        "projectId": "8235421",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DHAIGAON DAMAS PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071129",
+      "name": "KALPANI GHILAJANI PWSS (NEW)",
+      "description": "KALPANI GHILAJANI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALPANI GHILAJANI PWSS (NEW)",
+        "localName": "KALPANI GHILAJANI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33302",
+        "villageName": "Kalpani Ghilajani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071129",
+        "ddrName": "KALPANI GHILAJANI PWSS (NEW)",
+        "projectId": "30071129",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALPANI GHILAJANI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221079",
+      "name": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+      "description": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+        "localName": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33302",
+        "villageName": "Kalpani Ghilajani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221079",
+        "ddrName": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+        "projectId": "30221079",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203178",
+      "name": "Retrofitting of KARKACHI PWSS",
+      "description": "Retrofitting of KARKACHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KARKACHI PWSS",
+        "localName": "Retrofitting of KARKACHI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33296",
+        "villageName": "Karkashi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203178",
+        "ddrName": "Retrofitting of KARKACHI PWSS",
+        "projectId": "8203178",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KARKACHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173816",
+      "name": "ASSAM PARA PWSS (NEW)",
+      "description": "ASSAM PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ASSAM PARA PWSS (NEW)",
+        "localName": "ASSAM PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33296",
+        "villageName": "Karkashi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173816",
+        "ddrName": "ASSAM PARA PWSS (NEW)",
+        "projectId": "30173816",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ASSAM PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30220972",
+      "name": "Upper Karkachi PWSS (NEW)",
+      "description": "Upper Karkachi PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Upper Karkachi PWSS (NEW)",
+        "localName": "Upper Karkachi PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33296",
+        "villageName": "Karkashi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30220972",
+        "ddrName": "Upper Karkachi PWSS (NEW)",
+        "projectId": "30220972",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Upper Karkachi PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173978",
+      "name": "KARKASI DAMAS PWSS",
+      "description": "KARKASI DAMAS PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARKASI DAMAS PWSS",
+        "localName": "KARKASI DAMAS PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33297",
+        "villageName": "Karkasi Damas",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173978",
+        "ddrName": "KARKASI DAMAS PWSS",
+        "projectId": "30173978",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARKASI DAMAS PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175691",
+      "name": "KHAIRAPARA PWSS (NEW)",
+      "description": "KHAIRAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAIRAPARA PWSS (NEW)",
+        "localName": "KHAIRAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33299",
+        "villageName": "Khairapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175691",
+        "ddrName": "KHAIRAPARA PWSS (NEW)",
+        "projectId": "30175691",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAIRAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176683",
+      "name": "KHILASASTRA PWSS (NEW)",
+      "description": "KHILASASTRA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHILASASTRA PWSS (NEW)",
+        "localName": "KHILASASTRA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33301",
+        "villageName": "Khilasastra",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176683",
+        "ddrName": "KHILASASTRA PWSS (NEW)",
+        "projectId": "30176683",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHILASASTRA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176222",
+      "name": "PAHIDAL PWSS (NEW)",
+      "description": "PAHIDAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAHIDAL PWSS (NEW)",
+        "localName": "PAHIDAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33298",
+        "villageName": "Pahidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176222",
+        "ddrName": "PAHIDAL PWSS (NEW)",
+        "projectId": "30176222",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAHIDAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063285",
+      "name": "DHIRUPARA PWSS (NEW)",
+      "description": "DHIRUPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHIRUPARA PWSS (NEW)",
+        "localName": "DHIRUPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33300",
+        "villageName": "Sardarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063285",
+        "ddrName": "DHIRUPARA PWSS (NEW)",
+        "projectId": "30063285",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHIRUPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173977",
+      "name": "REFUGIPARA PWSS (NEW)",
+      "description": "REFUGIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "REFUGIPARA PWSS (NEW)",
+        "localName": "REFUGIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22436",
+        "panchayatname": "Dhaigaon",
+        "villageCode": "33300",
+        "villageName": "Sardarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173977",
+        "ddrName": "REFUGIPARA PWSS (NEW)",
+        "projectId": "30173977",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "REFUGIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023075",
+      "name": "CHENIMARI PT-II PWSS (NEW)",
+      "description": "CHENIMARI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENIMARI PT-II PWSS (NEW)",
+        "localName": "CHENIMARI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33320",
+        "villageName": "Chenimari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023075",
+        "ddrName": "CHENIMARI PT-II PWSS (NEW)",
+        "projectId": "30023075",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENIMARI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173973",
+      "name": "DARAPARA PT-I PWSS (NEW)",
+      "description": "DARAPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DARAPARA PT-I PWSS (NEW)",
+        "localName": "DARAPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33314",
+        "villageName": "Darapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173973",
+        "ddrName": "DARAPARA PT-I PWSS (NEW)",
+        "projectId": "30173973",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DARAPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173981",
+      "name": "DARAPARA PT-II PWSS (NEW)",
+      "description": "DARAPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DARAPARA PT-II PWSS (NEW)",
+        "localName": "DARAPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33315",
+        "villageName": "Darapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173981",
+        "ddrName": "DARAPARA PT-II PWSS (NEW)",
+        "projectId": "30173981",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DARAPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203162",
+      "name": "Retrofitting of GHORAPUTA PWSS",
+      "description": "Retrofitting of GHORAPUTA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GHORAPUTA PWSS",
+        "localName": "Retrofitting of GHORAPUTA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33323",
+        "villageName": "Ghoraputa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203162",
+        "ddrName": "Retrofitting of GHORAPUTA PWSS",
+        "projectId": "8203162",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GHORAPUTA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174740",
+      "name": "AMGURIPARA PWSS (NEW)",
+      "description": "AMGURIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMGURIPARA PWSS (NEW)",
+        "localName": "AMGURIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33323",
+        "villageName": "Ghoraputa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174740",
+        "ddrName": "AMGURIPARA PWSS (NEW)",
+        "projectId": "30174740",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMGURIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213150",
+      "name": "BELDENGPARA PWSS (NEW)",
+      "description": "BELDENGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BELDENGPARA PWSS (NEW)",
+        "localName": "BELDENGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33317",
+        "villageName": "Hatimura Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213150",
+        "ddrName": "BELDENGPARA PWSS (NEW)",
+        "projectId": "30213150",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BELDENGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222276",
+      "name": "Retrofitting of HATIMURA PWSS",
+      "description": "Retrofitting of HATIMURA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HATIMURA PWSS",
+        "localName": "Retrofitting of HATIMURA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33317",
+        "villageName": "Hatimura Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222276",
+        "ddrName": "Retrofitting of HATIMURA PWSS",
+        "projectId": "8222276",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HATIMURA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063143",
+      "name": "KHORAGOAN PWSS (NEW)",
+      "description": "KHORAGOAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHORAGOAN PWSS (NEW)",
+        "localName": "KHORAGOAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33317",
+        "villageName": "Hatimura Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063143",
+        "ddrName": "KHORAGOAN PWSS (NEW)",
+        "projectId": "30063143",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHORAGOAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176310",
+      "name": "HATIMURA PT-II PWSS (NEW)",
+      "description": "HATIMURA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATIMURA PT-II PWSS (NEW)",
+        "localName": "HATIMURA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33318",
+        "villageName": "Hatimura Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176310",
+        "ddrName": "HATIMURA PT-II PWSS (NEW)",
+        "projectId": "30176310",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATIMURA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037055",
+      "name": "KHAMARI PWSS (NEW)",
+      "description": "KHAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAMARI PWSS (NEW)",
+        "localName": "KHAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33322",
+        "villageName": "Khamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037055",
+        "ddrName": "KHAMARI PWSS (NEW)",
+        "projectId": "30037055",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178287",
+      "name": "HIRAPARA PWSS (NEW)",
+      "description": "HIRAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HIRAPARA PWSS (NEW)",
+        "localName": "HIRAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33313",
+        "villageName": "Krishnai Guria Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178287",
+        "ddrName": "HIRAPARA PWSS (NEW)",
+        "projectId": "30178287",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HIRAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219505",
+      "name": "Bhogdabli Ravapara PWSS (NEW)",
+      "description": "Bhogdabli Ravapara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhogdabli Ravapara PWSS (NEW)",
+        "localName": "Bhogdabli Ravapara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33313",
+        "villageName": "Krishnai Guria Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219505",
+        "ddrName": "Bhogdabli Ravapara PWSS (NEW)",
+        "projectId": "30219505",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhogdabli Ravapara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203128",
+      "name": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+      "description": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+        "localName": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33313",
+        "villageName": "Krishnai Guria Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203128",
+        "ddrName": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+        "projectId": "8203128",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6503042",
+      "name": "Krishnai Guria Pt-II PWSS",
+      "description": "Krishnai Guria Pt-II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Krishnai Guria Pt-II PWSS",
+        "localName": "Krishnai Guria Pt-II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33313",
+        "villageName": "Krishnai Guria Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6503042",
+        "ddrName": "Krishnai Guria Pt-II PWSS",
+        "projectId": "6503042",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Krishnai Guria Pt-II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203233",
+      "name": "Retrofitting of SALPARA MOLANDUBI PWSS",
+      "description": "Retrofitting of SALPARA MOLANDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SALPARA MOLANDUBI PWSS",
+        "localName": "Retrofitting of SALPARA MOLANDUBI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33316",
+        "villageName": "Salpara Molandubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203233",
+        "ddrName": "Retrofitting of SALPARA MOLANDUBI PWSS",
+        "projectId": "8203233",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SALPARA MOLANDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176670",
+      "name": "JILIKAPARA PWSS (NEW)",
+      "description": "JILIKAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JILIKAPARA PWSS (NEW)",
+        "localName": "JILIKAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33316",
+        "villageName": "Salpara Molandubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176670",
+        "ddrName": "JILIKAPARA PWSS (NEW)",
+        "projectId": "30176670",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JILIKAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6136397",
+      "name": "Salpara Molandubi PWSS",
+      "description": "Salpara Molandubi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Salpara Molandubi PWSS",
+        "localName": "Salpara Molandubi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33316",
+        "villageName": "Salpara Molandubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6136397",
+        "ddrName": "Salpara Molandubi PWSS",
+        "projectId": "6136397",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Salpara Molandubi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177999",
+      "name": "SENIMARI PT-I PWSS (NEW)",
+      "description": "SENIMARI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SENIMARI PT-I PWSS (NEW)",
+        "localName": "SENIMARI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33319",
+        "villageName": "Senimari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177999",
+        "ddrName": "SENIMARI PT-I PWSS (NEW)",
+        "projectId": "30177999",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SENIMARI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219515",
+      "name": "Senimari Pt-iii PWSS (NEW)",
+      "description": "Senimari Pt-iii PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Senimari Pt-iii PWSS (NEW)",
+        "localName": "Senimari Pt-iii PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22438",
+        "panchayatname": "Dirma Jakhili Salpara",
+        "villageCode": "33321",
+        "villageName": "Senimari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219515",
+        "ddrName": "Senimari Pt-iii PWSS (NEW)",
+        "projectId": "30219515",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Senimari Pt-iii PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182369",
+      "name": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+      "description": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+        "localName": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33344",
+        "villageName": "Fofanga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182369",
+        "ddrName": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+        "projectId": "30182369",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072843",
+      "name": "FAFANGA PT-I PWSS (NEW)",
+      "description": "FAFANGA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FAFANGA PT-I PWSS (NEW)",
+        "localName": "FAFANGA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33344",
+        "villageName": "Fofanga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072843",
+        "ddrName": "FAFANGA PT-I PWSS (NEW)",
+        "projectId": "30072843",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FAFANGA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221636",
+      "name": "Retrofitting of Natunpara PWSS",
+      "description": "Retrofitting of Natunpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Natunpara PWSS",
+        "localName": "Retrofitting of Natunpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33344",
+        "villageName": "Fofanga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221636",
+        "ddrName": "Retrofitting of Natunpara PWSS",
+        "projectId": "30221636",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Natunpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30116153",
+      "name": "FAFANGA PT-II PWSS (NEW)",
+      "description": "FAFANGA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FAFANGA PT-II PWSS (NEW)",
+        "localName": "FAFANGA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33345",
+        "villageName": "Fofanga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30116153",
+        "ddrName": "FAFANGA PT-II PWSS (NEW)",
+        "projectId": "30116153",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FAFANGA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143328",
+      "name": "HATI CAMP PWSS (NEW)",
+      "description": "HATI CAMP PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATI CAMP PWSS (NEW)",
+        "localName": "HATI CAMP PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "KRISHNAI",
+        "panchayatcode": "22440",
+        "panchayatname": "FAFANGA",
+        "villageCode": "33345",
+        "villageName": "FOFANGA PT-II",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143328",
+        "ddrName": "HATI CAMP PWSS (NEW)",
+        "projectId": "30143328",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATI CAMP PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30105196",
+      "name": "FAFANGA PT-III PWSS (NEW)",
+      "description": "FAFANGA PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FAFANGA PT-III PWSS (NEW)",
+        "localName": "FAFANGA PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33346",
+        "villageName": "Fofanga Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30105196",
+        "ddrName": "FAFANGA PT-III PWSS (NEW)",
+        "projectId": "30105196",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FAFANGA PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1872281",
+      "name": "Fafanga PWSS",
+      "description": "Fafanga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Fafanga PWSS",
+        "localName": "Fafanga PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33346",
+        "villageName": "Fofanga Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1872281",
+        "ddrName": "Fafanga PWSS",
+        "projectId": "1872281",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Fafanga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8325212",
+      "name": "Godharbori AWC",
+      "description": "Godharbori AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Godharbori AWC",
+        "localName": "Godharbori AWC",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33346",
+        "villageName": "Fofanga Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8325212",
+        "ddrName": "Godharbori AWC",
+        "projectId": "8325212",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Godharbori AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181562",
+      "name": "HADIAPARA FAFANGA PWSS (NEW)",
+      "description": "HADIAPARA FAFANGA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HADIAPARA FAFANGA PWSS (NEW)",
+        "localName": "HADIAPARA FAFANGA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "KRISHNAI",
+        "panchayatcode": "22440",
+        "panchayatname": "FAFANGA",
+        "villageCode": "33346",
+        "villageName": "FOFANGA PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181562",
+        "ddrName": "HADIAPARA FAFANGA PWSS (NEW)",
+        "projectId": "30181562",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HADIAPARA FAFANGA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8175241",
+      "name": "Retrofitting of FAFANGA PWSS",
+      "description": "Retrofitting of FAFANGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of FAFANGA PWSS",
+        "localName": "Retrofitting of FAFANGA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33346",
+        "villageName": "Fofanga Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8175241",
+        "ddrName": "Retrofitting of FAFANGA PWSS",
+        "projectId": "8175241",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of FAFANGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181434",
+      "name": "MUSLIMPARA PWSS (NEW)",
+      "description": "MUSLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUSLIMPARA PWSS (NEW)",
+        "localName": "MUSLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "KRISHNAI",
+        "panchayatcode": "22440",
+        "panchayatname": "FAFANGA",
+        "villageCode": "33346",
+        "villageName": "FOFANGA PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181434",
+        "ddrName": "MUSLIMPARA PWSS (NEW)",
+        "projectId": "30181434",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUSLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30064830",
+      "name": "KHAGRABARI PT-I PWSS (NEW)",
+      "description": "KHAGRABARI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAGRABARI PT-I PWSS (NEW)",
+        "localName": "KHAGRABARI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33348",
+        "villageName": "Khagrabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30064830",
+        "ddrName": "KHAGRABARI PT-I PWSS (NEW)",
+        "projectId": "30064830",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAGRABARI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143504",
+      "name": "TUKURA PWSS (NEW)",
+      "description": "TUKURA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TUKURA PWSS (NEW)",
+        "localName": "TUKURA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33347",
+        "villageName": "Tukura Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143504",
+        "ddrName": "TUKURA PWSS (NEW)",
+        "projectId": "30143504",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TUKURA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018312",
+      "name": "VERVERI PWSS (NEW)",
+      "description": "VERVERI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "VERVERI PWSS (NEW)",
+        "localName": "VERVERI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33349",
+        "villageName": "Tukura Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018312",
+        "ddrName": "VERVERI PWSS (NEW)",
+        "projectId": "30018312",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "VERVERI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068077",
+      "name": "TUKURA PT-II PWSS (NEW)",
+      "description": "TUKURA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TUKURA PT-II PWSS (NEW)",
+        "localName": "TUKURA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33349",
+        "villageName": "Tukura Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068077",
+        "ddrName": "TUKURA PT-II PWSS (NEW)",
+        "projectId": "30068077",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TUKURA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8261995",
+      "name": "GOALPARIA GAON LPS",
+      "description": "GOALPARIA GAON LPS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOALPARIA GAON LPS",
+        "localName": "GOALPARIA GAON LPS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22440",
+        "panchayatname": "Fafanga",
+        "villageCode": "33349",
+        "villageName": "Tukura Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8261995",
+        "ddrName": "GOALPARIA GAON LPS",
+        "projectId": "8261995",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOALPARIA GAON LPS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1941850",
+      "name": "Asudubi PWSS",
+      "description": "Asudubi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Asudubi PWSS",
+        "localName": "Asudubi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33283",
+        "villageName": "Asudubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1941850",
+        "ddrName": "Asudubi PWSS",
+        "projectId": "1941850",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Asudubi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203271",
+      "name": "Retrofitting of ASUDUBI PWSS",
+      "description": "Retrofitting of ASUDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of ASUDUBI PWSS",
+        "localName": "Retrofitting of ASUDUBI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33283",
+        "villageName": "Asudubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203271",
+        "ddrName": "Retrofitting of ASUDUBI PWSS",
+        "projectId": "8203271",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of ASUDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203286",
+      "name": "Retrofitting of KARMAKARPARA PWSS",
+      "description": "Retrofitting of KARMAKARPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KARMAKARPARA PWSS",
+        "localName": "Retrofitting of KARMAKARPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33283",
+        "villageName": "Asudubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203286",
+        "ddrName": "Retrofitting of KARMAKARPARA PWSS",
+        "projectId": "8203286",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KARMAKARPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30215695",
+      "name": "JAMBARI PWSS (NEW)",
+      "description": "JAMBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAMBARI PWSS (NEW)",
+        "localName": "JAMBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33283",
+        "villageName": "Asudubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30215695",
+        "ddrName": "JAMBARI PWSS (NEW)",
+        "projectId": "30215695",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAMBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219532",
+      "name": "Sakudhowa PWSS (NEW)",
+      "description": "Sakudhowa PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sakudhowa PWSS (NEW)",
+        "localName": "Sakudhowa PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33283",
+        "villageName": "Asudubi (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219532",
+        "ddrName": "Sakudhowa PWSS (NEW)",
+        "projectId": "30219532",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sakudhowa PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222264",
+      "name": "Retrofitting of KRISHNAI PWSS",
+      "description": "Retrofitting of KRISHNAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KRISHNAI PWSS",
+        "localName": "Retrofitting of KRISHNAI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33282",
+        "villageName": "Kharijapikon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222264",
+        "ddrName": "Retrofitting of KRISHNAI PWSS",
+        "projectId": "8222264",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KRISHNAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219544",
+      "name": "Chandarbori PWSS (NEW)",
+      "description": "Chandarbori PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chandarbori PWSS (NEW)",
+        "localName": "Chandarbori PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33282",
+        "villageName": "Kharijapikon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219544",
+        "ddrName": "Chandarbori PWSS (NEW)",
+        "projectId": "30219544",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chandarbori PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7637384",
+      "name": "Restoration of Krishnai PWSS",
+      "description": "Restoration of Krishnai PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Restoration of Krishnai PWSS",
+        "localName": "Restoration of Krishnai PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33282",
+        "villageName": "Kharijapikon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7637384",
+        "ddrName": "Restoration of Krishnai PWSS",
+        "projectId": "7637384",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Restoration of Krishnai PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2496136",
+      "name": "Krishnai PWSS",
+      "description": "Krishnai PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Krishnai PWSS",
+        "localName": "Krishnai PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33282",
+        "villageName": "Kharijapikon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2496136",
+        "ddrName": "Krishnai PWSS",
+        "projectId": "2496136",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Krishnai PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6502957",
+      "name": "Karmakarpara PWSS",
+      "description": "Karmakarpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Karmakarpara PWSS",
+        "localName": "Karmakarpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33282",
+        "villageName": "Kharijapikon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6502957",
+        "ddrName": "Karmakarpara PWSS",
+        "projectId": "6502957",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Karmakarpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216055",
+      "name": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+      "description": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+        "localName": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33282",
+        "villageName": "Kharijapikon (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216055",
+        "ddrName": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+        "projectId": "30216055",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037056",
+      "name": "BORJULI PWSS (NEW)",
+      "description": "BORJULI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORJULI PWSS (NEW)",
+        "localName": "BORJULI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33284",
+        "villageName": "Paikan Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037056",
+        "ddrName": "BORJULI PWSS (NEW)",
+        "projectId": "30037056",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORJULI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022851",
+      "name": "MAKRIBORI PWSS(NEW)",
+      "description": "MAKRIBORI PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAKRIBORI PWSS(NEW)",
+        "localName": "MAKRIBORI PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33284",
+        "villageName": "Paikan Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022851",
+        "ddrName": "MAKRIBORI PWSS(NEW)",
+        "projectId": "30022851",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAKRIBORI PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074706",
+      "name": "MADAPARA PWSS (NEW)",
+      "description": "MADAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MADAPARA PWSS (NEW)",
+        "localName": "MADAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33284",
+        "villageName": "Paikan Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074706",
+        "ddrName": "MADAPARA PWSS (NEW)",
+        "projectId": "30074706",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MADAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038197",
+      "name": "NAMAPARA PWSS (NEW)",
+      "description": "NAMAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAMAPARA PWSS (NEW)",
+        "localName": "NAMAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33284",
+        "villageName": "Paikan Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038197",
+        "ddrName": "NAMAPARA PWSS (NEW)",
+        "projectId": "30038197",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAMAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160423",
+      "name": "Retrofitting of PAIKAN PWSS",
+      "description": "Retrofitting of PAIKAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of PAIKAN PWSS",
+        "localName": "Retrofitting of PAIKAN PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33284",
+        "villageName": "Paikan Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160423",
+        "ddrName": "Retrofitting of PAIKAN PWSS",
+        "projectId": "8160423",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of PAIKAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2421922",
+      "name": "Paikan PWSS",
+      "description": "Paikan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Paikan PWSS",
+        "localName": "Paikan PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33284",
+        "villageName": "Paikan Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2421922",
+        "ddrName": "Paikan PWSS",
+        "projectId": "2421922",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Paikan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073492",
+      "name": "AMBARI (KRISHNAI) PWSS (NEW)",
+      "description": "AMBARI (KRISHNAI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMBARI (KRISHNAI) PWSS (NEW)",
+        "localName": "AMBARI (KRISHNAI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073492",
+        "ddrName": "AMBARI (KRISHNAI) PWSS (NEW)",
+        "projectId": "30073492",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMBARI (KRISHNAI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259908",
+      "name": "Paikan Pt II PWSS",
+      "description": "Paikan Pt II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Paikan Pt II PWSS",
+        "localName": "Paikan Pt II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259908",
+        "ddrName": "Paikan Pt II PWSS",
+        "projectId": "6259908",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Paikan Pt II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176394",
+      "name": "ARIMARA PWSS (NEW)",
+      "description": "ARIMARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ARIMARA PWSS (NEW)",
+        "localName": "ARIMARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176394",
+        "ddrName": "ARIMARA PWSS (NEW)",
+        "projectId": "30176394",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ARIMARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072901",
+      "name": "JHORABORI PWSS (NEW)",
+      "description": "JHORABORI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JHORABORI PWSS (NEW)",
+        "localName": "JHORABORI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072901",
+        "ddrName": "JHORABORI PWSS (NEW)",
+        "projectId": "30072901",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JHORABORI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143305",
+      "name": "TULTULIAPARA PWSS (NEW)",
+      "description": "TULTULIAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TULTULIAPARA PWSS (NEW)",
+        "localName": "TULTULIAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143305",
+        "ddrName": "TULTULIAPARA PWSS (NEW)",
+        "projectId": "30143305",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TULTULIAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5568316",
+      "name": "Bujruk Manikpur PWSS",
+      "description": "Bujruk Manikpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bujruk Manikpur PWSS",
+        "localName": "Bujruk Manikpur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5568316",
+        "ddrName": "Bujruk Manikpur PWSS",
+        "projectId": "5568316",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bujruk Manikpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203579",
+      "name": "Retrofitting of BUJRUK MANIKPUR PWSS",
+      "description": "Retrofitting of BUJRUK MANIKPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BUJRUK MANIKPUR PWSS",
+        "localName": "Retrofitting of BUJRUK MANIKPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22433",
+        "panchayatname": "Krishnai",
+        "villageCode": "33285",
+        "villageName": "Paikan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203579",
+        "ddrName": "Retrofitting of BUJRUK MANIKPUR PWSS",
+        "projectId": "8203579",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BUJRUK MANIKPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218731",
+      "name": "PASHIM BORVITA PWSS (NEW)",
+      "description": "PASHIM BORVITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PASHIM BORVITA PWSS (NEW)",
+        "localName": "PASHIM BORVITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33292",
+        "villageName": "Barvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218731",
+        "ddrName": "PASHIM BORVITA PWSS (NEW)",
+        "projectId": "30218731",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PASHIM BORVITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182115",
+      "name": "BARVITA (Manikpur) PWSS (NEW)",
+      "description": "BARVITA (Manikpur) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARVITA (Manikpur) PWSS (NEW)",
+        "localName": "BARVITA (Manikpur) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33292",
+        "villageName": "Barvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182115",
+        "ddrName": "BARVITA (Manikpur) PWSS (NEW)",
+        "projectId": "30182115",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARVITA (Manikpur) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182280",
+      "name": "PACHIM BHELAKHAMAR PWSS (NEW)",
+      "description": "PACHIM BHELAKHAMAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM BHELAKHAMAR PWSS (NEW)",
+        "localName": "PACHIM BHELAKHAMAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33288",
+        "villageName": "Bhela Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182280",
+        "ddrName": "PACHIM BHELAKHAMAR PWSS (NEW)",
+        "projectId": "30182280",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM BHELAKHAMAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181257",
+      "name": "BHELAKHAMAR PWSS (NEW)",
+      "description": "BHELAKHAMAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHELAKHAMAR PWSS (NEW)",
+        "localName": "BHELAKHAMAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33288",
+        "villageName": "Bhela Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181257",
+        "ddrName": "BHELAKHAMAR PWSS (NEW)",
+        "projectId": "30181257",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHELAKHAMAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235405",
+      "name": "Retrofitting of KHAMAR MANIKPUR PWSS",
+      "description": "Retrofitting of KHAMAR MANIKPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHAMAR MANIKPUR PWSS",
+        "localName": "Retrofitting of KHAMAR MANIKPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33290",
+        "villageName": "Bujruk Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235405",
+        "ddrName": "Retrofitting of KHAMAR MANIKPUR PWSS",
+        "projectId": "8235405",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHAMAR MANIKPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182312",
+      "name": "BUJRUKGAON PWSS (NEW)",
+      "description": "BUJRUKGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BUJRUKGAON PWSS (NEW)",
+        "localName": "BUJRUKGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33290",
+        "villageName": "Bujruk Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182312",
+        "ddrName": "BUJRUKGAON PWSS (NEW)",
+        "projectId": "30182312",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BUJRUKGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180654",
+      "name": "PUJARIPARA PWSS (NEW)",
+      "description": "PUJARIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUJARIPARA PWSS (NEW)",
+        "localName": "PUJARIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33290",
+        "villageName": "Bujruk Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180654",
+        "ddrName": "PUJARIPARA PWSS (NEW)",
+        "projectId": "30180654",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUJARIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212830",
+      "name": "KULIYA PWSS (NEW)",
+      "description": "KULIYA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KULIYA PWSS (NEW)",
+        "localName": "KULIYA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33293",
+        "villageName": "Jatsorabdi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212830",
+        "ddrName": "KULIYA PWSS (NEW)",
+        "projectId": "30212830",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KULIYA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212817",
+      "name": "MAJGAON (MANIKPUR) PWSS (NEW)",
+      "description": "MAJGAON (MANIKPUR) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAJGAON (MANIKPUR) PWSS (NEW)",
+        "localName": "MAJGAON (MANIKPUR) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33293",
+        "villageName": "Jatsorabdi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212817",
+        "ddrName": "MAJGAON (MANIKPUR) PWSS (NEW)",
+        "projectId": "30212817",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAJGAON (MANIKPUR) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072841",
+      "name": "DIGHALIBORI PWSS (NEW)",
+      "description": "DIGHALIBORI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIGHALIBORI PWSS (NEW)",
+        "localName": "DIGHALIBORI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33289",
+        "villageName": "Khamar Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072841",
+        "ddrName": "DIGHALIBORI PWSS (NEW)",
+        "projectId": "30072841",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIGHALIBORI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182433",
+      "name": "MANIKPUR PWSS (NEW)",
+      "description": "MANIKPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANIKPUR PWSS (NEW)",
+        "localName": "MANIKPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33289",
+        "villageName": "Khamar Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182433",
+        "ddrName": "MANIKPUR PWSS (NEW)",
+        "projectId": "30182433",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANIKPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182324",
+      "name": "SAKKOMARI PWSS (NEW)",
+      "description": "SAKKOMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAKKOMARI PWSS (NEW)",
+        "localName": "SAKKOMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33289",
+        "villageName": "Khamar Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182324",
+        "ddrName": "SAKKOMARI PWSS (NEW)",
+        "projectId": "30182324",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAKKOMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143496",
+      "name": "KHARIJA MANIKPUR PWSS (NEW)",
+      "description": "KHARIJA MANIKPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARIJA MANIKPUR PWSS (NEW)",
+        "localName": "KHARIJA MANIKPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22435",
+        "panchayatname": "Manikpur Bhelakhamar",
+        "villageCode": "33291",
+        "villageName": "Kharija Manikpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143496",
+        "ddrName": "KHARIJA MANIKPUR PWSS (NEW)",
+        "projectId": "30143496",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARIJA MANIKPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069093",
+      "name": "AMJONGA PWSS (NEW)",
+      "description": "AMJONGA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMJONGA PWSS (NEW)",
+        "localName": "AMJONGA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33324",
+        "villageName": "Amjonga Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069093",
+        "ddrName": "AMJONGA PWSS (NEW)",
+        "projectId": "30069093",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMJONGA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181091",
+      "name": "AMJONGA PT-II PWSS (NEW)",
+      "description": "AMJONGA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMJONGA PT-II PWSS (NEW)",
+        "localName": "AMJONGA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33325",
+        "villageName": "Amjonga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181091",
+        "ddrName": "AMJONGA PT-II PWSS (NEW)",
+        "projectId": "30181091",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMJONGA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181970",
+      "name": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+      "description": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+        "localName": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33325",
+        "villageName": "Amjonga Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181970",
+        "ddrName": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+        "projectId": "30181970",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181293",
+      "name": "BAIDA PWSS (NEW)",
+      "description": "BAIDA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAIDA PWSS (NEW)",
+        "localName": "BAIDA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33326",
+        "villageName": "Baida",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181293",
+        "ddrName": "BAIDA PWSS (NEW)",
+        "projectId": "30181293",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAIDA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213079",
+      "name": "Berubari Pt-I PWSS",
+      "description": "Berubari Pt-I PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Berubari Pt-I PWSS",
+        "localName": "Berubari Pt-I PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33327",
+        "villageName": "Berubari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213079",
+        "ddrName": "Berubari Pt-I PWSS",
+        "projectId": "30213079",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Berubari Pt-I PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046286",
+      "name": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+      "description": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+        "localName": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33329",
+        "villageName": "Changmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046286",
+        "ddrName": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+        "projectId": "30046286",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180724",
+      "name": "DARAKONA PWSS (NEW)",
+      "description": "DARAKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DARAKONA PWSS (NEW)",
+        "localName": "DARAKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33331",
+        "villageName": "Darakona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180724",
+        "ddrName": "DARAKONA PWSS (NEW)",
+        "projectId": "30180724",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DARAKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150234",
+      "name": "HALOWAPARA PWSS (NEW)",
+      "description": "HALOWAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HALOWAPARA PWSS (NEW)",
+        "localName": "HALOWAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33332",
+        "villageName": "Halowapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150234",
+        "ddrName": "HALOWAPARA PWSS (NEW)",
+        "projectId": "30150234",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HALOWAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218736",
+      "name": "BALIHARTOLI PWSS (NEW)",
+      "description": "BALIHARTOLI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIHARTOLI PWSS (NEW)",
+        "localName": "BALIHARTOLI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "KRISHNAI",
+        "panchayatcode": "22439",
+        "panchayatname": "MESSELKHOWA",
+        "villageCode": "33333",
+        "villageName": "KACHUMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218736",
+        "ddrName": "BALIHARTOLI PWSS (NEW)",
+        "projectId": "30218736",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIHARTOLI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067036",
+      "name": "KASUMARI PWSS (NEW)",
+      "description": "KASUMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KASUMARI PWSS (NEW)",
+        "localName": "KASUMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33333",
+        "villageName": "Kachumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067036",
+        "ddrName": "KASUMARI PWSS (NEW)",
+        "projectId": "30067036",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KASUMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212736",
+      "name": "KASUMARI NOABARA PWSS (NEW)",
+      "description": "KASUMARI NOABARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KASUMARI NOABARA PWSS (NEW)",
+        "localName": "KASUMARI NOABARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33333",
+        "villageName": "Kachumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212736",
+        "ddrName": "KASUMARI NOABARA PWSS (NEW)",
+        "projectId": "30212736",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KASUMARI NOABARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185635",
+      "name": "Messelkhowa PWSS",
+      "description": "Messelkhowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Messelkhowa PWSS",
+        "localName": "Messelkhowa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33333",
+        "villageName": "Kachumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185635",
+        "ddrName": "Messelkhowa PWSS",
+        "projectId": "5185635",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Messelkhowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156315",
+      "name": "Retrofitting of MESSELKHOWA PWSS",
+      "description": "Retrofitting of MESSELKHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MESSELKHOWA PWSS",
+        "localName": "Retrofitting of MESSELKHOWA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33333",
+        "villageName": "Kachumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156315",
+        "ddrName": "Retrofitting of MESSELKHOWA PWSS",
+        "projectId": "8156315",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MESSELKHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185650",
+      "name": "Messelkhowa PWSS",
+      "description": "Messelkhowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Messelkhowa PWSS",
+        "localName": "Messelkhowa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33333",
+        "villageName": "Kachumari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185650",
+        "ddrName": "Messelkhowa PWSS",
+        "projectId": "5185650",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Messelkhowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221164",
+      "name": "KAIMARAI PWSS",
+      "description": "KAIMARAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAIMARAI PWSS",
+        "localName": "KAIMARAI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33337",
+        "villageName": "Kaimari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221164",
+        "ddrName": "KAIMARAI PWSS",
+        "projectId": "30221164",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAIMARAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181145",
+      "name": "ACHONGPARA PWSS (NEW)",
+      "description": "ACHONGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ACHONGPARA PWSS (NEW)",
+        "localName": "ACHONGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33334",
+        "villageName": "Khankhal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181145",
+        "ddrName": "ACHONGPARA PWSS (NEW)",
+        "projectId": "30181145",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ACHONGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182096",
+      "name": "KHANGKHAL PWSS (NEW)",
+      "description": "KHANGKHAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHANGKHAL PWSS (NEW)",
+        "localName": "KHANGKHAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33334",
+        "villageName": "Khankhal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182096",
+        "ddrName": "KHANGKHAL PWSS (NEW)",
+        "projectId": "30182096",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHANGKHAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181444",
+      "name": "KUKURKATA PWSS (NEW)",
+      "description": "KUKURKATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUKURKATA PWSS (NEW)",
+        "localName": "KUKURKATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33335",
+        "villageName": "Kukurkata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181444",
+        "ddrName": "KUKURKATA PWSS (NEW)",
+        "projectId": "30181444",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUKURKATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211695",
+      "name": "BESAPARA PWSS (NEW)",
+      "description": "BESAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BESAPARA PWSS (NEW)",
+        "localName": "BESAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33335",
+        "villageName": "Kukurkata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211695",
+        "ddrName": "BESAPARA PWSS (NEW)",
+        "projectId": "30211695",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BESAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212673",
+      "name": "DEGHRI PASCIMPARA PWSS (NEW)",
+      "description": "DEGHRI PASCIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEGHRI PASCIMPARA PWSS (NEW)",
+        "localName": "DEGHRI PASCIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33338",
+        "villageName": "Mechelkhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212673",
+        "ddrName": "DEGHRI PASCIMPARA PWSS (NEW)",
+        "projectId": "30212673",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEGHRI PASCIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048673",
+      "name": "HADAKONA PWSS (NEW)",
+      "description": "HADAKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HADAKONA PWSS (NEW)",
+        "localName": "HADAKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33338",
+        "villageName": "Mechelkhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048673",
+        "ddrName": "HADAKONA PWSS (NEW)",
+        "projectId": "30048673",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HADAKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212710",
+      "name": "SIB BARI PWSS (NEW)",
+      "description": "SIB BARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIB BARI PWSS (NEW)",
+        "localName": "SIB BARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33338",
+        "villageName": "Mechelkhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212710",
+        "ddrName": "SIB BARI PWSS (NEW)",
+        "projectId": "30212710",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIB BARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179808",
+      "name": "SALGODA PWSS (NEW)",
+      "description": "SALGODA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALGODA PWSS (NEW)",
+        "localName": "SALGODA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33338",
+        "villageName": "Mechelkhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179808",
+        "ddrName": "SALGODA PWSS (NEW)",
+        "projectId": "30179808",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALGODA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181910",
+      "name": "NAYAGAON PWSS (NEW)",
+      "description": "NAYAGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAGAON PWSS (NEW)",
+        "localName": "NAYAGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33339",
+        "villageName": "Naya Gaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181910",
+        "ddrName": "NAYAGAON PWSS (NEW)",
+        "projectId": "30181910",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182397",
+      "name": "GAROPARA PWSS (NEW)",
+      "description": "GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROPARA PWSS (NEW)",
+        "localName": "GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33342",
+        "villageName": "Rangdam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182397",
+        "ddrName": "GAROPARA PWSS (NEW)",
+        "projectId": "30182397",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096579",
+      "name": "RANGDARA PWSS (NEW)",
+      "description": "RANGDARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGDARA PWSS (NEW)",
+        "localName": "RANGDARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33342",
+        "villageName": "Rangdam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096579",
+        "ddrName": "RANGDARA PWSS (NEW)",
+        "projectId": "30096579",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGDARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212847",
+      "name": "WANGNANG PWSS (NEW)",
+      "description": "WANGNANG PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "WANGNANG PWSS (NEW)",
+        "localName": "WANGNANG PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33342",
+        "villageName": "Rangdam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212847",
+        "ddrName": "WANGNANG PWSS (NEW)",
+        "projectId": "30212847",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "WANGNANG PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181892",
+      "name": "KACHARIPARA PWSS (NEW)",
+      "description": "KACHARIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KACHARIPARA PWSS (NEW)",
+        "localName": "KACHARIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22439",
+        "panchayatname": "Messelkhowa",
+        "villageCode": "33343",
+        "villageName": "Taranti",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181892",
+        "ddrName": "KACHARIPARA PWSS (NEW)",
+        "projectId": "30181892",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KACHARIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259933",
+      "name": "Bheltarghat PWSS",
+      "description": "Bheltarghat PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bheltarghat PWSS",
+        "localName": "Bheltarghat PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259933",
+        "ddrName": "Bheltarghat PWSS",
+        "projectId": "6259933",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bheltarghat PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177971",
+      "name": "GHONAPARA PWSS (NEW)",
+      "description": "GHONAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHONAPARA PWSS (NEW)",
+        "localName": "GHONAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177971",
+        "ddrName": "GHONAPARA PWSS (NEW)",
+        "projectId": "30177971",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHONAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213057",
+      "name": "RAMPUR PWSS (NEW)",
+      "description": "RAMPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMPUR PWSS (NEW)",
+        "localName": "RAMPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213057",
+        "ddrName": "RAMPUR PWSS (NEW)",
+        "projectId": "30213057",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937948",
+      "name": "Guria PWSS",
+      "description": "Guria PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Guria PWSS",
+        "localName": "Guria PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937948",
+        "ddrName": "Guria PWSS",
+        "projectId": "1937948",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Guria PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160455",
+      "name": "Retrofitting of GURIA PWSS",
+      "description": "Retrofitting of GURIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GURIA PWSS",
+        "localName": "Retrofitting of GURIA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160455",
+        "ddrName": "Retrofitting of GURIA PWSS",
+        "projectId": "8160455",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GURIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179397",
+      "name": "NAMAPARA EAST PWSS (NEW)",
+      "description": "NAMAPARA EAST PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAMAPARA EAST PWSS (NEW)",
+        "localName": "NAMAPARA EAST PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179397",
+        "ddrName": "NAMAPARA EAST PWSS (NEW)",
+        "projectId": "30179397",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAMAPARA EAST PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179473",
+      "name": "PEKPEKI PWSS (NEW)",
+      "description": "PEKPEKI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PEKPEKI PWSS (NEW)",
+        "localName": "PEKPEKI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33287",
+        "villageName": "Krishnai Guria Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179473",
+        "ddrName": "PEKPEKI PWSS (NEW)",
+        "projectId": "30179473",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PEKPEKI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176575",
+      "name": "BEKIPOOL PWSS (NEW)",
+      "description": "BEKIPOOL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BEKIPOOL PWSS (NEW)",
+        "localName": "BEKIPOOL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176575",
+        "ddrName": "BEKIPOOL PWSS (NEW)",
+        "projectId": "30176575",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BEKIPOOL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259888",
+      "name": "Siali PWSS",
+      "description": "Siali PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Siali PWSS",
+        "localName": "Siali PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259888",
+        "ddrName": "Siali PWSS",
+        "projectId": "6259888",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Siali PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213202",
+      "name": "GARO SICHA PWSS (NEW)",
+      "description": "GARO SICHA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARO SICHA PWSS (NEW)",
+        "localName": "GARO SICHA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213202",
+        "ddrName": "GARO SICHA PWSS (NEW)",
+        "projectId": "30213202",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARO SICHA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143323",
+      "name": "JYOTINAGAR PWSS (NEW)",
+      "description": "JYOTINAGAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JYOTINAGAR PWSS (NEW)",
+        "localName": "JYOTINAGAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143323",
+        "ddrName": "JYOTINAGAR PWSS (NEW)",
+        "projectId": "30143323",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JYOTINAGAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073350",
+      "name": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+      "description": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+        "localName": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073350",
+        "ddrName": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+        "projectId": "30073350",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176209",
+      "name": "KHARIDHORA PWSS (NEW)",
+      "description": "KHARIDHORA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARIDHORA PWSS (NEW)",
+        "localName": "KHARIDHORA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176209",
+        "ddrName": "KHARIDHORA PWSS (NEW)",
+        "projectId": "30176209",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARIDHORA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160400",
+      "name": "Retrofitting of MOLANDUBI PWSS",
+      "description": "Retrofitting of MOLANDUBI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MOLANDUBI PWSS",
+        "localName": "Retrofitting of MOLANDUBI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160400",
+        "ddrName": "Retrofitting of MOLANDUBI PWSS",
+        "projectId": "8160400",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MOLANDUBI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2421911",
+      "name": "MOlandubi PWSS",
+      "description": "MOlandubi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOlandubi PWSS",
+        "localName": "MOlandubi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2421911",
+        "ddrName": "MOlandubi PWSS",
+        "projectId": "2421911",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOlandubi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072996",
+      "name": "NAYAPARA PWSS (NEW)",
+      "description": "NAYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PWSS (NEW)",
+        "localName": "NAYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072996",
+        "ddrName": "NAYAPARA PWSS (NEW)",
+        "projectId": "30072996",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096711",
+      "name": "PAKHIRIGURI PWSS (NEW)",
+      "description": "PAKHIRIGURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAKHIRIGURI PWSS (NEW)",
+        "localName": "PAKHIRIGURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22434",
+        "panchayatname": "Molandubi",
+        "villageCode": "33286",
+        "villageName": "Salpara Molandubi Pt.-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096711",
+        "ddrName": "PAKHIRIGURI PWSS (NEW)",
+        "projectId": "30096711",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAKHIRIGURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386407",
+      "name": "Barmohra PWSS",
+      "description": "Barmohra PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barmohra PWSS",
+        "localName": "Barmohra PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33350",
+        "villageName": "Barmohara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386407",
+        "ddrName": "Barmohra PWSS",
+        "projectId": "3386407",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barmohra PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171572",
+      "name": "Retrofitting of BARMOHRA PWSS",
+      "description": "Retrofitting of BARMOHRA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BARMOHRA PWSS",
+        "localName": "Retrofitting of BARMOHRA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33350",
+        "villageName": "Barmohara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171572",
+        "ddrName": "Retrofitting of BARMOHRA PWSS",
+        "projectId": "8171572",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BARMOHRA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180965",
+      "name": "PACHIPARA PWSS (NEW)",
+      "description": "PACHIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIPARA PWSS (NEW)",
+        "localName": "PACHIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33350",
+        "villageName": "Barmohara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180965",
+        "ddrName": "PACHIPARA PWSS (NEW)",
+        "projectId": "30180965",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182357",
+      "name": "BORMOHRA PT-II PWSS (NEW)",
+      "description": "BORMOHRA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORMOHRA PT-II PWSS (NEW)",
+        "localName": "BORMOHRA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33351",
+        "villageName": "Barmohara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182357",
+        "ddrName": "BORMOHRA PT-II PWSS (NEW)",
+        "projectId": "30182357",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORMOHRA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30113852",
+      "name": "MUSLIMPARA-III PWSS (NEW)",
+      "description": "MUSLIMPARA-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUSLIMPARA-III PWSS (NEW)",
+        "localName": "MUSLIMPARA-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33352",
+        "villageName": "Hadigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30113852",
+        "ddrName": "MUSLIMPARA-III PWSS (NEW)",
+        "projectId": "30113852",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUSLIMPARA-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6858112",
+      "name": "Khermohra PWSS",
+      "description": "Khermohra PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khermohra PWSS",
+        "localName": "Khermohra PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33353",
+        "villageName": "Kharmohara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6858112",
+        "ddrName": "Khermohra PWSS",
+        "projectId": "6858112",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khermohra PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937928",
+      "name": "Khermohra PWSS",
+      "description": "Khermohra PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khermohra PWSS",
+        "localName": "Khermohra PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33353",
+        "villageName": "Kharmohara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937928",
+        "ddrName": "Khermohra PWSS",
+        "projectId": "1937928",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khermohra PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30180870",
+      "name": "GAROPARA (Tukura) PWSS (NEW)",
+      "description": "GAROPARA (Tukura) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROPARA (Tukura) PWSS (NEW)",
+        "localName": "GAROPARA (Tukura) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33353",
+        "villageName": "Kharmohara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30180870",
+        "ddrName": "GAROPARA (Tukura) PWSS (NEW)",
+        "projectId": "30180870",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROPARA (Tukura) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156288",
+      "name": "Retrofitting of KHERMOHRA PWSS",
+      "description": "Retrofitting of KHERMOHRA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHERMOHRA PWSS",
+        "localName": "Retrofitting of KHERMOHRA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33353",
+        "villageName": "Kharmohara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156288",
+        "ddrName": "Retrofitting of KHERMOHRA PWSS",
+        "projectId": "8156288",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHERMOHRA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212751",
+      "name": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+      "description": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+        "localName": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "KRISHNAI",
+        "panchayatcode": "22441",
+        "panchayatname": "TUKURA BORMOHRA",
+        "villageCode": "33354",
+        "villageName": "TUKURA PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212751",
+        "ddrName": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+        "projectId": "30212751",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211591",
+      "name": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+      "description": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+        "localName": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "KRISHNAI",
+        "panchayatcode": "22441",
+        "panchayatname": "TUKURA BORMOHRA",
+        "villageCode": "33354",
+        "villageName": "TUKURA PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211591",
+        "ddrName": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+        "projectId": "30211591",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072880",
+      "name": "HINDPARA PWSS (NEW)",
+      "description": "HINDPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HINDPARA PWSS (NEW)",
+        "localName": "HINDPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33354",
+        "villageName": "Tukura Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072880",
+        "ddrName": "HINDPARA PWSS (NEW)",
+        "projectId": "30072880",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HINDPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222311",
+      "name": "Retrofitting of TUKURA HADIGAON PWSS",
+      "description": "Retrofitting of TUKURA HADIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TUKURA HADIGAON PWSS",
+        "localName": "Retrofitting of TUKURA HADIGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33354",
+        "villageName": "Tukura Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222311",
+        "ddrName": "Retrofitting of TUKURA HADIGAON PWSS",
+        "projectId": "8222311",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TUKURA HADIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185659",
+      "name": "Tukura Hadigaon PWSS",
+      "description": "Tukura Hadigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tukura Hadigaon PWSS",
+        "localName": "Tukura Hadigaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33354",
+        "villageName": "Tukura Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185659",
+        "ddrName": "Tukura Hadigaon PWSS",
+        "projectId": "5185659",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tukura Hadigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185655",
+      "name": "Tukura Hadigaon PWSS",
+      "description": "Tukura Hadigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tukura Hadigaon PWSS",
+        "localName": "Tukura Hadigaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22441",
+        "panchayatname": "Tukura Bormohra",
+        "villageCode": "33354",
+        "villageName": "Tukura Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185655",
+        "ddrName": "Tukura Hadigaon PWSS",
+        "projectId": "5185655",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tukura Hadigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176539",
+      "name": "BAPUJINAGAR PWSS (NEW)",
+      "description": "BAPUJINAGAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPUJINAGAR PWSS (NEW)",
+        "localName": "BAPUJINAGAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176539",
+        "ddrName": "BAPUJINAGAR PWSS (NEW)",
+        "projectId": "30176539",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPUJINAGAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516189",
+      "name": "Bamunipanikhowa PWSS",
+      "description": "Bamunipanikhowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamunipanikhowa PWSS",
+        "localName": "Bamunipanikhowa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516189",
+        "ddrName": "Bamunipanikhowa PWSS",
+        "projectId": "2516189",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamunipanikhowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171970",
+      "name": "Retrofitting of BAMUNIPANIKHOWA PWSS",
+      "description": "Retrofitting of BAMUNIPANIKHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAMUNIPANIKHOWA PWSS",
+        "localName": "Retrofitting of BAMUNIPANIKHOWA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171970",
+        "ddrName": "Retrofitting of BAMUNIPANIKHOWA PWSS",
+        "projectId": "8171970",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAMUNIPANIKHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177874",
+      "name": "BHEBHERI 2 PWSS (NEW)",
+      "description": "BHEBHERI 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHEBHERI 2 PWSS (NEW)",
+        "localName": "BHEBHERI 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177874",
+        "ddrName": "BHEBHERI 2 PWSS (NEW)",
+        "projectId": "30177874",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHEBHERI 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177929",
+      "name": "BHUBHERI-1 PWSS (NEW)",
+      "description": "BHUBHERI-1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHUBHERI-1 PWSS (NEW)",
+        "localName": "BHUBHERI-1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177929",
+        "ddrName": "BHUBHERI-1 PWSS (NEW)",
+        "projectId": "30177929",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHUBHERI-1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176156",
+      "name": "BOLDAMPARA PWSS (NEW)",
+      "description": "BOLDAMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOLDAMPARA PWSS (NEW)",
+        "localName": "BOLDAMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176156",
+        "ddrName": "BOLDAMPARA PWSS (NEW)",
+        "projectId": "30176156",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOLDAMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072845",
+      "name": "GANAKGREY PWSS (NEW)",
+      "description": "GANAKGREY PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GANAKGREY PWSS (NEW)",
+        "localName": "GANAKGREY PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072845",
+        "ddrName": "GANAKGREY PWSS (NEW)",
+        "projectId": "30072845",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GANAKGREY PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176679",
+      "name": "NAMABASTI PWSS (NEW)",
+      "description": "NAMABASTI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAMABASTI PWSS (NEW)",
+        "localName": "NAMABASTI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33304",
+        "villageName": "Bamun Panikhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176679",
+        "ddrName": "NAMABASTI PWSS (NEW)",
+        "projectId": "30176679",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAMABASTI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170784",
+      "name": "BAPUKONA PWSS (NEW)",
+      "description": "BAPUKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPUKONA PWSS (NEW)",
+        "localName": "BAPUKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33306",
+        "villageName": "Belpara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170784",
+        "ddrName": "BAPUKONA PWSS (NEW)",
+        "projectId": "30170784",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPUKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170948",
+      "name": "BELGURI PWSS (NEW)",
+      "description": "BELGURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BELGURI PWSS (NEW)",
+        "localName": "BELGURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33306",
+        "villageName": "Belpara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170948",
+        "ddrName": "BELGURI PWSS (NEW)",
+        "projectId": "30170948",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BELGURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173688",
+      "name": "DANGAPARA PWSS (NEW)",
+      "description": "DANGAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DANGAPARA PWSS (NEW)",
+        "localName": "DANGAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33306",
+        "villageName": "Belpara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173688",
+        "ddrName": "DANGAPARA PWSS (NEW)",
+        "projectId": "30173688",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DANGAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178423",
+      "name": "BELPARA PT-II PWSS (NEW)",
+      "description": "BELPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BELPARA PT-II PWSS (NEW)",
+        "localName": "BELPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33307",
+        "villageName": "Belpara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178423",
+        "ddrName": "BELPARA PT-II PWSS (NEW)",
+        "projectId": "30178423",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BELPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170249",
+      "name": "DALUPARA PWSS (NEW)",
+      "description": "DALUPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DALUPARA PWSS (NEW)",
+        "localName": "DALUPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33308",
+        "villageName": "Khardang Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170249",
+        "ddrName": "DALUPARA PWSS (NEW)",
+        "projectId": "30170249",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DALUPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176117",
+      "name": "SARAKPURA 1 PWSS (NEW)",
+      "description": "SARAKPURA 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SARAKPURA 1 PWSS (NEW)",
+        "localName": "SARAKPURA 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33308",
+        "villageName": "Khardang Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176117",
+        "ddrName": "SARAKPURA 1 PWSS (NEW)",
+        "projectId": "30176117",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SARAKPURA 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173698",
+      "name": "AMBARI PWSS (NEW)",
+      "description": "AMBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMBARI PWSS (NEW)",
+        "localName": "AMBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33309",
+        "villageName": "Khardang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173698",
+        "ddrName": "AMBARI PWSS (NEW)",
+        "projectId": "30173698",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203251",
+      "name": "Retrofitting of KHARDANG PWSS",
+      "description": "Retrofitting of KHARDANG PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHARDANG PWSS",
+        "localName": "Retrofitting of KHARDANG PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33309",
+        "villageName": "Khardang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203251",
+        "ddrName": "Retrofitting of KHARDANG PWSS",
+        "projectId": "8203251",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHARDANG PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173770",
+      "name": "CHARAKPARA 2 PWSS (NEW)",
+      "description": "CHARAKPARA 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHARAKPARA 2 PWSS (NEW)",
+        "localName": "CHARAKPARA 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33309",
+        "villageName": "Khardang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173770",
+        "ddrName": "CHARAKPARA 2 PWSS (NEW)",
+        "projectId": "30173770",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHARAKPARA 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216928",
+      "name": "KOCHPARA PWSS (NEW) (Zira)",
+      "description": "KOCHPARA PWSS (NEW) (Zira)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOCHPARA PWSS (NEW) (Zira)",
+        "localName": "KOCHPARA PWSS (NEW) (Zira)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33309",
+        "villageName": "Khardang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216928",
+        "ddrName": "KOCHPARA PWSS (NEW) (Zira)",
+        "projectId": "30216928",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOCHPARA PWSS (NEW) (Zira)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174052",
+      "name": "HASTINAPUR PWSS (NEW)",
+      "description": "HASTINAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HASTINAPUR PWSS (NEW)",
+        "localName": "HASTINAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33312",
+        "villageName": "Pachim Dairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174052",
+        "ddrName": "HASTINAPUR PWSS (NEW)",
+        "projectId": "30174052",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HASTINAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176605",
+      "name": "KHERBARI PWSS (NEW)",
+      "description": "KHERBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHERBARI PWSS (NEW)",
+        "localName": "KHERBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33312",
+        "villageName": "Pachim Dairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176605",
+        "ddrName": "KHERBARI PWSS (NEW)",
+        "projectId": "30176605",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHERBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169657",
+      "name": "PACHIM JIRA PWSS (NEW)",
+      "description": "PACHIM JIRA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM JIRA PWSS (NEW)",
+        "localName": "PACHIM JIRA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "622667",
+        "villageName": "Pachimjira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169657",
+        "ddrName": "PACHIM JIRA PWSS (NEW)",
+        "projectId": "30169657",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM JIRA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176709",
+      "name": "RONGAPANI PWSS (NEW)",
+      "description": "RONGAPANI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RONGAPANI PWSS (NEW)",
+        "localName": "RONGAPANI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33305",
+        "villageName": "Pub-dairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176709",
+        "ddrName": "RONGAPANI PWSS (NEW)",
+        "projectId": "30176709",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RONGAPANI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176038",
+      "name": "FALGOMPARA PWSS (NEW)",
+      "description": "FALGOMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FALGOMPARA PWSS (NEW)",
+        "localName": "FALGOMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33305",
+        "villageName": "Pub-dairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176038",
+        "ddrName": "FALGOMPARA PWSS (NEW)",
+        "projectId": "30176038",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FALGOMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175648",
+      "name": "GARO BAHAMPARA PWSS (NEW)",
+      "description": "GARO BAHAMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GARO BAHAMPARA PWSS (NEW)",
+        "localName": "GARO BAHAMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33305",
+        "villageName": "Pub-dairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175648",
+        "ddrName": "GARO BAHAMPARA PWSS (NEW)",
+        "projectId": "30175648",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GARO BAHAMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221148",
+      "name": "JAGUANG PWSS (NEW)",
+      "description": "JAGUANG PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAGUANG PWSS (NEW)",
+        "localName": "JAGUANG PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33305",
+        "villageName": "Pub-dairang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221148",
+        "ddrName": "JAGUANG PWSS (NEW)",
+        "projectId": "30221148",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAGUANG PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160451",
+      "name": "Retrofitting of ZIRA PWSS",
+      "description": "Retrofitting of ZIRA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of ZIRA PWSS",
+        "localName": "Retrofitting of ZIRA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33303",
+        "villageName": "Pub-jira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160451",
+        "ddrName": "Retrofitting of ZIRA PWSS",
+        "projectId": "8160451",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of ZIRA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516159",
+      "name": "Zira PWSS",
+      "description": "Zira PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Zira PWSS",
+        "localName": "Zira PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33303",
+        "villageName": "Pub-jira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516159",
+        "ddrName": "Zira PWSS",
+        "projectId": "2516159",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Zira PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173962",
+      "name": "PUB-ZIRA PWSS (NEW)",
+      "description": "PUB-ZIRA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB-ZIRA PWSS (NEW)",
+        "localName": "PUB-ZIRA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33303",
+        "villageName": "Pub-jira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173962",
+        "ddrName": "PUB-ZIRA PWSS (NEW)",
+        "projectId": "30173962",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB-ZIRA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173679",
+      "name": "ROKETKONA PWSS (NEW)",
+      "description": "ROKETKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROKETKONA PWSS (NEW)",
+        "localName": "ROKETKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33303",
+        "villageName": "Pub-jira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173679",
+        "ddrName": "ROKETKONA PWSS (NEW)",
+        "projectId": "30173679",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROKETKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175983",
+      "name": "SELAPARA PWSS (NEW)",
+      "description": "SELAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SELAPARA PWSS (NEW)",
+        "localName": "SELAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33311",
+        "villageName": "Selapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175983",
+        "ddrName": "SELAPARA PWSS (NEW)",
+        "projectId": "30175983",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SELAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8176627",
+      "name": "Retrofitting of DAIRANG SELAPARA PWSS",
+      "description": "Retrofitting of DAIRANG SELAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DAIRANG SELAPARA PWSS",
+        "localName": "Retrofitting of DAIRANG SELAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33311",
+        "villageName": "Selapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8176627",
+        "ddrName": "Retrofitting of DAIRANG SELAPARA PWSS",
+        "projectId": "8176627",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DAIRANG SELAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4887720",
+      "name": "Dairong Celapara PWSS",
+      "description": "Dairong Celapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dairong Celapara PWSS",
+        "localName": "Dairong Celapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33311",
+        "villageName": "Selapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4887720",
+        "ddrName": "Dairong Celapara PWSS",
+        "projectId": "4887720",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dairong Celapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173740",
+      "name": "THERATHOP PWSS (NEW)",
+      "description": "THERATHOP PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THERATHOP PWSS (NEW)",
+        "localName": "THERATHOP PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "villageCode": "33310",
+        "villageName": "Tarathop",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173740",
+        "ddrName": "THERATHOP PWSS (NEW)",
+        "projectId": "30173740",
+        "regionName": "1188"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THERATHOP PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179533",
+      "name": "BAGUAN PT-II PWSS (NEW)",
+      "description": "BAGUAN PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUAN PT-II PWSS (NEW)",
+        "localName": "BAGUAN PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33278",
+        "villageName": "Baguan Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179533",
+        "ddrName": "BAGUAN PT-II PWSS (NEW)",
+        "projectId": "30179533",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUAN PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216024",
+      "name": "BAGUAN PT-III NO.3 PWSS (NEW)",
+      "description": "BAGUAN PT-III NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUAN PT-III NO.3 PWSS (NEW)",
+        "localName": "BAGUAN PT-III NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33279",
+        "villageName": "Baguan Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216024",
+        "ddrName": "BAGUAN PT-III NO.3 PWSS (NEW)",
+        "projectId": "30216024",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUAN PT-III NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070243",
+      "name": "BAGUAN PT-III NO 2 PWSS (NEW)",
+      "description": "BAGUAN PT-III NO 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUAN PT-III NO 2 PWSS (NEW)",
+        "localName": "BAGUAN PT-III NO 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33279",
+        "villageName": "Baguan Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070243",
+        "ddrName": "BAGUAN PT-III NO 2 PWSS (NEW)",
+        "projectId": "30070243",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUAN PT-III NO 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070309",
+      "name": "BAGUAN PT-III PWSS (NEW)",
+      "description": "BAGUAN PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUAN PT-III PWSS (NEW)",
+        "localName": "BAGUAN PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33279",
+        "villageName": "Baguan Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070309",
+        "ddrName": "BAGUAN PT-III PWSS (NEW)",
+        "projectId": "30070309",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUAN PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179124",
+      "name": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+      "description": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+        "localName": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33280",
+        "villageName": "Baguan Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179124",
+        "ddrName": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+        "projectId": "30179124",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179578",
+      "name": "BAGUAN PT-IV PWSS (NEW)",
+      "description": "BAGUAN PT-IV PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGUAN PT-IV PWSS (NEW)",
+        "localName": "BAGUAN PT-IV PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33280",
+        "villageName": "Baguan Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179578",
+        "ddrName": "BAGUAN PT-IV PWSS (NEW)",
+        "projectId": "30179578",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGUAN PT-IV PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174894",
+      "name": "TOPLAKHOWA No. 3 PWSS (NEW)",
+      "description": "TOPLAKHOWA No. 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TOPLAKHOWA No. 3 PWSS (NEW)",
+        "localName": "TOPLAKHOWA No. 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33281",
+        "villageName": "Toplakhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174894",
+        "ddrName": "TOPLAKHOWA No. 3 PWSS (NEW)",
+        "projectId": "30174894",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TOPLAKHOWA No. 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178310",
+      "name": "Sardarpara Baguan PWSS",
+      "description": "Sardarpara Baguan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sardarpara Baguan PWSS",
+        "localName": "Sardarpara Baguan PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22432",
+        "panchayatname": "Baguan Kathalbari",
+        "villageCode": "33281",
+        "villageName": "Toplakhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178310",
+        "ddrName": "Sardarpara Baguan PWSS",
+        "projectId": "30178310",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sardarpara Baguan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063223",
+      "name": "LASKARPARA PWSS (NEW)",
+      "description": "LASKARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LASKARPARA PWSS (NEW)",
+        "localName": "LASKARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33220",
+        "villageName": "Chituk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063223",
+        "ddrName": "LASKARPARA PWSS (NEW)",
+        "projectId": "30063223",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LASKARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048776",
+      "name": "DAMRA PATPARA NO.2 PWSS (NEW)",
+      "description": "DAMRA PATPARA NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMRA PATPARA NO.2 PWSS (NEW)",
+        "localName": "DAMRA PATPARA NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048776",
+        "ddrName": "DAMRA PATPARA NO.2 PWSS (NEW)",
+        "projectId": "30048776",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMRA PATPARA NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216058",
+      "name": "DAMRA PATPARA NO.5 PWSS (NEW)",
+      "description": "DAMRA PATPARA NO.5 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMRA PATPARA NO.5 PWSS (NEW)",
+        "localName": "DAMRA PATPARA NO.5 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216058",
+        "ddrName": "DAMRA PATPARA NO.5 PWSS (NEW)",
+        "projectId": "30216058",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMRA PATPARA NO.5 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30050952",
+      "name": "DAMRA PATPARA NO.3 PWSS (NEW)",
+      "description": "DAMRA PATPARA NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMRA PATPARA NO.3 PWSS (NEW)",
+        "localName": "DAMRA PATPARA NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30050952",
+        "ddrName": "DAMRA PATPARA NO.3 PWSS (NEW)",
+        "projectId": "30050952",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMRA PATPARA NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185685",
+      "name": "Damra Patpara PWSS",
+      "description": "Damra Patpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Damra Patpara PWSS",
+        "localName": "Damra Patpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185685",
+        "ddrName": "Damra Patpara PWSS",
+        "projectId": "5185685",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Damra Patpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067699",
+      "name": "GAROPARA (DAMRA) PWSS (NEW)",
+      "description": "GAROPARA (DAMRA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROPARA (DAMRA) PWSS (NEW)",
+        "localName": "GAROPARA (DAMRA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067699",
+        "ddrName": "GAROPARA (DAMRA) PWSS (NEW)",
+        "projectId": "30067699",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROPARA (DAMRA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076588",
+      "name": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+      "description": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+        "localName": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076588",
+        "ddrName": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+        "projectId": "30076588",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018741",
+      "name": "Patpara PWSS(NEW)",
+      "description": "Patpara PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Patpara PWSS(NEW)",
+        "localName": "Patpara PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018741",
+        "ddrName": "Patpara PWSS(NEW)",
+        "projectId": "30018741",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Patpara PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235371",
+      "name": "Retrofitting of DAMRA PATPARA PWSS",
+      "description": "Retrofitting of DAMRA PATPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DAMRA PATPARA PWSS",
+        "localName": "Retrofitting of DAMRA PATPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33222",
+        "villageName": "Damara Patpara (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235371",
+        "ddrName": "Retrofitting of DAMRA PATPARA PWSS",
+        "projectId": "8235371",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DAMRA PATPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070269",
+      "name": "DIGHALI PWSS (NEW)",
+      "description": "DIGHALI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIGHALI PWSS (NEW)",
+        "localName": "DIGHALI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33223",
+        "villageName": "Dighali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070269",
+        "ddrName": "DIGHALI PWSS (NEW)",
+        "projectId": "30070269",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIGHALI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176756",
+      "name": "HABANGGIRI No.4 PWSS (NEW)",
+      "description": "HABANGGIRI No.4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HABANGGIRI No.4 PWSS (NEW)",
+        "localName": "HABANGGIRI No.4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33219",
+        "villageName": "Habanggiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176756",
+        "ddrName": "HABANGGIRI No.4 PWSS (NEW)",
+        "projectId": "30176756",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HABANGGIRI No.4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176525",
+      "name": "HABANGGIRI NO.2 PWSS (NEW)",
+      "description": "HABANGGIRI NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HABANGGIRI NO.2 PWSS (NEW)",
+        "localName": "HABANGGIRI NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33219",
+        "villageName": "Habanggiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176525",
+        "ddrName": "HABANGGIRI NO.2 PWSS (NEW)",
+        "projectId": "30176525",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HABANGGIRI NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222352",
+      "name": "Retrofitting of HABANGIRI PWSS",
+      "description": "Retrofitting of HABANGIRI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HABANGIRI PWSS",
+        "localName": "Retrofitting of HABANGIRI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33219",
+        "villageName": "Habanggiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222352",
+        "ddrName": "Retrofitting of HABANGIRI PWSS",
+        "projectId": "8222352",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HABANGIRI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070276",
+      "name": "HABANGGIRI NO.3 PWSS",
+      "description": "HABANGGIRI NO.3 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HABANGGIRI NO.3 PWSS",
+        "localName": "HABANGGIRI NO.3 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33219",
+        "villageName": "Habanggiri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070276",
+        "ddrName": "HABANGGIRI NO.3 PWSS",
+        "projectId": "30070276",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HABANGGIRI NO.3 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022816",
+      "name": "DAGLAPARA PWSS (NEW)",
+      "description": "DAGLAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAGLAPARA PWSS (NEW)",
+        "localName": "DAGLAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33225",
+        "villageName": "Nakma Kundi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022816",
+        "ddrName": "DAGLAPARA PWSS (NEW)",
+        "projectId": "30022816",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAGLAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206524",
+      "name": "Retrofitting of KACHOMARI PWSS",
+      "description": "Retrofitting of KACHOMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KACHOMARI PWSS",
+        "localName": "Retrofitting of KACHOMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33225",
+        "villageName": "Nakma Kundi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206524",
+        "ddrName": "Retrofitting of KACHOMARI PWSS",
+        "projectId": "8206524",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KACHOMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937549",
+      "name": "Kachomari PWSS",
+      "description": "Kachomari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kachomari PWSS",
+        "localName": "Kachomari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33225",
+        "villageName": "Nakma Kundi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937549",
+        "ddrName": "Kachomari PWSS",
+        "projectId": "1937549",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kachomari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175668",
+      "name": "NISHANGRAM No.2 PWSS (NEW)",
+      "description": "NISHANGRAM No.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NISHANGRAM No.2 PWSS (NEW)",
+        "localName": "NISHANGRAM No.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33221",
+        "villageName": "Nishangram",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175668",
+        "ddrName": "NISHANGRAM No.2 PWSS (NEW)",
+        "projectId": "30175668",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NISHANGRAM No.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8228352",
+      "name": "Retrofitting of NISHANGRAM PWSS",
+      "description": "Retrofitting of NISHANGRAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NISHANGRAM PWSS",
+        "localName": "Retrofitting of NISHANGRAM PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33221",
+        "villageName": "Nishangram",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8228352",
+        "ddrName": "Retrofitting of NISHANGRAM PWSS",
+        "projectId": "8228352",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NISHANGRAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237467",
+      "name": "Retrofitting of BALASARA PWSS",
+      "description": "Retrofitting of BALASARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BALASARA PWSS",
+        "localName": "Retrofitting of BALASARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237467",
+        "ddrName": "Retrofitting of BALASARA PWSS",
+        "projectId": "8237467",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BALASARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516940",
+      "name": "Balasara PWSS",
+      "description": "Balasara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balasara PWSS",
+        "localName": "Balasara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516940",
+        "ddrName": "Balasara PWSS",
+        "projectId": "2516940",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balasara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070239",
+      "name": "THEKASHU PT.III PWSS (NEW)",
+      "description": "THEKASHU PT.III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.III PWSS (NEW)",
+        "localName": "THEKASHU PT.III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070239",
+        "ddrName": "THEKASHU PT.III PWSS (NEW)",
+        "projectId": "30070239",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179510",
+      "name": "THEKASHU PT.III No. 2 PWSS (NEW)",
+      "description": "THEKASHU PT.III No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.III No. 2 PWSS (NEW)",
+        "localName": "THEKASHU PT.III No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179510",
+        "ddrName": "THEKASHU PT.III No. 2 PWSS (NEW)",
+        "projectId": "30179510",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.III No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221221",
+      "name": "Thekasu Pt-III No.3 PWSS (NEW)",
+      "description": "Thekasu Pt-III No.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thekasu Pt-III No.3 PWSS (NEW)",
+        "localName": "Thekasu Pt-III No.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221221",
+        "ddrName": "Thekasu Pt-III No.3 PWSS (NEW)",
+        "projectId": "30221221",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thekasu Pt-III No.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937654",
+      "name": "Shantinagar PWSS",
+      "description": "Shantinagar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Shantinagar PWSS",
+        "localName": "Shantinagar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937654",
+        "ddrName": "Shantinagar PWSS",
+        "projectId": "1937654",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Shantinagar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205283",
+      "name": "Retrofitting of THEKASU PWSS",
+      "description": "Retrofitting of THEKASU PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of THEKASU PWSS",
+        "localName": "Retrofitting of THEKASU PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205283",
+        "ddrName": "Retrofitting of THEKASU PWSS",
+        "projectId": "8205283",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of THEKASU PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185665",
+      "name": "Thekashu PWSS",
+      "description": "Thekashu PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thekashu PWSS",
+        "localName": "Thekashu PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22427",
+        "panchayatname": "Damara",
+        "villageCode": "33224",
+        "villageName": "Thekashu Pt.iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185665",
+        "ddrName": "Thekashu PWSS",
+        "projectId": "5185665",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thekashu PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068614",
+      "name": "CHOWKAKATA PWSS (NEW)",
+      "description": "CHOWKAKATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOWKAKATA PWSS (NEW)",
+        "localName": "CHOWKAKATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33268",
+        "villageName": "Chouka-kata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068614",
+        "ddrName": "CHOWKAKATA PWSS (NEW)",
+        "projectId": "30068614",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOWKAKATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206068",
+      "name": "Retrofitting of GANDIMPATHAR PWSS",
+      "description": "Retrofitting of GANDIMPATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GANDIMPATHAR PWSS",
+        "localName": "Retrofitting of GANDIMPATHAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33271",
+        "villageName": "Gadim Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206068",
+        "ddrName": "Retrofitting of GANDIMPATHAR PWSS",
+        "projectId": "8206068",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GANDIMPATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2520181",
+      "name": "Naba Salpara PWSS",
+      "description": "Naba Salpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naba Salpara PWSS",
+        "localName": "Naba Salpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33255",
+        "villageName": "Hajaripara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2520181",
+        "ddrName": "Naba Salpara PWSS",
+        "projectId": "2520181",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naba Salpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160460",
+      "name": "Retrofitting of NABA SALPARA PWSS",
+      "description": "Retrofitting of NABA SALPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NABA SALPARA PWSS",
+        "localName": "Retrofitting of NABA SALPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33255",
+        "villageName": "Hajaripara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160460",
+        "ddrName": "Retrofitting of NABA SALPARA PWSS",
+        "projectId": "8160460",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NABA SALPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30040182",
+      "name": "JHAKOWAPARA PWSS (NEW)",
+      "description": "JHAKOWAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JHAKOWAPARA PWSS (NEW)",
+        "localName": "JHAKOWAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33264",
+        "villageName": "Jakhowapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30040182",
+        "ddrName": "JHAKOWAPARA PWSS (NEW)",
+        "projectId": "30040182",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JHAKOWAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169802",
+      "name": "KHAMAGADIM PWSS (NEW)",
+      "description": "KHAMAGADIM PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAMAGADIM PWSS (NEW)",
+        "localName": "KHAMAGADIM PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33264",
+        "villageName": "Jakhowapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169802",
+        "ddrName": "KHAMAGADIM PWSS (NEW)",
+        "projectId": "30169802",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAMAGADIM PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169790",
+      "name": "TENGABARI (DARRANGIRI) PWSS",
+      "description": "TENGABARI (DARRANGIRI) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TENGABARI (DARRANGIRI) PWSS",
+        "localName": "TENGABARI (DARRANGIRI) PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33264",
+        "villageName": "Jakhowapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169790",
+        "ddrName": "TENGABARI (DARRANGIRI) PWSS",
+        "projectId": "30169790",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TENGABARI (DARRANGIRI) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173794",
+      "name": "CHEKOSAN PWSS (NEW)",
+      "description": "CHEKOSAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHEKOSAN PWSS (NEW)",
+        "localName": "CHEKOSAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33259",
+        "villageName": "Kachari Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173794",
+        "ddrName": "CHEKOSAN PWSS (NEW)",
+        "projectId": "30173794",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHEKOSAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160409",
+      "name": "Retrofitting of KACHARIPARA PWSS",
+      "description": "Retrofitting of KACHARIPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KACHARIPARA PWSS",
+        "localName": "Retrofitting of KACHARIPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33259",
+        "villageName": "Kachari Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160409",
+        "ddrName": "Retrofitting of KACHARIPARA PWSS",
+        "projectId": "8160409",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KACHARIPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178023",
+      "name": "KANYAKUCHI PWSS (NEW)",
+      "description": "KANYAKUCHI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANYAKUCHI PWSS (NEW)",
+        "localName": "KANYAKUCHI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33267",
+        "villageName": "Kanyakuchi Pahar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178023",
+        "ddrName": "KANYAKUCHI PWSS (NEW)",
+        "projectId": "30178023",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANYAKUCHI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159671",
+      "name": "Retrofitting of KUCHDHOWA PWSS",
+      "description": "Retrofitting of KUCHDHOWA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KUCHDHOWA PWSS",
+        "localName": "Retrofitting of KUCHDHOWA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33265",
+        "villageName": "Kuchdhowapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159671",
+        "ddrName": "Retrofitting of KUCHDHOWA PWSS",
+        "projectId": "8159671",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KUCHDHOWA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159691",
+      "name": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+      "description": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+        "localName": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33265",
+        "villageName": "Kuchdhowapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159691",
+        "ddrName": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+        "projectId": "8159691",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069086",
+      "name": "KUCHDHOWAPARA PWSS (NEW)",
+      "description": "KUCHDHOWAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUCHDHOWAPARA PWSS (NEW)",
+        "localName": "KUCHDHOWAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33266",
+        "villageName": "Kushdhowa Para Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069086",
+        "ddrName": "KUCHDHOWAPARA PWSS (NEW)",
+        "projectId": "30069086",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUCHDHOWAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174863",
+      "name": "KACHOMARI 1 PWSS (NEW)",
+      "description": "KACHOMARI 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KACHOMARI 1 PWSS (NEW)",
+        "localName": "KACHOMARI 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33535",
+        "villageName": "Melopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174863",
+        "ddrName": "KACHOMARI 1 PWSS (NEW)",
+        "projectId": "30174863",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KACHOMARI 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259850",
+      "name": "Melopara",
+      "description": "Melopara",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Melopara",
+        "localName": "Melopara",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33535",
+        "villageName": "Melopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259850",
+        "ddrName": "Melopara",
+        "projectId": "6259850",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Melopara",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171462",
+      "name": "Retrofitting of RAWMARI MELOPARA PWSS",
+      "description": "Retrofitting of RAWMARI MELOPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RAWMARI MELOPARA PWSS",
+        "localName": "Retrofitting of RAWMARI MELOPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33535",
+        "villageName": "Melopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171462",
+        "ddrName": "Retrofitting of RAWMARI MELOPARA PWSS",
+        "projectId": "8171462",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RAWMARI MELOPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159727",
+      "name": "Retrofitting of MOISKHULI GAROPARA PWSS",
+      "description": "Retrofitting of MOISKHULI GAROPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MOISKHULI GAROPARA PWSS",
+        "localName": "Retrofitting of MOISKHULI GAROPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33273",
+        "villageName": "Moish Khulipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159727",
+        "ddrName": "Retrofitting of MOISKHULI GAROPARA PWSS",
+        "projectId": "8159727",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MOISKHULI GAROPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4870229",
+      "name": "Moiskhuli Garopara PWSS",
+      "description": "Moiskhuli Garopara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Moiskhuli Garopara PWSS",
+        "localName": "Moiskhuli Garopara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33273",
+        "villageName": "Moish Khulipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4870229",
+        "ddrName": "Moiskhuli Garopara PWSS",
+        "projectId": "4870229",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Moiskhuli Garopara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070357",
+      "name": "TILAPARA KAMARPARA PWSS (NEW)",
+      "description": "TILAPARA KAMARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA KAMARPARA PWSS (NEW)",
+        "localName": "TILAPARA KAMARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33273",
+        "villageName": "Moish Khulipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070357",
+        "ddrName": "TILAPARA KAMARPARA PWSS (NEW)",
+        "projectId": "30070357",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA KAMARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076595",
+      "name": "MOISKHULIPARA PWSS (NEW)",
+      "description": "MOISKHULIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOISKHULIPARA PWSS (NEW)",
+        "localName": "MOISKHULIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33273",
+        "villageName": "Moish Khulipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076595",
+        "ddrName": "MOISKHULIPARA PWSS (NEW)",
+        "projectId": "30076595",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOISKHULIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070365",
+      "name": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+      "description": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+        "localName": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33274",
+        "villageName": "Moishkhuli Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070365",
+        "ddrName": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+        "projectId": "30070365",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221189",
+      "name": "MOISKHULI KHAMAR PWSS (NEW)",
+      "description": "MOISKHULI KHAMAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOISKHULI KHAMAR PWSS (NEW)",
+        "localName": "MOISKHULI KHAMAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33274",
+        "villageName": "Moishkhuli Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221189",
+        "ddrName": "MOISKHULI KHAMAR PWSS (NEW)",
+        "projectId": "30221189",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOISKHULI KHAMAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170419",
+      "name": "PATIARPARA PT-I PWSS (NEW)",
+      "description": "PATIARPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PATIARPARA PT-I PWSS (NEW)",
+        "localName": "PATIARPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33257",
+        "villageName": "Patiarpara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170419",
+        "ddrName": "PATIARPARA PT-I PWSS (NEW)",
+        "projectId": "30170419",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PATIARPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160474",
+      "name": "Retrofitting of KACHADOL PWSS",
+      "description": "Retrofitting of KACHADOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KACHADOL PWSS",
+        "localName": "Retrofitting of KACHADOL PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33272",
+        "villageName": "Prithupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160474",
+        "ddrName": "Retrofitting of KACHADOL PWSS",
+        "projectId": "8160474",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KACHADOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173975",
+      "name": "SENGADING LETKUBARI PWSS (NEW)",
+      "description": "SENGADING LETKUBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SENGADING LETKUBARI PWSS (NEW)",
+        "localName": "SENGADING LETKUBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33272",
+        "villageName": "Prithupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173975",
+        "ddrName": "SENGADING LETKUBARI PWSS (NEW)",
+        "projectId": "30173975",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SENGADING LETKUBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3359758",
+      "name": "Kachadol PWSS",
+      "description": "Kachadol PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kachadol PWSS",
+        "localName": "Kachadol PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33272",
+        "villageName": "Prithupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3359758",
+        "ddrName": "Kachadol PWSS",
+        "projectId": "3359758",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kachadol PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070314",
+      "name": "RANGPATHAR PWSS (NEW)",
+      "description": "RANGPATHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGPATHAR PWSS (NEW)",
+        "localName": "RANGPATHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33270",
+        "villageName": "Rang Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070314",
+        "ddrName": "RANGPATHAR PWSS (NEW)",
+        "projectId": "30070314",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGPATHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174677",
+      "name": "RANGRANGPARA PWSS (NEW)",
+      "description": "RANGRANGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RANGRANGPARA PWSS (NEW)",
+        "localName": "RANGRANGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33262",
+        "villageName": "Rang Rongpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174677",
+        "ddrName": "RANGRANGPARA PWSS (NEW)",
+        "projectId": "30174677",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RANGRANGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30169988",
+      "name": "RAWMARI PT-II PWSS (NEW)",
+      "description": "RAWMARI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAWMARI PT-II PWSS (NEW)",
+        "localName": "RAWMARI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33537",
+        "villageName": "Rowmari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30169988",
+        "ddrName": "RAWMARI PT-II PWSS (NEW)",
+        "projectId": "30169988",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAWMARI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222348",
+      "name": "Retrofitting of TARAPARA PWSS",
+      "description": "Retrofitting of TARAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TARAPARA PWSS",
+        "localName": "Retrofitting of TARAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33258",
+        "villageName": "Tarapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222348",
+        "ddrName": "Retrofitting of TARAPARA PWSS",
+        "projectId": "8222348",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TARAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170237",
+      "name": "PAHARTOLI PWSS (NEW)",
+      "description": "PAHARTOLI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAHARTOLI PWSS (NEW)",
+        "localName": "PAHARTOLI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22431",
+        "panchayatname": "Darranggiri",
+        "villageCode": "33258",
+        "villageName": "Tarapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170237",
+        "ddrName": "PAHARTOLI PWSS (NEW)",
+        "projectId": "30170237",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAHARTOLI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178942",
+      "name": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+      "description": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+        "localName": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33215",
+        "villageName": "Khara Medhipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178942",
+        "ddrName": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+        "projectId": "30178942",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179000",
+      "name": "KHARA MEDHIPARA PWSS (NEW)",
+      "description": "KHARA MEDHIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARA MEDHIPARA PWSS (NEW)",
+        "localName": "KHARA MEDHIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33215",
+        "villageName": "Khara Medhipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179000",
+        "ddrName": "KHARA MEDHIPARA PWSS (NEW)",
+        "projectId": "30179000",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARA MEDHIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176517",
+      "name": "KHARA PT -II NO. 2 PWSS (NEW)",
+      "description": "KHARA PT -II NO. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARA PT -II NO. 2 PWSS (NEW)",
+        "localName": "KHARA PT -II NO. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33214",
+        "villageName": "Khara Pt -ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176517",
+        "ddrName": "KHARA PT -II NO. 2 PWSS (NEW)",
+        "projectId": "30176517",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARA PT -II NO. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173982",
+      "name": "KHARA PT -II NO. 3 PWSS (NEW)",
+      "description": "KHARA PT -II NO. 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARA PT -II NO. 3 PWSS (NEW)",
+        "localName": "KHARA PT -II NO. 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33214",
+        "villageName": "Khara Pt -ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173982",
+        "ddrName": "KHARA PT -II NO. 3 PWSS (NEW)",
+        "projectId": "30173982",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARA PT -II NO. 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8202008",
+      "name": "Retrofitting of KHARA PT II PWSS",
+      "description": "Retrofitting of KHARA PT II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHARA PT II PWSS",
+        "localName": "Retrofitting of KHARA PT II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33214",
+        "villageName": "Khara Pt -ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8202008",
+        "ddrName": "Retrofitting of KHARA PT II PWSS",
+        "projectId": "8202008",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHARA PT II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203051",
+      "name": "Retrofitting of KHARA (OLD) PWSS",
+      "description": "Retrofitting of KHARA (OLD) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHARA (OLD) PWSS",
+        "localName": "Retrofitting of KHARA (OLD) PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33213",
+        "villageName": "Khara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203051",
+        "ddrName": "Retrofitting of KHARA (OLD) PWSS",
+        "projectId": "8203051",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHARA (OLD) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176178",
+      "name": "TANGABARI PWSS (NEW)",
+      "description": "TANGABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TANGABARI PWSS (NEW)",
+        "localName": "TANGABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33218",
+        "villageName": "Tangabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176178",
+        "ddrName": "TANGABARI PWSS (NEW)",
+        "projectId": "30176178",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TANGABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175795",
+      "name": "TANGABARI NO. 2 PWSS (NEW)",
+      "description": "TANGABARI NO. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TANGABARI NO. 2 PWSS (NEW)",
+        "localName": "TANGABARI NO. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33218",
+        "villageName": "Tangabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175795",
+        "ddrName": "TANGABARI NO. 2 PWSS (NEW)",
+        "projectId": "30175795",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TANGABARI NO. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070344",
+      "name": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+      "description": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+        "localName": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33216",
+        "villageName": "Thekashu Pt-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070344",
+        "ddrName": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+        "projectId": "30070344",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216021",
+      "name": "THEKASHU PT-I NO.5 PWSS (NEW)",
+      "description": "THEKASHU PT-I NO.5 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT-I NO.5 PWSS (NEW)",
+        "localName": "THEKASHU PT-I NO.5 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33216",
+        "villageName": "Thekashu Pt-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216021",
+        "ddrName": "THEKASHU PT-I NO.5 PWSS (NEW)",
+        "projectId": "30216021",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT-I NO.5 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070236",
+      "name": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+      "description": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+        "localName": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33216",
+        "villageName": "Thekashu Pt-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070236",
+        "ddrName": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+        "projectId": "30070236",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070350",
+      "name": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+      "description": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+        "localName": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33216",
+        "villageName": "Thekashu Pt-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070350",
+        "ddrName": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+        "projectId": "30070350",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070346",
+      "name": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+      "description": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+        "localName": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33216",
+        "villageName": "Thekashu Pt-i (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070346",
+        "ddrName": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+        "projectId": "30070346",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159295",
+      "name": "Babupara (BTC, Dudhnoi) PWSS",
+      "description": "Babupara (BTC, Dudhnoi) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Babupara (BTC, Dudhnoi) PWSS",
+        "localName": "Babupara (BTC, Dudhnoi) PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159295",
+        "ddrName": "Babupara (BTC, Dudhnoi) PWSS",
+        "projectId": "8159295",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Babupara (BTC, Dudhnoi) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4651600",
+      "name": "Thekasu PT II PWSS",
+      "description": "Thekasu PT II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thekasu PT II PWSS",
+        "localName": "Thekasu PT II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4651600",
+        "ddrName": "Thekasu PT II PWSS",
+        "projectId": "4651600",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thekasu PT II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6234085",
+      "name": "DUdhnoi PWSS",
+      "description": "DUdhnoi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DUdhnoi PWSS",
+        "localName": "DUdhnoi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6234085",
+        "ddrName": "DUdhnoi PWSS",
+        "projectId": "6234085",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DUdhnoi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221203",
+      "name": "THEKASHU PT-II  No.4 PWSS (NEW)",
+      "description": "THEKASHU PT-II  No.4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT-II  No.4 PWSS (NEW)",
+        "localName": "THEKASHU PT-II  No.4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221203",
+        "ddrName": "THEKASHU PT-II  No.4 PWSS (NEW)",
+        "projectId": "30221203",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT-II  No.4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178092",
+      "name": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+      "description": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+        "localName": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178092",
+        "ddrName": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+        "projectId": "30178092",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205127",
+      "name": "Retrofitting of SHANTINAGAR PWSS",
+      "description": "Retrofitting of SHANTINAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SHANTINAGAR PWSS",
+        "localName": "Retrofitting of SHANTINAGAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205127",
+        "ddrName": "Retrofitting of SHANTINAGAR PWSS",
+        "projectId": "8205127",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SHANTINAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6852674",
+      "name": "Shantinagar PWSS",
+      "description": "Shantinagar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Shantinagar PWSS",
+        "localName": "Shantinagar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6852674",
+        "ddrName": "Shantinagar PWSS",
+        "projectId": "6852674",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Shantinagar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179724",
+      "name": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+      "description": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+        "localName": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22426",
+        "panchayatname": "Dudhnoi",
+        "villageCode": "33217",
+        "villageName": "Thekashu Pt.-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179724",
+        "ddrName": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+        "projectId": "30179724",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208101",
+      "name": "DARAKH NEW PWSS",
+      "description": "DARAKH NEW PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DARAKH NEW PWSS",
+        "localName": "DARAKH NEW PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33254",
+        "villageName": "Darakhpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208101",
+        "ddrName": "DARAKH NEW PWSS",
+        "projectId": "30208101",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DARAKH NEW PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160417",
+      "name": "Retrofitting of DARAKH PWSS",
+      "description": "Retrofitting of DARAKH PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DARAKH PWSS",
+        "localName": "Retrofitting of DARAKH PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33254",
+        "villageName": "Darakhpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160417",
+        "ddrName": "Retrofitting of DARAKH PWSS",
+        "projectId": "8160417",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DARAKH PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5379810",
+      "name": "Darakh PWSS",
+      "description": "Darakh PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Darakh PWSS",
+        "localName": "Darakh PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33254",
+        "villageName": "Darakhpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5379810",
+        "ddrName": "Darakh PWSS",
+        "projectId": "5379810",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Darakh PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023984",
+      "name": "LATAPARA PWSS (NEW)",
+      "description": "LATAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LATAPARA PWSS (NEW)",
+        "localName": "LATAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33254",
+        "villageName": "Darakhpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023984",
+        "ddrName": "LATAPARA PWSS (NEW)",
+        "projectId": "30023984",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LATAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070342",
+      "name": "DEULGURI PT-I PWSS (NEW)",
+      "description": "DEULGURI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEULGURI PT-I PWSS (NEW)",
+        "localName": "DEULGURI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33252",
+        "villageName": "Deulguri Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070342",
+        "ddrName": "DEULGURI PT-I PWSS (NEW)",
+        "projectId": "30070342",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEULGURI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4887898",
+      "name": "Deulguri PWSS",
+      "description": "Deulguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Deulguri PWSS",
+        "localName": "Deulguri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33252",
+        "villageName": "Deulguri Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4887898",
+        "ddrName": "Deulguri PWSS",
+        "projectId": "4887898",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Deulguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159680",
+      "name": "Retrofitting of CHESAPANI PWSS",
+      "description": "Retrofitting of CHESAPANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHESAPANI PWSS",
+        "localName": "Retrofitting of CHESAPANI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33263",
+        "villageName": "Kuchdhowa Chechapani Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159680",
+        "ddrName": "Retrofitting of CHESAPANI PWSS",
+        "projectId": "8159680",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHESAPANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175727",
+      "name": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+      "description": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+        "localName": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33275",
+        "villageName": "Kuchdhowa Chechapani Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175727",
+        "ddrName": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+        "projectId": "30175727",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075704",
+      "name": "MANUPARA 2 PWSS (NEW)",
+      "description": "MANUPARA 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANUPARA 2 PWSS (NEW)",
+        "localName": "MANUPARA 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33251",
+        "villageName": "Manupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075704",
+        "ddrName": "MANUPARA 2 PWSS (NEW)",
+        "projectId": "30075704",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANUPARA 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206496",
+      "name": "Retrofitting of MANUPARA PWSS",
+      "description": "Retrofitting of MANUPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MANUPARA PWSS",
+        "localName": "Retrofitting of MANUPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33251",
+        "villageName": "Manupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206496",
+        "ddrName": "Retrofitting of MANUPARA PWSS",
+        "projectId": "8206496",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MANUPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068606",
+      "name": "MANUPARA 1 PWSS (NEW)",
+      "description": "MANUPARA 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANUPARA 1 PWSS (NEW)",
+        "localName": "MANUPARA 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33251",
+        "villageName": "Manupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068606",
+        "ddrName": "MANUPARA 1 PWSS (NEW)",
+        "projectId": "30068606",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANUPARA 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2404401",
+      "name": "Manupara PWSS",
+      "description": "Manupara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Manupara PWSS",
+        "localName": "Manupara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33251",
+        "villageName": "Manupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2404401",
+        "ddrName": "Manupara PWSS",
+        "projectId": "2404401",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Manupara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173972",
+      "name": "PAHARTULI PWSS (NEW)",
+      "description": "PAHARTULI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAHARTULI PWSS (NEW)",
+        "localName": "PAHARTULI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33251",
+        "villageName": "Manupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173972",
+        "ddrName": "PAHARTULI PWSS (NEW)",
+        "projectId": "30173972",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAHARTULI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213053",
+      "name": "MANUPARA TILAPARA PWSS (NEW)",
+      "description": "MANUPARA TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANUPARA TILAPARA PWSS (NEW)",
+        "localName": "MANUPARA TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22430",
+        "panchayatname": "Kuchdhowa",
+        "villageCode": "33251",
+        "villageName": "Manupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213053",
+        "ddrName": "MANUPARA TILAPARA PWSS (NEW)",
+        "projectId": "30213053",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANUPARA TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237554",
+      "name": "Retrofitting of BAGULAMARI PWSS",
+      "description": "Retrofitting of BAGULAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAGULAMARI PWSS",
+        "localName": "Retrofitting of BAGULAMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33237",
+        "villageName": "Bagulamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237554",
+        "ddrName": "Retrofitting of BAGULAMARI PWSS",
+        "projectId": "8237554",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAGULAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176676",
+      "name": "BAGULAMARI NO. 2 PWSS (NEW)",
+      "description": "BAGULAMARI NO. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAGULAMARI NO. 2 PWSS (NEW)",
+        "localName": "BAGULAMARI NO. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33237",
+        "villageName": "Bagulamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176676",
+        "ddrName": "BAGULAMARI NO. 2 PWSS (NEW)",
+        "projectId": "30176676",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAGULAMARI NO. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176552",
+      "name": "Bagulamari No. 3 PWSS (NEW)",
+      "description": "Bagulamari No. 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bagulamari No. 3 PWSS (NEW)",
+        "localName": "Bagulamari No. 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33237",
+        "villageName": "Bagulamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176552",
+        "ddrName": "Bagulamari No. 3 PWSS (NEW)",
+        "projectId": "30176552",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bagulamari No. 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018739",
+      "name": "Baje Mondal Sialmari PWSS(NEW)",
+      "description": "Baje Mondal Sialmari PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baje Mondal Sialmari PWSS(NEW)",
+        "localName": "Baje Mondal Sialmari PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33249",
+        "villageName": "Baje Mandal Sialmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018739",
+        "ddrName": "Baje Mondal Sialmari PWSS(NEW)",
+        "projectId": "30018739",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baje Mondal Sialmari PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070267",
+      "name": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+      "description": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+        "localName": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33249",
+        "villageName": "Baje Mandal Sialmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070267",
+        "ddrName": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+        "projectId": "30070267",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206510",
+      "name": "Retrofitting of BANDARSHREE NEW PWSS",
+      "description": "Retrofitting of BANDARSHREE NEW PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BANDARSHREE NEW PWSS",
+        "localName": "Retrofitting of BANDARSHREE NEW PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33240",
+        "villageName": "Bandar Shee Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206510",
+        "ddrName": "Retrofitting of BANDARSHREE NEW PWSS",
+        "projectId": "8206510",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BANDARSHREE NEW PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6145716",
+      "name": "Bandarshree New PWSS",
+      "description": "Bandarshree New PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bandarshree New PWSS",
+        "localName": "Bandarshree New PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33240",
+        "villageName": "Bandar Shee Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6145716",
+        "ddrName": "Bandarshree New PWSS",
+        "projectId": "6145716",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bandarshree New PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170226",
+      "name": "BANDARSHRI PT-I M PWSS (NEW)",
+      "description": "BANDARSHRI PT-I M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANDARSHRI PT-I M PWSS (NEW)",
+        "localName": "BANDARSHRI PT-I M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33240",
+        "villageName": "Bandar Shee Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170226",
+        "ddrName": "BANDARSHRI PT-I M PWSS (NEW)",
+        "projectId": "30170226",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANDARSHRI PT-I M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30196401",
+      "name": "BANDARSHREE PT-II PWSS (NEW)",
+      "description": "BANDARSHREE PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANDARSHREE PT-II PWSS (NEW)",
+        "localName": "BANDARSHREE PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33241",
+        "villageName": "Bandar Shee Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30196401",
+        "ddrName": "BANDARSHREE PT-II PWSS (NEW)",
+        "projectId": "30196401",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANDARSHREE PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872595",
+      "name": "Bandarshree Pt-III PWSS",
+      "description": "Bandarshree Pt-III PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bandarshree Pt-III PWSS",
+        "localName": "Bandarshree Pt-III PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33242",
+        "villageName": "Bandar Shee Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872595",
+        "ddrName": "Bandarshree Pt-III PWSS",
+        "projectId": "4872595",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bandarshree Pt-III PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196914",
+      "name": "Retrofitting of BANDARSHREE PT III PWSS",
+      "description": "Retrofitting of BANDARSHREE PT III PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BANDARSHREE PT III PWSS",
+        "localName": "Retrofitting of BANDARSHREE PT III PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33242",
+        "villageName": "Bandar Shee Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196914",
+        "ddrName": "Retrofitting of BANDARSHREE PT III PWSS",
+        "projectId": "8196914",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BANDARSHREE PT III PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173965",
+      "name": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+      "description": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+        "localName": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33246",
+        "villageName": "Bar Matia Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173965",
+        "ddrName": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+        "projectId": "30173965",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174065",
+      "name": "BAR MATIA PT-II PWSS (NEW)",
+      "description": "BAR MATIA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAR MATIA PT-II PWSS (NEW)",
+        "localName": "BAR MATIA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33246",
+        "villageName": "Bar Matia Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174065",
+        "ddrName": "BAR MATIA PT-II PWSS (NEW)",
+        "projectId": "30174065",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAR MATIA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176252",
+      "name": "BAR PATHAR PWSS (NEW)",
+      "description": "BAR PATHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAR PATHAR PWSS (NEW)",
+        "localName": "BAR PATHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33239",
+        "villageName": "Bar Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176252",
+        "ddrName": "BAR PATHAR PWSS (NEW)",
+        "projectId": "30176252",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAR PATHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173782",
+      "name": "BARMATIA PT-I PWSS (NEW)",
+      "description": "BARMATIA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARMATIA PT-I PWSS (NEW)",
+        "localName": "BARMATIA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33245",
+        "villageName": "Barmatia Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173782",
+        "ddrName": "BARMATIA PT-I PWSS (NEW)",
+        "projectId": "30173782",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARMATIA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30171030",
+      "name": "BARMATIA PT-I NO.2 PWSS (NEW)",
+      "description": "BARMATIA PT-I NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARMATIA PT-I NO.2 PWSS (NEW)",
+        "localName": "BARMATIA PT-I NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33245",
+        "villageName": "Barmatia Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30171030",
+        "ddrName": "BARMATIA PT-I NO.2 PWSS (NEW)",
+        "projectId": "30171030",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARMATIA PT-I NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170262",
+      "name": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+      "description": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+        "localName": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33250",
+        "villageName": "Guabari Mandal Gram Hills",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170262",
+        "ddrName": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+        "projectId": "30170262",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872574",
+      "name": "Mandalgram PWSS",
+      "description": "Mandalgram PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mandalgram PWSS",
+        "localName": "Mandalgram PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33248",
+        "villageName": "Lakheraj Mandal Gram Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872574",
+        "ddrName": "Mandalgram PWSS",
+        "projectId": "4872574",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mandalgram PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197048",
+      "name": "Retrofitting of MANDALGRAM PWSS",
+      "description": "Retrofitting of MANDALGRAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MANDALGRAM PWSS",
+        "localName": "Retrofitting of MANDALGRAM PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33248",
+        "villageName": "Lakheraj Mandal Gram Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197048",
+        "ddrName": "Retrofitting of MANDALGRAM PWSS",
+        "projectId": "8197048",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MANDALGRAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173967",
+      "name": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+      "description": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+        "localName": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33247",
+        "villageName": "Lakheraj Mandalgram Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173967",
+        "ddrName": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+        "projectId": "30173967",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178331",
+      "name": "MANDALGRAM PT-I PWSS (NEW)",
+      "description": "MANDALGRAM PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MANDALGRAM PT-I PWSS (NEW)",
+        "localName": "MANDALGRAM PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33247",
+        "villageName": "Lakheraj Mandalgram Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178331",
+        "ddrName": "MANDALGRAM PT-I PWSS (NEW)",
+        "projectId": "30178331",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MANDALGRAM PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7347122",
+      "name": "Baniapara No I PWSS",
+      "description": "Baniapara No I PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baniapara No I PWSS",
+        "localName": "Baniapara No I PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33236",
+        "villageName": "Lela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7347122",
+        "ddrName": "Baniapara No I PWSS",
+        "projectId": "7347122",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baniapara No I PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072599",
+      "name": "LELA PWSS (NEW)",
+      "description": "LELA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LELA PWSS (NEW)",
+        "localName": "LELA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33236",
+        "villageName": "Lela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072599",
+        "ddrName": "LELA PWSS (NEW)",
+        "projectId": "30072599",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LELA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176589",
+      "name": "ROWMARI KALIPUR PWSS (NEW)",
+      "description": "ROWMARI KALIPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROWMARI KALIPUR PWSS (NEW)",
+        "localName": "ROWMARI KALIPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33236",
+        "villageName": "Lela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176589",
+        "ddrName": "ROWMARI KALIPUR PWSS (NEW)",
+        "projectId": "30176589",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROWMARI KALIPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205387",
+      "name": "Retrofitting of MOWAMARI PWSS",
+      "description": "Retrofitting of MOWAMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MOWAMARI PWSS",
+        "localName": "Retrofitting of MOWAMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33238",
+        "villageName": "Mowamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205387",
+        "ddrName": "Retrofitting of MOWAMARI PWSS",
+        "projectId": "8205387",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MOWAMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937513",
+      "name": "Mowamari PWSS",
+      "description": "Mowamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mowamari PWSS",
+        "localName": "Mowamari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33238",
+        "villageName": "Mowamari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937513",
+        "ddrName": "Mowamari PWSS",
+        "projectId": "1937513",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mowamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178175",
+      "name": "RAMBUK PWSS (NEW)",
+      "description": "RAMBUK PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAMBUK PWSS (NEW)",
+        "localName": "RAMBUK PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33244",
+        "villageName": "Rambuk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178175",
+        "ddrName": "RAMBUK PWSS (NEW)",
+        "projectId": "30178175",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAMBUK PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176720",
+      "name": "Rambuk No. 2 PWSS (NEW)",
+      "description": "Rambuk No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rambuk No. 2 PWSS (NEW)",
+        "localName": "Rambuk No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33244",
+        "villageName": "Rambuk",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176720",
+        "ddrName": "Rambuk No. 2 PWSS (NEW)",
+        "projectId": "30176720",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rambuk No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173812",
+      "name": "ROWMARI PWSS (NEW)",
+      "description": "ROWMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROWMARI PWSS (NEW)",
+        "localName": "ROWMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22429",
+        "panchayatname": "Lela",
+        "villageCode": "33243",
+        "villageName": "Rowmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173812",
+        "ddrName": "ROWMARI PWSS (NEW)",
+        "projectId": "30173812",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROWMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179232",
+      "name": "BARIGOAN PWSS (NEW)",
+      "description": "BARIGOAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARIGOAN PWSS (NEW)",
+        "localName": "BARIGOAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33211",
+        "villageName": "Barigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179232",
+        "ddrName": "BARIGOAN PWSS (NEW)",
+        "projectId": "30179232",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARIGOAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178977",
+      "name": "DABLI PWSS (NEW)",
+      "description": "DABLI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DABLI PWSS (NEW)",
+        "localName": "DABLI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33208",
+        "villageName": "Dabli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178977",
+        "ddrName": "DABLI PWSS (NEW)",
+        "projectId": "30178977",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DABLI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203211",
+      "name": "Retrofitting of AMGURI PURANPARA PWSS",
+      "description": "Retrofitting of AMGURI PURANPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AMGURI PURANPARA PWSS",
+        "localName": "Retrofitting of AMGURI PURANPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203211",
+        "ddrName": "Retrofitting of AMGURI PURANPARA PWSS",
+        "projectId": "8203211",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AMGURI PURANPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516005",
+      "name": "Amguri Puranpara PWSS",
+      "description": "Amguri Puranpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Amguri Puranpara PWSS",
+        "localName": "Amguri Puranpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516005",
+        "ddrName": "Amguri Puranpara PWSS",
+        "projectId": "2516005",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Amguri Puranpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203278",
+      "name": "Retrofitting of DOHELA PWSS",
+      "description": "Retrofitting of DOHELA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DOHELA PWSS",
+        "localName": "Retrofitting of DOHELA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203278",
+        "ddrName": "Retrofitting of DOHELA PWSS",
+        "projectId": "8203278",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DOHELA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186506",
+      "name": "Dohela PWSS",
+      "description": "Dohela PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dohela PWSS",
+        "localName": "Dohela PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186506",
+        "ddrName": "Dohela PWSS",
+        "projectId": "5186506",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dohela PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186513",
+      "name": "Dohela PWSS",
+      "description": "Dohela PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dohela PWSS",
+        "localName": "Dohela PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186513",
+        "ddrName": "Dohela PWSS",
+        "projectId": "5186513",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dohela PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221116",
+      "name": "Boro Pas Para PWSS (NEW)",
+      "description": "Boro Pas Para PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boro Pas Para PWSS (NEW)",
+        "localName": "Boro Pas Para PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221116",
+        "ddrName": "Boro Pas Para PWSS (NEW)",
+        "projectId": "30221116",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boro Pas Para PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178371",
+      "name": "KHADARJAN PWSS (NEW)",
+      "description": "KHADARJAN PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHADARJAN PWSS (NEW)",
+        "localName": "KHADARJAN PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178371",
+        "ddrName": "KHADARJAN PWSS (NEW)",
+        "projectId": "30178371",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHADARJAN PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173814",
+      "name": "SILOBARI PWSS (NEW)",
+      "description": "SILOBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILOBARI PWSS (NEW)",
+        "localName": "SILOBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33207",
+        "villageName": "Dahela",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173814",
+        "ddrName": "SILOBARI PWSS (NEW)",
+        "projectId": "30173814",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILOBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221545",
+      "name": "GUWABARI PWSS (NEW)",
+      "description": "GUWABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GUWABARI PWSS (NEW)",
+        "localName": "GUWABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33212",
+        "villageName": "Guwabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221545",
+        "ddrName": "GUWABARI PWSS (NEW)",
+        "projectId": "30221545",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GUWABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218469",
+      "name": "JANAIMARI PWSS (NEW)",
+      "description": "JANAIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JANAIMARI PWSS (NEW)",
+        "localName": "JANAIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33212",
+        "villageName": "Guwabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218469",
+        "ddrName": "JANAIMARI PWSS (NEW)",
+        "projectId": "30218469",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JANAIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218658",
+      "name": "MUJGURI MV PWSS (NEW)",
+      "description": "MUJGURI MV PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUJGURI MV PWSS (NEW)",
+        "localName": "MUJGURI MV PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33209",
+        "villageName": "Mujguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218658",
+        "ddrName": "MUJGURI MV PWSS (NEW)",
+        "projectId": "30218658",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUJGURI MV PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218660",
+      "name": "ISLAMPUR PWSS (NEW)",
+      "description": "ISLAMPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ISLAMPUR PWSS (NEW)",
+        "localName": "ISLAMPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "MAJ JAKHILI",
+        "villageCode": "33210",
+        "villageName": "MUJGURI ISLAMPUR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218660",
+        "ddrName": "ISLAMPUR PWSS (NEW)",
+        "projectId": "30218660",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ISLAMPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178056",
+      "name": "SINGIJANI PWSS (NEW)",
+      "description": "SINGIJANI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGIJANI PWSS (NEW)",
+        "localName": "SINGIJANI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33206",
+        "villageName": "Singijani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178056",
+        "ddrName": "SINGIJANI PWSS (NEW)",
+        "projectId": "30178056",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGIJANI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173984",
+      "name": "UPPERTOLA PT-I PWSS (NEW)",
+      "description": "UPPERTOLA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UPPERTOLA PT-I PWSS (NEW)",
+        "localName": "UPPERTOLA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33203",
+        "villageName": "Upartola Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173984",
+        "ddrName": "UPPERTOLA PT-I PWSS (NEW)",
+        "projectId": "30173984",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UPPERTOLA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173979",
+      "name": "UPPERTOLA PT-II PWSS (NEW)",
+      "description": "UPPERTOLA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UPPERTOLA PT-II PWSS (NEW)",
+        "localName": "UPPERTOLA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33204",
+        "villageName": "Upartola Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173979",
+        "ddrName": "UPPERTOLA PT-II PWSS (NEW)",
+        "projectId": "30173979",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UPPERTOLA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178124",
+      "name": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+      "description": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+        "localName": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33205",
+        "villageName": "Upartola Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178124",
+        "ddrName": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+        "projectId": "30178124",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176563",
+      "name": "UPPERTOLA KALITAPARA PWSS (NEW)",
+      "description": "UPPERTOLA KALITAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UPPERTOLA KALITAPARA PWSS (NEW)",
+        "localName": "UPPERTOLA KALITAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22425",
+        "panchayatname": "Maj Jakhili",
+        "villageCode": "33205",
+        "villageName": "Upartola Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176563",
+        "ddrName": "UPPERTOLA KALITAPARA PWSS (NEW)",
+        "projectId": "30176563",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UPPERTOLA KALITAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176512",
+      "name": "CHARAIMARI PWSS (NEW)",
+      "description": "CHARAIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHARAIMARI PWSS (NEW)",
+        "localName": "CHARAIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33227",
+        "villageName": "Charaimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176512",
+        "ddrName": "CHARAIMARI PWSS (NEW)",
+        "projectId": "30176512",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHARAIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022258",
+      "name": "Charaimari No.2 PWSS(NEW)",
+      "description": "Charaimari No.2 PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Charaimari No.2 PWSS(NEW)",
+        "localName": "Charaimari No.2 PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33227",
+        "villageName": "Charaimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022258",
+        "ddrName": "Charaimari No.2 PWSS(NEW)",
+        "projectId": "30022258",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Charaimari No.2 PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203804",
+      "name": "Retrofitting of FAFAL PWSS",
+      "description": "Retrofitting of FAFAL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of FAFAL PWSS",
+        "localName": "Retrofitting of FAFAL PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33230",
+        "villageName": "Fafal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203804",
+        "ddrName": "Retrofitting of FAFAL PWSS",
+        "projectId": "8203804",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of FAFAL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018721",
+      "name": "Fafal No 3 PWSS (NEW)",
+      "description": "Fafal No 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Fafal No 3 PWSS (NEW)",
+        "localName": "Fafal No 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33230",
+        "villageName": "Fafal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018721",
+        "ddrName": "Fafal No 3 PWSS (NEW)",
+        "projectId": "30018721",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Fafal No 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018738",
+      "name": "Fafal No 4 PWSS(NEW)",
+      "description": "Fafal No 4 PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Fafal No 4 PWSS(NEW)",
+        "localName": "Fafal No 4 PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33230",
+        "villageName": "Fafal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018738",
+        "ddrName": "Fafal No 4 PWSS(NEW)",
+        "projectId": "30018738",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Fafal No 4 PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175917",
+      "name": "KHARA BAGARIBARI PWSS (NEW)",
+      "description": "KHARA BAGARIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARA BAGARIBARI PWSS (NEW)",
+        "localName": "KHARA BAGARIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33231",
+        "villageName": "Khara Bagaribari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175917",
+        "ddrName": "KHARA BAGARIBARI PWSS (NEW)",
+        "projectId": "30175917",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARA BAGARIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173983",
+      "name": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+      "description": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+        "localName": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33231",
+        "villageName": "Khara Bagaribari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173983",
+        "ddrName": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+        "projectId": "30173983",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176714",
+      "name": "NABAGRAM PWSS (NEW)",
+      "description": "NABAGRAM PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NABAGRAM PWSS (NEW)",
+        "localName": "NABAGRAM PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33232",
+        "villageName": "Nabagram",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176714",
+        "ddrName": "NABAGRAM PWSS (NEW)",
+        "projectId": "30176714",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NABAGRAM PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179209",
+      "name": "PURANI BHITA PWSS (NEW)",
+      "description": "PURANI BHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PURANI BHITA PWSS (NEW)",
+        "localName": "PURANI BHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33226",
+        "villageName": "Purani Bhita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179209",
+        "ddrName": "PURANI BHITA PWSS (NEW)",
+        "projectId": "30179209",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PURANI BHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179439",
+      "name": "PURANI BHITA NO.2 PWSS (NEW)",
+      "description": "PURANI BHITA NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PURANI BHITA NO.2 PWSS (NEW)",
+        "localName": "PURANI BHITA NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33226",
+        "villageName": "Purani Bhita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179439",
+        "ddrName": "PURANI BHITA NO.2 PWSS (NEW)",
+        "projectId": "30179439",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PURANI BHITA NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30178397",
+      "name": "SILUK PT-I PWSS (NEW)",
+      "description": "SILUK PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILUK PT-I PWSS (NEW)",
+        "localName": "SILUK PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33228",
+        "villageName": "Siluk Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30178397",
+        "ddrName": "SILUK PT-I PWSS (NEW)",
+        "projectId": "30178397",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILUK PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179165",
+      "name": "SILUK PT-II No. 2 PWSS (NEW)",
+      "description": "SILUK PT-II No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILUK PT-II No. 2 PWSS (NEW)",
+        "localName": "SILUK PT-II No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33229",
+        "villageName": "Siluk Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179165",
+        "ddrName": "SILUK PT-II No. 2 PWSS (NEW)",
+        "projectId": "30179165",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILUK PT-II No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206111",
+      "name": "Retrofitting of SILUK PWSS",
+      "description": "Retrofitting of SILUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SILUK PWSS",
+        "localName": "Retrofitting of SILUK PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33229",
+        "villageName": "Siluk Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206111",
+        "ddrName": "Retrofitting of SILUK PWSS",
+        "projectId": "8206111",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SILUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176673",
+      "name": "SILUK PT-II PWSS (NEW)",
+      "description": "SILUK PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILUK PT-II PWSS (NEW)",
+        "localName": "SILUK PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33229",
+        "villageName": "Siluk Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176673",
+        "ddrName": "SILUK PT-II PWSS (NEW)",
+        "projectId": "30176673",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILUK PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205277",
+      "name": "Retrofitting of SUCIA PAHAR PWSS",
+      "description": "Retrofitting of SUCIA PAHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SUCIA PAHAR PWSS",
+        "localName": "Retrofitting of SUCIA PAHAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33234",
+        "villageName": "Suchia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205277",
+        "ddrName": "Retrofitting of SUCIA PAHAR PWSS",
+        "projectId": "8205277",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SUCIA PAHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386386",
+      "name": "Suchia Pahar PWSS",
+      "description": "Suchia Pahar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Suchia Pahar PWSS",
+        "localName": "Suchia Pahar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33234",
+        "villageName": "Suchia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386386",
+        "ddrName": "Suchia Pahar PWSS",
+        "projectId": "3386386",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Suchia Pahar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176350",
+      "name": "SUCHIA PAHAR PT-I PWSS (NEW)",
+      "description": "SUCHIA PAHAR PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUCHIA PAHAR PT-I PWSS (NEW)",
+        "localName": "SUCHIA PAHAR PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33233",
+        "villageName": "Suchia Pahar Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176350",
+        "ddrName": "SUCHIA PAHAR PT-I PWSS (NEW)",
+        "projectId": "30176350",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUCHIA PAHAR PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170810",
+      "name": "SUCHIA PAHAR PT-II PWSS (NEW)",
+      "description": "SUCHIA PAHAR PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUCHIA PAHAR PT-II PWSS (NEW)",
+        "localName": "SUCHIA PAHAR PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1187",
+        "blockname": "Kuchdhowa",
+        "panchayatcode": "22428",
+        "panchayatname": "Puranibhita",
+        "villageCode": "33235",
+        "villageName": "Suchia Pahar Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170810",
+        "ddrName": "SUCHIA PAHAR PT-II PWSS (NEW)",
+        "projectId": "30170810",
+        "regionName": "1187"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUCHIA PAHAR PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205058",
+      "name": "Retrofitting of AOLATOLI PWSS",
+      "description": "Retrofitting of AOLATOLI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AOLATOLI PWSS",
+        "localName": "Retrofitting of AOLATOLI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205058",
+        "ddrName": "Retrofitting of AOLATOLI PWSS",
+        "projectId": "8205058",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AOLATOLI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185541",
+      "name": "Aolatoli PWSS",
+      "description": "Aolatoli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Aolatoli PWSS",
+        "localName": "Aolatoli PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185541",
+        "ddrName": "Aolatoli PWSS",
+        "projectId": "5185541",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Aolatoli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143523",
+      "name": "BANIYAPARA PWSS (NEW)",
+      "description": "BANIYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BANIYAPARA PWSS (NEW)",
+        "localName": "BANIYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22421",
+        "panchayatname": "AOLATOLI",
+        "villageCode": "33175",
+        "villageName": "AOLATOLI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143523",
+        "ddrName": "BANIYAPARA PWSS (NEW)",
+        "projectId": "30143523",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BANIYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216051",
+      "name": "KAJIPUTA PWSS (NEW)",
+      "description": "KAJIPUTA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAJIPUTA PWSS (NEW)",
+        "localName": "KAJIPUTA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216051",
+        "ddrName": "KAJIPUTA PWSS (NEW)",
+        "projectId": "30216051",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAJIPUTA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30196783",
+      "name": "MESERVITA NORTH PWSS (NEW)",
+      "description": "MESERVITA NORTH PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MESERVITA NORTH PWSS (NEW)",
+        "localName": "MESERVITA NORTH PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30196783",
+        "ddrName": "MESERVITA NORTH PWSS (NEW)",
+        "projectId": "30196783",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MESERVITA NORTH PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259975",
+      "name": "Machervita PWSS",
+      "description": "Machervita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Machervita PWSS",
+        "localName": "Machervita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259975",
+        "ddrName": "Machervita PWSS",
+        "projectId": "6259975",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Machervita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213138",
+      "name": "MAMUDPUR PWSS (NEW)",
+      "description": "MAMUDPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAMUDPUR PWSS (NEW)",
+        "localName": "MAMUDPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213138",
+        "ddrName": "MAMUDPUR PWSS (NEW)",
+        "projectId": "30213138",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAMUDPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5464342",
+      "name": "Pub Simulbari PWSS",
+      "description": "Pub Simulbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Pub Simulbari PWSS",
+        "localName": "Pub Simulbari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5464342",
+        "ddrName": "Pub Simulbari PWSS",
+        "projectId": "5464342",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Pub Simulbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143283",
+      "name": "SONARURTAL PWSS (NEW)",
+      "description": "SONARURTAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONARURTAL PWSS (NEW)",
+        "localName": "SONARURTAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143283",
+        "ddrName": "SONARURTAL PWSS (NEW)",
+        "projectId": "30143283",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONARURTAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30129329",
+      "name": "SONAMOYEE PWSS (NEW)",
+      "description": "SONAMOYEE PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONAMOYEE PWSS (NEW)",
+        "localName": "SONAMOYEE PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33175",
+        "villageName": "Aolatoli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30129329",
+        "ddrName": "SONAMOYEE PWSS (NEW)",
+        "projectId": "30129329",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONAMOYEE PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063426",
+      "name": "BORDAL PWSS (NEW)",
+      "description": "BORDAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDAL PWSS (NEW)",
+        "localName": "BORDAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22421",
+        "panchayatname": "AOLATOLI",
+        "villageCode": "33162",
+        "villageName": "BORDOL",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063426",
+        "ddrName": "BORDAL PWSS (NEW)",
+        "projectId": "30063426",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30138032",
+      "name": "KURSAKATI PWSS (NEW)",
+      "description": "KURSAKATI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KURSAKATI PWSS (NEW)",
+        "localName": "KURSAKATI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33174",
+        "villageName": "Kursakati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30138032",
+        "ddrName": "KURSAKATI PWSS (NEW)",
+        "projectId": "30138032",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KURSAKATI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218735",
+      "name": "KHONERPARA PWSS",
+      "description": "KHONERPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHONERPARA PWSS",
+        "localName": "KHONERPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22421",
+        "panchayatname": "AOLATOLI",
+        "villageCode": "33174",
+        "villageName": "KURSAKATI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218735",
+        "ddrName": "KHONERPARA PWSS",
+        "projectId": "30218735",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHONERPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30137946",
+      "name": "NIZ KURSAKATI PWSS (NEW)",
+      "description": "NIZ KURSAKATI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIZ KURSAKATI PWSS (NEW)",
+        "localName": "NIZ KURSAKATI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22421",
+        "panchayatname": "Aolatoli",
+        "villageCode": "33173",
+        "villageName": "Nizkusakati",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30137946",
+        "ddrName": "NIZ KURSAKATI PWSS (NEW)",
+        "projectId": "30137946",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIZ KURSAKATI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019171",
+      "name": "Bapurbhita Pt-I PWSS(NEW)",
+      "description": "Bapurbhita Pt-I PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bapurbhita Pt-I PWSS(NEW)",
+        "localName": "Bapurbhita Pt-I PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33154",
+        "villageName": "Bapurvita Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019171",
+        "ddrName": "Bapurbhita Pt-I PWSS(NEW)",
+        "projectId": "30019171",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bapurbhita Pt-I PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386356",
+      "name": "Bapurbhita PWSS",
+      "description": "Bapurbhita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bapurbhita PWSS",
+        "localName": "Bapurbhita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33154",
+        "villageName": "Bapurvita Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386356",
+        "ddrName": "Bapurbhita PWSS",
+        "projectId": "3386356",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bapurbhita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30091086",
+      "name": "ADORSOPARA PWSS (NEW)",
+      "description": "ADORSOPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ADORSOPARA PWSS (NEW)",
+        "localName": "ADORSOPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33155",
+        "villageName": "Bapurvita Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30091086",
+        "ddrName": "ADORSOPARA PWSS (NEW)",
+        "projectId": "30091086",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ADORSOPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096403",
+      "name": "BAPURBHITA PT II PWSS (NEW)",
+      "description": "BAPURBHITA PT II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPURBHITA PT II PWSS (NEW)",
+        "localName": "BAPURBHITA PT II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33155",
+        "villageName": "Bapurvita Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096403",
+        "ddrName": "BAPURBHITA PT II PWSS (NEW)",
+        "projectId": "30096403",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPURBHITA PT II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196954",
+      "name": "Retrofitting of Bapurbhita PWSS",
+      "description": "Retrofitting of Bapurbhita PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bapurbhita PWSS",
+        "localName": "Retrofitting of Bapurbhita PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33155",
+        "villageName": "Bapurvita Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196954",
+        "ddrName": "Retrofitting of Bapurbhita PWSS",
+        "projectId": "8196954",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bapurbhita PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197005",
+      "name": "Retrofitting of BOSKOPARA PWSS",
+      "description": "Retrofitting of BOSKOPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BOSKOPARA PWSS",
+        "localName": "Retrofitting of BOSKOPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33155",
+        "villageName": "Bapurvita Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197005",
+        "ddrName": "Retrofitting of BOSKOPARA PWSS",
+        "projectId": "8197005",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BOSKOPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386540",
+      "name": "Boskopara PWSS",
+      "description": "Boskopara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boskopara PWSS",
+        "localName": "Boskopara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33155",
+        "villageName": "Bapurvita Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386540",
+        "ddrName": "Boskopara PWSS",
+        "projectId": "3386540",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boskopara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041203",
+      "name": "SAKPARA PWSS (NEW)",
+      "description": "SAKPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAKPARA PWSS (NEW)",
+        "localName": "SAKPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33155",
+        "villageName": "Bapurvita Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041203",
+        "ddrName": "SAKPARA PWSS (NEW)",
+        "projectId": "30041203",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAKPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022760",
+      "name": "BAPURBHITA PT-III PWSS (NEW)",
+      "description": "BAPURBHITA PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPURBHITA PT-III PWSS (NEW)",
+        "localName": "BAPURBHITA PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33156",
+        "villageName": "Bapurvita Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022760",
+        "ddrName": "BAPURBHITA PT-III PWSS (NEW)",
+        "projectId": "30022760",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPURBHITA PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211673",
+      "name": "MIAPARA EAST PWSS (NEW)",
+      "description": "MIAPARA EAST PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MIAPARA EAST PWSS (NEW)",
+        "localName": "MIAPARA EAST PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22418",
+        "panchayatname": "BAPURBHITA JURIGAON",
+        "villageCode": "33156",
+        "villageName": "BAPURVITA PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211673",
+        "ddrName": "MIAPARA EAST PWSS (NEW)",
+        "projectId": "30211673",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MIAPARA EAST PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019170",
+      "name": "Nalagapara PWSS(NEW)",
+      "description": "Nalagapara PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nalagapara PWSS(NEW)",
+        "localName": "Nalagapara PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33156",
+        "villageName": "Bapurvita Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019170",
+        "ddrName": "Nalagapara PWSS(NEW)",
+        "projectId": "30019170",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nalagapara PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022986",
+      "name": "BOWALMARI PWSS (NEW)",
+      "description": "BOWALMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOWALMARI PWSS (NEW)",
+        "localName": "BOWALMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33157",
+        "villageName": "Bowalmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022986",
+        "ddrName": "BOWALMARI PWSS (NEW)",
+        "projectId": "30022986",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOWALMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042788",
+      "name": "BOWALMARI NO-I PWSS (NEW)",
+      "description": "BOWALMARI NO-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOWALMARI NO-I PWSS (NEW)",
+        "localName": "BOWALMARI NO-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33157",
+        "villageName": "Bowalmari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042788",
+        "ddrName": "BOWALMARI NO-I PWSS (NEW)",
+        "projectId": "30042788",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOWALMARI NO-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207843",
+      "name": "GHONAPARA PWSS (NEW)",
+      "description": "GHONAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHONAPARA PWSS (NEW)",
+        "localName": "GHONAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33153",
+        "villageName": "Hatisila Muslimpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207843",
+        "ddrName": "GHONAPARA PWSS (NEW)",
+        "projectId": "30207843",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHONAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873715",
+      "name": "Hatisila PWSS",
+      "description": "Hatisila PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatisila PWSS",
+        "localName": "Hatisila PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33153",
+        "villageName": "Hatisila Muslimpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873715",
+        "ddrName": "Hatisila PWSS",
+        "projectId": "4873715",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatisila PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197028",
+      "name": "Retrofitting of HATISILA PWSS",
+      "description": "Retrofitting of HATISILA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HATISILA PWSS",
+        "localName": "Retrofitting of HATISILA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33153",
+        "villageName": "Hatisila Muslimpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197028",
+        "ddrName": "Retrofitting of HATISILA PWSS",
+        "projectId": "8197028",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HATISILA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072127",
+      "name": "JURIGAON BARMANPARA PWSS (NEW)",
+      "description": "JURIGAON BARMANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JURIGAON BARMANPARA PWSS (NEW)",
+        "localName": "JURIGAON BARMANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072127",
+        "ddrName": "JURIGAON BARMANPARA PWSS (NEW)",
+        "projectId": "30072127",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JURIGAON BARMANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197282",
+      "name": "Retrofitting of JURIGAON PWSS",
+      "description": "Retrofitting of JURIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of JURIGAON PWSS",
+        "localName": "Retrofitting of JURIGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197282",
+        "ddrName": "Retrofitting of JURIGAON PWSS",
+        "projectId": "8197282",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of JURIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074827",
+      "name": "JURIGAON GAROPARA PWSS (NEW)",
+      "description": "JURIGAON GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JURIGAON GAROPARA PWSS (NEW)",
+        "localName": "JURIGAON GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074827",
+        "ddrName": "JURIGAON GAROPARA PWSS (NEW)",
+        "projectId": "30074827",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JURIGAON GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4869442",
+      "name": "Jurigaon PWSS",
+      "description": "Jurigaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Jurigaon PWSS",
+        "localName": "Jurigaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4869442",
+        "ddrName": "Jurigaon PWSS",
+        "projectId": "4869442",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Jurigaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183599",
+      "name": "JURIGAON KANDAPARA PWSS (NEW)",
+      "description": "JURIGAON KANDAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JURIGAON KANDAPARA PWSS (NEW)",
+        "localName": "JURIGAON KANDAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183599",
+        "ddrName": "JURIGAON KANDAPARA PWSS (NEW)",
+        "projectId": "30183599",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JURIGAON KANDAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213136",
+      "name": "KONDAPARA PWSS (NEW)",
+      "description": "KONDAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KONDAPARA PWSS (NEW)",
+        "localName": "KONDAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213136",
+        "ddrName": "KONDAPARA PWSS (NEW)",
+        "projectId": "30213136",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KONDAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211715",
+      "name": "MUSLIMPARA PWSS (NEW)",
+      "description": "MUSLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUSLIMPARA PWSS (NEW)",
+        "localName": "MUSLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22418",
+        "panchayatname": "BAPURBHITA JURIGAON",
+        "villageCode": "33158",
+        "villageName": "JURIGAON",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211715",
+        "ddrName": "MUSLIMPARA PWSS (NEW)",
+        "projectId": "30211715",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUSLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049049",
+      "name": "JURIGAON TILAPARA PWSS (NEW)",
+      "description": "JURIGAON TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JURIGAON TILAPARA PWSS (NEW)",
+        "localName": "JURIGAON TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22418",
+        "panchayatname": "Bapurbhita Jurigaon",
+        "villageCode": "33158",
+        "villageName": "Jurigaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049049",
+        "ddrName": "JURIGAON TILAPARA PWSS (NEW)",
+        "projectId": "30049049",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JURIGAON TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206302",
+      "name": "Retrofitting of JOYBHUM PWSS",
+      "description": "Retrofitting of JOYBHUM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of JOYBHUM PWSS",
+        "localName": "Retrofitting of JOYBHUM PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33160",
+        "villageName": "Jaybhum",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206302",
+        "ddrName": "Retrofitting of JOYBHUM PWSS",
+        "projectId": "8206302",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of JOYBHUM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049625",
+      "name": "PADDAMARI PWSS (NEW)",
+      "description": "PADDAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PADDAMARI PWSS (NEW)",
+        "localName": "PADDAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33160",
+        "villageName": "Jaybhum",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049625",
+        "ddrName": "PADDAMARI PWSS (NEW)",
+        "projectId": "30049625",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PADDAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873166",
+      "name": "Kamakhyabari PWSS",
+      "description": "Kamakhyabari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kamakhyabari PWSS",
+        "localName": "Kamakhyabari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33160",
+        "villageName": "Jaybhum",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873166",
+        "ddrName": "Kamakhyabari PWSS",
+        "projectId": "4873166",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kamakhyabari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30137988",
+      "name": "CHOIULEAPARA PWSS (NEW)",
+      "description": "CHOIULEAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOIULEAPARA PWSS (NEW)",
+        "localName": "CHOIULEAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33160",
+        "villageName": "Jaybhum",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30137988",
+        "ddrName": "CHOIULEAPARA PWSS (NEW)",
+        "projectId": "30137988",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOIULEAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8172016",
+      "name": "Retrofitting of KAMAKHYABARI PWSS",
+      "description": "Retrofitting of KAMAKHYABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KAMAKHYABARI PWSS",
+        "localName": "Retrofitting of KAMAKHYABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33160",
+        "villageName": "Jaybhum",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8172016",
+        "ddrName": "Retrofitting of KAMAKHYABARI PWSS",
+        "projectId": "8172016",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KAMAKHYABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049004",
+      "name": "PURANPARA PWSS (NEW)",
+      "description": "PURANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PURANPARA PWSS (NEW)",
+        "localName": "PURANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33160",
+        "villageName": "Jaybhum",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049004",
+        "ddrName": "PURANPARA PWSS (NEW)",
+        "projectId": "30049004",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PURANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30215708",
+      "name": "JOYBHUM DESIPARA PWSS (NEW)",
+      "description": "JOYBHUM DESIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOYBHUM DESIPARA PWSS (NEW)",
+        "localName": "JOYBHUM DESIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22419",
+        "panchayatname": "CHUNARI",
+        "villageCode": "33160",
+        "villageName": "JAYBHUM",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30215708",
+        "ddrName": "JOYBHUM DESIPARA PWSS (NEW)",
+        "projectId": "30215708",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOYBHUM DESIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30138003",
+      "name": "KASIMA PWSS (NEW)",
+      "description": "KASIMA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KASIMA PWSS (NEW)",
+        "localName": "KASIMA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33163",
+        "villageName": "Kasima",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30138003",
+        "ddrName": "KASIMA PWSS (NEW)",
+        "projectId": "30138003",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KASIMA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218673",
+      "name": "KHUDRAPOITARY NORTH PWSS (NEW)",
+      "description": "KHUDRAPOITARY NORTH PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHUDRAPOITARY NORTH PWSS (NEW)",
+        "localName": "KHUDRAPOITARY NORTH PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33165",
+        "villageName": "Khudra Paitori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218673",
+        "ddrName": "KHUDRAPOITARY NORTH PWSS (NEW)",
+        "projectId": "30218673",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHUDRAPOITARY NORTH PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218675",
+      "name": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+      "description": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+        "localName": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22419",
+        "panchayatname": "CHUNARI",
+        "villageCode": "33165",
+        "villageName": "KHUDRA PAITORI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218675",
+        "ddrName": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+        "projectId": "30218675",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30196800",
+      "name": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+      "description": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+        "localName": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33165",
+        "villageName": "Khudra Paitori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30196800",
+        "ddrName": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+        "projectId": "30196800",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049629",
+      "name": "LEZAM PWSS (NEW)",
+      "description": "LEZAM PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LEZAM PWSS (NEW)",
+        "localName": "LEZAM PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33164",
+        "villageName": "Lejam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049629",
+        "ddrName": "LEZAM PWSS (NEW)",
+        "projectId": "30049629",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LEZAM PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037058",
+      "name": "NATHPARA (CHUNARI) PWSS (NEW)",
+      "description": "NATHPARA (CHUNARI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NATHPARA (CHUNARI) PWSS (NEW)",
+        "localName": "NATHPARA (CHUNARI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33164",
+        "villageName": "Lejam",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037058",
+        "ddrName": "NATHPARA (CHUNARI) PWSS (NEW)",
+        "projectId": "30037058",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NATHPARA (CHUNARI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049081",
+      "name": "BEPARIPARA PWSS (NEW)",
+      "description": "BEPARIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BEPARIPARA PWSS (NEW)",
+        "localName": "BEPARIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33159",
+        "villageName": "Puthimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049081",
+        "ddrName": "BEPARIPARA PWSS (NEW)",
+        "projectId": "30049081",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BEPARIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067915",
+      "name": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+      "description": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+        "localName": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22419",
+        "panchayatname": "Chunari",
+        "villageCode": "33159",
+        "villageName": "Puthimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067915",
+        "ddrName": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+        "projectId": "30067915",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057166",
+      "name": "BAIDA PT-I PWSS (NEW)",
+      "description": "BAIDA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAIDA PT-I PWSS (NEW)",
+        "localName": "BAIDA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33136",
+        "villageName": "Baida Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057166",
+        "ddrName": "BAIDA PT-I PWSS (NEW)",
+        "projectId": "30057166",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAIDA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183739",
+      "name": "BAIDA PT-II PWSS (NEW)",
+      "description": "BAIDA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAIDA PT-II PWSS (NEW)",
+        "localName": "BAIDA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33137",
+        "villageName": "Baida Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183739",
+        "ddrName": "BAIDA PT-II PWSS (NEW)",
+        "projectId": "30183739",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAIDA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183402",
+      "name": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+      "description": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+        "localName": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33137",
+        "villageName": "Baida Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183402",
+        "ddrName": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+        "projectId": "30183402",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183244",
+      "name": "BORJANPARA PWSS (NEW)",
+      "description": "BORJANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORJANPARA PWSS (NEW)",
+        "localName": "BORJANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33137",
+        "villageName": "Baida Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183244",
+        "ddrName": "BORJANPARA PWSS (NEW)",
+        "projectId": "30183244",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORJANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189242",
+      "name": "BALASARI PWSS (NEW)",
+      "description": "BALASARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALASARI PWSS (NEW)",
+        "localName": "BALASARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33125",
+        "villageName": "Balachari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189242",
+        "ddrName": "BALASARI PWSS (NEW)",
+        "projectId": "30189242",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALASARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188457",
+      "name": "BALASARI AMGURI PWSS (NEW)",
+      "description": "BALASARI AMGURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALASARI AMGURI PWSS (NEW)",
+        "localName": "BALASARI AMGURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33124",
+        "villageName": "Balachari Amguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188457",
+        "ddrName": "BALASARI AMGURI PWSS (NEW)",
+        "projectId": "30188457",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALASARI AMGURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183693",
+      "name": "BORJHORA (Dadan) PWSS (NEW)",
+      "description": "BORJHORA (Dadan) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORJHORA (Dadan) PWSS (NEW)",
+        "localName": "BORJHORA (Dadan) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33145",
+        "villageName": "Borjora No-2",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183693",
+        "ddrName": "BORJHORA (Dadan) PWSS (NEW)",
+        "projectId": "30183693",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORJHORA (Dadan) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072650",
+      "name": "CHATABARI PT-I PWSS (NEW)",
+      "description": "CHATABARI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHATABARI PT-I PWSS (NEW)",
+        "localName": "CHATABARI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33141",
+        "villageName": "Chatabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072650",
+        "ddrName": "CHATABARI PT-I PWSS (NEW)",
+        "projectId": "30072650",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHATABARI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30070207",
+      "name": "CHATABARI PT-II PWSS (NEW)",
+      "description": "CHATABARI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHATABARI PT-II PWSS (NEW)",
+        "localName": "CHATABARI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33142",
+        "villageName": "Chatabari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30070207",
+        "ddrName": "CHATABARI PT-II PWSS (NEW)",
+        "projectId": "30070207",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHATABARI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211747",
+      "name": "JONGSIPARA PWSS (NEW)",
+      "description": "JONGSIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JONGSIPARA PWSS (NEW)",
+        "localName": "JONGSIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22416",
+        "panchayatname": "DADAN",
+        "villageCode": "33142",
+        "villageName": "CHATABARI PT-II",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211747",
+        "ddrName": "JONGSIPARA PWSS (NEW)",
+        "projectId": "30211747",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JONGSIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30128175",
+      "name": "DEPALCHANG PWSS (NEW)",
+      "description": "DEPALCHANG PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEPALCHANG PWSS (NEW)",
+        "localName": "DEPALCHANG PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33123",
+        "villageName": "Depalchang",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30128175",
+        "ddrName": "DEPALCHANG PWSS (NEW)",
+        "projectId": "30128175",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEPALCHANG PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218722",
+      "name": "SANTAPARA PWSS (NEW)",
+      "description": "SANTAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SANTAPARA PWSS (NEW)",
+        "localName": "SANTAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22416",
+        "panchayatname": "DADAN",
+        "villageCode": "33123",
+        "villageName": "DEPALCHANG",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218722",
+        "ddrName": "SANTAPARA PWSS (NEW)",
+        "projectId": "30218722",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SANTAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183522",
+      "name": "DIPKAI PT-I PWSS (NEW)",
+      "description": "DIPKAI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIPKAI PT-I PWSS (NEW)",
+        "localName": "DIPKAI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33134",
+        "villageName": "Dipkai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183522",
+        "ddrName": "DIPKAI PT-I PWSS (NEW)",
+        "projectId": "30183522",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIPKAI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063300",
+      "name": "DIPKAI PT-II PWSS (NEW)",
+      "description": "DIPKAI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIPKAI PT-II PWSS (NEW)",
+        "localName": "DIPKAI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33135",
+        "villageName": "Dipkai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063300",
+        "ddrName": "DIPKAI PT-II PWSS (NEW)",
+        "projectId": "30063300",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIPKAI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30090984",
+      "name": "FAKIRMARA PWSS (NEW)",
+      "description": "FAKIRMARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FAKIRMARA PWSS (NEW)",
+        "localName": "FAKIRMARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33130",
+        "villageName": "Fakirmara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30090984",
+        "ddrName": "FAKIRMARA PWSS (NEW)",
+        "projectId": "30090984",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FAKIRMARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058109",
+      "name": "HATISHILA RABHAPARA PWSS (NEW)",
+      "description": "HATISHILA RABHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATISHILA RABHAPARA PWSS (NEW)",
+        "localName": "HATISHILA RABHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33144",
+        "villageName": "Hatisila Ravapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058109",
+        "ddrName": "HATISHILA RABHAPARA PWSS (NEW)",
+        "projectId": "30058109",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATISHILA RABHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043327",
+      "name": "KURUNG PWSS (NEW)",
+      "description": "KURUNG PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KURUNG PWSS (NEW)",
+        "localName": "KURUNG PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33132",
+        "villageName": "Kurung",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043327",
+        "ddrName": "KURUNG PWSS (NEW)",
+        "projectId": "30043327",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KURUNG PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073357",
+      "name": "PACHIM LEMAKONA PWSS (NEW)",
+      "description": "PACHIM LEMAKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM LEMAKONA PWSS (NEW)",
+        "localName": "PACHIM LEMAKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33129",
+        "villageName": "Lemakona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073357",
+        "ddrName": "PACHIM LEMAKONA PWSS (NEW)",
+        "projectId": "30073357",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM LEMAKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183275",
+      "name": "PUB LEMAKONA PWSS (NEW)",
+      "description": "PUB LEMAKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB LEMAKONA PWSS (NEW)",
+        "localName": "PUB LEMAKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33129",
+        "villageName": "Lemakona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183275",
+        "ddrName": "PUB LEMAKONA PWSS (NEW)",
+        "projectId": "30183275",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB LEMAKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156253",
+      "name": "Retrofitting of MOGHO PWSS",
+      "description": "Retrofitting of MOGHO PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MOGHO PWSS",
+        "localName": "Retrofitting of MOGHO PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33126",
+        "villageName": "Magho Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156253",
+        "ddrName": "Retrofitting of MOGHO PWSS",
+        "projectId": "8156253",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MOGHO PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6054138",
+      "name": "Mogho PWSS",
+      "description": "Mogho PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Mogho PWSS",
+        "localName": "Mogho PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33126",
+        "villageName": "Magho Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6054138",
+        "ddrName": "Mogho PWSS",
+        "projectId": "6054138",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Mogho PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188494",
+      "name": "MALADHARA GAROPARA PWSS (NEW)",
+      "description": "MALADHARA GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MALADHARA GAROPARA PWSS (NEW)",
+        "localName": "MALADHARA GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33121",
+        "villageName": "Maladhara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188494",
+        "ddrName": "MALADHARA GAROPARA PWSS (NEW)",
+        "projectId": "30188494",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MALADHARA GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188440",
+      "name": "MALADHARA PT-I PWSS (NEW)",
+      "description": "MALADHARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MALADHARA PT-I PWSS (NEW)",
+        "localName": "MALADHARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33121",
+        "villageName": "Maladhara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188440",
+        "ddrName": "MALADHARA PT-I PWSS (NEW)",
+        "projectId": "30188440",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MALADHARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183351",
+      "name": "Maladhara Pt-II PWSS (NEW)",
+      "description": "Maladhara Pt-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Maladhara Pt-II PWSS (NEW)",
+        "localName": "Maladhara Pt-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33122",
+        "villageName": "Maladhara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183351",
+        "ddrName": "Maladhara Pt-II PWSS (NEW)",
+        "projectId": "30183351",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Maladhara Pt-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183971",
+      "name": "MOGHO HATISILA PWSS (NEW)",
+      "description": "MOGHO HATISILA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOGHO HATISILA PWSS (NEW)",
+        "localName": "MOGHO HATISILA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33133",
+        "villageName": "Mogho Hatisila",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183971",
+        "ddrName": "MOGHO HATISILA PWSS (NEW)",
+        "projectId": "30183971",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOGHO HATISILA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183409",
+      "name": "KHATRYAPARA PWSS (NEW)",
+      "description": "KHATRYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHATRYAPARA PWSS (NEW)",
+        "localName": "KHATRYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33127",
+        "villageName": "Mogho Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183409",
+        "ddrName": "KHATRYAPARA PWSS (NEW)",
+        "projectId": "30183409",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHATRYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183468",
+      "name": "MOGHO PT-III PWSS (NEW)",
+      "description": "MOGHO PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOGHO PT-III PWSS (NEW)",
+        "localName": "MOGHO PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33127",
+        "villageName": "Mogho Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183468",
+        "ddrName": "MOGHO PT-III PWSS (NEW)",
+        "projectId": "30183468",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOGHO PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213066",
+      "name": "NIHALIRBHITA PWSS (NEW)",
+      "description": "NIHALIRBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIHALIRBHITA PWSS (NEW)",
+        "localName": "NIHALIRBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33138",
+        "villageName": "Nahalirvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213066",
+        "ddrName": "NIHALIRBHITA PWSS (NEW)",
+        "projectId": "30213066",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIHALIRBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213067",
+      "name": "SAMFANG PWSS (NEW)",
+      "description": "SAMFANG PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAMFANG PWSS (NEW)",
+        "localName": "SAMFANG PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33138",
+        "villageName": "Nahalirvita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213067",
+        "ddrName": "SAMFANG PWSS (NEW)",
+        "projectId": "30213067",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAMFANG PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156241",
+      "name": "Retrofitting of SALPARA PWSS",
+      "description": "Retrofitting of SALPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SALPARA PWSS",
+        "localName": "Retrofitting of SALPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33143",
+        "villageName": "Salpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156241",
+        "ddrName": "Retrofitting of SALPARA PWSS",
+        "projectId": "8156241",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SALPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6055529",
+      "name": "Salpara PWSS",
+      "description": "Salpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Salpara PWSS",
+        "localName": "Salpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33143",
+        "villageName": "Salpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6055529",
+        "ddrName": "Salpara PWSS",
+        "projectId": "6055529",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Salpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30058545",
+      "name": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+      "description": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+        "localName": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33139",
+        "villageName": "Trichimkali Pandoba Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30058545",
+        "ddrName": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+        "projectId": "30058545",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30182444",
+      "name": "JONGPARA PWSS (NEW)",
+      "description": "JONGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JONGPARA PWSS (NEW)",
+        "localName": "JONGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33140",
+        "villageName": "Trichimkalipandoba Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30182444",
+        "ddrName": "JONGPARA PWSS (NEW)",
+        "projectId": "30182444",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JONGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183255",
+      "name": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+      "description": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+        "localName": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22416",
+        "panchayatname": "Dadan",
+        "villageCode": "33140",
+        "villageName": "Trichimkalipandoba Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183255",
+        "ddrName": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+        "projectId": "30183255",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188564",
+      "name": "DHAMAR BEEL PWSS (NEW)",
+      "description": "DHAMAR BEEL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHAMAR BEEL PWSS (NEW)",
+        "localName": "DHAMAR BEEL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33149",
+        "villageName": "Dhamar Bill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188564",
+        "ddrName": "DHAMAR BEEL PWSS (NEW)",
+        "projectId": "30188564",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHAMAR BEEL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197023",
+      "name": "Retrofitting of DHAMAR RESERVE PWSS",
+      "description": "Retrofitting of DHAMAR RESERVE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DHAMAR RESERVE PWSS",
+        "localName": "Retrofitting of DHAMAR RESERVE PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33148",
+        "villageName": "Dhamar Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197023",
+        "ddrName": "Retrofitting of DHAMAR RESERVE PWSS",
+        "projectId": "8197023",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DHAMAR RESERVE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218662",
+      "name": "TILAPARA PWSS (NEW)",
+      "description": "TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA PWSS (NEW)",
+        "localName": "TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33148",
+        "villageName": "Dhamar Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218662",
+        "ddrName": "TILAPARA PWSS (NEW)",
+        "projectId": "30218662",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30166739",
+      "name": "DHAMAR RESERVE 2 PWSS (NEW)",
+      "description": "DHAMAR RESERVE 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHAMAR RESERVE 2 PWSS (NEW)",
+        "localName": "DHAMAR RESERVE 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33148",
+        "villageName": "Dhamar Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30166739",
+        "ddrName": "DHAMAR RESERVE 2 PWSS (NEW)",
+        "projectId": "30166739",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHAMAR RESERVE 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2517189",
+      "name": "Dhamar Reserve PWSS",
+      "description": "Dhamar Reserve PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhamar Reserve PWSS",
+        "localName": "Dhamar Reserve PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33148",
+        "villageName": "Dhamar Reserve",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2517189",
+        "ddrName": "Dhamar Reserve PWSS",
+        "projectId": "2517189",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhamar Reserve PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211653",
+      "name": "RUPAKURA PWSS (NEW)",
+      "description": "RUPAKURA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RUPAKURA PWSS (NEW)",
+        "localName": "RUPAKURA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22417",
+        "panchayatname": "DHAMAR",
+        "villageCode": "33148",
+        "villageName": "DHAMAR RESERVE",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211653",
+        "ddrName": "RUPAKURA PWSS (NEW)",
+        "projectId": "30211653",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RUPAKURA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30196788",
+      "name": "HATOGAON PT-I PWSS (NEW)",
+      "description": "HATOGAON PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATOGAON PT-I PWSS (NEW)",
+        "localName": "HATOGAON PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33146",
+        "villageName": "Hatogaon Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30196788",
+        "ddrName": "HATOGAON PT-I PWSS (NEW)",
+        "projectId": "30196788",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATOGAON PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156193",
+      "name": "Retrofitting of HATOGAON PWSS",
+      "description": "Retrofitting of HATOGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HATOGAON PWSS",
+        "localName": "Retrofitting of HATOGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33146",
+        "villageName": "Hatogaon Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156193",
+        "ddrName": "Retrofitting of HATOGAON PWSS",
+        "projectId": "8156193",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HATOGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873739",
+      "name": "Hatogaon PWSS",
+      "description": "Hatogaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hatogaon PWSS",
+        "localName": "Hatogaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33146",
+        "villageName": "Hatogaon Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873739",
+        "ddrName": "Hatogaon PWSS",
+        "projectId": "4873739",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hatogaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30021987",
+      "name": "HATOGAON BARMANPARA PWSS (NEW)",
+      "description": "HATOGAON BARMANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATOGAON BARMANPARA PWSS (NEW)",
+        "localName": "HATOGAON BARMANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22417",
+        "panchayatname": "DHAMAR",
+        "villageCode": "33147",
+        "villageName": "HATOGAON PT-II",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30021987",
+        "ddrName": "HATOGAON BARMANPARA PWSS (NEW)",
+        "projectId": "30021987",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATOGAON BARMANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043601",
+      "name": "MEDHIPARA PT-I PWSS (NEW)",
+      "description": "MEDHIPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEDHIPARA PT-I PWSS (NEW)",
+        "localName": "MEDHIPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33150",
+        "villageName": "Medhipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043601",
+        "ddrName": "MEDHIPARA PT-I PWSS (NEW)",
+        "projectId": "30043601",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEDHIPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183385",
+      "name": "MEDHIPARA PT-II PWSS (NEW)",
+      "description": "MEDHIPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEDHIPARA PT-II PWSS (NEW)",
+        "localName": "MEDHIPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33151",
+        "villageName": "Medhipara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183385",
+        "ddrName": "MEDHIPARA PT-II PWSS (NEW)",
+        "projectId": "30183385",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEDHIPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218732",
+      "name": "BEELPARA PWSS (NEW)",
+      "description": "BEELPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BEELPARA PWSS (NEW)",
+        "localName": "BEELPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22417",
+        "panchayatname": "DHAMAR",
+        "villageCode": "33152",
+        "villageName": "NIDANPUR PT-II (CT)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218732",
+        "ddrName": "BEELPARA PWSS (NEW)",
+        "projectId": "30218732",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BEELPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30128194",
+      "name": "BHAI BHANI PWSS (NEW)",
+      "description": "BHAI BHANI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHAI BHANI PWSS (NEW)",
+        "localName": "BHAI BHANI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30128194",
+        "ddrName": "BHAI BHANI PWSS (NEW)",
+        "projectId": "30128194",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHAI BHANI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167486",
+      "name": "KOCHPARA PWSS (Lakhipur) (NEW)",
+      "description": "KOCHPARA PWSS (Lakhipur) (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOCHPARA PWSS (Lakhipur) (NEW)",
+        "localName": "KOCHPARA PWSS (Lakhipur) (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167486",
+        "ddrName": "KOCHPARA PWSS (Lakhipur) (NEW)",
+        "projectId": "30167486",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOCHPARA PWSS (Lakhipur) (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2515942",
+      "name": "Nidanpur PWSS",
+      "description": "Nidanpur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nidanpur PWSS",
+        "localName": "Nidanpur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2515942",
+        "ddrName": "Nidanpur PWSS",
+        "projectId": "2515942",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nidanpur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156180",
+      "name": "Retrofitting of NIDANPUR PWSS",
+      "description": "Retrofitting of NIDANPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NIDANPUR PWSS",
+        "localName": "Retrofitting of NIDANPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156180",
+        "ddrName": "Retrofitting of NIDANPUR PWSS",
+        "projectId": "8156180",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NIDANPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386123",
+      "name": "Rishipara PWSS",
+      "description": "Rishipara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rishipara PWSS",
+        "localName": "Rishipara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386123",
+        "ddrName": "Rishipara PWSS",
+        "projectId": "3386123",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rishipara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156208",
+      "name": "Retrofitting of RISHIPARA PWSS",
+      "description": "Retrofitting of RISHIPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RISHIPARA PWSS",
+        "localName": "Retrofitting of RISHIPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156208",
+        "ddrName": "Retrofitting of RISHIPARA PWSS",
+        "projectId": "8156208",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RISHIPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189286",
+      "name": "SUNDARPARA PWSS (NEW)",
+      "description": "SUNDARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUNDARPARA PWSS (NEW)",
+        "localName": "SUNDARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22417",
+        "panchayatname": "Dhamar",
+        "villageCode": "33152",
+        "villageName": "Nidanpur Pt-ii (ct)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189286",
+        "ddrName": "SUNDARPARA PWSS (NEW)",
+        "projectId": "30189286",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUNDARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218721",
+      "name": "BALIPARA PWSS (NEW)",
+      "description": "BALIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALIPARA PWSS (NEW)",
+        "localName": "BALIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218721",
+        "ddrName": "BALIPARA PWSS (NEW)",
+        "projectId": "30218721",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221249",
+      "name": "Domoni PWSS (NEW)",
+      "description": "Domoni PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Domoni PWSS (NEW)",
+        "localName": "Domoni PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221249",
+        "ddrName": "Domoni PWSS (NEW)",
+        "projectId": "30221249",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Domoni PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2520036",
+      "name": "Faringapara PWSS",
+      "description": "Faringapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Faringapara PWSS",
+        "localName": "Faringapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2520036",
+        "ddrName": "Faringapara PWSS",
+        "projectId": "2520036",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Faringapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072651",
+      "name": "FARINGAPARA TALTOLA PWSS (NEW)",
+      "description": "FARINGAPARA TALTOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FARINGAPARA TALTOLA PWSS (NEW)",
+        "localName": "FARINGAPARA TALTOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072651",
+        "ddrName": "FARINGAPARA TALTOLA PWSS (NEW)",
+        "projectId": "30072651",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FARINGAPARA TALTOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208803",
+      "name": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+      "description": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+        "localName": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208803",
+        "ddrName": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+        "projectId": "30208803",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183462",
+      "name": "PALASH KANDI PWSS (NEW)",
+      "description": "PALASH KANDI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PALASH KANDI PWSS (NEW)",
+        "localName": "PALASH KANDI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183462",
+        "ddrName": "PALASH KANDI PWSS (NEW)",
+        "projectId": "30183462",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PALASH KANDI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072655",
+      "name": "DONGERPAR PWSS (NEW)",
+      "description": "DONGERPAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DONGERPAR PWSS (NEW)",
+        "localName": "DONGERPAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33176",
+        "villageName": "Faringapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072655",
+        "ddrName": "DONGERPAR PWSS (NEW)",
+        "projectId": "30072655",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DONGERPAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042812",
+      "name": "LIKIRI PARA PWSS (NEW)",
+      "description": "LIKIRI PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LIKIRI PARA PWSS (NEW)",
+        "localName": "LIKIRI PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33178",
+        "villageName": "Likiri Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042812",
+        "ddrName": "LIKIRI PARA PWSS (NEW)",
+        "projectId": "30042812",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LIKIRI PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30061020",
+      "name": "DASPARA SILAPANI PWSS (NEW)",
+      "description": "DASPARA SILAPANI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DASPARA SILAPANI PWSS (NEW)",
+        "localName": "DASPARA SILAPANI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33177",
+        "villageName": "Silapani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30061020",
+        "ddrName": "DASPARA SILAPANI PWSS (NEW)",
+        "projectId": "30061020",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DASPARA SILAPANI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072656",
+      "name": "DASPARA PWSS (NEW)",
+      "description": "DASPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DASPARA PWSS (NEW)",
+        "localName": "DASPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22422",
+        "panchayatname": "Faringapara",
+        "villageCode": "33177",
+        "villageName": "Silapani",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072656",
+        "ddrName": "DASPARA PWSS (NEW)",
+        "projectId": "30072656",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DASPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189328",
+      "name": "ABHIRAMPARA PWSS (NEW)",
+      "description": "ABHIRAMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ABHIRAMPARA PWSS (NEW)",
+        "localName": "ABHIRAMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33113",
+        "villageName": "Abhirampara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189328",
+        "ddrName": "ABHIRAMPARA PWSS (NEW)",
+        "projectId": "30189328",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ABHIRAMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043321",
+      "name": "BAMUNDOBA PWSS (NEW)",
+      "description": "BAMUNDOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNDOBA PWSS (NEW)",
+        "localName": "BAMUNDOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33109",
+        "villageName": "Bamundoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043321",
+        "ddrName": "BAMUNDOBA PWSS (NEW)",
+        "projectId": "30043321",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNDOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189582",
+      "name": "TOPAJULI PWSS (NEW)",
+      "description": "TOPAJULI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TOPAJULI PWSS (NEW)",
+        "localName": "TOPAJULI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33109",
+        "villageName": "Bamundoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189582",
+        "ddrName": "TOPAJULI PWSS (NEW)",
+        "projectId": "30189582",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TOPAJULI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386695",
+      "name": "Boistompara PWSS",
+      "description": "Boistompara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Boistompara PWSS",
+        "localName": "Boistompara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33117",
+        "villageName": "Boistompara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386695",
+        "ddrName": "Boistompara PWSS",
+        "projectId": "3386695",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Boistompara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30061011",
+      "name": "RABHAPARA PWSS (NEW)",
+      "description": "RABHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RABHAPARA PWSS (NEW)",
+        "localName": "RABHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33117",
+        "villageName": "Boistompara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30061011",
+        "ddrName": "RABHAPARA PWSS (NEW)",
+        "projectId": "30061011",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RABHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196972",
+      "name": "Retrofitting of BOISTOMPARA PWSS",
+      "description": "Retrofitting of BOISTOMPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BOISTOMPARA PWSS",
+        "localName": "Retrofitting of BOISTOMPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33117",
+        "villageName": "Boistompara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196972",
+        "ddrName": "Retrofitting of BOISTOMPARA PWSS",
+        "projectId": "8196972",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BOISTOMPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211881",
+      "name": "NAKCHIGIRI PWSS (NEW)",
+      "description": "NAKCHIGIRI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAKCHIGIRI PWSS (NEW)",
+        "localName": "NAKCHIGIRI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22415",
+        "panchayatname": "JAYRAM KUCHI",
+        "villageCode": "33117",
+        "villageName": "BOISTOMPARA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211881",
+        "ddrName": "NAKCHIGIRI PWSS (NEW)",
+        "projectId": "30211881",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAKCHIGIRI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30138012",
+      "name": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+      "description": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+        "localName": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33110",
+        "villageName": "Chaibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30138012",
+        "ddrName": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+        "projectId": "30138012",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156220",
+      "name": "Retrofitting of CHOIBARI PWSS",
+      "description": "Retrofitting of CHOIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHOIBARI PWSS",
+        "localName": "Retrofitting of CHOIBARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33110",
+        "villageName": "Chaibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156220",
+        "ddrName": "Retrofitting of CHOIBARI PWSS",
+        "projectId": "8156220",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHOIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4887755",
+      "name": "Choibari PWSS",
+      "description": "Choibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Choibari PWSS",
+        "localName": "Choibari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33110",
+        "villageName": "Chaibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4887755",
+        "ddrName": "Choibari PWSS",
+        "projectId": "4887755",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Choibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189595",
+      "name": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+      "description": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+        "localName": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33111",
+        "villageName": "Goyram Kushi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189595",
+        "ddrName": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+        "projectId": "30189595",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069820",
+      "name": "JAYRAMKUCHI PWSS (NEW)",
+      "description": "JAYRAMKUCHI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAYRAMKUCHI PWSS (NEW)",
+        "localName": "JAYRAMKUCHI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33111",
+        "villageName": "Goyram Kushi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069820",
+        "ddrName": "JAYRAMKUCHI PWSS (NEW)",
+        "projectId": "30069820",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAYRAMKUCHI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042961",
+      "name": "KRISHNAPUR PWSS (NEW)",
+      "description": "KRISHNAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KRISHNAPUR PWSS (NEW)",
+        "localName": "KRISHNAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33116",
+        "villageName": "Janjipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042961",
+        "ddrName": "KRISHNAPUR PWSS (NEW)",
+        "projectId": "30042961",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KRISHNAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212766",
+      "name": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+      "description": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+        "localName": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22415",
+        "panchayatname": "JAYRAM KUCHI",
+        "villageCode": "33116",
+        "villageName": "JANJIPARA PT-I",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212766",
+        "ddrName": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+        "projectId": "30212766",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218726",
+      "name": "BATAPARA TILAPARA PWSS (NEW)",
+      "description": "BATAPARA TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BATAPARA TILAPARA PWSS (NEW)",
+        "localName": "BATAPARA TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33112",
+        "villageName": "Krishapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218726",
+        "ddrName": "BATAPARA TILAPARA PWSS (NEW)",
+        "projectId": "30218726",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BATAPARA TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063240",
+      "name": "KULAMUWA PWSS (NEW)",
+      "description": "KULAMUWA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KULAMUWA PWSS (NEW)",
+        "localName": "KULAMUWA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33120",
+        "villageName": "Kulamuwa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063240",
+        "ddrName": "KULAMUWA PWSS (NEW)",
+        "projectId": "30063240",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KULAMUWA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30222601",
+      "name": "Retrofitting of Jhanjipara PWSS",
+      "description": "Retrofitting of Jhanjipara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Jhanjipara PWSS",
+        "localName": "Retrofitting of Jhanjipara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33119",
+        "villageName": "Nalbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30222601",
+        "ddrName": "Retrofitting of Jhanjipara PWSS",
+        "projectId": "30222601",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Jhanjipara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155049",
+      "name": "JANJIPARA PWSS",
+      "description": "JANJIPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JANJIPARA PWSS",
+        "localName": "JANJIPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33119",
+        "villageName": "Nalbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155049",
+        "ddrName": "JANJIPARA PWSS",
+        "projectId": "8155049",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JANJIPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189379",
+      "name": "NAYAPARA (Lakhipur) PWSS (NEW)",
+      "description": "NAYAPARA (Lakhipur) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA (Lakhipur) PWSS (NEW)",
+        "localName": "NAYAPARA (Lakhipur) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33114",
+        "villageName": "Nayapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189379",
+        "ddrName": "NAYAPARA (Lakhipur) PWSS (NEW)",
+        "projectId": "30189379",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA (Lakhipur) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30059252",
+      "name": "CHAKIABHASA PWSS (NEW)",
+      "description": "CHAKIABHASA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAKIABHASA PWSS (NEW)",
+        "localName": "CHAKIABHASA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33118",
+        "villageName": "Panisali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30059252",
+        "ddrName": "CHAKIABHASA PWSS (NEW)",
+        "projectId": "30059252",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAKIABHASA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30093053",
+      "name": "PANISALI PWSS (NEW)",
+      "description": "PANISALI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PANISALI PWSS (NEW)",
+        "localName": "PANISALI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33118",
+        "villageName": "Panisali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30093053",
+        "ddrName": "PANISALI PWSS (NEW)",
+        "projectId": "30093053",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PANISALI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073356",
+      "name": "INDIBARI PWSS (NEW)",
+      "description": "INDIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "INDIBARI PWSS (NEW)",
+        "localName": "INDIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33118",
+        "villageName": "Panisali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073356",
+        "ddrName": "INDIBARI PWSS (NEW)",
+        "projectId": "30073356",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "INDIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218465",
+      "name": "LALUPARA PWSS (NEW)",
+      "description": "LALUPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LALUPARA PWSS (NEW)",
+        "localName": "LALUPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33118",
+        "villageName": "Panisali",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218465",
+        "ddrName": "LALUPARA PWSS (NEW)",
+        "projectId": "30218465",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LALUPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30146517",
+      "name": "RONGADOBA PWSS (NEW)",
+      "description": "RONGADOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RONGADOBA PWSS (NEW)",
+        "localName": "RONGADOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33108",
+        "villageName": "Rongadoba",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30146517",
+        "ddrName": "RONGADOBA PWSS (NEW)",
+        "projectId": "30146517",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RONGADOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30192093",
+      "name": "THORKO GAROPARA PWSS (NEW)",
+      "description": "THORKO GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "THORKO GAROPARA PWSS (NEW)",
+        "localName": "THORKO GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33115",
+        "villageName": "Tharka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30192093",
+        "ddrName": "THORKO GAROPARA PWSS (NEW)",
+        "projectId": "30192093",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "THORKO GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8156271",
+      "name": "Retrofitting of THORKO PWSS",
+      "description": "Retrofitting of THORKO PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of THORKO PWSS",
+        "localName": "Retrofitting of THORKO PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33115",
+        "villageName": "Tharka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8156271",
+        "ddrName": "Retrofitting of THORKO PWSS",
+        "projectId": "8156271",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of THORKO PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2517256",
+      "name": "Thorko PWSS",
+      "description": "Thorko PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Thorko PWSS",
+        "localName": "Thorko PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22415",
+        "panchayatname": "Jayram Kuchi",
+        "villageCode": "33115",
+        "villageName": "Tharka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2517256",
+        "ddrName": "Thorko PWSS",
+        "projectId": "2517256",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Thorko PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167319",
+      "name": "BAMUNER ALGA PT-III PWSS (NEW)",
+      "description": "BAMUNER ALGA PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNER ALGA PT-III PWSS (NEW)",
+        "localName": "BAMUNER ALGA PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22424",
+        "panchayatname": "Kalshabhanga",
+        "villageCode": "33196",
+        "villageName": "Bamuner Alga Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167319",
+        "ddrName": "BAMUNER ALGA PT-III PWSS (NEW)",
+        "projectId": "30167319",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNER ALGA PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167391",
+      "name": "BAMUNER ALGA PT- IV PWSS (NEW)",
+      "description": "BAMUNER ALGA PT- IV PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNER ALGA PT- IV PWSS (NEW)",
+        "localName": "BAMUNER ALGA PT- IV PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22424",
+        "panchayatname": "Kalshabhanga",
+        "villageCode": "33197",
+        "villageName": "Bamuner Alga Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167391",
+        "ddrName": "BAMUNER ALGA PT- IV PWSS (NEW)",
+        "projectId": "30167391",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNER ALGA PT- IV PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189234",
+      "name": "CHOLAKURA PT-I PWSS (NEW)",
+      "description": "CHOLAKURA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOLAKURA PT-I PWSS (NEW)",
+        "localName": "CHOLAKURA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22424",
+        "panchayatname": "Kalshabhanga",
+        "villageCode": "33193",
+        "villageName": "Cholakura Pt-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189234",
+        "ddrName": "CHOLAKURA PT-I PWSS (NEW)",
+        "projectId": "30189234",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOLAKURA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167439",
+      "name": "CHOLAKURA PT-III PWSS (NEW)",
+      "description": "CHOLAKURA PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOLAKURA PT-III PWSS (NEW)",
+        "localName": "CHOLAKURA PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22424",
+        "panchayatname": "Kalshabhanga",
+        "villageCode": "627229",
+        "villageName": "Cholakura Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167439",
+        "ddrName": "CHOLAKURA PT-III PWSS (NEW)",
+        "projectId": "30167439",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOLAKURA PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189208",
+      "name": "KILLHARA PT-I PWSS (NEW)",
+      "description": "KILLHARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KILLHARA PT-I PWSS (NEW)",
+        "localName": "KILLHARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22424",
+        "panchayatname": "Kalshabhanga",
+        "villageCode": "33199",
+        "villageName": "Killahara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189208",
+        "ddrName": "KILLHARA PT-I PWSS (NEW)",
+        "projectId": "30189208",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KILLHARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8196995",
+      "name": "Retrofitting of BOLAIKHAMAR PWSS",
+      "description": "Retrofitting of BOLAIKHAMAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BOLAIKHAMAR PWSS",
+        "localName": "Retrofitting of BOLAIKHAMAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33096",
+        "villageName": "Balaikhamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8196995",
+        "ddrName": "Retrofitting of BOLAIKHAMAR PWSS",
+        "projectId": "8196995",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BOLAIKHAMAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937556",
+      "name": "Bolaikhamar PWSS",
+      "description": "Bolaikhamar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bolaikhamar PWSS",
+        "localName": "Bolaikhamar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33096",
+        "villageName": "Balaikhamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937556",
+        "ddrName": "Bolaikhamar PWSS",
+        "projectId": "1937556",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bolaikhamar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189469",
+      "name": "KALAPARA PWSS (NEW)",
+      "description": "KALAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALAPARA PWSS (NEW)",
+        "localName": "KALAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33101",
+        "villageName": "Besarkona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189469",
+        "ddrName": "KALAPARA PWSS (NEW)",
+        "projectId": "30189469",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073481",
+      "name": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+      "description": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+        "localName": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33101",
+        "villageName": "Besarkona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073481",
+        "ddrName": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+        "projectId": "30073481",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30222577",
+      "name": "Retrofitting of Besorkona PWSS",
+      "description": "Retrofitting of Besorkona PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Besorkona PWSS",
+        "localName": "Retrofitting of Besorkona PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33101",
+        "villageName": "Besarkona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30222577",
+        "ddrName": "Retrofitting of Besorkona PWSS",
+        "projectId": "30222577",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Besorkona PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8154251",
+      "name": "BESARKONA PWSS",
+      "description": "BESARKONA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BESARKONA PWSS",
+        "localName": "BESARKONA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33101",
+        "villageName": "Besarkona",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8154251",
+        "ddrName": "BESARKONA PWSS",
+        "projectId": "8154251",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BESARKONA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189381",
+      "name": "DEONAPARA PT-I PWSS (NEW)",
+      "description": "DEONAPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEONAPARA PT-I PWSS (NEW)",
+        "localName": "DEONAPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33103",
+        "villageName": "Deonapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189381",
+        "ddrName": "DEONAPARA PT-I PWSS (NEW)",
+        "projectId": "30189381",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEONAPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8155025",
+      "name": "BORDOL PWSS",
+      "description": "BORDOL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDOL PWSS",
+        "localName": "BORDOL PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33104",
+        "villageName": "Deonapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8155025",
+        "ddrName": "BORDOL PWSS",
+        "projectId": "8155025",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDOL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8261500",
+      "name": "BORDAL L.P.S.",
+      "description": "BORDAL L.P.S.",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDAL L.P.S.",
+        "localName": "BORDAL L.P.S.",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33104",
+        "villageName": "Deonapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8261500",
+        "ddrName": "BORDAL L.P.S.",
+        "projectId": "8261500",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDAL L.P.S.",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30091027",
+      "name": "DEONAPARA PT-II PWSS (NEW)",
+      "description": "DEONAPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEONAPARA PT-II PWSS (NEW)",
+        "localName": "DEONAPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33104",
+        "villageName": "Deonapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30091027",
+        "ddrName": "DEONAPARA PT-II PWSS (NEW)",
+        "projectId": "30091027",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEONAPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041386",
+      "name": "DHOKAPARA PWSS (NEW)",
+      "description": "DHOKAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHOKAPARA PWSS (NEW)",
+        "localName": "DHOKAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33105",
+        "villageName": "Dhokapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041386",
+        "ddrName": "DHOKAPARA PWSS (NEW)",
+        "projectId": "30041386",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHOKAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30222595",
+      "name": "Retrofitting of Bordol PWSS",
+      "description": "Retrofitting of Bordol PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of Bordol PWSS",
+        "localName": "Retrofitting of Bordol PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33107",
+        "villageName": "Ghunghunivita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30222595",
+        "ddrName": "Retrofitting of Bordol PWSS",
+        "projectId": "30222595",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of Bordol PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189391",
+      "name": "GHUNGHUNIRBHITA PWSS (NEW)",
+      "description": "GHUNGHUNIRBHITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHUNGHUNIRBHITA PWSS (NEW)",
+        "localName": "GHUNGHUNIRBHITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33107",
+        "villageName": "Ghunghunivita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189391",
+        "ddrName": "GHUNGHUNIRBHITA PWSS (NEW)",
+        "projectId": "30189391",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHUNGHUNIRBHITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211556",
+      "name": "GOBAL, TIKRIPARA PWSS (NEW)",
+      "description": "GOBAL, TIKRIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOBAL, TIKRIPARA PWSS (NEW)",
+        "localName": "GOBAL, TIKRIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33099",
+        "villageName": "Gobal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211556",
+        "ddrName": "GOBAL, TIKRIPARA PWSS (NEW)",
+        "projectId": "30211556",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOBAL, TIKRIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197113",
+      "name": "Retrofitting of SIGRI PWSS",
+      "description": "Retrofitting of SIGRI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SIGRI PWSS",
+        "localName": "Retrofitting of SIGRI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33099",
+        "villageName": "Gobal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197113",
+        "ddrName": "Retrofitting of SIGRI PWSS",
+        "projectId": "8197113",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SIGRI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207996",
+      "name": "JHANJIPARA PT-II PWSS (NEW)",
+      "description": "JHANJIPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JHANJIPARA PT-II PWSS (NEW)",
+        "localName": "JHANJIPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33106",
+        "villageName": "Janjipara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207996",
+        "ddrName": "JHANJIPARA PT-II PWSS (NEW)",
+        "projectId": "30207996",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JHANJIPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189399",
+      "name": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+      "description": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+        "localName": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33100",
+        "villageName": "Lahapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189399",
+        "ddrName": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+        "projectId": "30189399",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189336",
+      "name": "LAHAPARA PWSS (NEW)",
+      "description": "LAHAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LAHAPARA PWSS (NEW)",
+        "localName": "LAHAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33100",
+        "villageName": "Lahapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189336",
+        "ddrName": "LAHAPARA PWSS (NEW)",
+        "projectId": "30189336",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LAHAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060116",
+      "name": "SIGRI PT-I PWSS (NEW)",
+      "description": "SIGRI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIGRI PT-I PWSS (NEW)",
+        "localName": "SIGRI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33102",
+        "villageName": "Lambupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060116",
+        "ddrName": "SIGRI PT-I PWSS (NEW)",
+        "projectId": "30060116",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIGRI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023084",
+      "name": "Sigri Pt-I Lambupara MVS(NEW)",
+      "description": "Sigri Pt-I Lambupara MVS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sigri Pt-I Lambupara MVS(NEW)",
+        "localName": "Sigri Pt-I Lambupara MVS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33102",
+        "villageName": "Lambupara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023084",
+        "ddrName": "Sigri Pt-I Lambupara MVS(NEW)",
+        "projectId": "30023084",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sigri Pt-I Lambupara MVS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6055543",
+      "name": "Sigri PWSS",
+      "description": "Sigri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sigri PWSS",
+        "localName": "Sigri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22414",
+        "panchayatname": "Pukhuripara",
+        "villageCode": "33098",
+        "villageName": "Sigri Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6055543",
+        "ddrName": "Sigri PWSS",
+        "projectId": "6055543",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sigri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167408",
+      "name": "BORARCHAR PT-I PWSS (NEW)",
+      "description": "BORARCHAR PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORARCHAR PT-I PWSS (NEW)",
+        "localName": "BORARCHAR PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22423",
+        "panchayatname": "Rowkhowa",
+        "villageCode": "33183",
+        "villageName": "Borar Char Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167408",
+        "ddrName": "BORARCHAR PT-I PWSS (NEW)",
+        "projectId": "30167408",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORARCHAR PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188506",
+      "name": "CHULARCHAR PWSS (NEW)",
+      "description": "CHULARCHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHULARCHAR PWSS (NEW)",
+        "localName": "CHULARCHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22423",
+        "panchayatname": "Rowkhowa",
+        "villageCode": "33191",
+        "villageName": "Chular Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188506",
+        "ddrName": "CHULARCHAR PWSS (NEW)",
+        "projectId": "30188506",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHULARCHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167292",
+      "name": "ROWKHOWA PT-II PWSS (NEW)",
+      "description": "ROWKHOWA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ROWKHOWA PT-II PWSS (NEW)",
+        "localName": "ROWKHOWA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22423",
+        "panchayatname": "Rowkhowa",
+        "villageCode": "627235",
+        "villageName": "Rowkhowa Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167292",
+        "ddrName": "ROWKHOWA PT-II PWSS (NEW)",
+        "projectId": "30167292",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ROWKHOWA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167463",
+      "name": "SALMARA PWSS (NEW)",
+      "description": "SALMARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SALMARA PWSS (NEW)",
+        "localName": "SALMARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22423",
+        "panchayatname": "Rowkhowa",
+        "villageCode": "33186",
+        "villageName": "Salmara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167463",
+        "ddrName": "SALMARA PWSS (NEW)",
+        "projectId": "30167463",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SALMARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30137931",
+      "name": "BHOISMARI PWSS (NEW)",
+      "description": "BHOISMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOISMARI PWSS (NEW)",
+        "localName": "BHOISMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33167",
+        "villageName": "BHOISMARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30137931",
+        "ddrName": "BHOISMARI PWSS (NEW)",
+        "projectId": "30137931",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOISMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143295",
+      "name": "BOROPOITARY PWSS (NEW)",
+      "description": "BOROPOITARY PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOROPOITARY PWSS (NEW)",
+        "localName": "BOROPOITARY PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33168",
+        "villageName": "BORO PAITARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143295",
+        "ddrName": "BOROPOITARY PWSS (NEW)",
+        "projectId": "30143295",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOROPOITARY PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6054046",
+      "name": "Khudrapoitary PWSS",
+      "description": "Khudrapoitary PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khudrapoitary PWSS",
+        "localName": "Khudrapoitary PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33168",
+        "villageName": "BORO PAITARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6054046",
+        "ddrName": "Khudrapoitary PWSS",
+        "projectId": "6054046",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khudrapoitary PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206297",
+      "name": "Retrofitting of KHUDRAPOITARY PWSS",
+      "description": "Retrofitting of KHUDRAPOITARY PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHUDRAPOITARY PWSS",
+        "localName": "Retrofitting of KHUDRAPOITARY PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33168",
+        "villageName": "BORO PAITARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206297",
+        "ddrName": "Retrofitting of KHUDRAPOITARY PWSS",
+        "projectId": "8206297",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHUDRAPOITARY PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30041202",
+      "name": "CHAKLA MOTHABARI PWSS (NEW)",
+      "description": "CHAKLA MOTHABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAKLA MOTHABARI PWSS (NEW)",
+        "localName": "CHAKLA MOTHABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33172",
+        "villageName": "Chakbabill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30041202",
+        "ddrName": "CHAKLA MOTHABARI PWSS (NEW)",
+        "projectId": "30041202",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAKLA MOTHABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30183367",
+      "name": "Chakla Billpara PWSS (NEW)",
+      "description": "Chakla Billpara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chakla Billpara PWSS (NEW)",
+        "localName": "Chakla Billpara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33172",
+        "villageName": "Chakbabill",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30183367",
+        "ddrName": "Chakla Billpara PWSS (NEW)",
+        "projectId": "30183367",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chakla Billpara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171989",
+      "name": "Retrofitting of KHONAR PUBPAR PWSS",
+      "description": "Retrofitting of KHONAR PUBPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHONAR PUBPAR PWSS",
+        "localName": "Retrofitting of KHONAR PUBPAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33171",
+        "villageName": "Khonar Pubpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171989",
+        "ddrName": "Retrofitting of KHONAR PUBPAR PWSS",
+        "projectId": "8171989",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHONAR PUBPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4963515",
+      "name": "Khonar Pubpar PWSS",
+      "description": "Khonar Pubpar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khonar Pubpar PWSS",
+        "localName": "Khonar Pubpar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33171",
+        "villageName": "Khonar Pubpar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4963515",
+        "ddrName": "Khonar Pubpar PWSS",
+        "projectId": "4963515",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khonar Pubpar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30188401",
+      "name": "MOTHABARI (LAKHIPUR) PWSS",
+      "description": "MOTHABARI (LAKHIPUR) PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MOTHABARI (LAKHIPUR) PWSS",
+        "localName": "MOTHABARI (LAKHIPUR) PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33169",
+        "villageName": "MOTHABARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30188401",
+        "ddrName": "MOTHABARI (LAKHIPUR) PWSS",
+        "projectId": "30188401",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MOTHABARI (LAKHIPUR) PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30064646",
+      "name": "BAWAIRARPARA PWSS (NEW)",
+      "description": "BAWAIRARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAWAIRARPARA PWSS (NEW)",
+        "localName": "BAWAIRARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33169",
+        "villageName": "MOTHABARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30064646",
+        "ddrName": "BAWAIRARPARA PWSS (NEW)",
+        "projectId": "30064646",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAWAIRARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30189299",
+      "name": "KUKRADANGA PWSS (NEW)",
+      "description": "KUKRADANGA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUKRADANGA PWSS (NEW)",
+        "localName": "KUKRADANGA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33170",
+        "villageName": "Saktola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30189299",
+        "ddrName": "KUKRADANGA PWSS (NEW)",
+        "projectId": "30189299",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUKRADANGA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186463",
+      "name": "Saktola PWSS",
+      "description": "Saktola PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Saktola PWSS",
+        "localName": "Saktola PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33170",
+        "villageName": "Saktola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186463",
+        "ddrName": "Saktola PWSS",
+        "projectId": "5186463",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Saktola PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206477",
+      "name": "Retrofitting of SAKTOLA PWSS",
+      "description": "Retrofitting of SAKTOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SAKTOLA PWSS",
+        "localName": "Retrofitting of SAKTOLA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33170",
+        "villageName": "Saktola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206477",
+        "ddrName": "Retrofitting of SAKTOLA PWSS",
+        "projectId": "8206477",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SAKTOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186457",
+      "name": "Saktola PWSS",
+      "description": "Saktola PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Saktola PWSS",
+        "localName": "Saktola PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33170",
+        "villageName": "Saktola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186457",
+        "ddrName": "Saktola PWSS",
+        "projectId": "5186457",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Saktola PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30137902",
+      "name": "SAKTOLA [ A ] PWSS",
+      "description": "SAKTOLA [ A ] PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAKTOLA [ A ] PWSS",
+        "localName": "SAKTOLA [ A ] PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33170",
+        "villageName": "Saktola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30137902",
+        "ddrName": "SAKTOLA [ A ] PWSS",
+        "projectId": "30137902",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAKTOLA [ A ] PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068229",
+      "name": "SAKTOLA [ B ] PWSS (NEW)",
+      "description": "SAKTOLA [ B ] PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAKTOLA [ B ] PWSS (NEW)",
+        "localName": "SAKTOLA [ B ] PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "Lakhipur",
+        "panchayatcode": "22420",
+        "panchayatname": "Saktola",
+        "villageCode": "33170",
+        "villageName": "Saktola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068229",
+        "ddrName": "SAKTOLA [ B ] PWSS (NEW)",
+        "projectId": "30068229",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAKTOLA [ B ] PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30080314",
+      "name": "SOWARI POITARY PWSS (NEW)",
+      "description": "SOWARI POITARY PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SOWARI POITARY PWSS (NEW)",
+        "localName": "SOWARI POITARY PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1186",
+        "blockname": "LAKHIPUR",
+        "panchayatcode": "22420",
+        "panchayatname": "SAKTOLA",
+        "villageCode": "33166",
+        "villageName": "SWARI PAITARI",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30080314",
+        "ddrName": "SOWARI POITARY PWSS (NEW)",
+        "projectId": "30080314",
+        "regionName": "1186"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SOWARI POITARY PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8234543",
+      "name": "RETROFITTING OF 8 No Camp PWSS",
+      "description": "RETROFITTING OF 8 No Camp PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF 8 No Camp PWSS",
+        "localName": "RETROFITTING OF 8 No Camp PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22411",
+        "panchayatname": "BAKAITARY",
+        "villageCode": "33074",
+        "villageName": "BAKAITARI PT-I",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8234543",
+        "ddrName": "RETROFITTING OF 8 No Camp PWSS",
+        "projectId": "8234543",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF 8 No Camp PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6054477",
+      "name": "Bakaitary PWSS",
+      "description": "Bakaitary PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakaitary PWSS",
+        "localName": "Bakaitary PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33074",
+        "villageName": "Bakaitari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6054477",
+        "ddrName": "Bakaitary PWSS",
+        "projectId": "6054477",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakaitary PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203683",
+      "name": "Retrofitting of 9 No. Camp PWSS",
+      "description": "Retrofitting of 9 No. Camp PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of 9 No. Camp PWSS",
+        "localName": "Retrofitting of 9 No. Camp PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33074",
+        "villageName": "Bakaitari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203683",
+        "ddrName": "Retrofitting of 9 No. Camp PWSS",
+        "projectId": "8203683",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of 9 No. Camp PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205395",
+      "name": "Retrofitting of BAKAITARY PWSS",
+      "description": "Retrofitting of BAKAITARY PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAKAITARY PWSS",
+        "localName": "Retrofitting of BAKAITARY PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33074",
+        "villageName": "Bakaitari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205395",
+        "ddrName": "Retrofitting of BAKAITARY PWSS",
+        "projectId": "8205395",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAKAITARY PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043557",
+      "name": "NOBILA BORI PWSS (NEW)",
+      "description": "NOBILA BORI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NOBILA BORI PWSS (NEW)",
+        "localName": "NOBILA BORI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33074",
+        "villageName": "Bakaitari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043557",
+        "ddrName": "NOBILA BORI PWSS (NEW)",
+        "projectId": "30043557",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NOBILA BORI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873898",
+      "name": "Nigam PWSS",
+      "description": "Nigam PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Nigam PWSS",
+        "localName": "Nigam PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33074",
+        "villageName": "Bakaitari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873898",
+        "ddrName": "Nigam PWSS",
+        "projectId": "4873898",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Nigam PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30149044",
+      "name": "BHAKATPARA PWSS (NEW)",
+      "description": "BHAKATPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHAKATPARA PWSS (NEW)",
+        "localName": "BHAKATPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33075",
+        "villageName": "Bakaitari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30149044",
+        "ddrName": "BHAKATPARA PWSS (NEW)",
+        "projectId": "30149044",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHAKATPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30079143",
+      "name": "COLLEGEPARA PWSS (NEW)",
+      "description": "COLLEGEPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "COLLEGEPARA PWSS (NEW)",
+        "localName": "COLLEGEPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33075",
+        "villageName": "Bakaitari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30079143",
+        "ddrName": "COLLEGEPARA PWSS (NEW)",
+        "projectId": "30079143",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "COLLEGEPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213215",
+      "name": "RAYATPARA PURANPARA PWSS (NEW)",
+      "description": "RAYATPARA PURANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAYATPARA PURANPARA PWSS (NEW)",
+        "localName": "RAYATPARA PURANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33075",
+        "villageName": "Bakaitari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213215",
+        "ddrName": "RAYATPARA PURANPARA PWSS (NEW)",
+        "projectId": "30213215",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAYATPARA PURANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1872304",
+      "name": "9 No.  Camp PWSS",
+      "description": "9 No.  Camp PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "9 No.  Camp PWSS",
+        "localName": "9 No.  Camp PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22411",
+        "panchayatname": "BAKAITARY",
+        "villageCode": "33076",
+        "villageName": "BAKAITARI PT-III",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1872304",
+        "ddrName": "9 No.  Camp PWSS",
+        "projectId": "1872304",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "9 No.  Camp PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213224",
+      "name": "BAKAITARY KHALAIPARA PWSS (NEW)",
+      "description": "BAKAITARY KHALAIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAKAITARY KHALAIPARA PWSS (NEW)",
+        "localName": "BAKAITARY KHALAIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33076",
+        "villageName": "Bakaitari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213224",
+        "ddrName": "BAKAITARY KHALAIPARA PWSS (NEW)",
+        "projectId": "30213224",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAKAITARY KHALAIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30128902",
+      "name": "GANAKPARA PWSS (NEW)",
+      "description": "GANAKPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GANAKPARA PWSS (NEW)",
+        "localName": "GANAKPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33076",
+        "villageName": "Bakaitari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30128902",
+        "ddrName": "GANAKPARA PWSS (NEW)",
+        "projectId": "30128902",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GANAKPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019166",
+      "name": "JAGANNATHPUR PWSS (NEW)",
+      "description": "JAGANNATHPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAGANNATHPUR PWSS (NEW)",
+        "localName": "JAGANNATHPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22411",
+        "panchayatname": "Bakaitary",
+        "villageCode": "33073",
+        "villageName": "Gunialguri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019166",
+        "ddrName": "JAGANNATHPUR PWSS (NEW)",
+        "projectId": "30019166",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAGANNATHPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7347032",
+      "name": "Baladmari Char Pt I PWSS",
+      "description": "Baladmari Char Pt I PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Baladmari Char Pt I PWSS",
+        "localName": "Baladmari Char Pt I PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33010",
+        "villageName": "Baladmari Char Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7347032",
+        "ddrName": "Baladmari Char Pt I PWSS",
+        "projectId": "7347032",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Baladmari Char Pt I PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30018720",
+      "name": "1 No Baladmari Char PWSS(NEW)",
+      "description": "1 No Baladmari Char PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "1 No Baladmari Char PWSS(NEW)",
+        "localName": "1 No Baladmari Char PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33010",
+        "villageName": "Baladmari Char Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30018720",
+        "ddrName": "1 No Baladmari Char PWSS(NEW)",
+        "projectId": "30018720",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "1 No Baladmari Char PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071861",
+      "name": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+      "description": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+        "localName": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071861",
+        "ddrName": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+        "projectId": "30071861",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4872988",
+      "name": "Kalu Bazar PWSS",
+      "description": "Kalu Bazar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalu Bazar PWSS",
+        "localName": "Kalu Bazar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4872988",
+        "ddrName": "Kalu Bazar PWSS",
+        "projectId": "4872988",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalu Bazar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203942",
+      "name": "Retrofitting of KALUBAZAR PWSS",
+      "description": "Retrofitting of KALUBAZAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KALUBAZAR PWSS",
+        "localName": "Retrofitting of KALUBAZAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203942",
+        "ddrName": "Retrofitting of KALUBAZAR PWSS",
+        "projectId": "8203942",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KALUBAZAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077362",
+      "name": "DAKHINPARA PWSS (NEW)",
+      "description": "DAKHINPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAKHINPARA PWSS (NEW)",
+        "localName": "DAKHINPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077362",
+        "ddrName": "DAKHINPARA PWSS (NEW)",
+        "projectId": "30077362",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAKHINPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5464439",
+      "name": "Santipur PWSS",
+      "description": "Santipur PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Santipur PWSS",
+        "localName": "Santipur PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5464439",
+        "ddrName": "Santipur PWSS",
+        "projectId": "5464439",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Santipur PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049050",
+      "name": "PACHIMPARA PWSS (NEW)",
+      "description": "PACHIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIMPARA PWSS (NEW)",
+        "localName": "PACHIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049050",
+        "ddrName": "PACHIMPARA PWSS (NEW)",
+        "projectId": "30049050",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075655",
+      "name": "UTTARPARA PWSS (NEW)",
+      "description": "UTTARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UTTARPARA PWSS (NEW)",
+        "localName": "UTTARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33011",
+        "villageName": "Baladmari Char Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075655",
+        "ddrName": "UTTARPARA PWSS (NEW)",
+        "projectId": "30075655",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UTTARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043286",
+      "name": "RAM HARIPARA PWSS (NEW)",
+      "description": "RAM HARIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAM HARIPARA PWSS (NEW)",
+        "localName": "RAM HARIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33012",
+        "villageName": "Baladmari Char Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043286",
+        "ddrName": "RAM HARIPARA PWSS (NEW)",
+        "projectId": "30043286",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAM HARIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049228",
+      "name": "BALAVITA PWSS (NEW)",
+      "description": "BALAVITA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALAVITA PWSS (NEW)",
+        "localName": "BALAVITA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33012",
+        "villageName": "Baladmari Char Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049228",
+        "ddrName": "BALAVITA PWSS (NEW)",
+        "projectId": "30049228",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALAVITA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077383",
+      "name": "HATKHOLA (BALADMARI) PWSS (NEW)",
+      "description": "HATKHOLA (BALADMARI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HATKHOLA (BALADMARI) PWSS (NEW)",
+        "localName": "HATKHOLA (BALADMARI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33013",
+        "villageName": "Baladmari Char Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077383",
+        "ddrName": "HATKHOLA (BALADMARI) PWSS (NEW)",
+        "projectId": "30077383",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HATKHOLA (BALADMARI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072592",
+      "name": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+      "description": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+        "localName": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33013",
+        "villageName": "Baladmari Char Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072592",
+        "ddrName": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+        "projectId": "30072592",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2515998",
+      "name": "Helapakhiri PWSS",
+      "description": "Helapakhiri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Helapakhiri PWSS",
+        "localName": "Helapakhiri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33015",
+        "villageName": "Helapakhri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2515998",
+        "ddrName": "Helapakhiri PWSS",
+        "projectId": "2515998",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Helapakhiri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160840",
+      "name": "Retrofitting of HELAPAKHRI PWSS",
+      "description": "Retrofitting of HELAPAKHRI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HELAPAKHRI PWSS",
+        "localName": "Retrofitting of HELAPAKHRI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33015",
+        "villageName": "Helapakhri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160840",
+        "ddrName": "Retrofitting of HELAPAKHRI PWSS",
+        "projectId": "8160840",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HELAPAKHRI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014669",
+      "name": "MAMABHAGINPARA PWSS (NEW)",
+      "description": "MAMABHAGINPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAMABHAGINPARA PWSS (NEW)",
+        "localName": "MAMABHAGINPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33015",
+        "villageName": "Helapakhri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014669",
+        "ddrName": "MAMABHAGINPARA PWSS (NEW)",
+        "projectId": "30014669",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAMABHAGINPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049610",
+      "name": "HELAPAKHRI TILAPARA PWSS (NEW)",
+      "description": "HELAPAKHRI TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HELAPAKHRI TILAPARA PWSS (NEW)",
+        "localName": "HELAPAKHRI TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33015",
+        "villageName": "Helapakhri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049610",
+        "ddrName": "HELAPAKHRI TILAPARA PWSS (NEW)",
+        "projectId": "30049610",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HELAPAKHRI TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30196806",
+      "name": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+      "description": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+        "localName": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22403",
+        "panchayatname": "Baladmari Char",
+        "villageCode": "33016",
+        "villageName": "Pakhiura Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30196806",
+        "ddrName": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+        "projectId": "30196806",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069296",
+      "name": "BARBALUPARA PWSS (NEW)",
+      "description": "BARBALUPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARBALUPARA PWSS (NEW)",
+        "localName": "BARBALUPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33060",
+        "villageName": "Borobalupara (banbabu Para)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069296",
+        "ddrName": "BARBALUPARA PWSS (NEW)",
+        "projectId": "30069296",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARBALUPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181615",
+      "name": "BORKANDA PWSS (NEW)",
+      "description": "BORKANDA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORKANDA PWSS (NEW)",
+        "localName": "BORKANDA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33060",
+        "villageName": "Borobalupara (banbabu Para)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181615",
+        "ddrName": "BORKANDA PWSS (NEW)",
+        "projectId": "30181615",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORKANDA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873867",
+      "name": "Buduchar PWSS",
+      "description": "Buduchar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Buduchar PWSS",
+        "localName": "Buduchar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33052",
+        "villageName": "Buduchar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873867",
+        "ddrName": "Buduchar PWSS",
+        "projectId": "4873867",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Buduchar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060179",
+      "name": "BUDUCHAR MILANPUR PWSS (NEW)",
+      "description": "BUDUCHAR MILANPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BUDUCHAR MILANPUR PWSS (NEW)",
+        "localName": "BUDUCHAR MILANPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33052",
+        "villageName": "Buduchar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060179",
+        "ddrName": "BUDUCHAR MILANPUR PWSS (NEW)",
+        "projectId": "30060179",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BUDUCHAR MILANPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126496",
+      "name": "JAYANTIPUR PWSS (NEW)",
+      "description": "JAYANTIPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JAYANTIPUR PWSS (NEW)",
+        "localName": "JAYANTIPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33052",
+        "villageName": "Buduchar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126496",
+        "ddrName": "JAYANTIPUR PWSS (NEW)",
+        "projectId": "30126496",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JAYANTIPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30027153",
+      "name": "MUSHLIMPARA PWSS (NEW)",
+      "description": "MUSHLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUSHLIMPARA PWSS (NEW)",
+        "localName": "MUSHLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33052",
+        "villageName": "Buduchar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30027153",
+        "ddrName": "MUSHLIMPARA PWSS (NEW)",
+        "projectId": "30027153",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUSHLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206558",
+      "name": "Retrofitting of SUNDARPUR PWSS",
+      "description": "Retrofitting of SUNDARPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SUNDARPUR PWSS",
+        "localName": "Retrofitting of SUNDARPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33052",
+        "villageName": "Buduchar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206558",
+        "ddrName": "Retrofitting of SUNDARPUR PWSS",
+        "projectId": "8206558",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SUNDARPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30211543",
+      "name": "SUNDARPUR NC PWSS (NEW)",
+      "description": "SUNDARPUR NC PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUNDARPUR NC PWSS (NEW)",
+        "localName": "SUNDARPUR NC PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33052",
+        "villageName": "Buduchar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30211543",
+        "ddrName": "SUNDARPUR NC PWSS (NEW)",
+        "projectId": "30211543",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUNDARPUR NC PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207863",
+      "name": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+      "description": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+        "localName": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33054",
+        "villageName": "Buduchar N.c.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207863",
+        "ddrName": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+        "projectId": "30207863",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049631",
+      "name": "KHALAIPARA PWSS (NEW)",
+      "description": "KHALAIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHALAIPARA PWSS (NEW)",
+        "localName": "KHALAIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33056",
+        "villageName": "Khalaipara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049631",
+        "ddrName": "KHALAIPARA PWSS (NEW)",
+        "projectId": "30049631",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHALAIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30128895",
+      "name": "MAMUDPUR PT-I PWSS (NEW)",
+      "description": "MAMUDPUR PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAMUDPUR PT-I PWSS (NEW)",
+        "localName": "MAMUDPUR PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22408",
+        "panchayatname": "BUDUCHAR",
+        "villageCode": "33061",
+        "villageName": "MAMUDPUR PT-I",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30128895",
+        "ddrName": "MAMUDPUR PT-I PWSS (NEW)",
+        "projectId": "30128895",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAMUDPUR PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235302",
+      "name": "Retrofitting of MAMUDPUR PWSS",
+      "description": "Retrofitting of MAMUDPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MAMUDPUR PWSS",
+        "localName": "Retrofitting of MAMUDPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22408",
+        "panchayatname": "BUDUCHAR",
+        "villageCode": "33061",
+        "villageName": "MAMUDPUR PT-I",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235302",
+        "ddrName": "Retrofitting of MAMUDPUR PWSS",
+        "projectId": "8235302",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MAMUDPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019832",
+      "name": "PURANPARA TELIPARA PWSS(NEW)",
+      "description": "PURANPARA TELIPARA PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PURANPARA TELIPARA PWSS(NEW)",
+        "localName": "PURANPARA TELIPARA PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33061",
+        "villageName": "Mamudpur Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019832",
+        "ddrName": "PURANPARA TELIPARA PWSS(NEW)",
+        "projectId": "30019832",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PURANPARA TELIPARA PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019173",
+      "name": "Hathkhola PWSS (NEW)",
+      "description": "Hathkhola PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hathkhola PWSS (NEW)",
+        "localName": "Hathkhola PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33063",
+        "villageName": "Mamudpur Pt.-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019173",
+        "ddrName": "Hathkhola PWSS (NEW)",
+        "projectId": "30019173",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hathkhola PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221327",
+      "name": "NATUNBASTI PWSS (NEW)",
+      "description": "NATUNBASTI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NATUNBASTI PWSS (NEW)",
+        "localName": "NATUNBASTI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33063",
+        "villageName": "Mamudpur Pt.-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221327",
+        "ddrName": "NATUNBASTI PWSS (NEW)",
+        "projectId": "30221327",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NATUNBASTI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221262",
+      "name": "TEKORPARA PWSS (NEW)",
+      "description": "TEKORPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TEKORPARA PWSS (NEW)",
+        "localName": "TEKORPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22408",
+        "panchayatname": "Buduchar",
+        "villageCode": "33063",
+        "villageName": "Mamudpur Pt.-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221262",
+        "ddrName": "TEKORPARA PWSS (NEW)",
+        "projectId": "30221262",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TEKORPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206554",
+      "name": "Retrofitting of DALGOMA PWSS",
+      "description": "Retrofitting of DALGOMA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DALGOMA PWSS",
+        "localName": "Retrofitting of DALGOMA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33048",
+        "villageName": "Dalgoma",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206554",
+        "ddrName": "Retrofitting of DALGOMA PWSS",
+        "projectId": "8206554",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DALGOMA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208681",
+      "name": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+      "description": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+        "localName": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33048",
+        "villageName": "Dalgoma",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208681",
+        "ddrName": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+        "projectId": "30208681",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221256",
+      "name": "PAULPARA PWSS (NEW)",
+      "description": "PAULPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAULPARA PWSS (NEW)",
+        "localName": "PAULPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33048",
+        "villageName": "Dalgoma",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221256",
+        "ddrName": "PAULPARA PWSS (NEW)",
+        "projectId": "30221256",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAULPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019826",
+      "name": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+      "description": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+        "localName": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33048",
+        "villageName": "Dalgoma",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019826",
+        "ddrName": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+        "projectId": "30019826",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8202020",
+      "name": "Retrofitting of KADOMTOLA CAMP PWSS",
+      "description": "Retrofitting of KADOMTOLA CAMP PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KADOMTOLA CAMP PWSS",
+        "localName": "Retrofitting of KADOMTOLA CAMP PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33048",
+        "villageName": "Dalgoma",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8202020",
+        "ddrName": "Retrofitting of KADOMTOLA CAMP PWSS",
+        "projectId": "8202020",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KADOMTOLA CAMP PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213208",
+      "name": "GOSSAIBORI MILANPUR PWSS (NEW)",
+      "description": "GOSSAIBORI MILANPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOSSAIBORI MILANPUR PWSS (NEW)",
+        "localName": "GOSSAIBORI MILANPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33051",
+        "villageName": "Gosaibori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213208",
+        "ddrName": "GOSSAIBORI MILANPUR PWSS (NEW)",
+        "projectId": "30213208",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOSSAIBORI MILANPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8234577",
+      "name": "RETROFITTING OF Gossaibori PWSS",
+      "description": "RETROFITTING OF Gossaibori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RETROFITTING OF Gossaibori PWSS",
+        "localName": "RETROFITTING OF Gossaibori PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33051",
+        "villageName": "Gosaibori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8234577",
+        "ddrName": "RETROFITTING OF Gossaibori PWSS",
+        "projectId": "8234577",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RETROFITTING OF Gossaibori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30141038",
+      "name": "HIRAPARA (DALGOMA) PWSS (NEW)",
+      "description": "HIRAPARA (DALGOMA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HIRAPARA (DALGOMA) PWSS (NEW)",
+        "localName": "HIRAPARA (DALGOMA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33051",
+        "villageName": "Gosaibori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30141038",
+        "ddrName": "HIRAPARA (DALGOMA) PWSS (NEW)",
+        "projectId": "30141038",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HIRAPARA (DALGOMA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8320434",
+      "name": "182 no. Gosaibori Pub Milanpur AWC",
+      "description": "182 no. Gosaibori Pub Milanpur AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "182 no. Gosaibori Pub Milanpur AWC",
+        "localName": "182 no. Gosaibori Pub Milanpur AWC",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33051",
+        "villageName": "Gosaibori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8320434",
+        "ddrName": "182 no. Gosaibori Pub Milanpur AWC",
+        "projectId": "8320434",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "182 no. Gosaibori Pub Milanpur AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30020201",
+      "name": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+      "description": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+        "localName": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33049",
+        "villageName": "Kodamtola Gopalpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30020201",
+        "ddrName": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+        "projectId": "30020201",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023147",
+      "name": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+      "description": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+        "localName": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22407",
+        "panchayatname": "Dalgoma",
+        "villageCode": "33049",
+        "villageName": "Kodamtola Gopalpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023147",
+        "ddrName": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+        "projectId": "30023147",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073352",
+      "name": "FUTURIPARA 1 PWSS (NEW)",
+      "description": "FUTURIPARA 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "FUTURIPARA 1 PWSS (NEW)",
+        "localName": "FUTURIPARA 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33022",
+        "villageName": "Futuripara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073352",
+        "ddrName": "FUTURIPARA 1 PWSS (NEW)",
+        "projectId": "30073352",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "FUTURIPARA 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060206",
+      "name": "SAGRADHORA JALUAPARA PWSS (NEW)",
+      "description": "SAGRADHORA JALUAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SAGRADHORA JALUAPARA PWSS (NEW)",
+        "localName": "SAGRADHORA JALUAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33022",
+        "villageName": "Futuripara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060206",
+        "ddrName": "SAGRADHORA JALUAPARA PWSS (NEW)",
+        "projectId": "30060206",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SAGRADHORA JALUAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077533",
+      "name": "KOCHPARA REFUJIPARA PWSS (NEW)",
+      "description": "KOCHPARA REFUJIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOCHPARA REFUJIPARA PWSS (NEW)",
+        "localName": "KOCHPARA REFUJIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33022",
+        "villageName": "Futuripara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077533",
+        "ddrName": "KOCHPARA REFUJIPARA PWSS (NEW)",
+        "projectId": "30077533",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOCHPARA REFUJIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043298",
+      "name": "CHENGMARI PWSS (NEW)",
+      "description": "CHENGMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHENGMARI PWSS (NEW)",
+        "localName": "CHENGMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33023",
+        "villageName": "Harimura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043298",
+        "ddrName": "CHENGMARI PWSS (NEW)",
+        "projectId": "30043298",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHENGMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206280",
+      "name": "Retrofitting of HARIMURA  PWSS",
+      "description": "Retrofitting of HARIMURA  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HARIMURA  PWSS",
+        "localName": "Retrofitting of HARIMURA  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33023",
+        "villageName": "Harimura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206280",
+        "ddrName": "Retrofitting of HARIMURA  PWSS",
+        "projectId": "8206280",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HARIMURA  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30116490",
+      "name": "MAGURMARI M PWSS (NEW)",
+      "description": "MAGURMARI M PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAGURMARI M PWSS (NEW)",
+        "localName": "MAGURMARI M PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33023",
+        "villageName": "Harimura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30116490",
+        "ddrName": "MAGURMARI M PWSS (NEW)",
+        "projectId": "30116490",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAGURMARI M PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30093085",
+      "name": "UDAYPUR PWSS (NEW)",
+      "description": "UDAYPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "UDAYPUR PWSS (NEW)",
+        "localName": "UDAYPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33023",
+        "villageName": "Harimura",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30093085",
+        "ddrName": "UDAYPUR PWSS (NEW)",
+        "projectId": "30093085",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "UDAYPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181268",
+      "name": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+      "description": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+        "localName": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22404",
+        "panchayatname": "HARIMURA",
+        "villageCode": "622669",
+        "villageName": "KHAMAR PAKHIRIGURI DHUNDIPARA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181268",
+        "ddrName": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+        "projectId": "30181268",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205362",
+      "name": "Retrofitting of LALABORI PWSS",
+      "description": "Retrofitting of LALABORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of LALABORI PWSS",
+        "localName": "Retrofitting of LALABORI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33025",
+        "villageName": "Lalabori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205362",
+        "ddrName": "Retrofitting of LALABORI PWSS",
+        "projectId": "8205362",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of LALABORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132498",
+      "name": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+      "description": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+        "localName": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33025",
+        "villageName": "Lalabori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132498",
+        "ddrName": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+        "projectId": "30132498",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077387",
+      "name": "BELBORI NAYAPARA PWSS (NEW)",
+      "description": "BELBORI NAYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BELBORI NAYAPARA PWSS (NEW)",
+        "localName": "BELBORI NAYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33025",
+        "villageName": "Lalabori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077387",
+        "ddrName": "BELBORI NAYAPARA PWSS (NEW)",
+        "projectId": "30077387",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BELBORI NAYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077531",
+      "name": "LALABORI KODOMTOLA PWSS (NEW)",
+      "description": "LALABORI KODOMTOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LALABORI KODOMTOLA PWSS (NEW)",
+        "localName": "LALABORI KODOMTOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33025",
+        "villageName": "Lalabori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077531",
+        "ddrName": "LALABORI KODOMTOLA PWSS (NEW)",
+        "projectId": "30077531",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LALABORI KODOMTOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.455214",
+      "name": "Lalabori PWSS",
+      "description": "Lalabori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Lalabori PWSS",
+        "localName": "Lalabori PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33025",
+        "villageName": "Lalabori",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "455214",
+        "ddrName": "Lalabori PWSS",
+        "projectId": "455214",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Lalabori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937849",
+      "name": "Moijonga PWSS",
+      "description": "Moijonga PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Moijonga PWSS",
+        "localName": "Moijonga PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33024",
+        "villageName": "Moijonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937849",
+        "ddrName": "Moijonga PWSS",
+        "projectId": "1937849",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Moijonga PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160897",
+      "name": "Retrofitting of MOIJONGA PWSS",
+      "description": "Retrofitting of MOIJONGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MOIJONGA PWSS",
+        "localName": "Retrofitting of MOIJONGA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33024",
+        "villageName": "Moijonga",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160897",
+        "ddrName": "Retrofitting of MOIJONGA PWSS",
+        "projectId": "8160897",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MOIJONGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7971866",
+      "name": "HARIMURA T.E. MPWSS",
+      "description": "HARIMURA T.E. MPWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HARIMURA T.E. MPWSS",
+        "localName": "HARIMURA T.E. MPWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22404",
+        "panchayatname": "HARIMURA",
+        "villageCode": "33024",
+        "villageName": "MOIJONGA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7971866",
+        "ddrName": "HARIMURA T.E. MPWSS",
+        "projectId": "7971866",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HARIMURA T.E. MPWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237588",
+      "name": "Retrofitting of HARIMURA T E PWSS",
+      "description": "Retrofitting of HARIMURA T E PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of HARIMURA T E PWSS",
+        "localName": "Retrofitting of HARIMURA T E PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22404",
+        "panchayatname": "HARIMURA",
+        "villageCode": "33024",
+        "villageName": "MOIJONGA",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237588",
+        "ddrName": "Retrofitting of HARIMURA T E PWSS",
+        "projectId": "8237588",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of HARIMURA T E PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022862",
+      "name": "LEWABARI MADHYAPARA PWSS(NEW)",
+      "description": "LEWABARI MADHYAPARA PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LEWABARI MADHYAPARA PWSS(NEW)",
+        "localName": "LEWABARI MADHYAPARA PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33018",
+        "villageName": "Rakhyasini Garopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022862",
+        "ddrName": "LEWABARI MADHYAPARA PWSS(NEW)",
+        "projectId": "30022862",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LEWABARI MADHYAPARA PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075842",
+      "name": "CHOUTARABORI PWSS (NEW)",
+      "description": "CHOUTARABORI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOUTARABORI PWSS (NEW)",
+        "localName": "CHOUTARABORI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33018",
+        "villageName": "Rakhyasini Garopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075842",
+        "ddrName": "CHOUTARABORI PWSS (NEW)",
+        "projectId": "30075842",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOUTARABORI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5475220",
+      "name": "Rakhyasini Garopara Pt I PWSS",
+      "description": "Rakhyasini Garopara Pt I PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rakhyasini Garopara Pt I PWSS",
+        "localName": "Rakhyasini Garopara Pt I PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33018",
+        "villageName": "Rakhyasini Garopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5475220",
+        "ddrName": "Rakhyasini Garopara Pt I PWSS",
+        "projectId": "5475220",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rakhyasini Garopara Pt I PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205382",
+      "name": "Retrofitting of RAKHYASINI PWSS",
+      "description": "Retrofitting of RAKHYASINI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RAKHYASINI PWSS",
+        "localName": "Retrofitting of RAKHYASINI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33018",
+        "villageName": "Rakhyasini Garopara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205382",
+        "ddrName": "Retrofitting of RAKHYASINI PWSS",
+        "projectId": "8205382",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RAKHYASINI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873771",
+      "name": "Milanpur Garopara PWSS",
+      "description": "Milanpur Garopara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Milanpur Garopara PWSS",
+        "localName": "Milanpur Garopara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33019",
+        "villageName": "Rakhyasini Jangle Block",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873771",
+        "ddrName": "Milanpur Garopara PWSS",
+        "projectId": "4873771",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Milanpur Garopara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077538",
+      "name": "RAKHYASINI MVS PWSS (NEW)",
+      "description": "RAKHYASINI MVS PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKHYASINI MVS PWSS (NEW)",
+        "localName": "RAKHYASINI MVS PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33019",
+        "villageName": "Rakhyasini Jangle Block",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077538",
+        "ddrName": "RAKHYASINI MVS PWSS (NEW)",
+        "projectId": "30077538",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKHYASINI MVS PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.455219",
+      "name": "Rakshasini PWSS",
+      "description": "Rakshasini PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rakshasini PWSS",
+        "localName": "Rakshasini PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33020",
+        "villageName": "Rakhyasini Jhar Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "455219",
+        "ddrName": "Rakshasini PWSS",
+        "projectId": "455219",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rakshasini PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049048",
+      "name": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+      "description": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+        "localName": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33021",
+        "villageName": "Rakhyasini Jhar Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049048",
+        "ddrName": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+        "projectId": "30049048",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30097297",
+      "name": "RAKSHASINI PAHAR PWSS (NEW)",
+      "description": "RAKSHASINI PAHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKSHASINI PAHAR PWSS (NEW)",
+        "localName": "RAKSHASINI PAHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33028",
+        "villageName": "Rakhyasini Pahar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30097297",
+        "ddrName": "RAKSHASINI PAHAR PWSS (NEW)",
+        "projectId": "30097297",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKSHASINI PAHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30077405",
+      "name": "DANAPARA PWSS (NEW)",
+      "description": "DANAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DANAPARA PWSS (NEW)",
+        "localName": "DANAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33026",
+        "villageName": "Tengabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30077405",
+        "ddrName": "DANAPARA PWSS (NEW)",
+        "projectId": "30077405",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DANAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049278",
+      "name": "PETKATA PWSS (NEW)",
+      "description": "PETKATA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PETKATA PWSS (NEW)",
+        "localName": "PETKATA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33026",
+        "villageName": "Tengabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049278",
+        "ddrName": "PETKATA PWSS (NEW)",
+        "projectId": "30049278",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PETKATA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8307469",
+      "name": "143 NO. MAZGAON AWC",
+      "description": "143 NO. MAZGAON AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "143 NO. MAZGAON AWC",
+        "localName": "143 NO. MAZGAON AWC",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33026",
+        "villageName": "Tengabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8307469",
+        "ddrName": "143 NO. MAZGAON AWC",
+        "projectId": "8307469",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "143 NO. MAZGAON AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049299",
+      "name": "TENGABARI PWSS (NEW)",
+      "description": "TENGABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TENGABARI PWSS (NEW)",
+        "localName": "TENGABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22404",
+        "panchayatname": "Harimura",
+        "villageCode": "33026",
+        "villageName": "Tengabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049299",
+        "ddrName": "TENGABARI PWSS (NEW)",
+        "projectId": "30049299",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TENGABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038633",
+      "name": "TILAPARA PWSS (NEW)",
+      "description": "TILAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA PWSS (NEW)",
+        "localName": "TILAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33068",
+        "villageName": "Karipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038633",
+        "ddrName": "TILAPARA PWSS (NEW)",
+        "projectId": "30038633",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212952",
+      "name": "DABPARA BORIPARA PWSS (NEW)",
+      "description": "DABPARA BORIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DABPARA BORIPARA PWSS (NEW)",
+        "localName": "DABPARA BORIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33069",
+        "villageName": "Karipara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212952",
+        "ddrName": "DABPARA BORIPARA PWSS (NEW)",
+        "projectId": "30212952",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DABPARA BORIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30038208",
+      "name": "KARIPARA KALITAPARA PWSS (NEW)",
+      "description": "KARIPARA KALITAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARIPARA KALITAPARA PWSS (NEW)",
+        "localName": "KARIPARA KALITAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33070",
+        "villageName": "Karipara Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30038208",
+        "ddrName": "KARIPARA KALITAPARA PWSS (NEW)",
+        "projectId": "30038208",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARIPARA KALITAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216054",
+      "name": "KARIPARA PT-IV PWSS (NEW)",
+      "description": "KARIPARA PT-IV PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARIPARA PT-IV PWSS (NEW)",
+        "localName": "KARIPARA PT-IV PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33071",
+        "villageName": "Karipara Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216054",
+        "ddrName": "KARIPARA PT-IV PWSS (NEW)",
+        "projectId": "30216054",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARIPARA PT-IV PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30076911",
+      "name": "KARIPARA PT-IV RABHAPARA (NEW)",
+      "description": "KARIPARA PT-IV RABHAPARA (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARIPARA PT-IV RABHAPARA (NEW)",
+        "localName": "KARIPARA PT-IV RABHAPARA (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33071",
+        "villageName": "Karipara Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30076911",
+        "ddrName": "KARIPARA PT-IV RABHAPARA (NEW)",
+        "projectId": "30076911",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARIPARA PT-IV RABHAPARA (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073483",
+      "name": "KARIPARA MEDHIPARA PWSS (NEW)",
+      "description": "KARIPARA MEDHIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KARIPARA MEDHIPARA PWSS (NEW)",
+        "localName": "KARIPARA MEDHIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33071",
+        "villageName": "Karipara Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073483",
+        "ddrName": "KARIPARA MEDHIPARA PWSS (NEW)",
+        "projectId": "30073483",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KARIPARA MEDHIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046178",
+      "name": "PHULGURI PWSS (NEW)",
+      "description": "PHULGURI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PHULGURI PWSS (NEW)",
+        "localName": "PHULGURI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33071",
+        "villageName": "Karipara Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046178",
+        "ddrName": "PHULGURI PWSS (NEW)",
+        "projectId": "30046178",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PHULGURI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30057641",
+      "name": "SARAPARA NAYAPARA PWSS (NEW)",
+      "description": "SARAPARA NAYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SARAPARA NAYAPARA PWSS (NEW)",
+        "localName": "SARAPARA NAYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33072",
+        "villageName": "Sarapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30057641",
+        "ddrName": "SARAPARA NAYAPARA PWSS (NEW)",
+        "projectId": "30057641",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SARAPARA NAYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8202014",
+      "name": "Retrofitting of SARAPARA PWSS",
+      "description": "Retrofitting of SARAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SARAPARA PWSS",
+        "localName": "Retrofitting of SARAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22410",
+        "panchayatname": "Karipara",
+        "villageCode": "33072",
+        "villageName": "Sarapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8202014",
+        "ddrName": "Retrofitting of SARAPARA PWSS",
+        "projectId": "8202014",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SARAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4888114",
+      "name": "Bamunpara PWSS",
+      "description": "Bamunpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bamunpara PWSS",
+        "localName": "Bamunpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33067",
+        "villageName": "Bamunpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4888114",
+        "ddrName": "Bamunpara PWSS",
+        "projectId": "4888114",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bamunpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203647",
+      "name": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+      "description": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+        "localName": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203647",
+        "ddrName": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+        "projectId": "8203647",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4870250",
+      "name": "5 No. Saranarthi Camp PWSS",
+      "description": "5 No. Saranarthi Camp PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "5 No. Saranarthi Camp PWSS",
+        "localName": "5 No. Saranarthi Camp PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4870250",
+        "ddrName": "5 No. Saranarthi Camp PWSS",
+        "projectId": "4870250",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "5 No. Saranarthi Camp PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30129324",
+      "name": "DAMANI PWSS (NEW)",
+      "description": "DAMANI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAMANI PWSS (NEW)",
+        "localName": "DAMANI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30129324",
+        "ddrName": "DAMANI PWSS (NEW)",
+        "projectId": "30129324",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAMANI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067040",
+      "name": "HAJONGPARA PWSS (NEW)",
+      "description": "HAJONGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HAJONGPARA PWSS (NEW)",
+        "localName": "HAJONGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067040",
+        "ddrName": "HAJONGPARA PWSS (NEW)",
+        "projectId": "30067040",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HAJONGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235314",
+      "name": "Retrofitting of PACHIM MATIA PWSS",
+      "description": "Retrofitting of PACHIM MATIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of PACHIM MATIA PWSS",
+        "localName": "Retrofitting of PACHIM MATIA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235314",
+        "ddrName": "Retrofitting of PACHIM MATIA PWSS",
+        "projectId": "8235314",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of PACHIM MATIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069738",
+      "name": "MATIA GAROPARA PWSS (NEW)",
+      "description": "MATIA GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MATIA GAROPARA PWSS (NEW)",
+        "localName": "MATIA GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069738",
+        "ddrName": "MATIA GAROPARA PWSS (NEW)",
+        "projectId": "30069738",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MATIA GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30096485",
+      "name": "NANDESWAR GAROPARA PWSS (NEW)",
+      "description": "NANDESWAR GAROPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NANDESWAR GAROPARA PWSS (NEW)",
+        "localName": "NANDESWAR GAROPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30096485",
+        "ddrName": "NANDESWAR GAROPARA PWSS (NEW)",
+        "projectId": "30096485",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NANDESWAR GAROPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213084",
+      "name": "DOMONI BORIPARA PWSS (NEW)",
+      "description": "DOMONI BORIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DOMONI BORIPARA PWSS (NEW)",
+        "localName": "DOMONI BORIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213084",
+        "ddrName": "DOMONI BORIPARA PWSS (NEW)",
+        "projectId": "30213084",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DOMONI BORIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30181597",
+      "name": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+      "description": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+        "localName": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33066",
+        "villageName": "Pachim Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30181597",
+        "ddrName": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+        "projectId": "30181597",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30208074",
+      "name": "CHANDRAPUR PWSS (NEW)",
+      "description": "CHANDRAPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHANDRAPUR PWSS (NEW)",
+        "localName": "CHANDRAPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33065",
+        "villageName": "Pub Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30208074",
+        "ddrName": "CHANDRAPUR PWSS (NEW)",
+        "projectId": "30208074",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHANDRAPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206316",
+      "name": "Retrofitting of PUB MATIA PWSS",
+      "description": "Retrofitting of PUB MATIA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of PUB MATIA PWSS",
+        "localName": "Retrofitting of PUB MATIA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "33065",
+        "villageName": "Pub Matia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206316",
+        "ddrName": "Retrofitting of PUB MATIA PWSS",
+        "projectId": "8206316",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of PUB MATIA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218719",
+      "name": "Matia Rabhapara PWSS",
+      "description": "Matia Rabhapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Matia Rabhapara PWSS",
+        "localName": "Matia Rabhapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22409",
+        "panchayatname": "Matia",
+        "villageCode": "622668",
+        "villageName": "Rabhapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218719",
+        "ddrName": "Matia Rabhapara PWSS",
+        "projectId": "30218719",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Matia Rabhapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30117305",
+      "name": "MAJGAON PWSS (NEW)",
+      "description": "MAJGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAJGAON PWSS (NEW)",
+        "localName": "MAJGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33047",
+        "villageName": "Bhojmala Pt-i(mornoi)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30117305",
+        "ddrName": "MAJGAON PWSS (NEW)",
+        "projectId": "30117305",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAJGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160864",
+      "name": "Retrofitting of GAJIAJANI PWSS",
+      "description": "Retrofitting of GAJIAJANI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GAJIAJANI PWSS",
+        "localName": "Retrofitting of GAJIAJANI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33047",
+        "villageName": "Bhojmala Pt-i(mornoi)",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160864",
+        "ddrName": "Retrofitting of GAJIAJANI PWSS",
+        "projectId": "8160864",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GAJIAJANI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049604",
+      "name": "BHOJMALA PT-II PWSS (NEW)",
+      "description": "BHOJMALA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHOJMALA PT-II PWSS (NEW)",
+        "localName": "BHOJMALA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33044",
+        "villageName": "Bhojmala Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049604",
+        "ddrName": "BHOJMALA PT-II PWSS (NEW)",
+        "projectId": "30049604",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHOJMALA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160875",
+      "name": "Retrofitting of DAHIKATA PWSS",
+      "description": "Retrofitting of DAHIKATA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DAHIKATA PWSS",
+        "localName": "Retrofitting of DAHIKATA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33045",
+        "villageName": "Dahikata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160875",
+        "ddrName": "Retrofitting of DAHIKATA PWSS",
+        "projectId": "8160875",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DAHIKATA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2443383",
+      "name": "Dahikata PWSS",
+      "description": "Dahikata PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dahikata PWSS",
+        "localName": "Dahikata PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33045",
+        "villageName": "Dahikata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2443383",
+        "ddrName": "Dahikata PWSS",
+        "projectId": "2443383",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dahikata PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140254",
+      "name": "DAHIKATA KODOMTALA PWSS (NEW)",
+      "description": "DAHIKATA KODOMTALA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAHIKATA KODOMTALA PWSS (NEW)",
+        "localName": "DAHIKATA KODOMTALA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33045",
+        "villageName": "Dahikata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140254",
+        "ddrName": "DAHIKATA KODOMTALA PWSS (NEW)",
+        "projectId": "30140254",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAHIKATA KODOMTALA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160827",
+      "name": "Retrofitting of RAJAPARA PWSS",
+      "description": "Retrofitting of RAJAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RAJAPARA PWSS",
+        "localName": "Retrofitting of RAJAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33045",
+        "villageName": "Dahikata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160827",
+        "ddrName": "Retrofitting of RAJAPARA PWSS",
+        "projectId": "8160827",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RAJAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216059",
+      "name": "NIMNA RAJAPARA PWSS (NEW)",
+      "description": "NIMNA RAJAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIMNA RAJAPARA PWSS (NEW)",
+        "localName": "NIMNA RAJAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33045",
+        "villageName": "Dahikata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216059",
+        "ddrName": "NIMNA RAJAPARA PWSS (NEW)",
+        "projectId": "30216059",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIMNA RAJAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516013",
+      "name": "Rajapara PWSS",
+      "description": "Rajapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rajapara PWSS",
+        "localName": "Rajapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33045",
+        "villageName": "Dahikata",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516013",
+        "ddrName": "Rajapara PWSS",
+        "projectId": "2516013",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rajapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5464241",
+      "name": "Kodaldhowa PWSS",
+      "description": "Kodaldhowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kodaldhowa PWSS",
+        "localName": "Kodaldhowa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33043",
+        "villageName": "Dakaidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5464241",
+        "ddrName": "Kodaldhowa PWSS",
+        "projectId": "5464241",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kodaldhowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205350",
+      "name": "Retrofitting of DAKAIDAL PWSS",
+      "description": "Retrofitting of DAKAIDAL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DAKAIDAL PWSS",
+        "localName": "Retrofitting of DAKAIDAL PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33043",
+        "villageName": "Dakaidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205350",
+        "ddrName": "Retrofitting of DAKAIDAL PWSS",
+        "projectId": "8205350",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DAKAIDAL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072574",
+      "name": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+      "description": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+        "localName": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33043",
+        "villageName": "Dakaidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072574",
+        "ddrName": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+        "projectId": "30072574",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185575",
+      "name": "Dakaidal PWSS",
+      "description": "Dakaidal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dakaidal PWSS",
+        "localName": "Dakaidal PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33043",
+        "villageName": "Dakaidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185575",
+        "ddrName": "Dakaidal PWSS",
+        "projectId": "5185575",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dakaidal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185570",
+      "name": "Dakaidal PWSS",
+      "description": "Dakaidal PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dakaidal PWSS",
+        "localName": "Dakaidal PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33043",
+        "villageName": "Dakaidal",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185570",
+        "ddrName": "Dakaidal PWSS",
+        "projectId": "5185570",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dakaidal PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221330",
+      "name": "Dakaidol New Basti PWSS (NEW)",
+      "description": "Dakaidol New Basti PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dakaidol New Basti PWSS (NEW)",
+        "localName": "Dakaidol New Basti PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22406",
+        "panchayatname": "MORNAI",
+        "villageCode": "33043",
+        "villageName": "DAKAIDAL",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221330",
+        "ddrName": "Dakaidol New Basti PWSS (NEW)",
+        "projectId": "30221330",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dakaidol New Basti PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042803",
+      "name": "MONAKASA BELTOLA PWSS (NEW)",
+      "description": "MONAKASA BELTOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MONAKASA BELTOLA PWSS (NEW)",
+        "localName": "MONAKASA BELTOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33040",
+        "villageName": "Monakasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042803",
+        "ddrName": "MONAKASA BELTOLA PWSS (NEW)",
+        "projectId": "30042803",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MONAKASA BELTOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203589",
+      "name": "Retrofitting of MONAKOCHA PWSS",
+      "description": "Retrofitting of MONAKOCHA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MONAKOCHA PWSS",
+        "localName": "Retrofitting of MONAKOCHA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33040",
+        "villageName": "Monakasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203589",
+        "ddrName": "Retrofitting of MONAKOCHA PWSS",
+        "projectId": "8203589",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MONAKOCHA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.455220",
+      "name": "Monakocha PWSS",
+      "description": "Monakocha PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Monakocha PWSS",
+        "localName": "Monakocha PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33040",
+        "villageName": "Monakasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "455220",
+        "ddrName": "Monakocha PWSS",
+        "projectId": "455220",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Monakocha PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30149113",
+      "name": "TILAPARA NOLDOBA PWSS (NEW)",
+      "description": "TILAPARA NOLDOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA NOLDOBA PWSS (NEW)",
+        "localName": "TILAPARA NOLDOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33040",
+        "villageName": "Monakasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30149113",
+        "ddrName": "TILAPARA NOLDOBA PWSS (NEW)",
+        "projectId": "30149113",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA NOLDOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30140242",
+      "name": "NEPALIKHUTI PWSS (NEW)",
+      "description": "NEPALIKHUTI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NEPALIKHUTI PWSS (NEW)",
+        "localName": "NEPALIKHUTI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33040",
+        "villageName": "Monakasa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30140242",
+        "ddrName": "NEPALIKHUTI PWSS (NEW)",
+        "projectId": "30140242",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NEPALIKHUTI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30117521",
+      "name": "BABUPARA UJANPARA PWSS (NEW)",
+      "description": "BABUPARA UJANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BABUPARA UJANPARA PWSS (NEW)",
+        "localName": "BABUPARA UJANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33042",
+        "villageName": "Mornai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30117521",
+        "ddrName": "BABUPARA UJANPARA PWSS (NEW)",
+        "projectId": "30117521",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BABUPARA UJANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30091137",
+      "name": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+      "description": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+        "localName": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33042",
+        "villageName": "Mornai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30091137",
+        "ddrName": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+        "projectId": "30091137",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042963",
+      "name": "NEW MORNAI FIELDPARA PWSS (NEW)",
+      "description": "NEW MORNAI FIELDPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NEW MORNAI FIELDPARA PWSS (NEW)",
+        "localName": "NEW MORNAI FIELDPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33042",
+        "villageName": "Mornai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042963",
+        "ddrName": "NEW MORNAI FIELDPARA PWSS (NEW)",
+        "projectId": "30042963",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NEW MORNAI FIELDPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216049",
+      "name": "HIRAPARA PWSS (NEW)",
+      "description": "HIRAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HIRAPARA PWSS (NEW)",
+        "localName": "HIRAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33042",
+        "villageName": "Mornai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216049",
+        "ddrName": "HIRAPARA PWSS (NEW)",
+        "projectId": "30216049",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HIRAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30105174",
+      "name": "MORNOI MAJORPARA PWSS (NEW)",
+      "description": "MORNOI MAJORPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MORNOI MAJORPARA PWSS (NEW)",
+        "localName": "MORNOI MAJORPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33042",
+        "villageName": "Mornai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30105174",
+        "ddrName": "MORNOI MAJORPARA PWSS (NEW)",
+        "projectId": "30105174",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MORNOI MAJORPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30116536",
+      "name": "MORNOI PACHIMAPARA PWSS (New)",
+      "description": "MORNOI PACHIMAPARA PWSS (New)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MORNOI PACHIMAPARA PWSS (New)",
+        "localName": "MORNOI PACHIMAPARA PWSS (New)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22406",
+        "panchayatname": "Mornai",
+        "villageCode": "33042",
+        "villageName": "Mornai",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30116536",
+        "ddrName": "MORNOI PACHIMAPARA PWSS (New)",
+        "projectId": "30116536",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MORNOI PACHIMAPARA PWSS (New)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218467",
+      "name": "BAHATI CHAR PWSS (NEW)",
+      "description": "BAHATI CHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI CHAR PWSS (NEW)",
+        "localName": "BAHATI CHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22413",
+        "panchayatname": "NABAGOTA SIMLITOLA",
+        "villageCode": "33089",
+        "villageName": "BAHATI CHAR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218467",
+        "ddrName": "BAHATI CHAR PWSS (NEW)",
+        "projectId": "30218467",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI CHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221339",
+      "name": "Bahati River Block Pt-I No.2 PWSS",
+      "description": "Bahati River Block Pt-I No.2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bahati River Block Pt-I No.2 PWSS",
+        "localName": "Bahati River Block Pt-I No.2 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "MATIA",
+        "panchayatcode": "22413",
+        "panchayatname": "NABAGOTA SIMLITOLA",
+        "villageCode": "33089",
+        "villageName": "BAHATI CHAR",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221339",
+        "ddrName": "Bahati River Block Pt-I No.2 PWSS",
+        "projectId": "30221339",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bahati River Block Pt-I No.2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221352",
+      "name": "BAHATI CHAR NO 3 PWSS (NEW)",
+      "description": "BAHATI CHAR NO 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI CHAR NO 3 PWSS (NEW)",
+        "localName": "BAHATI CHAR NO 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33089",
+        "villageName": "Bahati Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221352",
+        "ddrName": "BAHATI CHAR NO 3 PWSS (NEW)",
+        "projectId": "30221352",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI CHAR NO 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216061",
+      "name": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+      "description": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+        "localName": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "627228",
+        "villageName": "Bahati River Block - Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216061",
+        "ddrName": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+        "projectId": "30216061",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221379",
+      "name": "Bahati Char Pt-II River Block PWSS",
+      "description": "Bahati Char Pt-II River Block PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bahati Char Pt-II River Block PWSS",
+        "localName": "Bahati Char Pt-II River Block PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33090",
+        "villageName": "Bahati River Pt-ii Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221379",
+        "ddrName": "Bahati Char Pt-II River Block PWSS",
+        "projectId": "30221379",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bahati Char Pt-II River Block PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218422",
+      "name": "BAHATI CHAR PT-II PWSS (NEW)",
+      "description": "BAHATI CHAR PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI CHAR PT-II PWSS (NEW)",
+        "localName": "BAHATI CHAR PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33090",
+        "villageName": "Bahati River Pt-ii Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218422",
+        "ddrName": "BAHATI CHAR PT-II PWSS (NEW)",
+        "projectId": "30218422",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI CHAR PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216057",
+      "name": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+      "description": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+        "localName": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33090",
+        "villageName": "Bahati River Pt-ii Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216057",
+        "ddrName": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+        "projectId": "30216057",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216062",
+      "name": "BALAPARA PWSS (NEW)",
+      "description": "BALAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALAPARA PWSS (NEW)",
+        "localName": "BALAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "653619",
+        "villageName": "Balapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216062",
+        "ddrName": "BALAPARA PWSS (NEW)",
+        "projectId": "30216062",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071801",
+      "name": "BHARBARI NO.2 PWSS (NEW)",
+      "description": "BHARBARI NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHARBARI NO.2 PWSS (NEW)",
+        "localName": "BHARBARI NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33087",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071801",
+        "ddrName": "BHARBARI NO.2 PWSS (NEW)",
+        "projectId": "30071801",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHARBARI NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30129475",
+      "name": "BHARBARI PWSS (NEW)",
+      "description": "BHARBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHARBARI PWSS (NEW)",
+        "localName": "BHARBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33087",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30129475",
+        "ddrName": "BHARBARI PWSS (NEW)",
+        "projectId": "30129475",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHARBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221370",
+      "name": "Singramari NC PWSS",
+      "description": "Singramari NC PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Singramari NC PWSS",
+        "localName": "Singramari NC PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33087",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221370",
+        "ddrName": "Singramari NC PWSS",
+        "projectId": "30221370",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Singramari NC PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071806",
+      "name": "BHARBARI NO.3 PWSS (NEW)",
+      "description": "BHARBARI NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHARBARI NO.3 PWSS (NEW)",
+        "localName": "BHARBARI NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33087",
+        "villageName": "Bherveri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071806",
+        "ddrName": "BHARBARI NO.3 PWSS (NEW)",
+        "projectId": "30071806",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHARBARI NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219068",
+      "name": "GOROMARI PWSS (NEW)",
+      "description": "GOROMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GOROMARI PWSS (NEW)",
+        "localName": "GOROMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33088",
+        "villageName": "Goromari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219068",
+        "ddrName": "GOROMARI PWSS (NEW)",
+        "projectId": "30219068",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GOROMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30219089",
+      "name": "Kalaichar PWSS",
+      "description": "Kalaichar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kalaichar PWSS",
+        "localName": "Kalaichar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33088",
+        "villageName": "Goromari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30219089",
+        "ddrName": "Kalaichar PWSS",
+        "projectId": "30219089",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kalaichar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042957",
+      "name": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+      "description": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+        "localName": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33092",
+        "villageName": "Nobagata Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042957",
+        "ddrName": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+        "projectId": "30042957",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30150213",
+      "name": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+      "description": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+        "localName": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33092",
+        "villageName": "Nobagata Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30150213",
+        "ddrName": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+        "projectId": "30150213",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30065052",
+      "name": "NOBAGATA SIMLITOLA PWSS (NEW)",
+      "description": "NOBAGATA SIMLITOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NOBAGATA SIMLITOLA PWSS (NEW)",
+        "localName": "NOBAGATA SIMLITOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33092",
+        "villageName": "Nobagata Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30065052",
+        "ddrName": "NOBAGATA SIMLITOLA PWSS (NEW)",
+        "projectId": "30065052",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NOBAGATA SIMLITOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30055275",
+      "name": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+      "description": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+        "localName": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33092",
+        "villageName": "Nobagata Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30055275",
+        "ddrName": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+        "projectId": "30055275",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30049262",
+      "name": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+      "description": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+        "localName": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33092",
+        "villageName": "Nobagata Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30049262",
+        "ddrName": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+        "projectId": "30049262",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30022523",
+      "name": "POKALAGI PWSS (NEW)",
+      "description": "POKALAGI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "POKALAGI PWSS (NEW)",
+        "localName": "POKALAGI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33085",
+        "villageName": "Pokalagi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30022523",
+        "ddrName": "POKALAGI PWSS (NEW)",
+        "projectId": "30022523",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "POKALAGI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206445",
+      "name": "Retrofitting of GARUPURATARY PWSS",
+      "description": "Retrofitting of GARUPURATARY PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GARUPURATARY PWSS",
+        "localName": "Retrofitting of GARUPURATARY PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33062",
+        "villageName": "Singramari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206445",
+        "ddrName": "Retrofitting of GARUPURATARY PWSS",
+        "projectId": "8206445",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GARUPURATARY PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216045",
+      "name": "SINGRAMARI RIVER BLOCK (NEW)",
+      "description": "SINGRAMARI RIVER BLOCK (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SINGRAMARI RIVER BLOCK (NEW)",
+        "localName": "SINGRAMARI RIVER BLOCK (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33086",
+        "villageName": "Singramari River Block",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216045",
+        "ddrName": "SINGRAMARI RIVER BLOCK (NEW)",
+        "projectId": "30216045",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SINGRAMARI RIVER BLOCK (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4887740",
+      "name": "Garupurartary PWSS",
+      "description": "Garupurartary PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Garupurartary PWSS",
+        "localName": "Garupurartary PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33086",
+        "villageName": "Singramari River Block",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4887740",
+        "ddrName": "Garupurartary PWSS",
+        "projectId": "4887740",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Garupurartary PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067748",
+      "name": "SUTARPARA CHAR PWSS (NEW)",
+      "description": "SUTARPARA CHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUTARPARA CHAR PWSS (NEW)",
+        "localName": "SUTARPARA CHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33094",
+        "villageName": "Sutarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067748",
+        "ddrName": "SUTARPARA CHAR PWSS (NEW)",
+        "projectId": "30067748",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUTARPARA CHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206436",
+      "name": "Retrofitting of SUTARPARA PWSS",
+      "description": "Retrofitting of SUTARPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SUTARPARA PWSS",
+        "localName": "Retrofitting of SUTARPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33094",
+        "villageName": "Sutarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206436",
+        "ddrName": "Retrofitting of SUTARPARA PWSS",
+        "projectId": "8206436",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SUTARPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043330",
+      "name": "SUTARPARA NO 3 PWSS (NEW)",
+      "description": "SUTARPARA NO 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUTARPARA NO 3 PWSS (NEW)",
+        "localName": "SUTARPARA NO 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33091",
+        "villageName": "Sutarpara Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043330",
+        "ddrName": "SUTARPARA NO 3 PWSS (NEW)",
+        "projectId": "30043330",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUTARPARA NO 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042954",
+      "name": "SUTARPARA NO 2 PWSS (NEW)",
+      "description": "SUTARPARA NO 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SUTARPARA NO 2 PWSS (NEW)",
+        "localName": "SUTARPARA NO 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22413",
+        "panchayatname": "Nabagota Simlitola",
+        "villageCode": "33091",
+        "villageName": "Sutarpara Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042954",
+        "ddrName": "SUTARPARA NO 2 PWSS (NEW)",
+        "projectId": "30042954",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SUTARPARA NO 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30129479",
+      "name": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+      "description": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+        "localName": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33078",
+        "villageName": "Bahati Pt-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30129479",
+        "ddrName": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+        "projectId": "30129479",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074675",
+      "name": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+      "description": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+        "localName": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33078",
+        "villageName": "Bahati Pt-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074675",
+        "ddrName": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+        "projectId": "30074675",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30167381",
+      "name": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+      "description": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+        "localName": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33078",
+        "villageName": "Bahati Pt-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30167381",
+        "ddrName": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+        "projectId": "30167381",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132548",
+      "name": "BAHATI PT-1 PWSS (NEW)",
+      "description": "BAHATI PT-1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI PT-1 PWSS (NEW)",
+        "localName": "BAHATI PT-1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33078",
+        "villageName": "Bahati Pt-1",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132548",
+        "ddrName": "BAHATI PT-1 PWSS (NEW)",
+        "projectId": "30132548",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI PT-1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037057",
+      "name": "BAHATI PT-II PWSS (NEW)",
+      "description": "BAHATI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI PT-II PWSS (NEW)",
+        "localName": "BAHATI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33079",
+        "villageName": "Bahati Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037057",
+        "ddrName": "BAHATI PT-II PWSS (NEW)",
+        "projectId": "30037057",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132620",
+      "name": "BAHATI PT-II NO.2 PWSS (NEW)",
+      "description": "BAHATI PT-II NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAHATI PT-II NO.2 PWSS (NEW)",
+        "localName": "BAHATI PT-II NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33079",
+        "villageName": "Bahati Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132620",
+        "ddrName": "BAHATI PT-II NO.2 PWSS (NEW)",
+        "projectId": "30132620",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAHATI PT-II NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218453",
+      "name": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+      "description": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+        "localName": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33080",
+        "villageName": "Nayapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218453",
+        "ddrName": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+        "projectId": "30218453",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060518",
+      "name": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+      "description": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+        "localName": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33080",
+        "villageName": "Nayapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060518",
+        "ddrName": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+        "projectId": "30060518",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014448",
+      "name": "NAYAPARA PT-I PWSS (NEW)",
+      "description": "NAYAPARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-I PWSS (NEW)",
+        "localName": "NAYAPARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33080",
+        "villageName": "Nayapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014448",
+        "ddrName": "NAYAPARA PT-I PWSS (NEW)",
+        "projectId": "30014448",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037286",
+      "name": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+      "description": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+        "localName": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33080",
+        "villageName": "Nayapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037286",
+        "ddrName": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+        "projectId": "30037286",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042955",
+      "name": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+      "description": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+        "localName": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33081",
+        "villageName": "Nayapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042955",
+        "ddrName": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+        "projectId": "30042955",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132559",
+      "name": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+      "description": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+        "localName": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33081",
+        "villageName": "Nayapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132559",
+        "ddrName": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+        "projectId": "30132559",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014445",
+      "name": "NAYAPARA PT-II PWSS (NEW)",
+      "description": "NAYAPARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAYAPARA PT-II PWSS (NEW)",
+        "localName": "NAYAPARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33081",
+        "villageName": "Nayapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014445",
+        "ddrName": "NAYAPARA PT-II PWSS (NEW)",
+        "projectId": "30014445",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAYAPARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014452",
+      "name": "RONUA PWSS (NEW)",
+      "description": "RONUA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RONUA PWSS (NEW)",
+        "localName": "RONUA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33084",
+        "villageName": "Ronua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014452",
+        "ddrName": "RONUA PWSS (NEW)",
+        "projectId": "30014452",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RONUA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132532",
+      "name": "RONUA NO 3 PWSS (NEW)",
+      "description": "RONUA NO 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RONUA NO 3 PWSS (NEW)",
+        "localName": "RONUA NO 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33084",
+        "villageName": "Ronua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132532",
+        "ddrName": "RONUA NO 3 PWSS (NEW)",
+        "projectId": "30132532",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RONUA NO 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132588",
+      "name": "RONUA NO 2 PWSS (NEW)",
+      "description": "RONUA NO 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RONUA NO 2 PWSS (NEW)",
+        "localName": "RONUA NO 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33084",
+        "villageName": "Ronua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132588",
+        "ddrName": "RONUA NO 2 PWSS (NEW)",
+        "projectId": "30132588",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RONUA NO 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30051400",
+      "name": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+      "description": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+        "localName": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33082",
+        "villageName": "Sidhabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30051400",
+        "ddrName": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+        "projectId": "30051400",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132648",
+      "name": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+      "description": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+        "localName": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33082",
+        "villageName": "Sidhabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132648",
+        "ddrName": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+        "projectId": "30132648",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8326909",
+      "name": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+      "description": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+        "localName": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33082",
+        "villageName": "Sidhabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8326909",
+        "ddrName": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+        "projectId": "8326909",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037289",
+      "name": "SIDHABARI PT-I PWSS (NEW)",
+      "description": "SIDHABARI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIDHABARI PT-I PWSS (NEW)",
+        "localName": "SIDHABARI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33082",
+        "villageName": "Sidhabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037289",
+        "ddrName": "SIDHABARI PT-I PWSS (NEW)",
+        "projectId": "30037289",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIDHABARI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014450",
+      "name": "SIDHABARI PT-II No.2 PWSS (NEW)",
+      "description": "SIDHABARI PT-II No.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIDHABARI PT-II No.2 PWSS (NEW)",
+        "localName": "SIDHABARI PT-II No.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33083",
+        "villageName": "Sidhabari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014450",
+        "ddrName": "SIDHABARI PT-II No.2 PWSS (NEW)",
+        "projectId": "30014450",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIDHABARI PT-II No.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30132661",
+      "name": "SIDHABARI PT-II PWSS (NEW)",
+      "description": "SIDHABARI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIDHABARI PT-II PWSS (NEW)",
+        "localName": "SIDHABARI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33083",
+        "villageName": "Sidhabari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30132661",
+        "ddrName": "SIDHABARI PT-II PWSS (NEW)",
+        "projectId": "30132661",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIDHABARI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8235387",
+      "name": "Retrofitting of SIDHABARI PWSS",
+      "description": "Retrofitting of SIDHABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SIDHABARI PWSS",
+        "localName": "Retrofitting of SIDHABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33083",
+        "villageName": "Sidhabari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8235387",
+        "ddrName": "Retrofitting of SIDHABARI PWSS",
+        "projectId": "8235387",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SIDHABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218442",
+      "name": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+      "description": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+        "localName": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22412",
+        "panchayatname": "Sidhabari",
+        "villageCode": "33083",
+        "villageName": "Sidhabari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218442",
+        "ddrName": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+        "projectId": "30218442",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6054503",
+      "name": "Bhatipara PWSS",
+      "description": "Bhatipara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bhatipara PWSS",
+        "localName": "Bhatipara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33039",
+        "villageName": "Bhatiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6054503",
+        "ddrName": "Bhatipara PWSS",
+        "projectId": "6054503",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bhatipara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206284",
+      "name": "Retrofitting of BHATIPARA PWSS",
+      "description": "Retrofitting of BHATIPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BHATIPARA PWSS",
+        "localName": "Retrofitting of BHATIPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33039",
+        "villageName": "Bhatiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206284",
+        "ddrName": "Retrofitting of BHATIPARA PWSS",
+        "projectId": "8206284",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BHATIPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30021973",
+      "name": "BHATIPARA MAJORPARA PWSS (NEW)",
+      "description": "BHATIPARA MAJORPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHATIPARA MAJORPARA PWSS (NEW)",
+        "localName": "BHATIPARA MAJORPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33039",
+        "villageName": "Bhatiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30021973",
+        "ddrName": "BHATIPARA MAJORPARA PWSS (NEW)",
+        "projectId": "30021973",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHATIPARA MAJORPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218426",
+      "name": "HAJONGPARA PWSS (NEW)",
+      "description": "HAJONGPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HAJONGPARA PWSS (NEW)",
+        "localName": "HAJONGPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33039",
+        "villageName": "Bhatiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218426",
+        "ddrName": "HAJONGPARA PWSS (NEW)",
+        "projectId": "30218426",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HAJONGPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221335",
+      "name": "Dalucamp PWSS (NEW)",
+      "description": "Dalucamp PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dalucamp PWSS (NEW)",
+        "localName": "Dalucamp PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33037",
+        "villageName": "Dashabhuja Debasthan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221335",
+        "ddrName": "Dalucamp PWSS (NEW)",
+        "projectId": "30221335",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dalucamp PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205375",
+      "name": "Retrofitting of DASABHUJA PWSS",
+      "description": "Retrofitting of DASABHUJA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DASABHUJA PWSS",
+        "localName": "Retrofitting of DASABHUJA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33037",
+        "villageName": "Dashabhuja Debasthan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205375",
+        "ddrName": "Retrofitting of DASABHUJA PWSS",
+        "projectId": "8205375",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DASABHUJA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6861545",
+      "name": "Dasabhuja Devasthan PWSS",
+      "description": "Dasabhuja Devasthan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dasabhuja Devasthan PWSS",
+        "localName": "Dasabhuja Devasthan PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33037",
+        "villageName": "Dashabhuja Debasthan",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6861545",
+        "ddrName": "Dasabhuja Devasthan PWSS",
+        "projectId": "6861545",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dasabhuja Devasthan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216955",
+      "name": "DEKDHOWA TALTOLA PWSS (NEW)",
+      "description": "DEKDHOWA TALTOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEKDHOWA TALTOLA PWSS (NEW)",
+        "localName": "DEKDHOWA TALTOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33029",
+        "villageName": "Dekdhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216955",
+        "ddrName": "DEKDHOWA TALTOLA PWSS (NEW)",
+        "projectId": "30216955",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEKDHOWA TALTOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937787",
+      "name": "Dekdhowa PWSS",
+      "description": "Dekdhowa PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dekdhowa PWSS",
+        "localName": "Dekdhowa PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33029",
+        "villageName": "Dekdhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937787",
+        "ddrName": "Dekdhowa PWSS",
+        "projectId": "1937787",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dekdhowa PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048994",
+      "name": "PUB DEKDHOWA PWSS (NEW)",
+      "description": "PUB DEKDHOWA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PUB DEKDHOWA PWSS (NEW)",
+        "localName": "PUB DEKDHOWA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33029",
+        "villageName": "Dekdhowa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048994",
+        "ddrName": "PUB DEKDHOWA PWSS (NEW)",
+        "projectId": "30048994",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PUB DEKDHOWA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30117571",
+      "name": "NAIDALPARA PWSS (NEW)",
+      "description": "NAIDALPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NAIDALPARA PWSS (NEW)",
+        "localName": "NAIDALPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33035",
+        "villageName": "Dubapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30117571",
+        "ddrName": "NAIDALPARA PWSS (NEW)",
+        "projectId": "30117571",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NAIDALPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30117565",
+      "name": "DUBAPARA KALITA PARA PWSS (NEW)",
+      "description": "DUBAPARA KALITA PARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DUBAPARA KALITA PARA PWSS (NEW)",
+        "localName": "DUBAPARA KALITA PARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33035",
+        "villageName": "Dubapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30117565",
+        "ddrName": "DUBAPARA KALITA PARA PWSS (NEW)",
+        "projectId": "30117565",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DUBAPARA KALITA PARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203947",
+      "name": "Retrofitting of DUBAPARA PWSS",
+      "description": "Retrofitting of DUBAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DUBAPARA PWSS",
+        "localName": "Retrofitting of DUBAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33035",
+        "villageName": "Dubapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203947",
+        "ddrName": "Retrofitting of DUBAPARA PWSS",
+        "projectId": "8203947",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DUBAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30117549",
+      "name": "DUBAPARA NAMABASTI PWSS (NEW)",
+      "description": "DUBAPARA NAMABASTI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DUBAPARA NAMABASTI PWSS (NEW)",
+        "localName": "DUBAPARA NAMABASTI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33035",
+        "villageName": "Dubapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30117549",
+        "ddrName": "DUBAPARA NAMABASTI PWSS (NEW)",
+        "projectId": "30117549",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DUBAPARA NAMABASTI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2516881",
+      "name": "Dubapara PWSS",
+      "description": "Dubapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dubapara PWSS",
+        "localName": "Dubapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33035",
+        "villageName": "Dubapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2516881",
+        "ddrName": "Dubapara PWSS",
+        "projectId": "2516881",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dubapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071827",
+      "name": "NATUN DUBAPARA PWSS (NEW)",
+      "description": "NATUN DUBAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NATUN DUBAPARA PWSS (NEW)",
+        "localName": "NATUN DUBAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33035",
+        "villageName": "Dubapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071827",
+        "ddrName": "NATUN DUBAPARA PWSS (NEW)",
+        "projectId": "30071827",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NATUN DUBAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042965",
+      "name": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+      "description": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+        "localName": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33034",
+        "villageName": "Dubapara Lupta Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042965",
+        "ddrName": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+        "projectId": "30042965",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222342",
+      "name": "Retrofitting of SONAPUR 1 PWSS",
+      "description": "Retrofitting of SONAPUR 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SONAPUR 1 PWSS",
+        "localName": "Retrofitting of SONAPUR 1 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33034",
+        "villageName": "Dubapara Lupta Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222342",
+        "ddrName": "Retrofitting of SONAPUR 1 PWSS",
+        "projectId": "8222342",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SONAPUR 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071830",
+      "name": "SONAPUR NAYAPARA PWSS (NEW)",
+      "description": "SONAPUR NAYAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SONAPUR NAYAPARA PWSS (NEW)",
+        "localName": "SONAPUR NAYAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33034",
+        "villageName": "Dubapara Lupta Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071830",
+        "ddrName": "SONAPUR NAYAPARA PWSS (NEW)",
+        "projectId": "30071830",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SONAPUR NAYAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386146",
+      "name": "Sonapur-1 PWSS",
+      "description": "Sonapur-1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sonapur-1 PWSS",
+        "localName": "Sonapur-1 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33034",
+        "villageName": "Dubapara Lupta Char",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386146",
+        "ddrName": "Sonapur-1 PWSS",
+        "projectId": "3386146",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sonapur-1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043311",
+      "name": "KUMARPARA PATIARPARA PWSS (NEW)",
+      "description": "KUMARPARA PATIARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KUMARPARA PATIARPARA PWSS (NEW)",
+        "localName": "KUMARPARA PATIARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33031",
+        "villageName": "Paharsing Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043311",
+        "ddrName": "KUMARPARA PATIARPARA PWSS (NEW)",
+        "projectId": "30043311",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KUMARPARA PATIARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126233",
+      "name": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+      "description": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+        "localName": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33031",
+        "villageName": "Paharsing Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126233",
+        "ddrName": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+        "projectId": "30126233",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30072662",
+      "name": "PAHASING 1 PWSS (NEW)",
+      "description": "PAHASING 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PAHASING 1 PWSS (NEW)",
+        "localName": "PAHASING 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33031",
+        "villageName": "Paharsing Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30072662",
+        "ddrName": "PAHASING 1 PWSS (NEW)",
+        "projectId": "30072662",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PAHASING 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30148838",
+      "name": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+      "description": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+        "localName": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33031",
+        "villageName": "Paharsing Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30148838",
+        "ddrName": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+        "projectId": "30148838",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30146477",
+      "name": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+      "description": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+        "localName": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33031",
+        "villageName": "Paharsing Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30146477",
+        "ddrName": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+        "projectId": "30146477",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206425",
+      "name": "Retrofitting of TINKONIAPARA PWSS",
+      "description": "Retrofitting of TINKONIAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TINKONIAPARA PWSS",
+        "localName": "Retrofitting of TINKONIAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33036",
+        "villageName": "Tinkoniapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206425",
+        "ddrName": "Retrofitting of TINKONIAPARA PWSS",
+        "projectId": "8206425",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TINKONIAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043335",
+      "name": "TINKONIAPARA UJANPARA PWSS (NEW)",
+      "description": "TINKONIAPARA UJANPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TINKONIAPARA UJANPARA PWSS (NEW)",
+        "localName": "TINKONIAPARA UJANPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1185",
+        "blockname": "Matia",
+        "panchayatcode": "22405",
+        "panchayatname": "Sri Suryagiri",
+        "villageCode": "33036",
+        "villageName": "Tinkoniapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043335",
+        "ddrName": "TINKONIAPARA UJANPARA PWSS (NEW)",
+        "projectId": "30043335",
+        "regionName": "1185"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TINKONIAPARA UJANPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023298",
+      "name": "Ambari Pt-I PWSS (NEW)",
+      "description": "Ambari Pt-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ambari Pt-I PWSS (NEW)",
+        "localName": "Ambari Pt-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33606",
+        "villageName": "Ambari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023298",
+        "ddrName": "Ambari Pt-I PWSS (NEW)",
+        "projectId": "30023298",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ambari Pt-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5464190",
+      "name": "Dudhkonwar PWSS",
+      "description": "Dudhkonwar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dudhkonwar PWSS",
+        "localName": "Dudhkonwar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33599",
+        "villageName": "Ambari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5464190",
+        "ddrName": "Dudhkonwar PWSS",
+        "projectId": "5464190",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dudhkonwar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014668",
+      "name": "BOETARI PWSS (NEW)",
+      "description": "BOETARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BOETARI PWSS (NEW)",
+        "localName": "BOETARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014668",
+        "ddrName": "BOETARI PWSS (NEW)",
+        "projectId": "30014668",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BOETARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8228342",
+      "name": "Retrofitting of CELABORI PWSS",
+      "description": "Retrofitting of CELABORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CELABORI PWSS",
+        "localName": "Retrofitting of CELABORI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8228342",
+        "ddrName": "Retrofitting of CELABORI PWSS",
+        "projectId": "8228342",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CELABORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386435",
+      "name": "Celabori PWSS",
+      "description": "Celabori PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Celabori PWSS",
+        "localName": "Celabori PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386435",
+        "ddrName": "Celabori PWSS",
+        "projectId": "3386435",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Celabori PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203064",
+      "name": "Retrofitting of AMBARI DUMPARA PWSS",
+      "description": "Retrofitting of AMBARI DUMPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AMBARI DUMPARA PWSS",
+        "localName": "Retrofitting of AMBARI DUMPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203064",
+        "ddrName": "Retrofitting of AMBARI DUMPARA PWSS",
+        "projectId": "8203064",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AMBARI DUMPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30043358",
+      "name": "AMBARI SIMLABARI PWSS (NEW)",
+      "description": "AMBARI SIMLABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMBARI SIMLABARI PWSS (NEW)",
+        "localName": "AMBARI SIMLABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30043358",
+        "ddrName": "AMBARI SIMLABARI PWSS (NEW)",
+        "projectId": "30043358",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMBARI SIMLABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205107",
+      "name": "Retrofitting of AMBARI PT III PWSS",
+      "description": "Retrofitting of AMBARI PT III PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AMBARI PT III PWSS",
+        "localName": "Retrofitting of AMBARI PT III PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205107",
+        "ddrName": "Retrofitting of AMBARI PT III PWSS",
+        "projectId": "8205107",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AMBARI PT III PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386664",
+      "name": "Padupara PWSS",
+      "description": "Padupara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Padupara PWSS",
+        "localName": "Padupara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386664",
+        "ddrName": "Padupara PWSS",
+        "projectId": "3386664",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Padupara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2433896",
+      "name": "Ambari Pt-III PWSS",
+      "description": "Ambari Pt-III PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ambari Pt-III PWSS",
+        "localName": "Ambari Pt-III PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2433896",
+        "ddrName": "Ambari Pt-III PWSS",
+        "projectId": "2433896",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ambari Pt-III PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205116",
+      "name": "Retrofitting of PADUPARA PWSS",
+      "description": "Retrofitting of PADUPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of PADUPARA PWSS",
+        "localName": "Retrofitting of PADUPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33601",
+        "villageName": "Ambari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205116",
+        "ddrName": "Retrofitting of PADUPARA PWSS",
+        "projectId": "8205116",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of PADUPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069283",
+      "name": "Bijoypur Bongaon PWSS",
+      "description": "Bijoypur Bongaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bijoypur Bongaon PWSS",
+        "localName": "Bijoypur Bongaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33607",
+        "villageName": "Bijoypur Bangaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069283",
+        "ddrName": "Bijoypur Bongaon PWSS",
+        "projectId": "30069283",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bijoypur Bongaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206177",
+      "name": "Retrofitting of DHANTOLA PWSS",
+      "description": "Retrofitting of DHANTOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DHANTOLA PWSS",
+        "localName": "Retrofitting of DHANTOLA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "625679",
+        "villageName": "Dhantola Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206177",
+        "ddrName": "Retrofitting of DHANTOLA PWSS",
+        "projectId": "8206177",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DHANTOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237534",
+      "name": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+      "description": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+        "localName": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33608",
+        "villageName": "Dhontola Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237534",
+        "ddrName": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+        "projectId": "8237534",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206170",
+      "name": "Retrofitting of FAKIRPARA PWSS",
+      "description": "Retrofitting of FAKIRPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of FAKIRPARA PWSS",
+        "localName": "Retrofitting of FAKIRPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33608",
+        "villageName": "Dhontola Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206170",
+        "ddrName": "Retrofitting of FAKIRPARA PWSS",
+        "projectId": "8206170",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of FAKIRPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068088",
+      "name": "BORSIMLA PWSS (NEW)",
+      "description": "BORSIMLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORSIMLA PWSS (NEW)",
+        "localName": "BORSIMLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33608",
+        "villageName": "Dhontola Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068088",
+        "ddrName": "BORSIMLA PWSS (NEW)",
+        "projectId": "30068088",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORSIMLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069284",
+      "name": "KHEKAPARA PWSS (NEW)",
+      "description": "KHEKAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KHEKAPARA PWSS (NEW)",
+        "localName": "KHEKAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "627221",
+        "villageName": "Khekapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069284",
+        "ddrName": "KHEKAPARA PWSS (NEW)",
+        "projectId": "30069284",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KHEKAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205087",
+      "name": "Retrofitting of KHAMAR PWSS",
+      "description": "Retrofitting of KHAMAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHAMAR PWSS",
+        "localName": "Retrofitting of KHAMAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "627222",
+        "villageName": "Palsa",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205087",
+        "ddrName": "Retrofitting of KHAMAR PWSS",
+        "projectId": "8205087",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHAMAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063228",
+      "name": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+      "description": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+        "localName": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33560",
+        "villageName": "Ullubari Choutra Naitarabeel",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063228",
+        "ddrName": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+        "projectId": "30063228",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30148938",
+      "name": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+      "description": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+        "localName": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22472",
+        "panchayatname": "Ambari",
+        "villageCode": "33560",
+        "villageName": "Ullubari Choutra Naitarabeel",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30148938",
+        "ddrName": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+        "projectId": "30148938",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206542",
+      "name": "Retrofitting of DHANUBHANGA PWSS",
+      "description": "Retrofitting of DHANUBHANGA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DHANUBHANGA PWSS",
+        "localName": "Retrofitting of DHANUBHANGA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "669583",
+        "villageName": "Aoimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206542",
+        "ddrName": "Retrofitting of DHANUBHANGA PWSS",
+        "projectId": "8206542",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DHANUBHANGA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30148954",
+      "name": "AOIMARI PWSS (NEW)",
+      "description": "AOIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AOIMARI PWSS (NEW)",
+        "localName": "AOIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "669583",
+        "villageName": "Aoimari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30148954",
+        "ddrName": "AOIMARI PWSS (NEW)",
+        "projectId": "30148954",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AOIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173753",
+      "name": "MEDHIKONA PWSS (NEW)",
+      "description": "MEDHIKONA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MEDHIKONA PWSS (NEW)",
+        "localName": "MEDHIKONA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33598",
+        "villageName": "Athiabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173753",
+        "ddrName": "MEDHIKONA PWSS (NEW)",
+        "projectId": "30173753",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MEDHIKONA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221411",
+      "name": "RAJHASALI PWSS (NEW)",
+      "description": "RAJHASALI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "RAJHASALI PWSS (NEW)",
+        "localName": "RAJHASALI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33598",
+        "villageName": "Athiabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221411",
+        "ddrName": "RAJHASALI PWSS (NEW)",
+        "projectId": "30221411",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "RAJHASALI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205290",
+      "name": "Retrofitting of GATHIAPARA  PWSS",
+      "description": "Retrofitting of GATHIAPARA  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GATHIAPARA  PWSS",
+        "localName": "Retrofitting of GATHIAPARA  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33595",
+        "villageName": "Gathiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205290",
+        "ddrName": "Retrofitting of GATHIAPARA  PWSS",
+        "projectId": "8205290",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GATHIAPARA  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073473",
+      "name": "GATHIAPARA PWSS (NEW)",
+      "description": "GATHIAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GATHIAPARA PWSS (NEW)",
+        "localName": "GATHIAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33595",
+        "villageName": "Gathiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073473",
+        "ddrName": "GATHIAPARA PWSS (NEW)",
+        "projectId": "30073473",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GATHIAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6136635",
+      "name": "Gathiapara PWSS",
+      "description": "Gathiapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Gathiapara PWSS",
+        "localName": "Gathiapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33595",
+        "villageName": "Gathiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6136635",
+        "ddrName": "Gathiapara PWSS",
+        "projectId": "6136635",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Gathiapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213000",
+      "name": "GATHIAPARA(1) PWSS (NEW)",
+      "description": "GATHIAPARA(1) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GATHIAPARA(1) PWSS (NEW)",
+        "localName": "GATHIAPARA(1) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33595",
+        "villageName": "Gathiapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213000",
+        "ddrName": "GATHIAPARA(1) PWSS (NEW)",
+        "projectId": "30213000",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GATHIAPARA(1) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30149001",
+      "name": "MADANG PT-I PWSS (NEW)",
+      "description": "MADANG PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MADANG PT-I PWSS (NEW)",
+        "localName": "MADANG PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33592",
+        "villageName": "Madang Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30149001",
+        "ddrName": "MADANG PT-I PWSS (NEW)",
+        "projectId": "30149001",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MADANG PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8230806",
+      "name": "Retrofitting of MADANG  PWSS",
+      "description": "Retrofitting of MADANG  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MADANG  PWSS",
+        "localName": "Retrofitting of MADANG  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33597",
+        "villageName": "Madang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8230806",
+        "ddrName": "Retrofitting of MADANG  PWSS",
+        "projectId": "8230806",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MADANG  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171366",
+      "name": "Retrofitting of NALDOBA PWSS",
+      "description": "Retrofitting of NALDOBA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NALDOBA PWSS",
+        "localName": "Retrofitting of NALDOBA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33597",
+        "villageName": "Madang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171366",
+        "ddrName": "Retrofitting of NALDOBA PWSS",
+        "projectId": "8171366",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NALDOBA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173710",
+      "name": "DHANUBHANGA PT-I PWSS (NEW)",
+      "description": "DHANUBHANGA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHANUBHANGA PT-I PWSS (NEW)",
+        "localName": "DHANUBHANGA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33597",
+        "villageName": "Madang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173710",
+        "ddrName": "DHANUBHANGA PT-I PWSS (NEW)",
+        "projectId": "30173710",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHANUBHANGA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4888294",
+      "name": "Naldoba PWSS",
+      "description": "Naldoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Naldoba PWSS",
+        "localName": "Naldoba PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33597",
+        "villageName": "Madang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4888294",
+        "ddrName": "Naldoba PWSS",
+        "projectId": "4888294",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Naldoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5186446",
+      "name": "Madang PWSS",
+      "description": "Madang PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Madang PWSS",
+        "localName": "Madang PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33597",
+        "villageName": "Madang Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5186446",
+        "ddrName": "Madang PWSS",
+        "projectId": "5186446",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Madang PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067950",
+      "name": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+      "description": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+        "localName": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33596",
+        "villageName": "Madang Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067950",
+        "ddrName": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+        "projectId": "30067950",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206547",
+      "name": "Retrofitting of GOREMARI PWSS",
+      "description": "Retrofitting of GOREMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GOREMARI PWSS",
+        "localName": "Retrofitting of GOREMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33596",
+        "villageName": "Madang Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206547",
+        "ddrName": "Retrofitting of GOREMARI PWSS",
+        "projectId": "8206547",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GOREMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197069",
+      "name": "Retrofitting of MADANG PT III PWSS",
+      "description": "Retrofitting of MADANG PT III PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MADANG PT III PWSS",
+        "localName": "Retrofitting of MADANG PT III PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33596",
+        "villageName": "Madang Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197069",
+        "ddrName": "Retrofitting of MADANG PT III PWSS",
+        "projectId": "8197069",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MADANG PT III PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2517242",
+      "name": "Madang Pt-III PWSS",
+      "description": "Madang Pt-III PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Madang Pt-III PWSS",
+        "localName": "Madang Pt-III PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33596",
+        "villageName": "Madang Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2517242",
+        "ddrName": "Madang Pt-III PWSS",
+        "projectId": "2517242",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Madang Pt-III PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237353",
+      "name": "Retrofitting of DAKUAKATA PWSS",
+      "description": "Retrofitting of DAKUAKATA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DAKUAKATA PWSS",
+        "localName": "Retrofitting of DAKUAKATA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33596",
+        "villageName": "Madang Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237353",
+        "ddrName": "Retrofitting of DAKUAKATA PWSS",
+        "projectId": "8237353",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DAKUAKATA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30176503",
+      "name": "SILDUBI PWSS (NEW)",
+      "description": "SILDUBI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILDUBI PWSS (NEW)",
+        "localName": "SILDUBI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33591",
+        "villageName": "Saldubi Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176503",
+        "ddrName": "SILDUBI PWSS (NEW)",
+        "projectId": "30176503",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILDUBI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1941788",
+      "name": "Goremari PWSS",
+      "description": "Goremari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Goremari PWSS",
+        "localName": "Goremari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33591",
+        "villageName": "Saldubi Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1941788",
+        "ddrName": "Goremari PWSS",
+        "projectId": "1941788",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Goremari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174133",
+      "name": "BALBOLA PWSS (NEW)",
+      "description": "BALBOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BALBOLA PWSS (NEW)",
+        "localName": "BALBOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33593",
+        "villageName": "Saldubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174133",
+        "ddrName": "BALBOLA PWSS (NEW)",
+        "projectId": "30174133",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BALBOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203764",
+      "name": "Retrofitting of CHESAJHARA PWSS",
+      "description": "Retrofitting of CHESAJHARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHESAJHARA PWSS",
+        "localName": "Retrofitting of CHESAJHARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33593",
+        "villageName": "Saldubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203764",
+        "ddrName": "Retrofitting of CHESAJHARA PWSS",
+        "projectId": "8203764",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHESAJHARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937533",
+      "name": "Chechajhara PWSS",
+      "description": "Chechajhara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chechajhara PWSS",
+        "localName": "Chechajhara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33593",
+        "villageName": "Saldubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937533",
+        "ddrName": "Chechajhara PWSS",
+        "projectId": "1937533",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chechajhara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173961",
+      "name": "SILDUBI PT-I PWSS (NEW)",
+      "description": "SILDUBI PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILDUBI PT-I PWSS (NEW)",
+        "localName": "SILDUBI PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33593",
+        "villageName": "Saldubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173961",
+        "ddrName": "SILDUBI PT-I PWSS (NEW)",
+        "projectId": "30173961",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILDUBI PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30071148",
+      "name": "SILDUBI PT-II PWSS (NEW)",
+      "description": "SILDUBI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SILDUBI PT-II PWSS (NEW)",
+        "localName": "SILDUBI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "33593",
+        "villageName": "Saldubi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30071148",
+        "ddrName": "SILDUBI PT-II PWSS (NEW)",
+        "projectId": "30071148",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SILDUBI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30212983",
+      "name": "DEUSILA PWSS (NEW)",
+      "description": "DEUSILA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEUSILA PWSS (NEW)",
+        "localName": "DEUSILA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22471",
+        "panchayatname": "Dhanubhanga",
+        "villageCode": "627224",
+        "villageName": "Saljhar Block",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30212983",
+        "ddrName": "DEUSILA PWSS (NEW)",
+        "projectId": "30212983",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEUSILA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218734",
+      "name": "KALITAPARA PWSS",
+      "description": "KALITAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALITAPARA PWSS",
+        "localName": "KALITAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33604",
+        "villageName": "Ambari Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218734",
+        "ddrName": "KALITAPARA PWSS",
+        "projectId": "30218734",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALITAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206058",
+      "name": "Retrofitting of CHASIBORI PWSS",
+      "description": "Retrofitting of CHASIBORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHASIBORI PWSS",
+        "localName": "Retrofitting of CHASIBORI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33604",
+        "villageName": "Ambari Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206058",
+        "ddrName": "Retrofitting of CHASIBORI PWSS",
+        "projectId": "8206058",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHASIBORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206091",
+      "name": "Retrofitting of BANIAPARA PWSS",
+      "description": "Retrofitting of BANIAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BANIAPARA PWSS",
+        "localName": "Retrofitting of BANIAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33581",
+        "villageName": "Dhupdhara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206091",
+        "ddrName": "Retrofitting of BANIAPARA PWSS",
+        "projectId": "8206091",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BANIAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014663",
+      "name": "DHUPDHARA PT-I PWSS (NEW)",
+      "description": "DHUPDHARA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHUPDHARA PT-I PWSS (NEW)",
+        "localName": "DHUPDHARA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33581",
+        "villageName": "Dhupdhara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014663",
+        "ddrName": "DHUPDHARA PT-I PWSS (NEW)",
+        "projectId": "30014663",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHUPDHARA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023999",
+      "name": "DHUPDHARA PT-II PWSS (NEW)",
+      "description": "DHUPDHARA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DHUPDHARA PT-II PWSS (NEW)",
+        "localName": "DHUPDHARA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33574",
+        "villageName": "Dhupdhara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023999",
+        "ddrName": "DHUPDHARA PT-II PWSS (NEW)",
+        "projectId": "30023999",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DHUPDHARA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6858114",
+      "name": "Dhupdhara PWSS",
+      "description": "Dhupdhara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dhupdhara PWSS",
+        "localName": "Dhupdhara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33574",
+        "villageName": "Dhupdhara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6858114",
+        "ddrName": "Dhupdhara PWSS",
+        "projectId": "6858114",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dhupdhara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069267",
+      "name": "HASARIBORI PWSS (NEW)",
+      "description": "HASARIBORI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "HASARIBORI PWSS (NEW)",
+        "localName": "HASARIBORI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33574",
+        "villageName": "Dhupdhara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069267",
+        "ddrName": "HASARIBORI PWSS (NEW)",
+        "projectId": "30069267",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "HASARIBORI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205176",
+      "name": "Retrofitting of DHUPDHARA PWSS",
+      "description": "Retrofitting of DHUPDHARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DHUPDHARA PWSS",
+        "localName": "Retrofitting of DHUPDHARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33574",
+        "villageName": "Dhupdhara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205176",
+        "ddrName": "Retrofitting of DHUPDHARA PWSS",
+        "projectId": "8205176",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DHUPDHARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068427",
+      "name": "DIGHALI I PWSS (NEW)",
+      "description": "DIGHALI I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIGHALI I PWSS (NEW)",
+        "localName": "DIGHALI I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33577",
+        "villageName": "Dighali Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068427",
+        "ddrName": "DIGHALI I PWSS (NEW)",
+        "projectId": "30068427",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIGHALI I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206116",
+      "name": "Retrofitting of DIGHELI PWSS",
+      "description": "Retrofitting of DIGHELI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DIGHELI PWSS",
+        "localName": "Retrofitting of DIGHELI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33577",
+        "villageName": "Dighali Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206116",
+        "ddrName": "Retrofitting of DIGHELI PWSS",
+        "projectId": "8206116",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DIGHELI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30149016",
+      "name": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+      "description": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+        "localName": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33578",
+        "villageName": "Dighali Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30149016",
+        "ddrName": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+        "projectId": "30149016",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30143512",
+      "name": "DIGHALI II PWSS (NEW)",
+      "description": "DIGHALI II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DIGHALI II PWSS (NEW)",
+        "localName": "DIGHALI II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33578",
+        "villageName": "Dighali Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30143512",
+        "ddrName": "DIGHALI II PWSS (NEW)",
+        "projectId": "30143512",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DIGHALI II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30019572",
+      "name": "Dighali Pt-III PWSS(NEW)",
+      "description": "Dighali Pt-III PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dighali Pt-III PWSS(NEW)",
+        "localName": "Dighali Pt-III PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33576",
+        "villageName": "Dighali Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30019572",
+        "ddrName": "Dighali Pt-III PWSS(NEW)",
+        "projectId": "30019572",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dighali Pt-III PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2491893",
+      "name": "Bagdoba PWSS",
+      "description": "Bagdoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bagdoba PWSS",
+        "localName": "Bagdoba PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33579",
+        "villageName": "Jogipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2491893",
+        "ddrName": "Bagdoba PWSS",
+        "projectId": "2491893",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bagdoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171388",
+      "name": "Retrofitting of BAGDOBA PWSS",
+      "description": "Retrofitting of BAGDOBA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAGDOBA PWSS",
+        "localName": "Retrofitting of BAGDOBA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33579",
+        "villageName": "Jogipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171388",
+        "ddrName": "Retrofitting of BAGDOBA PWSS",
+        "projectId": "8171388",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAGDOBA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069742",
+      "name": "JOGIPARA I PWSS (NEW)",
+      "description": "JOGIPARA I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGIPARA I PWSS (NEW)",
+        "localName": "JOGIPARA I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33579",
+        "villageName": "Jogipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069742",
+        "ddrName": "JOGIPARA I PWSS (NEW)",
+        "projectId": "30069742",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGIPARA I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171475",
+      "name": "Retrofitting of JOGIPARA PWSS",
+      "description": "Retrofitting of JOGIPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of JOGIPARA PWSS",
+        "localName": "Retrofitting of JOGIPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33579",
+        "villageName": "Jogipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171475",
+        "ddrName": "Retrofitting of JOGIPARA PWSS",
+        "projectId": "8171475",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of JOGIPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014454",
+      "name": "Oxybari PWSS (NEW)",
+      "description": "Oxybari PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Oxybari PWSS (NEW)",
+        "localName": "Oxybari PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33579",
+        "villageName": "Jogipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014454",
+        "ddrName": "Oxybari PWSS (NEW)",
+        "projectId": "30014454",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Oxybari PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173963",
+      "name": "JOGIPARA II PWSS (NEW)",
+      "description": "JOGIPARA II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGIPARA II PWSS (NEW)",
+        "localName": "JOGIPARA II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33579",
+        "villageName": "Jogipara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173963",
+        "ddrName": "JOGIPARA II PWSS (NEW)",
+        "projectId": "30173963",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGIPARA II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069282",
+      "name": "JOGIPARA III PWSS (NEW)",
+      "description": "JOGIPARA III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JOGIPARA III PWSS (NEW)",
+        "localName": "JOGIPARA III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "627214",
+        "villageName": "Jogipara Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069282",
+        "ddrName": "JOGIPARA III PWSS (NEW)",
+        "projectId": "30069282",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JOGIPARA III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206219",
+      "name": "Retrofitting of MASLAM PWSS",
+      "description": "Retrofitting of MASLAM PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MASLAM PWSS",
+        "localName": "Retrofitting of MASLAM PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33580",
+        "villageName": "Maslam Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206219",
+        "ddrName": "Retrofitting of MASLAM PWSS",
+        "projectId": "8206219",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MASLAM PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213143",
+      "name": "ULMAPARA PWSS (NEW)",
+      "description": "ULMAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ULMAPARA PWSS (NEW)",
+        "localName": "ULMAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "33580",
+        "villageName": "Maslam Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213143",
+        "ddrName": "ULMAPARA PWSS (NEW)",
+        "projectId": "30213143",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ULMAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048680",
+      "name": "PIPLIBARI PWSS (NEW)",
+      "description": "PIPLIBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PIPLIBARI PWSS (NEW)",
+        "localName": "PIPLIBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22469",
+        "panchayatname": "Dhupdhara",
+        "villageCode": "627223",
+        "villageName": "Piplibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048680",
+        "ddrName": "PIPLIBARI PWSS (NEW)",
+        "projectId": "30048680",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PIPLIBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023324",
+      "name": "Kahibari Alibari PWSS(NEW)",
+      "description": "Kahibari Alibari PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kahibari Alibari PWSS(NEW)",
+        "localName": "Kahibari Alibari PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33526",
+        "villageName": "Allibari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023324",
+        "ddrName": "Kahibari Alibari PWSS(NEW)",
+        "projectId": "30023324",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kahibari Alibari PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30213200",
+      "name": "BHALUKJULI PWSS (NEW)",
+      "description": "BHALUKJULI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKJULI PWSS (NEW)",
+        "localName": "BHALUKJULI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33525",
+        "villageName": "Bhalukjuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30213200",
+        "ddrName": "BHALUKJULI PWSS (NEW)",
+        "projectId": "30213200",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKJULI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30128554",
+      "name": "BHALUKJULI BUDLUNG PWSS (NEW)",
+      "description": "BHALUKJULI BUDLUNG PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHALUKJULI BUDLUNG PWSS (NEW)",
+        "localName": "BHALUKJULI BUDLUNG PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33525",
+        "villageName": "Bhalukjuli",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30128554",
+        "ddrName": "BHALUKJULI BUDLUNG PWSS (NEW)",
+        "projectId": "30128554",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHALUKJULI BUDLUNG PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023317",
+      "name": "Budlung Chanchalipara PWSS(NEW)",
+      "description": "Budlung Chanchalipara PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Budlung Chanchalipara PWSS(NEW)",
+        "localName": "Budlung Chanchalipara PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33529",
+        "villageName": "Budlung Chanchali Para",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023317",
+        "ddrName": "Budlung Chanchalipara PWSS(NEW)",
+        "projectId": "30023317",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Budlung Chanchalipara PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221395",
+      "name": "Budlung Pahar PWSS (NEW)",
+      "description": "Budlung Pahar PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Budlung Pahar PWSS (NEW)",
+        "localName": "Budlung Pahar PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "650758",
+        "villageName": "Budlung Pahar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221395",
+        "ddrName": "Budlung Pahar PWSS (NEW)",
+        "projectId": "30221395",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Budlung Pahar PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30170429",
+      "name": "CHATABARI PWSS (NEW)",
+      "description": "CHATABARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHATABARI PWSS (NEW)",
+        "localName": "CHATABARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33532",
+        "villageName": "Chatabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30170429",
+        "ddrName": "CHATABARI PWSS (NEW)",
+        "projectId": "30170429",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHATABARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218437",
+      "name": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+      "description": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+        "localName": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "625698",
+        "villageName": "Ghagra Saljhar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218437",
+        "ddrName": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+        "projectId": "30218437",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174084",
+      "name": "Kahibari Garopara PWSS (NEW)",
+      "description": "Kahibari Garopara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kahibari Garopara PWSS (NEW)",
+        "localName": "Kahibari Garopara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "625699",
+        "villageName": "Kahibari Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174084",
+        "ddrName": "Kahibari Garopara PWSS (NEW)",
+        "projectId": "30174084",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kahibari Garopara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159704",
+      "name": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+      "description": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+        "localName": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "625699",
+        "villageName": "Kahibari Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159704",
+        "ddrName": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+        "projectId": "8159704",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386236",
+      "name": "Sikiajuli Kahibari PWSS",
+      "description": "Sikiajuli Kahibari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Sikiajuli Kahibari PWSS",
+        "localName": "Sikiajuli Kahibari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "625699",
+        "villageName": "Kahibari Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386236",
+        "ddrName": "Sikiajuli Kahibari PWSS",
+        "projectId": "3386236",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Sikiajuli Kahibari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023894",
+      "name": "KANKATA PT-II PWSS (NEW)",
+      "description": "KANKATA PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANKATA PT-II PWSS (NEW)",
+        "localName": "KANKATA PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33566",
+        "villageName": "Kankata Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023894",
+        "ddrName": "KANKATA PT-II PWSS (NEW)",
+        "projectId": "30023894",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANKATA PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205310",
+      "name": "Retrofitting of KANYAKUCHI PWSS",
+      "description": "Retrofitting of KANYAKUCHI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KANYAKUCHI PWSS",
+        "localName": "Retrofitting of KANYAKUCHI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33530",
+        "villageName": "Kanyakuchi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205310",
+        "ddrName": "Retrofitting of KANYAKUCHI PWSS",
+        "projectId": "8205310",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KANYAKUCHI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4888263",
+      "name": "Kanyakuchi PWSS",
+      "description": "Kanyakuchi PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kanyakuchi PWSS",
+        "localName": "Kanyakuchi PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33530",
+        "villageName": "Kanyakuchi",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4888263",
+        "ddrName": "Kanyakuchi PWSS",
+        "projectId": "4888263",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kanyakuchi PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159645",
+      "name": "Retrofitting of KUHIARBARI PWSS",
+      "description": "Retrofitting of KUHIARBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KUHIARBARI PWSS",
+        "localName": "Retrofitting of KUHIARBARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33522",
+        "villageName": "Sikajuli Kuhiarbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159645",
+        "ddrName": "Retrofitting of KUHIARBARI PWSS",
+        "projectId": "8159645",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KUHIARBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1941535",
+      "name": "Kuhiarbari PWSS",
+      "description": "Kuhiarbari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kuhiarbari PWSS",
+        "localName": "Kuhiarbari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33522",
+        "villageName": "Sikajuli Kuhiarbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1941535",
+        "ddrName": "Kuhiarbari PWSS",
+        "projectId": "1941535",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kuhiarbari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037053",
+      "name": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+      "description": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+        "localName": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33522",
+        "villageName": "Sikajuli Kuhiarbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037053",
+        "ddrName": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+        "projectId": "30037053",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218664",
+      "name": "NIDANPUR PWSS (NEW)",
+      "description": "NIDANPUR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "NIDANPUR PWSS (NEW)",
+        "localName": "NIDANPUR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33522",
+        "villageName": "Sikajuli Kuhiarbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218664",
+        "ddrName": "NIDANPUR PWSS (NEW)",
+        "projectId": "30218664",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "NIDANPUR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3385946",
+      "name": "Simlitola Tea Estate PWSS",
+      "description": "Simlitola Tea Estate PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Simlitola Tea Estate PWSS",
+        "localName": "Simlitola Tea Estate PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33524",
+        "villageName": "Simlitola T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3385946",
+        "ddrName": "Simlitola Tea Estate PWSS",
+        "projectId": "3385946",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Simlitola Tea Estate PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218718",
+      "name": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+      "description": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+        "localName": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "KAHIBARI",
+        "villageCode": "33524",
+        "villageName": "SIMLITOLA T.E.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218718",
+        "ddrName": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+        "projectId": "30218718",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171324",
+      "name": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+      "description": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+        "localName": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22465",
+        "panchayatname": "Kahibari",
+        "villageCode": "33524",
+        "villageName": "Simlitola T.e.",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171324",
+        "ddrName": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+        "projectId": "8171324",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206074",
+      "name": "Retrofitting of BHAKATPARA PWSS",
+      "description": "Retrofitting of BHAKATPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BHAKATPARA PWSS",
+        "localName": "Retrofitting of BHAKATPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "KHUTABARI",
+        "villageCode": "33590",
+        "villageName": "BARDAL  PT-I",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206074",
+        "ddrName": "Retrofitting of BHAKATPARA PWSS",
+        "projectId": "8206074",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BHAKATPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30039715",
+      "name": "BARDAL PWSS (NEW)",
+      "description": "BARDAL PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARDAL PWSS (NEW)",
+        "localName": "BARDAL PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "KHUTABARI",
+        "villageCode": "33590",
+        "villageName": "BARDAL  PT-I",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30039715",
+        "ddrName": "BARDAL PWSS (NEW)",
+        "projectId": "30039715",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARDAL PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237435",
+      "name": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+      "description": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+        "localName": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33589",
+        "villageName": "Chaplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237435",
+        "ddrName": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+        "projectId": "8237435",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222042",
+      "name": "Retrofitting of  CHAPLAI PWSS",
+      "description": "Retrofitting of  CHAPLAI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of  CHAPLAI PWSS",
+        "localName": "Retrofitting of  CHAPLAI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33589",
+        "villageName": "Chaplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222042",
+        "ddrName": "Retrofitting of  CHAPLAI PWSS",
+        "projectId": "8222042",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of  CHAPLAI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5803027",
+      "name": "Chaplai PWSS",
+      "description": "Chaplai PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chaplai PWSS",
+        "localName": "Chaplai PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33589",
+        "villageName": "Chaplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5803027",
+        "ddrName": "Chaplai PWSS",
+        "projectId": "5803027",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chaplai PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203786",
+      "name": "Retrofitting of DOLAGAON PWSS",
+      "description": "Retrofitting of DOLAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of DOLAGAON PWSS",
+        "localName": "Retrofitting of DOLAGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33584",
+        "villageName": "Chaplai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203786",
+        "ddrName": "Retrofitting of DOLAGAON PWSS",
+        "projectId": "8203786",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of DOLAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218717",
+      "name": "CHAPLAI PT-II PWSS (NEW)",
+      "description": "CHAPLAI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHAPLAI PT-II PWSS (NEW)",
+        "localName": "CHAPLAI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33584",
+        "villageName": "Chaplai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218717",
+        "ddrName": "CHAPLAI PT-II PWSS (NEW)",
+        "projectId": "30218717",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHAPLAI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.455374",
+      "name": "Dolagaon PWSS",
+      "description": "Dolagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dolagaon PWSS",
+        "localName": "Dolagaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33584",
+        "villageName": "Chaplai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "455374",
+        "ddrName": "Dolagaon PWSS",
+        "projectId": "455374",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dolagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30042799",
+      "name": "GHILABORI PWSS (NEW)",
+      "description": "GHILABORI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GHILABORI PWSS (NEW)",
+        "localName": "GHILABORI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "650807",
+        "villageName": "Ghilabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30042799",
+        "ddrName": "GHILABORI PWSS (NEW)",
+        "projectId": "30042799",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GHILABORI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160796",
+      "name": "Retrofitting of BALASARA 1 PWSS",
+      "description": "Retrofitting of BALASARA 1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BALASARA 1 PWSS",
+        "localName": "Retrofitting of BALASARA 1 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160796",
+        "ddrName": "Retrofitting of BALASARA 1 PWSS",
+        "projectId": "8160796",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BALASARA 1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6145500",
+      "name": "Balasara-  1 PWSS",
+      "description": "Balasara-  1 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balasara-  1 PWSS",
+        "localName": "Balasara-  1 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6145500",
+        "ddrName": "Balasara-  1 PWSS",
+        "projectId": "6145500",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balasara-  1 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2515923",
+      "name": "Laudoba PWSS",
+      "description": "Laudoba PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Laudoba PWSS",
+        "localName": "Laudoba PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2515923",
+        "ddrName": "Laudoba PWSS",
+        "projectId": "2515923",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Laudoba PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160387",
+      "name": "Retrofitting of RANGAJAN PWSS",
+      "description": "Retrofitting of RANGAJAN PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RANGAJAN PWSS",
+        "localName": "Retrofitting of RANGAJAN PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160387",
+        "ddrName": "Retrofitting of RANGAJAN PWSS",
+        "projectId": "8160387",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RANGAJAN PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160379",
+      "name": "Retrofitting of LAUDOBA PWSS",
+      "description": "Retrofitting of LAUDOBA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of LAUDOBA PWSS",
+        "localName": "Retrofitting of LAUDOBA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160379",
+        "ddrName": "Retrofitting of LAUDOBA PWSS",
+        "projectId": "8160379",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of LAUDOBA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6233420",
+      "name": "Khutabari  PWSS",
+      "description": "Khutabari  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Khutabari  PWSS",
+        "localName": "Khutabari  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6233420",
+        "ddrName": "Khutabari  PWSS",
+        "projectId": "6233420",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Khutabari  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206535",
+      "name": "Retrofitting of MATIHOLA PWSS",
+      "description": "Retrofitting of MATIHOLA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of MATIHOLA PWSS",
+        "localName": "Retrofitting of MATIHOLA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206535",
+        "ddrName": "Retrofitting of MATIHOLA PWSS",
+        "projectId": "8206535",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of MATIHOLA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5230312",
+      "name": "Rongajan PWSS",
+      "description": "Rongajan PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rongajan PWSS",
+        "localName": "Rongajan PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33585",
+        "villageName": "Khutabari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5230312",
+        "ddrName": "Rongajan PWSS",
+        "projectId": "5230312",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rongajan PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206194",
+      "name": "Retrofitting of KHUTABARI PT II PWSS",
+      "description": "Retrofitting of KHUTABARI PT II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHUTABARI PT II PWSS",
+        "localName": "Retrofitting of KHUTABARI PT II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33587",
+        "villageName": "Khutabari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206194",
+        "ddrName": "Retrofitting of KHUTABARI PT II PWSS",
+        "projectId": "8206194",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHUTABARI PT II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197243",
+      "name": "Retrofitting of KHUTABARI PWSS",
+      "description": "Retrofitting of KHUTABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHUTABARI PWSS",
+        "localName": "Retrofitting of KHUTABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33588",
+        "villageName": "Khutabari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197243",
+        "ddrName": "Retrofitting of KHUTABARI PWSS",
+        "projectId": "8197243",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHUTABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171415",
+      "name": "Retrofitting of NADIRPAR PWSS",
+      "description": "Retrofitting of NADIRPAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of NADIRPAR PWSS",
+        "localName": "Retrofitting of NADIRPAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33588",
+        "villageName": "Khutabari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171415",
+        "ddrName": "Retrofitting of NADIRPAR PWSS",
+        "projectId": "8171415",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of NADIRPAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218728",
+      "name": "KAURIDUBI TELIPARA PWSS (NEW)",
+      "description": "KAURIDUBI TELIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAURIDUBI TELIPARA PWSS (NEW)",
+        "localName": "KAURIDUBI TELIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33582",
+        "villageName": "Khutabari Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218728",
+        "ddrName": "KAURIDUBI TELIPARA PWSS (NEW)",
+        "projectId": "30218728",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAURIDUBI TELIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237495",
+      "name": "Retrofitting of KHUTABARI PT V PWSS",
+      "description": "Retrofitting of KHUTABARI PT V PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KHUTABARI PT V PWSS",
+        "localName": "Retrofitting of KHUTABARI PT V PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22470",
+        "panchayatname": "Khutabari",
+        "villageCode": "33586",
+        "villageName": "Khutabari Pt-v",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237495",
+        "ddrName": "Retrofitting of KHUTABARI PT V PWSS",
+        "projectId": "8237495",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KHUTABARI PT V PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222249",
+      "name": "Retrofitting of AMBUK PWSS",
+      "description": "Retrofitting of AMBUK PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of AMBUK PWSS",
+        "localName": "Retrofitting of AMBUK PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33610",
+        "villageName": "Ambuk Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222249",
+        "ddrName": "Retrofitting of AMBUK PWSS",
+        "projectId": "8222249",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of AMBUK PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023308",
+      "name": "Ambuk Hakojuli PWSS",
+      "description": "Ambuk Hakojuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ambuk Hakojuli PWSS",
+        "localName": "Ambuk Hakojuli PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "650802",
+        "villageName": "Ambuk Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023308",
+        "ddrName": "Ambuk Hakojuli PWSS",
+        "projectId": "30023308",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ambuk Hakojuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068650",
+      "name": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+      "description": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+        "localName": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33613",
+        "villageName": "Ambuk Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068650",
+        "ddrName": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+        "projectId": "30068650",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6145361",
+      "name": "Ambuk PWSS",
+      "description": "Ambuk PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Ambuk PWSS",
+        "localName": "Ambuk PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33613",
+        "villageName": "Ambuk Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6145361",
+        "ddrName": "Ambuk PWSS",
+        "projectId": "6145361",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Ambuk PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206486",
+      "name": "Retrofitting of ATHIABARI PWSS",
+      "description": "Retrofitting of ATHIABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of ATHIABARI PWSS",
+        "localName": "Retrofitting of ATHIABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33609",
+        "villageName": "Bardamal Athiabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206486",
+        "ddrName": "Retrofitting of ATHIABARI PWSS",
+        "projectId": "8206486",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of ATHIABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8237606",
+      "name": "Retrofitting of BARDAMAL PWSS",
+      "description": "Retrofitting of BARDAMAL PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BARDAMAL PWSS",
+        "localName": "Retrofitting of BARDAMAL PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33609",
+        "villageName": "Bardamal Athiabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8237606",
+        "ddrName": "Retrofitting of BARDAMAL PWSS",
+        "projectId": "8237606",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BARDAMAL PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067985",
+      "name": "ATHIABARI PWSS",
+      "description": "ATHIABARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ATHIABARI PWSS",
+        "localName": "ATHIABARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33609",
+        "villageName": "Bardamal Athiabari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067985",
+        "ddrName": "ATHIABARI PWSS",
+        "projectId": "30067985",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ATHIABARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3374529",
+      "name": "Chekowari PWSS",
+      "description": "Chekowari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Chekowari PWSS",
+        "localName": "Chekowari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33618",
+        "villageName": "Chekowari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3374529",
+        "ddrName": "Chekowari PWSS",
+        "projectId": "3374529",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Chekowari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175867",
+      "name": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+      "description": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+        "localName": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33618",
+        "villageName": "Chekowari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175867",
+        "ddrName": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+        "projectId": "30175867",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30067989",
+      "name": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+      "description": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+        "localName": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "650803",
+        "villageName": "Chekowari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30067989",
+        "ddrName": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+        "projectId": "30067989",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203748",
+      "name": "Retrofitting of CHEKOWARI PWSS",
+      "description": "Retrofitting of CHEKOWARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of CHEKOWARI PWSS",
+        "localName": "Retrofitting of CHEKOWARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "650803",
+        "villageName": "Chekowari Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203748",
+        "ddrName": "Retrofitting of CHEKOWARI PWSS",
+        "projectId": "8203748",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of CHEKOWARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30074732",
+      "name": "CHEKOWARI PT-III PWSS (NEW)",
+      "description": "CHEKOWARI PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHEKOWARI PT-III PWSS (NEW)",
+        "localName": "CHEKOWARI PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "650804",
+        "villageName": "Chekowari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30074732",
+        "ddrName": "CHEKOWARI PT-III PWSS (NEW)",
+        "projectId": "30074732",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHEKOWARI PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174977",
+      "name": "CHEKOWARI PT-II PWSS (NEW)",
+      "description": "CHEKOWARI PT-II PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHEKOWARI PT-II PWSS (NEW)",
+        "localName": "CHEKOWARI PT-II PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "650804",
+        "villageName": "Chekowari Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174977",
+        "ddrName": "CHEKOWARI PT-II PWSS (NEW)",
+        "projectId": "30174977",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHEKOWARI PT-II PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30021560",
+      "name": "DUMAPARA PWSS (NEW)",
+      "description": "DUMAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DUMAPARA PWSS (NEW)",
+        "localName": "DUMAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33616",
+        "villageName": "Dumapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30021560",
+        "ddrName": "DUMAPARA PWSS (NEW)",
+        "projectId": "30021560",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DUMAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898575",
+      "name": "BAKRAKHUTI PWSS (SWAJAL)",
+      "description": "BAKRAKHUTI PWSS (SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAKRAKHUTI PWSS (SWAJAL)",
+        "localName": "BAKRAKHUTI PWSS (SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33612",
+        "villageName": "Kathakuthi Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898575",
+        "ddrName": "BAKRAKHUTI PWSS (SWAJAL)",
+        "projectId": "7898575",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAKRAKHUTI PWSS (SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023347",
+      "name": "Kothakuthi PWSS(NEW)",
+      "description": "Kothakuthi PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kothakuthi PWSS(NEW)",
+        "localName": "Kothakuthi PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33612",
+        "villageName": "Kathakuthi Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023347",
+        "ddrName": "Kothakuthi PWSS(NEW)",
+        "projectId": "30023347",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kothakuthi PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023337",
+      "name": "Kothakuthi Pt-I PWSS(NEW)",
+      "description": "Kothakuthi Pt-I PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kothakuthi Pt-I PWSS(NEW)",
+        "localName": "Kothakuthi Pt-I PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33612",
+        "villageName": "Kathakuthi Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023337",
+        "ddrName": "Kothakuthi Pt-I PWSS(NEW)",
+        "projectId": "30023337",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kothakuthi Pt-I PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4873102",
+      "name": "Kurihamari PWSS",
+      "description": "Kurihamari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kurihamari PWSS",
+        "localName": "Kurihamari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33615",
+        "villageName": "Kathakuthi Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4873102",
+        "ddrName": "Kurihamari PWSS",
+        "projectId": "4873102",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kurihamari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30069261",
+      "name": "KOTHKUTHI PT-III PWSS (NEW)",
+      "description": "KOTHKUTHI PT-III PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KOTHKUTHI PT-III PWSS (NEW)",
+        "localName": "KOTHKUTHI PT-III PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33614",
+        "villageName": "Kathakuthi Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30069261",
+        "ddrName": "KOTHKUTHI PT-III PWSS (NEW)",
+        "projectId": "30069261",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KOTHKUTHI PT-III PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218724",
+      "name": "CHOUDHURIPARA PWSS (NEW)",
+      "description": "CHOUDHURIPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "CHOUDHURIPARA PWSS (NEW)",
+        "localName": "CHOUDHURIPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "627216",
+        "villageName": "Kathakuthi Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218724",
+        "ddrName": "CHOUDHURIPARA PWSS (NEW)",
+        "projectId": "30218724",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "CHOUDHURIPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205153",
+      "name": "Retrofitting of SHYAMAGAON PWSS",
+      "description": "Retrofitting of SHYAMAGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of SHYAMAGAON PWSS",
+        "localName": "Retrofitting of SHYAMAGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "627216",
+        "villageName": "Kathakuthi Pt-iv",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205153",
+        "ddrName": "Retrofitting of SHYAMAGAON PWSS",
+        "projectId": "8205153",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of SHYAMAGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30115249",
+      "name": "MASLOM PT-I PWSS (NEW)",
+      "description": "MASLOM PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MASLOM PT-I PWSS (NEW)",
+        "localName": "MASLOM PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33617",
+        "villageName": "Maslam Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30115249",
+        "ddrName": "MASLOM PT-I PWSS (NEW)",
+        "projectId": "30115249",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MASLOM PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2517248",
+      "name": "Shyamagaon PWSS",
+      "description": "Shyamagaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Shyamagaon PWSS",
+        "localName": "Shyamagaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22473",
+        "panchayatname": "Kothakuthi",
+        "villageCode": "33611",
+        "villageName": "Shyama Gaon Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2517248",
+        "ddrName": "Shyamagaon PWSS",
+        "projectId": "2517248",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Shyamagaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023283",
+      "name": "Adopara PWSS (NEW)",
+      "description": "Adopara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adopara PWSS (NEW)",
+        "localName": "Adopara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33553",
+        "villageName": "Adopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023283",
+        "ddrName": "Adopara PWSS (NEW)",
+        "projectId": "30023283",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adopara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8205265",
+      "name": "Retrofitting of ADOPARA SARDARPARA PWSS",
+      "description": "Retrofitting of ADOPARA SARDARPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of ADOPARA SARDARPARA PWSS",
+        "localName": "Retrofitting of ADOPARA SARDARPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33553",
+        "villageName": "Adopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8205265",
+        "ddrName": "Retrofitting of ADOPARA SARDARPARA PWSS",
+        "projectId": "8205265",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of ADOPARA SARDARPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203816",
+      "name": "Retrofitting of BADIARPARA PWSS",
+      "description": "Retrofitting of BADIARPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BADIARPARA PWSS",
+        "localName": "Retrofitting of BADIARPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33554",
+        "villageName": "Badiarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203816",
+        "ddrName": "Retrofitting of BADIARPARA PWSS",
+        "projectId": "8203816",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BADIARPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5185587",
+      "name": "Badiarpara PWSS",
+      "description": "Badiarpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Badiarpara PWSS",
+        "localName": "Badiarpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33554",
+        "villageName": "Badiarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5185587",
+        "ddrName": "Badiarpara PWSS",
+        "projectId": "5185587",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Badiarpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216030",
+      "name": "JALDHAPARA BADIARPARA PWSS (NEW)",
+      "description": "JALDHAPARA BADIARPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "JALDHAPARA BADIARPARA PWSS (NEW)",
+        "localName": "JALDHAPARA BADIARPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33554",
+        "villageName": "Badiarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216030",
+        "ddrName": "JALDHAPARA BADIARPARA PWSS (NEW)",
+        "projectId": "30216030",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "JALDHAPARA BADIARPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30173980",
+      "name": "Bakrapara 1 PWSS (NEW)",
+      "description": "Bakrapara 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakrapara 1 PWSS (NEW)",
+        "localName": "Bakrapara 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33547",
+        "villageName": "Bakrapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30173980",
+        "ddrName": "Bakrapara 1 PWSS (NEW)",
+        "projectId": "30173980",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakrapara 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8203835",
+      "name": "Retrofitting of BAKHRAPARA PWSS",
+      "description": "Retrofitting of BAKHRAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BAKHRAPARA PWSS",
+        "localName": "Retrofitting of BAKHRAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33547",
+        "villageName": "Bakrapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8203835",
+        "ddrName": "Retrofitting of BAKHRAPARA PWSS",
+        "projectId": "8203835",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BAKHRAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.5849473",
+      "name": "Bakhrapara PWSS",
+      "description": "Bakhrapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bakhrapara PWSS",
+        "localName": "Bakhrapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33549",
+        "villageName": "Bakrapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "5849473",
+        "ddrName": "Bakhrapara PWSS",
+        "projectId": "5849473",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bakhrapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218431",
+      "name": "GAROPARA BAKRAPARA PWSS (NEW)",
+      "description": "GAROPARA BAKRAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GAROPARA BAKRAPARA PWSS (NEW)",
+        "localName": "GAROPARA BAKRAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33549",
+        "villageName": "Bakrapara Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218431",
+        "ddrName": "GAROPARA BAKRAPARA PWSS (NEW)",
+        "projectId": "30218431",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GAROPARA BAKRAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.7898565",
+      "name": "BHAMRAPATHAR PWSS (SWAJAL)",
+      "description": "BHAMRAPATHAR PWSS (SWAJAL)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHAMRAPATHAR PWSS (SWAJAL)",
+        "localName": "BHAMRAPATHAR PWSS (SWAJAL)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33533",
+        "villageName": "Hadipara Bhamra Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "7898565",
+        "ddrName": "BHAMRAPATHAR PWSS (SWAJAL)",
+        "projectId": "7898565",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHAMRAPATHAR PWSS (SWAJAL)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30175904",
+      "name": "Hadipara Garopara PWSS (NEW)",
+      "description": "Hadipara Garopara PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Hadipara Garopara PWSS (NEW)",
+        "localName": "Hadipara Garopara PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33533",
+        "villageName": "Hadipara Bhamra Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30175904",
+        "ddrName": "Hadipara Garopara PWSS (NEW)",
+        "projectId": "30175904",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Hadipara Garopara PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1936743",
+      "name": "Rawmari PWSS",
+      "description": "Rawmari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rawmari PWSS",
+        "localName": "Rawmari PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33533",
+        "villageName": "Hadipara Bhamra Pathar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1936743",
+        "ddrName": "Rawmari PWSS",
+        "projectId": "1936743",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rawmari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1941516",
+      "name": "Kayasthapara PWSS",
+      "description": "Kayasthapara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kayasthapara PWSS",
+        "localName": "Kayasthapara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33548",
+        "villageName": "Kayashthapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1941516",
+        "ddrName": "Kayasthapara PWSS",
+        "projectId": "1941516",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kayasthapara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171531",
+      "name": "Retrofitting of KAYASTHAPARA PWSS",
+      "description": "Retrofitting of KAYASTHAPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KAYASTHAPARA PWSS",
+        "localName": "Retrofitting of KAYASTHAPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33548",
+        "villageName": "Kayashthapara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171531",
+        "ddrName": "Retrofitting of KAYASTHAPARA PWSS",
+        "projectId": "8171531",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KAYASTHAPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8197059",
+      "name": "Retrofitting of RANGJULI PWSS",
+      "description": "Retrofitting of RANGJULI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RANGJULI PWSS",
+        "localName": "Retrofitting of RANGJULI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33545",
+        "villageName": "Mahajanpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8197059",
+        "ddrName": "Retrofitting of RANGJULI PWSS",
+        "projectId": "8197059",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RANGJULI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6136706",
+      "name": "Rangjuli PWSS",
+      "description": "Rangjuli PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Rangjuli PWSS",
+        "localName": "Rangjuli PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33545",
+        "villageName": "Mahajanpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6136706",
+        "ddrName": "Rangjuli PWSS",
+        "projectId": "6136706",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Rangjuli PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30092981",
+      "name": "MAJPARA KHAMAR PWSS (NEW)",
+      "description": "MAJPARA KHAMAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAJPARA KHAMAR PWSS (NEW)",
+        "localName": "MAJPARA KHAMAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33542",
+        "villageName": "Majpara Khamar",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30092981",
+        "ddrName": "MAJPARA KHAMAR PWSS (NEW)",
+        "projectId": "30092981",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAJPARA KHAMAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048987",
+      "name": "SARAPARA PWSS (NEW)",
+      "description": "SARAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SARAPARA PWSS (NEW)",
+        "localName": "SARAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33546",
+        "villageName": "Panditpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048987",
+        "ddrName": "SARAPARA PWSS (NEW)",
+        "projectId": "30048987",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SARAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160852",
+      "name": "Retrofitting of GAROPARA PWSS",
+      "description": "Retrofitting of GAROPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GAROPARA PWSS",
+        "localName": "Retrofitting of GAROPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33551",
+        "villageName": "Rongjuli Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160852",
+        "ddrName": "Retrofitting of GAROPARA PWSS",
+        "projectId": "8160852",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GAROPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6055984",
+      "name": "Garopara PWSS",
+      "description": "Garopara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Garopara PWSS",
+        "localName": "Garopara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33551",
+        "villageName": "Rongjuli Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6055984",
+        "ddrName": "Garopara PWSS",
+        "projectId": "6055984",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Garopara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30174699",
+      "name": "LASKARPARA (RANGJULI) PWSS (NEW)",
+      "description": "LASKARPARA (RANGJULI) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "LASKARPARA (RANGJULI) PWSS (NEW)",
+        "localName": "LASKARPARA (RANGJULI) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33551",
+        "villageName": "Rongjuli Garopara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30174699",
+        "ddrName": "LASKARPARA (RANGJULI) PWSS (NEW)",
+        "projectId": "30174699",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "LASKARPARA (RANGJULI) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30068609",
+      "name": "PENCHIMARI PWSS (NEW)",
+      "description": "PENCHIMARI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "PENCHIMARI PWSS (NEW)",
+        "localName": "PENCHIMARI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33539",
+        "villageName": "Rowmari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30068609",
+        "ddrName": "PENCHIMARI PWSS (NEW)",
+        "projectId": "30068609",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "PENCHIMARI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160910",
+      "name": "Retrofitting of RAWMARI PWSS",
+      "description": "Retrofitting of RAWMARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of RAWMARI PWSS",
+        "localName": "Retrofitting of RAWMARI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33539",
+        "villageName": "Rowmari Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160910",
+        "ddrName": "Retrofitting of RAWMARI PWSS",
+        "projectId": "8160910",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of RAWMARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.2405228",
+      "name": "Adopara Sardarpara PWSS",
+      "description": "Adopara Sardarpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Adopara Sardarpara PWSS",
+        "localName": "Adopara Sardarpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22466",
+        "panchayatname": "Rangjuli",
+        "villageCode": "33552",
+        "villageName": "Sardarpara",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "2405228",
+        "ddrName": "Adopara Sardarpara PWSS",
+        "projectId": "2405228",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Adopara Sardarpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30221387",
+      "name": "Barbari No. 2 PWSS (NEW)",
+      "description": "Barbari No. 2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barbari No. 2 PWSS (NEW)",
+        "localName": "Barbari No. 2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33571",
+        "villageName": "Barbari",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30221387",
+        "ddrName": "Barbari No. 2 PWSS (NEW)",
+        "projectId": "30221387",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barbari No. 2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8206044",
+      "name": "Retrofitting of BORBORI PWSS",
+      "description": "Retrofitting of BORBORI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BORBORI PWSS",
+        "localName": "Retrofitting of BORBORI PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33570",
+        "villageName": "Domnapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8206044",
+        "ddrName": "Retrofitting of BORBORI PWSS",
+        "projectId": "8206044",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BORBORI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216027",
+      "name": "DOMNAPARA PWSS (NEW)",
+      "description": "DOMNAPARA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DOMNAPARA PWSS (NEW)",
+        "localName": "DOMNAPARA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33570",
+        "villageName": "Domnapara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216027",
+        "ddrName": "DOMNAPARA PWSS (NEW)",
+        "projectId": "30216027",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DOMNAPARA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060892",
+      "name": "GERUA PWSS (NEW)",
+      "description": "GERUA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GERUA PWSS (NEW)",
+        "localName": "GERUA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33569",
+        "villageName": "Gerua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060892",
+        "ddrName": "GERUA PWSS (NEW)",
+        "projectId": "30060892",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GERUA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30060898",
+      "name": "GERUA NO.2 PWSS (NEW)",
+      "description": "GERUA NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GERUA NO.2 PWSS (NEW)",
+        "localName": "GERUA NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33569",
+        "villageName": "Gerua",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30060898",
+        "ddrName": "GERUA NO.2 PWSS (NEW)",
+        "projectId": "30060898",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GERUA NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126312",
+      "name": "KAMAR POTA PWSS (NEW)",
+      "description": "KAMAR POTA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAMAR POTA PWSS (NEW)",
+        "localName": "KAMAR POTA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33568",
+        "villageName": "Kamar Pota",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126312",
+        "ddrName": "KAMAR POTA PWSS (NEW)",
+        "projectId": "30126312",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAMAR POTA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8222366",
+      "name": "Retrofitting of KAMARPUTA  PWSS",
+      "description": "Retrofitting of KAMARPUTA  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of KAMARPUTA  PWSS",
+        "localName": "Retrofitting of KAMARPUTA  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33568",
+        "villageName": "Kamar Pota",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8222366",
+        "ddrName": "Retrofitting of KAMARPUTA  PWSS",
+        "projectId": "8222366",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of KAMARPUTA  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126316",
+      "name": "KAMAR POTA NO.2 PWSS (NEW)",
+      "description": "KAMAR POTA NO.2 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KAMAR POTA NO.2 PWSS (NEW)",
+        "localName": "KAMAR POTA NO.2 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33568",
+        "villageName": "Kamar Pota",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126316",
+        "ddrName": "KAMAR POTA NO.2 PWSS (NEW)",
+        "projectId": "30126316",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KAMAR POTA NO.2 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30063119",
+      "name": "KANKATA PT-I PWSS (NEW)",
+      "description": "KANKATA PT-I PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANKATA PT-I PWSS (NEW)",
+        "localName": "KANKATA PT-I PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33565",
+        "villageName": "Kankata Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30063119",
+        "ddrName": "KANKATA PT-I PWSS (NEW)",
+        "projectId": "30063119",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANKATA PT-I PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30037516",
+      "name": "KANKATA PT-I (NO 2) PWSS (NEW)",
+      "description": "KANKATA PT-I (NO 2) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANKATA PT-I (NO 2) PWSS (NEW)",
+        "localName": "KANKATA PT-I (NO 2) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33565",
+        "villageName": "Kankata Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30037516",
+        "ddrName": "KANKATA PT-I (NO 2) PWSS (NEW)",
+        "projectId": "30037516",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANKATA PT-I (NO 2) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30126308",
+      "name": "KANKATA PT-I (NO 4) PWSS (New)",
+      "description": "KANKATA PT-I (NO 4) PWSS (New)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANKATA PT-I (NO 4) PWSS (New)",
+        "localName": "KANKATA PT-I (NO 4) PWSS (New)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33565",
+        "villageName": "Kankata Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30126308",
+        "ddrName": "KANKATA PT-I (NO 4) PWSS (New)",
+        "projectId": "30126308",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANKATA PT-I (NO 4) PWSS (New)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014658",
+      "name": "KANKATA PT-I (No 3) PWSS (NEW)",
+      "description": "KANKATA PT-I (No 3) PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KANKATA PT-I (No 3) PWSS (NEW)",
+        "localName": "KANKATA PT-I (No 3) PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33565",
+        "villageName": "Kankata Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014658",
+        "ddrName": "KANKATA PT-I (No 3) PWSS (NEW)",
+        "projectId": "30014658",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KANKATA PT-I (No 3) PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30216939",
+      "name": "Fakirpara Pukhuripara PWSS",
+      "description": "Fakirpara Pukhuripara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Fakirpara Pukhuripara PWSS",
+        "localName": "Fakirpara Pukhuripara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33260",
+        "villageName": "Kuchdhowa Chechapani Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30216939",
+        "ddrName": "Fakirpara Pukhuripara PWSS",
+        "projectId": "30216939",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Fakirpara Pukhuripara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259651",
+      "name": "Kuchdhowa Chesapani Pt II PWSS",
+      "description": "Kuchdhowa Chesapani Pt II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Kuchdhowa Chesapani Pt II PWSS",
+        "localName": "Kuchdhowa Chesapani Pt II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33260",
+        "villageName": "Kuchdhowa Chechapani Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259651",
+        "ddrName": "Kuchdhowa Chesapani Pt II PWSS",
+        "projectId": "6259651",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Kuchdhowa Chesapani Pt II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30075685",
+      "name": "SIMLITOLA NO.4 PWSS (NEW)",
+      "description": "SIMLITOLA NO.4 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIMLITOLA NO.4 PWSS (NEW)",
+        "localName": "SIMLITOLA NO.4 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33567",
+        "villageName": "Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30075685",
+        "ddrName": "SIMLITOLA NO.4 PWSS (NEW)",
+        "projectId": "30075685",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIMLITOLA NO.4 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30073477",
+      "name": "SIMLITOLA PWSS (NEW)",
+      "description": "SIMLITOLA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIMLITOLA PWSS (NEW)",
+        "localName": "SIMLITOLA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33567",
+        "villageName": "Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30073477",
+        "ddrName": "SIMLITOLA PWSS (NEW)",
+        "projectId": "30073477",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIMLITOLA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30128549",
+      "name": "SIMLITOLA NO.3 PWSS (NEW)",
+      "description": "SIMLITOLA NO.3 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIMLITOLA NO.3 PWSS (NEW)",
+        "localName": "SIMLITOLA NO.3 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33567",
+        "villageName": "Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30128549",
+        "ddrName": "SIMLITOLA NO.3 PWSS (NEW)",
+        "projectId": "30128549",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIMLITOLA NO.3 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30023360",
+      "name": "SIMLITOLA No.2 PWSS(NEW)",
+      "description": "SIMLITOLA No.2 PWSS(NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "SIMLITOLA No.2 PWSS(NEW)",
+        "localName": "SIMLITOLA No.2 PWSS(NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22468",
+        "panchayatname": "Simlitola",
+        "villageCode": "33567",
+        "villageName": "Simlitola",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30023360",
+        "ddrName": "SIMLITOLA No.2 PWSS(NEW)",
+        "projectId": "30023360",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "SIMLITOLA No.2 PWSS(NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30179689",
+      "name": "BAMUNIGAON PWSS (NEW)",
+      "description": "BAMUNIGAON PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAMUNIGAON PWSS (NEW)",
+        "localName": "BAMUNIGAON PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33564",
+        "villageName": "Bamuni Gaon Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30179689",
+        "ddrName": "BAMUNIGAON PWSS (NEW)",
+        "projectId": "30179689",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAMUNIGAON PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171518",
+      "name": "Retrofitting of TPLAI PT II PWSS",
+      "description": "Retrofitting of TPLAI PT II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TPLAI PT II PWSS",
+        "localName": "Retrofitting of TPLAI PT II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33563",
+        "villageName": "Bamuni Gaon Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171518",
+        "ddrName": "Retrofitting of TPLAI PT II PWSS",
+        "projectId": "8171518",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TPLAI PT II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4870166",
+      "name": "Patpara PWSS",
+      "description": "Patpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Patpara PWSS",
+        "localName": "Patpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33563",
+        "villageName": "Bamuni Gaon Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4870166",
+        "ddrName": "Patpara PWSS",
+        "projectId": "4870166",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Patpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160467",
+      "name": "Retrofitting of BANGAON PWSS",
+      "description": "Retrofitting of BANGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BANGAON PWSS",
+        "localName": "Retrofitting of BANGAON PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33562",
+        "villageName": "Bangaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160467",
+        "ddrName": "Retrofitting of BANGAON PWSS",
+        "projectId": "8160467",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BANGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4652293",
+      "name": "Bangaon PWSS",
+      "description": "Bangaon PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Bangaon PWSS",
+        "localName": "Bangaon PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33562",
+        "villageName": "Bangaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4652293",
+        "ddrName": "Bangaon PWSS",
+        "projectId": "4652293",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Bangaon PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30048965",
+      "name": "GURUCHATKA 1 PWSS (NEW)",
+      "description": "GURUCHATKA 1 PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "GURUCHATKA 1 PWSS (NEW)",
+        "localName": "GURUCHATKA 1 PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33559",
+        "villageName": "Garuchatka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30048965",
+        "ddrName": "GURUCHATKA 1 PWSS (NEW)",
+        "projectId": "30048965",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "GURUCHATKA 1 PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8186803",
+      "name": "Retrofitting of GARUCHUTKA PWSS",
+      "description": "Retrofitting of GARUCHUTKA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of GARUCHUTKA PWSS",
+        "localName": "Retrofitting of GARUCHUTKA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33559",
+        "villageName": "Garuchatka",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8186803",
+        "ddrName": "Retrofitting of GARUCHUTKA PWSS",
+        "projectId": "8186803",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of GARUCHUTKA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30105223",
+      "name": "ENGLISH BAZAR PWSS (NEW)",
+      "description": "ENGLISH BAZAR PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "ENGLISH BAZAR PWSS (NEW)",
+        "localName": "ENGLISH BAZAR PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33561",
+        "villageName": "Patpara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30105223",
+        "ddrName": "ENGLISH BAZAR PWSS (NEW)",
+        "projectId": "30105223",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "ENGLISH BAZAR PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8171505",
+      "name": "Retrofitting of PATPARA PWSS",
+      "description": "Retrofitting of PATPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of PATPARA PWSS",
+        "localName": "Retrofitting of PATPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33561",
+        "villageName": "Patpara Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8171505",
+        "ddrName": "Retrofitting of PATPARA PWSS",
+        "projectId": "8171505",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of PATPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014666",
+      "name": "TIPLAI PWSS (NEW)",
+      "description": "TIPLAI PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TIPLAI PWSS (NEW)",
+        "localName": "TIPLAI PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33556",
+        "villageName": "Tiplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014666",
+        "ddrName": "TIPLAI PWSS (NEW)",
+        "projectId": "30014666",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TIPLAI PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30218733",
+      "name": "BORDOBA PWSS (NEW)",
+      "description": "BORDOBA PWSS (NEW)",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BORDOBA PWSS (NEW)",
+        "localName": "BORDOBA PWSS (NEW)",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33556",
+        "villageName": "Tiplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30218733",
+        "ddrName": "BORDOBA PWSS (NEW)",
+        "projectId": "30218733",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BORDOBA PWSS (NEW)",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386204",
+      "name": "Barpathar PWSS",
+      "description": "Barpathar PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Barpathar PWSS",
+        "localName": "Barpathar PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33556",
+        "villageName": "Tiplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386204",
+        "ddrName": "Barpathar PWSS",
+        "projectId": "3386204",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Barpathar PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8160817",
+      "name": "Retrofitting of BARPATHAR PWSS",
+      "description": "Retrofitting of BARPATHAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of BARPATHAR PWSS",
+        "localName": "Retrofitting of BARPATHAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33556",
+        "villageName": "Tiplai Pt-i",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8160817",
+        "ddrName": "Retrofitting of BARPATHAR PWSS",
+        "projectId": "8160817",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of BARPATHAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.6259479",
+      "name": "Dighalibori  PWSS",
+      "description": "Dighalibori  PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Dighalibori  PWSS",
+        "localName": "Dighalibori  PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33558",
+        "villageName": "Tiplai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "6259479",
+        "ddrName": "Dighalibori  PWSS",
+        "projectId": "6259479",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Dighalibori  PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.3386289",
+      "name": "Tiplai PT-II PWSS",
+      "description": "Tiplai PT-II PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tiplai PT-II PWSS",
+        "localName": "Tiplai PT-II PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33558",
+        "villageName": "Tiplai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "3386289",
+        "ddrName": "Tiplai PT-II PWSS",
+        "projectId": "3386289",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tiplai PT-II PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1937816",
+      "name": "Tiplai Bhakatpara PWSS",
+      "description": "Tiplai Bhakatpara PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tiplai Bhakatpara PWSS",
+        "localName": "Tiplai Bhakatpara PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33558",
+        "villageName": "Tiplai Pt-ii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1937816",
+        "ddrName": "Tiplai Bhakatpara PWSS",
+        "projectId": "1937816",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tiplai Bhakatpara PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.4887947",
+      "name": "Tiplai Pt I PWSS",
+      "description": "Tiplai Pt I PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Tiplai Pt I PWSS",
+        "localName": "Tiplai Pt I PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33557",
+        "villageName": "Tipli Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "4887947",
+        "ddrName": "Tiplai Pt I PWSS",
+        "projectId": "4887947",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Tiplai Pt I PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8159717",
+      "name": "Retrofitting of TIPLAI BHAKATPARA PWSS",
+      "description": "Retrofitting of TIPLAI BHAKATPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Retrofitting of TIPLAI BHAKATPARA PWSS",
+        "localName": "Retrofitting of TIPLAI BHAKATPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1191",
+        "blockname": "Rongjuli",
+        "panchayatcode": "22467",
+        "panchayatname": "Tiplai",
+        "villageCode": "33557",
+        "villageName": "Tipli Pt-iii",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8159717",
+        "ddrName": "Retrofitting of TIPLAI BHAKATPARA PWSS",
+        "projectId": "8159717",
+        "regionName": "1191"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Retrofitting of TIPLAI BHAKATPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.testing",
+      "name": "testing",
+      "description": "testing",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "testing",
+        "localName": "testing",
+        "districtCode": "204",
+        "districtName": "Shivamogga",
+        "blockcode": "2595",
+        "blockname": "Soraba",
+        "panchayatcode": "63625",
+        "panchayatname": "Udri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "testing",
+        "ddrName": "testing",
+        "projectId": "testing",
+        "regionName": "2595",
+        "villageName": "Bamun Panikhowa",
+        "villageCode": "33304"
+      },
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "testing",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    }
+  ]
+}

From 5906d2ee786bf45ddc1698936031051d68383054 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:30:53 +0530
Subject: [PATCH 02/23] added 400 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5547867/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5547870/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5547877/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5547899/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5548125/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5548175/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5548215/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5548227/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5548257/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5548360/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5550489/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5550585/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5552472/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5552515/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5552526/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5552540/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5557007/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5568316/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5569781/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5569877/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5571455/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5571465/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5571476/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5571515/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5573206/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5573300/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5599446/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5641311/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5803027/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../5849473/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6054046/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6054138/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6054477/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6054503/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6055529/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6055543/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6055984/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6136397/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6136635/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6136706/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6145361/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6145500/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6145716/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6149983/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6150005/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6150033/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6150048/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6151001/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6166571/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6166583/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6173095/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175393/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175413/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175518/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175537/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175631/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175645/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6175650/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6189857/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6189867/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6233420/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6234085/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6241704/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6241823/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6241939/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6242561/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6242604/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6242836/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6242875/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6242892/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259479/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259651/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259713/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259850/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259888/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259908/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259933/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6259975/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6260027/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6260773/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6260844/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6260923/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6347427/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6349286/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6350831/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6350854/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385531/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385536/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385545/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385554/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385567/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385905/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385915/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6385925/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6502957/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6503042/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6515973/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6516224/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6517821/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6520124/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6524893/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6524935/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6526507/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6526593/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6526646/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6852674/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6858112/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6858114/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6861545/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6861639/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../6861642/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7341547/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7343676/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7347016/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7347032/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7347122/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7637384/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7893876/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7894596/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898565/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898568/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898570/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898571/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898573/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898574/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7898575/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7971619/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../7971866/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8036124/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8036130/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8131608/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132115/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132124/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132128/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132750/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132803/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132805/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132840/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132845/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132847/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132850/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132861/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132866/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132870/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8132892/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8137635/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8138120/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8138164/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8140993/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141044/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141062/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141109/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141554/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141566/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141583/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141619/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141631/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141643/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141666/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141686/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141704/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141716/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141733/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141761/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141785/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141831/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141923/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8141972/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148068/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148081/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148097/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148105/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148116/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148125/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148137/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148159/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148173/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148181/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148193/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148198/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8148257/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153195/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153198/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153201/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153205/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153209/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153214/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153219/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153224/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153228/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153230/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153234/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153241/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153248/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153287/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153302/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153320/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153337/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153355/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153374/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../8153399/egov-location/boundary-data.json  |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153482/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153639/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153665/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153690/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153703/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153723/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153746/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153766/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153777/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153800/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153823/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8153844/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8154251/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155025/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155026/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155041/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155049/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155055/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155070/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155090/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155168/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155206/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155271/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155279/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8155344/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156157/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156180/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156193/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156208/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156216/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156220/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156223/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156231/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156241/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156244/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156253/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156257/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156263/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156271/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156274/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156288/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156289/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156315/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156393/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156410/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156419/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156424/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156430/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8156440/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8157519/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8157593/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8157595/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8157600/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8157602/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8157739/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159295/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159645/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159671/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159680/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159691/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159704/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159717/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159727/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159738/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159747/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159851/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159874/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159939/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159954/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8159963/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160000/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160005/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160019/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160027/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160039/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160338/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160353/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160367/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160379/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160387/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160400/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160409/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160417/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160423/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160451/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160455/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160460/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160467/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160474/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160796/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160817/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160827/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160840/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160852/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160864/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160875/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160897/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8160910/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161016/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161774/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161776/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161778/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161779/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161782/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161786/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161790/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161794/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161801/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161808/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161819/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161828/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161841/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161861/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161882/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161897/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161907/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161918/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161943/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161960/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161985/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8161998/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8162013/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8162057/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8162079/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8162125/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8162166/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171324/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171366/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171388/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171415/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171462/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171475/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171505/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171518/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171531/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171572/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171735/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171834/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171872/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171904/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171945/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171970/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8171989/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8172016/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8172071/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175220/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175227/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175232/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175237/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175241/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175267/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8175588/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8176558/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8176578/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8176607/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8176627/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8177941/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178172/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178282/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178343/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178428/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178783/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178821/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178861/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178895/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8178929/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8181830/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8181848/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8181875/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8181912/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8183542/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8183933/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8184246/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8184256/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../8184281/egov-location/boundary-data.json  |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8184539/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185128/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185176/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185212/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185242/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185270/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185286/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185317/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185354/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185387/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185418/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185772/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185789/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185807/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8185824/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8186783/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8186803/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187077/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187084/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187090/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187146/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187153/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187157/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187165/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 1596 files changed, 136140 insertions(+), 24 deletions(-)
 create mode 100644 data/as/5547867/BillingService/BusinessService.json
 create mode 100644 data/as/5547867/egov-location/boundary-data.json
 create mode 100644 data/as/5547867/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547867/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547870/BillingService/BusinessService.json
 create mode 100644 data/as/5547870/egov-location/boundary-data.json
 create mode 100644 data/as/5547870/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547870/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547877/BillingService/BusinessService.json
 create mode 100644 data/as/5547877/egov-location/boundary-data.json
 create mode 100644 data/as/5547877/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547877/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5547899/BillingService/BusinessService.json
 create mode 100644 data/as/5547899/egov-location/boundary-data.json
 create mode 100644 data/as/5547899/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5547899/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5548125/BillingService/BusinessService.json
 create mode 100644 data/as/5548125/egov-location/boundary-data.json
 create mode 100644 data/as/5548125/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5548125/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5548175/BillingService/BusinessService.json
 create mode 100644 data/as/5548175/egov-location/boundary-data.json
 create mode 100644 data/as/5548175/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5548175/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5548215/BillingService/BusinessService.json
 create mode 100644 data/as/5548215/egov-location/boundary-data.json
 create mode 100644 data/as/5548215/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5548215/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5548227/BillingService/BusinessService.json
 create mode 100644 data/as/5548227/egov-location/boundary-data.json
 create mode 100644 data/as/5548227/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5548227/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5548257/BillingService/BusinessService.json
 create mode 100644 data/as/5548257/egov-location/boundary-data.json
 create mode 100644 data/as/5548257/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5548257/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5548360/BillingService/BusinessService.json
 create mode 100644 data/as/5548360/egov-location/boundary-data.json
 create mode 100644 data/as/5548360/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5548360/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5550489/BillingService/BusinessService.json
 create mode 100644 data/as/5550489/egov-location/boundary-data.json
 create mode 100644 data/as/5550489/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5550489/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5550585/BillingService/BusinessService.json
 create mode 100644 data/as/5550585/egov-location/boundary-data.json
 create mode 100644 data/as/5550585/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5550585/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5552472/BillingService/BusinessService.json
 create mode 100644 data/as/5552472/egov-location/boundary-data.json
 create mode 100644 data/as/5552472/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5552472/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5552515/BillingService/BusinessService.json
 create mode 100644 data/as/5552515/egov-location/boundary-data.json
 create mode 100644 data/as/5552515/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5552515/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5552526/BillingService/BusinessService.json
 create mode 100644 data/as/5552526/egov-location/boundary-data.json
 create mode 100644 data/as/5552526/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5552526/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5552540/BillingService/BusinessService.json
 create mode 100644 data/as/5552540/egov-location/boundary-data.json
 create mode 100644 data/as/5552540/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5552540/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5557007/BillingService/BusinessService.json
 create mode 100644 data/as/5557007/egov-location/boundary-data.json
 create mode 100644 data/as/5557007/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5557007/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5568316/BillingService/BusinessService.json
 create mode 100644 data/as/5568316/egov-location/boundary-data.json
 create mode 100644 data/as/5568316/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5568316/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5569781/BillingService/BusinessService.json
 create mode 100644 data/as/5569781/egov-location/boundary-data.json
 create mode 100644 data/as/5569781/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5569781/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5569877/BillingService/BusinessService.json
 create mode 100644 data/as/5569877/egov-location/boundary-data.json
 create mode 100644 data/as/5569877/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5569877/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5571455/BillingService/BusinessService.json
 create mode 100644 data/as/5571455/egov-location/boundary-data.json
 create mode 100644 data/as/5571455/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5571455/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5571465/BillingService/BusinessService.json
 create mode 100644 data/as/5571465/egov-location/boundary-data.json
 create mode 100644 data/as/5571465/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5571465/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5571476/BillingService/BusinessService.json
 create mode 100644 data/as/5571476/egov-location/boundary-data.json
 create mode 100644 data/as/5571476/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5571476/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5571515/BillingService/BusinessService.json
 create mode 100644 data/as/5571515/egov-location/boundary-data.json
 create mode 100644 data/as/5571515/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5571515/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5573206/BillingService/BusinessService.json
 create mode 100644 data/as/5573206/egov-location/boundary-data.json
 create mode 100644 data/as/5573206/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5573206/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5573300/BillingService/BusinessService.json
 create mode 100644 data/as/5573300/egov-location/boundary-data.json
 create mode 100644 data/as/5573300/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5573300/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5599446/BillingService/BusinessService.json
 create mode 100644 data/as/5599446/egov-location/boundary-data.json
 create mode 100644 data/as/5599446/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5599446/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5641311/BillingService/BusinessService.json
 create mode 100644 data/as/5641311/egov-location/boundary-data.json
 create mode 100644 data/as/5641311/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5641311/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5803027/BillingService/BusinessService.json
 create mode 100644 data/as/5803027/egov-location/boundary-data.json
 create mode 100644 data/as/5803027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5803027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/5849473/BillingService/BusinessService.json
 create mode 100644 data/as/5849473/egov-location/boundary-data.json
 create mode 100644 data/as/5849473/ws-services-calculation/Penalty.json
 create mode 100644 data/as/5849473/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6054046/BillingService/BusinessService.json
 create mode 100644 data/as/6054046/egov-location/boundary-data.json
 create mode 100644 data/as/6054046/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6054046/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6054138/BillingService/BusinessService.json
 create mode 100644 data/as/6054138/egov-location/boundary-data.json
 create mode 100644 data/as/6054138/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6054138/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6054477/BillingService/BusinessService.json
 create mode 100644 data/as/6054477/egov-location/boundary-data.json
 create mode 100644 data/as/6054477/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6054477/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6054503/BillingService/BusinessService.json
 create mode 100644 data/as/6054503/egov-location/boundary-data.json
 create mode 100644 data/as/6054503/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6054503/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6055529/BillingService/BusinessService.json
 create mode 100644 data/as/6055529/egov-location/boundary-data.json
 create mode 100644 data/as/6055529/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6055529/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6055543/BillingService/BusinessService.json
 create mode 100644 data/as/6055543/egov-location/boundary-data.json
 create mode 100644 data/as/6055543/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6055543/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6055984/BillingService/BusinessService.json
 create mode 100644 data/as/6055984/egov-location/boundary-data.json
 create mode 100644 data/as/6055984/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6055984/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6136397/BillingService/BusinessService.json
 create mode 100644 data/as/6136397/egov-location/boundary-data.json
 create mode 100644 data/as/6136397/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6136397/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6136635/BillingService/BusinessService.json
 create mode 100644 data/as/6136635/egov-location/boundary-data.json
 create mode 100644 data/as/6136635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6136635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6136706/BillingService/BusinessService.json
 create mode 100644 data/as/6136706/egov-location/boundary-data.json
 create mode 100644 data/as/6136706/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6136706/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6145361/BillingService/BusinessService.json
 create mode 100644 data/as/6145361/egov-location/boundary-data.json
 create mode 100644 data/as/6145361/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6145361/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6145500/BillingService/BusinessService.json
 create mode 100644 data/as/6145500/egov-location/boundary-data.json
 create mode 100644 data/as/6145500/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6145500/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6145716/BillingService/BusinessService.json
 create mode 100644 data/as/6145716/egov-location/boundary-data.json
 create mode 100644 data/as/6145716/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6145716/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6149983/BillingService/BusinessService.json
 create mode 100644 data/as/6149983/egov-location/boundary-data.json
 create mode 100644 data/as/6149983/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6149983/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6150005/BillingService/BusinessService.json
 create mode 100644 data/as/6150005/egov-location/boundary-data.json
 create mode 100644 data/as/6150005/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6150005/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6150033/BillingService/BusinessService.json
 create mode 100644 data/as/6150033/egov-location/boundary-data.json
 create mode 100644 data/as/6150033/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6150033/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6150048/BillingService/BusinessService.json
 create mode 100644 data/as/6150048/egov-location/boundary-data.json
 create mode 100644 data/as/6150048/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6150048/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6151001/BillingService/BusinessService.json
 create mode 100644 data/as/6151001/egov-location/boundary-data.json
 create mode 100644 data/as/6151001/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6151001/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6166571/BillingService/BusinessService.json
 create mode 100644 data/as/6166571/egov-location/boundary-data.json
 create mode 100644 data/as/6166571/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6166571/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6166583/BillingService/BusinessService.json
 create mode 100644 data/as/6166583/egov-location/boundary-data.json
 create mode 100644 data/as/6166583/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6166583/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6173095/BillingService/BusinessService.json
 create mode 100644 data/as/6173095/egov-location/boundary-data.json
 create mode 100644 data/as/6173095/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6173095/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175393/BillingService/BusinessService.json
 create mode 100644 data/as/6175393/egov-location/boundary-data.json
 create mode 100644 data/as/6175393/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175393/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175413/BillingService/BusinessService.json
 create mode 100644 data/as/6175413/egov-location/boundary-data.json
 create mode 100644 data/as/6175413/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175413/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175518/BillingService/BusinessService.json
 create mode 100644 data/as/6175518/egov-location/boundary-data.json
 create mode 100644 data/as/6175518/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175518/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175537/BillingService/BusinessService.json
 create mode 100644 data/as/6175537/egov-location/boundary-data.json
 create mode 100644 data/as/6175537/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175537/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175631/BillingService/BusinessService.json
 create mode 100644 data/as/6175631/egov-location/boundary-data.json
 create mode 100644 data/as/6175631/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175631/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175645/BillingService/BusinessService.json
 create mode 100644 data/as/6175645/egov-location/boundary-data.json
 create mode 100644 data/as/6175645/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175645/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6175650/BillingService/BusinessService.json
 create mode 100644 data/as/6175650/egov-location/boundary-data.json
 create mode 100644 data/as/6175650/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6175650/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6189857/BillingService/BusinessService.json
 create mode 100644 data/as/6189857/egov-location/boundary-data.json
 create mode 100644 data/as/6189857/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6189857/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6189867/BillingService/BusinessService.json
 create mode 100644 data/as/6189867/egov-location/boundary-data.json
 create mode 100644 data/as/6189867/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6189867/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6233420/BillingService/BusinessService.json
 create mode 100644 data/as/6233420/egov-location/boundary-data.json
 create mode 100644 data/as/6233420/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6233420/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6234085/BillingService/BusinessService.json
 create mode 100644 data/as/6234085/egov-location/boundary-data.json
 create mode 100644 data/as/6234085/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6234085/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6241704/BillingService/BusinessService.json
 create mode 100644 data/as/6241704/egov-location/boundary-data.json
 create mode 100644 data/as/6241704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6241704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6241823/BillingService/BusinessService.json
 create mode 100644 data/as/6241823/egov-location/boundary-data.json
 create mode 100644 data/as/6241823/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6241823/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6241939/BillingService/BusinessService.json
 create mode 100644 data/as/6241939/egov-location/boundary-data.json
 create mode 100644 data/as/6241939/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6241939/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6242561/BillingService/BusinessService.json
 create mode 100644 data/as/6242561/egov-location/boundary-data.json
 create mode 100644 data/as/6242561/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6242561/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6242604/BillingService/BusinessService.json
 create mode 100644 data/as/6242604/egov-location/boundary-data.json
 create mode 100644 data/as/6242604/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6242604/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6242836/BillingService/BusinessService.json
 create mode 100644 data/as/6242836/egov-location/boundary-data.json
 create mode 100644 data/as/6242836/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6242836/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6242875/BillingService/BusinessService.json
 create mode 100644 data/as/6242875/egov-location/boundary-data.json
 create mode 100644 data/as/6242875/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6242875/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6242892/BillingService/BusinessService.json
 create mode 100644 data/as/6242892/egov-location/boundary-data.json
 create mode 100644 data/as/6242892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6242892/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259479/BillingService/BusinessService.json
 create mode 100644 data/as/6259479/egov-location/boundary-data.json
 create mode 100644 data/as/6259479/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259479/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259651/BillingService/BusinessService.json
 create mode 100644 data/as/6259651/egov-location/boundary-data.json
 create mode 100644 data/as/6259651/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259651/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259713/BillingService/BusinessService.json
 create mode 100644 data/as/6259713/egov-location/boundary-data.json
 create mode 100644 data/as/6259713/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259713/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259850/BillingService/BusinessService.json
 create mode 100644 data/as/6259850/egov-location/boundary-data.json
 create mode 100644 data/as/6259850/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259850/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259888/BillingService/BusinessService.json
 create mode 100644 data/as/6259888/egov-location/boundary-data.json
 create mode 100644 data/as/6259888/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259888/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259908/BillingService/BusinessService.json
 create mode 100644 data/as/6259908/egov-location/boundary-data.json
 create mode 100644 data/as/6259908/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259908/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259933/BillingService/BusinessService.json
 create mode 100644 data/as/6259933/egov-location/boundary-data.json
 create mode 100644 data/as/6259933/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259933/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6259975/BillingService/BusinessService.json
 create mode 100644 data/as/6259975/egov-location/boundary-data.json
 create mode 100644 data/as/6259975/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6259975/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6260027/BillingService/BusinessService.json
 create mode 100644 data/as/6260027/egov-location/boundary-data.json
 create mode 100644 data/as/6260027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6260027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6260773/BillingService/BusinessService.json
 create mode 100644 data/as/6260773/egov-location/boundary-data.json
 create mode 100644 data/as/6260773/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6260773/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6260844/BillingService/BusinessService.json
 create mode 100644 data/as/6260844/egov-location/boundary-data.json
 create mode 100644 data/as/6260844/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6260844/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6260923/BillingService/BusinessService.json
 create mode 100644 data/as/6260923/egov-location/boundary-data.json
 create mode 100644 data/as/6260923/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6260923/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6347427/BillingService/BusinessService.json
 create mode 100644 data/as/6347427/egov-location/boundary-data.json
 create mode 100644 data/as/6347427/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6347427/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6349286/BillingService/BusinessService.json
 create mode 100644 data/as/6349286/egov-location/boundary-data.json
 create mode 100644 data/as/6349286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6349286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6350831/BillingService/BusinessService.json
 create mode 100644 data/as/6350831/egov-location/boundary-data.json
 create mode 100644 data/as/6350831/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6350831/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6350854/BillingService/BusinessService.json
 create mode 100644 data/as/6350854/egov-location/boundary-data.json
 create mode 100644 data/as/6350854/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6350854/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385531/BillingService/BusinessService.json
 create mode 100644 data/as/6385531/egov-location/boundary-data.json
 create mode 100644 data/as/6385531/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385531/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385536/BillingService/BusinessService.json
 create mode 100644 data/as/6385536/egov-location/boundary-data.json
 create mode 100644 data/as/6385536/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385536/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385545/BillingService/BusinessService.json
 create mode 100644 data/as/6385545/egov-location/boundary-data.json
 create mode 100644 data/as/6385545/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385545/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385554/BillingService/BusinessService.json
 create mode 100644 data/as/6385554/egov-location/boundary-data.json
 create mode 100644 data/as/6385554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385567/BillingService/BusinessService.json
 create mode 100644 data/as/6385567/egov-location/boundary-data.json
 create mode 100644 data/as/6385567/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385567/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385905/BillingService/BusinessService.json
 create mode 100644 data/as/6385905/egov-location/boundary-data.json
 create mode 100644 data/as/6385905/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385905/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385915/BillingService/BusinessService.json
 create mode 100644 data/as/6385915/egov-location/boundary-data.json
 create mode 100644 data/as/6385915/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385915/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6385925/BillingService/BusinessService.json
 create mode 100644 data/as/6385925/egov-location/boundary-data.json
 create mode 100644 data/as/6385925/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6385925/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6502957/BillingService/BusinessService.json
 create mode 100644 data/as/6502957/egov-location/boundary-data.json
 create mode 100644 data/as/6502957/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6502957/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6503042/BillingService/BusinessService.json
 create mode 100644 data/as/6503042/egov-location/boundary-data.json
 create mode 100644 data/as/6503042/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6503042/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6515973/BillingService/BusinessService.json
 create mode 100644 data/as/6515973/egov-location/boundary-data.json
 create mode 100644 data/as/6515973/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6515973/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6516224/BillingService/BusinessService.json
 create mode 100644 data/as/6516224/egov-location/boundary-data.json
 create mode 100644 data/as/6516224/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6516224/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6517821/BillingService/BusinessService.json
 create mode 100644 data/as/6517821/egov-location/boundary-data.json
 create mode 100644 data/as/6517821/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6517821/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6520124/BillingService/BusinessService.json
 create mode 100644 data/as/6520124/egov-location/boundary-data.json
 create mode 100644 data/as/6520124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6520124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6524893/BillingService/BusinessService.json
 create mode 100644 data/as/6524893/egov-location/boundary-data.json
 create mode 100644 data/as/6524893/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6524893/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6524935/BillingService/BusinessService.json
 create mode 100644 data/as/6524935/egov-location/boundary-data.json
 create mode 100644 data/as/6524935/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6524935/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6526507/BillingService/BusinessService.json
 create mode 100644 data/as/6526507/egov-location/boundary-data.json
 create mode 100644 data/as/6526507/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6526507/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6526593/BillingService/BusinessService.json
 create mode 100644 data/as/6526593/egov-location/boundary-data.json
 create mode 100644 data/as/6526593/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6526593/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6526646/BillingService/BusinessService.json
 create mode 100644 data/as/6526646/egov-location/boundary-data.json
 create mode 100644 data/as/6526646/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6526646/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6852674/BillingService/BusinessService.json
 create mode 100644 data/as/6852674/egov-location/boundary-data.json
 create mode 100644 data/as/6852674/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6852674/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6858112/BillingService/BusinessService.json
 create mode 100644 data/as/6858112/egov-location/boundary-data.json
 create mode 100644 data/as/6858112/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6858112/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6858114/BillingService/BusinessService.json
 create mode 100644 data/as/6858114/egov-location/boundary-data.json
 create mode 100644 data/as/6858114/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6858114/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6861545/BillingService/BusinessService.json
 create mode 100644 data/as/6861545/egov-location/boundary-data.json
 create mode 100644 data/as/6861545/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6861545/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6861639/BillingService/BusinessService.json
 create mode 100644 data/as/6861639/egov-location/boundary-data.json
 create mode 100644 data/as/6861639/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6861639/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/6861642/BillingService/BusinessService.json
 create mode 100644 data/as/6861642/egov-location/boundary-data.json
 create mode 100644 data/as/6861642/ws-services-calculation/Penalty.json
 create mode 100644 data/as/6861642/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7341547/BillingService/BusinessService.json
 create mode 100644 data/as/7341547/egov-location/boundary-data.json
 create mode 100644 data/as/7341547/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7341547/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7343676/BillingService/BusinessService.json
 create mode 100644 data/as/7343676/egov-location/boundary-data.json
 create mode 100644 data/as/7343676/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7343676/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7347016/BillingService/BusinessService.json
 create mode 100644 data/as/7347016/egov-location/boundary-data.json
 create mode 100644 data/as/7347016/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7347016/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7347032/BillingService/BusinessService.json
 create mode 100644 data/as/7347032/egov-location/boundary-data.json
 create mode 100644 data/as/7347032/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7347032/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7347122/BillingService/BusinessService.json
 create mode 100644 data/as/7347122/egov-location/boundary-data.json
 create mode 100644 data/as/7347122/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7347122/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7637384/BillingService/BusinessService.json
 create mode 100644 data/as/7637384/egov-location/boundary-data.json
 create mode 100644 data/as/7637384/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7637384/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7893876/BillingService/BusinessService.json
 create mode 100644 data/as/7893876/egov-location/boundary-data.json
 create mode 100644 data/as/7893876/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7893876/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7894596/BillingService/BusinessService.json
 create mode 100644 data/as/7894596/egov-location/boundary-data.json
 create mode 100644 data/as/7894596/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7894596/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898565/BillingService/BusinessService.json
 create mode 100644 data/as/7898565/egov-location/boundary-data.json
 create mode 100644 data/as/7898565/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898565/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898568/BillingService/BusinessService.json
 create mode 100644 data/as/7898568/egov-location/boundary-data.json
 create mode 100644 data/as/7898568/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898568/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898570/BillingService/BusinessService.json
 create mode 100644 data/as/7898570/egov-location/boundary-data.json
 create mode 100644 data/as/7898570/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898570/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898571/BillingService/BusinessService.json
 create mode 100644 data/as/7898571/egov-location/boundary-data.json
 create mode 100644 data/as/7898571/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898571/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898573/BillingService/BusinessService.json
 create mode 100644 data/as/7898573/egov-location/boundary-data.json
 create mode 100644 data/as/7898573/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898573/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898574/BillingService/BusinessService.json
 create mode 100644 data/as/7898574/egov-location/boundary-data.json
 create mode 100644 data/as/7898574/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898574/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7898575/BillingService/BusinessService.json
 create mode 100644 data/as/7898575/egov-location/boundary-data.json
 create mode 100644 data/as/7898575/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7898575/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7971619/BillingService/BusinessService.json
 create mode 100644 data/as/7971619/egov-location/boundary-data.json
 create mode 100644 data/as/7971619/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7971619/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/7971866/BillingService/BusinessService.json
 create mode 100644 data/as/7971866/egov-location/boundary-data.json
 create mode 100644 data/as/7971866/ws-services-calculation/Penalty.json
 create mode 100644 data/as/7971866/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8036124/BillingService/BusinessService.json
 create mode 100644 data/as/8036124/egov-location/boundary-data.json
 create mode 100644 data/as/8036124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8036124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8036130/BillingService/BusinessService.json
 create mode 100644 data/as/8036130/egov-location/boundary-data.json
 create mode 100644 data/as/8036130/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8036130/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8131608/BillingService/BusinessService.json
 create mode 100644 data/as/8131608/egov-location/boundary-data.json
 create mode 100644 data/as/8131608/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8131608/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132115/BillingService/BusinessService.json
 create mode 100644 data/as/8132115/egov-location/boundary-data.json
 create mode 100644 data/as/8132115/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132115/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132124/BillingService/BusinessService.json
 create mode 100644 data/as/8132124/egov-location/boundary-data.json
 create mode 100644 data/as/8132124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132128/BillingService/BusinessService.json
 create mode 100644 data/as/8132128/egov-location/boundary-data.json
 create mode 100644 data/as/8132128/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132128/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132750/BillingService/BusinessService.json
 create mode 100644 data/as/8132750/egov-location/boundary-data.json
 create mode 100644 data/as/8132750/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132750/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132803/BillingService/BusinessService.json
 create mode 100644 data/as/8132803/egov-location/boundary-data.json
 create mode 100644 data/as/8132803/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132803/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132805/BillingService/BusinessService.json
 create mode 100644 data/as/8132805/egov-location/boundary-data.json
 create mode 100644 data/as/8132805/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132805/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132840/BillingService/BusinessService.json
 create mode 100644 data/as/8132840/egov-location/boundary-data.json
 create mode 100644 data/as/8132840/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132840/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132845/BillingService/BusinessService.json
 create mode 100644 data/as/8132845/egov-location/boundary-data.json
 create mode 100644 data/as/8132845/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132845/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132847/BillingService/BusinessService.json
 create mode 100644 data/as/8132847/egov-location/boundary-data.json
 create mode 100644 data/as/8132847/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132847/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132850/BillingService/BusinessService.json
 create mode 100644 data/as/8132850/egov-location/boundary-data.json
 create mode 100644 data/as/8132850/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132850/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132861/BillingService/BusinessService.json
 create mode 100644 data/as/8132861/egov-location/boundary-data.json
 create mode 100644 data/as/8132861/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132861/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132866/BillingService/BusinessService.json
 create mode 100644 data/as/8132866/egov-location/boundary-data.json
 create mode 100644 data/as/8132866/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132866/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132870/BillingService/BusinessService.json
 create mode 100644 data/as/8132870/egov-location/boundary-data.json
 create mode 100644 data/as/8132870/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132870/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8132892/BillingService/BusinessService.json
 create mode 100644 data/as/8132892/egov-location/boundary-data.json
 create mode 100644 data/as/8132892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8132892/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8137635/BillingService/BusinessService.json
 create mode 100644 data/as/8137635/egov-location/boundary-data.json
 create mode 100644 data/as/8137635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8137635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8138120/BillingService/BusinessService.json
 create mode 100644 data/as/8138120/egov-location/boundary-data.json
 create mode 100644 data/as/8138120/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8138120/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8138164/BillingService/BusinessService.json
 create mode 100644 data/as/8138164/egov-location/boundary-data.json
 create mode 100644 data/as/8138164/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8138164/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8140993/BillingService/BusinessService.json
 create mode 100644 data/as/8140993/egov-location/boundary-data.json
 create mode 100644 data/as/8140993/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8140993/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141044/BillingService/BusinessService.json
 create mode 100644 data/as/8141044/egov-location/boundary-data.json
 create mode 100644 data/as/8141044/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141044/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141062/BillingService/BusinessService.json
 create mode 100644 data/as/8141062/egov-location/boundary-data.json
 create mode 100644 data/as/8141062/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141062/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141109/BillingService/BusinessService.json
 create mode 100644 data/as/8141109/egov-location/boundary-data.json
 create mode 100644 data/as/8141109/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141109/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141554/BillingService/BusinessService.json
 create mode 100644 data/as/8141554/egov-location/boundary-data.json
 create mode 100644 data/as/8141554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141566/BillingService/BusinessService.json
 create mode 100644 data/as/8141566/egov-location/boundary-data.json
 create mode 100644 data/as/8141566/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141566/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141583/BillingService/BusinessService.json
 create mode 100644 data/as/8141583/egov-location/boundary-data.json
 create mode 100644 data/as/8141583/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141583/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141619/BillingService/BusinessService.json
 create mode 100644 data/as/8141619/egov-location/boundary-data.json
 create mode 100644 data/as/8141619/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141619/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141631/BillingService/BusinessService.json
 create mode 100644 data/as/8141631/egov-location/boundary-data.json
 create mode 100644 data/as/8141631/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141631/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141643/BillingService/BusinessService.json
 create mode 100644 data/as/8141643/egov-location/boundary-data.json
 create mode 100644 data/as/8141643/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141643/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141666/BillingService/BusinessService.json
 create mode 100644 data/as/8141666/egov-location/boundary-data.json
 create mode 100644 data/as/8141666/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141666/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141686/BillingService/BusinessService.json
 create mode 100644 data/as/8141686/egov-location/boundary-data.json
 create mode 100644 data/as/8141686/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141686/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141704/BillingService/BusinessService.json
 create mode 100644 data/as/8141704/egov-location/boundary-data.json
 create mode 100644 data/as/8141704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141716/BillingService/BusinessService.json
 create mode 100644 data/as/8141716/egov-location/boundary-data.json
 create mode 100644 data/as/8141716/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141716/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141733/BillingService/BusinessService.json
 create mode 100644 data/as/8141733/egov-location/boundary-data.json
 create mode 100644 data/as/8141733/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141733/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141761/BillingService/BusinessService.json
 create mode 100644 data/as/8141761/egov-location/boundary-data.json
 create mode 100644 data/as/8141761/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141761/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141785/BillingService/BusinessService.json
 create mode 100644 data/as/8141785/egov-location/boundary-data.json
 create mode 100644 data/as/8141785/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141785/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141831/BillingService/BusinessService.json
 create mode 100644 data/as/8141831/egov-location/boundary-data.json
 create mode 100644 data/as/8141831/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141831/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141923/BillingService/BusinessService.json
 create mode 100644 data/as/8141923/egov-location/boundary-data.json
 create mode 100644 data/as/8141923/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141923/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8141972/BillingService/BusinessService.json
 create mode 100644 data/as/8141972/egov-location/boundary-data.json
 create mode 100644 data/as/8141972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8141972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148068/BillingService/BusinessService.json
 create mode 100644 data/as/8148068/egov-location/boundary-data.json
 create mode 100644 data/as/8148068/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148068/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148081/BillingService/BusinessService.json
 create mode 100644 data/as/8148081/egov-location/boundary-data.json
 create mode 100644 data/as/8148081/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148081/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148097/BillingService/BusinessService.json
 create mode 100644 data/as/8148097/egov-location/boundary-data.json
 create mode 100644 data/as/8148097/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148097/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148105/BillingService/BusinessService.json
 create mode 100644 data/as/8148105/egov-location/boundary-data.json
 create mode 100644 data/as/8148105/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148105/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148116/BillingService/BusinessService.json
 create mode 100644 data/as/8148116/egov-location/boundary-data.json
 create mode 100644 data/as/8148116/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148116/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148125/BillingService/BusinessService.json
 create mode 100644 data/as/8148125/egov-location/boundary-data.json
 create mode 100644 data/as/8148125/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148125/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148137/BillingService/BusinessService.json
 create mode 100644 data/as/8148137/egov-location/boundary-data.json
 create mode 100644 data/as/8148137/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148137/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148159/BillingService/BusinessService.json
 create mode 100644 data/as/8148159/egov-location/boundary-data.json
 create mode 100644 data/as/8148159/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148159/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148173/BillingService/BusinessService.json
 create mode 100644 data/as/8148173/egov-location/boundary-data.json
 create mode 100644 data/as/8148173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148181/BillingService/BusinessService.json
 create mode 100644 data/as/8148181/egov-location/boundary-data.json
 create mode 100644 data/as/8148181/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148181/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148193/BillingService/BusinessService.json
 create mode 100644 data/as/8148193/egov-location/boundary-data.json
 create mode 100644 data/as/8148193/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148193/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148198/BillingService/BusinessService.json
 create mode 100644 data/as/8148198/egov-location/boundary-data.json
 create mode 100644 data/as/8148198/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148198/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8148257/BillingService/BusinessService.json
 create mode 100644 data/as/8148257/egov-location/boundary-data.json
 create mode 100644 data/as/8148257/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8148257/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153195/BillingService/BusinessService.json
 create mode 100644 data/as/8153195/egov-location/boundary-data.json
 create mode 100644 data/as/8153195/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153195/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153198/BillingService/BusinessService.json
 create mode 100644 data/as/8153198/egov-location/boundary-data.json
 create mode 100644 data/as/8153198/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153198/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153201/BillingService/BusinessService.json
 create mode 100644 data/as/8153201/egov-location/boundary-data.json
 create mode 100644 data/as/8153201/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153201/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153205/BillingService/BusinessService.json
 create mode 100644 data/as/8153205/egov-location/boundary-data.json
 create mode 100644 data/as/8153205/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153205/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153209/BillingService/BusinessService.json
 create mode 100644 data/as/8153209/egov-location/boundary-data.json
 create mode 100644 data/as/8153209/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153209/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153214/BillingService/BusinessService.json
 create mode 100644 data/as/8153214/egov-location/boundary-data.json
 create mode 100644 data/as/8153214/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153214/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153219/BillingService/BusinessService.json
 create mode 100644 data/as/8153219/egov-location/boundary-data.json
 create mode 100644 data/as/8153219/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153219/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153224/BillingService/BusinessService.json
 create mode 100644 data/as/8153224/egov-location/boundary-data.json
 create mode 100644 data/as/8153224/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153224/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153228/BillingService/BusinessService.json
 create mode 100644 data/as/8153228/egov-location/boundary-data.json
 create mode 100644 data/as/8153228/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153228/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153230/BillingService/BusinessService.json
 create mode 100644 data/as/8153230/egov-location/boundary-data.json
 create mode 100644 data/as/8153230/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153230/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153234/BillingService/BusinessService.json
 create mode 100644 data/as/8153234/egov-location/boundary-data.json
 create mode 100644 data/as/8153234/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153234/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153241/BillingService/BusinessService.json
 create mode 100644 data/as/8153241/egov-location/boundary-data.json
 create mode 100644 data/as/8153241/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153241/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153248/BillingService/BusinessService.json
 create mode 100644 data/as/8153248/egov-location/boundary-data.json
 create mode 100644 data/as/8153248/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153248/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153287/BillingService/BusinessService.json
 create mode 100644 data/as/8153287/egov-location/boundary-data.json
 create mode 100644 data/as/8153287/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153287/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153302/BillingService/BusinessService.json
 create mode 100644 data/as/8153302/egov-location/boundary-data.json
 create mode 100644 data/as/8153302/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153302/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153320/BillingService/BusinessService.json
 create mode 100644 data/as/8153320/egov-location/boundary-data.json
 create mode 100644 data/as/8153320/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153320/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153337/BillingService/BusinessService.json
 create mode 100644 data/as/8153337/egov-location/boundary-data.json
 create mode 100644 data/as/8153337/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153337/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153355/BillingService/BusinessService.json
 create mode 100644 data/as/8153355/egov-location/boundary-data.json
 create mode 100644 data/as/8153355/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153355/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153374/BillingService/BusinessService.json
 create mode 100644 data/as/8153374/egov-location/boundary-data.json
 create mode 100644 data/as/8153374/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153374/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153482/BillingService/BusinessService.json
 create mode 100644 data/as/8153482/egov-location/boundary-data.json
 create mode 100644 data/as/8153482/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153482/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153639/BillingService/BusinessService.json
 create mode 100644 data/as/8153639/egov-location/boundary-data.json
 create mode 100644 data/as/8153639/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153639/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153665/BillingService/BusinessService.json
 create mode 100644 data/as/8153665/egov-location/boundary-data.json
 create mode 100644 data/as/8153665/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153665/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153690/BillingService/BusinessService.json
 create mode 100644 data/as/8153690/egov-location/boundary-data.json
 create mode 100644 data/as/8153690/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153690/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153703/BillingService/BusinessService.json
 create mode 100644 data/as/8153703/egov-location/boundary-data.json
 create mode 100644 data/as/8153703/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153703/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153723/BillingService/BusinessService.json
 create mode 100644 data/as/8153723/egov-location/boundary-data.json
 create mode 100644 data/as/8153723/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153723/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153746/BillingService/BusinessService.json
 create mode 100644 data/as/8153746/egov-location/boundary-data.json
 create mode 100644 data/as/8153746/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153746/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153766/BillingService/BusinessService.json
 create mode 100644 data/as/8153766/egov-location/boundary-data.json
 create mode 100644 data/as/8153766/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153766/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153777/BillingService/BusinessService.json
 create mode 100644 data/as/8153777/egov-location/boundary-data.json
 create mode 100644 data/as/8153777/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153777/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153800/BillingService/BusinessService.json
 create mode 100644 data/as/8153800/egov-location/boundary-data.json
 create mode 100644 data/as/8153800/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153800/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153823/BillingService/BusinessService.json
 create mode 100644 data/as/8153823/egov-location/boundary-data.json
 create mode 100644 data/as/8153823/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153823/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8153844/BillingService/BusinessService.json
 create mode 100644 data/as/8153844/egov-location/boundary-data.json
 create mode 100644 data/as/8153844/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8153844/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8154251/BillingService/BusinessService.json
 create mode 100644 data/as/8154251/egov-location/boundary-data.json
 create mode 100644 data/as/8154251/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8154251/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155025/BillingService/BusinessService.json
 create mode 100644 data/as/8155025/egov-location/boundary-data.json
 create mode 100644 data/as/8155025/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155025/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155026/BillingService/BusinessService.json
 create mode 100644 data/as/8155026/egov-location/boundary-data.json
 create mode 100644 data/as/8155026/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155026/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155041/BillingService/BusinessService.json
 create mode 100644 data/as/8155041/egov-location/boundary-data.json
 create mode 100644 data/as/8155041/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155041/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155049/BillingService/BusinessService.json
 create mode 100644 data/as/8155049/egov-location/boundary-data.json
 create mode 100644 data/as/8155049/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155049/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155055/BillingService/BusinessService.json
 create mode 100644 data/as/8155055/egov-location/boundary-data.json
 create mode 100644 data/as/8155055/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155055/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155070/BillingService/BusinessService.json
 create mode 100644 data/as/8155070/egov-location/boundary-data.json
 create mode 100644 data/as/8155070/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155070/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155090/BillingService/BusinessService.json
 create mode 100644 data/as/8155090/egov-location/boundary-data.json
 create mode 100644 data/as/8155090/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155090/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155168/BillingService/BusinessService.json
 create mode 100644 data/as/8155168/egov-location/boundary-data.json
 create mode 100644 data/as/8155168/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155168/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155206/BillingService/BusinessService.json
 create mode 100644 data/as/8155206/egov-location/boundary-data.json
 create mode 100644 data/as/8155206/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155206/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155271/BillingService/BusinessService.json
 create mode 100644 data/as/8155271/egov-location/boundary-data.json
 create mode 100644 data/as/8155271/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155271/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155279/BillingService/BusinessService.json
 create mode 100644 data/as/8155279/egov-location/boundary-data.json
 create mode 100644 data/as/8155279/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155279/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8155344/BillingService/BusinessService.json
 create mode 100644 data/as/8155344/egov-location/boundary-data.json
 create mode 100644 data/as/8155344/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8155344/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156157/BillingService/BusinessService.json
 create mode 100644 data/as/8156157/egov-location/boundary-data.json
 create mode 100644 data/as/8156157/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156157/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156180/BillingService/BusinessService.json
 create mode 100644 data/as/8156180/egov-location/boundary-data.json
 create mode 100644 data/as/8156180/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156180/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156193/BillingService/BusinessService.json
 create mode 100644 data/as/8156193/egov-location/boundary-data.json
 create mode 100644 data/as/8156193/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156193/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156208/BillingService/BusinessService.json
 create mode 100644 data/as/8156208/egov-location/boundary-data.json
 create mode 100644 data/as/8156208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156216/BillingService/BusinessService.json
 create mode 100644 data/as/8156216/egov-location/boundary-data.json
 create mode 100644 data/as/8156216/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156216/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156220/BillingService/BusinessService.json
 create mode 100644 data/as/8156220/egov-location/boundary-data.json
 create mode 100644 data/as/8156220/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156220/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156223/BillingService/BusinessService.json
 create mode 100644 data/as/8156223/egov-location/boundary-data.json
 create mode 100644 data/as/8156223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156231/BillingService/BusinessService.json
 create mode 100644 data/as/8156231/egov-location/boundary-data.json
 create mode 100644 data/as/8156231/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156231/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156241/BillingService/BusinessService.json
 create mode 100644 data/as/8156241/egov-location/boundary-data.json
 create mode 100644 data/as/8156241/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156241/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156244/BillingService/BusinessService.json
 create mode 100644 data/as/8156244/egov-location/boundary-data.json
 create mode 100644 data/as/8156244/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156244/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156253/BillingService/BusinessService.json
 create mode 100644 data/as/8156253/egov-location/boundary-data.json
 create mode 100644 data/as/8156253/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156253/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156257/BillingService/BusinessService.json
 create mode 100644 data/as/8156257/egov-location/boundary-data.json
 create mode 100644 data/as/8156257/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156257/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156263/BillingService/BusinessService.json
 create mode 100644 data/as/8156263/egov-location/boundary-data.json
 create mode 100644 data/as/8156263/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156263/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156271/BillingService/BusinessService.json
 create mode 100644 data/as/8156271/egov-location/boundary-data.json
 create mode 100644 data/as/8156271/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156271/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156274/BillingService/BusinessService.json
 create mode 100644 data/as/8156274/egov-location/boundary-data.json
 create mode 100644 data/as/8156274/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156274/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156288/BillingService/BusinessService.json
 create mode 100644 data/as/8156288/egov-location/boundary-data.json
 create mode 100644 data/as/8156288/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156288/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156289/BillingService/BusinessService.json
 create mode 100644 data/as/8156289/egov-location/boundary-data.json
 create mode 100644 data/as/8156289/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156289/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156315/BillingService/BusinessService.json
 create mode 100644 data/as/8156315/egov-location/boundary-data.json
 create mode 100644 data/as/8156315/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156315/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156393/BillingService/BusinessService.json
 create mode 100644 data/as/8156393/egov-location/boundary-data.json
 create mode 100644 data/as/8156393/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156393/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156410/BillingService/BusinessService.json
 create mode 100644 data/as/8156410/egov-location/boundary-data.json
 create mode 100644 data/as/8156410/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156410/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156419/BillingService/BusinessService.json
 create mode 100644 data/as/8156419/egov-location/boundary-data.json
 create mode 100644 data/as/8156419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156424/BillingService/BusinessService.json
 create mode 100644 data/as/8156424/egov-location/boundary-data.json
 create mode 100644 data/as/8156424/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156424/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156430/BillingService/BusinessService.json
 create mode 100644 data/as/8156430/egov-location/boundary-data.json
 create mode 100644 data/as/8156430/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156430/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8156440/BillingService/BusinessService.json
 create mode 100644 data/as/8156440/egov-location/boundary-data.json
 create mode 100644 data/as/8156440/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8156440/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8157519/BillingService/BusinessService.json
 create mode 100644 data/as/8157519/egov-location/boundary-data.json
 create mode 100644 data/as/8157519/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8157519/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8157593/BillingService/BusinessService.json
 create mode 100644 data/as/8157593/egov-location/boundary-data.json
 create mode 100644 data/as/8157593/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8157593/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8157595/BillingService/BusinessService.json
 create mode 100644 data/as/8157595/egov-location/boundary-data.json
 create mode 100644 data/as/8157595/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8157595/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8157600/BillingService/BusinessService.json
 create mode 100644 data/as/8157600/egov-location/boundary-data.json
 create mode 100644 data/as/8157600/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8157600/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8157602/BillingService/BusinessService.json
 create mode 100644 data/as/8157602/egov-location/boundary-data.json
 create mode 100644 data/as/8157602/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8157602/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8157739/BillingService/BusinessService.json
 create mode 100644 data/as/8157739/egov-location/boundary-data.json
 create mode 100644 data/as/8157739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8157739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159295/BillingService/BusinessService.json
 create mode 100644 data/as/8159295/egov-location/boundary-data.json
 create mode 100644 data/as/8159295/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159295/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159645/BillingService/BusinessService.json
 create mode 100644 data/as/8159645/egov-location/boundary-data.json
 create mode 100644 data/as/8159645/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159645/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159671/BillingService/BusinessService.json
 create mode 100644 data/as/8159671/egov-location/boundary-data.json
 create mode 100644 data/as/8159671/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159671/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159680/BillingService/BusinessService.json
 create mode 100644 data/as/8159680/egov-location/boundary-data.json
 create mode 100644 data/as/8159680/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159680/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159691/BillingService/BusinessService.json
 create mode 100644 data/as/8159691/egov-location/boundary-data.json
 create mode 100644 data/as/8159691/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159691/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159704/BillingService/BusinessService.json
 create mode 100644 data/as/8159704/egov-location/boundary-data.json
 create mode 100644 data/as/8159704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159717/BillingService/BusinessService.json
 create mode 100644 data/as/8159717/egov-location/boundary-data.json
 create mode 100644 data/as/8159717/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159717/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159727/BillingService/BusinessService.json
 create mode 100644 data/as/8159727/egov-location/boundary-data.json
 create mode 100644 data/as/8159727/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159727/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159738/BillingService/BusinessService.json
 create mode 100644 data/as/8159738/egov-location/boundary-data.json
 create mode 100644 data/as/8159738/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159738/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159747/BillingService/BusinessService.json
 create mode 100644 data/as/8159747/egov-location/boundary-data.json
 create mode 100644 data/as/8159747/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159747/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159851/BillingService/BusinessService.json
 create mode 100644 data/as/8159851/egov-location/boundary-data.json
 create mode 100644 data/as/8159851/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159851/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159874/BillingService/BusinessService.json
 create mode 100644 data/as/8159874/egov-location/boundary-data.json
 create mode 100644 data/as/8159874/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159874/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159939/BillingService/BusinessService.json
 create mode 100644 data/as/8159939/egov-location/boundary-data.json
 create mode 100644 data/as/8159939/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159939/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159954/BillingService/BusinessService.json
 create mode 100644 data/as/8159954/egov-location/boundary-data.json
 create mode 100644 data/as/8159954/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159954/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8159963/BillingService/BusinessService.json
 create mode 100644 data/as/8159963/egov-location/boundary-data.json
 create mode 100644 data/as/8159963/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8159963/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160000/BillingService/BusinessService.json
 create mode 100644 data/as/8160000/egov-location/boundary-data.json
 create mode 100644 data/as/8160000/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160000/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160005/BillingService/BusinessService.json
 create mode 100644 data/as/8160005/egov-location/boundary-data.json
 create mode 100644 data/as/8160005/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160005/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160019/BillingService/BusinessService.json
 create mode 100644 data/as/8160019/egov-location/boundary-data.json
 create mode 100644 data/as/8160019/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160019/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160027/BillingService/BusinessService.json
 create mode 100644 data/as/8160027/egov-location/boundary-data.json
 create mode 100644 data/as/8160027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160039/BillingService/BusinessService.json
 create mode 100644 data/as/8160039/egov-location/boundary-data.json
 create mode 100644 data/as/8160039/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160039/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160338/BillingService/BusinessService.json
 create mode 100644 data/as/8160338/egov-location/boundary-data.json
 create mode 100644 data/as/8160338/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160338/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160353/BillingService/BusinessService.json
 create mode 100644 data/as/8160353/egov-location/boundary-data.json
 create mode 100644 data/as/8160353/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160353/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160367/BillingService/BusinessService.json
 create mode 100644 data/as/8160367/egov-location/boundary-data.json
 create mode 100644 data/as/8160367/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160367/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160379/BillingService/BusinessService.json
 create mode 100644 data/as/8160379/egov-location/boundary-data.json
 create mode 100644 data/as/8160379/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160379/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160387/BillingService/BusinessService.json
 create mode 100644 data/as/8160387/egov-location/boundary-data.json
 create mode 100644 data/as/8160387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160400/BillingService/BusinessService.json
 create mode 100644 data/as/8160400/egov-location/boundary-data.json
 create mode 100644 data/as/8160400/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160400/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160409/BillingService/BusinessService.json
 create mode 100644 data/as/8160409/egov-location/boundary-data.json
 create mode 100644 data/as/8160409/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160409/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160417/BillingService/BusinessService.json
 create mode 100644 data/as/8160417/egov-location/boundary-data.json
 create mode 100644 data/as/8160417/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160417/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160423/BillingService/BusinessService.json
 create mode 100644 data/as/8160423/egov-location/boundary-data.json
 create mode 100644 data/as/8160423/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160423/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160451/BillingService/BusinessService.json
 create mode 100644 data/as/8160451/egov-location/boundary-data.json
 create mode 100644 data/as/8160451/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160451/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160455/BillingService/BusinessService.json
 create mode 100644 data/as/8160455/egov-location/boundary-data.json
 create mode 100644 data/as/8160455/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160455/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160460/BillingService/BusinessService.json
 create mode 100644 data/as/8160460/egov-location/boundary-data.json
 create mode 100644 data/as/8160460/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160460/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160467/BillingService/BusinessService.json
 create mode 100644 data/as/8160467/egov-location/boundary-data.json
 create mode 100644 data/as/8160467/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160467/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160474/BillingService/BusinessService.json
 create mode 100644 data/as/8160474/egov-location/boundary-data.json
 create mode 100644 data/as/8160474/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160474/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160796/BillingService/BusinessService.json
 create mode 100644 data/as/8160796/egov-location/boundary-data.json
 create mode 100644 data/as/8160796/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160796/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160817/BillingService/BusinessService.json
 create mode 100644 data/as/8160817/egov-location/boundary-data.json
 create mode 100644 data/as/8160817/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160817/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160827/BillingService/BusinessService.json
 create mode 100644 data/as/8160827/egov-location/boundary-data.json
 create mode 100644 data/as/8160827/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160827/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160840/BillingService/BusinessService.json
 create mode 100644 data/as/8160840/egov-location/boundary-data.json
 create mode 100644 data/as/8160840/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160840/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160852/BillingService/BusinessService.json
 create mode 100644 data/as/8160852/egov-location/boundary-data.json
 create mode 100644 data/as/8160852/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160852/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160864/BillingService/BusinessService.json
 create mode 100644 data/as/8160864/egov-location/boundary-data.json
 create mode 100644 data/as/8160864/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160864/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160875/BillingService/BusinessService.json
 create mode 100644 data/as/8160875/egov-location/boundary-data.json
 create mode 100644 data/as/8160875/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160875/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160897/BillingService/BusinessService.json
 create mode 100644 data/as/8160897/egov-location/boundary-data.json
 create mode 100644 data/as/8160897/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160897/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8160910/BillingService/BusinessService.json
 create mode 100644 data/as/8160910/egov-location/boundary-data.json
 create mode 100644 data/as/8160910/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8160910/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161016/BillingService/BusinessService.json
 create mode 100644 data/as/8161016/egov-location/boundary-data.json
 create mode 100644 data/as/8161016/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161016/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161774/BillingService/BusinessService.json
 create mode 100644 data/as/8161774/egov-location/boundary-data.json
 create mode 100644 data/as/8161774/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161774/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161776/BillingService/BusinessService.json
 create mode 100644 data/as/8161776/egov-location/boundary-data.json
 create mode 100644 data/as/8161776/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161776/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161778/BillingService/BusinessService.json
 create mode 100644 data/as/8161778/egov-location/boundary-data.json
 create mode 100644 data/as/8161778/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161778/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161779/BillingService/BusinessService.json
 create mode 100644 data/as/8161779/egov-location/boundary-data.json
 create mode 100644 data/as/8161779/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161779/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161782/BillingService/BusinessService.json
 create mode 100644 data/as/8161782/egov-location/boundary-data.json
 create mode 100644 data/as/8161782/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161782/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161786/BillingService/BusinessService.json
 create mode 100644 data/as/8161786/egov-location/boundary-data.json
 create mode 100644 data/as/8161786/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161786/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161790/BillingService/BusinessService.json
 create mode 100644 data/as/8161790/egov-location/boundary-data.json
 create mode 100644 data/as/8161790/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161790/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161794/BillingService/BusinessService.json
 create mode 100644 data/as/8161794/egov-location/boundary-data.json
 create mode 100644 data/as/8161794/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161794/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161801/BillingService/BusinessService.json
 create mode 100644 data/as/8161801/egov-location/boundary-data.json
 create mode 100644 data/as/8161801/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161801/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161808/BillingService/BusinessService.json
 create mode 100644 data/as/8161808/egov-location/boundary-data.json
 create mode 100644 data/as/8161808/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161808/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161819/BillingService/BusinessService.json
 create mode 100644 data/as/8161819/egov-location/boundary-data.json
 create mode 100644 data/as/8161819/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161819/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161828/BillingService/BusinessService.json
 create mode 100644 data/as/8161828/egov-location/boundary-data.json
 create mode 100644 data/as/8161828/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161828/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161841/BillingService/BusinessService.json
 create mode 100644 data/as/8161841/egov-location/boundary-data.json
 create mode 100644 data/as/8161841/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161841/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161861/BillingService/BusinessService.json
 create mode 100644 data/as/8161861/egov-location/boundary-data.json
 create mode 100644 data/as/8161861/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161861/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161882/BillingService/BusinessService.json
 create mode 100644 data/as/8161882/egov-location/boundary-data.json
 create mode 100644 data/as/8161882/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161882/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161897/BillingService/BusinessService.json
 create mode 100644 data/as/8161897/egov-location/boundary-data.json
 create mode 100644 data/as/8161897/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161897/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161907/BillingService/BusinessService.json
 create mode 100644 data/as/8161907/egov-location/boundary-data.json
 create mode 100644 data/as/8161907/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161907/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161918/BillingService/BusinessService.json
 create mode 100644 data/as/8161918/egov-location/boundary-data.json
 create mode 100644 data/as/8161918/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161918/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161943/BillingService/BusinessService.json
 create mode 100644 data/as/8161943/egov-location/boundary-data.json
 create mode 100644 data/as/8161943/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161943/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161960/BillingService/BusinessService.json
 create mode 100644 data/as/8161960/egov-location/boundary-data.json
 create mode 100644 data/as/8161960/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161960/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161985/BillingService/BusinessService.json
 create mode 100644 data/as/8161985/egov-location/boundary-data.json
 create mode 100644 data/as/8161985/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161985/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8161998/BillingService/BusinessService.json
 create mode 100644 data/as/8161998/egov-location/boundary-data.json
 create mode 100644 data/as/8161998/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8161998/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8162013/BillingService/BusinessService.json
 create mode 100644 data/as/8162013/egov-location/boundary-data.json
 create mode 100644 data/as/8162013/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8162013/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8162057/BillingService/BusinessService.json
 create mode 100644 data/as/8162057/egov-location/boundary-data.json
 create mode 100644 data/as/8162057/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8162057/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8162079/BillingService/BusinessService.json
 create mode 100644 data/as/8162079/egov-location/boundary-data.json
 create mode 100644 data/as/8162079/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8162079/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8162125/BillingService/BusinessService.json
 create mode 100644 data/as/8162125/egov-location/boundary-data.json
 create mode 100644 data/as/8162125/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8162125/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8162166/BillingService/BusinessService.json
 create mode 100644 data/as/8162166/egov-location/boundary-data.json
 create mode 100644 data/as/8162166/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8162166/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171324/BillingService/BusinessService.json
 create mode 100644 data/as/8171324/egov-location/boundary-data.json
 create mode 100644 data/as/8171324/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171324/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171366/BillingService/BusinessService.json
 create mode 100644 data/as/8171366/egov-location/boundary-data.json
 create mode 100644 data/as/8171366/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171366/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171388/BillingService/BusinessService.json
 create mode 100644 data/as/8171388/egov-location/boundary-data.json
 create mode 100644 data/as/8171388/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171388/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171415/BillingService/BusinessService.json
 create mode 100644 data/as/8171415/egov-location/boundary-data.json
 create mode 100644 data/as/8171415/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171415/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171462/BillingService/BusinessService.json
 create mode 100644 data/as/8171462/egov-location/boundary-data.json
 create mode 100644 data/as/8171462/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171462/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171475/BillingService/BusinessService.json
 create mode 100644 data/as/8171475/egov-location/boundary-data.json
 create mode 100644 data/as/8171475/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171475/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171505/BillingService/BusinessService.json
 create mode 100644 data/as/8171505/egov-location/boundary-data.json
 create mode 100644 data/as/8171505/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171505/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171518/BillingService/BusinessService.json
 create mode 100644 data/as/8171518/egov-location/boundary-data.json
 create mode 100644 data/as/8171518/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171518/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171531/BillingService/BusinessService.json
 create mode 100644 data/as/8171531/egov-location/boundary-data.json
 create mode 100644 data/as/8171531/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171531/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171572/BillingService/BusinessService.json
 create mode 100644 data/as/8171572/egov-location/boundary-data.json
 create mode 100644 data/as/8171572/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171572/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171735/BillingService/BusinessService.json
 create mode 100644 data/as/8171735/egov-location/boundary-data.json
 create mode 100644 data/as/8171735/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171735/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171834/BillingService/BusinessService.json
 create mode 100644 data/as/8171834/egov-location/boundary-data.json
 create mode 100644 data/as/8171834/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171834/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171872/BillingService/BusinessService.json
 create mode 100644 data/as/8171872/egov-location/boundary-data.json
 create mode 100644 data/as/8171872/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171872/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171904/BillingService/BusinessService.json
 create mode 100644 data/as/8171904/egov-location/boundary-data.json
 create mode 100644 data/as/8171904/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171904/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171945/BillingService/BusinessService.json
 create mode 100644 data/as/8171945/egov-location/boundary-data.json
 create mode 100644 data/as/8171945/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171945/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171970/BillingService/BusinessService.json
 create mode 100644 data/as/8171970/egov-location/boundary-data.json
 create mode 100644 data/as/8171970/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171970/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8171989/BillingService/BusinessService.json
 create mode 100644 data/as/8171989/egov-location/boundary-data.json
 create mode 100644 data/as/8171989/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8171989/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8172016/BillingService/BusinessService.json
 create mode 100644 data/as/8172016/egov-location/boundary-data.json
 create mode 100644 data/as/8172016/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8172016/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8172071/BillingService/BusinessService.json
 create mode 100644 data/as/8172071/egov-location/boundary-data.json
 create mode 100644 data/as/8172071/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8172071/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175220/BillingService/BusinessService.json
 create mode 100644 data/as/8175220/egov-location/boundary-data.json
 create mode 100644 data/as/8175220/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175220/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175227/BillingService/BusinessService.json
 create mode 100644 data/as/8175227/egov-location/boundary-data.json
 create mode 100644 data/as/8175227/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175227/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175232/BillingService/BusinessService.json
 create mode 100644 data/as/8175232/egov-location/boundary-data.json
 create mode 100644 data/as/8175232/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175232/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175237/BillingService/BusinessService.json
 create mode 100644 data/as/8175237/egov-location/boundary-data.json
 create mode 100644 data/as/8175237/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175237/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175241/BillingService/BusinessService.json
 create mode 100644 data/as/8175241/egov-location/boundary-data.json
 create mode 100644 data/as/8175241/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175241/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175267/BillingService/BusinessService.json
 create mode 100644 data/as/8175267/egov-location/boundary-data.json
 create mode 100644 data/as/8175267/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175267/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8175588/BillingService/BusinessService.json
 create mode 100644 data/as/8175588/egov-location/boundary-data.json
 create mode 100644 data/as/8175588/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8175588/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8176558/BillingService/BusinessService.json
 create mode 100644 data/as/8176558/egov-location/boundary-data.json
 create mode 100644 data/as/8176558/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8176558/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8176578/BillingService/BusinessService.json
 create mode 100644 data/as/8176578/egov-location/boundary-data.json
 create mode 100644 data/as/8176578/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8176578/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8176607/BillingService/BusinessService.json
 create mode 100644 data/as/8176607/egov-location/boundary-data.json
 create mode 100644 data/as/8176607/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8176607/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8176627/BillingService/BusinessService.json
 create mode 100644 data/as/8176627/egov-location/boundary-data.json
 create mode 100644 data/as/8176627/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8176627/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8177941/BillingService/BusinessService.json
 create mode 100644 data/as/8177941/egov-location/boundary-data.json
 create mode 100644 data/as/8177941/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8177941/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178172/BillingService/BusinessService.json
 create mode 100644 data/as/8178172/egov-location/boundary-data.json
 create mode 100644 data/as/8178172/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178172/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178282/BillingService/BusinessService.json
 create mode 100644 data/as/8178282/egov-location/boundary-data.json
 create mode 100644 data/as/8178282/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178282/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178343/BillingService/BusinessService.json
 create mode 100644 data/as/8178343/egov-location/boundary-data.json
 create mode 100644 data/as/8178343/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178343/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178428/BillingService/BusinessService.json
 create mode 100644 data/as/8178428/egov-location/boundary-data.json
 create mode 100644 data/as/8178428/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178428/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178783/BillingService/BusinessService.json
 create mode 100644 data/as/8178783/egov-location/boundary-data.json
 create mode 100644 data/as/8178783/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178783/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178821/BillingService/BusinessService.json
 create mode 100644 data/as/8178821/egov-location/boundary-data.json
 create mode 100644 data/as/8178821/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178821/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178861/BillingService/BusinessService.json
 create mode 100644 data/as/8178861/egov-location/boundary-data.json
 create mode 100644 data/as/8178861/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178861/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178895/BillingService/BusinessService.json
 create mode 100644 data/as/8178895/egov-location/boundary-data.json
 create mode 100644 data/as/8178895/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178895/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8178929/BillingService/BusinessService.json
 create mode 100644 data/as/8178929/egov-location/boundary-data.json
 create mode 100644 data/as/8178929/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8178929/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8181830/BillingService/BusinessService.json
 create mode 100644 data/as/8181830/egov-location/boundary-data.json
 create mode 100644 data/as/8181830/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8181830/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8181848/BillingService/BusinessService.json
 create mode 100644 data/as/8181848/egov-location/boundary-data.json
 create mode 100644 data/as/8181848/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8181848/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8181875/BillingService/BusinessService.json
 create mode 100644 data/as/8181875/egov-location/boundary-data.json
 create mode 100644 data/as/8181875/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8181875/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8181912/BillingService/BusinessService.json
 create mode 100644 data/as/8181912/egov-location/boundary-data.json
 create mode 100644 data/as/8181912/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8181912/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8183542/BillingService/BusinessService.json
 create mode 100644 data/as/8183542/egov-location/boundary-data.json
 create mode 100644 data/as/8183542/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8183542/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8183933/BillingService/BusinessService.json
 create mode 100644 data/as/8183933/egov-location/boundary-data.json
 create mode 100644 data/as/8183933/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8183933/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8184246/BillingService/BusinessService.json
 create mode 100644 data/as/8184246/egov-location/boundary-data.json
 create mode 100644 data/as/8184246/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8184246/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8184256/BillingService/BusinessService.json
 create mode 100644 data/as/8184256/egov-location/boundary-data.json
 create mode 100644 data/as/8184256/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8184256/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8184539/BillingService/BusinessService.json
 create mode 100644 data/as/8184539/egov-location/boundary-data.json
 create mode 100644 data/as/8184539/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8184539/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185128/BillingService/BusinessService.json
 create mode 100644 data/as/8185128/egov-location/boundary-data.json
 create mode 100644 data/as/8185128/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185128/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185176/BillingService/BusinessService.json
 create mode 100644 data/as/8185176/egov-location/boundary-data.json
 create mode 100644 data/as/8185176/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185176/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185212/BillingService/BusinessService.json
 create mode 100644 data/as/8185212/egov-location/boundary-data.json
 create mode 100644 data/as/8185212/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185212/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185242/BillingService/BusinessService.json
 create mode 100644 data/as/8185242/egov-location/boundary-data.json
 create mode 100644 data/as/8185242/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185242/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185270/BillingService/BusinessService.json
 create mode 100644 data/as/8185270/egov-location/boundary-data.json
 create mode 100644 data/as/8185270/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185270/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185286/BillingService/BusinessService.json
 create mode 100644 data/as/8185286/egov-location/boundary-data.json
 create mode 100644 data/as/8185286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185317/BillingService/BusinessService.json
 create mode 100644 data/as/8185317/egov-location/boundary-data.json
 create mode 100644 data/as/8185317/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185317/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185354/BillingService/BusinessService.json
 create mode 100644 data/as/8185354/egov-location/boundary-data.json
 create mode 100644 data/as/8185354/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185354/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185387/BillingService/BusinessService.json
 create mode 100644 data/as/8185387/egov-location/boundary-data.json
 create mode 100644 data/as/8185387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185418/BillingService/BusinessService.json
 create mode 100644 data/as/8185418/egov-location/boundary-data.json
 create mode 100644 data/as/8185418/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185418/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185772/BillingService/BusinessService.json
 create mode 100644 data/as/8185772/egov-location/boundary-data.json
 create mode 100644 data/as/8185772/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185772/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185789/BillingService/BusinessService.json
 create mode 100644 data/as/8185789/egov-location/boundary-data.json
 create mode 100644 data/as/8185789/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185789/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185807/BillingService/BusinessService.json
 create mode 100644 data/as/8185807/egov-location/boundary-data.json
 create mode 100644 data/as/8185807/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185807/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8185824/BillingService/BusinessService.json
 create mode 100644 data/as/8185824/egov-location/boundary-data.json
 create mode 100644 data/as/8185824/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8185824/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8186783/BillingService/BusinessService.json
 create mode 100644 data/as/8186783/egov-location/boundary-data.json
 create mode 100644 data/as/8186783/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8186783/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8186803/BillingService/BusinessService.json
 create mode 100644 data/as/8186803/egov-location/boundary-data.json
 create mode 100644 data/as/8186803/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8186803/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187077/BillingService/BusinessService.json
 create mode 100644 data/as/8187077/egov-location/boundary-data.json
 create mode 100644 data/as/8187077/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187077/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187084/BillingService/BusinessService.json
 create mode 100644 data/as/8187084/egov-location/boundary-data.json
 create mode 100644 data/as/8187084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187090/BillingService/BusinessService.json
 create mode 100644 data/as/8187090/egov-location/boundary-data.json
 create mode 100644 data/as/8187090/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187090/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187146/BillingService/BusinessService.json
 create mode 100644 data/as/8187146/egov-location/boundary-data.json
 create mode 100644 data/as/8187146/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187146/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187153/BillingService/BusinessService.json
 create mode 100644 data/as/8187153/egov-location/boundary-data.json
 create mode 100644 data/as/8187153/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187153/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187157/BillingService/BusinessService.json
 create mode 100644 data/as/8187157/egov-location/boundary-data.json
 create mode 100644 data/as/8187157/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187157/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187165/BillingService/BusinessService.json
 create mode 100644 data/as/8187165/egov-location/boundary-data.json
 create mode 100644 data/as/8187165/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187165/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/5547867/BillingService/BusinessService.json b/data/as/5547867/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19ddac7672
--- /dev/null
+++ b/data/as/5547867/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547867",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547867/egov-location/boundary-data.json b/data/as/5547867/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba11925acf
--- /dev/null
+++ b/data/as/5547867/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547867",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUDAMGHAT PWSS",
+                "localname": "GUDAMGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUDAMGHAT PWSS",
+                        "localname": "GUDAMGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUDAMGHAT PWSS",
+                "localname": "GUDAMGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUDAMGHAT PWSS",
+                        "localname": "GUDAMGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547867/ws-services-calculation/Penalty.json b/data/as/5547867/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..58cc535c79
--- /dev/null
+++ b/data/as/5547867/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547867",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547867/ws-services-calculation/WCBillingSlab.json b/data/as/5547867/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7922c4520b
--- /dev/null
+++ b/data/as/5547867/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547867",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547870/BillingService/BusinessService.json b/data/as/5547870/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ba4ed1e8bd
--- /dev/null
+++ b/data/as/5547870/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547870",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547870/egov-location/boundary-data.json b/data/as/5547870/egov-location/boundary-data.json
new file mode 100644
index 0000000000..998a66d7b4
--- /dev/null
+++ b/data/as/5547870/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547870",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAPAM PWSS",
+                "localname": "NAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAPAM PWSS",
+                        "localname": "NAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAPAM PWSS",
+                "localname": "NAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAPAM PWSS",
+                        "localname": "NAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547870/ws-services-calculation/Penalty.json b/data/as/5547870/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b10e5093af
--- /dev/null
+++ b/data/as/5547870/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547870",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547870/ws-services-calculation/WCBillingSlab.json b/data/as/5547870/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc056a96d2
--- /dev/null
+++ b/data/as/5547870/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547870",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547877/BillingService/BusinessService.json b/data/as/5547877/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f1aa1c322
--- /dev/null
+++ b/data/as/5547877/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547877",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547877/egov-location/boundary-data.json b/data/as/5547877/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1bf987390b
--- /dev/null
+++ b/data/as/5547877/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547877",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLABARI PWSS",
+                "localname": "DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLABARI PWSS",
+                        "localname": "DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLABARI PWSS",
+                "localname": "DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLABARI PWSS",
+                        "localname": "DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547877/ws-services-calculation/Penalty.json b/data/as/5547877/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f8ecb64903
--- /dev/null
+++ b/data/as/5547877/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547877",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547877/ws-services-calculation/WCBillingSlab.json b/data/as/5547877/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb064f9ed0
--- /dev/null
+++ b/data/as/5547877/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547877",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547899/BillingService/BusinessService.json b/data/as/5547899/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e919f4e66
--- /dev/null
+++ b/data/as/5547899/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5547899",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547899/egov-location/boundary-data.json b/data/as/5547899/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6bb535630e
--- /dev/null
+++ b/data/as/5547899/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5547899",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "URIUMGURI PWSS",
+                "localname": "URIUMGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547899",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "URIUMGURI PWSS",
+                        "localname": "URIUMGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "URIUMGURI PWSS",
+                "localname": "URIUMGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5547899",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "URIUMGURI PWSS",
+                        "localname": "URIUMGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547899/ws-services-calculation/Penalty.json b/data/as/5547899/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ffe2a68767
--- /dev/null
+++ b/data/as/5547899/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5547899",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5547899/ws-services-calculation/WCBillingSlab.json b/data/as/5547899/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a08b7bae69
--- /dev/null
+++ b/data/as/5547899/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5547899",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548125/BillingService/BusinessService.json b/data/as/5548125/BillingService/BusinessService.json
new file mode 100644
index 0000000000..50b759a204
--- /dev/null
+++ b/data/as/5548125/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5548125",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548125/egov-location/boundary-data.json b/data/as/5548125/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be9cd65afa
--- /dev/null
+++ b/data/as/5548125/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5548125",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGHSUNG BALITIKA PWSS",
+                "localname": "BAGHSUNG BALITIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGHSUNG BALITIKA PWSS",
+                        "localname": "BAGHSUNG BALITIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGHSUNG BALITIKA PWSS",
+                "localname": "BAGHSUNG BALITIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGHSUNG BALITIKA PWSS",
+                        "localname": "BAGHSUNG BALITIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548125/ws-services-calculation/Penalty.json b/data/as/5548125/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4babfe3d55
--- /dev/null
+++ b/data/as/5548125/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5548125",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548125/ws-services-calculation/WCBillingSlab.json b/data/as/5548125/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a0ba22173b
--- /dev/null
+++ b/data/as/5548125/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5548125",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548175/BillingService/BusinessService.json b/data/as/5548175/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb1607cf2d
--- /dev/null
+++ b/data/as/5548175/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5548175",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548175/egov-location/boundary-data.json b/data/as/5548175/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f2b3cea17
--- /dev/null
+++ b/data/as/5548175/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5548175",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMDHARA PWSS",
+                "localname": "SAMDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMDHARA PWSS",
+                        "localname": "SAMDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMDHARA PWSS",
+                "localname": "SAMDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMDHARA PWSS",
+                        "localname": "SAMDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548175/ws-services-calculation/Penalty.json b/data/as/5548175/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3e979fa31
--- /dev/null
+++ b/data/as/5548175/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5548175",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548175/ws-services-calculation/WCBillingSlab.json b/data/as/5548175/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5e3ab71e0
--- /dev/null
+++ b/data/as/5548175/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5548175",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548215/BillingService/BusinessService.json b/data/as/5548215/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a16ab1c5d7
--- /dev/null
+++ b/data/as/5548215/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5548215",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548215/egov-location/boundary-data.json b/data/as/5548215/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43f64f1517
--- /dev/null
+++ b/data/as/5548215/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5548215",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRITOLI PWSS",
+                "localname": "SINGRITOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548215",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRITOLI PWSS",
+                        "localname": "SINGRITOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRITOLI PWSS",
+                "localname": "SINGRITOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548215",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRITOLI PWSS",
+                        "localname": "SINGRITOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548215/ws-services-calculation/Penalty.json b/data/as/5548215/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..36409fdab9
--- /dev/null
+++ b/data/as/5548215/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5548215",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548215/ws-services-calculation/WCBillingSlab.json b/data/as/5548215/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea8f3f4291
--- /dev/null
+++ b/data/as/5548215/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5548215",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548227/BillingService/BusinessService.json b/data/as/5548227/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f81e1a20d
--- /dev/null
+++ b/data/as/5548227/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5548227",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548227/egov-location/boundary-data.json b/data/as/5548227/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b240c2eccb
--- /dev/null
+++ b/data/as/5548227/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5548227",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASSIGAON PWSS",
+                "localname": "PASSIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASSIGAON PWSS",
+                        "localname": "PASSIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASSIGAON PWSS",
+                "localname": "PASSIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASSIGAON PWSS",
+                        "localname": "PASSIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548227/ws-services-calculation/Penalty.json b/data/as/5548227/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1564573908
--- /dev/null
+++ b/data/as/5548227/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5548227",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548227/ws-services-calculation/WCBillingSlab.json b/data/as/5548227/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..26e69a5d06
--- /dev/null
+++ b/data/as/5548227/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5548227",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548257/BillingService/BusinessService.json b/data/as/5548257/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86e6a00687
--- /dev/null
+++ b/data/as/5548257/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5548257",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548257/egov-location/boundary-data.json b/data/as/5548257/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ebf6d6a8d8
--- /dev/null
+++ b/data/as/5548257/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5548257",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KORSONTOLA PWSS",
+                "localname": "KORSONTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KORSONTOLA PWSS",
+                        "localname": "KORSONTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KORSONTOLA PWSS",
+                "localname": "KORSONTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KORSONTOLA PWSS",
+                        "localname": "KORSONTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548257/ws-services-calculation/Penalty.json b/data/as/5548257/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..07a8f10c0d
--- /dev/null
+++ b/data/as/5548257/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5548257",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548257/ws-services-calculation/WCBillingSlab.json b/data/as/5548257/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10f8bcb12f
--- /dev/null
+++ b/data/as/5548257/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5548257",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548360/BillingService/BusinessService.json b/data/as/5548360/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bfd65935a0
--- /dev/null
+++ b/data/as/5548360/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5548360",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548360/egov-location/boundary-data.json b/data/as/5548360/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3d8587f9af
--- /dev/null
+++ b/data/as/5548360/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5548360",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGELIMORA PWSS",
+                "localname": "CHENGELIMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548360",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGELIMORA PWSS",
+                        "localname": "CHENGELIMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGELIMORA PWSS",
+                "localname": "CHENGELIMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5548360",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGELIMORA PWSS",
+                        "localname": "CHENGELIMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548360/ws-services-calculation/Penalty.json b/data/as/5548360/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..22cdc6806d
--- /dev/null
+++ b/data/as/5548360/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5548360",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5548360/ws-services-calculation/WCBillingSlab.json b/data/as/5548360/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..35ddccc03b
--- /dev/null
+++ b/data/as/5548360/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5548360",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550489/BillingService/BusinessService.json b/data/as/5550489/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f2bbc8e027
--- /dev/null
+++ b/data/as/5550489/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5550489",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550489/egov-location/boundary-data.json b/data/as/5550489/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e8338f4f9
--- /dev/null
+++ b/data/as/5550489/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5550489",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                "localname": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5550489",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                        "localname": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                "localname": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5550489",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                        "localname": "RETROFITTING OF MATIKHUNDA PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550489/ws-services-calculation/Penalty.json b/data/as/5550489/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6be25f2e4b
--- /dev/null
+++ b/data/as/5550489/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5550489",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550489/ws-services-calculation/WCBillingSlab.json b/data/as/5550489/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba8a8aa9c0
--- /dev/null
+++ b/data/as/5550489/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5550489",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550585/BillingService/BusinessService.json b/data/as/5550585/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c979c5c726
--- /dev/null
+++ b/data/as/5550585/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5550585",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550585/egov-location/boundary-data.json b/data/as/5550585/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce2b6e966b
--- /dev/null
+++ b/data/as/5550585/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5550585",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIMARI BENGALI PWSS",
+                "localname": "SINGIMARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5550585",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIMARI BENGALI PWSS",
+                        "localname": "SINGIMARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIMARI BENGALI PWSS",
+                "localname": "SINGIMARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5550585",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIMARI BENGALI PWSS",
+                        "localname": "SINGIMARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550585/ws-services-calculation/Penalty.json b/data/as/5550585/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..785af25bd7
--- /dev/null
+++ b/data/as/5550585/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5550585",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5550585/ws-services-calculation/WCBillingSlab.json b/data/as/5550585/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8971776aa3
--- /dev/null
+++ b/data/as/5550585/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5550585",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552472/BillingService/BusinessService.json b/data/as/5552472/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aeb9ce4b31
--- /dev/null
+++ b/data/as/5552472/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5552472",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552472/egov-location/boundary-data.json b/data/as/5552472/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f940615650
--- /dev/null
+++ b/data/as/5552472/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5552472",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE PWSS",
+                "localname": "SESSA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE PWSS",
+                        "localname": "SESSA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE PWSS",
+                "localname": "SESSA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE PWSS",
+                        "localname": "SESSA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552472/ws-services-calculation/Penalty.json b/data/as/5552472/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..192d2a1310
--- /dev/null
+++ b/data/as/5552472/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5552472",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552472/ws-services-calculation/WCBillingSlab.json b/data/as/5552472/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e5a53f8f2e
--- /dev/null
+++ b/data/as/5552472/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5552472",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552515/BillingService/BusinessService.json b/data/as/5552515/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bf63f2830a
--- /dev/null
+++ b/data/as/5552515/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5552515",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552515/egov-location/boundary-data.json b/data/as/5552515/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f34c587053
--- /dev/null
+++ b/data/as/5552515/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5552515",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE PWSS",
+                "localname": "BARJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE PWSS",
+                        "localname": "BARJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE PWSS",
+                "localname": "BARJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE PWSS",
+                        "localname": "BARJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552515/ws-services-calculation/Penalty.json b/data/as/5552515/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9707852ab
--- /dev/null
+++ b/data/as/5552515/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5552515",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552515/ws-services-calculation/WCBillingSlab.json b/data/as/5552515/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd214fcf43
--- /dev/null
+++ b/data/as/5552515/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5552515",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552526/BillingService/BusinessService.json b/data/as/5552526/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6bddda173f
--- /dev/null
+++ b/data/as/5552526/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5552526",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552526/egov-location/boundary-data.json b/data/as/5552526/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2f211e946f
--- /dev/null
+++ b/data/as/5552526/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5552526",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAJULI TE PWSS",
+                "localname": "SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAJULI TE PWSS",
+                        "localname": "SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAJULI TE PWSS",
+                "localname": "SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAJULI TE PWSS",
+                        "localname": "SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552526/ws-services-calculation/Penalty.json b/data/as/5552526/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b981999ede
--- /dev/null
+++ b/data/as/5552526/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5552526",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552526/ws-services-calculation/WCBillingSlab.json b/data/as/5552526/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e369ab2365
--- /dev/null
+++ b/data/as/5552526/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5552526",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552540/BillingService/BusinessService.json b/data/as/5552540/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85ea44be98
--- /dev/null
+++ b/data/as/5552540/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5552540",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552540/egov-location/boundary-data.json b/data/as/5552540/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97022cd1af
--- /dev/null
+++ b/data/as/5552540/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5552540",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHUMARI PWSS",
+                "localname": "BAHUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552540",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHUMARI PWSS",
+                        "localname": "BAHUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHUMARI PWSS",
+                "localname": "BAHUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5552540",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHUMARI PWSS",
+                        "localname": "BAHUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552540/ws-services-calculation/Penalty.json b/data/as/5552540/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a9bac26b7
--- /dev/null
+++ b/data/as/5552540/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5552540",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5552540/ws-services-calculation/WCBillingSlab.json b/data/as/5552540/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a940dd7c7
--- /dev/null
+++ b/data/as/5552540/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5552540",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5557007/BillingService/BusinessService.json b/data/as/5557007/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2893049459
--- /dev/null
+++ b/data/as/5557007/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5557007",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5557007/egov-location/boundary-data.json b/data/as/5557007/egov-location/boundary-data.json
new file mode 100644
index 0000000000..21e57496fb
--- /dev/null
+++ b/data/as/5557007/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5557007",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAIJAN PWSS",
+                "localname": "DIKORAIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5557007",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAIJAN PWSS",
+                        "localname": "DIKORAIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAIJAN PWSS",
+                "localname": "DIKORAIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5557007",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAIJAN PWSS",
+                        "localname": "DIKORAIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5557007/ws-services-calculation/Penalty.json b/data/as/5557007/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5ed35c392
--- /dev/null
+++ b/data/as/5557007/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5557007",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5557007/ws-services-calculation/WCBillingSlab.json b/data/as/5557007/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9e1888c65
--- /dev/null
+++ b/data/as/5557007/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5557007",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5568316/BillingService/BusinessService.json b/data/as/5568316/BillingService/BusinessService.json
new file mode 100644
index 0000000000..22e368c934
--- /dev/null
+++ b/data/as/5568316/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5568316",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5568316/egov-location/boundary-data.json b/data/as/5568316/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be2de64c99
--- /dev/null
+++ b/data/as/5568316/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5568316",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUJRUK MANIKPUR PWSS",
+                "localname": "BUJRUK MANIKPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5568316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUJRUK MANIKPUR PWSS",
+                        "localname": "BUJRUK MANIKPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUJRUK MANIKPUR PWSS",
+                "localname": "BUJRUK MANIKPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5568316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUJRUK MANIKPUR PWSS",
+                        "localname": "BUJRUK MANIKPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5568316/ws-services-calculation/Penalty.json b/data/as/5568316/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..22b213e8ee
--- /dev/null
+++ b/data/as/5568316/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5568316",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5568316/ws-services-calculation/WCBillingSlab.json b/data/as/5568316/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e3c80e036
--- /dev/null
+++ b/data/as/5568316/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5568316",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569781/BillingService/BusinessService.json b/data/as/5569781/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7597a169cc
--- /dev/null
+++ b/data/as/5569781/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5569781",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569781/egov-location/boundary-data.json b/data/as/5569781/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a2b551cbdd
--- /dev/null
+++ b/data/as/5569781/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5569781",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LABARIGAON P.W.S.S",
+                "localname": "LABARIGAON P.W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5569781",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LABARIGAON P.W.S.S",
+                        "localname": "LABARIGAON P.W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LABARIGAON P.W.S.S",
+                "localname": "LABARIGAON P.W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5569781",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LABARIGAON P.W.S.S",
+                        "localname": "LABARIGAON P.W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569781/ws-services-calculation/Penalty.json b/data/as/5569781/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..235697d72e
--- /dev/null
+++ b/data/as/5569781/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5569781",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569781/ws-services-calculation/WCBillingSlab.json b/data/as/5569781/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..473519c362
--- /dev/null
+++ b/data/as/5569781/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5569781",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569877/BillingService/BusinessService.json b/data/as/5569877/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79b49d2344
--- /dev/null
+++ b/data/as/5569877/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5569877",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569877/egov-location/boundary-data.json b/data/as/5569877/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dea534d5b5
--- /dev/null
+++ b/data/as/5569877/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5569877",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARUN T.E  P.W.S.S",
+                "localname": "ARUN T.E  P.W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5569877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARUN T.E  P.W.S.S",
+                        "localname": "ARUN T.E  P.W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARUN T.E  P.W.S.S",
+                "localname": "ARUN T.E  P.W.S.S",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5569877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARUN T.E  P.W.S.S",
+                        "localname": "ARUN T.E  P.W.S.S",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569877/ws-services-calculation/Penalty.json b/data/as/5569877/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..726d5f6f41
--- /dev/null
+++ b/data/as/5569877/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5569877",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5569877/ws-services-calculation/WCBillingSlab.json b/data/as/5569877/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b4ba74928
--- /dev/null
+++ b/data/as/5569877/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5569877",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571455/BillingService/BusinessService.json b/data/as/5571455/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0dc96eb2a4
--- /dev/null
+++ b/data/as/5571455/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5571455",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571455/egov-location/boundary-data.json b/data/as/5571455/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ad0595583
--- /dev/null
+++ b/data/as/5571455/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5571455",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORABHUYAN PWSS",
+                "localname": "BORABHUYAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORABHUYAN PWSS",
+                        "localname": "BORABHUYAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORABHUYAN PWSS",
+                "localname": "BORABHUYAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORABHUYAN PWSS",
+                        "localname": "BORABHUYAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571455/ws-services-calculation/Penalty.json b/data/as/5571455/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e4730fde8
--- /dev/null
+++ b/data/as/5571455/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5571455",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571455/ws-services-calculation/WCBillingSlab.json b/data/as/5571455/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b9b1985cde
--- /dev/null
+++ b/data/as/5571455/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5571455",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571465/BillingService/BusinessService.json b/data/as/5571465/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3151c9519c
--- /dev/null
+++ b/data/as/5571465/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5571465",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571465/egov-location/boundary-data.json b/data/as/5571465/egov-location/boundary-data.json
new file mode 100644
index 0000000000..384ef9394a
--- /dev/null
+++ b/data/as/5571465/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5571465",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ITAKHALA PWSS",
+                "localname": "ITAKHALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ITAKHALA PWSS",
+                        "localname": "ITAKHALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ITAKHALA PWSS",
+                "localname": "ITAKHALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ITAKHALA PWSS",
+                        "localname": "ITAKHALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571465/ws-services-calculation/Penalty.json b/data/as/5571465/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f0ca0f0f29
--- /dev/null
+++ b/data/as/5571465/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5571465",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571465/ws-services-calculation/WCBillingSlab.json b/data/as/5571465/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2997cce024
--- /dev/null
+++ b/data/as/5571465/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5571465",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571476/BillingService/BusinessService.json b/data/as/5571476/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ec74e2d16
--- /dev/null
+++ b/data/as/5571476/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5571476",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571476/egov-location/boundary-data.json b/data/as/5571476/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1441819355
--- /dev/null
+++ b/data/as/5571476/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5571476",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKARAIPAM PWSS",
+                "localname": "DIKARAIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571476",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKARAIPAM PWSS",
+                        "localname": "DIKARAIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKARAIPAM PWSS",
+                "localname": "DIKARAIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571476",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKARAIPAM PWSS",
+                        "localname": "DIKARAIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571476/ws-services-calculation/Penalty.json b/data/as/5571476/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d1b34847cb
--- /dev/null
+++ b/data/as/5571476/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5571476",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571476/ws-services-calculation/WCBillingSlab.json b/data/as/5571476/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f23a94379
--- /dev/null
+++ b/data/as/5571476/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5571476",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571515/BillingService/BusinessService.json b/data/as/5571515/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ccb21c9df
--- /dev/null
+++ b/data/as/5571515/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5571515",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571515/egov-location/boundary-data.json b/data/as/5571515/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8139dc6dac
--- /dev/null
+++ b/data/as/5571515/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5571515",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKARAI TE NLR 42/42 PWSS",
+                "localname": "DIKARAI TE NLR 42/42 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKARAI TE NLR 42/42 PWSS",
+                        "localname": "DIKARAI TE NLR 42/42 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKARAI TE NLR 42/42 PWSS",
+                "localname": "DIKARAI TE NLR 42/42 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5571515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKARAI TE NLR 42/42 PWSS",
+                        "localname": "DIKARAI TE NLR 42/42 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571515/ws-services-calculation/Penalty.json b/data/as/5571515/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46056a57ca
--- /dev/null
+++ b/data/as/5571515/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5571515",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5571515/ws-services-calculation/WCBillingSlab.json b/data/as/5571515/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..488b53f619
--- /dev/null
+++ b/data/as/5571515/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5571515",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573206/BillingService/BusinessService.json b/data/as/5573206/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee7e322b5c
--- /dev/null
+++ b/data/as/5573206/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5573206",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573206/egov-location/boundary-data.json b/data/as/5573206/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3006571df9
--- /dev/null
+++ b/data/as/5573206/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5573206",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIGAON PWSS",
+                "localname": "PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5573206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIGAON PWSS",
+                        "localname": "PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIGAON PWSS",
+                "localname": "PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5573206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIGAON PWSS",
+                        "localname": "PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573206/ws-services-calculation/Penalty.json b/data/as/5573206/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b9a49f93d
--- /dev/null
+++ b/data/as/5573206/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5573206",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573206/ws-services-calculation/WCBillingSlab.json b/data/as/5573206/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dee66ef1d8
--- /dev/null
+++ b/data/as/5573206/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5573206",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573300/BillingService/BusinessService.json b/data/as/5573300/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e8ac9930e
--- /dev/null
+++ b/data/as/5573300/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5573300",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573300/egov-location/boundary-data.json b/data/as/5573300/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e1d81323c1
--- /dev/null
+++ b/data/as/5573300/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5573300",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKERIGAON PWSS",
+                "localname": "DHEKERIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5573300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKERIGAON PWSS",
+                        "localname": "DHEKERIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKERIGAON PWSS",
+                "localname": "DHEKERIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5573300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKERIGAON PWSS",
+                        "localname": "DHEKERIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573300/ws-services-calculation/Penalty.json b/data/as/5573300/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37fa441d90
--- /dev/null
+++ b/data/as/5573300/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5573300",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5573300/ws-services-calculation/WCBillingSlab.json b/data/as/5573300/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e63fef40db
--- /dev/null
+++ b/data/as/5573300/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5573300",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5599446/BillingService/BusinessService.json b/data/as/5599446/BillingService/BusinessService.json
new file mode 100644
index 0000000000..678a27561a
--- /dev/null
+++ b/data/as/5599446/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5599446",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5599446/egov-location/boundary-data.json b/data/as/5599446/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2f0b9b3374
--- /dev/null
+++ b/data/as/5599446/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5599446",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIPARA PWSS",
+                "localname": "TELIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5599446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIPARA PWSS",
+                        "localname": "TELIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIPARA PWSS",
+                "localname": "TELIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5599446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIPARA PWSS",
+                        "localname": "TELIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5599446/ws-services-calculation/Penalty.json b/data/as/5599446/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc0d4a5e50
--- /dev/null
+++ b/data/as/5599446/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5599446",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5599446/ws-services-calculation/WCBillingSlab.json b/data/as/5599446/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..64fda2aa4b
--- /dev/null
+++ b/data/as/5599446/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5599446",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5641311/BillingService/BusinessService.json b/data/as/5641311/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ed7b5caa1
--- /dev/null
+++ b/data/as/5641311/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5641311",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5641311/egov-location/boundary-data.json b/data/as/5641311/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8fa3844f89
--- /dev/null
+++ b/data/as/5641311/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5641311",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOULMARI KALYANPUR PWSS",
+                "localname": "SOULMARI KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5641311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOULMARI KALYANPUR PWSS",
+                        "localname": "SOULMARI KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOULMARI KALYANPUR PWSS",
+                "localname": "SOULMARI KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5641311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOULMARI KALYANPUR PWSS",
+                        "localname": "SOULMARI KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5641311/ws-services-calculation/Penalty.json b/data/as/5641311/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..963feec236
--- /dev/null
+++ b/data/as/5641311/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5641311",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5641311/ws-services-calculation/WCBillingSlab.json b/data/as/5641311/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..566816c27e
--- /dev/null
+++ b/data/as/5641311/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5641311",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5803027/BillingService/BusinessService.json b/data/as/5803027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98212bc110
--- /dev/null
+++ b/data/as/5803027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5803027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5803027/egov-location/boundary-data.json b/data/as/5803027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..448fb3dde5
--- /dev/null
+++ b/data/as/5803027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5803027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLAI PWSS",
+                "localname": "CHAPLAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5803027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLAI PWSS",
+                        "localname": "CHAPLAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLAI PWSS",
+                "localname": "CHAPLAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5803027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLAI PWSS",
+                        "localname": "CHAPLAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5803027/ws-services-calculation/Penalty.json b/data/as/5803027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e55561bacb
--- /dev/null
+++ b/data/as/5803027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5803027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5803027/ws-services-calculation/WCBillingSlab.json b/data/as/5803027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8b9bc5b7e
--- /dev/null
+++ b/data/as/5803027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5803027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5849473/BillingService/BusinessService.json b/data/as/5849473/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c992547542
--- /dev/null
+++ b/data/as/5849473/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.5849473",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5849473/egov-location/boundary-data.json b/data/as/5849473/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5706ce49a8
--- /dev/null
+++ b/data/as/5849473/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.5849473",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKHRAPARA PWSS",
+                "localname": "BAKHRAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5849473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKHRAPARA PWSS",
+                        "localname": "BAKHRAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKHRAPARA PWSS",
+                "localname": "BAKHRAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.5849473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKHRAPARA PWSS",
+                        "localname": "BAKHRAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5849473/ws-services-calculation/Penalty.json b/data/as/5849473/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9e009ac49c
--- /dev/null
+++ b/data/as/5849473/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.5849473",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/5849473/ws-services-calculation/WCBillingSlab.json b/data/as/5849473/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7b516e5703
--- /dev/null
+++ b/data/as/5849473/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.5849473",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054046/BillingService/BusinessService.json b/data/as/6054046/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3909e6ec90
--- /dev/null
+++ b/data/as/6054046/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6054046",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054046/egov-location/boundary-data.json b/data/as/6054046/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3202f0d59e
--- /dev/null
+++ b/data/as/6054046/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6054046",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRAPOITARY PWSS",
+                "localname": "KHUDRAPOITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054046",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRAPOITARY PWSS",
+                        "localname": "KHUDRAPOITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRAPOITARY PWSS",
+                "localname": "KHUDRAPOITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054046",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRAPOITARY PWSS",
+                        "localname": "KHUDRAPOITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054046/ws-services-calculation/Penalty.json b/data/as/6054046/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..064650c573
--- /dev/null
+++ b/data/as/6054046/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6054046",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054046/ws-services-calculation/WCBillingSlab.json b/data/as/6054046/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bbe75a014e
--- /dev/null
+++ b/data/as/6054046/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6054046",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054138/BillingService/BusinessService.json b/data/as/6054138/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5d292faf6a
--- /dev/null
+++ b/data/as/6054138/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6054138",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054138/egov-location/boundary-data.json b/data/as/6054138/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5813810931
--- /dev/null
+++ b/data/as/6054138/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6054138",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOGHO PWSS",
+                "localname": "MOGHO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054138",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOGHO PWSS",
+                        "localname": "MOGHO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOGHO PWSS",
+                "localname": "MOGHO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054138",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOGHO PWSS",
+                        "localname": "MOGHO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054138/ws-services-calculation/Penalty.json b/data/as/6054138/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2fd7a72e34
--- /dev/null
+++ b/data/as/6054138/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6054138",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054138/ws-services-calculation/WCBillingSlab.json b/data/as/6054138/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fbdeb6fcef
--- /dev/null
+++ b/data/as/6054138/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6054138",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054477/BillingService/BusinessService.json b/data/as/6054477/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d6a43a9f39
--- /dev/null
+++ b/data/as/6054477/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6054477",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054477/egov-location/boundary-data.json b/data/as/6054477/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8bab280d9d
--- /dev/null
+++ b/data/as/6054477/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6054477",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKAITARY PWSS",
+                "localname": "BAKAITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKAITARY PWSS",
+                        "localname": "BAKAITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKAITARY PWSS",
+                "localname": "BAKAITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKAITARY PWSS",
+                        "localname": "BAKAITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054477/ws-services-calculation/Penalty.json b/data/as/6054477/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0edc31ca19
--- /dev/null
+++ b/data/as/6054477/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6054477",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054477/ws-services-calculation/WCBillingSlab.json b/data/as/6054477/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8bb88b25b2
--- /dev/null
+++ b/data/as/6054477/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6054477",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054503/BillingService/BusinessService.json b/data/as/6054503/BillingService/BusinessService.json
new file mode 100644
index 0000000000..336f1c0aaf
--- /dev/null
+++ b/data/as/6054503/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6054503",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054503/egov-location/boundary-data.json b/data/as/6054503/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44e5ba03f7
--- /dev/null
+++ b/data/as/6054503/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6054503",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHATIPARA PWSS",
+                "localname": "BHATIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054503",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHATIPARA PWSS",
+                        "localname": "BHATIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHATIPARA PWSS",
+                "localname": "BHATIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6054503",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHATIPARA PWSS",
+                        "localname": "BHATIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054503/ws-services-calculation/Penalty.json b/data/as/6054503/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cebb4ec769
--- /dev/null
+++ b/data/as/6054503/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6054503",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6054503/ws-services-calculation/WCBillingSlab.json b/data/as/6054503/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d850f701e8
--- /dev/null
+++ b/data/as/6054503/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6054503",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055529/BillingService/BusinessService.json b/data/as/6055529/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11c5aef0b8
--- /dev/null
+++ b/data/as/6055529/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6055529",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055529/egov-location/boundary-data.json b/data/as/6055529/egov-location/boundary-data.json
new file mode 100644
index 0000000000..967eb7ff3f
--- /dev/null
+++ b/data/as/6055529/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6055529",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS",
+                "localname": "SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6055529",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS",
+                        "localname": "SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS",
+                "localname": "SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6055529",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS",
+                        "localname": "SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055529/ws-services-calculation/Penalty.json b/data/as/6055529/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bc50ec2c8a
--- /dev/null
+++ b/data/as/6055529/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6055529",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055529/ws-services-calculation/WCBillingSlab.json b/data/as/6055529/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..45e2e874cd
--- /dev/null
+++ b/data/as/6055529/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6055529",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055543/BillingService/BusinessService.json b/data/as/6055543/BillingService/BusinessService.json
new file mode 100644
index 0000000000..396e0a1550
--- /dev/null
+++ b/data/as/6055543/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6055543",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055543/egov-location/boundary-data.json b/data/as/6055543/egov-location/boundary-data.json
new file mode 100644
index 0000000000..75e03944e9
--- /dev/null
+++ b/data/as/6055543/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6055543",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRI PWSS",
+                "localname": "SIGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6055543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRI PWSS",
+                        "localname": "SIGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRI PWSS",
+                "localname": "SIGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6055543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRI PWSS",
+                        "localname": "SIGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055543/ws-services-calculation/Penalty.json b/data/as/6055543/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ba1e609e49
--- /dev/null
+++ b/data/as/6055543/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6055543",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055543/ws-services-calculation/WCBillingSlab.json b/data/as/6055543/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3f2fc05051
--- /dev/null
+++ b/data/as/6055543/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6055543",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055984/BillingService/BusinessService.json b/data/as/6055984/BillingService/BusinessService.json
new file mode 100644
index 0000000000..04989c4122
--- /dev/null
+++ b/data/as/6055984/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6055984",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055984/egov-location/boundary-data.json b/data/as/6055984/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c703b1e55
--- /dev/null
+++ b/data/as/6055984/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6055984",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA PWSS",
+                "localname": "GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6055984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA PWSS",
+                        "localname": "GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA PWSS",
+                "localname": "GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6055984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA PWSS",
+                        "localname": "GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055984/ws-services-calculation/Penalty.json b/data/as/6055984/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ead4b0a59
--- /dev/null
+++ b/data/as/6055984/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6055984",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6055984/ws-services-calculation/WCBillingSlab.json b/data/as/6055984/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..43533740d7
--- /dev/null
+++ b/data/as/6055984/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6055984",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136397/BillingService/BusinessService.json b/data/as/6136397/BillingService/BusinessService.json
new file mode 100644
index 0000000000..613cf3261b
--- /dev/null
+++ b/data/as/6136397/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6136397",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136397/egov-location/boundary-data.json b/data/as/6136397/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d0ff20ede
--- /dev/null
+++ b/data/as/6136397/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6136397",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA MOLANDUBI PWSS",
+                "localname": "SALPARA MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6136397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA MOLANDUBI PWSS",
+                        "localname": "SALPARA MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA MOLANDUBI PWSS",
+                "localname": "SALPARA MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6136397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA MOLANDUBI PWSS",
+                        "localname": "SALPARA MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136397/ws-services-calculation/Penalty.json b/data/as/6136397/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..458f27c266
--- /dev/null
+++ b/data/as/6136397/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6136397",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136397/ws-services-calculation/WCBillingSlab.json b/data/as/6136397/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8581ae009f
--- /dev/null
+++ b/data/as/6136397/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6136397",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136635/BillingService/BusinessService.json b/data/as/6136635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8cc783501b
--- /dev/null
+++ b/data/as/6136635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6136635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136635/egov-location/boundary-data.json b/data/as/6136635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b362779a4e
--- /dev/null
+++ b/data/as/6136635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6136635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATHIAPARA PWSS",
+                "localname": "GATHIAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6136635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATHIAPARA PWSS",
+                        "localname": "GATHIAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATHIAPARA PWSS",
+                "localname": "GATHIAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6136635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATHIAPARA PWSS",
+                        "localname": "GATHIAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136635/ws-services-calculation/Penalty.json b/data/as/6136635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bd76c519d
--- /dev/null
+++ b/data/as/6136635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6136635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136635/ws-services-calculation/WCBillingSlab.json b/data/as/6136635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32932ad5ad
--- /dev/null
+++ b/data/as/6136635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6136635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136706/BillingService/BusinessService.json b/data/as/6136706/BillingService/BusinessService.json
new file mode 100644
index 0000000000..95b03fbc24
--- /dev/null
+++ b/data/as/6136706/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6136706",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136706/egov-location/boundary-data.json b/data/as/6136706/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca1a044f40
--- /dev/null
+++ b/data/as/6136706/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6136706",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGJULI PWSS",
+                "localname": "RANGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6136706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGJULI PWSS",
+                        "localname": "RANGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGJULI PWSS",
+                "localname": "RANGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6136706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGJULI PWSS",
+                        "localname": "RANGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136706/ws-services-calculation/Penalty.json b/data/as/6136706/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fffff10d34
--- /dev/null
+++ b/data/as/6136706/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6136706",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6136706/ws-services-calculation/WCBillingSlab.json b/data/as/6136706/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37bf6f1fff
--- /dev/null
+++ b/data/as/6136706/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6136706",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145361/BillingService/BusinessService.json b/data/as/6145361/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85bb8bab64
--- /dev/null
+++ b/data/as/6145361/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6145361",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145361/egov-location/boundary-data.json b/data/as/6145361/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7d2d5edfb0
--- /dev/null
+++ b/data/as/6145361/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6145361",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBUK PWSS",
+                "localname": "AMBUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6145361",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBUK PWSS",
+                        "localname": "AMBUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBUK PWSS",
+                "localname": "AMBUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6145361",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBUK PWSS",
+                        "localname": "AMBUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145361/ws-services-calculation/Penalty.json b/data/as/6145361/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4122f27db6
--- /dev/null
+++ b/data/as/6145361/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6145361",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145361/ws-services-calculation/WCBillingSlab.json b/data/as/6145361/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03e99458ed
--- /dev/null
+++ b/data/as/6145361/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6145361",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145500/BillingService/BusinessService.json b/data/as/6145500/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d2ff0f257e
--- /dev/null
+++ b/data/as/6145500/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6145500",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145500/egov-location/boundary-data.json b/data/as/6145500/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29a18e0c46
--- /dev/null
+++ b/data/as/6145500/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6145500",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARA-  1 PWSS",
+                "localname": "BALASARA-  1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6145500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARA-  1 PWSS",
+                        "localname": "BALASARA-  1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARA-  1 PWSS",
+                "localname": "BALASARA-  1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6145500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARA-  1 PWSS",
+                        "localname": "BALASARA-  1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145500/ws-services-calculation/Penalty.json b/data/as/6145500/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..623f74817c
--- /dev/null
+++ b/data/as/6145500/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6145500",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145500/ws-services-calculation/WCBillingSlab.json b/data/as/6145500/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..200af31cba
--- /dev/null
+++ b/data/as/6145500/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6145500",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145716/BillingService/BusinessService.json b/data/as/6145716/BillingService/BusinessService.json
new file mode 100644
index 0000000000..33762ffc98
--- /dev/null
+++ b/data/as/6145716/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6145716",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145716/egov-location/boundary-data.json b/data/as/6145716/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a4094e8043
--- /dev/null
+++ b/data/as/6145716/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6145716",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHREE NEW PWSS",
+                "localname": "BANDARSHREE NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6145716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHREE NEW PWSS",
+                        "localname": "BANDARSHREE NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHREE NEW PWSS",
+                "localname": "BANDARSHREE NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6145716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHREE NEW PWSS",
+                        "localname": "BANDARSHREE NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145716/ws-services-calculation/Penalty.json b/data/as/6145716/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3cc407ece2
--- /dev/null
+++ b/data/as/6145716/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6145716",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6145716/ws-services-calculation/WCBillingSlab.json b/data/as/6145716/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..26774d5ac0
--- /dev/null
+++ b/data/as/6145716/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6145716",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6149983/BillingService/BusinessService.json b/data/as/6149983/BillingService/BusinessService.json
new file mode 100644
index 0000000000..492640ff84
--- /dev/null
+++ b/data/as/6149983/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6149983",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6149983/egov-location/boundary-data.json b/data/as/6149983/egov-location/boundary-data.json
new file mode 100644
index 0000000000..80e559f18b
--- /dev/null
+++ b/data/as/6149983/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6149983",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAROINI PWSS (MNP)",
+                "localname": "KAROINI PWSS (MNP)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6149983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAROINI PWSS (MNP)",
+                        "localname": "KAROINI PWSS (MNP)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAROINI PWSS (MNP)",
+                "localname": "KAROINI PWSS (MNP)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6149983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAROINI PWSS (MNP)",
+                        "localname": "KAROINI PWSS (MNP)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6149983/ws-services-calculation/Penalty.json b/data/as/6149983/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aa8c53de61
--- /dev/null
+++ b/data/as/6149983/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6149983",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6149983/ws-services-calculation/WCBillingSlab.json b/data/as/6149983/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fe360b6330
--- /dev/null
+++ b/data/as/6149983/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6149983",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150005/BillingService/BusinessService.json b/data/as/6150005/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01f73f9909
--- /dev/null
+++ b/data/as/6150005/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6150005",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150005/egov-location/boundary-data.json b/data/as/6150005/egov-location/boundary-data.json
new file mode 100644
index 0000000000..318e03fea6
--- /dev/null
+++ b/data/as/6150005/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6150005",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                "localname": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6150005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                        "localname": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                "localname": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6150005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                        "localname": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150005/ws-services-calculation/Penalty.json b/data/as/6150005/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..61a73e5e36
--- /dev/null
+++ b/data/as/6150005/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6150005",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150005/ws-services-calculation/WCBillingSlab.json b/data/as/6150005/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..01a84f316f
--- /dev/null
+++ b/data/as/6150005/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6150005",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150033/BillingService/BusinessService.json b/data/as/6150033/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b769ae4f46
--- /dev/null
+++ b/data/as/6150033/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6150033",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150033/egov-location/boundary-data.json b/data/as/6150033/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd73f294ac
--- /dev/null
+++ b/data/as/6150033/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6150033",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JORGARH PWSS (ARP)",
+                "localname": "JORGARH PWSS (ARP)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6150033",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JORGARH PWSS (ARP)",
+                        "localname": "JORGARH PWSS (ARP)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JORGARH PWSS (ARP)",
+                "localname": "JORGARH PWSS (ARP)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6150033",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JORGARH PWSS (ARP)",
+                        "localname": "JORGARH PWSS (ARP)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150033/ws-services-calculation/Penalty.json b/data/as/6150033/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f2b969a71b
--- /dev/null
+++ b/data/as/6150033/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6150033",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150033/ws-services-calculation/WCBillingSlab.json b/data/as/6150033/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94d68f7c2b
--- /dev/null
+++ b/data/as/6150033/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6150033",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150048/BillingService/BusinessService.json b/data/as/6150048/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5aaa1e4469
--- /dev/null
+++ b/data/as/6150048/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6150048",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150048/egov-location/boundary-data.json b/data/as/6150048/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b33a90acb5
--- /dev/null
+++ b/data/as/6150048/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6150048",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                "localname": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6150048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                        "localname": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                "localname": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6150048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                        "localname": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150048/ws-services-calculation/Penalty.json b/data/as/6150048/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f27b8f9ed3
--- /dev/null
+++ b/data/as/6150048/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6150048",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6150048/ws-services-calculation/WCBillingSlab.json b/data/as/6150048/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f347dcfb1d
--- /dev/null
+++ b/data/as/6150048/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6150048",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6151001/BillingService/BusinessService.json b/data/as/6151001/BillingService/BusinessService.json
new file mode 100644
index 0000000000..037ee98074
--- /dev/null
+++ b/data/as/6151001/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6151001",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6151001/egov-location/boundary-data.json b/data/as/6151001/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b2e8980946
--- /dev/null
+++ b/data/as/6151001/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6151001",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ GORPAL PWSS (UPGRADATION)",
+                "localname": "NIZ GORPAL PWSS (UPGRADATION)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6151001",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ GORPAL PWSS (UPGRADATION)",
+                        "localname": "NIZ GORPAL PWSS (UPGRADATION)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ GORPAL PWSS (UPGRADATION)",
+                "localname": "NIZ GORPAL PWSS (UPGRADATION)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6151001",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ GORPAL PWSS (UPGRADATION)",
+                        "localname": "NIZ GORPAL PWSS (UPGRADATION)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6151001/ws-services-calculation/Penalty.json b/data/as/6151001/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69d9992740
--- /dev/null
+++ b/data/as/6151001/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6151001",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6151001/ws-services-calculation/WCBillingSlab.json b/data/as/6151001/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..86afdfe94f
--- /dev/null
+++ b/data/as/6151001/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6151001",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166571/BillingService/BusinessService.json b/data/as/6166571/BillingService/BusinessService.json
new file mode 100644
index 0000000000..101923fd32
--- /dev/null
+++ b/data/as/6166571/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6166571",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166571/egov-location/boundary-data.json b/data/as/6166571/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06f591f683
--- /dev/null
+++ b/data/as/6166571/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6166571",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                "localname": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6166571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                        "localname": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                "localname": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6166571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                        "localname": "RETROFITTING OF KEHERUKHANDA GP MULTI VILLAGE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166571/ws-services-calculation/Penalty.json b/data/as/6166571/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d90dbdc349
--- /dev/null
+++ b/data/as/6166571/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6166571",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166571/ws-services-calculation/WCBillingSlab.json b/data/as/6166571/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9bd7987d20
--- /dev/null
+++ b/data/as/6166571/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6166571",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166583/BillingService/BusinessService.json b/data/as/6166583/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bf0e4e110b
--- /dev/null
+++ b/data/as/6166583/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6166583",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166583/egov-location/boundary-data.json b/data/as/6166583/egov-location/boundary-data.json
new file mode 100644
index 0000000000..81a9bf7224
--- /dev/null
+++ b/data/as/6166583/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6166583",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                "localname": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6166583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                        "localname": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                "localname": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6166583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                        "localname": "RETROFITTING OF BHER NEPALI PWSS (QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166583/ws-services-calculation/Penalty.json b/data/as/6166583/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..28ccb54c37
--- /dev/null
+++ b/data/as/6166583/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6166583",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6166583/ws-services-calculation/WCBillingSlab.json b/data/as/6166583/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..efd37e4011
--- /dev/null
+++ b/data/as/6166583/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6166583",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6173095/BillingService/BusinessService.json b/data/as/6173095/BillingService/BusinessService.json
new file mode 100644
index 0000000000..baa985e25f
--- /dev/null
+++ b/data/as/6173095/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6173095",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6173095/egov-location/boundary-data.json b/data/as/6173095/egov-location/boundary-data.json
new file mode 100644
index 0000000000..14198bbc28
--- /dev/null
+++ b/data/as/6173095/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6173095",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGRIPAM PWSS (STATE PLAN)",
+                "localname": "AGRIPAM PWSS (STATE PLAN)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6173095",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGRIPAM PWSS (STATE PLAN)",
+                        "localname": "AGRIPAM PWSS (STATE PLAN)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGRIPAM PWSS (STATE PLAN)",
+                "localname": "AGRIPAM PWSS (STATE PLAN)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6173095",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGRIPAM PWSS (STATE PLAN)",
+                        "localname": "AGRIPAM PWSS (STATE PLAN)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6173095/ws-services-calculation/Penalty.json b/data/as/6173095/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c06ab1b56b
--- /dev/null
+++ b/data/as/6173095/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6173095",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6173095/ws-services-calculation/WCBillingSlab.json b/data/as/6173095/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf34934918
--- /dev/null
+++ b/data/as/6173095/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6173095",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175393/BillingService/BusinessService.json b/data/as/6175393/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3969938e3f
--- /dev/null
+++ b/data/as/6175393/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175393",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175393/egov-location/boundary-data.json b/data/as/6175393/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0a8f2705eb
--- /dev/null
+++ b/data/as/6175393/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175393",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                "localname": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                        "localname": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                "localname": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                        "localname": "RETROFITTING OF BALIGAON PWSS ( NQ )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175393/ws-services-calculation/Penalty.json b/data/as/6175393/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..57894efae9
--- /dev/null
+++ b/data/as/6175393/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175393",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175393/ws-services-calculation/WCBillingSlab.json b/data/as/6175393/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cbb6f6979b
--- /dev/null
+++ b/data/as/6175393/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175393",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175413/BillingService/BusinessService.json b/data/as/6175413/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce2f24ce4c
--- /dev/null
+++ b/data/as/6175413/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175413",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175413/egov-location/boundary-data.json b/data/as/6175413/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dc9c4e4c20
--- /dev/null
+++ b/data/as/6175413/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175413",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALINIDUBA PWSS ( NQ )",
+                "localname": "NALINIDUBA PWSS ( NQ )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALINIDUBA PWSS ( NQ )",
+                        "localname": "NALINIDUBA PWSS ( NQ )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALINIDUBA PWSS ( NQ )",
+                "localname": "NALINIDUBA PWSS ( NQ )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALINIDUBA PWSS ( NQ )",
+                        "localname": "NALINIDUBA PWSS ( NQ )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175413/ws-services-calculation/Penalty.json b/data/as/6175413/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a862c7ed33
--- /dev/null
+++ b/data/as/6175413/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175413",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175413/ws-services-calculation/WCBillingSlab.json b/data/as/6175413/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d20acdbf5
--- /dev/null
+++ b/data/as/6175413/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175413",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175518/BillingService/BusinessService.json b/data/as/6175518/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5298d79f71
--- /dev/null
+++ b/data/as/6175518/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175518",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175518/egov-location/boundary-data.json b/data/as/6175518/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9eaeaa405f
--- /dev/null
+++ b/data/as/6175518/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175518",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                "localname": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                        "localname": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                "localname": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                        "localname": "RETROFITTING OF CHIRJULI BAGAN PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175518/ws-services-calculation/Penalty.json b/data/as/6175518/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e86a6462d4
--- /dev/null
+++ b/data/as/6175518/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175518",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175518/ws-services-calculation/WCBillingSlab.json b/data/as/6175518/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d228ea6327
--- /dev/null
+++ b/data/as/6175518/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175518",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175537/BillingService/BusinessService.json b/data/as/6175537/BillingService/BusinessService.json
new file mode 100644
index 0000000000..44957df9b3
--- /dev/null
+++ b/data/as/6175537/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175537",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175537/egov-location/boundary-data.json b/data/as/6175537/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c13ecc63d7
--- /dev/null
+++ b/data/as/6175537/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175537",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                "localname": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                        "localname": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                "localname": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                        "localname": "RETROFITTING OF MOUKHUWAJAN PWSS ( QA ) (PERTAINING TO COURT CASE)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175537/ws-services-calculation/Penalty.json b/data/as/6175537/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..77849389fa
--- /dev/null
+++ b/data/as/6175537/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175537",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175537/ws-services-calculation/WCBillingSlab.json b/data/as/6175537/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9e45f0f6f1
--- /dev/null
+++ b/data/as/6175537/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175537",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175631/BillingService/BusinessService.json b/data/as/6175631/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cbd0bed5c4
--- /dev/null
+++ b/data/as/6175631/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175631",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175631/egov-location/boundary-data.json b/data/as/6175631/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef54216e91
--- /dev/null
+++ b/data/as/6175631/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175631",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                "localname": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                        "localname": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                "localname": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                        "localname": "RETROFITTING OF PIRAKATA KACHARI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175631/ws-services-calculation/Penalty.json b/data/as/6175631/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aab8e0821d
--- /dev/null
+++ b/data/as/6175631/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175631",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175631/ws-services-calculation/WCBillingSlab.json b/data/as/6175631/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..06ae3f07f7
--- /dev/null
+++ b/data/as/6175631/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175631",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175645/BillingService/BusinessService.json b/data/as/6175645/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bee3ce9bb3
--- /dev/null
+++ b/data/as/6175645/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175645",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175645/egov-location/boundary-data.json b/data/as/6175645/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a410de50a3
--- /dev/null
+++ b/data/as/6175645/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175645",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                "localname": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175645",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                        "localname": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                "localname": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175645",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                        "localname": "RETROFITTING OF PUB MADHURIBIL PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175645/ws-services-calculation/Penalty.json b/data/as/6175645/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..716cbce285
--- /dev/null
+++ b/data/as/6175645/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175645",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175645/ws-services-calculation/WCBillingSlab.json b/data/as/6175645/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..489fcdda7e
--- /dev/null
+++ b/data/as/6175645/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175645",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175650/BillingService/BusinessService.json b/data/as/6175650/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fab8e62fb8
--- /dev/null
+++ b/data/as/6175650/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6175650",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175650/egov-location/boundary-data.json b/data/as/6175650/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c73f893a4
--- /dev/null
+++ b/data/as/6175650/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6175650",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                "localname": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                        "localname": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                "localname": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6175650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                        "localname": "RETROFITTING OF GORMORA JORPUKHURI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175650/ws-services-calculation/Penalty.json b/data/as/6175650/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9515395c8e
--- /dev/null
+++ b/data/as/6175650/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6175650",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6175650/ws-services-calculation/WCBillingSlab.json b/data/as/6175650/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3673f2d9e2
--- /dev/null
+++ b/data/as/6175650/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6175650",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189857/BillingService/BusinessService.json b/data/as/6189857/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2038695196
--- /dev/null
+++ b/data/as/6189857/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6189857",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189857/egov-location/boundary-data.json b/data/as/6189857/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f945edba2
--- /dev/null
+++ b/data/as/6189857/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6189857",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HUGRAJULI PWSS",
+                "localname": "HUGRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6189857",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HUGRAJULI PWSS",
+                        "localname": "HUGRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HUGRAJULI PWSS",
+                "localname": "HUGRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6189857",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HUGRAJULI PWSS",
+                        "localname": "HUGRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189857/ws-services-calculation/Penalty.json b/data/as/6189857/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf9c7e4136
--- /dev/null
+++ b/data/as/6189857/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6189857",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189857/ws-services-calculation/WCBillingSlab.json b/data/as/6189857/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6a95d87de
--- /dev/null
+++ b/data/as/6189857/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6189857",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189867/BillingService/BusinessService.json b/data/as/6189867/BillingService/BusinessService.json
new file mode 100644
index 0000000000..adf2f24d05
--- /dev/null
+++ b/data/as/6189867/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6189867",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189867/egov-location/boundary-data.json b/data/as/6189867/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ac96f7f4e
--- /dev/null
+++ b/data/as/6189867/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6189867",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUBARI PWSS",
+                "localname": "OUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6189867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUBARI PWSS",
+                        "localname": "OUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUBARI PWSS",
+                "localname": "OUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6189867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUBARI PWSS",
+                        "localname": "OUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189867/ws-services-calculation/Penalty.json b/data/as/6189867/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b41c532712
--- /dev/null
+++ b/data/as/6189867/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6189867",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6189867/ws-services-calculation/WCBillingSlab.json b/data/as/6189867/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf3fbd0289
--- /dev/null
+++ b/data/as/6189867/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6189867",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6233420/BillingService/BusinessService.json b/data/as/6233420/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d1c44b931c
--- /dev/null
+++ b/data/as/6233420/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6233420",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6233420/egov-location/boundary-data.json b/data/as/6233420/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f700f9e649
--- /dev/null
+++ b/data/as/6233420/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6233420",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTABARI  PWSS",
+                "localname": "KHUTABARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6233420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTABARI  PWSS",
+                        "localname": "KHUTABARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTABARI  PWSS",
+                "localname": "KHUTABARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6233420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTABARI  PWSS",
+                        "localname": "KHUTABARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6233420/ws-services-calculation/Penalty.json b/data/as/6233420/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e7d269900b
--- /dev/null
+++ b/data/as/6233420/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6233420",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6233420/ws-services-calculation/WCBillingSlab.json b/data/as/6233420/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b25b3f8fe2
--- /dev/null
+++ b/data/as/6233420/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6233420",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6234085/BillingService/BusinessService.json b/data/as/6234085/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc154d849d
--- /dev/null
+++ b/data/as/6234085/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6234085",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6234085/egov-location/boundary-data.json b/data/as/6234085/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f2772da5a
--- /dev/null
+++ b/data/as/6234085/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6234085",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUDHNOI PWSS",
+                "localname": "DUDHNOI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6234085",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUDHNOI PWSS",
+                        "localname": "DUDHNOI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUDHNOI PWSS",
+                "localname": "DUDHNOI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6234085",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUDHNOI PWSS",
+                        "localname": "DUDHNOI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6234085/ws-services-calculation/Penalty.json b/data/as/6234085/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..20714bdeab
--- /dev/null
+++ b/data/as/6234085/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6234085",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6234085/ws-services-calculation/WCBillingSlab.json b/data/as/6234085/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3210537101
--- /dev/null
+++ b/data/as/6234085/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6234085",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241704/BillingService/BusinessService.json b/data/as/6241704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f81adf6d02
--- /dev/null
+++ b/data/as/6241704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6241704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241704/egov-location/boundary-data.json b/data/as/6241704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fbe484fa1c
--- /dev/null
+++ b/data/as/6241704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6241704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                "localname": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6241704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                        "localname": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                "localname": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6241704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                        "localname": "RETROFITTING OF KAWAIMARI PWSS (NQ) (PERTAINING TO COURT CASE)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241704/ws-services-calculation/Penalty.json b/data/as/6241704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b2cc8236c
--- /dev/null
+++ b/data/as/6241704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6241704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241704/ws-services-calculation/WCBillingSlab.json b/data/as/6241704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..35d4624b72
--- /dev/null
+++ b/data/as/6241704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6241704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241823/BillingService/BusinessService.json b/data/as/6241823/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7af3110b07
--- /dev/null
+++ b/data/as/6241823/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6241823",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241823/egov-location/boundary-data.json b/data/as/6241823/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c65416c469
--- /dev/null
+++ b/data/as/6241823/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6241823",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                "localname": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6241823",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                        "localname": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                "localname": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6241823",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                        "localname": "RETROFITTING OF SARAKA PWSS ( NQ )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241823/ws-services-calculation/Penalty.json b/data/as/6241823/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f39455d8cc
--- /dev/null
+++ b/data/as/6241823/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6241823",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241823/ws-services-calculation/WCBillingSlab.json b/data/as/6241823/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..932973d2eb
--- /dev/null
+++ b/data/as/6241823/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6241823",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241939/BillingService/BusinessService.json b/data/as/6241939/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6fc1909bd2
--- /dev/null
+++ b/data/as/6241939/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6241939",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241939/egov-location/boundary-data.json b/data/as/6241939/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2543c7c43
--- /dev/null
+++ b/data/as/6241939/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6241939",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                "localname": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6241939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                        "localname": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                "localname": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6241939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                        "localname": "RETROFITTING OF SAMUKIA PWSS ( NQ ) (PERTAINING TO COURT CASE)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241939/ws-services-calculation/Penalty.json b/data/as/6241939/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b7fa4a123b
--- /dev/null
+++ b/data/as/6241939/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6241939",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6241939/ws-services-calculation/WCBillingSlab.json b/data/as/6241939/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ccda4f2143
--- /dev/null
+++ b/data/as/6241939/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6241939",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242561/BillingService/BusinessService.json b/data/as/6242561/BillingService/BusinessService.json
new file mode 100644
index 0000000000..268fc645ee
--- /dev/null
+++ b/data/as/6242561/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6242561",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242561/egov-location/boundary-data.json b/data/as/6242561/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9b6984ee53
--- /dev/null
+++ b/data/as/6242561/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6242561",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                "localname": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242561",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                        "localname": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                "localname": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242561",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                        "localname": "RETROFITTING OF SOPAI BALIGAON PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242561/ws-services-calculation/Penalty.json b/data/as/6242561/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb3b984555
--- /dev/null
+++ b/data/as/6242561/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6242561",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242561/ws-services-calculation/WCBillingSlab.json b/data/as/6242561/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..45278cf7e9
--- /dev/null
+++ b/data/as/6242561/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6242561",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242604/BillingService/BusinessService.json b/data/as/6242604/BillingService/BusinessService.json
new file mode 100644
index 0000000000..18d6399cb4
--- /dev/null
+++ b/data/as/6242604/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6242604",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242604/egov-location/boundary-data.json b/data/as/6242604/egov-location/boundary-data.json
new file mode 100644
index 0000000000..afbd902792
--- /dev/null
+++ b/data/as/6242604/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6242604",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                "localname": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242604",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                        "localname": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                "localname": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242604",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                        "localname": "RETROFITTING OF SATIPUKHURI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242604/ws-services-calculation/Penalty.json b/data/as/6242604/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b771f170ee
--- /dev/null
+++ b/data/as/6242604/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6242604",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242604/ws-services-calculation/WCBillingSlab.json b/data/as/6242604/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e901ca65e
--- /dev/null
+++ b/data/as/6242604/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6242604",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242836/BillingService/BusinessService.json b/data/as/6242836/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56fe216641
--- /dev/null
+++ b/data/as/6242836/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6242836",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242836/egov-location/boundary-data.json b/data/as/6242836/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a3756f3ec4
--- /dev/null
+++ b/data/as/6242836/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6242836",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ROWMARI PWSS QA )",
+                "localname": "RETROFITTING OF ROWMARI PWSS QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242836",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ROWMARI PWSS QA )",
+                        "localname": "RETROFITTING OF ROWMARI PWSS QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ROWMARI PWSS QA )",
+                "localname": "RETROFITTING OF ROWMARI PWSS QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242836",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ROWMARI PWSS QA )",
+                        "localname": "RETROFITTING OF ROWMARI PWSS QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242836/ws-services-calculation/Penalty.json b/data/as/6242836/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b8602a149d
--- /dev/null
+++ b/data/as/6242836/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6242836",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242836/ws-services-calculation/WCBillingSlab.json b/data/as/6242836/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9bb7fbd452
--- /dev/null
+++ b/data/as/6242836/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6242836",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242875/BillingService/BusinessService.json b/data/as/6242875/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b5ac1cbe9
--- /dev/null
+++ b/data/as/6242875/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6242875",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242875/egov-location/boundary-data.json b/data/as/6242875/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0f7de95012
--- /dev/null
+++ b/data/as/6242875/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6242875",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                "localname": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242875",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                        "localname": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                "localname": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242875",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                        "localname": "RETROFITTING OF BOGAPANI PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242875/ws-services-calculation/Penalty.json b/data/as/6242875/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..450b377da6
--- /dev/null
+++ b/data/as/6242875/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6242875",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242875/ws-services-calculation/WCBillingSlab.json b/data/as/6242875/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ca3de3bcb
--- /dev/null
+++ b/data/as/6242875/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6242875",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242892/BillingService/BusinessService.json b/data/as/6242892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..966caf73ed
--- /dev/null
+++ b/data/as/6242892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6242892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242892/egov-location/boundary-data.json b/data/as/6242892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..851aec6800
--- /dev/null
+++ b/data/as/6242892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6242892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                "localname": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                        "localname": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                "localname": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6242892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                        "localname": "RETROFITTING OF GORJULI PATHER PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242892/ws-services-calculation/Penalty.json b/data/as/6242892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6b932cfd1b
--- /dev/null
+++ b/data/as/6242892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6242892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6242892/ws-services-calculation/WCBillingSlab.json b/data/as/6242892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07767e9fe3
--- /dev/null
+++ b/data/as/6242892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6242892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259479/BillingService/BusinessService.json b/data/as/6259479/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a98eac7db6
--- /dev/null
+++ b/data/as/6259479/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259479",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259479/egov-location/boundary-data.json b/data/as/6259479/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae7b93d6e9
--- /dev/null
+++ b/data/as/6259479/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259479",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALIBORI  PWSS",
+                "localname": "DIGHALIBORI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259479",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALIBORI  PWSS",
+                        "localname": "DIGHALIBORI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALIBORI  PWSS",
+                "localname": "DIGHALIBORI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259479",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALIBORI  PWSS",
+                        "localname": "DIGHALIBORI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259479/ws-services-calculation/Penalty.json b/data/as/6259479/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b798a8d7d2
--- /dev/null
+++ b/data/as/6259479/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259479",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259479/ws-services-calculation/WCBillingSlab.json b/data/as/6259479/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c1767e158
--- /dev/null
+++ b/data/as/6259479/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259479",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259651/BillingService/BusinessService.json b/data/as/6259651/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98d066eb29
--- /dev/null
+++ b/data/as/6259651/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259651",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259651/egov-location/boundary-data.json b/data/as/6259651/egov-location/boundary-data.json
new file mode 100644
index 0000000000..087e4c6643
--- /dev/null
+++ b/data/as/6259651/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259651",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUCHDHOWA CHESAPANI PT II PWSS",
+                "localname": "KUCHDHOWA CHESAPANI PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUCHDHOWA CHESAPANI PT II PWSS",
+                        "localname": "KUCHDHOWA CHESAPANI PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUCHDHOWA CHESAPANI PT II PWSS",
+                "localname": "KUCHDHOWA CHESAPANI PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUCHDHOWA CHESAPANI PT II PWSS",
+                        "localname": "KUCHDHOWA CHESAPANI PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259651/ws-services-calculation/Penalty.json b/data/as/6259651/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..29854a2371
--- /dev/null
+++ b/data/as/6259651/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259651",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259651/ws-services-calculation/WCBillingSlab.json b/data/as/6259651/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..161e5a311b
--- /dev/null
+++ b/data/as/6259651/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259651",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259713/BillingService/BusinessService.json b/data/as/6259713/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bea8a02070
--- /dev/null
+++ b/data/as/6259713/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259713",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259713/egov-location/boundary-data.json b/data/as/6259713/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4b69fe025c
--- /dev/null
+++ b/data/as/6259713/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259713",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGALJHAR PWSS",
+                "localname": "BANGALJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259713",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGALJHAR PWSS",
+                        "localname": "BANGALJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGALJHAR PWSS",
+                "localname": "BANGALJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259713",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGALJHAR PWSS",
+                        "localname": "BANGALJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259713/ws-services-calculation/Penalty.json b/data/as/6259713/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8274b20b1b
--- /dev/null
+++ b/data/as/6259713/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259713",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259713/ws-services-calculation/WCBillingSlab.json b/data/as/6259713/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..294c581eba
--- /dev/null
+++ b/data/as/6259713/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259713",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259850/BillingService/BusinessService.json b/data/as/6259850/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8cac0386b7
--- /dev/null
+++ b/data/as/6259850/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259850",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259850/egov-location/boundary-data.json b/data/as/6259850/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad83b0598e
--- /dev/null
+++ b/data/as/6259850/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259850",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MELOPARA",
+                "localname": "MELOPARA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MELOPARA",
+                        "localname": "MELOPARA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MELOPARA",
+                "localname": "MELOPARA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MELOPARA",
+                        "localname": "MELOPARA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259850/ws-services-calculation/Penalty.json b/data/as/6259850/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4eb0b9cf4d
--- /dev/null
+++ b/data/as/6259850/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259850",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259850/ws-services-calculation/WCBillingSlab.json b/data/as/6259850/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..97d98889dd
--- /dev/null
+++ b/data/as/6259850/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259850",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259888/BillingService/BusinessService.json b/data/as/6259888/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e553118582
--- /dev/null
+++ b/data/as/6259888/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259888",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259888/egov-location/boundary-data.json b/data/as/6259888/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34bbf32ed0
--- /dev/null
+++ b/data/as/6259888/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259888",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIALI PWSS",
+                "localname": "SIALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259888",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIALI PWSS",
+                        "localname": "SIALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIALI PWSS",
+                "localname": "SIALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259888",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIALI PWSS",
+                        "localname": "SIALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259888/ws-services-calculation/Penalty.json b/data/as/6259888/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe1dd04b5a
--- /dev/null
+++ b/data/as/6259888/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259888",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259888/ws-services-calculation/WCBillingSlab.json b/data/as/6259888/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5531c9473b
--- /dev/null
+++ b/data/as/6259888/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259888",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259908/BillingService/BusinessService.json b/data/as/6259908/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f8b27e6e13
--- /dev/null
+++ b/data/as/6259908/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259908",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259908/egov-location/boundary-data.json b/data/as/6259908/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95c4f7fe63
--- /dev/null
+++ b/data/as/6259908/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259908",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAIKAN PT II PWSS",
+                "localname": "PAIKAN PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259908",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAIKAN PT II PWSS",
+                        "localname": "PAIKAN PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAIKAN PT II PWSS",
+                "localname": "PAIKAN PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259908",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAIKAN PT II PWSS",
+                        "localname": "PAIKAN PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259908/ws-services-calculation/Penalty.json b/data/as/6259908/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86e224a3ef
--- /dev/null
+++ b/data/as/6259908/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259908",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259908/ws-services-calculation/WCBillingSlab.json b/data/as/6259908/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df0201536f
--- /dev/null
+++ b/data/as/6259908/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259908",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259933/BillingService/BusinessService.json b/data/as/6259933/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b6d726f22
--- /dev/null
+++ b/data/as/6259933/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259933",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259933/egov-location/boundary-data.json b/data/as/6259933/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2939aadaa8
--- /dev/null
+++ b/data/as/6259933/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259933",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELTARGHAT PWSS",
+                "localname": "BHELTARGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259933",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELTARGHAT PWSS",
+                        "localname": "BHELTARGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELTARGHAT PWSS",
+                "localname": "BHELTARGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259933",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELTARGHAT PWSS",
+                        "localname": "BHELTARGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259933/ws-services-calculation/Penalty.json b/data/as/6259933/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56b35c98e0
--- /dev/null
+++ b/data/as/6259933/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259933",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259933/ws-services-calculation/WCBillingSlab.json b/data/as/6259933/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e6e7300fb
--- /dev/null
+++ b/data/as/6259933/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259933",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259975/BillingService/BusinessService.json b/data/as/6259975/BillingService/BusinessService.json
new file mode 100644
index 0000000000..517678c498
--- /dev/null
+++ b/data/as/6259975/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6259975",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259975/egov-location/boundary-data.json b/data/as/6259975/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2422456e30
--- /dev/null
+++ b/data/as/6259975/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6259975",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MACHERVITA PWSS",
+                "localname": "MACHERVITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MACHERVITA PWSS",
+                        "localname": "MACHERVITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MACHERVITA PWSS",
+                "localname": "MACHERVITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6259975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MACHERVITA PWSS",
+                        "localname": "MACHERVITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259975/ws-services-calculation/Penalty.json b/data/as/6259975/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..49f7cca560
--- /dev/null
+++ b/data/as/6259975/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6259975",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6259975/ws-services-calculation/WCBillingSlab.json b/data/as/6259975/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4581853ff6
--- /dev/null
+++ b/data/as/6259975/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6259975",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260027/BillingService/BusinessService.json b/data/as/6260027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6703ed55e3
--- /dev/null
+++ b/data/as/6260027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6260027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260027/egov-location/boundary-data.json b/data/as/6260027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..28b42fbfed
--- /dev/null
+++ b/data/as/6260027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6260027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUNGLE BLOCK PT II PWSS",
+                "localname": "JUNGLE BLOCK PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUNGLE BLOCK PT II PWSS",
+                        "localname": "JUNGLE BLOCK PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUNGLE BLOCK PT II PWSS",
+                "localname": "JUNGLE BLOCK PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUNGLE BLOCK PT II PWSS",
+                        "localname": "JUNGLE BLOCK PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260027/ws-services-calculation/Penalty.json b/data/as/6260027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..398abcd6f8
--- /dev/null
+++ b/data/as/6260027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6260027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260027/ws-services-calculation/WCBillingSlab.json b/data/as/6260027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93b896ab10
--- /dev/null
+++ b/data/as/6260027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6260027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260773/BillingService/BusinessService.json b/data/as/6260773/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b51a03841f
--- /dev/null
+++ b/data/as/6260773/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6260773",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260773/egov-location/boundary-data.json b/data/as/6260773/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2cd139efce
--- /dev/null
+++ b/data/as/6260773/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6260773",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHOGRARPAR PWSS",
+                "localname": "KHOGRARPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260773",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHOGRARPAR PWSS",
+                        "localname": "KHOGRARPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHOGRARPAR PWSS",
+                "localname": "KHOGRARPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260773",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHOGRARPAR PWSS",
+                        "localname": "KHOGRARPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260773/ws-services-calculation/Penalty.json b/data/as/6260773/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8a9ed1f0af
--- /dev/null
+++ b/data/as/6260773/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6260773",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260773/ws-services-calculation/WCBillingSlab.json b/data/as/6260773/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..787ab11670
--- /dev/null
+++ b/data/as/6260773/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6260773",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260844/BillingService/BusinessService.json b/data/as/6260844/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb877f38df
--- /dev/null
+++ b/data/as/6260844/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6260844",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260844/egov-location/boundary-data.json b/data/as/6260844/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2fce60d158
--- /dev/null
+++ b/data/as/6260844/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6260844",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI BAZAR PWSS",
+                "localname": "ROWMARI BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI BAZAR PWSS",
+                        "localname": "ROWMARI BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI BAZAR PWSS",
+                "localname": "ROWMARI BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI BAZAR PWSS",
+                        "localname": "ROWMARI BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260844/ws-services-calculation/Penalty.json b/data/as/6260844/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6404eb1f16
--- /dev/null
+++ b/data/as/6260844/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6260844",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260844/ws-services-calculation/WCBillingSlab.json b/data/as/6260844/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74f1595056
--- /dev/null
+++ b/data/as/6260844/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6260844",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260923/BillingService/BusinessService.json b/data/as/6260923/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ffbc7d7437
--- /dev/null
+++ b/data/as/6260923/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6260923",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260923/egov-location/boundary-data.json b/data/as/6260923/egov-location/boundary-data.json
new file mode 100644
index 0000000000..747be298ce
--- /dev/null
+++ b/data/as/6260923/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6260923",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANTAPUR PWSS",
+                "localname": "KANTAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANTAPUR PWSS",
+                        "localname": "KANTAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANTAPUR PWSS",
+                "localname": "KANTAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6260923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANTAPUR PWSS",
+                        "localname": "KANTAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260923/ws-services-calculation/Penalty.json b/data/as/6260923/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6ca55bf35
--- /dev/null
+++ b/data/as/6260923/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6260923",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6260923/ws-services-calculation/WCBillingSlab.json b/data/as/6260923/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c07f62231d
--- /dev/null
+++ b/data/as/6260923/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6260923",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6347427/BillingService/BusinessService.json b/data/as/6347427/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00339c33ce
--- /dev/null
+++ b/data/as/6347427/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6347427",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6347427/egov-location/boundary-data.json b/data/as/6347427/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe44c5461a
--- /dev/null
+++ b/data/as/6347427/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6347427",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAIPAM PWSS (MNP)",
+                "localname": "DIKORAIPAM PWSS (MNP)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6347427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAIPAM PWSS (MNP)",
+                        "localname": "DIKORAIPAM PWSS (MNP)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAIPAM PWSS (MNP)",
+                "localname": "DIKORAIPAM PWSS (MNP)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6347427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAIPAM PWSS (MNP)",
+                        "localname": "DIKORAIPAM PWSS (MNP)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6347427/ws-services-calculation/Penalty.json b/data/as/6347427/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5320eed7c
--- /dev/null
+++ b/data/as/6347427/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6347427",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6347427/ws-services-calculation/WCBillingSlab.json b/data/as/6347427/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e90c8a7fbb
--- /dev/null
+++ b/data/as/6347427/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6347427",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6349286/BillingService/BusinessService.json b/data/as/6349286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01195b2997
--- /dev/null
+++ b/data/as/6349286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6349286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6349286/egov-location/boundary-data.json b/data/as/6349286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5b9bf0c9d
--- /dev/null
+++ b/data/as/6349286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6349286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                "localname": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6349286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                        "localname": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                "localname": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6349286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                        "localname": "RETROFITTING OF CHATAI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6349286/ws-services-calculation/Penalty.json b/data/as/6349286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a4d1edc39
--- /dev/null
+++ b/data/as/6349286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6349286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6349286/ws-services-calculation/WCBillingSlab.json b/data/as/6349286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fd3e820bac
--- /dev/null
+++ b/data/as/6349286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6349286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350831/BillingService/BusinessService.json b/data/as/6350831/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c1d9249919
--- /dev/null
+++ b/data/as/6350831/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6350831",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350831/egov-location/boundary-data.json b/data/as/6350831/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0ad769f86a
--- /dev/null
+++ b/data/as/6350831/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6350831",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                "localname": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6350831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                        "localname": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                "localname": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6350831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                        "localname": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350831/ws-services-calculation/Penalty.json b/data/as/6350831/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ebcf59510
--- /dev/null
+++ b/data/as/6350831/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6350831",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350831/ws-services-calculation/WCBillingSlab.json b/data/as/6350831/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cb123d90af
--- /dev/null
+++ b/data/as/6350831/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6350831",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350854/BillingService/BusinessService.json b/data/as/6350854/BillingService/BusinessService.json
new file mode 100644
index 0000000000..864a6aa7d6
--- /dev/null
+++ b/data/as/6350854/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6350854",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350854/egov-location/boundary-data.json b/data/as/6350854/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a80c2090b
--- /dev/null
+++ b/data/as/6350854/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6350854",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THAKURBARI PWSS",
+                "localname": "RETROFITTING OF THAKURBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6350854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THAKURBARI PWSS",
+                        "localname": "RETROFITTING OF THAKURBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THAKURBARI PWSS",
+                "localname": "RETROFITTING OF THAKURBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6350854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THAKURBARI PWSS",
+                        "localname": "RETROFITTING OF THAKURBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350854/ws-services-calculation/Penalty.json b/data/as/6350854/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c3766b479f
--- /dev/null
+++ b/data/as/6350854/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6350854",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6350854/ws-services-calculation/WCBillingSlab.json b/data/as/6350854/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fc512b7e7
--- /dev/null
+++ b/data/as/6350854/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6350854",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385531/BillingService/BusinessService.json b/data/as/6385531/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f9b6cf7ea
--- /dev/null
+++ b/data/as/6385531/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385531",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385531/egov-location/boundary-data.json b/data/as/6385531/egov-location/boundary-data.json
new file mode 100644
index 0000000000..325a099591
--- /dev/null
+++ b/data/as/6385531/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385531",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILGHAGARI PWSS",
+                "localname": "RETROFITTING OF SILGHAGARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILGHAGARI PWSS",
+                        "localname": "RETROFITTING OF SILGHAGARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILGHAGARI PWSS",
+                "localname": "RETROFITTING OF SILGHAGARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILGHAGARI PWSS",
+                        "localname": "RETROFITTING OF SILGHAGARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385531/ws-services-calculation/Penalty.json b/data/as/6385531/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6e1d3cdacd
--- /dev/null
+++ b/data/as/6385531/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385531",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385531/ws-services-calculation/WCBillingSlab.json b/data/as/6385531/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6cad319132
--- /dev/null
+++ b/data/as/6385531/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385531",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385536/BillingService/BusinessService.json b/data/as/6385536/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1c206b0118
--- /dev/null
+++ b/data/as/6385536/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385536",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385536/egov-location/boundary-data.json b/data/as/6385536/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f1095730e6
--- /dev/null
+++ b/data/as/6385536/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385536",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHATOWAL PWSS",
+                "localname": "RETROFITTING OF KHATOWAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHATOWAL PWSS",
+                        "localname": "RETROFITTING OF KHATOWAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHATOWAL PWSS",
+                "localname": "RETROFITTING OF KHATOWAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHATOWAL PWSS",
+                        "localname": "RETROFITTING OF KHATOWAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385536/ws-services-calculation/Penalty.json b/data/as/6385536/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a2d6f934a
--- /dev/null
+++ b/data/as/6385536/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385536",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385536/ws-services-calculation/WCBillingSlab.json b/data/as/6385536/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b205db98fb
--- /dev/null
+++ b/data/as/6385536/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385536",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385545/BillingService/BusinessService.json b/data/as/6385545/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f61e0451e
--- /dev/null
+++ b/data/as/6385545/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385545",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385545/egov-location/boundary-data.json b/data/as/6385545/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b000665302
--- /dev/null
+++ b/data/as/6385545/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385545",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHETI PWSS -QA",
+                "localname": "BORBHETI PWSS -QA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHETI PWSS -QA",
+                        "localname": "BORBHETI PWSS -QA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHETI PWSS -QA",
+                "localname": "BORBHETI PWSS -QA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHETI PWSS -QA",
+                        "localname": "BORBHETI PWSS -QA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385545/ws-services-calculation/Penalty.json b/data/as/6385545/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..901edf0bf4
--- /dev/null
+++ b/data/as/6385545/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385545",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385545/ws-services-calculation/WCBillingSlab.json b/data/as/6385545/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad88c76345
--- /dev/null
+++ b/data/as/6385545/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385545",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385554/BillingService/BusinessService.json b/data/as/6385554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3848d6948c
--- /dev/null
+++ b/data/as/6385554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385554/egov-location/boundary-data.json b/data/as/6385554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89daea8c80
--- /dev/null
+++ b/data/as/6385554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PADMAPUR PWSS",
+                "localname": "RETROFITTING OF PADMAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PADMAPUR PWSS",
+                        "localname": "RETROFITTING OF PADMAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PADMAPUR PWSS",
+                "localname": "RETROFITTING OF PADMAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PADMAPUR PWSS",
+                        "localname": "RETROFITTING OF PADMAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385554/ws-services-calculation/Penalty.json b/data/as/6385554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..07060293e0
--- /dev/null
+++ b/data/as/6385554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385554/ws-services-calculation/WCBillingSlab.json b/data/as/6385554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..606ad8d141
--- /dev/null
+++ b/data/as/6385554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385567/BillingService/BusinessService.json b/data/as/6385567/BillingService/BusinessService.json
new file mode 100644
index 0000000000..58e328e76a
--- /dev/null
+++ b/data/as/6385567/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385567",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385567/egov-location/boundary-data.json b/data/as/6385567/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7752a1ddc
--- /dev/null
+++ b/data/as/6385567/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385567",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GADERIJAN PWSS",
+                "localname": "RETROFITTING OF GADERIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385567",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GADERIJAN PWSS",
+                        "localname": "RETROFITTING OF GADERIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GADERIJAN PWSS",
+                "localname": "RETROFITTING OF GADERIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385567",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GADERIJAN PWSS",
+                        "localname": "RETROFITTING OF GADERIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385567/ws-services-calculation/Penalty.json b/data/as/6385567/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c3d0a1644c
--- /dev/null
+++ b/data/as/6385567/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385567",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385567/ws-services-calculation/WCBillingSlab.json b/data/as/6385567/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f105100152
--- /dev/null
+++ b/data/as/6385567/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385567",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385905/BillingService/BusinessService.json b/data/as/6385905/BillingService/BusinessService.json
new file mode 100644
index 0000000000..debe2a024f
--- /dev/null
+++ b/data/as/6385905/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385905",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385905/egov-location/boundary-data.json b/data/as/6385905/egov-location/boundary-data.json
new file mode 100644
index 0000000000..017be1af1d
--- /dev/null
+++ b/data/as/6385905/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385905",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORTOL PWSS",
+                "localname": "RETROFITTING OF BORTOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385905",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORTOL PWSS",
+                        "localname": "RETROFITTING OF BORTOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORTOL PWSS",
+                "localname": "RETROFITTING OF BORTOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385905",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORTOL PWSS",
+                        "localname": "RETROFITTING OF BORTOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385905/ws-services-calculation/Penalty.json b/data/as/6385905/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4dd4e3def2
--- /dev/null
+++ b/data/as/6385905/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385905",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385905/ws-services-calculation/WCBillingSlab.json b/data/as/6385905/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9916a197c9
--- /dev/null
+++ b/data/as/6385905/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385905",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385915/BillingService/BusinessService.json b/data/as/6385915/BillingService/BusinessService.json
new file mode 100644
index 0000000000..083155f592
--- /dev/null
+++ b/data/as/6385915/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385915",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385915/egov-location/boundary-data.json b/data/as/6385915/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0712121d3d
--- /dev/null
+++ b/data/as/6385915/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385915",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHENDAI PWSS",
+                "localname": "RETROFITTING OF DHENDAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHENDAI PWSS",
+                        "localname": "RETROFITTING OF DHENDAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHENDAI PWSS",
+                "localname": "RETROFITTING OF DHENDAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHENDAI PWSS",
+                        "localname": "RETROFITTING OF DHENDAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385915/ws-services-calculation/Penalty.json b/data/as/6385915/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d706e34a9b
--- /dev/null
+++ b/data/as/6385915/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385915",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385915/ws-services-calculation/WCBillingSlab.json b/data/as/6385915/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..916225f619
--- /dev/null
+++ b/data/as/6385915/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385915",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385925/BillingService/BusinessService.json b/data/as/6385925/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a66c4cb958
--- /dev/null
+++ b/data/as/6385925/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6385925",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385925/egov-location/boundary-data.json b/data/as/6385925/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c0938ce6bf
--- /dev/null
+++ b/data/as/6385925/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6385925",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORGHULI PWSS",
+                "localname": "RETROFITTING OF BORGHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385925",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORGHULI PWSS",
+                        "localname": "RETROFITTING OF BORGHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORGHULI PWSS",
+                "localname": "RETROFITTING OF BORGHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6385925",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORGHULI PWSS",
+                        "localname": "RETROFITTING OF BORGHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385925/ws-services-calculation/Penalty.json b/data/as/6385925/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bae810d65d
--- /dev/null
+++ b/data/as/6385925/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6385925",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6385925/ws-services-calculation/WCBillingSlab.json b/data/as/6385925/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5cede3578
--- /dev/null
+++ b/data/as/6385925/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6385925",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6502957/BillingService/BusinessService.json b/data/as/6502957/BillingService/BusinessService.json
new file mode 100644
index 0000000000..81ec3abb5b
--- /dev/null
+++ b/data/as/6502957/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6502957",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6502957/egov-location/boundary-data.json b/data/as/6502957/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74f203b529
--- /dev/null
+++ b/data/as/6502957/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6502957",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARMAKARPARA PWSS",
+                "localname": "KARMAKARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6502957",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARMAKARPARA PWSS",
+                        "localname": "KARMAKARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARMAKARPARA PWSS",
+                "localname": "KARMAKARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6502957",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARMAKARPARA PWSS",
+                        "localname": "KARMAKARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6502957/ws-services-calculation/Penalty.json b/data/as/6502957/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3f1ef32e6
--- /dev/null
+++ b/data/as/6502957/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6502957",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6502957/ws-services-calculation/WCBillingSlab.json b/data/as/6502957/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..89217a8db7
--- /dev/null
+++ b/data/as/6502957/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6502957",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6503042/BillingService/BusinessService.json b/data/as/6503042/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f0ee3e96fe
--- /dev/null
+++ b/data/as/6503042/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6503042",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6503042/egov-location/boundary-data.json b/data/as/6503042/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf8acf3129
--- /dev/null
+++ b/data/as/6503042/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6503042",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KRISHNAI GURIA PT-II PWSS",
+                "localname": "KRISHNAI GURIA PT-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6503042",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KRISHNAI GURIA PT-II PWSS",
+                        "localname": "KRISHNAI GURIA PT-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KRISHNAI GURIA PT-II PWSS",
+                "localname": "KRISHNAI GURIA PT-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6503042",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KRISHNAI GURIA PT-II PWSS",
+                        "localname": "KRISHNAI GURIA PT-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6503042/ws-services-calculation/Penalty.json b/data/as/6503042/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..abeb2e5f1b
--- /dev/null
+++ b/data/as/6503042/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6503042",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6503042/ws-services-calculation/WCBillingSlab.json b/data/as/6503042/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..775d7db8e8
--- /dev/null
+++ b/data/as/6503042/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6503042",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6515973/BillingService/BusinessService.json b/data/as/6515973/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cedb00937e
--- /dev/null
+++ b/data/as/6515973/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6515973",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6515973/egov-location/boundary-data.json b/data/as/6515973/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4a4cd75b8d
--- /dev/null
+++ b/data/as/6515973/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6515973",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAPAGURI PWSS",
+                "localname": "RETROFITTING OF CHAPAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6515973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAPAGURI PWSS",
+                        "localname": "RETROFITTING OF CHAPAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAPAGURI PWSS",
+                "localname": "RETROFITTING OF CHAPAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6515973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAPAGURI PWSS",
+                        "localname": "RETROFITTING OF CHAPAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6515973/ws-services-calculation/Penalty.json b/data/as/6515973/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a66d52977
--- /dev/null
+++ b/data/as/6515973/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6515973",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6515973/ws-services-calculation/WCBillingSlab.json b/data/as/6515973/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a342330218
--- /dev/null
+++ b/data/as/6515973/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6515973",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6516224/BillingService/BusinessService.json b/data/as/6516224/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd774391d4
--- /dev/null
+++ b/data/as/6516224/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6516224",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6516224/egov-location/boundary-data.json b/data/as/6516224/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c6589b0f91
--- /dev/null
+++ b/data/as/6516224/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6516224",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                "localname": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6516224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                        "localname": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                "localname": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6516224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                        "localname": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6516224/ws-services-calculation/Penalty.json b/data/as/6516224/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c55008258d
--- /dev/null
+++ b/data/as/6516224/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6516224",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6516224/ws-services-calculation/WCBillingSlab.json b/data/as/6516224/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..155695f975
--- /dev/null
+++ b/data/as/6516224/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6516224",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6517821/BillingService/BusinessService.json b/data/as/6517821/BillingService/BusinessService.json
new file mode 100644
index 0000000000..330c530380
--- /dev/null
+++ b/data/as/6517821/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6517821",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6517821/egov-location/boundary-data.json b/data/as/6517821/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3c820e75d4
--- /dev/null
+++ b/data/as/6517821/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6517821",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "EXTENTION OF PANIGAON PWSS",
+                "localname": "EXTENTION OF PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6517821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "EXTENTION OF PANIGAON PWSS",
+                        "localname": "EXTENTION OF PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "EXTENTION OF PANIGAON PWSS",
+                "localname": "EXTENTION OF PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6517821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "EXTENTION OF PANIGAON PWSS",
+                        "localname": "EXTENTION OF PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6517821/ws-services-calculation/Penalty.json b/data/as/6517821/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ada8c8d0df
--- /dev/null
+++ b/data/as/6517821/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6517821",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6517821/ws-services-calculation/WCBillingSlab.json b/data/as/6517821/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..14914c1f6a
--- /dev/null
+++ b/data/as/6517821/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6517821",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6520124/BillingService/BusinessService.json b/data/as/6520124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..600d9a5b5e
--- /dev/null
+++ b/data/as/6520124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6520124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6520124/egov-location/boundary-data.json b/data/as/6520124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a621b6f050
--- /dev/null
+++ b/data/as/6520124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6520124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                "localname": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6520124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                        "localname": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                "localname": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6520124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                        "localname": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6520124/ws-services-calculation/Penalty.json b/data/as/6520124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bdc94d1717
--- /dev/null
+++ b/data/as/6520124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6520124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6520124/ws-services-calculation/WCBillingSlab.json b/data/as/6520124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..084ef92b9f
--- /dev/null
+++ b/data/as/6520124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6520124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524893/BillingService/BusinessService.json b/data/as/6524893/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32d7484370
--- /dev/null
+++ b/data/as/6524893/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6524893",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524893/egov-location/boundary-data.json b/data/as/6524893/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48530ea1a6
--- /dev/null
+++ b/data/as/6524893/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6524893",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                "localname": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6524893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                        "localname": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                "localname": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6524893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                        "localname": "RETROFITTING OF LIMBU GAON PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524893/ws-services-calculation/Penalty.json b/data/as/6524893/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3dbb3b7ca5
--- /dev/null
+++ b/data/as/6524893/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6524893",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524893/ws-services-calculation/WCBillingSlab.json b/data/as/6524893/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc805cc00e
--- /dev/null
+++ b/data/as/6524893/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6524893",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524935/BillingService/BusinessService.json b/data/as/6524935/BillingService/BusinessService.json
new file mode 100644
index 0000000000..13856c051b
--- /dev/null
+++ b/data/as/6524935/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6524935",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524935/egov-location/boundary-data.json b/data/as/6524935/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c63f9d3cb5
--- /dev/null
+++ b/data/as/6524935/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6524935",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                "localname": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6524935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                        "localname": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                "localname": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6524935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                        "localname": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524935/ws-services-calculation/Penalty.json b/data/as/6524935/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..595b2dfd3b
--- /dev/null
+++ b/data/as/6524935/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6524935",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6524935/ws-services-calculation/WCBillingSlab.json b/data/as/6524935/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8340f0137c
--- /dev/null
+++ b/data/as/6524935/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6524935",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526507/BillingService/BusinessService.json b/data/as/6526507/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a2a3b98db
--- /dev/null
+++ b/data/as/6526507/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6526507",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526507/egov-location/boundary-data.json b/data/as/6526507/egov-location/boundary-data.json
new file mode 100644
index 0000000000..76ed13a141
--- /dev/null
+++ b/data/as/6526507/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6526507",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYPUR PWSS",
+                "localname": "RETROFITTING OF JOYPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6526507",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYPUR PWSS",
+                        "localname": "RETROFITTING OF JOYPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYPUR PWSS",
+                "localname": "RETROFITTING OF JOYPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6526507",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYPUR PWSS",
+                        "localname": "RETROFITTING OF JOYPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526507/ws-services-calculation/Penalty.json b/data/as/6526507/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..87e80f2166
--- /dev/null
+++ b/data/as/6526507/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6526507",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526507/ws-services-calculation/WCBillingSlab.json b/data/as/6526507/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad6dd87b46
--- /dev/null
+++ b/data/as/6526507/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6526507",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526593/BillingService/BusinessService.json b/data/as/6526593/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f8eb346d6a
--- /dev/null
+++ b/data/as/6526593/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6526593",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526593/egov-location/boundary-data.json b/data/as/6526593/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cffa521fa8
--- /dev/null
+++ b/data/as/6526593/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6526593",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                "localname": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6526593",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                        "localname": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                "localname": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6526593",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                        "localname": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526593/ws-services-calculation/Penalty.json b/data/as/6526593/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9b7c50c51
--- /dev/null
+++ b/data/as/6526593/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6526593",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526593/ws-services-calculation/WCBillingSlab.json b/data/as/6526593/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3f056a5275
--- /dev/null
+++ b/data/as/6526593/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6526593",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526646/BillingService/BusinessService.json b/data/as/6526646/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a624fc6392
--- /dev/null
+++ b/data/as/6526646/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6526646",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526646/egov-location/boundary-data.json b/data/as/6526646/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c215f3460c
--- /dev/null
+++ b/data/as/6526646/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6526646",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                "localname": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6526646",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                        "localname": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                "localname": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6526646",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                        "localname": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526646/ws-services-calculation/Penalty.json b/data/as/6526646/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05d51ad408
--- /dev/null
+++ b/data/as/6526646/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6526646",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6526646/ws-services-calculation/WCBillingSlab.json b/data/as/6526646/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..51877667e5
--- /dev/null
+++ b/data/as/6526646/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6526646",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6852674/BillingService/BusinessService.json b/data/as/6852674/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f79a96f8d
--- /dev/null
+++ b/data/as/6852674/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6852674",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6852674/egov-location/boundary-data.json b/data/as/6852674/egov-location/boundary-data.json
new file mode 100644
index 0000000000..595e406f79
--- /dev/null
+++ b/data/as/6852674/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6852674",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHANTINAGAR PWSS",
+                "localname": "SHANTINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6852674",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHANTINAGAR PWSS",
+                        "localname": "SHANTINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHANTINAGAR PWSS",
+                "localname": "SHANTINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6852674",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHANTINAGAR PWSS",
+                        "localname": "SHANTINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6852674/ws-services-calculation/Penalty.json b/data/as/6852674/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..752f765fd8
--- /dev/null
+++ b/data/as/6852674/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6852674",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6852674/ws-services-calculation/WCBillingSlab.json b/data/as/6852674/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..79f2df6e5e
--- /dev/null
+++ b/data/as/6852674/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6852674",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858112/BillingService/BusinessService.json b/data/as/6858112/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1fe4723dba
--- /dev/null
+++ b/data/as/6858112/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6858112",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858112/egov-location/boundary-data.json b/data/as/6858112/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba00f2b7bc
--- /dev/null
+++ b/data/as/6858112/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6858112",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERMOHRA PWSS",
+                "localname": "KHERMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6858112",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERMOHRA PWSS",
+                        "localname": "KHERMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERMOHRA PWSS",
+                "localname": "KHERMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6858112",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERMOHRA PWSS",
+                        "localname": "KHERMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858112/ws-services-calculation/Penalty.json b/data/as/6858112/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf43669996
--- /dev/null
+++ b/data/as/6858112/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6858112",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858112/ws-services-calculation/WCBillingSlab.json b/data/as/6858112/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a94deb0d81
--- /dev/null
+++ b/data/as/6858112/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6858112",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858114/BillingService/BusinessService.json b/data/as/6858114/BillingService/BusinessService.json
new file mode 100644
index 0000000000..67339e8227
--- /dev/null
+++ b/data/as/6858114/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6858114",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858114/egov-location/boundary-data.json b/data/as/6858114/egov-location/boundary-data.json
new file mode 100644
index 0000000000..31f8a3fab0
--- /dev/null
+++ b/data/as/6858114/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6858114",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUPDHARA PWSS",
+                "localname": "DHUPDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6858114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUPDHARA PWSS",
+                        "localname": "DHUPDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUPDHARA PWSS",
+                "localname": "DHUPDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6858114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUPDHARA PWSS",
+                        "localname": "DHUPDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858114/ws-services-calculation/Penalty.json b/data/as/6858114/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..912eb0626f
--- /dev/null
+++ b/data/as/6858114/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6858114",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6858114/ws-services-calculation/WCBillingSlab.json b/data/as/6858114/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c31776f1fd
--- /dev/null
+++ b/data/as/6858114/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6858114",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861545/BillingService/BusinessService.json b/data/as/6861545/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c1482bd67c
--- /dev/null
+++ b/data/as/6861545/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6861545",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861545/egov-location/boundary-data.json b/data/as/6861545/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60c6f648ef
--- /dev/null
+++ b/data/as/6861545/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6861545",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASABHUJA DEVASTHAN PWSS",
+                "localname": "DASABHUJA DEVASTHAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6861545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASABHUJA DEVASTHAN PWSS",
+                        "localname": "DASABHUJA DEVASTHAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASABHUJA DEVASTHAN PWSS",
+                "localname": "DASABHUJA DEVASTHAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6861545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASABHUJA DEVASTHAN PWSS",
+                        "localname": "DASABHUJA DEVASTHAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861545/ws-services-calculation/Penalty.json b/data/as/6861545/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b32cab7fff
--- /dev/null
+++ b/data/as/6861545/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6861545",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861545/ws-services-calculation/WCBillingSlab.json b/data/as/6861545/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ae31105449
--- /dev/null
+++ b/data/as/6861545/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6861545",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861639/BillingService/BusinessService.json b/data/as/6861639/BillingService/BusinessService.json
new file mode 100644
index 0000000000..069acc6859
--- /dev/null
+++ b/data/as/6861639/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6861639",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861639/egov-location/boundary-data.json b/data/as/6861639/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c43ecffe36
--- /dev/null
+++ b/data/as/6861639/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6861639",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANDOBA PWSS",
+                "localname": "PANDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6861639",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANDOBA PWSS",
+                        "localname": "PANDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANDOBA PWSS",
+                "localname": "PANDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6861639",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANDOBA PWSS",
+                        "localname": "PANDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861639/ws-services-calculation/Penalty.json b/data/as/6861639/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1c89897a6
--- /dev/null
+++ b/data/as/6861639/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6861639",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861639/ws-services-calculation/WCBillingSlab.json b/data/as/6861639/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..798409b777
--- /dev/null
+++ b/data/as/6861639/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6861639",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861642/BillingService/BusinessService.json b/data/as/6861642/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dde8ccf08f
--- /dev/null
+++ b/data/as/6861642/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.6861642",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861642/egov-location/boundary-data.json b/data/as/6861642/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6ec6e4d53d
--- /dev/null
+++ b/data/as/6861642/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.6861642",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAKRI PWSS",
+                "localname": "MAKRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6861642",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAKRI PWSS",
+                        "localname": "MAKRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAKRI PWSS",
+                "localname": "MAKRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.6861642",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAKRI PWSS",
+                        "localname": "MAKRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861642/ws-services-calculation/Penalty.json b/data/as/6861642/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..175b4ca8de
--- /dev/null
+++ b/data/as/6861642/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.6861642",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/6861642/ws-services-calculation/WCBillingSlab.json b/data/as/6861642/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07949bbadc
--- /dev/null
+++ b/data/as/6861642/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.6861642",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7341547/BillingService/BusinessService.json b/data/as/7341547/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7be4747401
--- /dev/null
+++ b/data/as/7341547/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7341547",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7341547/egov-location/boundary-data.json b/data/as/7341547/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ceba907722
--- /dev/null
+++ b/data/as/7341547/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7341547",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ASSUMARI PWSS",
+                "localname": "ASSUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7341547",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ASSUMARI PWSS",
+                        "localname": "ASSUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ASSUMARI PWSS",
+                "localname": "ASSUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7341547",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ASSUMARI PWSS",
+                        "localname": "ASSUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7341547/ws-services-calculation/Penalty.json b/data/as/7341547/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d50085818d
--- /dev/null
+++ b/data/as/7341547/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7341547",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7341547/ws-services-calculation/WCBillingSlab.json b/data/as/7341547/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..adbcf139c4
--- /dev/null
+++ b/data/as/7341547/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7341547",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7343676/BillingService/BusinessService.json b/data/as/7343676/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a3e0472fd3
--- /dev/null
+++ b/data/as/7343676/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7343676",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7343676/egov-location/boundary-data.json b/data/as/7343676/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2de6a66d77
--- /dev/null
+++ b/data/as/7343676/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7343676",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BORCHALLA PWSS",
+                "localname": "NIZ BORCHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7343676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BORCHALLA PWSS",
+                        "localname": "NIZ BORCHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BORCHALLA PWSS",
+                "localname": "NIZ BORCHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7343676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BORCHALLA PWSS",
+                        "localname": "NIZ BORCHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7343676/ws-services-calculation/Penalty.json b/data/as/7343676/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f5df6c4ab
--- /dev/null
+++ b/data/as/7343676/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7343676",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7343676/ws-services-calculation/WCBillingSlab.json b/data/as/7343676/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9eaf9148ad
--- /dev/null
+++ b/data/as/7343676/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7343676",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347016/BillingService/BusinessService.json b/data/as/7347016/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b0ffea597c
--- /dev/null
+++ b/data/as/7347016/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7347016",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347016/egov-location/boundary-data.json b/data/as/7347016/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f39d24094
--- /dev/null
+++ b/data/as/7347016/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7347016",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGIA PT II PWSS",
+                "localname": "AGIA PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7347016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGIA PT II PWSS",
+                        "localname": "AGIA PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGIA PT II PWSS",
+                "localname": "AGIA PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7347016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGIA PT II PWSS",
+                        "localname": "AGIA PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347016/ws-services-calculation/Penalty.json b/data/as/7347016/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..da9f31de14
--- /dev/null
+++ b/data/as/7347016/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7347016",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347016/ws-services-calculation/WCBillingSlab.json b/data/as/7347016/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c43e23fd6
--- /dev/null
+++ b/data/as/7347016/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7347016",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347032/BillingService/BusinessService.json b/data/as/7347032/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3acf490171
--- /dev/null
+++ b/data/as/7347032/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7347032",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347032/egov-location/boundary-data.json b/data/as/7347032/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb724d3a6f
--- /dev/null
+++ b/data/as/7347032/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7347032",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALADMARI CHAR PT I PWSS",
+                "localname": "BALADMARI CHAR PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7347032",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALADMARI CHAR PT I PWSS",
+                        "localname": "BALADMARI CHAR PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALADMARI CHAR PT I PWSS",
+                "localname": "BALADMARI CHAR PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7347032",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALADMARI CHAR PT I PWSS",
+                        "localname": "BALADMARI CHAR PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347032/ws-services-calculation/Penalty.json b/data/as/7347032/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c7e866e16
--- /dev/null
+++ b/data/as/7347032/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7347032",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347032/ws-services-calculation/WCBillingSlab.json b/data/as/7347032/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d387ea777f
--- /dev/null
+++ b/data/as/7347032/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7347032",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347122/BillingService/BusinessService.json b/data/as/7347122/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6710322351
--- /dev/null
+++ b/data/as/7347122/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7347122",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347122/egov-location/boundary-data.json b/data/as/7347122/egov-location/boundary-data.json
new file mode 100644
index 0000000000..232011489c
--- /dev/null
+++ b/data/as/7347122/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7347122",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANIAPARA NO I PWSS",
+                "localname": "BANIAPARA NO I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7347122",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANIAPARA NO I PWSS",
+                        "localname": "BANIAPARA NO I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANIAPARA NO I PWSS",
+                "localname": "BANIAPARA NO I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7347122",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANIAPARA NO I PWSS",
+                        "localname": "BANIAPARA NO I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347122/ws-services-calculation/Penalty.json b/data/as/7347122/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62754f4da8
--- /dev/null
+++ b/data/as/7347122/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7347122",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7347122/ws-services-calculation/WCBillingSlab.json b/data/as/7347122/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..768351c1fe
--- /dev/null
+++ b/data/as/7347122/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7347122",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7637384/BillingService/BusinessService.json b/data/as/7637384/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3bf6835252
--- /dev/null
+++ b/data/as/7637384/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7637384",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7637384/egov-location/boundary-data.json b/data/as/7637384/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6fc133a04f
--- /dev/null
+++ b/data/as/7637384/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7637384",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESTORATION OF KRISHNAI PWSS",
+                "localname": "RESTORATION OF KRISHNAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7637384",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESTORATION OF KRISHNAI PWSS",
+                        "localname": "RESTORATION OF KRISHNAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESTORATION OF KRISHNAI PWSS",
+                "localname": "RESTORATION OF KRISHNAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7637384",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESTORATION OF KRISHNAI PWSS",
+                        "localname": "RESTORATION OF KRISHNAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7637384/ws-services-calculation/Penalty.json b/data/as/7637384/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a11a10f7ea
--- /dev/null
+++ b/data/as/7637384/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7637384",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7637384/ws-services-calculation/WCBillingSlab.json b/data/as/7637384/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8734cf89c6
--- /dev/null
+++ b/data/as/7637384/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7637384",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7893876/BillingService/BusinessService.json b/data/as/7893876/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b21b04ed50
--- /dev/null
+++ b/data/as/7893876/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7893876",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7893876/egov-location/boundary-data.json b/data/as/7893876/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b9106dc492
--- /dev/null
+++ b/data/as/7893876/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7893876",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGSAPARA PWSS",
+                "localname": "RANGSAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7893876",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGSAPARA PWSS",
+                        "localname": "RANGSAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGSAPARA PWSS",
+                "localname": "RANGSAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7893876",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGSAPARA PWSS",
+                        "localname": "RANGSAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7893876/ws-services-calculation/Penalty.json b/data/as/7893876/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..58297b4493
--- /dev/null
+++ b/data/as/7893876/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7893876",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7893876/ws-services-calculation/WCBillingSlab.json b/data/as/7893876/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b3a97eea1
--- /dev/null
+++ b/data/as/7893876/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7893876",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7894596/BillingService/BusinessService.json b/data/as/7894596/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35913e8c3f
--- /dev/null
+++ b/data/as/7894596/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7894596",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7894596/egov-location/boundary-data.json b/data/as/7894596/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4aa4b307e2
--- /dev/null
+++ b/data/as/7894596/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7894596",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                "localname": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7894596",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                        "localname": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                "localname": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7894596",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                        "localname": "RETROFITTING OF SOOTEA NO. 2 (SAGY)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7894596/ws-services-calculation/Penalty.json b/data/as/7894596/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b2ea400be
--- /dev/null
+++ b/data/as/7894596/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7894596",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7894596/ws-services-calculation/WCBillingSlab.json b/data/as/7894596/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9683b79ef9
--- /dev/null
+++ b/data/as/7894596/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7894596",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898565/BillingService/BusinessService.json b/data/as/7898565/BillingService/BusinessService.json
new file mode 100644
index 0000000000..902a9a592a
--- /dev/null
+++ b/data/as/7898565/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898565",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898565/egov-location/boundary-data.json b/data/as/7898565/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0dd7aa9681
--- /dev/null
+++ b/data/as/7898565/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898565",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAMRAPATHAR PWSS (SWAJAL)",
+                "localname": "BHAMRAPATHAR PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898565",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAMRAPATHAR PWSS (SWAJAL)",
+                        "localname": "BHAMRAPATHAR PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAMRAPATHAR PWSS (SWAJAL)",
+                "localname": "BHAMRAPATHAR PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898565",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAMRAPATHAR PWSS (SWAJAL)",
+                        "localname": "BHAMRAPATHAR PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898565/ws-services-calculation/Penalty.json b/data/as/7898565/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd2daa866f
--- /dev/null
+++ b/data/as/7898565/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898565",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898565/ws-services-calculation/WCBillingSlab.json b/data/as/7898565/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9af3766710
--- /dev/null
+++ b/data/as/7898565/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898565",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898568/BillingService/BusinessService.json b/data/as/7898568/BillingService/BusinessService.json
new file mode 100644
index 0000000000..250984d89e
--- /dev/null
+++ b/data/as/7898568/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898568",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898568/egov-location/boundary-data.json b/data/as/7898568/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03f797f063
--- /dev/null
+++ b/data/as/7898568/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898568",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS (SWAJAL)",
+                "localname": "SALPARA PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898568",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS (SWAJAL)",
+                        "localname": "SALPARA PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS (SWAJAL)",
+                "localname": "SALPARA PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898568",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS (SWAJAL)",
+                        "localname": "SALPARA PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898568/ws-services-calculation/Penalty.json b/data/as/7898568/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c624bbc59
--- /dev/null
+++ b/data/as/7898568/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898568",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898568/ws-services-calculation/WCBillingSlab.json b/data/as/7898568/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db28e68c7a
--- /dev/null
+++ b/data/as/7898568/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898568",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898570/BillingService/BusinessService.json b/data/as/7898570/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9600b13ee4
--- /dev/null
+++ b/data/as/7898570/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898570",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898570/egov-location/boundary-data.json b/data/as/7898570/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4be25b73c4
--- /dev/null
+++ b/data/as/7898570/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898570",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHIALKANDA PWSS ( SWAJAL)",
+                "localname": "SHIALKANDA PWSS ( SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHIALKANDA PWSS ( SWAJAL)",
+                        "localname": "SHIALKANDA PWSS ( SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHIALKANDA PWSS ( SWAJAL)",
+                "localname": "SHIALKANDA PWSS ( SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHIALKANDA PWSS ( SWAJAL)",
+                        "localname": "SHIALKANDA PWSS ( SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898570/ws-services-calculation/Penalty.json b/data/as/7898570/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3fd069cd78
--- /dev/null
+++ b/data/as/7898570/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898570",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898570/ws-services-calculation/WCBillingSlab.json b/data/as/7898570/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..febc2fa019
--- /dev/null
+++ b/data/as/7898570/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898570",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898571/BillingService/BusinessService.json b/data/as/7898571/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ff03a2702
--- /dev/null
+++ b/data/as/7898571/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898571",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898571/egov-location/boundary-data.json b/data/as/7898571/egov-location/boundary-data.json
new file mode 100644
index 0000000000..09102d1977
--- /dev/null
+++ b/data/as/7898571/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898571",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALAKURA PWSS (SWAJAL)",
+                "localname": "CHALAKURA PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALAKURA PWSS (SWAJAL)",
+                        "localname": "CHALAKURA PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALAKURA PWSS (SWAJAL)",
+                "localname": "CHALAKURA PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALAKURA PWSS (SWAJAL)",
+                        "localname": "CHALAKURA PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898571/ws-services-calculation/Penalty.json b/data/as/7898571/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d5bfe160ba
--- /dev/null
+++ b/data/as/7898571/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898571",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898571/ws-services-calculation/WCBillingSlab.json b/data/as/7898571/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f7ee2abc9b
--- /dev/null
+++ b/data/as/7898571/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898571",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898573/BillingService/BusinessService.json b/data/as/7898573/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c3bb39e3dd
--- /dev/null
+++ b/data/as/7898573/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898573",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898573/egov-location/boundary-data.json b/data/as/7898573/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b9730ab1a
--- /dev/null
+++ b/data/as/7898573/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898573",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURARPAR PWSS (SWAJAL)",
+                "localname": "KURARPAR PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898573",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURARPAR PWSS (SWAJAL)",
+                        "localname": "KURARPAR PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURARPAR PWSS (SWAJAL)",
+                "localname": "KURARPAR PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898573",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURARPAR PWSS (SWAJAL)",
+                        "localname": "KURARPAR PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898573/ws-services-calculation/Penalty.json b/data/as/7898573/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..33011098d6
--- /dev/null
+++ b/data/as/7898573/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898573",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898573/ws-services-calculation/WCBillingSlab.json b/data/as/7898573/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..59adf11b8e
--- /dev/null
+++ b/data/as/7898573/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898573",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898574/BillingService/BusinessService.json b/data/as/7898574/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2743c830ec
--- /dev/null
+++ b/data/as/7898574/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898574",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898574/egov-location/boundary-data.json b/data/as/7898574/egov-location/boundary-data.json
new file mode 100644
index 0000000000..94c311192e
--- /dev/null
+++ b/data/as/7898574/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898574",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHPARA PWSS (SWAJAL)",
+                "localname": "PACHPARA PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHPARA PWSS (SWAJAL)",
+                        "localname": "PACHPARA PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHPARA PWSS (SWAJAL)",
+                "localname": "PACHPARA PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHPARA PWSS (SWAJAL)",
+                        "localname": "PACHPARA PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898574/ws-services-calculation/Penalty.json b/data/as/7898574/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..87ac744faf
--- /dev/null
+++ b/data/as/7898574/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898574",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898574/ws-services-calculation/WCBillingSlab.json b/data/as/7898574/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..247cfb17b4
--- /dev/null
+++ b/data/as/7898574/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898574",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898575/BillingService/BusinessService.json b/data/as/7898575/BillingService/BusinessService.json
new file mode 100644
index 0000000000..133d9fa8c9
--- /dev/null
+++ b/data/as/7898575/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7898575",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898575/egov-location/boundary-data.json b/data/as/7898575/egov-location/boundary-data.json
new file mode 100644
index 0000000000..106656857e
--- /dev/null
+++ b/data/as/7898575/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7898575",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKRAKHUTI PWSS (SWAJAL)",
+                "localname": "BAKRAKHUTI PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKRAKHUTI PWSS (SWAJAL)",
+                        "localname": "BAKRAKHUTI PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKRAKHUTI PWSS (SWAJAL)",
+                "localname": "BAKRAKHUTI PWSS (SWAJAL)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7898575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKRAKHUTI PWSS (SWAJAL)",
+                        "localname": "BAKRAKHUTI PWSS (SWAJAL)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898575/ws-services-calculation/Penalty.json b/data/as/7898575/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c0015c1978
--- /dev/null
+++ b/data/as/7898575/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7898575",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7898575/ws-services-calculation/WCBillingSlab.json b/data/as/7898575/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a42ba5b12d
--- /dev/null
+++ b/data/as/7898575/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7898575",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971619/BillingService/BusinessService.json b/data/as/7971619/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ef480637d5
--- /dev/null
+++ b/data/as/7971619/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7971619",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971619/egov-location/boundary-data.json b/data/as/7971619/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52d92affd8
--- /dev/null
+++ b/data/as/7971619/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7971619",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIRSING PT I MPWSS",
+                "localname": "BIRSING PT I MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7971619",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIRSING PT I MPWSS",
+                        "localname": "BIRSING PT I MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIRSING PT I MPWSS",
+                "localname": "BIRSING PT I MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7971619",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIRSING PT I MPWSS",
+                        "localname": "BIRSING PT I MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971619/ws-services-calculation/Penalty.json b/data/as/7971619/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..21e7c25a7f
--- /dev/null
+++ b/data/as/7971619/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7971619",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971619/ws-services-calculation/WCBillingSlab.json b/data/as/7971619/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f41d1ab786
--- /dev/null
+++ b/data/as/7971619/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7971619",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971866/BillingService/BusinessService.json b/data/as/7971866/BillingService/BusinessService.json
new file mode 100644
index 0000000000..098aa734f8
--- /dev/null
+++ b/data/as/7971866/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.7971866",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971866/egov-location/boundary-data.json b/data/as/7971866/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dcd28ad12c
--- /dev/null
+++ b/data/as/7971866/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.7971866",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIMURA T.E. MPWSS",
+                "localname": "HARIMURA T.E. MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7971866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIMURA T.E. MPWSS",
+                        "localname": "HARIMURA T.E. MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIMURA T.E. MPWSS",
+                "localname": "HARIMURA T.E. MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.7971866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIMURA T.E. MPWSS",
+                        "localname": "HARIMURA T.E. MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971866/ws-services-calculation/Penalty.json b/data/as/7971866/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1b48dd3469
--- /dev/null
+++ b/data/as/7971866/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.7971866",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/7971866/ws-services-calculation/WCBillingSlab.json b/data/as/7971866/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c9d3ef16f
--- /dev/null
+++ b/data/as/7971866/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.7971866",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036124/BillingService/BusinessService.json b/data/as/8036124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2fed7e81b1
--- /dev/null
+++ b/data/as/8036124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8036124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036124/egov-location/boundary-data.json b/data/as/8036124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b31d6212e
--- /dev/null
+++ b/data/as/8036124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8036124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIDRA  BAGUAN PWSS SWAJAL",
+                "localname": "HARIDRA  BAGUAN PWSS SWAJAL",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8036124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIDRA  BAGUAN PWSS SWAJAL",
+                        "localname": "HARIDRA  BAGUAN PWSS SWAJAL",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIDRA  BAGUAN PWSS SWAJAL",
+                "localname": "HARIDRA  BAGUAN PWSS SWAJAL",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8036124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIDRA  BAGUAN PWSS SWAJAL",
+                        "localname": "HARIDRA  BAGUAN PWSS SWAJAL",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036124/ws-services-calculation/Penalty.json b/data/as/8036124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5aa77d577
--- /dev/null
+++ b/data/as/8036124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8036124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036124/ws-services-calculation/WCBillingSlab.json b/data/as/8036124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31ffc80c91
--- /dev/null
+++ b/data/as/8036124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8036124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036130/BillingService/BusinessService.json b/data/as/8036130/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7230c35604
--- /dev/null
+++ b/data/as/8036130/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8036130",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036130/egov-location/boundary-data.json b/data/as/8036130/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c29c3af592
--- /dev/null
+++ b/data/as/8036130/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8036130",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESERVE DAKHINPARA PWSS SWAJAL",
+                "localname": "RESERVE DAKHINPARA PWSS SWAJAL",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8036130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESERVE DAKHINPARA PWSS SWAJAL",
+                        "localname": "RESERVE DAKHINPARA PWSS SWAJAL",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESERVE DAKHINPARA PWSS SWAJAL",
+                "localname": "RESERVE DAKHINPARA PWSS SWAJAL",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8036130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESERVE DAKHINPARA PWSS SWAJAL",
+                        "localname": "RESERVE DAKHINPARA PWSS SWAJAL",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036130/ws-services-calculation/Penalty.json b/data/as/8036130/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f587528bdb
--- /dev/null
+++ b/data/as/8036130/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8036130",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8036130/ws-services-calculation/WCBillingSlab.json b/data/as/8036130/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6bb15a091a
--- /dev/null
+++ b/data/as/8036130/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8036130",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8131608/BillingService/BusinessService.json b/data/as/8131608/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e17993fc2
--- /dev/null
+++ b/data/as/8131608/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8131608",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8131608/egov-location/boundary-data.json b/data/as/8131608/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca1bb3c3d8
--- /dev/null
+++ b/data/as/8131608/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8131608",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATHALUPATHAR PWSS",
+                "localname": "RETROFITTING OF KATHALUPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8131608",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATHALUPATHAR PWSS",
+                        "localname": "RETROFITTING OF KATHALUPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATHALUPATHAR PWSS",
+                "localname": "RETROFITTING OF KATHALUPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8131608",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATHALUPATHAR PWSS",
+                        "localname": "RETROFITTING OF KATHALUPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8131608/ws-services-calculation/Penalty.json b/data/as/8131608/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..163adb3c93
--- /dev/null
+++ b/data/as/8131608/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8131608",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8131608/ws-services-calculation/WCBillingSlab.json b/data/as/8131608/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..175640d183
--- /dev/null
+++ b/data/as/8131608/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8131608",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132115/BillingService/BusinessService.json b/data/as/8132115/BillingService/BusinessService.json
new file mode 100644
index 0000000000..163b9e9873
--- /dev/null
+++ b/data/as/8132115/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132115",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132115/egov-location/boundary-data.json b/data/as/8132115/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ee62172ef
--- /dev/null
+++ b/data/as/8132115/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132115",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRI PWSS",
+                "localname": "RETROFITTING OF SINGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRI PWSS",
+                        "localname": "RETROFITTING OF SINGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRI PWSS",
+                "localname": "RETROFITTING OF SINGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRI PWSS",
+                        "localname": "RETROFITTING OF SINGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132115/ws-services-calculation/Penalty.json b/data/as/8132115/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf97a9e3fb
--- /dev/null
+++ b/data/as/8132115/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132115",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132115/ws-services-calculation/WCBillingSlab.json b/data/as/8132115/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b95175a6db
--- /dev/null
+++ b/data/as/8132115/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132115",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132124/BillingService/BusinessService.json b/data/as/8132124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6bd9d0ccc1
--- /dev/null
+++ b/data/as/8132124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132124/egov-location/boundary-data.json b/data/as/8132124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a74fef734d
--- /dev/null
+++ b/data/as/8132124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BURAGARUDUBA PWSS",
+                "localname": "RETROFITTING OF BURAGARUDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BURAGARUDUBA PWSS",
+                        "localname": "RETROFITTING OF BURAGARUDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BURAGARUDUBA PWSS",
+                "localname": "RETROFITTING OF BURAGARUDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BURAGARUDUBA PWSS",
+                        "localname": "RETROFITTING OF BURAGARUDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132124/ws-services-calculation/Penalty.json b/data/as/8132124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a72a8a839
--- /dev/null
+++ b/data/as/8132124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132124/ws-services-calculation/WCBillingSlab.json b/data/as/8132124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b7a23340b7
--- /dev/null
+++ b/data/as/8132124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132128/BillingService/BusinessService.json b/data/as/8132128/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aacc1c53a8
--- /dev/null
+++ b/data/as/8132128/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132128",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132128/egov-location/boundary-data.json b/data/as/8132128/egov-location/boundary-data.json
new file mode 100644
index 0000000000..73cfd181a2
--- /dev/null
+++ b/data/as/8132128/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132128",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MONOJULI PWSS",
+                "localname": "RETROFITTING OF MONOJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MONOJULI PWSS",
+                        "localname": "RETROFITTING OF MONOJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MONOJULI PWSS",
+                "localname": "RETROFITTING OF MONOJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MONOJULI PWSS",
+                        "localname": "RETROFITTING OF MONOJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132128/ws-services-calculation/Penalty.json b/data/as/8132128/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82eac397ce
--- /dev/null
+++ b/data/as/8132128/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132128",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132128/ws-services-calculation/WCBillingSlab.json b/data/as/8132128/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fce6f0b79
--- /dev/null
+++ b/data/as/8132128/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132128",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132750/BillingService/BusinessService.json b/data/as/8132750/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32b17afe6b
--- /dev/null
+++ b/data/as/8132750/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132750",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132750/egov-location/boundary-data.json b/data/as/8132750/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc16595568
--- /dev/null
+++ b/data/as/8132750/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132750",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SITALMARI PWSS",
+                "localname": "RETROFITTING OF SITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132750",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SITALMARI PWSS",
+                        "localname": "RETROFITTING OF SITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SITALMARI PWSS",
+                "localname": "RETROFITTING OF SITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132750",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SITALMARI PWSS",
+                        "localname": "RETROFITTING OF SITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132750/ws-services-calculation/Penalty.json b/data/as/8132750/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1cb3cfdf33
--- /dev/null
+++ b/data/as/8132750/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132750",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132750/ws-services-calculation/WCBillingSlab.json b/data/as/8132750/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..51fd012078
--- /dev/null
+++ b/data/as/8132750/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132750",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132803/BillingService/BusinessService.json b/data/as/8132803/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c3b679736f
--- /dev/null
+++ b/data/as/8132803/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132803",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132803/egov-location/boundary-data.json b/data/as/8132803/egov-location/boundary-data.json
new file mode 100644
index 0000000000..083ac0c644
--- /dev/null
+++ b/data/as/8132803/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132803",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF OUBARI PWSS",
+                "localname": "RETROFITTING OF OUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF OUBARI PWSS",
+                        "localname": "RETROFITTING OF OUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF OUBARI PWSS",
+                "localname": "RETROFITTING OF OUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF OUBARI PWSS",
+                        "localname": "RETROFITTING OF OUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132803/ws-services-calculation/Penalty.json b/data/as/8132803/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c1962cbb55
--- /dev/null
+++ b/data/as/8132803/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132803",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132803/ws-services-calculation/WCBillingSlab.json b/data/as/8132803/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6d909624b
--- /dev/null
+++ b/data/as/8132803/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132803",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132805/BillingService/BusinessService.json b/data/as/8132805/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a40fe76c6c
--- /dev/null
+++ b/data/as/8132805/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132805",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132805/egov-location/boundary-data.json b/data/as/8132805/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bdc728ff7c
--- /dev/null
+++ b/data/as/8132805/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132805",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALISIHA PWSS",
+                "localname": "RETROFITTING OF BALISIHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALISIHA PWSS",
+                        "localname": "RETROFITTING OF BALISIHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALISIHA PWSS",
+                "localname": "RETROFITTING OF BALISIHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALISIHA PWSS",
+                        "localname": "RETROFITTING OF BALISIHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132805/ws-services-calculation/Penalty.json b/data/as/8132805/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..76c633c6d9
--- /dev/null
+++ b/data/as/8132805/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132805",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132805/ws-services-calculation/WCBillingSlab.json b/data/as/8132805/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2ce3dd34ad
--- /dev/null
+++ b/data/as/8132805/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132805",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132840/BillingService/BusinessService.json b/data/as/8132840/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0c25b07d37
--- /dev/null
+++ b/data/as/8132840/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132840",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132840/egov-location/boundary-data.json b/data/as/8132840/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2bcb91448b
--- /dev/null
+++ b/data/as/8132840/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132840",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATANIGAON PWSS",
+                "localname": "RETROFITTING OF KATANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132840",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATANIGAON PWSS",
+                        "localname": "RETROFITTING OF KATANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATANIGAON PWSS",
+                "localname": "RETROFITTING OF KATANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132840",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATANIGAON PWSS",
+                        "localname": "RETROFITTING OF KATANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132840/ws-services-calculation/Penalty.json b/data/as/8132840/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..47d35078a8
--- /dev/null
+++ b/data/as/8132840/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132840",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132840/ws-services-calculation/WCBillingSlab.json b/data/as/8132840/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0c04649e75
--- /dev/null
+++ b/data/as/8132840/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132840",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132845/BillingService/BusinessService.json b/data/as/8132845/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36ecb3e356
--- /dev/null
+++ b/data/as/8132845/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132845",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132845/egov-location/boundary-data.json b/data/as/8132845/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49f5fe8409
--- /dev/null
+++ b/data/as/8132845/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132845",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI NO.2 PWSS",
+                "localname": "RETROFITTING OF SOPAI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI NO.2 PWSS",
+                        "localname": "RETROFITTING OF SOPAI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI NO.2 PWSS",
+                "localname": "RETROFITTING OF SOPAI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI NO.2 PWSS",
+                        "localname": "RETROFITTING OF SOPAI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132845/ws-services-calculation/Penalty.json b/data/as/8132845/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9062c1cc63
--- /dev/null
+++ b/data/as/8132845/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132845",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132845/ws-services-calculation/WCBillingSlab.json b/data/as/8132845/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3216e3572f
--- /dev/null
+++ b/data/as/8132845/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132845",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132847/BillingService/BusinessService.json b/data/as/8132847/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc9d90a278
--- /dev/null
+++ b/data/as/8132847/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132847",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132847/egov-location/boundary-data.json b/data/as/8132847/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15483375ab
--- /dev/null
+++ b/data/as/8132847/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132847",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI NO.3 PWSS",
+                "localname": "RETROFITTING OF SOPAI NO.3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132847",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI NO.3 PWSS",
+                        "localname": "RETROFITTING OF SOPAI NO.3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI NO.3 PWSS",
+                "localname": "RETROFITTING OF SOPAI NO.3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132847",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI NO.3 PWSS",
+                        "localname": "RETROFITTING OF SOPAI NO.3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132847/ws-services-calculation/Penalty.json b/data/as/8132847/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..92e7ff97fb
--- /dev/null
+++ b/data/as/8132847/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132847",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132847/ws-services-calculation/WCBillingSlab.json b/data/as/8132847/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a0dc6d5c9
--- /dev/null
+++ b/data/as/8132847/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132847",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132850/BillingService/BusinessService.json b/data/as/8132850/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9ed3e7ab93
--- /dev/null
+++ b/data/as/8132850/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132850",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132850/egov-location/boundary-data.json b/data/as/8132850/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aa24a45259
--- /dev/null
+++ b/data/as/8132850/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132850",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI NO.4 PWSS",
+                "localname": "RETROFITTING OF SOPAI NO.4 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI NO.4 PWSS",
+                        "localname": "RETROFITTING OF SOPAI NO.4 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI NO.4 PWSS",
+                "localname": "RETROFITTING OF SOPAI NO.4 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI NO.4 PWSS",
+                        "localname": "RETROFITTING OF SOPAI NO.4 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132850/ws-services-calculation/Penalty.json b/data/as/8132850/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c07efda633
--- /dev/null
+++ b/data/as/8132850/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132850",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132850/ws-services-calculation/WCBillingSlab.json b/data/as/8132850/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..639078bb18
--- /dev/null
+++ b/data/as/8132850/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132850",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132861/BillingService/BusinessService.json b/data/as/8132861/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7854f4aa20
--- /dev/null
+++ b/data/as/8132861/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132861",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132861/egov-location/boundary-data.json b/data/as/8132861/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b377c1482f
--- /dev/null
+++ b/data/as/8132861/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132861",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI TE PWSS",
+                "localname": "RETROFITTING OF SOPAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI TE PWSS",
+                        "localname": "RETROFITTING OF SOPAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI TE PWSS",
+                "localname": "RETROFITTING OF SOPAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI TE PWSS",
+                        "localname": "RETROFITTING OF SOPAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132861/ws-services-calculation/Penalty.json b/data/as/8132861/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8c6f8b2710
--- /dev/null
+++ b/data/as/8132861/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132861",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132861/ws-services-calculation/WCBillingSlab.json b/data/as/8132861/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..98bd41b933
--- /dev/null
+++ b/data/as/8132861/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132861",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132866/BillingService/BusinessService.json b/data/as/8132866/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f88827710
--- /dev/null
+++ b/data/as/8132866/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132866",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132866/egov-location/boundary-data.json b/data/as/8132866/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0afc6b2572
--- /dev/null
+++ b/data/as/8132866/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132866",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ARUN TE PWSS",
+                "localname": "RETROFITTING OF ARUN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ARUN TE PWSS",
+                        "localname": "RETROFITTING OF ARUN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ARUN TE PWSS",
+                "localname": "RETROFITTING OF ARUN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ARUN TE PWSS",
+                        "localname": "RETROFITTING OF ARUN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132866/ws-services-calculation/Penalty.json b/data/as/8132866/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4c99e1348f
--- /dev/null
+++ b/data/as/8132866/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132866",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132866/ws-services-calculation/WCBillingSlab.json b/data/as/8132866/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..122ad99b08
--- /dev/null
+++ b/data/as/8132866/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132866",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132870/BillingService/BusinessService.json b/data/as/8132870/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e0112a26e
--- /dev/null
+++ b/data/as/8132870/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132870",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132870/egov-location/boundary-data.json b/data/as/8132870/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3f534e8a8
--- /dev/null
+++ b/data/as/8132870/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132870",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HUGRAJULI PWSS",
+                "localname": "RETROFITTING OF HUGRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HUGRAJULI PWSS",
+                        "localname": "RETROFITTING OF HUGRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HUGRAJULI PWSS",
+                "localname": "RETROFITTING OF HUGRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HUGRAJULI PWSS",
+                        "localname": "RETROFITTING OF HUGRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132870/ws-services-calculation/Penalty.json b/data/as/8132870/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f7c205fcfb
--- /dev/null
+++ b/data/as/8132870/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132870",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132870/ws-services-calculation/WCBillingSlab.json b/data/as/8132870/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e83b61b46
--- /dev/null
+++ b/data/as/8132870/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132870",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132892/BillingService/BusinessService.json b/data/as/8132892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7c0d69bf28
--- /dev/null
+++ b/data/as/8132892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8132892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132892/egov-location/boundary-data.json b/data/as/8132892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..45496c3dca
--- /dev/null
+++ b/data/as/8132892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8132892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF OSURMARI PWSS",
+                "localname": "RETROFITTING OF OSURMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF OSURMARI PWSS",
+                        "localname": "RETROFITTING OF OSURMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF OSURMARI PWSS",
+                "localname": "RETROFITTING OF OSURMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8132892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF OSURMARI PWSS",
+                        "localname": "RETROFITTING OF OSURMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132892/ws-services-calculation/Penalty.json b/data/as/8132892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee63c4994f
--- /dev/null
+++ b/data/as/8132892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8132892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8132892/ws-services-calculation/WCBillingSlab.json b/data/as/8132892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1dd150dfe4
--- /dev/null
+++ b/data/as/8132892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8132892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8137635/BillingService/BusinessService.json b/data/as/8137635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11ba5af9cd
--- /dev/null
+++ b/data/as/8137635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8137635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8137635/egov-location/boundary-data.json b/data/as/8137635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..928b777885
--- /dev/null
+++ b/data/as/8137635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8137635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                "localname": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8137635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                        "localname": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                "localname": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8137635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                        "localname": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8137635/ws-services-calculation/Penalty.json b/data/as/8137635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..09da931bf4
--- /dev/null
+++ b/data/as/8137635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8137635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8137635/ws-services-calculation/WCBillingSlab.json b/data/as/8137635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf24594d6a
--- /dev/null
+++ b/data/as/8137635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8137635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138120/BillingService/BusinessService.json b/data/as/8138120/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b82337bb0
--- /dev/null
+++ b/data/as/8138120/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8138120",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138120/egov-location/boundary-data.json b/data/as/8138120/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5ad65fef8
--- /dev/null
+++ b/data/as/8138120/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8138120",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORATI PWSS",
+                "localname": "RETROFITTING OF BORATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8138120",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORATI PWSS",
+                        "localname": "RETROFITTING OF BORATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORATI PWSS",
+                "localname": "RETROFITTING OF BORATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8138120",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORATI PWSS",
+                        "localname": "RETROFITTING OF BORATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138120/ws-services-calculation/Penalty.json b/data/as/8138120/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0c4cb0d1a2
--- /dev/null
+++ b/data/as/8138120/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8138120",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138120/ws-services-calculation/WCBillingSlab.json b/data/as/8138120/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5237b0caa4
--- /dev/null
+++ b/data/as/8138120/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8138120",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138164/BillingService/BusinessService.json b/data/as/8138164/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd0f71ad82
--- /dev/null
+++ b/data/as/8138164/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8138164",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138164/egov-location/boundary-data.json b/data/as/8138164/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06e6e5b851
--- /dev/null
+++ b/data/as/8138164/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8138164",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHAGRA KACHARI",
+                "localname": "RETROFITTING OF GHAGRA KACHARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8138164",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHAGRA KACHARI",
+                        "localname": "RETROFITTING OF GHAGRA KACHARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHAGRA KACHARI",
+                "localname": "RETROFITTING OF GHAGRA KACHARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8138164",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHAGRA KACHARI",
+                        "localname": "RETROFITTING OF GHAGRA KACHARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138164/ws-services-calculation/Penalty.json b/data/as/8138164/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ae18a1582
--- /dev/null
+++ b/data/as/8138164/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8138164",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8138164/ws-services-calculation/WCBillingSlab.json b/data/as/8138164/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e26ec7fd52
--- /dev/null
+++ b/data/as/8138164/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8138164",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8140993/BillingService/BusinessService.json b/data/as/8140993/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46dfd683ff
--- /dev/null
+++ b/data/as/8140993/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8140993",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8140993/egov-location/boundary-data.json b/data/as/8140993/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f6c0cce91
--- /dev/null
+++ b/data/as/8140993/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8140993",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARBARI PWSS",
+                "localname": "RETROFITTING OF NAHARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8140993",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARBARI PWSS",
+                        "localname": "RETROFITTING OF NAHARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARBARI PWSS",
+                "localname": "RETROFITTING OF NAHARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8140993",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARBARI PWSS",
+                        "localname": "RETROFITTING OF NAHARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8140993/ws-services-calculation/Penalty.json b/data/as/8140993/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..803bc9ac65
--- /dev/null
+++ b/data/as/8140993/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8140993",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8140993/ws-services-calculation/WCBillingSlab.json b/data/as/8140993/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7947dda9a1
--- /dev/null
+++ b/data/as/8140993/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8140993",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141044/BillingService/BusinessService.json b/data/as/8141044/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e0a655f44b
--- /dev/null
+++ b/data/as/8141044/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141044",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141044/egov-location/boundary-data.json b/data/as/8141044/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f95f52b04f
--- /dev/null
+++ b/data/as/8141044/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141044",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SHYMAGURI ",
+                "localname": "RETROFITTING OF SHYMAGURI ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SHYMAGURI ",
+                        "localname": "RETROFITTING OF SHYMAGURI ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SHYMAGURI ",
+                "localname": "RETROFITTING OF SHYMAGURI ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SHYMAGURI ",
+                        "localname": "RETROFITTING OF SHYMAGURI ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141044/ws-services-calculation/Penalty.json b/data/as/8141044/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8eccd63201
--- /dev/null
+++ b/data/as/8141044/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141044",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141044/ws-services-calculation/WCBillingSlab.json b/data/as/8141044/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c723d9020f
--- /dev/null
+++ b/data/as/8141044/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141044",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141062/BillingService/BusinessService.json b/data/as/8141062/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e414b0bf6
--- /dev/null
+++ b/data/as/8141062/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141062",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141062/egov-location/boundary-data.json b/data/as/8141062/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97b7f2316b
--- /dev/null
+++ b/data/as/8141062/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141062",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFFITTING OF BATACHIPUR  PWSS",
+                "localname": "RETROFFITTING OF BATACHIPUR  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFFITTING OF BATACHIPUR  PWSS",
+                        "localname": "RETROFFITTING OF BATACHIPUR  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFFITTING OF BATACHIPUR  PWSS",
+                "localname": "RETROFFITTING OF BATACHIPUR  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFFITTING OF BATACHIPUR  PWSS",
+                        "localname": "RETROFFITTING OF BATACHIPUR  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141062/ws-services-calculation/Penalty.json b/data/as/8141062/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11f008b752
--- /dev/null
+++ b/data/as/8141062/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141062",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141062/ws-services-calculation/WCBillingSlab.json b/data/as/8141062/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0026ff6cc1
--- /dev/null
+++ b/data/as/8141062/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141062",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141109/BillingService/BusinessService.json b/data/as/8141109/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11369c15a6
--- /dev/null
+++ b/data/as/8141109/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141109",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141109/egov-location/boundary-data.json b/data/as/8141109/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9b7d83d52c
--- /dev/null
+++ b/data/as/8141109/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141109",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHENIMARI PWSS",
+                "localname": "RETROFITTING OF CHENIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141109",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHENIMARI PWSS",
+                        "localname": "RETROFITTING OF CHENIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHENIMARI PWSS",
+                "localname": "RETROFITTING OF CHENIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141109",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHENIMARI PWSS",
+                        "localname": "RETROFITTING OF CHENIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141109/ws-services-calculation/Penalty.json b/data/as/8141109/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf46acc314
--- /dev/null
+++ b/data/as/8141109/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141109",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141109/ws-services-calculation/WCBillingSlab.json b/data/as/8141109/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..876238493b
--- /dev/null
+++ b/data/as/8141109/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141109",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141554/BillingService/BusinessService.json b/data/as/8141554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27739410cc
--- /dev/null
+++ b/data/as/8141554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141554/egov-location/boundary-data.json b/data/as/8141554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..04416ae4a0
--- /dev/null
+++ b/data/as/8141554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HIRAJULI TE II PWSS",
+                "localname": "RETROFITTING OF HIRAJULI TE II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HIRAJULI TE II PWSS",
+                        "localname": "RETROFITTING OF HIRAJULI TE II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HIRAJULI TE II PWSS",
+                "localname": "RETROFITTING OF HIRAJULI TE II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HIRAJULI TE II PWSS",
+                        "localname": "RETROFITTING OF HIRAJULI TE II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141554/ws-services-calculation/Penalty.json b/data/as/8141554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13b6935aee
--- /dev/null
+++ b/data/as/8141554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141554/ws-services-calculation/WCBillingSlab.json b/data/as/8141554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5914c402d
--- /dev/null
+++ b/data/as/8141554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141566/BillingService/BusinessService.json b/data/as/8141566/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35089b6588
--- /dev/null
+++ b/data/as/8141566/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141566",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141566/egov-location/boundary-data.json b/data/as/8141566/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bf4f82336b
--- /dev/null
+++ b/data/as/8141566/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141566",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PANBARI BAGAN PWSS",
+                "localname": "RETROFITTING OF PANBARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141566",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PANBARI BAGAN PWSS",
+                        "localname": "RETROFITTING OF PANBARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PANBARI BAGAN PWSS",
+                "localname": "RETROFITTING OF PANBARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141566",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PANBARI BAGAN PWSS",
+                        "localname": "RETROFITTING OF PANBARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141566/ws-services-calculation/Penalty.json b/data/as/8141566/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..956008c260
--- /dev/null
+++ b/data/as/8141566/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141566",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141566/ws-services-calculation/WCBillingSlab.json b/data/as/8141566/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a486436bee
--- /dev/null
+++ b/data/as/8141566/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141566",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141583/BillingService/BusinessService.json b/data/as/8141583/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c14e0c1eae
--- /dev/null
+++ b/data/as/8141583/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141583",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141583/egov-location/boundary-data.json b/data/as/8141583/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c79c6f2f69
--- /dev/null
+++ b/data/as/8141583/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141583",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUTHIMARI PWSS",
+                "localname": "RETROFITTING OF PUTHIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUTHIMARI PWSS",
+                        "localname": "RETROFITTING OF PUTHIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUTHIMARI PWSS",
+                "localname": "RETROFITTING OF PUTHIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUTHIMARI PWSS",
+                        "localname": "RETROFITTING OF PUTHIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141583/ws-services-calculation/Penalty.json b/data/as/8141583/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a22500e94e
--- /dev/null
+++ b/data/as/8141583/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141583",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141583/ws-services-calculation/WCBillingSlab.json b/data/as/8141583/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0f36c6bd16
--- /dev/null
+++ b/data/as/8141583/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141583",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141619/BillingService/BusinessService.json b/data/as/8141619/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f55d4df526
--- /dev/null
+++ b/data/as/8141619/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141619",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141619/egov-location/boundary-data.json b/data/as/8141619/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7455e3032
--- /dev/null
+++ b/data/as/8141619/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141619",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF BARUADOLONI PWSS",
+                "localname": "RETROFITING OF BARUADOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141619",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF BARUADOLONI PWSS",
+                        "localname": "RETROFITING OF BARUADOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF BARUADOLONI PWSS",
+                "localname": "RETROFITING OF BARUADOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141619",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF BARUADOLONI PWSS",
+                        "localname": "RETROFITING OF BARUADOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141619/ws-services-calculation/Penalty.json b/data/as/8141619/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..faefc8f42f
--- /dev/null
+++ b/data/as/8141619/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141619",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141619/ws-services-calculation/WCBillingSlab.json b/data/as/8141619/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ae5fe0ff52
--- /dev/null
+++ b/data/as/8141619/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141619",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141631/BillingService/BusinessService.json b/data/as/8141631/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ec606da25
--- /dev/null
+++ b/data/as/8141631/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141631",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141631/egov-location/boundary-data.json b/data/as/8141631/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be1c7636ae
--- /dev/null
+++ b/data/as/8141631/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141631",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAPUBHETI  PWSS",
+                "localname": "RETROFITTING OF BAPUBHETI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAPUBHETI  PWSS",
+                        "localname": "RETROFITTING OF BAPUBHETI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAPUBHETI  PWSS",
+                "localname": "RETROFITTING OF BAPUBHETI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAPUBHETI  PWSS",
+                        "localname": "RETROFITTING OF BAPUBHETI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141631/ws-services-calculation/Penalty.json b/data/as/8141631/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..354f4f210e
--- /dev/null
+++ b/data/as/8141631/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141631",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141631/ws-services-calculation/WCBillingSlab.json b/data/as/8141631/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ae8a2342b0
--- /dev/null
+++ b/data/as/8141631/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141631",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141643/BillingService/BusinessService.json b/data/as/8141643/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5297a0dceb
--- /dev/null
+++ b/data/as/8141643/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141643",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141643/egov-location/boundary-data.json b/data/as/8141643/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ebda0ae8a9
--- /dev/null
+++ b/data/as/8141643/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141643",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMALUGURI PWSS",
+                "localname": "RETROFITTING OF SIMALUGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141643",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMALUGURI PWSS",
+                        "localname": "RETROFITTING OF SIMALUGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMALUGURI PWSS",
+                "localname": "RETROFITTING OF SIMALUGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141643",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMALUGURI PWSS",
+                        "localname": "RETROFITTING OF SIMALUGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141643/ws-services-calculation/Penalty.json b/data/as/8141643/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5f6c678b3a
--- /dev/null
+++ b/data/as/8141643/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141643",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141643/ws-services-calculation/WCBillingSlab.json b/data/as/8141643/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..57ee55e79b
--- /dev/null
+++ b/data/as/8141643/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141643",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141666/BillingService/BusinessService.json b/data/as/8141666/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d89ecd6d86
--- /dev/null
+++ b/data/as/8141666/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141666",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141666/egov-location/boundary-data.json b/data/as/8141666/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1fdc4f8342
--- /dev/null
+++ b/data/as/8141666/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141666",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARMARI PWSS",
+                "localname": "RETROFITTING OF BANDARMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141666",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARMARI PWSS",
+                        "localname": "RETROFITTING OF BANDARMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARMARI PWSS",
+                "localname": "RETROFITTING OF BANDARMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141666",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARMARI PWSS",
+                        "localname": "RETROFITTING OF BANDARMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141666/ws-services-calculation/Penalty.json b/data/as/8141666/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a5a4d5b8c3
--- /dev/null
+++ b/data/as/8141666/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141666",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141666/ws-services-calculation/WCBillingSlab.json b/data/as/8141666/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c361fbda1
--- /dev/null
+++ b/data/as/8141666/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141666",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141686/BillingService/BusinessService.json b/data/as/8141686/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df8f1b83ba
--- /dev/null
+++ b/data/as/8141686/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141686",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141686/egov-location/boundary-data.json b/data/as/8141686/egov-location/boundary-data.json
new file mode 100644
index 0000000000..916d070afd
--- /dev/null
+++ b/data/as/8141686/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141686",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAKALBHANGI PWSS",
+                "localname": "RETROFITTING OF KAKALBHANGI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAKALBHANGI PWSS",
+                        "localname": "RETROFITTING OF KAKALBHANGI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAKALBHANGI PWSS",
+                "localname": "RETROFITTING OF KAKALBHANGI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAKALBHANGI PWSS",
+                        "localname": "RETROFITTING OF KAKALBHANGI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141686/ws-services-calculation/Penalty.json b/data/as/8141686/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e600f7ad51
--- /dev/null
+++ b/data/as/8141686/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141686",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141686/ws-services-calculation/WCBillingSlab.json b/data/as/8141686/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4acb43aa39
--- /dev/null
+++ b/data/as/8141686/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141686",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141704/BillingService/BusinessService.json b/data/as/8141704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3e912bd59d
--- /dev/null
+++ b/data/as/8141704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141704/egov-location/boundary-data.json b/data/as/8141704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea9634b04c
--- /dev/null
+++ b/data/as/8141704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                "localname": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                        "localname": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                "localname": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                        "localname": "RETROFITTING OF BHALUKEKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141704/ws-services-calculation/Penalty.json b/data/as/8141704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0265536402
--- /dev/null
+++ b/data/as/8141704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141704/ws-services-calculation/WCBillingSlab.json b/data/as/8141704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41afb87bfc
--- /dev/null
+++ b/data/as/8141704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141716/BillingService/BusinessService.json b/data/as/8141716/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c9b867c72a
--- /dev/null
+++ b/data/as/8141716/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141716",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141716/egov-location/boundary-data.json b/data/as/8141716/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19e04631e0
--- /dev/null
+++ b/data/as/8141716/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141716",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                "localname": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                        "localname": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                "localname": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                        "localname": "RETROFITTING OF NIZ BIHAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141716/ws-services-calculation/Penalty.json b/data/as/8141716/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a2eabee4ac
--- /dev/null
+++ b/data/as/8141716/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141716",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141716/ws-services-calculation/WCBillingSlab.json b/data/as/8141716/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4ff2d77bf7
--- /dev/null
+++ b/data/as/8141716/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141716",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141733/BillingService/BusinessService.json b/data/as/8141733/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd1adb6a08
--- /dev/null
+++ b/data/as/8141733/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141733",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141733/egov-location/boundary-data.json b/data/as/8141733/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8f6bc938cf
--- /dev/null
+++ b/data/as/8141733/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141733",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MUWAMARI PWSS",
+                "localname": "RETROFITTING OF MUWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141733",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MUWAMARI PWSS",
+                        "localname": "RETROFITTING OF MUWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MUWAMARI PWSS",
+                "localname": "RETROFITTING OF MUWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141733",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MUWAMARI PWSS",
+                        "localname": "RETROFITTING OF MUWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141733/ws-services-calculation/Penalty.json b/data/as/8141733/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1ed3466da
--- /dev/null
+++ b/data/as/8141733/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141733",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141733/ws-services-calculation/WCBillingSlab.json b/data/as/8141733/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b311effff4
--- /dev/null
+++ b/data/as/8141733/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141733",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141761/BillingService/BusinessService.json b/data/as/8141761/BillingService/BusinessService.json
new file mode 100644
index 0000000000..75638fcaf9
--- /dev/null
+++ b/data/as/8141761/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141761",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141761/egov-location/boundary-data.json b/data/as/8141761/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a85aac8fd9
--- /dev/null
+++ b/data/as/8141761/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141761",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF NATUNPAMGAON PWSS",
+                "localname": "RETROFITING OF NATUNPAMGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141761",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF NATUNPAMGAON PWSS",
+                        "localname": "RETROFITING OF NATUNPAMGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF NATUNPAMGAON PWSS",
+                "localname": "RETROFITING OF NATUNPAMGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141761",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF NATUNPAMGAON PWSS",
+                        "localname": "RETROFITING OF NATUNPAMGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141761/ws-services-calculation/Penalty.json b/data/as/8141761/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ff1182f377
--- /dev/null
+++ b/data/as/8141761/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141761",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141761/ws-services-calculation/WCBillingSlab.json b/data/as/8141761/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5a5ce786a
--- /dev/null
+++ b/data/as/8141761/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141761",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141785/BillingService/BusinessService.json b/data/as/8141785/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94272b0832
--- /dev/null
+++ b/data/as/8141785/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141785",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141785/egov-location/boundary-data.json b/data/as/8141785/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19ee198699
--- /dev/null
+++ b/data/as/8141785/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141785",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAIRAGURI PWSS",
+                "localname": "RETROFITTING OF BHAIRAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141785",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAIRAGURI PWSS",
+                        "localname": "RETROFITTING OF BHAIRAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAIRAGURI PWSS",
+                "localname": "RETROFITTING OF BHAIRAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141785",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAIRAGURI PWSS",
+                        "localname": "RETROFITTING OF BHAIRAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141785/ws-services-calculation/Penalty.json b/data/as/8141785/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec1d78bea6
--- /dev/null
+++ b/data/as/8141785/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141785",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141785/ws-services-calculation/WCBillingSlab.json b/data/as/8141785/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc9803833d
--- /dev/null
+++ b/data/as/8141785/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141785",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141831/BillingService/BusinessService.json b/data/as/8141831/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6397eb90d4
--- /dev/null
+++ b/data/as/8141831/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141831",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141831/egov-location/boundary-data.json b/data/as/8141831/egov-location/boundary-data.json
new file mode 100644
index 0000000000..78558f10ce
--- /dev/null
+++ b/data/as/8141831/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141831",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                "localname": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                        "localname": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                "localname": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                        "localname": "RETROFITTING OF NAM BOGORIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141831/ws-services-calculation/Penalty.json b/data/as/8141831/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04a6a0eb7b
--- /dev/null
+++ b/data/as/8141831/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141831",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141831/ws-services-calculation/WCBillingSlab.json b/data/as/8141831/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..66a70244b4
--- /dev/null
+++ b/data/as/8141831/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141831",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141923/BillingService/BusinessService.json b/data/as/8141923/BillingService/BusinessService.json
new file mode 100644
index 0000000000..290f4f0af3
--- /dev/null
+++ b/data/as/8141923/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141923",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141923/egov-location/boundary-data.json b/data/as/8141923/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8fdb5306c1
--- /dev/null
+++ b/data/as/8141923/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141923",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF BENGENAJULI PWSS",
+                "localname": "RETROFITING OF BENGENAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF BENGENAJULI PWSS",
+                        "localname": "RETROFITING OF BENGENAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF BENGENAJULI PWSS",
+                "localname": "RETROFITING OF BENGENAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF BENGENAJULI PWSS",
+                        "localname": "RETROFITING OF BENGENAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141923/ws-services-calculation/Penalty.json b/data/as/8141923/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26feeb7cae
--- /dev/null
+++ b/data/as/8141923/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141923",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141923/ws-services-calculation/WCBillingSlab.json b/data/as/8141923/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0850818778
--- /dev/null
+++ b/data/as/8141923/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141923",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141972/BillingService/BusinessService.json b/data/as/8141972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90a736308e
--- /dev/null
+++ b/data/as/8141972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8141972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141972/egov-location/boundary-data.json b/data/as/8141972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c5e230035
--- /dev/null
+++ b/data/as/8141972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8141972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PADUMPUKHURI PWSS",
+                "localname": "RETROFITTING OF PADUMPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PADUMPUKHURI PWSS",
+                        "localname": "RETROFITTING OF PADUMPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PADUMPUKHURI PWSS",
+                "localname": "RETROFITTING OF PADUMPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8141972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PADUMPUKHURI PWSS",
+                        "localname": "RETROFITTING OF PADUMPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141972/ws-services-calculation/Penalty.json b/data/as/8141972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d990f171b8
--- /dev/null
+++ b/data/as/8141972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8141972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8141972/ws-services-calculation/WCBillingSlab.json b/data/as/8141972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd12a57a2d
--- /dev/null
+++ b/data/as/8141972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8141972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148068/BillingService/BusinessService.json b/data/as/8148068/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d259bec30
--- /dev/null
+++ b/data/as/8148068/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148068",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148068/egov-location/boundary-data.json b/data/as/8148068/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2107a544ee
--- /dev/null
+++ b/data/as/8148068/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148068",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TALAKABARI PWSS",
+                "localname": "RETROFITTING OF TALAKABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TALAKABARI PWSS",
+                        "localname": "RETROFITTING OF TALAKABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TALAKABARI PWSS",
+                "localname": "RETROFITTING OF TALAKABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TALAKABARI PWSS",
+                        "localname": "RETROFITTING OF TALAKABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148068/ws-services-calculation/Penalty.json b/data/as/8148068/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08b3b034c1
--- /dev/null
+++ b/data/as/8148068/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148068",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148068/ws-services-calculation/WCBillingSlab.json b/data/as/8148068/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..964410960a
--- /dev/null
+++ b/data/as/8148068/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148068",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148081/BillingService/BusinessService.json b/data/as/8148081/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d1164fa258
--- /dev/null
+++ b/data/as/8148081/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148081",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148081/egov-location/boundary-data.json b/data/as/8148081/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db8123014e
--- /dev/null
+++ b/data/as/8148081/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148081",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                "localname": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148081",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                        "localname": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                "localname": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148081",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                        "localname": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148081/ws-services-calculation/Penalty.json b/data/as/8148081/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4b2de5712
--- /dev/null
+++ b/data/as/8148081/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148081",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148081/ws-services-calculation/WCBillingSlab.json b/data/as/8148081/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..19e2e0605c
--- /dev/null
+++ b/data/as/8148081/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148081",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148097/BillingService/BusinessService.json b/data/as/8148097/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5d76a57dc
--- /dev/null
+++ b/data/as/8148097/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148097",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148097/egov-location/boundary-data.json b/data/as/8148097/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ebb900b3cd
--- /dev/null
+++ b/data/as/8148097/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148097",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAIBARI PWSS",
+                "localname": "RETROFITTING OF CHAIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148097",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAIBARI PWSS",
+                        "localname": "RETROFITTING OF CHAIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAIBARI PWSS",
+                "localname": "RETROFITTING OF CHAIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148097",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAIBARI PWSS",
+                        "localname": "RETROFITTING OF CHAIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148097/ws-services-calculation/Penalty.json b/data/as/8148097/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2574f804f
--- /dev/null
+++ b/data/as/8148097/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148097",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148097/ws-services-calculation/WCBillingSlab.json b/data/as/8148097/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..652fcc8639
--- /dev/null
+++ b/data/as/8148097/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148097",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148105/BillingService/BusinessService.json b/data/as/8148105/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3eeef289eb
--- /dev/null
+++ b/data/as/8148105/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148105",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148105/egov-location/boundary-data.json b/data/as/8148105/egov-location/boundary-data.json
new file mode 100644
index 0000000000..45a6c2d22b
--- /dev/null
+++ b/data/as/8148105/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148105",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MORISUTI PWSS",
+                "localname": "RETROFITTING OF MORISUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148105",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MORISUTI PWSS",
+                        "localname": "RETROFITTING OF MORISUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MORISUTI PWSS",
+                "localname": "RETROFITTING OF MORISUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148105",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MORISUTI PWSS",
+                        "localname": "RETROFITTING OF MORISUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148105/ws-services-calculation/Penalty.json b/data/as/8148105/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd2c5ea37c
--- /dev/null
+++ b/data/as/8148105/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148105",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148105/ws-services-calculation/WCBillingSlab.json b/data/as/8148105/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0c2a267fee
--- /dev/null
+++ b/data/as/8148105/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148105",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148116/BillingService/BusinessService.json b/data/as/8148116/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f2d99cc71
--- /dev/null
+++ b/data/as/8148116/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148116",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148116/egov-location/boundary-data.json b/data/as/8148116/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1660b21daf
--- /dev/null
+++ b/data/as/8148116/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148116",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDIKORAI PWSS",
+                "localname": "RETROFITTING OF BORDIKORAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDIKORAI PWSS",
+                        "localname": "RETROFITTING OF BORDIKORAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDIKORAI PWSS",
+                "localname": "RETROFITTING OF BORDIKORAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDIKORAI PWSS",
+                        "localname": "RETROFITTING OF BORDIKORAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148116/ws-services-calculation/Penalty.json b/data/as/8148116/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78ba3fcd37
--- /dev/null
+++ b/data/as/8148116/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148116",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148116/ws-services-calculation/WCBillingSlab.json b/data/as/8148116/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7069734e4a
--- /dev/null
+++ b/data/as/8148116/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148116",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148125/BillingService/BusinessService.json b/data/as/8148125/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df32d0f0af
--- /dev/null
+++ b/data/as/8148125/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148125",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148125/egov-location/boundary-data.json b/data/as/8148125/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b66e5c42c0
--- /dev/null
+++ b/data/as/8148125/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148125",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                "localname": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                        "localname": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                "localname": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                        "localname": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148125/ws-services-calculation/Penalty.json b/data/as/8148125/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cccb25975a
--- /dev/null
+++ b/data/as/8148125/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148125",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148125/ws-services-calculation/WCBillingSlab.json b/data/as/8148125/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5b77dd3d8
--- /dev/null
+++ b/data/as/8148125/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148125",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148137/BillingService/BusinessService.json b/data/as/8148137/BillingService/BusinessService.json
new file mode 100644
index 0000000000..503e1d0d92
--- /dev/null
+++ b/data/as/8148137/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148137",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148137/egov-location/boundary-data.json b/data/as/8148137/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9138bc1588
--- /dev/null
+++ b/data/as/8148137/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148137",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                "localname": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148137",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                        "localname": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                "localname": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148137",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                        "localname": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148137/ws-services-calculation/Penalty.json b/data/as/8148137/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a007c24ec
--- /dev/null
+++ b/data/as/8148137/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148137",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148137/ws-services-calculation/WCBillingSlab.json b/data/as/8148137/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3245bdc5ee
--- /dev/null
+++ b/data/as/8148137/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148137",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148159/BillingService/BusinessService.json b/data/as/8148159/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e2dca07f2
--- /dev/null
+++ b/data/as/8148159/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148159",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148159/egov-location/boundary-data.json b/data/as/8148159/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6e634f090c
--- /dev/null
+++ b/data/as/8148159/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148159",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AGRIPAM PWSS",
+                "localname": "RETROFITTING OF AGRIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148159",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AGRIPAM PWSS",
+                        "localname": "RETROFITTING OF AGRIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AGRIPAM PWSS",
+                "localname": "RETROFITTING OF AGRIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148159",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AGRIPAM PWSS",
+                        "localname": "RETROFITTING OF AGRIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148159/ws-services-calculation/Penalty.json b/data/as/8148159/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04d2a2296f
--- /dev/null
+++ b/data/as/8148159/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148159",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148159/ws-services-calculation/WCBillingSlab.json b/data/as/8148159/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2df4e035c2
--- /dev/null
+++ b/data/as/8148159/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148159",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148173/BillingService/BusinessService.json b/data/as/8148173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4af1367487
--- /dev/null
+++ b/data/as/8148173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148173/egov-location/boundary-data.json b/data/as/8148173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fcf3e4823c
--- /dev/null
+++ b/data/as/8148173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                "localname": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                        "localname": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                "localname": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                        "localname": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148173/ws-services-calculation/Penalty.json b/data/as/8148173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ddab37854
--- /dev/null
+++ b/data/as/8148173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148173/ws-services-calculation/WCBillingSlab.json b/data/as/8148173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..24d40641c2
--- /dev/null
+++ b/data/as/8148173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148181/BillingService/BusinessService.json b/data/as/8148181/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8bd06b0fa5
--- /dev/null
+++ b/data/as/8148181/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148181",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148181/egov-location/boundary-data.json b/data/as/8148181/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0b786daf5
--- /dev/null
+++ b/data/as/8148181/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148181",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MURHADOL PWSS",
+                "localname": "RETROFITTING OF MURHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148181",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MURHADOL PWSS",
+                        "localname": "RETROFITTING OF MURHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MURHADOL PWSS",
+                "localname": "RETROFITTING OF MURHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148181",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MURHADOL PWSS",
+                        "localname": "RETROFITTING OF MURHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148181/ws-services-calculation/Penalty.json b/data/as/8148181/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a60b0d8947
--- /dev/null
+++ b/data/as/8148181/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148181",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148181/ws-services-calculation/WCBillingSlab.json b/data/as/8148181/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30fce76763
--- /dev/null
+++ b/data/as/8148181/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148181",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148193/BillingService/BusinessService.json b/data/as/8148193/BillingService/BusinessService.json
new file mode 100644
index 0000000000..392a5a7ae9
--- /dev/null
+++ b/data/as/8148193/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148193",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148193/egov-location/boundary-data.json b/data/as/8148193/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1f6533c3b4
--- /dev/null
+++ b/data/as/8148193/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148193",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORMOTA PWSS",
+                "localname": "RETROFITTING OF BORMOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORMOTA PWSS",
+                        "localname": "RETROFITTING OF BORMOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORMOTA PWSS",
+                "localname": "RETROFITTING OF BORMOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORMOTA PWSS",
+                        "localname": "RETROFITTING OF BORMOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148193/ws-services-calculation/Penalty.json b/data/as/8148193/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ad6d91fa2
--- /dev/null
+++ b/data/as/8148193/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148193",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148193/ws-services-calculation/WCBillingSlab.json b/data/as/8148193/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5a5e914fa
--- /dev/null
+++ b/data/as/8148193/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148193",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148198/BillingService/BusinessService.json b/data/as/8148198/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5967e9bbf8
--- /dev/null
+++ b/data/as/8148198/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148198",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148198/egov-location/boundary-data.json b/data/as/8148198/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad68e04984
--- /dev/null
+++ b/data/as/8148198/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148198",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHOLAIBIL PWSS",
+                "localname": "RETROFITTING OF DHOLAIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHOLAIBIL PWSS",
+                        "localname": "RETROFITTING OF DHOLAIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHOLAIBIL PWSS",
+                "localname": "RETROFITTING OF DHOLAIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHOLAIBIL PWSS",
+                        "localname": "RETROFITTING OF DHOLAIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148198/ws-services-calculation/Penalty.json b/data/as/8148198/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a347cd8fe2
--- /dev/null
+++ b/data/as/8148198/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148198",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148198/ws-services-calculation/WCBillingSlab.json b/data/as/8148198/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..427ccfbc62
--- /dev/null
+++ b/data/as/8148198/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148198",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148257/BillingService/BusinessService.json b/data/as/8148257/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ffe8655537
--- /dev/null
+++ b/data/as/8148257/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8148257",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148257/egov-location/boundary-data.json b/data/as/8148257/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c5a0731410
--- /dev/null
+++ b/data/as/8148257/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8148257",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                "localname": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                        "localname": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                "localname": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8148257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                        "localname": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148257/ws-services-calculation/Penalty.json b/data/as/8148257/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..593366ed60
--- /dev/null
+++ b/data/as/8148257/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8148257",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8148257/ws-services-calculation/WCBillingSlab.json b/data/as/8148257/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d76798317f
--- /dev/null
+++ b/data/as/8148257/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8148257",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153195/BillingService/BusinessService.json b/data/as/8153195/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac8195775f
--- /dev/null
+++ b/data/as/8153195/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153195",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153195/egov-location/boundary-data.json b/data/as/8153195/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53c266fd5e
--- /dev/null
+++ b/data/as/8153195/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153195",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF URIAMGURI PWSS",
+                "localname": "RETROFITTING OF URIAMGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153195",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF URIAMGURI PWSS",
+                        "localname": "RETROFITTING OF URIAMGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF URIAMGURI PWSS",
+                "localname": "RETROFITTING OF URIAMGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153195",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF URIAMGURI PWSS",
+                        "localname": "RETROFITTING OF URIAMGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153195/ws-services-calculation/Penalty.json b/data/as/8153195/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..70c9d47a3a
--- /dev/null
+++ b/data/as/8153195/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153195",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153195/ws-services-calculation/WCBillingSlab.json b/data/as/8153195/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b05e4a735d
--- /dev/null
+++ b/data/as/8153195/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153195",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153198/BillingService/BusinessService.json b/data/as/8153198/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e2be91f842
--- /dev/null
+++ b/data/as/8153198/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153198",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153198/egov-location/boundary-data.json b/data/as/8153198/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6684d03d79
--- /dev/null
+++ b/data/as/8153198/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153198",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOLOGURI PWSS",
+                "localname": "RETROFITTING OF SOLOGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOLOGURI PWSS",
+                        "localname": "RETROFITTING OF SOLOGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOLOGURI PWSS",
+                "localname": "RETROFITTING OF SOLOGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOLOGURI PWSS",
+                        "localname": "RETROFITTING OF SOLOGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153198/ws-services-calculation/Penalty.json b/data/as/8153198/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab4b7618f8
--- /dev/null
+++ b/data/as/8153198/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153198",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153198/ws-services-calculation/WCBillingSlab.json b/data/as/8153198/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d9744a38f7
--- /dev/null
+++ b/data/as/8153198/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153198",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153201/BillingService/BusinessService.json b/data/as/8153201/BillingService/BusinessService.json
new file mode 100644
index 0000000000..950e62642c
--- /dev/null
+++ b/data/as/8153201/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153201",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153201/egov-location/boundary-data.json b/data/as/8153201/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e11df23544
--- /dev/null
+++ b/data/as/8153201/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153201",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNBARI PWSS",
+                "localname": "RETROFITTING OF BAMUNBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153201",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNBARI PWSS",
+                        "localname": "RETROFITTING OF BAMUNBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNBARI PWSS",
+                "localname": "RETROFITTING OF BAMUNBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153201",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNBARI PWSS",
+                        "localname": "RETROFITTING OF BAMUNBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153201/ws-services-calculation/Penalty.json b/data/as/8153201/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0413c72ce8
--- /dev/null
+++ b/data/as/8153201/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153201",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153201/ws-services-calculation/WCBillingSlab.json b/data/as/8153201/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5e5822dd0
--- /dev/null
+++ b/data/as/8153201/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153201",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153205/BillingService/BusinessService.json b/data/as/8153205/BillingService/BusinessService.json
new file mode 100644
index 0000000000..be24b559d6
--- /dev/null
+++ b/data/as/8153205/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153205",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153205/egov-location/boundary-data.json b/data/as/8153205/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43cf45d485
--- /dev/null
+++ b/data/as/8153205/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153205",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHOBAKATA PWSS",
+                "localname": "RETROFITTING OF DHOBAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHOBAKATA PWSS",
+                        "localname": "RETROFITTING OF DHOBAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHOBAKATA PWSS",
+                "localname": "RETROFITTING OF DHOBAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHOBAKATA PWSS",
+                        "localname": "RETROFITTING OF DHOBAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153205/ws-services-calculation/Penalty.json b/data/as/8153205/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f17c9f8a7
--- /dev/null
+++ b/data/as/8153205/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153205",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153205/ws-services-calculation/WCBillingSlab.json b/data/as/8153205/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4e21dce16c
--- /dev/null
+++ b/data/as/8153205/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153205",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153209/BillingService/BusinessService.json b/data/as/8153209/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce0f8471d0
--- /dev/null
+++ b/data/as/8153209/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153209",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153209/egov-location/boundary-data.json b/data/as/8153209/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49bddfe1e6
--- /dev/null
+++ b/data/as/8153209/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153209",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TOUBHANGA PWSS",
+                "localname": "RETROFITTING OF TOUBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TOUBHANGA PWSS",
+                        "localname": "RETROFITTING OF TOUBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TOUBHANGA PWSS",
+                "localname": "RETROFITTING OF TOUBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TOUBHANGA PWSS",
+                        "localname": "RETROFITTING OF TOUBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153209/ws-services-calculation/Penalty.json b/data/as/8153209/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..09fe5f1c70
--- /dev/null
+++ b/data/as/8153209/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153209",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153209/ws-services-calculation/WCBillingSlab.json b/data/as/8153209/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..55714de5ba
--- /dev/null
+++ b/data/as/8153209/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153209",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153214/BillingService/BusinessService.json b/data/as/8153214/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9b96a034d3
--- /dev/null
+++ b/data/as/8153214/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153214",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153214/egov-location/boundary-data.json b/data/as/8153214/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9516054136
--- /dev/null
+++ b/data/as/8153214/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153214",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKERIGAON PWSS",
+                "localname": "RETROFITTING OF DHEKERIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153214",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKERIGAON PWSS",
+                        "localname": "RETROFITTING OF DHEKERIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKERIGAON PWSS",
+                "localname": "RETROFITTING OF DHEKERIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153214",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKERIGAON PWSS",
+                        "localname": "RETROFITTING OF DHEKERIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153214/ws-services-calculation/Penalty.json b/data/as/8153214/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1feab0f06b
--- /dev/null
+++ b/data/as/8153214/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153214",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153214/ws-services-calculation/WCBillingSlab.json b/data/as/8153214/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0bcf6bdffe
--- /dev/null
+++ b/data/as/8153214/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153214",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153219/BillingService/BusinessService.json b/data/as/8153219/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8140f5b3a7
--- /dev/null
+++ b/data/as/8153219/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153219",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153219/egov-location/boundary-data.json b/data/as/8153219/egov-location/boundary-data.json
new file mode 100644
index 0000000000..392b6e3d59
--- /dev/null
+++ b/data/as/8153219/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153219",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHALIHAMARI PWSS",
+                "localname": "RETROFITTING OF KHALIHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHALIHAMARI PWSS",
+                        "localname": "RETROFITTING OF KHALIHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHALIHAMARI PWSS",
+                "localname": "RETROFITTING OF KHALIHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHALIHAMARI PWSS",
+                        "localname": "RETROFITTING OF KHALIHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153219/ws-services-calculation/Penalty.json b/data/as/8153219/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..182813ad65
--- /dev/null
+++ b/data/as/8153219/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153219",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153219/ws-services-calculation/WCBillingSlab.json b/data/as/8153219/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..28aa96217a
--- /dev/null
+++ b/data/as/8153219/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153219",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153224/BillingService/BusinessService.json b/data/as/8153224/BillingService/BusinessService.json
new file mode 100644
index 0000000000..62a96017b1
--- /dev/null
+++ b/data/as/8153224/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153224",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153224/egov-location/boundary-data.json b/data/as/8153224/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0f816ab2cc
--- /dev/null
+++ b/data/as/8153224/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153224",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PANIGAON PWSS",
+                "localname": "RETROFITTING OF PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PANIGAON PWSS",
+                        "localname": "RETROFITTING OF PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PANIGAON PWSS",
+                "localname": "RETROFITTING OF PANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PANIGAON PWSS",
+                        "localname": "RETROFITTING OF PANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153224/ws-services-calculation/Penalty.json b/data/as/8153224/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..374cee982f
--- /dev/null
+++ b/data/as/8153224/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153224",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153224/ws-services-calculation/WCBillingSlab.json b/data/as/8153224/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c3cb0d3092
--- /dev/null
+++ b/data/as/8153224/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153224",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153228/BillingService/BusinessService.json b/data/as/8153228/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7877f4f930
--- /dev/null
+++ b/data/as/8153228/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153228",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153228/egov-location/boundary-data.json b/data/as/8153228/egov-location/boundary-data.json
new file mode 100644
index 0000000000..39b45fbb8b
--- /dev/null
+++ b/data/as/8153228/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153228",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                "localname": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                        "localname": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                "localname": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                        "localname": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153228/ws-services-calculation/Penalty.json b/data/as/8153228/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..33e6951e41
--- /dev/null
+++ b/data/as/8153228/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153228",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153228/ws-services-calculation/WCBillingSlab.json b/data/as/8153228/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e191c3954a
--- /dev/null
+++ b/data/as/8153228/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153228",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153230/BillingService/BusinessService.json b/data/as/8153230/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46b11cf8fa
--- /dev/null
+++ b/data/as/8153230/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153230",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153230/egov-location/boundary-data.json b/data/as/8153230/egov-location/boundary-data.json
new file mode 100644
index 0000000000..912d69d40d
--- /dev/null
+++ b/data/as/8153230/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153230",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGIA PWSS",
+                "localname": "RETROFITTING OF SINGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGIA PWSS",
+                        "localname": "RETROFITTING OF SINGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGIA PWSS",
+                "localname": "RETROFITTING OF SINGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGIA PWSS",
+                        "localname": "RETROFITTING OF SINGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153230/ws-services-calculation/Penalty.json b/data/as/8153230/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b34c2c6ca
--- /dev/null
+++ b/data/as/8153230/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153230",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153230/ws-services-calculation/WCBillingSlab.json b/data/as/8153230/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..afa28d433c
--- /dev/null
+++ b/data/as/8153230/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153230",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153234/BillingService/BusinessService.json b/data/as/8153234/BillingService/BusinessService.json
new file mode 100644
index 0000000000..068aa8de08
--- /dev/null
+++ b/data/as/8153234/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153234",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153234/egov-location/boundary-data.json b/data/as/8153234/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ec9be93564
--- /dev/null
+++ b/data/as/8153234/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153234",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                "localname": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153234",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                        "localname": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                "localname": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153234",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                        "localname": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153234/ws-services-calculation/Penalty.json b/data/as/8153234/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..55f4f501b2
--- /dev/null
+++ b/data/as/8153234/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153234",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153234/ws-services-calculation/WCBillingSlab.json b/data/as/8153234/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8dea1d99aa
--- /dev/null
+++ b/data/as/8153234/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153234",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153241/BillingService/BusinessService.json b/data/as/8153241/BillingService/BusinessService.json
new file mode 100644
index 0000000000..14bd0fa284
--- /dev/null
+++ b/data/as/8153241/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153241",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153241/egov-location/boundary-data.json b/data/as/8153241/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0bf4a895b2
--- /dev/null
+++ b/data/as/8153241/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153241",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BURACHAPORI PWSS",
+                "localname": "RETROFITTING OF BURACHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BURACHAPORI PWSS",
+                        "localname": "RETROFITTING OF BURACHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BURACHAPORI PWSS",
+                "localname": "RETROFITTING OF BURACHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BURACHAPORI PWSS",
+                        "localname": "RETROFITTING OF BURACHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153241/ws-services-calculation/Penalty.json b/data/as/8153241/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c09d1d3687
--- /dev/null
+++ b/data/as/8153241/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153241",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153241/ws-services-calculation/WCBillingSlab.json b/data/as/8153241/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68264e7af9
--- /dev/null
+++ b/data/as/8153241/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153241",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153248/BillingService/BusinessService.json b/data/as/8153248/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6e815fbf7a
--- /dev/null
+++ b/data/as/8153248/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153248",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153248/egov-location/boundary-data.json b/data/as/8153248/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bcc5ede328
--- /dev/null
+++ b/data/as/8153248/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153248",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALITA GAON PWSS",
+                "localname": "RETROFITTING OF KALITA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153248",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALITA GAON PWSS",
+                        "localname": "RETROFITTING OF KALITA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALITA GAON PWSS",
+                "localname": "RETROFITTING OF KALITA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153248",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALITA GAON PWSS",
+                        "localname": "RETROFITTING OF KALITA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153248/ws-services-calculation/Penalty.json b/data/as/8153248/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f841d6d44d
--- /dev/null
+++ b/data/as/8153248/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153248",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153248/ws-services-calculation/WCBillingSlab.json b/data/as/8153248/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5057c2253f
--- /dev/null
+++ b/data/as/8153248/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153248",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153287/BillingService/BusinessService.json b/data/as/8153287/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2a543dfb5a
--- /dev/null
+++ b/data/as/8153287/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153287",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153287/egov-location/boundary-data.json b/data/as/8153287/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cedb183046
--- /dev/null
+++ b/data/as/8153287/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153287",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATANATIKA PWSS",
+                "localname": "RETROFITTING OF KATANATIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATANATIKA PWSS",
+                        "localname": "RETROFITTING OF KATANATIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATANATIKA PWSS",
+                "localname": "RETROFITTING OF KATANATIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATANATIKA PWSS",
+                        "localname": "RETROFITTING OF KATANATIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153287/ws-services-calculation/Penalty.json b/data/as/8153287/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a25501b07e
--- /dev/null
+++ b/data/as/8153287/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153287",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153287/ws-services-calculation/WCBillingSlab.json b/data/as/8153287/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c0ec980cc2
--- /dev/null
+++ b/data/as/8153287/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153287",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153302/BillingService/BusinessService.json b/data/as/8153302/BillingService/BusinessService.json
new file mode 100644
index 0000000000..68ede3e4b5
--- /dev/null
+++ b/data/as/8153302/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153302",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153302/egov-location/boundary-data.json b/data/as/8153302/egov-location/boundary-data.json
new file mode 100644
index 0000000000..603a63a61f
--- /dev/null
+++ b/data/as/8153302/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153302",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOLABARI PWSS",
+                "localname": "RETROFITTING OF DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOLABARI PWSS",
+                        "localname": "RETROFITTING OF DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOLABARI PWSS",
+                "localname": "RETROFITTING OF DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOLABARI PWSS",
+                        "localname": "RETROFITTING OF DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153302/ws-services-calculation/Penalty.json b/data/as/8153302/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e300d7562e
--- /dev/null
+++ b/data/as/8153302/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153302",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153302/ws-services-calculation/WCBillingSlab.json b/data/as/8153302/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f554931727
--- /dev/null
+++ b/data/as/8153302/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153302",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153320/BillingService/BusinessService.json b/data/as/8153320/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b780a4f01
--- /dev/null
+++ b/data/as/8153320/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153320",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153320/egov-location/boundary-data.json b/data/as/8153320/egov-location/boundary-data.json
new file mode 100644
index 0000000000..da2db1922c
--- /dev/null
+++ b/data/as/8153320/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153320",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINIMILE PWSS",
+                "localname": "RETROFITTING OF TINIMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINIMILE PWSS",
+                        "localname": "RETROFITTING OF TINIMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINIMILE PWSS",
+                "localname": "RETROFITTING OF TINIMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINIMILE PWSS",
+                        "localname": "RETROFITTING OF TINIMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153320/ws-services-calculation/Penalty.json b/data/as/8153320/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..063ca61797
--- /dev/null
+++ b/data/as/8153320/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153320",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153320/ws-services-calculation/WCBillingSlab.json b/data/as/8153320/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f403bd28c4
--- /dev/null
+++ b/data/as/8153320/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153320",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153337/BillingService/BusinessService.json b/data/as/8153337/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0c4c431233
--- /dev/null
+++ b/data/as/8153337/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153337",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153337/egov-location/boundary-data.json b/data/as/8153337/egov-location/boundary-data.json
new file mode 100644
index 0000000000..78c2103329
--- /dev/null
+++ b/data/as/8153337/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153337",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHITORSUTI PWSS",
+                "localname": "RETROFITTING OF BHITORSUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHITORSUTI PWSS",
+                        "localname": "RETROFITTING OF BHITORSUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHITORSUTI PWSS",
+                "localname": "RETROFITTING OF BHITORSUTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHITORSUTI PWSS",
+                        "localname": "RETROFITTING OF BHITORSUTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153337/ws-services-calculation/Penalty.json b/data/as/8153337/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9d4a523961
--- /dev/null
+++ b/data/as/8153337/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153337",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153337/ws-services-calculation/WCBillingSlab.json b/data/as/8153337/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7d34e48d30
--- /dev/null
+++ b/data/as/8153337/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153337",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153355/BillingService/BusinessService.json b/data/as/8153355/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0d8278345
--- /dev/null
+++ b/data/as/8153355/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153355",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153355/egov-location/boundary-data.json b/data/as/8153355/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2890c5c005
--- /dev/null
+++ b/data/as/8153355/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153355",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                "localname": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153355",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                        "localname": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                "localname": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153355",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                        "localname": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153355/ws-services-calculation/Penalty.json b/data/as/8153355/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b02be5062a
--- /dev/null
+++ b/data/as/8153355/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153355",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153355/ws-services-calculation/WCBillingSlab.json b/data/as/8153355/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3d80618c36
--- /dev/null
+++ b/data/as/8153355/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153355",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153374/BillingService/BusinessService.json b/data/as/8153374/BillingService/BusinessService.json
new file mode 100644
index 0000000000..83fed8b30e
--- /dev/null
+++ b/data/as/8153374/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153374",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153374/egov-location/boundary-data.json b/data/as/8153374/egov-location/boundary-data.json
new file mode 100644
index 0000000000..04d418f88c
--- /dev/null
+++ b/data/as/8153374/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153374",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOTLONG PWSS",
+                "localname": "RETROFITTING OF GOTLONG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153374",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOTLONG PWSS",
+                        "localname": "RETROFITTING OF GOTLONG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOTLONG PWSS",
+                "localname": "RETROFITTING OF GOTLONG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153374",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOTLONG PWSS",
+                        "localname": "RETROFITTING OF GOTLONG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153374/ws-services-calculation/Penalty.json b/data/as/8153374/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..747e80b749
--- /dev/null
+++ b/data/as/8153374/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153374",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153374/ws-services-calculation/WCBillingSlab.json b/data/as/8153374/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fdefcb55ee
--- /dev/null
+++ b/data/as/8153374/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153374",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153399/egov-location/boundary-data.json b/data/as/8153399/egov-location/boundary-data.json
index e7ce323dd2..e0ae97366c 100644
--- a/data/as/8153399/egov-location/boundary-data.json
+++ b/data/as/8153399/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "BARIKA CHUBURI PWSS",
-                "localname": "BARIKA CHUBURI PWSS",
+                "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
+                "localname": "RETROFITTING OF BARIKA CHUBURI PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "BARIKA CHUBURI PWSS",
-                        "localname": "BARIKA CHUBURI PWSS",
+                        "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
+                        "localname": "RETROFITTING OF BARIKA CHUBURI PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "BARIKA CHUBURI PWSS",
-                "localname": "BARIKA CHUBURI PWSS",
+                "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
+                "localname": "RETROFITTING OF BARIKA CHUBURI PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "BARIKA CHUBURI PWSS",
-                        "localname": "BARIKA CHUBURI PWSS",
+                        "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
+                        "localname": "RETROFITTING OF BARIKA CHUBURI PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/8153399/ws-services-calculation/WCBillingSlab.json b/data/as/8153399/ws-services-calculation/WCBillingSlab.json
index 15c3eee10d..c0fd667374 100644
--- a/data/as/8153399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153399/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153482/BillingService/BusinessService.json b/data/as/8153482/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e59974e15
--- /dev/null
+++ b/data/as/8153482/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153482",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153482/egov-location/boundary-data.json b/data/as/8153482/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4c41e1d06e
--- /dev/null
+++ b/data/as/8153482/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153482",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATAMARIGAON PWSS",
+                "localname": "RETROFITTING OF BATAMARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATAMARIGAON PWSS",
+                        "localname": "RETROFITTING OF BATAMARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATAMARIGAON PWSS",
+                "localname": "RETROFITTING OF BATAMARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATAMARIGAON PWSS",
+                        "localname": "RETROFITTING OF BATAMARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153482/ws-services-calculation/Penalty.json b/data/as/8153482/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a846b8b1bb
--- /dev/null
+++ b/data/as/8153482/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153482",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153482/ws-services-calculation/WCBillingSlab.json b/data/as/8153482/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d397642aef
--- /dev/null
+++ b/data/as/8153482/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153482",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153639/BillingService/BusinessService.json b/data/as/8153639/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2da480c576
--- /dev/null
+++ b/data/as/8153639/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153639",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153639/egov-location/boundary-data.json b/data/as/8153639/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e70998ddcc
--- /dev/null
+++ b/data/as/8153639/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153639",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAMGAON TE PWSS",
+                "localname": "RETROFITTING OF NAMGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153639",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAMGAON TE PWSS",
+                        "localname": "RETROFITTING OF NAMGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAMGAON TE PWSS",
+                "localname": "RETROFITTING OF NAMGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153639",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAMGAON TE PWSS",
+                        "localname": "RETROFITTING OF NAMGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153639/ws-services-calculation/Penalty.json b/data/as/8153639/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ba2b40dc3
--- /dev/null
+++ b/data/as/8153639/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153639",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153639/ws-services-calculation/WCBillingSlab.json b/data/as/8153639/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8e5cec76d
--- /dev/null
+++ b/data/as/8153639/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153639",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153665/BillingService/BusinessService.json b/data/as/8153665/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55a6ae0eb1
--- /dev/null
+++ b/data/as/8153665/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153665",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153665/egov-location/boundary-data.json b/data/as/8153665/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e397b2d5c5
--- /dev/null
+++ b/data/as/8153665/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153665",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAMANIGAON PWSS",
+                "localname": "RETROFITTING OF NAMANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAMANIGAON PWSS",
+                        "localname": "RETROFITTING OF NAMANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAMANIGAON PWSS",
+                "localname": "RETROFITTING OF NAMANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAMANIGAON PWSS",
+                        "localname": "RETROFITTING OF NAMANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153665/ws-services-calculation/Penalty.json b/data/as/8153665/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6805a0eaf3
--- /dev/null
+++ b/data/as/8153665/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153665",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153665/ws-services-calculation/WCBillingSlab.json b/data/as/8153665/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..281be38515
--- /dev/null
+++ b/data/as/8153665/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153665",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153690/BillingService/BusinessService.json b/data/as/8153690/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b5e1931ff
--- /dev/null
+++ b/data/as/8153690/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153690",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153690/egov-location/boundary-data.json b/data/as/8153690/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0923185c56
--- /dev/null
+++ b/data/as/8153690/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153690",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKMARI PWSS",
+                "localname": "RETROFITTING OF BHALUKMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153690",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKMARI PWSS",
+                        "localname": "RETROFITTING OF BHALUKMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKMARI PWSS",
+                "localname": "RETROFITTING OF BHALUKMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153690",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKMARI PWSS",
+                        "localname": "RETROFITTING OF BHALUKMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153690/ws-services-calculation/Penalty.json b/data/as/8153690/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b8a5e50646
--- /dev/null
+++ b/data/as/8153690/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153690",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153690/ws-services-calculation/WCBillingSlab.json b/data/as/8153690/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4ec43d8775
--- /dev/null
+++ b/data/as/8153690/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153690",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153703/BillingService/BusinessService.json b/data/as/8153703/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c12acebf85
--- /dev/null
+++ b/data/as/8153703/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153703",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153703/egov-location/boundary-data.json b/data/as/8153703/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e874c3d60
--- /dev/null
+++ b/data/as/8153703/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153703",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JUGLONI PWSS",
+                "localname": "RETROFITTING OF JUGLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JUGLONI PWSS",
+                        "localname": "RETROFITTING OF JUGLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JUGLONI PWSS",
+                "localname": "RETROFITTING OF JUGLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JUGLONI PWSS",
+                        "localname": "RETROFITTING OF JUGLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153703/ws-services-calculation/Penalty.json b/data/as/8153703/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d2bc35f5d
--- /dev/null
+++ b/data/as/8153703/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153703",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153703/ws-services-calculation/WCBillingSlab.json b/data/as/8153703/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..025c39e7a7
--- /dev/null
+++ b/data/as/8153703/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153703",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153723/BillingService/BusinessService.json b/data/as/8153723/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2efc5e6295
--- /dev/null
+++ b/data/as/8153723/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153723",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153723/egov-location/boundary-data.json b/data/as/8153723/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d8de3f1a69
--- /dev/null
+++ b/data/as/8153723/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153723",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIKORAIJAN PWSS",
+                "localname": "RETROFITTING OF DIKORAIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153723",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIKORAIJAN PWSS",
+                        "localname": "RETROFITTING OF DIKORAIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIKORAIJAN PWSS",
+                "localname": "RETROFITTING OF DIKORAIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153723",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIKORAIJAN PWSS",
+                        "localname": "RETROFITTING OF DIKORAIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153723/ws-services-calculation/Penalty.json b/data/as/8153723/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..578177224b
--- /dev/null
+++ b/data/as/8153723/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153723",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153723/ws-services-calculation/WCBillingSlab.json b/data/as/8153723/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..90c8a72f05
--- /dev/null
+++ b/data/as/8153723/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153723",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153746/BillingService/BusinessService.json b/data/as/8153746/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c4a44c431e
--- /dev/null
+++ b/data/as/8153746/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153746",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153746/egov-location/boundary-data.json b/data/as/8153746/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7cb1a3e61
--- /dev/null
+++ b/data/as/8153746/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153746",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALIABHATA PWSS",
+                "localname": "RETROFITTING OF KALIABHATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153746",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALIABHATA PWSS",
+                        "localname": "RETROFITTING OF KALIABHATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALIABHATA PWSS",
+                "localname": "RETROFITTING OF KALIABHATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153746",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALIABHATA PWSS",
+                        "localname": "RETROFITTING OF KALIABHATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153746/ws-services-calculation/Penalty.json b/data/as/8153746/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..53759fdd2a
--- /dev/null
+++ b/data/as/8153746/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153746",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153746/ws-services-calculation/WCBillingSlab.json b/data/as/8153746/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a2d1dce81b
--- /dev/null
+++ b/data/as/8153746/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153746",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153766/BillingService/BusinessService.json b/data/as/8153766/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eccb5a2313
--- /dev/null
+++ b/data/as/8153766/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153766",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153766/egov-location/boundary-data.json b/data/as/8153766/egov-location/boundary-data.json
new file mode 100644
index 0000000000..84f9e798d9
--- /dev/null
+++ b/data/as/8153766/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153766",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUNIONI PWSS",
+                "localname": "RETROFITTING OF PUNIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153766",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUNIONI PWSS",
+                        "localname": "RETROFITTING OF PUNIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUNIONI PWSS",
+                "localname": "RETROFITTING OF PUNIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153766",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUNIONI PWSS",
+                        "localname": "RETROFITTING OF PUNIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153766/ws-services-calculation/Penalty.json b/data/as/8153766/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..760933e518
--- /dev/null
+++ b/data/as/8153766/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153766",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153766/ws-services-calculation/WCBillingSlab.json b/data/as/8153766/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b5744d113
--- /dev/null
+++ b/data/as/8153766/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153766",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153777/BillingService/BusinessService.json b/data/as/8153777/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f4cdf17633
--- /dev/null
+++ b/data/as/8153777/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153777",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153777/egov-location/boundary-data.json b/data/as/8153777/egov-location/boundary-data.json
new file mode 100644
index 0000000000..22412cbd1a
--- /dev/null
+++ b/data/as/8153777/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153777",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAPAM PWSS",
+                "localname": "RETROFITTING OF NAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAPAM PWSS",
+                        "localname": "RETROFITTING OF NAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAPAM PWSS",
+                "localname": "RETROFITTING OF NAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAPAM PWSS",
+                        "localname": "RETROFITTING OF NAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153777/ws-services-calculation/Penalty.json b/data/as/8153777/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c8fafd2b85
--- /dev/null
+++ b/data/as/8153777/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153777",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153777/ws-services-calculation/WCBillingSlab.json b/data/as/8153777/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f671f0ad2b
--- /dev/null
+++ b/data/as/8153777/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153777",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153800/BillingService/BusinessService.json b/data/as/8153800/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca57e183fa
--- /dev/null
+++ b/data/as/8153800/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153800",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153800/egov-location/boundary-data.json b/data/as/8153800/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7323850318
--- /dev/null
+++ b/data/as/8153800/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153800",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                "localname": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                        "localname": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                "localname": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                        "localname": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153800/ws-services-calculation/Penalty.json b/data/as/8153800/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2da2cba281
--- /dev/null
+++ b/data/as/8153800/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153800",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153800/ws-services-calculation/WCBillingSlab.json b/data/as/8153800/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41477dd64b
--- /dev/null
+++ b/data/as/8153800/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153800",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153823/BillingService/BusinessService.json b/data/as/8153823/BillingService/BusinessService.json
new file mode 100644
index 0000000000..187d0bc3dd
--- /dev/null
+++ b/data/as/8153823/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153823",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153823/egov-location/boundary-data.json b/data/as/8153823/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f886d24b47
--- /dev/null
+++ b/data/as/8153823/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153823",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRITOLI PWSS",
+                "localname": "RETROFITTING OF SINGRITOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153823",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRITOLI PWSS",
+                        "localname": "RETROFITTING OF SINGRITOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRITOLI PWSS",
+                "localname": "RETROFITTING OF SINGRITOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153823",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRITOLI PWSS",
+                        "localname": "RETROFITTING OF SINGRITOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153823/ws-services-calculation/Penalty.json b/data/as/8153823/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f655e70fcf
--- /dev/null
+++ b/data/as/8153823/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153823",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153823/ws-services-calculation/WCBillingSlab.json b/data/as/8153823/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5374e67c46
--- /dev/null
+++ b/data/as/8153823/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153823",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153844/BillingService/BusinessService.json b/data/as/8153844/BillingService/BusinessService.json
new file mode 100644
index 0000000000..02932da51d
--- /dev/null
+++ b/data/as/8153844/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8153844",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153844/egov-location/boundary-data.json b/data/as/8153844/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3e71d5b6e
--- /dev/null
+++ b/data/as/8153844/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8153844",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ANDURBBER PWSS",
+                "localname": "RETROFITTING OF ANDURBBER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ANDURBBER PWSS",
+                        "localname": "RETROFITTING OF ANDURBBER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ANDURBBER PWSS",
+                "localname": "RETROFITTING OF ANDURBBER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8153844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ANDURBBER PWSS",
+                        "localname": "RETROFITTING OF ANDURBBER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153844/ws-services-calculation/Penalty.json b/data/as/8153844/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db397121c6
--- /dev/null
+++ b/data/as/8153844/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8153844",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8153844/ws-services-calculation/WCBillingSlab.json b/data/as/8153844/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f1d4cdc178
--- /dev/null
+++ b/data/as/8153844/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8153844",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8154251/BillingService/BusinessService.json b/data/as/8154251/BillingService/BusinessService.json
new file mode 100644
index 0000000000..abfbb3592e
--- /dev/null
+++ b/data/as/8154251/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8154251",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8154251/egov-location/boundary-data.json b/data/as/8154251/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87ae2b8b05
--- /dev/null
+++ b/data/as/8154251/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8154251",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BESARKONA PWSS",
+                "localname": "BESARKONA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8154251",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BESARKONA PWSS",
+                        "localname": "BESARKONA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BESARKONA PWSS",
+                "localname": "BESARKONA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8154251",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BESARKONA PWSS",
+                        "localname": "BESARKONA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8154251/ws-services-calculation/Penalty.json b/data/as/8154251/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f6d906988
--- /dev/null
+++ b/data/as/8154251/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8154251",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8154251/ws-services-calculation/WCBillingSlab.json b/data/as/8154251/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc79d8c483
--- /dev/null
+++ b/data/as/8154251/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8154251",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155025/BillingService/BusinessService.json b/data/as/8155025/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b71215252c
--- /dev/null
+++ b/data/as/8155025/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155025",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155025/egov-location/boundary-data.json b/data/as/8155025/egov-location/boundary-data.json
new file mode 100644
index 0000000000..635f913b91
--- /dev/null
+++ b/data/as/8155025/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155025",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDOL PWSS",
+                "localname": "BORDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155025",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDOL PWSS",
+                        "localname": "BORDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDOL PWSS",
+                "localname": "BORDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155025",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDOL PWSS",
+                        "localname": "BORDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155025/ws-services-calculation/Penalty.json b/data/as/8155025/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8dd2bc37fa
--- /dev/null
+++ b/data/as/8155025/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155025",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155025/ws-services-calculation/WCBillingSlab.json b/data/as/8155025/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ec06102e8e
--- /dev/null
+++ b/data/as/8155025/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155025",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155026/BillingService/BusinessService.json b/data/as/8155026/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a4bee5562c
--- /dev/null
+++ b/data/as/8155026/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155026",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155026/egov-location/boundary-data.json b/data/as/8155026/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3b72d6a1b1
--- /dev/null
+++ b/data/as/8155026/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155026",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                "localname": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155026",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                        "localname": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                "localname": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155026",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                        "localname": "RETROFITTING OF JOYPUR GEREKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155026/ws-services-calculation/Penalty.json b/data/as/8155026/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d071430408
--- /dev/null
+++ b/data/as/8155026/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155026",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155026/ws-services-calculation/WCBillingSlab.json b/data/as/8155026/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f7f50ac13
--- /dev/null
+++ b/data/as/8155026/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155026",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155041/BillingService/BusinessService.json b/data/as/8155041/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92213367a1
--- /dev/null
+++ b/data/as/8155041/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155041",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155041/egov-location/boundary-data.json b/data/as/8155041/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ceac580cc2
--- /dev/null
+++ b/data/as/8155041/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155041",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                "localname": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155041",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                        "localname": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                "localname": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155041",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                        "localname": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155041/ws-services-calculation/Penalty.json b/data/as/8155041/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..548bc51bd4
--- /dev/null
+++ b/data/as/8155041/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155041",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155041/ws-services-calculation/WCBillingSlab.json b/data/as/8155041/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d1a2ceeb1d
--- /dev/null
+++ b/data/as/8155041/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155041",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155049/BillingService/BusinessService.json b/data/as/8155049/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8287b11c6d
--- /dev/null
+++ b/data/as/8155049/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155049",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155049/egov-location/boundary-data.json b/data/as/8155049/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9873d4c16f
--- /dev/null
+++ b/data/as/8155049/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155049",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JANJIPARA PWSS",
+                "localname": "JANJIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155049",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JANJIPARA PWSS",
+                        "localname": "JANJIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JANJIPARA PWSS",
+                "localname": "JANJIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155049",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JANJIPARA PWSS",
+                        "localname": "JANJIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155049/ws-services-calculation/Penalty.json b/data/as/8155049/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a7b1c96ee
--- /dev/null
+++ b/data/as/8155049/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155049",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155049/ws-services-calculation/WCBillingSlab.json b/data/as/8155049/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2233512e9c
--- /dev/null
+++ b/data/as/8155049/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155049",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155055/BillingService/BusinessService.json b/data/as/8155055/BillingService/BusinessService.json
new file mode 100644
index 0000000000..adbcc3b893
--- /dev/null
+++ b/data/as/8155055/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155055",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155055/egov-location/boundary-data.json b/data/as/8155055/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7fa6222c9
--- /dev/null
+++ b/data/as/8155055/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155055",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAROBHUYAN PWSS",
+                "localname": "RETROFITTING OF BAROBHUYAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAROBHUYAN PWSS",
+                        "localname": "RETROFITTING OF BAROBHUYAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAROBHUYAN PWSS",
+                "localname": "RETROFITTING OF BAROBHUYAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAROBHUYAN PWSS",
+                        "localname": "RETROFITTING OF BAROBHUYAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155055/ws-services-calculation/Penalty.json b/data/as/8155055/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..39fe87ebd5
--- /dev/null
+++ b/data/as/8155055/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155055",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155055/ws-services-calculation/WCBillingSlab.json b/data/as/8155055/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf0f933633
--- /dev/null
+++ b/data/as/8155055/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155055",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155070/BillingService/BusinessService.json b/data/as/8155070/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d2ae49ca7
--- /dev/null
+++ b/data/as/8155070/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155070",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155070/egov-location/boundary-data.json b/data/as/8155070/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e158b6b208
--- /dev/null
+++ b/data/as/8155070/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155070",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOMARDOLONI PWSS",
+                "localname": "RETROFITTING OF SOMARDOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOMARDOLONI PWSS",
+                        "localname": "RETROFITTING OF SOMARDOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOMARDOLONI PWSS",
+                "localname": "RETROFITTING OF SOMARDOLONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOMARDOLONI PWSS",
+                        "localname": "RETROFITTING OF SOMARDOLONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155070/ws-services-calculation/Penalty.json b/data/as/8155070/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd1bda73e0
--- /dev/null
+++ b/data/as/8155070/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155070",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155070/ws-services-calculation/WCBillingSlab.json b/data/as/8155070/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..601ba33203
--- /dev/null
+++ b/data/as/8155070/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155070",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155090/BillingService/BusinessService.json b/data/as/8155090/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e83de819d
--- /dev/null
+++ b/data/as/8155090/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155090",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155090/egov-location/boundary-data.json b/data/as/8155090/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53b167b6bf
--- /dev/null
+++ b/data/as/8155090/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155090",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ITAKHOLA PWSS",
+                "localname": "RETROFITTING OF ITAKHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155090",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ITAKHOLA PWSS",
+                        "localname": "RETROFITTING OF ITAKHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ITAKHOLA PWSS",
+                "localname": "RETROFITTING OF ITAKHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155090",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ITAKHOLA PWSS",
+                        "localname": "RETROFITTING OF ITAKHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155090/ws-services-calculation/Penalty.json b/data/as/8155090/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0942af9e80
--- /dev/null
+++ b/data/as/8155090/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155090",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155090/ws-services-calculation/WCBillingSlab.json b/data/as/8155090/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d7a317aece
--- /dev/null
+++ b/data/as/8155090/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155090",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155168/BillingService/BusinessService.json b/data/as/8155168/BillingService/BusinessService.json
new file mode 100644
index 0000000000..76f1fc1fbd
--- /dev/null
+++ b/data/as/8155168/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155168",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155168/egov-location/boundary-data.json b/data/as/8155168/egov-location/boundary-data.json
new file mode 100644
index 0000000000..24e57d1390
--- /dev/null
+++ b/data/as/8155168/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155168",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHAHIGAON PWSS",
+                "localname": "RETROFITTING OF GHAHIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHAHIGAON PWSS",
+                        "localname": "RETROFITTING OF GHAHIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHAHIGAON PWSS",
+                "localname": "RETROFITTING OF GHAHIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHAHIGAON PWSS",
+                        "localname": "RETROFITTING OF GHAHIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155168/ws-services-calculation/Penalty.json b/data/as/8155168/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95bb27355c
--- /dev/null
+++ b/data/as/8155168/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155168",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155168/ws-services-calculation/WCBillingSlab.json b/data/as/8155168/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2070cf5de2
--- /dev/null
+++ b/data/as/8155168/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155168",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155206/BillingService/BusinessService.json b/data/as/8155206/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c83dd70f90
--- /dev/null
+++ b/data/as/8155206/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155206",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155206/egov-location/boundary-data.json b/data/as/8155206/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5d365a1961
--- /dev/null
+++ b/data/as/8155206/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155206",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHENGAMARI PWSS",
+                "localname": "RETROFITTING OF CHENGAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHENGAMARI PWSS",
+                        "localname": "RETROFITTING OF CHENGAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHENGAMARI PWSS",
+                "localname": "RETROFITTING OF CHENGAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHENGAMARI PWSS",
+                        "localname": "RETROFITTING OF CHENGAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155206/ws-services-calculation/Penalty.json b/data/as/8155206/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f117b4d75
--- /dev/null
+++ b/data/as/8155206/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155206",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155206/ws-services-calculation/WCBillingSlab.json b/data/as/8155206/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed581d4f7d
--- /dev/null
+++ b/data/as/8155206/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155206",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155271/BillingService/BusinessService.json b/data/as/8155271/BillingService/BusinessService.json
new file mode 100644
index 0000000000..782d7f691c
--- /dev/null
+++ b/data/as/8155271/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155271",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155271/egov-location/boundary-data.json b/data/as/8155271/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6a876a31ca
--- /dev/null
+++ b/data/as/8155271/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155271",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF POHUSOWA PWSS",
+                "localname": "RETROFITTING OF POHUSOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF POHUSOWA PWSS",
+                        "localname": "RETROFITTING OF POHUSOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF POHUSOWA PWSS",
+                "localname": "RETROFITTING OF POHUSOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF POHUSOWA PWSS",
+                        "localname": "RETROFITTING OF POHUSOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155271/ws-services-calculation/Penalty.json b/data/as/8155271/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42eb065b65
--- /dev/null
+++ b/data/as/8155271/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155271",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155271/ws-services-calculation/WCBillingSlab.json b/data/as/8155271/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ba778409d
--- /dev/null
+++ b/data/as/8155271/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155271",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155279/BillingService/BusinessService.json b/data/as/8155279/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a3fc839c0
--- /dev/null
+++ b/data/as/8155279/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155279",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155279/egov-location/boundary-data.json b/data/as/8155279/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a114041b1b
--- /dev/null
+++ b/data/as/8155279/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155279",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAMAGURI PWSS",
+                "localname": "RETROFITTING OF SAMAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155279",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAMAGURI PWSS",
+                        "localname": "RETROFITTING OF SAMAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAMAGURI PWSS",
+                "localname": "RETROFITTING OF SAMAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155279",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAMAGURI PWSS",
+                        "localname": "RETROFITTING OF SAMAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155279/ws-services-calculation/Penalty.json b/data/as/8155279/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ddcd4bc87
--- /dev/null
+++ b/data/as/8155279/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155279",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155279/ws-services-calculation/WCBillingSlab.json b/data/as/8155279/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3c104d6eb
--- /dev/null
+++ b/data/as/8155279/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155279",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155344/BillingService/BusinessService.json b/data/as/8155344/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f75cc4e3b2
--- /dev/null
+++ b/data/as/8155344/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8155344",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155344/egov-location/boundary-data.json b/data/as/8155344/egov-location/boundary-data.json
new file mode 100644
index 0000000000..725077e01d
--- /dev/null
+++ b/data/as/8155344/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8155344",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                "localname": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                        "localname": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                "localname": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8155344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                        "localname": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155344/ws-services-calculation/Penalty.json b/data/as/8155344/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cb2ddc9929
--- /dev/null
+++ b/data/as/8155344/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8155344",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8155344/ws-services-calculation/WCBillingSlab.json b/data/as/8155344/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..50d43c1f99
--- /dev/null
+++ b/data/as/8155344/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8155344",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156157/BillingService/BusinessService.json b/data/as/8156157/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b9e7434dd
--- /dev/null
+++ b/data/as/8156157/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156157",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156157/egov-location/boundary-data.json b/data/as/8156157/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8abf3a53b
--- /dev/null
+++ b/data/as/8156157/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156157",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALYANPUR PWSS",
+                "localname": "RETROFITTING OF KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALYANPUR PWSS",
+                        "localname": "RETROFITTING OF KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALYANPUR PWSS",
+                "localname": "RETROFITTING OF KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALYANPUR PWSS",
+                        "localname": "RETROFITTING OF KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156157/ws-services-calculation/Penalty.json b/data/as/8156157/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5631a86902
--- /dev/null
+++ b/data/as/8156157/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156157",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156157/ws-services-calculation/WCBillingSlab.json b/data/as/8156157/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..350e2b80cf
--- /dev/null
+++ b/data/as/8156157/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156157",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156180/BillingService/BusinessService.json b/data/as/8156180/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7f1744c180
--- /dev/null
+++ b/data/as/8156180/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156180",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156180/egov-location/boundary-data.json b/data/as/8156180/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87c7e70fa4
--- /dev/null
+++ b/data/as/8156180/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156180",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIDANPUR PWSS",
+                "localname": "RETROFITTING OF NIDANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156180",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIDANPUR PWSS",
+                        "localname": "RETROFITTING OF NIDANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIDANPUR PWSS",
+                "localname": "RETROFITTING OF NIDANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156180",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIDANPUR PWSS",
+                        "localname": "RETROFITTING OF NIDANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156180/ws-services-calculation/Penalty.json b/data/as/8156180/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ffe6f99965
--- /dev/null
+++ b/data/as/8156180/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156180",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156180/ws-services-calculation/WCBillingSlab.json b/data/as/8156180/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..866cdd520d
--- /dev/null
+++ b/data/as/8156180/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156180",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156193/BillingService/BusinessService.json b/data/as/8156193/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dcfacd0fb9
--- /dev/null
+++ b/data/as/8156193/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156193",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156193/egov-location/boundary-data.json b/data/as/8156193/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba55a4d838
--- /dev/null
+++ b/data/as/8156193/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156193",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATOGAON PWSS",
+                "localname": "RETROFITTING OF HATOGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATOGAON PWSS",
+                        "localname": "RETROFITTING OF HATOGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATOGAON PWSS",
+                "localname": "RETROFITTING OF HATOGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATOGAON PWSS",
+                        "localname": "RETROFITTING OF HATOGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156193/ws-services-calculation/Penalty.json b/data/as/8156193/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a14f02e2a
--- /dev/null
+++ b/data/as/8156193/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156193",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156193/ws-services-calculation/WCBillingSlab.json b/data/as/8156193/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..36f491d580
--- /dev/null
+++ b/data/as/8156193/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156193",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156208/BillingService/BusinessService.json b/data/as/8156208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f20d313792
--- /dev/null
+++ b/data/as/8156208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156208/egov-location/boundary-data.json b/data/as/8156208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20db5b38dd
--- /dev/null
+++ b/data/as/8156208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RISHIPARA PWSS",
+                "localname": "RETROFITTING OF RISHIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RISHIPARA PWSS",
+                        "localname": "RETROFITTING OF RISHIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RISHIPARA PWSS",
+                "localname": "RETROFITTING OF RISHIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RISHIPARA PWSS",
+                        "localname": "RETROFITTING OF RISHIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156208/ws-services-calculation/Penalty.json b/data/as/8156208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7736f7f307
--- /dev/null
+++ b/data/as/8156208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156208/ws-services-calculation/WCBillingSlab.json b/data/as/8156208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7b0815e671
--- /dev/null
+++ b/data/as/8156208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156216/BillingService/BusinessService.json b/data/as/8156216/BillingService/BusinessService.json
new file mode 100644
index 0000000000..76e39bf7e5
--- /dev/null
+++ b/data/as/8156216/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156216",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156216/egov-location/boundary-data.json b/data/as/8156216/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5435ace647
--- /dev/null
+++ b/data/as/8156216/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156216",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARPATHER PWSS",
+                "localname": "RETROFITTING OF KAMARPATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156216",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARPATHER PWSS",
+                        "localname": "RETROFITTING OF KAMARPATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARPATHER PWSS",
+                "localname": "RETROFITTING OF KAMARPATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156216",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARPATHER PWSS",
+                        "localname": "RETROFITTING OF KAMARPATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156216/ws-services-calculation/Penalty.json b/data/as/8156216/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca6f908562
--- /dev/null
+++ b/data/as/8156216/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156216",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156216/ws-services-calculation/WCBillingSlab.json b/data/as/8156216/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7077d3c8d3
--- /dev/null
+++ b/data/as/8156216/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156216",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156220/BillingService/BusinessService.json b/data/as/8156220/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41ac779a9a
--- /dev/null
+++ b/data/as/8156220/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156220",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156220/egov-location/boundary-data.json b/data/as/8156220/egov-location/boundary-data.json
new file mode 100644
index 0000000000..410093bf5a
--- /dev/null
+++ b/data/as/8156220/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156220",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHOIBARI PWSS",
+                "localname": "RETROFITTING OF CHOIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHOIBARI PWSS",
+                        "localname": "RETROFITTING OF CHOIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHOIBARI PWSS",
+                "localname": "RETROFITTING OF CHOIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHOIBARI PWSS",
+                        "localname": "RETROFITTING OF CHOIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156220/ws-services-calculation/Penalty.json b/data/as/8156220/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..981face680
--- /dev/null
+++ b/data/as/8156220/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156220",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156220/ws-services-calculation/WCBillingSlab.json b/data/as/8156220/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68fde8158a
--- /dev/null
+++ b/data/as/8156220/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156220",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156223/BillingService/BusinessService.json b/data/as/8156223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7029cf57fe
--- /dev/null
+++ b/data/as/8156223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156223/egov-location/boundary-data.json b/data/as/8156223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d00e978ea9
--- /dev/null
+++ b/data/as/8156223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NARAYANKATI PWSS",
+                "localname": "RETROFITTING OF NARAYANKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NARAYANKATI PWSS",
+                        "localname": "RETROFITTING OF NARAYANKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NARAYANKATI PWSS",
+                "localname": "RETROFITTING OF NARAYANKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NARAYANKATI PWSS",
+                        "localname": "RETROFITTING OF NARAYANKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156223/ws-services-calculation/Penalty.json b/data/as/8156223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0f3a85b501
--- /dev/null
+++ b/data/as/8156223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156223/ws-services-calculation/WCBillingSlab.json b/data/as/8156223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c9a242e0ab
--- /dev/null
+++ b/data/as/8156223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156231/BillingService/BusinessService.json b/data/as/8156231/BillingService/BusinessService.json
new file mode 100644
index 0000000000..130a82bfbf
--- /dev/null
+++ b/data/as/8156231/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156231",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156231/egov-location/boundary-data.json b/data/as/8156231/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0a1d822e7e
--- /dev/null
+++ b/data/as/8156231/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156231",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MEGHAIATI PWSS",
+                "localname": "RETROFITTING OF MEGHAIATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156231",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MEGHAIATI PWSS",
+                        "localname": "RETROFITTING OF MEGHAIATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MEGHAIATI PWSS",
+                "localname": "RETROFITTING OF MEGHAIATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156231",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MEGHAIATI PWSS",
+                        "localname": "RETROFITTING OF MEGHAIATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156231/ws-services-calculation/Penalty.json b/data/as/8156231/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83c003fd1d
--- /dev/null
+++ b/data/as/8156231/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156231",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156231/ws-services-calculation/WCBillingSlab.json b/data/as/8156231/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5bf65b5123
--- /dev/null
+++ b/data/as/8156231/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156231",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156241/BillingService/BusinessService.json b/data/as/8156241/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4c469ca8a
--- /dev/null
+++ b/data/as/8156241/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156241",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156241/egov-location/boundary-data.json b/data/as/8156241/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e78f90236
--- /dev/null
+++ b/data/as/8156241/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156241",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SALPARA PWSS",
+                "localname": "RETROFITTING OF SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SALPARA PWSS",
+                        "localname": "RETROFITTING OF SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SALPARA PWSS",
+                "localname": "RETROFITTING OF SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SALPARA PWSS",
+                        "localname": "RETROFITTING OF SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156241/ws-services-calculation/Penalty.json b/data/as/8156241/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e1363a6461
--- /dev/null
+++ b/data/as/8156241/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156241",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156241/ws-services-calculation/WCBillingSlab.json b/data/as/8156241/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a67d43c9de
--- /dev/null
+++ b/data/as/8156241/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156241",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156244/BillingService/BusinessService.json b/data/as/8156244/BillingService/BusinessService.json
new file mode 100644
index 0000000000..642f2f1111
--- /dev/null
+++ b/data/as/8156244/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156244",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156244/egov-location/boundary-data.json b/data/as/8156244/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bbe4460c44
--- /dev/null
+++ b/data/as/8156244/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156244",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARPARA PWSS",
+                "localname": "RETROFITTING OF GARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARPARA PWSS",
+                        "localname": "RETROFITTING OF GARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARPARA PWSS",
+                "localname": "RETROFITTING OF GARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARPARA PWSS",
+                        "localname": "RETROFITTING OF GARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156244/ws-services-calculation/Penalty.json b/data/as/8156244/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f054bb0e67
--- /dev/null
+++ b/data/as/8156244/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156244",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156244/ws-services-calculation/WCBillingSlab.json b/data/as/8156244/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..96a7d191e9
--- /dev/null
+++ b/data/as/8156244/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156244",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156253/BillingService/BusinessService.json b/data/as/8156253/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4fb2eb632f
--- /dev/null
+++ b/data/as/8156253/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156253",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156253/egov-location/boundary-data.json b/data/as/8156253/egov-location/boundary-data.json
new file mode 100644
index 0000000000..94ab9152e7
--- /dev/null
+++ b/data/as/8156253/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156253",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOGHO PWSS",
+                "localname": "RETROFITTING OF MOGHO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156253",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOGHO PWSS",
+                        "localname": "RETROFITTING OF MOGHO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOGHO PWSS",
+                "localname": "RETROFITTING OF MOGHO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156253",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOGHO PWSS",
+                        "localname": "RETROFITTING OF MOGHO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156253/ws-services-calculation/Penalty.json b/data/as/8156253/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2db03de52b
--- /dev/null
+++ b/data/as/8156253/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156253",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156253/ws-services-calculation/WCBillingSlab.json b/data/as/8156253/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5dcc48782b
--- /dev/null
+++ b/data/as/8156253/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156253",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156257/BillingService/BusinessService.json b/data/as/8156257/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1640bdc283
--- /dev/null
+++ b/data/as/8156257/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156257",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156257/egov-location/boundary-data.json b/data/as/8156257/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1621d66637
--- /dev/null
+++ b/data/as/8156257/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156257",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILIKHABARI PWSS",
+                "localname": "RETROFITTING OF SILIKHABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILIKHABARI PWSS",
+                        "localname": "RETROFITTING OF SILIKHABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILIKHABARI PWSS",
+                "localname": "RETROFITTING OF SILIKHABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILIKHABARI PWSS",
+                        "localname": "RETROFITTING OF SILIKHABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156257/ws-services-calculation/Penalty.json b/data/as/8156257/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d91096d446
--- /dev/null
+++ b/data/as/8156257/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156257",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156257/ws-services-calculation/WCBillingSlab.json b/data/as/8156257/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..39f82bab4f
--- /dev/null
+++ b/data/as/8156257/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156257",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156263/BillingService/BusinessService.json b/data/as/8156263/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cbde288b0a
--- /dev/null
+++ b/data/as/8156263/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156263",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156263/egov-location/boundary-data.json b/data/as/8156263/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9b25d19d38
--- /dev/null
+++ b/data/as/8156263/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156263",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTONG OF TULIP TE PWSS",
+                "localname": "RETROFITTONG OF TULIP TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156263",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTONG OF TULIP TE PWSS",
+                        "localname": "RETROFITTONG OF TULIP TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTONG OF TULIP TE PWSS",
+                "localname": "RETROFITTONG OF TULIP TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156263",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTONG OF TULIP TE PWSS",
+                        "localname": "RETROFITTONG OF TULIP TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156263/ws-services-calculation/Penalty.json b/data/as/8156263/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1df928c8e2
--- /dev/null
+++ b/data/as/8156263/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156263",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156263/ws-services-calculation/WCBillingSlab.json b/data/as/8156263/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e26049271
--- /dev/null
+++ b/data/as/8156263/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156263",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156271/BillingService/BusinessService.json b/data/as/8156271/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f0b50473b
--- /dev/null
+++ b/data/as/8156271/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156271",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156271/egov-location/boundary-data.json b/data/as/8156271/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c2a7e86626
--- /dev/null
+++ b/data/as/8156271/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156271",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THORKO PWSS",
+                "localname": "RETROFITTING OF THORKO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THORKO PWSS",
+                        "localname": "RETROFITTING OF THORKO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THORKO PWSS",
+                "localname": "RETROFITTING OF THORKO PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THORKO PWSS",
+                        "localname": "RETROFITTING OF THORKO PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156271/ws-services-calculation/Penalty.json b/data/as/8156271/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71d172a3eb
--- /dev/null
+++ b/data/as/8156271/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156271",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156271/ws-services-calculation/WCBillingSlab.json b/data/as/8156271/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a17ddb422c
--- /dev/null
+++ b/data/as/8156271/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156271",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156274/BillingService/BusinessService.json b/data/as/8156274/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0972087cdf
--- /dev/null
+++ b/data/as/8156274/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156274",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156274/egov-location/boundary-data.json b/data/as/8156274/egov-location/boundary-data.json
new file mode 100644
index 0000000000..148854f9df
--- /dev/null
+++ b/data/as/8156274/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156274",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NOORPURJUT PWSS",
+                "localname": "RETROFITTING OF NOORPURJUT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156274",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NOORPURJUT PWSS",
+                        "localname": "RETROFITTING OF NOORPURJUT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NOORPURJUT PWSS",
+                "localname": "RETROFITTING OF NOORPURJUT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156274",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NOORPURJUT PWSS",
+                        "localname": "RETROFITTING OF NOORPURJUT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156274/ws-services-calculation/Penalty.json b/data/as/8156274/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd4aca7de9
--- /dev/null
+++ b/data/as/8156274/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156274",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156274/ws-services-calculation/WCBillingSlab.json b/data/as/8156274/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..12c550dc9c
--- /dev/null
+++ b/data/as/8156274/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156274",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156288/BillingService/BusinessService.json b/data/as/8156288/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6fa6ac232
--- /dev/null
+++ b/data/as/8156288/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156288",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156288/egov-location/boundary-data.json b/data/as/8156288/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89ddac3afa
--- /dev/null
+++ b/data/as/8156288/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156288",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHERMOHRA PWSS",
+                "localname": "RETROFITTING OF KHERMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHERMOHRA PWSS",
+                        "localname": "RETROFITTING OF KHERMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHERMOHRA PWSS",
+                "localname": "RETROFITTING OF KHERMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHERMOHRA PWSS",
+                        "localname": "RETROFITTING OF KHERMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156288/ws-services-calculation/Penalty.json b/data/as/8156288/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f6e035b51
--- /dev/null
+++ b/data/as/8156288/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156288",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156288/ws-services-calculation/WCBillingSlab.json b/data/as/8156288/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..87557d4941
--- /dev/null
+++ b/data/as/8156288/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156288",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156289/BillingService/BusinessService.json b/data/as/8156289/BillingService/BusinessService.json
new file mode 100644
index 0000000000..442cb68b9e
--- /dev/null
+++ b/data/as/8156289/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156289",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156289/egov-location/boundary-data.json b/data/as/8156289/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb42847ee7
--- /dev/null
+++ b/data/as/8156289/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156289",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYNAGAR PWSS",
+                "localname": "RETROFITTING OF JOYNAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYNAGAR PWSS",
+                        "localname": "RETROFITTING OF JOYNAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYNAGAR PWSS",
+                "localname": "RETROFITTING OF JOYNAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYNAGAR PWSS",
+                        "localname": "RETROFITTING OF JOYNAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156289/ws-services-calculation/Penalty.json b/data/as/8156289/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42a6122a28
--- /dev/null
+++ b/data/as/8156289/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156289",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156289/ws-services-calculation/WCBillingSlab.json b/data/as/8156289/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21679ef894
--- /dev/null
+++ b/data/as/8156289/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156289",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156315/BillingService/BusinessService.json b/data/as/8156315/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66232d2494
--- /dev/null
+++ b/data/as/8156315/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156315",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156315/egov-location/boundary-data.json b/data/as/8156315/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b81a6420bc
--- /dev/null
+++ b/data/as/8156315/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156315",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MESSELKHOWA PWSS",
+                "localname": "RETROFITTING OF MESSELKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MESSELKHOWA PWSS",
+                        "localname": "RETROFITTING OF MESSELKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MESSELKHOWA PWSS",
+                "localname": "RETROFITTING OF MESSELKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MESSELKHOWA PWSS",
+                        "localname": "RETROFITTING OF MESSELKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156315/ws-services-calculation/Penalty.json b/data/as/8156315/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e251ba590f
--- /dev/null
+++ b/data/as/8156315/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156315",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156315/ws-services-calculation/WCBillingSlab.json b/data/as/8156315/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..90a5883fbf
--- /dev/null
+++ b/data/as/8156315/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156315",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156393/BillingService/BusinessService.json b/data/as/8156393/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dd89e7e4b2
--- /dev/null
+++ b/data/as/8156393/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156393",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156393/egov-location/boundary-data.json b/data/as/8156393/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae61ab64df
--- /dev/null
+++ b/data/as/8156393/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156393",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                "localname": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                        "localname": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                "localname": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                        "localname": "RETROFITTING OF NAHARANI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156393/ws-services-calculation/Penalty.json b/data/as/8156393/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2c4023e29
--- /dev/null
+++ b/data/as/8156393/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156393",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156393/ws-services-calculation/WCBillingSlab.json b/data/as/8156393/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc92ca3184
--- /dev/null
+++ b/data/as/8156393/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156393",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156410/BillingService/BusinessService.json b/data/as/8156410/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed4d78cdf8
--- /dev/null
+++ b/data/as/8156410/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156410",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156410/egov-location/boundary-data.json b/data/as/8156410/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b06b1e9172
--- /dev/null
+++ b/data/as/8156410/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156410",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                "localname": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156410",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                        "localname": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                "localname": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156410",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                        "localname": "RETROFITTING OF NIZ BORCHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156410/ws-services-calculation/Penalty.json b/data/as/8156410/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5541344c4b
--- /dev/null
+++ b/data/as/8156410/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156410",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156410/ws-services-calculation/WCBillingSlab.json b/data/as/8156410/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc3b5e085f
--- /dev/null
+++ b/data/as/8156410/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156410",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156419/BillingService/BusinessService.json b/data/as/8156419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19007c4730
--- /dev/null
+++ b/data/as/8156419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156419/egov-location/boundary-data.json b/data/as/8156419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2b1f6fbaf8
--- /dev/null
+++ b/data/as/8156419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TURIPAM PWSS",
+                "localname": "RETROFITTING OF TURIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TURIPAM PWSS",
+                        "localname": "RETROFITTING OF TURIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TURIPAM PWSS",
+                "localname": "RETROFITTING OF TURIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TURIPAM PWSS",
+                        "localname": "RETROFITTING OF TURIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156419/ws-services-calculation/Penalty.json b/data/as/8156419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc68ab920a
--- /dev/null
+++ b/data/as/8156419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156419/ws-services-calculation/WCBillingSlab.json b/data/as/8156419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3bdc3c4309
--- /dev/null
+++ b/data/as/8156419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156424/BillingService/BusinessService.json b/data/as/8156424/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cbaeaf1f6b
--- /dev/null
+++ b/data/as/8156424/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156424",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156424/egov-location/boundary-data.json b/data/as/8156424/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dc8304e2d4
--- /dev/null
+++ b/data/as/8156424/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156424",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOORPUKHURI PWSS",
+                "localname": "RETROFITTING OF JOORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156424",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOORPUKHURI PWSS",
+                        "localname": "RETROFITTING OF JOORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOORPUKHURI PWSS",
+                "localname": "RETROFITTING OF JOORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156424",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOORPUKHURI PWSS",
+                        "localname": "RETROFITTING OF JOORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156424/ws-services-calculation/Penalty.json b/data/as/8156424/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e145f50ad9
--- /dev/null
+++ b/data/as/8156424/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156424",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156424/ws-services-calculation/WCBillingSlab.json b/data/as/8156424/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ffe3db5f74
--- /dev/null
+++ b/data/as/8156424/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156424",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156430/BillingService/BusinessService.json b/data/as/8156430/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e97ef020be
--- /dev/null
+++ b/data/as/8156430/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156430",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156430/egov-location/boundary-data.json b/data/as/8156430/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71245f9937
--- /dev/null
+++ b/data/as/8156430/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156430",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHANGAMANDIR PWSS",
+                "localname": "RETROFITTING OF BHANGAMANDIR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156430",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHANGAMANDIR PWSS",
+                        "localname": "RETROFITTING OF BHANGAMANDIR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHANGAMANDIR PWSS",
+                "localname": "RETROFITTING OF BHANGAMANDIR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156430",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHANGAMANDIR PWSS",
+                        "localname": "RETROFITTING OF BHANGAMANDIR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156430/ws-services-calculation/Penalty.json b/data/as/8156430/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4dd151f03c
--- /dev/null
+++ b/data/as/8156430/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156430",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156430/ws-services-calculation/WCBillingSlab.json b/data/as/8156430/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..18f0cadf4d
--- /dev/null
+++ b/data/as/8156430/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156430",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156440/BillingService/BusinessService.json b/data/as/8156440/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e369dd5cb4
--- /dev/null
+++ b/data/as/8156440/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8156440",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156440/egov-location/boundary-data.json b/data/as/8156440/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d64b89ecf
--- /dev/null
+++ b/data/as/8156440/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8156440",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SURYAPUR PWSS",
+                "localname": "RETROFITTING OF SURYAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156440",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SURYAPUR PWSS",
+                        "localname": "RETROFITTING OF SURYAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SURYAPUR PWSS",
+                "localname": "RETROFITTING OF SURYAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8156440",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SURYAPUR PWSS",
+                        "localname": "RETROFITTING OF SURYAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156440/ws-services-calculation/Penalty.json b/data/as/8156440/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ddb4696860
--- /dev/null
+++ b/data/as/8156440/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8156440",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8156440/ws-services-calculation/WCBillingSlab.json b/data/as/8156440/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eb1f58345c
--- /dev/null
+++ b/data/as/8156440/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8156440",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157519/BillingService/BusinessService.json b/data/as/8157519/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a6b2a9906
--- /dev/null
+++ b/data/as/8157519/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8157519",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157519/egov-location/boundary-data.json b/data/as/8157519/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aeb328fef5
--- /dev/null
+++ b/data/as/8157519/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8157519",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHILADHARIGAON PWSS",
+                "localname": "RETROFITTING OF GHILADHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157519",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHILADHARIGAON PWSS",
+                        "localname": "RETROFITTING OF GHILADHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHILADHARIGAON PWSS",
+                "localname": "RETROFITTING OF GHILADHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157519",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHILADHARIGAON PWSS",
+                        "localname": "RETROFITTING OF GHILADHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157519/ws-services-calculation/Penalty.json b/data/as/8157519/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b0d345bcc5
--- /dev/null
+++ b/data/as/8157519/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8157519",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157519/ws-services-calculation/WCBillingSlab.json b/data/as/8157519/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6c6e67cc1
--- /dev/null
+++ b/data/as/8157519/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8157519",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157593/BillingService/BusinessService.json b/data/as/8157593/BillingService/BusinessService.json
new file mode 100644
index 0000000000..68df7d1cb9
--- /dev/null
+++ b/data/as/8157593/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8157593",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157593/egov-location/boundary-data.json b/data/as/8157593/egov-location/boundary-data.json
new file mode 100644
index 0000000000..885dfbc11f
--- /dev/null
+++ b/data/as/8157593/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8157593",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAMIRIPAL PWSS",
+                "localname": "RETROFITTING OF GAMIRIPAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157593",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAMIRIPAL PWSS",
+                        "localname": "RETROFITTING OF GAMIRIPAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAMIRIPAL PWSS",
+                "localname": "RETROFITTING OF GAMIRIPAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157593",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAMIRIPAL PWSS",
+                        "localname": "RETROFITTING OF GAMIRIPAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157593/ws-services-calculation/Penalty.json b/data/as/8157593/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f025d1bf97
--- /dev/null
+++ b/data/as/8157593/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8157593",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157593/ws-services-calculation/WCBillingSlab.json b/data/as/8157593/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b62c19614e
--- /dev/null
+++ b/data/as/8157593/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8157593",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157595/BillingService/BusinessService.json b/data/as/8157595/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c8295278b6
--- /dev/null
+++ b/data/as/8157595/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8157595",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157595/egov-location/boundary-data.json b/data/as/8157595/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2c65f5066
--- /dev/null
+++ b/data/as/8157595/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8157595",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHITOLMARI PWSS",
+                "localname": "RETROFITTING OF CHITOLMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHITOLMARI PWSS",
+                        "localname": "RETROFITTING OF CHITOLMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHITOLMARI PWSS",
+                "localname": "RETROFITTING OF CHITOLMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHITOLMARI PWSS",
+                        "localname": "RETROFITTING OF CHITOLMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157595/ws-services-calculation/Penalty.json b/data/as/8157595/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..617a6ff117
--- /dev/null
+++ b/data/as/8157595/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8157595",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157595/ws-services-calculation/WCBillingSlab.json b/data/as/8157595/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0776463dd2
--- /dev/null
+++ b/data/as/8157595/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8157595",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157600/BillingService/BusinessService.json b/data/as/8157600/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1385484564
--- /dev/null
+++ b/data/as/8157600/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8157600",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157600/egov-location/boundary-data.json b/data/as/8157600/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e5c534406
--- /dev/null
+++ b/data/as/8157600/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8157600",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOGABIL PWSS",
+                "localname": "RETROFITTING OF BOGABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOGABIL PWSS",
+                        "localname": "RETROFITTING OF BOGABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOGABIL PWSS",
+                "localname": "RETROFITTING OF BOGABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOGABIL PWSS",
+                        "localname": "RETROFITTING OF BOGABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157600/ws-services-calculation/Penalty.json b/data/as/8157600/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1ee5e4f291
--- /dev/null
+++ b/data/as/8157600/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8157600",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157600/ws-services-calculation/WCBillingSlab.json b/data/as/8157600/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7051380349
--- /dev/null
+++ b/data/as/8157600/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8157600",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157602/BillingService/BusinessService.json b/data/as/8157602/BillingService/BusinessService.json
new file mode 100644
index 0000000000..39649d7e6c
--- /dev/null
+++ b/data/as/8157602/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8157602",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157602/egov-location/boundary-data.json b/data/as/8157602/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8dc172df0d
--- /dev/null
+++ b/data/as/8157602/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8157602",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONARIGAON PWSS",
+                "localname": "RETROFITTING OF SONARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157602",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONARIGAON PWSS",
+                        "localname": "RETROFITTING OF SONARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONARIGAON PWSS",
+                "localname": "RETROFITTING OF SONARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157602",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONARIGAON PWSS",
+                        "localname": "RETROFITTING OF SONARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157602/ws-services-calculation/Penalty.json b/data/as/8157602/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69632ae920
--- /dev/null
+++ b/data/as/8157602/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8157602",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157602/ws-services-calculation/WCBillingSlab.json b/data/as/8157602/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e7461e2bd
--- /dev/null
+++ b/data/as/8157602/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8157602",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157739/BillingService/BusinessService.json b/data/as/8157739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..38f0333fa0
--- /dev/null
+++ b/data/as/8157739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8157739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157739/egov-location/boundary-data.json b/data/as/8157739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06b36466d1
--- /dev/null
+++ b/data/as/8157739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8157739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORGURI PWSS",
+                "localname": "RETROFITTING OF BORGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORGURI PWSS",
+                        "localname": "RETROFITTING OF BORGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORGURI PWSS",
+                "localname": "RETROFITTING OF BORGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8157739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORGURI PWSS",
+                        "localname": "RETROFITTING OF BORGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157739/ws-services-calculation/Penalty.json b/data/as/8157739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b09a91af44
--- /dev/null
+++ b/data/as/8157739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8157739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8157739/ws-services-calculation/WCBillingSlab.json b/data/as/8157739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7241855680
--- /dev/null
+++ b/data/as/8157739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8157739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159295/BillingService/BusinessService.json b/data/as/8159295/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c10a87d84
--- /dev/null
+++ b/data/as/8159295/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159295",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159295/egov-location/boundary-data.json b/data/as/8159295/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4eeee5250d
--- /dev/null
+++ b/data/as/8159295/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159295",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BABUPARA (BTC, DUDHNOI) PWSS",
+                "localname": "BABUPARA (BTC, DUDHNOI) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BABUPARA (BTC, DUDHNOI) PWSS",
+                        "localname": "BABUPARA (BTC, DUDHNOI) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BABUPARA (BTC, DUDHNOI) PWSS",
+                "localname": "BABUPARA (BTC, DUDHNOI) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BABUPARA (BTC, DUDHNOI) PWSS",
+                        "localname": "BABUPARA (BTC, DUDHNOI) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159295/ws-services-calculation/Penalty.json b/data/as/8159295/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59d8e3ad38
--- /dev/null
+++ b/data/as/8159295/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159295",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159295/ws-services-calculation/WCBillingSlab.json b/data/as/8159295/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1507303986
--- /dev/null
+++ b/data/as/8159295/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159295",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159645/BillingService/BusinessService.json b/data/as/8159645/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2c37cfdc8c
--- /dev/null
+++ b/data/as/8159645/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159645",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159645/egov-location/boundary-data.json b/data/as/8159645/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a36c213755
--- /dev/null
+++ b/data/as/8159645/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159645",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUHIARBARI PWSS",
+                "localname": "RETROFITTING OF KUHIARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159645",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUHIARBARI PWSS",
+                        "localname": "RETROFITTING OF KUHIARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUHIARBARI PWSS",
+                "localname": "RETROFITTING OF KUHIARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159645",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUHIARBARI PWSS",
+                        "localname": "RETROFITTING OF KUHIARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159645/ws-services-calculation/Penalty.json b/data/as/8159645/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6a2dddbd3
--- /dev/null
+++ b/data/as/8159645/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159645",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159645/ws-services-calculation/WCBillingSlab.json b/data/as/8159645/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4baf2552ed
--- /dev/null
+++ b/data/as/8159645/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159645",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159671/BillingService/BusinessService.json b/data/as/8159671/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5fed20ec5e
--- /dev/null
+++ b/data/as/8159671/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159671",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159671/egov-location/boundary-data.json b/data/as/8159671/egov-location/boundary-data.json
new file mode 100644
index 0000000000..462dbfba90
--- /dev/null
+++ b/data/as/8159671/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159671",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUCHDHOWA PWSS",
+                "localname": "RETROFITTING OF KUCHDHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159671",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUCHDHOWA PWSS",
+                        "localname": "RETROFITTING OF KUCHDHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUCHDHOWA PWSS",
+                "localname": "RETROFITTING OF KUCHDHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159671",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUCHDHOWA PWSS",
+                        "localname": "RETROFITTING OF KUCHDHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159671/ws-services-calculation/Penalty.json b/data/as/8159671/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..114087ba6f
--- /dev/null
+++ b/data/as/8159671/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159671",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159671/ws-services-calculation/WCBillingSlab.json b/data/as/8159671/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2556ba30bc
--- /dev/null
+++ b/data/as/8159671/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159671",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159680/BillingService/BusinessService.json b/data/as/8159680/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d88d838745
--- /dev/null
+++ b/data/as/8159680/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159680",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159680/egov-location/boundary-data.json b/data/as/8159680/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c7dd21d776
--- /dev/null
+++ b/data/as/8159680/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159680",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHESAPANI PWSS",
+                "localname": "RETROFITTING OF CHESAPANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHESAPANI PWSS",
+                        "localname": "RETROFITTING OF CHESAPANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHESAPANI PWSS",
+                "localname": "RETROFITTING OF CHESAPANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHESAPANI PWSS",
+                        "localname": "RETROFITTING OF CHESAPANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159680/ws-services-calculation/Penalty.json b/data/as/8159680/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb83cbbfe6
--- /dev/null
+++ b/data/as/8159680/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159680",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159680/ws-services-calculation/WCBillingSlab.json b/data/as/8159680/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d95686ba99
--- /dev/null
+++ b/data/as/8159680/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159680",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159691/BillingService/BusinessService.json b/data/as/8159691/BillingService/BusinessService.json
new file mode 100644
index 0000000000..03cc89818c
--- /dev/null
+++ b/data/as/8159691/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159691",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159691/egov-location/boundary-data.json b/data/as/8159691/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b99e97a2a4
--- /dev/null
+++ b/data/as/8159691/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159691",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                "localname": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                        "localname": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                "localname": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                        "localname": "RETROFITTING OF KUCHDHOWA RANGANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159691/ws-services-calculation/Penalty.json b/data/as/8159691/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4da7cd682
--- /dev/null
+++ b/data/as/8159691/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159691",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159691/ws-services-calculation/WCBillingSlab.json b/data/as/8159691/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9381e1ccb3
--- /dev/null
+++ b/data/as/8159691/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159691",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159704/BillingService/BusinessService.json b/data/as/8159704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..20332e9da9
--- /dev/null
+++ b/data/as/8159704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159704/egov-location/boundary-data.json b/data/as/8159704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e98da15486
--- /dev/null
+++ b/data/as/8159704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                "localname": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                        "localname": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                "localname": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                        "localname": "RETROFITTING OF SIKIAJULI KAHIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159704/ws-services-calculation/Penalty.json b/data/as/8159704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a317d1cf4d
--- /dev/null
+++ b/data/as/8159704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159704/ws-services-calculation/WCBillingSlab.json b/data/as/8159704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dad99ec758
--- /dev/null
+++ b/data/as/8159704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159717/BillingService/BusinessService.json b/data/as/8159717/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1eeec30281
--- /dev/null
+++ b/data/as/8159717/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159717",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159717/egov-location/boundary-data.json b/data/as/8159717/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3bf8e285db
--- /dev/null
+++ b/data/as/8159717/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159717",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                "localname": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                        "localname": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                "localname": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                        "localname": "RETROFITTING OF TIPLAI BHAKATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159717/ws-services-calculation/Penalty.json b/data/as/8159717/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89d59465a1
--- /dev/null
+++ b/data/as/8159717/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159717",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159717/ws-services-calculation/WCBillingSlab.json b/data/as/8159717/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c59c8c8b04
--- /dev/null
+++ b/data/as/8159717/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159717",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159727/BillingService/BusinessService.json b/data/as/8159727/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a35eb974f
--- /dev/null
+++ b/data/as/8159727/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159727",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159727/egov-location/boundary-data.json b/data/as/8159727/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c9266a9ff
--- /dev/null
+++ b/data/as/8159727/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159727",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                "localname": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159727",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                        "localname": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                "localname": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159727",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                        "localname": "RETROFITTING OF MOISKHULI GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159727/ws-services-calculation/Penalty.json b/data/as/8159727/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6a27f87df7
--- /dev/null
+++ b/data/as/8159727/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159727",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159727/ws-services-calculation/WCBillingSlab.json b/data/as/8159727/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a1d806e4e
--- /dev/null
+++ b/data/as/8159727/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159727",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159738/BillingService/BusinessService.json b/data/as/8159738/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b4dc172b9
--- /dev/null
+++ b/data/as/8159738/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159738",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159738/egov-location/boundary-data.json b/data/as/8159738/egov-location/boundary-data.json
new file mode 100644
index 0000000000..520142e9df
--- /dev/null
+++ b/data/as/8159738/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159738",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHUGUDOBA PWSS",
+                "localname": "RETROFITTING OF GHUGUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHUGUDOBA PWSS",
+                        "localname": "RETROFITTING OF GHUGUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHUGUDOBA PWSS",
+                "localname": "RETROFITTING OF GHUGUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHUGUDOBA PWSS",
+                        "localname": "RETROFITTING OF GHUGUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159738/ws-services-calculation/Penalty.json b/data/as/8159738/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1815e5c62c
--- /dev/null
+++ b/data/as/8159738/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159738",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159738/ws-services-calculation/WCBillingSlab.json b/data/as/8159738/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf58053f94
--- /dev/null
+++ b/data/as/8159738/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159738",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159747/BillingService/BusinessService.json b/data/as/8159747/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ed9fe10ab
--- /dev/null
+++ b/data/as/8159747/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159747",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159747/egov-location/boundary-data.json b/data/as/8159747/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4c0942b505
--- /dev/null
+++ b/data/as/8159747/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159747",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHATAIMARI PWSS",
+                "localname": "RETROFITTING OF CHATAIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHATAIMARI PWSS",
+                        "localname": "RETROFITTING OF CHATAIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHATAIMARI PWSS",
+                "localname": "RETROFITTING OF CHATAIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHATAIMARI PWSS",
+                        "localname": "RETROFITTING OF CHATAIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159747/ws-services-calculation/Penalty.json b/data/as/8159747/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e18ba10ab2
--- /dev/null
+++ b/data/as/8159747/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159747",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159747/ws-services-calculation/WCBillingSlab.json b/data/as/8159747/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c39369d711
--- /dev/null
+++ b/data/as/8159747/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159747",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159851/BillingService/BusinessService.json b/data/as/8159851/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7c6c9841fe
--- /dev/null
+++ b/data/as/8159851/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159851",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159851/egov-location/boundary-data.json b/data/as/8159851/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb8fdc52e7
--- /dev/null
+++ b/data/as/8159851/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159851",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANYAGURI PWSS",
+                "localname": "RETROFITTING OF BANYAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANYAGURI PWSS",
+                        "localname": "RETROFITTING OF BANYAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANYAGURI PWSS",
+                "localname": "RETROFITTING OF BANYAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANYAGURI PWSS",
+                        "localname": "RETROFITTING OF BANYAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159851/ws-services-calculation/Penalty.json b/data/as/8159851/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f3f0e9994
--- /dev/null
+++ b/data/as/8159851/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159851",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159851/ws-services-calculation/WCBillingSlab.json b/data/as/8159851/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1394786585
--- /dev/null
+++ b/data/as/8159851/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159851",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159874/BillingService/BusinessService.json b/data/as/8159874/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92e6fd4c04
--- /dev/null
+++ b/data/as/8159874/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159874",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159874/egov-location/boundary-data.json b/data/as/8159874/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3d58955d78
--- /dev/null
+++ b/data/as/8159874/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159874",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAMRIBHASA PWSS",
+                "localname": "RETROFITTING OF DAMRIBHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159874",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAMRIBHASA PWSS",
+                        "localname": "RETROFITTING OF DAMRIBHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAMRIBHASA PWSS",
+                "localname": "RETROFITTING OF DAMRIBHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159874",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAMRIBHASA PWSS",
+                        "localname": "RETROFITTING OF DAMRIBHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159874/ws-services-calculation/Penalty.json b/data/as/8159874/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbdf0606be
--- /dev/null
+++ b/data/as/8159874/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159874",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159874/ws-services-calculation/WCBillingSlab.json b/data/as/8159874/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e6d9f337ff
--- /dev/null
+++ b/data/as/8159874/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159874",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159939/BillingService/BusinessService.json b/data/as/8159939/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2dbadfab3d
--- /dev/null
+++ b/data/as/8159939/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159939",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159939/egov-location/boundary-data.json b/data/as/8159939/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95567c019b
--- /dev/null
+++ b/data/as/8159939/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159939",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HASHDOBA PWSS",
+                "localname": "RETROFITTING OF HASHDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HASHDOBA PWSS",
+                        "localname": "RETROFITTING OF HASHDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HASHDOBA PWSS",
+                "localname": "RETROFITTING OF HASHDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HASHDOBA PWSS",
+                        "localname": "RETROFITTING OF HASHDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159939/ws-services-calculation/Penalty.json b/data/as/8159939/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27bc53a40c
--- /dev/null
+++ b/data/as/8159939/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159939",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159939/ws-services-calculation/WCBillingSlab.json b/data/as/8159939/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ff93cef3bb
--- /dev/null
+++ b/data/as/8159939/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159939",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159954/BillingService/BusinessService.json b/data/as/8159954/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5972387bcf
--- /dev/null
+++ b/data/as/8159954/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159954",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159954/egov-location/boundary-data.json b/data/as/8159954/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29970aa590
--- /dev/null
+++ b/data/as/8159954/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159954",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KARTIMARI PWSS",
+                "localname": "RETROFITTING OF KARTIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KARTIMARI PWSS",
+                        "localname": "RETROFITTING OF KARTIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KARTIMARI PWSS",
+                "localname": "RETROFITTING OF KARTIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KARTIMARI PWSS",
+                        "localname": "RETROFITTING OF KARTIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159954/ws-services-calculation/Penalty.json b/data/as/8159954/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f0da6ed808
--- /dev/null
+++ b/data/as/8159954/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159954",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159954/ws-services-calculation/WCBillingSlab.json b/data/as/8159954/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5e51ebe60
--- /dev/null
+++ b/data/as/8159954/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159954",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159963/BillingService/BusinessService.json b/data/as/8159963/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ac4bba695
--- /dev/null
+++ b/data/as/8159963/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8159963",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159963/egov-location/boundary-data.json b/data/as/8159963/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a96431a629
--- /dev/null
+++ b/data/as/8159963/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8159963",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMULKANDI PWSS",
+                "localname": "RETROFITTING OF SIMULKANDI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159963",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMULKANDI PWSS",
+                        "localname": "RETROFITTING OF SIMULKANDI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMULKANDI PWSS",
+                "localname": "RETROFITTING OF SIMULKANDI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8159963",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMULKANDI PWSS",
+                        "localname": "RETROFITTING OF SIMULKANDI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159963/ws-services-calculation/Penalty.json b/data/as/8159963/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..45c4e628f2
--- /dev/null
+++ b/data/as/8159963/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8159963",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8159963/ws-services-calculation/WCBillingSlab.json b/data/as/8159963/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce2ee04920
--- /dev/null
+++ b/data/as/8159963/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8159963",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160000/BillingService/BusinessService.json b/data/as/8160000/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4814855a34
--- /dev/null
+++ b/data/as/8160000/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160000",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160000/egov-location/boundary-data.json b/data/as/8160000/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb63bda502
--- /dev/null
+++ b/data/as/8160000/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160000",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PANDOBA PWSS",
+                "localname": "RETROFITTING OF PANDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160000",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PANDOBA PWSS",
+                        "localname": "RETROFITTING OF PANDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PANDOBA PWSS",
+                "localname": "RETROFITTING OF PANDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160000",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PANDOBA PWSS",
+                        "localname": "RETROFITTING OF PANDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160000/ws-services-calculation/Penalty.json b/data/as/8160000/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7c259380c4
--- /dev/null
+++ b/data/as/8160000/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160000",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160000/ws-services-calculation/WCBillingSlab.json b/data/as/8160000/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..553fd31c67
--- /dev/null
+++ b/data/as/8160000/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160000",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160005/BillingService/BusinessService.json b/data/as/8160005/BillingService/BusinessService.json
new file mode 100644
index 0000000000..faba88e352
--- /dev/null
+++ b/data/as/8160005/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160005",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160005/egov-location/boundary-data.json b/data/as/8160005/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4b372e340b
--- /dev/null
+++ b/data/as/8160005/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160005",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                "localname": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                        "localname": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                "localname": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                        "localname": "RETROFITTING OF NALANGA SINGIMARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160005/ws-services-calculation/Penalty.json b/data/as/8160005/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a68855c6ea
--- /dev/null
+++ b/data/as/8160005/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160005",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160005/ws-services-calculation/WCBillingSlab.json b/data/as/8160005/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41d9d5800e
--- /dev/null
+++ b/data/as/8160005/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160005",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160019/BillingService/BusinessService.json b/data/as/8160019/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a8c1344a3c
--- /dev/null
+++ b/data/as/8160019/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160019",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160019/egov-location/boundary-data.json b/data/as/8160019/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a4aa0911f
--- /dev/null
+++ b/data/as/8160019/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160019",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MARKULA PWSS",
+                "localname": "RETROFITTING OF MARKULA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MARKULA PWSS",
+                        "localname": "RETROFITTING OF MARKULA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MARKULA PWSS",
+                "localname": "RETROFITTING OF MARKULA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MARKULA PWSS",
+                        "localname": "RETROFITTING OF MARKULA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160019/ws-services-calculation/Penalty.json b/data/as/8160019/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64dfbaf308
--- /dev/null
+++ b/data/as/8160019/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160019",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160019/ws-services-calculation/WCBillingSlab.json b/data/as/8160019/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..877c33453c
--- /dev/null
+++ b/data/as/8160019/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160019",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160027/BillingService/BusinessService.json b/data/as/8160027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97ad1ce3d2
--- /dev/null
+++ b/data/as/8160027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160027/egov-location/boundary-data.json b/data/as/8160027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5eb4995966
--- /dev/null
+++ b/data/as/8160027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                "localname": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                        "localname": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                "localname": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                        "localname": "RETROFITTING OF MARKULA GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160027/ws-services-calculation/Penalty.json b/data/as/8160027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..29300b87d5
--- /dev/null
+++ b/data/as/8160027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160027/ws-services-calculation/WCBillingSlab.json b/data/as/8160027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cbe13d1ac4
--- /dev/null
+++ b/data/as/8160027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160039/BillingService/BusinessService.json b/data/as/8160039/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c8bc69d583
--- /dev/null
+++ b/data/as/8160039/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160039",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160039/egov-location/boundary-data.json b/data/as/8160039/egov-location/boundary-data.json
new file mode 100644
index 0000000000..619a3ccbc5
--- /dev/null
+++ b/data/as/8160039/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160039",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                "localname": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160039",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                        "localname": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                "localname": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160039",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                        "localname": "RETROFITTING OF KHARMUJA 2 NO GHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160039/ws-services-calculation/Penalty.json b/data/as/8160039/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99273675b8
--- /dev/null
+++ b/data/as/8160039/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160039",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160039/ws-services-calculation/WCBillingSlab.json b/data/as/8160039/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a60c5230ac
--- /dev/null
+++ b/data/as/8160039/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160039",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160338/BillingService/BusinessService.json b/data/as/8160338/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dcb913eba
--- /dev/null
+++ b/data/as/8160338/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160338",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160338/egov-location/boundary-data.json b/data/as/8160338/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5ea5cfb2ae
--- /dev/null
+++ b/data/as/8160338/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160338",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEODHUTURI PWSS",
+                "localname": "RETROFITTING OF DEODHUTURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160338",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEODHUTURI PWSS",
+                        "localname": "RETROFITTING OF DEODHUTURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEODHUTURI PWSS",
+                "localname": "RETROFITTING OF DEODHUTURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160338",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEODHUTURI PWSS",
+                        "localname": "RETROFITTING OF DEODHUTURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160338/ws-services-calculation/Penalty.json b/data/as/8160338/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e027eecdfa
--- /dev/null
+++ b/data/as/8160338/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160338",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160338/ws-services-calculation/WCBillingSlab.json b/data/as/8160338/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c33c3659d5
--- /dev/null
+++ b/data/as/8160338/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160338",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160353/BillingService/BusinessService.json b/data/as/8160353/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07de0d3773
--- /dev/null
+++ b/data/as/8160353/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160353",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160353/egov-location/boundary-data.json b/data/as/8160353/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2dc1a31bc2
--- /dev/null
+++ b/data/as/8160353/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160353",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                "localname": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160353",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                        "localname": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                "localname": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160353",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                        "localname": "RETROFITTING OF NALANGA PAHARTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160353/ws-services-calculation/Penalty.json b/data/as/8160353/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..007991c62c
--- /dev/null
+++ b/data/as/8160353/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160353",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160353/ws-services-calculation/WCBillingSlab.json b/data/as/8160353/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c039bb818c
--- /dev/null
+++ b/data/as/8160353/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160353",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160367/BillingService/BusinessService.json b/data/as/8160367/BillingService/BusinessService.json
new file mode 100644
index 0000000000..863524aa9b
--- /dev/null
+++ b/data/as/8160367/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160367",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160367/egov-location/boundary-data.json b/data/as/8160367/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3085596bb4
--- /dev/null
+++ b/data/as/8160367/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160367",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GUMAIJHAR PWSS",
+                "localname": "RETROFITTING OF GUMAIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GUMAIJHAR PWSS",
+                        "localname": "RETROFITTING OF GUMAIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GUMAIJHAR PWSS",
+                "localname": "RETROFITTING OF GUMAIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GUMAIJHAR PWSS",
+                        "localname": "RETROFITTING OF GUMAIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160367/ws-services-calculation/Penalty.json b/data/as/8160367/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..14a9a2141a
--- /dev/null
+++ b/data/as/8160367/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160367",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160367/ws-services-calculation/WCBillingSlab.json b/data/as/8160367/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..50ce3dc4f8
--- /dev/null
+++ b/data/as/8160367/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160367",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160379/BillingService/BusinessService.json b/data/as/8160379/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa289e5fcc
--- /dev/null
+++ b/data/as/8160379/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160379",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160379/egov-location/boundary-data.json b/data/as/8160379/egov-location/boundary-data.json
new file mode 100644
index 0000000000..96325f58f5
--- /dev/null
+++ b/data/as/8160379/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160379",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LAUDOBA PWSS",
+                "localname": "RETROFITTING OF LAUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LAUDOBA PWSS",
+                        "localname": "RETROFITTING OF LAUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LAUDOBA PWSS",
+                "localname": "RETROFITTING OF LAUDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LAUDOBA PWSS",
+                        "localname": "RETROFITTING OF LAUDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160379/ws-services-calculation/Penalty.json b/data/as/8160379/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..272bf2d350
--- /dev/null
+++ b/data/as/8160379/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160379",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160379/ws-services-calculation/WCBillingSlab.json b/data/as/8160379/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f739ca9347
--- /dev/null
+++ b/data/as/8160379/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160379",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160387/BillingService/BusinessService.json b/data/as/8160387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35ae4871b1
--- /dev/null
+++ b/data/as/8160387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160387/egov-location/boundary-data.json b/data/as/8160387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5def8702c8
--- /dev/null
+++ b/data/as/8160387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGAJAN PWSS",
+                "localname": "RETROFITTING OF RANGAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGAJAN PWSS",
+                        "localname": "RETROFITTING OF RANGAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGAJAN PWSS",
+                "localname": "RETROFITTING OF RANGAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGAJAN PWSS",
+                        "localname": "RETROFITTING OF RANGAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160387/ws-services-calculation/Penalty.json b/data/as/8160387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ccb15d2e2
--- /dev/null
+++ b/data/as/8160387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160387/ws-services-calculation/WCBillingSlab.json b/data/as/8160387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c9dd9b243a
--- /dev/null
+++ b/data/as/8160387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160400/BillingService/BusinessService.json b/data/as/8160400/BillingService/BusinessService.json
new file mode 100644
index 0000000000..109ba28492
--- /dev/null
+++ b/data/as/8160400/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160400",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160400/egov-location/boundary-data.json b/data/as/8160400/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1948ab690d
--- /dev/null
+++ b/data/as/8160400/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160400",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOLANDUBI PWSS",
+                "localname": "RETROFITTING OF MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOLANDUBI PWSS",
+                        "localname": "RETROFITTING OF MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOLANDUBI PWSS",
+                "localname": "RETROFITTING OF MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOLANDUBI PWSS",
+                        "localname": "RETROFITTING OF MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160400/ws-services-calculation/Penalty.json b/data/as/8160400/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ae57e60ae
--- /dev/null
+++ b/data/as/8160400/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160400",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160400/ws-services-calculation/WCBillingSlab.json b/data/as/8160400/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fd8206e458
--- /dev/null
+++ b/data/as/8160400/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160400",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160409/BillingService/BusinessService.json b/data/as/8160409/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6db5d8d29f
--- /dev/null
+++ b/data/as/8160409/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160409",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160409/egov-location/boundary-data.json b/data/as/8160409/egov-location/boundary-data.json
new file mode 100644
index 0000000000..65be377ad9
--- /dev/null
+++ b/data/as/8160409/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160409",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHARIPARA PWSS",
+                "localname": "RETROFITTING OF KACHARIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHARIPARA PWSS",
+                        "localname": "RETROFITTING OF KACHARIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHARIPARA PWSS",
+                "localname": "RETROFITTING OF KACHARIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHARIPARA PWSS",
+                        "localname": "RETROFITTING OF KACHARIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160409/ws-services-calculation/Penalty.json b/data/as/8160409/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32492dc1c2
--- /dev/null
+++ b/data/as/8160409/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160409",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160409/ws-services-calculation/WCBillingSlab.json b/data/as/8160409/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93c57e8061
--- /dev/null
+++ b/data/as/8160409/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160409",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160417/BillingService/BusinessService.json b/data/as/8160417/BillingService/BusinessService.json
new file mode 100644
index 0000000000..49383465c8
--- /dev/null
+++ b/data/as/8160417/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160417",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160417/egov-location/boundary-data.json b/data/as/8160417/egov-location/boundary-data.json
new file mode 100644
index 0000000000..14e979bdf4
--- /dev/null
+++ b/data/as/8160417/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160417",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DARAKH PWSS",
+                "localname": "RETROFITTING OF DARAKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160417",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DARAKH PWSS",
+                        "localname": "RETROFITTING OF DARAKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DARAKH PWSS",
+                "localname": "RETROFITTING OF DARAKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160417",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DARAKH PWSS",
+                        "localname": "RETROFITTING OF DARAKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160417/ws-services-calculation/Penalty.json b/data/as/8160417/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..efff584447
--- /dev/null
+++ b/data/as/8160417/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160417",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160417/ws-services-calculation/WCBillingSlab.json b/data/as/8160417/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a7987f1675
--- /dev/null
+++ b/data/as/8160417/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160417",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160423/BillingService/BusinessService.json b/data/as/8160423/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ffa1831dc
--- /dev/null
+++ b/data/as/8160423/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160423",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160423/egov-location/boundary-data.json b/data/as/8160423/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e63dfd50d
--- /dev/null
+++ b/data/as/8160423/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160423",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PAIKAN PWSS",
+                "localname": "RETROFITTING OF PAIKAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PAIKAN PWSS",
+                        "localname": "RETROFITTING OF PAIKAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PAIKAN PWSS",
+                "localname": "RETROFITTING OF PAIKAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PAIKAN PWSS",
+                        "localname": "RETROFITTING OF PAIKAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160423/ws-services-calculation/Penalty.json b/data/as/8160423/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..441b39e66e
--- /dev/null
+++ b/data/as/8160423/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160423",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160423/ws-services-calculation/WCBillingSlab.json b/data/as/8160423/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3564f75e3a
--- /dev/null
+++ b/data/as/8160423/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160423",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160451/BillingService/BusinessService.json b/data/as/8160451/BillingService/BusinessService.json
new file mode 100644
index 0000000000..445da44980
--- /dev/null
+++ b/data/as/8160451/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160451",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160451/egov-location/boundary-data.json b/data/as/8160451/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9f0391dbc
--- /dev/null
+++ b/data/as/8160451/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160451",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ZIRA PWSS",
+                "localname": "RETROFITTING OF ZIRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160451",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ZIRA PWSS",
+                        "localname": "RETROFITTING OF ZIRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ZIRA PWSS",
+                "localname": "RETROFITTING OF ZIRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160451",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ZIRA PWSS",
+                        "localname": "RETROFITTING OF ZIRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160451/ws-services-calculation/Penalty.json b/data/as/8160451/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..042b5473f0
--- /dev/null
+++ b/data/as/8160451/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160451",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160451/ws-services-calculation/WCBillingSlab.json b/data/as/8160451/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c04c26d777
--- /dev/null
+++ b/data/as/8160451/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160451",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160455/BillingService/BusinessService.json b/data/as/8160455/BillingService/BusinessService.json
new file mode 100644
index 0000000000..52dc307ac7
--- /dev/null
+++ b/data/as/8160455/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160455",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160455/egov-location/boundary-data.json b/data/as/8160455/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8302e03a23
--- /dev/null
+++ b/data/as/8160455/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160455",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GURIA PWSS",
+                "localname": "RETROFITTING OF GURIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GURIA PWSS",
+                        "localname": "RETROFITTING OF GURIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GURIA PWSS",
+                "localname": "RETROFITTING OF GURIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GURIA PWSS",
+                        "localname": "RETROFITTING OF GURIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160455/ws-services-calculation/Penalty.json b/data/as/8160455/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..30682c2372
--- /dev/null
+++ b/data/as/8160455/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160455",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160455/ws-services-calculation/WCBillingSlab.json b/data/as/8160455/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5cc973861
--- /dev/null
+++ b/data/as/8160455/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160455",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160460/BillingService/BusinessService.json b/data/as/8160460/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b0e28c160f
--- /dev/null
+++ b/data/as/8160460/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160460",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160460/egov-location/boundary-data.json b/data/as/8160460/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b61b2c1cd
--- /dev/null
+++ b/data/as/8160460/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160460",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NABA SALPARA PWSS",
+                "localname": "RETROFITTING OF NABA SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160460",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NABA SALPARA PWSS",
+                        "localname": "RETROFITTING OF NABA SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NABA SALPARA PWSS",
+                "localname": "RETROFITTING OF NABA SALPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160460",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NABA SALPARA PWSS",
+                        "localname": "RETROFITTING OF NABA SALPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160460/ws-services-calculation/Penalty.json b/data/as/8160460/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71c2fa848f
--- /dev/null
+++ b/data/as/8160460/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160460",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160460/ws-services-calculation/WCBillingSlab.json b/data/as/8160460/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7161c291a
--- /dev/null
+++ b/data/as/8160460/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160460",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160467/BillingService/BusinessService.json b/data/as/8160467/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ee8cb47be
--- /dev/null
+++ b/data/as/8160467/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160467",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160467/egov-location/boundary-data.json b/data/as/8160467/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4826a1ce9b
--- /dev/null
+++ b/data/as/8160467/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160467",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANGAON PWSS",
+                "localname": "RETROFITTING OF BANGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160467",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANGAON PWSS",
+                        "localname": "RETROFITTING OF BANGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANGAON PWSS",
+                "localname": "RETROFITTING OF BANGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160467",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANGAON PWSS",
+                        "localname": "RETROFITTING OF BANGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160467/ws-services-calculation/Penalty.json b/data/as/8160467/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8f54cee37d
--- /dev/null
+++ b/data/as/8160467/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160467",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160467/ws-services-calculation/WCBillingSlab.json b/data/as/8160467/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8052a8cfb
--- /dev/null
+++ b/data/as/8160467/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160467",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160474/BillingService/BusinessService.json b/data/as/8160474/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b518867bce
--- /dev/null
+++ b/data/as/8160474/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160474",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160474/egov-location/boundary-data.json b/data/as/8160474/egov-location/boundary-data.json
new file mode 100644
index 0000000000..81607ebacd
--- /dev/null
+++ b/data/as/8160474/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160474",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHADOL PWSS",
+                "localname": "RETROFITTING OF KACHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160474",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHADOL PWSS",
+                        "localname": "RETROFITTING OF KACHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHADOL PWSS",
+                "localname": "RETROFITTING OF KACHADOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160474",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHADOL PWSS",
+                        "localname": "RETROFITTING OF KACHADOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160474/ws-services-calculation/Penalty.json b/data/as/8160474/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6e1aeae5e4
--- /dev/null
+++ b/data/as/8160474/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160474",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160474/ws-services-calculation/WCBillingSlab.json b/data/as/8160474/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e49a3cd4ea
--- /dev/null
+++ b/data/as/8160474/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160474",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160796/BillingService/BusinessService.json b/data/as/8160796/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1eab9bd850
--- /dev/null
+++ b/data/as/8160796/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160796",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160796/egov-location/boundary-data.json b/data/as/8160796/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7bdc869960
--- /dev/null
+++ b/data/as/8160796/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160796",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALASARA 1 PWSS",
+                "localname": "RETROFITTING OF BALASARA 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALASARA 1 PWSS",
+                        "localname": "RETROFITTING OF BALASARA 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALASARA 1 PWSS",
+                "localname": "RETROFITTING OF BALASARA 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALASARA 1 PWSS",
+                        "localname": "RETROFITTING OF BALASARA 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160796/ws-services-calculation/Penalty.json b/data/as/8160796/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fbc8925532
--- /dev/null
+++ b/data/as/8160796/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160796",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160796/ws-services-calculation/WCBillingSlab.json b/data/as/8160796/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4809ffeb0a
--- /dev/null
+++ b/data/as/8160796/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160796",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160817/BillingService/BusinessService.json b/data/as/8160817/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a2f2437348
--- /dev/null
+++ b/data/as/8160817/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160817",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160817/egov-location/boundary-data.json b/data/as/8160817/egov-location/boundary-data.json
new file mode 100644
index 0000000000..657c5b745d
--- /dev/null
+++ b/data/as/8160817/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160817",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARPATHAR PWSS",
+                "localname": "RETROFITTING OF BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160817",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARPATHAR PWSS",
+                        "localname": "RETROFITTING OF BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARPATHAR PWSS",
+                "localname": "RETROFITTING OF BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160817",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARPATHAR PWSS",
+                        "localname": "RETROFITTING OF BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160817/ws-services-calculation/Penalty.json b/data/as/8160817/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3979e1a02
--- /dev/null
+++ b/data/as/8160817/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160817",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160817/ws-services-calculation/WCBillingSlab.json b/data/as/8160817/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4957bab71f
--- /dev/null
+++ b/data/as/8160817/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160817",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160827/BillingService/BusinessService.json b/data/as/8160827/BillingService/BusinessService.json
new file mode 100644
index 0000000000..03d437c1a5
--- /dev/null
+++ b/data/as/8160827/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160827",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160827/egov-location/boundary-data.json b/data/as/8160827/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3c0e082cb
--- /dev/null
+++ b/data/as/8160827/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160827",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAJAPARA PWSS",
+                "localname": "RETROFITTING OF RAJAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAJAPARA PWSS",
+                        "localname": "RETROFITTING OF RAJAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAJAPARA PWSS",
+                "localname": "RETROFITTING OF RAJAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAJAPARA PWSS",
+                        "localname": "RETROFITTING OF RAJAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160827/ws-services-calculation/Penalty.json b/data/as/8160827/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..28661a0a8a
--- /dev/null
+++ b/data/as/8160827/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160827",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160827/ws-services-calculation/WCBillingSlab.json b/data/as/8160827/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d93e568ea6
--- /dev/null
+++ b/data/as/8160827/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160827",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160840/BillingService/BusinessService.json b/data/as/8160840/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ebc80e2dc5
--- /dev/null
+++ b/data/as/8160840/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160840",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160840/egov-location/boundary-data.json b/data/as/8160840/egov-location/boundary-data.json
new file mode 100644
index 0000000000..93a62e02f7
--- /dev/null
+++ b/data/as/8160840/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160840",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HELAPAKHRI PWSS",
+                "localname": "RETROFITTING OF HELAPAKHRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160840",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HELAPAKHRI PWSS",
+                        "localname": "RETROFITTING OF HELAPAKHRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HELAPAKHRI PWSS",
+                "localname": "RETROFITTING OF HELAPAKHRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160840",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HELAPAKHRI PWSS",
+                        "localname": "RETROFITTING OF HELAPAKHRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160840/ws-services-calculation/Penalty.json b/data/as/8160840/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0fd81ed276
--- /dev/null
+++ b/data/as/8160840/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160840",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160840/ws-services-calculation/WCBillingSlab.json b/data/as/8160840/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..978baa9614
--- /dev/null
+++ b/data/as/8160840/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160840",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160852/BillingService/BusinessService.json b/data/as/8160852/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e94dec8d65
--- /dev/null
+++ b/data/as/8160852/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160852",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160852/egov-location/boundary-data.json b/data/as/8160852/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b33c857792
--- /dev/null
+++ b/data/as/8160852/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160852",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAROPARA PWSS",
+                "localname": "RETROFITTING OF GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160852",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAROPARA PWSS",
+                        "localname": "RETROFITTING OF GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAROPARA PWSS",
+                "localname": "RETROFITTING OF GAROPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160852",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAROPARA PWSS",
+                        "localname": "RETROFITTING OF GAROPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160852/ws-services-calculation/Penalty.json b/data/as/8160852/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41ec9e2a3d
--- /dev/null
+++ b/data/as/8160852/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160852",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160852/ws-services-calculation/WCBillingSlab.json b/data/as/8160852/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..569da549a0
--- /dev/null
+++ b/data/as/8160852/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160852",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160864/BillingService/BusinessService.json b/data/as/8160864/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c80642b6e
--- /dev/null
+++ b/data/as/8160864/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160864",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160864/egov-location/boundary-data.json b/data/as/8160864/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ee559c73b5
--- /dev/null
+++ b/data/as/8160864/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160864",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAJIAJANI PWSS",
+                "localname": "RETROFITTING OF GAJIAJANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160864",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAJIAJANI PWSS",
+                        "localname": "RETROFITTING OF GAJIAJANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAJIAJANI PWSS",
+                "localname": "RETROFITTING OF GAJIAJANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160864",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAJIAJANI PWSS",
+                        "localname": "RETROFITTING OF GAJIAJANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160864/ws-services-calculation/Penalty.json b/data/as/8160864/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c8cedd3e5f
--- /dev/null
+++ b/data/as/8160864/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160864",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160864/ws-services-calculation/WCBillingSlab.json b/data/as/8160864/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..99f31d5b16
--- /dev/null
+++ b/data/as/8160864/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160864",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160875/BillingService/BusinessService.json b/data/as/8160875/BillingService/BusinessService.json
new file mode 100644
index 0000000000..218cdd4597
--- /dev/null
+++ b/data/as/8160875/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160875",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160875/egov-location/boundary-data.json b/data/as/8160875/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0f5c75e27
--- /dev/null
+++ b/data/as/8160875/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160875",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAHIKATA PWSS",
+                "localname": "RETROFITTING OF DAHIKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160875",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAHIKATA PWSS",
+                        "localname": "RETROFITTING OF DAHIKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAHIKATA PWSS",
+                "localname": "RETROFITTING OF DAHIKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160875",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAHIKATA PWSS",
+                        "localname": "RETROFITTING OF DAHIKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160875/ws-services-calculation/Penalty.json b/data/as/8160875/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9d866ba88b
--- /dev/null
+++ b/data/as/8160875/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160875",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160875/ws-services-calculation/WCBillingSlab.json b/data/as/8160875/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..568f11fece
--- /dev/null
+++ b/data/as/8160875/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160875",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160897/BillingService/BusinessService.json b/data/as/8160897/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4346f25243
--- /dev/null
+++ b/data/as/8160897/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160897",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160897/egov-location/boundary-data.json b/data/as/8160897/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1878ab826
--- /dev/null
+++ b/data/as/8160897/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160897",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOIJONGA PWSS",
+                "localname": "RETROFITTING OF MOIJONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160897",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOIJONGA PWSS",
+                        "localname": "RETROFITTING OF MOIJONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOIJONGA PWSS",
+                "localname": "RETROFITTING OF MOIJONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160897",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOIJONGA PWSS",
+                        "localname": "RETROFITTING OF MOIJONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160897/ws-services-calculation/Penalty.json b/data/as/8160897/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0c56b23592
--- /dev/null
+++ b/data/as/8160897/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160897",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160897/ws-services-calculation/WCBillingSlab.json b/data/as/8160897/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1076154ae7
--- /dev/null
+++ b/data/as/8160897/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160897",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160910/BillingService/BusinessService.json b/data/as/8160910/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c412572a3b
--- /dev/null
+++ b/data/as/8160910/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8160910",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160910/egov-location/boundary-data.json b/data/as/8160910/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7b4dee8e4
--- /dev/null
+++ b/data/as/8160910/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8160910",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAWMARI PWSS",
+                "localname": "RETROFITTING OF RAWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAWMARI PWSS",
+                        "localname": "RETROFITTING OF RAWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAWMARI PWSS",
+                "localname": "RETROFITTING OF RAWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8160910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAWMARI PWSS",
+                        "localname": "RETROFITTING OF RAWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160910/ws-services-calculation/Penalty.json b/data/as/8160910/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ebdffba6e8
--- /dev/null
+++ b/data/as/8160910/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8160910",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8160910/ws-services-calculation/WCBillingSlab.json b/data/as/8160910/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0d967ac663
--- /dev/null
+++ b/data/as/8160910/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8160910",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161016/BillingService/BusinessService.json b/data/as/8161016/BillingService/BusinessService.json
new file mode 100644
index 0000000000..526cd28158
--- /dev/null
+++ b/data/as/8161016/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161016",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161016/egov-location/boundary-data.json b/data/as/8161016/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a1a23ae0d
--- /dev/null
+++ b/data/as/8161016/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161016",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                "localname": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                        "localname": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                "localname": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                        "localname": "RETROFITTING OF KANGKAI PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161016/ws-services-calculation/Penalty.json b/data/as/8161016/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..43fb28b8af
--- /dev/null
+++ b/data/as/8161016/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161016",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161016/ws-services-calculation/WCBillingSlab.json b/data/as/8161016/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..70fab87c21
--- /dev/null
+++ b/data/as/8161016/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161016",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161774/BillingService/BusinessService.json b/data/as/8161774/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7f47c11305
--- /dev/null
+++ b/data/as/8161774/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161774",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161774/egov-location/boundary-data.json b/data/as/8161774/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f8d784a1b9
--- /dev/null
+++ b/data/as/8161774/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161774",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATINGA PWSS",
+                "localname": "RETROFITTING OF HATINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161774",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATINGA PWSS",
+                        "localname": "RETROFITTING OF HATINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATINGA PWSS",
+                "localname": "RETROFITTING OF HATINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161774",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATINGA PWSS",
+                        "localname": "RETROFITTING OF HATINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161774/ws-services-calculation/Penalty.json b/data/as/8161774/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7994d3741a
--- /dev/null
+++ b/data/as/8161774/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161774",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161774/ws-services-calculation/WCBillingSlab.json b/data/as/8161774/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1fe090cfba
--- /dev/null
+++ b/data/as/8161774/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161774",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161776/BillingService/BusinessService.json b/data/as/8161776/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a8d7c6f95a
--- /dev/null
+++ b/data/as/8161776/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161776",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161776/egov-location/boundary-data.json b/data/as/8161776/egov-location/boundary-data.json
new file mode 100644
index 0000000000..85831077ee
--- /dev/null
+++ b/data/as/8161776/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161776",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGACHAKUWA PWSS",
+                "localname": "RETROFITTING OF RANGACHAKUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGACHAKUWA PWSS",
+                        "localname": "RETROFITTING OF RANGACHAKUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGACHAKUWA PWSS",
+                "localname": "RETROFITTING OF RANGACHAKUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGACHAKUWA PWSS",
+                        "localname": "RETROFITTING OF RANGACHAKUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161776/ws-services-calculation/Penalty.json b/data/as/8161776/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..16f8450fc8
--- /dev/null
+++ b/data/as/8161776/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161776",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161776/ws-services-calculation/WCBillingSlab.json b/data/as/8161776/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..396619c5fe
--- /dev/null
+++ b/data/as/8161776/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161776",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161778/BillingService/BusinessService.json b/data/as/8161778/BillingService/BusinessService.json
new file mode 100644
index 0000000000..16871333f5
--- /dev/null
+++ b/data/as/8161778/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161778",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161778/egov-location/boundary-data.json b/data/as/8161778/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40a2cc39e3
--- /dev/null
+++ b/data/as/8161778/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161778",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                "localname": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161778",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                        "localname": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                "localname": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161778",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                        "localname": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161778/ws-services-calculation/Penalty.json b/data/as/8161778/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8150f05ab0
--- /dev/null
+++ b/data/as/8161778/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161778",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161778/ws-services-calculation/WCBillingSlab.json b/data/as/8161778/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91870afb17
--- /dev/null
+++ b/data/as/8161778/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161778",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161779/BillingService/BusinessService.json b/data/as/8161779/BillingService/BusinessService.json
new file mode 100644
index 0000000000..172f20230b
--- /dev/null
+++ b/data/as/8161779/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161779",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161779/egov-location/boundary-data.json b/data/as/8161779/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e077a34a4
--- /dev/null
+++ b/data/as/8161779/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161779",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PITHAGURIDOL PWSS",
+                "localname": "RETROFITTING OF PITHAGURIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161779",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PITHAGURIDOL PWSS",
+                        "localname": "RETROFITTING OF PITHAGURIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PITHAGURIDOL PWSS",
+                "localname": "RETROFITTING OF PITHAGURIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161779",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PITHAGURIDOL PWSS",
+                        "localname": "RETROFITTING OF PITHAGURIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161779/ws-services-calculation/Penalty.json b/data/as/8161779/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fdb7f186d9
--- /dev/null
+++ b/data/as/8161779/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161779",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161779/ws-services-calculation/WCBillingSlab.json b/data/as/8161779/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a9f521b78
--- /dev/null
+++ b/data/as/8161779/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161779",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161782/BillingService/BusinessService.json b/data/as/8161782/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc9977e8a1
--- /dev/null
+++ b/data/as/8161782/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161782",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161782/egov-location/boundary-data.json b/data/as/8161782/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1630ae6577
--- /dev/null
+++ b/data/as/8161782/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161782",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAJORCHUK PWSS",
+                "localname": "RETROFITTING OF MAJORCHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161782",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAJORCHUK PWSS",
+                        "localname": "RETROFITTING OF MAJORCHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAJORCHUK PWSS",
+                "localname": "RETROFITTING OF MAJORCHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161782",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAJORCHUK PWSS",
+                        "localname": "RETROFITTING OF MAJORCHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161782/ws-services-calculation/Penalty.json b/data/as/8161782/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..750b30c126
--- /dev/null
+++ b/data/as/8161782/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161782",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161782/ws-services-calculation/WCBillingSlab.json b/data/as/8161782/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc1bac0570
--- /dev/null
+++ b/data/as/8161782/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161782",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161786/BillingService/BusinessService.json b/data/as/8161786/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10442f5228
--- /dev/null
+++ b/data/as/8161786/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161786",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161786/egov-location/boundary-data.json b/data/as/8161786/egov-location/boundary-data.json
new file mode 100644
index 0000000000..79bca67958
--- /dev/null
+++ b/data/as/8161786/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161786",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                "localname": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                        "localname": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                "localname": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                        "localname": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161786/ws-services-calculation/Penalty.json b/data/as/8161786/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..07065d956b
--- /dev/null
+++ b/data/as/8161786/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161786",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161786/ws-services-calculation/WCBillingSlab.json b/data/as/8161786/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ae80a2776
--- /dev/null
+++ b/data/as/8161786/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161786",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161790/BillingService/BusinessService.json b/data/as/8161790/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d82e0a1d2
--- /dev/null
+++ b/data/as/8161790/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161790",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161790/egov-location/boundary-data.json b/data/as/8161790/egov-location/boundary-data.json
new file mode 100644
index 0000000000..17407f1350
--- /dev/null
+++ b/data/as/8161790/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161790",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOTAMORA PWSS",
+                "localname": "RETROFITTING OF GOTAMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161790",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOTAMORA PWSS",
+                        "localname": "RETROFITTING OF GOTAMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOTAMORA PWSS",
+                "localname": "RETROFITTING OF GOTAMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161790",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOTAMORA PWSS",
+                        "localname": "RETROFITTING OF GOTAMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161790/ws-services-calculation/Penalty.json b/data/as/8161790/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b84a66ac6
--- /dev/null
+++ b/data/as/8161790/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161790",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161790/ws-services-calculation/WCBillingSlab.json b/data/as/8161790/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a601e1a7c
--- /dev/null
+++ b/data/as/8161790/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161790",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161794/BillingService/BusinessService.json b/data/as/8161794/BillingService/BusinessService.json
new file mode 100644
index 0000000000..182cf4ee38
--- /dev/null
+++ b/data/as/8161794/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161794",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161794/egov-location/boundary-data.json b/data/as/8161794/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b61912b0ef
--- /dev/null
+++ b/data/as/8161794/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161794",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GUDAMGHAT PWSS",
+                "localname": "RETROFITTING OF GUDAMGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161794",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GUDAMGHAT PWSS",
+                        "localname": "RETROFITTING OF GUDAMGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GUDAMGHAT PWSS",
+                "localname": "RETROFITTING OF GUDAMGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161794",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GUDAMGHAT PWSS",
+                        "localname": "RETROFITTING OF GUDAMGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161794/ws-services-calculation/Penalty.json b/data/as/8161794/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bde894eaf2
--- /dev/null
+++ b/data/as/8161794/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161794",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161794/ws-services-calculation/WCBillingSlab.json b/data/as/8161794/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a590bdd5b7
--- /dev/null
+++ b/data/as/8161794/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161794",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161801/BillingService/BusinessService.json b/data/as/8161801/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8891b901c9
--- /dev/null
+++ b/data/as/8161801/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161801",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161801/egov-location/boundary-data.json b/data/as/8161801/egov-location/boundary-data.json
new file mode 100644
index 0000000000..11b00e8238
--- /dev/null
+++ b/data/as/8161801/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161801",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PASSIGAON PWSS",
+                "localname": "RETROFITTING OF PASSIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161801",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PASSIGAON PWSS",
+                        "localname": "RETROFITTING OF PASSIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PASSIGAON PWSS",
+                "localname": "RETROFITTING OF PASSIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161801",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PASSIGAON PWSS",
+                        "localname": "RETROFITTING OF PASSIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161801/ws-services-calculation/Penalty.json b/data/as/8161801/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..748db5c9ef
--- /dev/null
+++ b/data/as/8161801/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161801",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161801/ws-services-calculation/WCBillingSlab.json b/data/as/8161801/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..84a0f315b1
--- /dev/null
+++ b/data/as/8161801/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161801",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161808/BillingService/BusinessService.json b/data/as/8161808/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94da85e395
--- /dev/null
+++ b/data/as/8161808/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161808",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161808/egov-location/boundary-data.json b/data/as/8161808/egov-location/boundary-data.json
new file mode 100644
index 0000000000..882a804028
--- /dev/null
+++ b/data/as/8161808/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161808",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KORSONTOLA PWSS",
+                "localname": "RETROFITTING OF KORSONTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161808",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KORSONTOLA PWSS",
+                        "localname": "RETROFITTING OF KORSONTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KORSONTOLA PWSS",
+                "localname": "RETROFITTING OF KORSONTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161808",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KORSONTOLA PWSS",
+                        "localname": "RETROFITTING OF KORSONTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161808/ws-services-calculation/Penalty.json b/data/as/8161808/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ce9b1c4ee
--- /dev/null
+++ b/data/as/8161808/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161808",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161808/ws-services-calculation/WCBillingSlab.json b/data/as/8161808/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2932e256cc
--- /dev/null
+++ b/data/as/8161808/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161808",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161819/BillingService/BusinessService.json b/data/as/8161819/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27f5a3ecf1
--- /dev/null
+++ b/data/as/8161819/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161819",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161819/egov-location/boundary-data.json b/data/as/8161819/egov-location/boundary-data.json
new file mode 100644
index 0000000000..674785a55e
--- /dev/null
+++ b/data/as/8161819/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161819",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                "localname": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161819",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                        "localname": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                "localname": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161819",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                        "localname": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161819/ws-services-calculation/Penalty.json b/data/as/8161819/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..425cb4ca4d
--- /dev/null
+++ b/data/as/8161819/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161819",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161819/ws-services-calculation/WCBillingSlab.json b/data/as/8161819/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0b7bb839d
--- /dev/null
+++ b/data/as/8161819/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161819",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161828/BillingService/BusinessService.json b/data/as/8161828/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ea1a9c5056
--- /dev/null
+++ b/data/as/8161828/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161828",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161828/egov-location/boundary-data.json b/data/as/8161828/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d756af6063
--- /dev/null
+++ b/data/as/8161828/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161828",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                "localname": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                        "localname": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                "localname": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                        "localname": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161828/ws-services-calculation/Penalty.json b/data/as/8161828/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..894c7bd5f4
--- /dev/null
+++ b/data/as/8161828/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161828",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161828/ws-services-calculation/WCBillingSlab.json b/data/as/8161828/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..14d69d740f
--- /dev/null
+++ b/data/as/8161828/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161828",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161841/BillingService/BusinessService.json b/data/as/8161841/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d6c06f25a7
--- /dev/null
+++ b/data/as/8161841/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161841",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161841/egov-location/boundary-data.json b/data/as/8161841/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4fb3b808b5
--- /dev/null
+++ b/data/as/8161841/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161841",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOCHGAON PWSS",
+                "localname": "RETROFITTING OF KOCHGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161841",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOCHGAON PWSS",
+                        "localname": "RETROFITTING OF KOCHGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOCHGAON PWSS",
+                "localname": "RETROFITTING OF KOCHGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161841",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOCHGAON PWSS",
+                        "localname": "RETROFITTING OF KOCHGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161841/ws-services-calculation/Penalty.json b/data/as/8161841/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..85789de1c7
--- /dev/null
+++ b/data/as/8161841/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161841",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161841/ws-services-calculation/WCBillingSlab.json b/data/as/8161841/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..609ca07dca
--- /dev/null
+++ b/data/as/8161841/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161841",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161861/BillingService/BusinessService.json b/data/as/8161861/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bbddee0561
--- /dev/null
+++ b/data/as/8161861/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161861",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161861/egov-location/boundary-data.json b/data/as/8161861/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9663204ec8
--- /dev/null
+++ b/data/as/8161861/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161861",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ADABARI PWSS",
+                "localname": "RETROFITTING OF ADABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ADABARI PWSS",
+                        "localname": "RETROFITTING OF ADABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ADABARI PWSS",
+                "localname": "RETROFITTING OF ADABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ADABARI PWSS",
+                        "localname": "RETROFITTING OF ADABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161861/ws-services-calculation/Penalty.json b/data/as/8161861/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a12cdaaba
--- /dev/null
+++ b/data/as/8161861/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161861",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161861/ws-services-calculation/WCBillingSlab.json b/data/as/8161861/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ff6612b20c
--- /dev/null
+++ b/data/as/8161861/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161861",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161882/BillingService/BusinessService.json b/data/as/8161882/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c92a00d402
--- /dev/null
+++ b/data/as/8161882/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161882",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161882/egov-location/boundary-data.json b/data/as/8161882/egov-location/boundary-data.json
new file mode 100644
index 0000000000..85bd712af5
--- /dev/null
+++ b/data/as/8161882/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161882",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILONI PWSS",
+                "localname": "RETROFITTING OF SILONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161882",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILONI PWSS",
+                        "localname": "RETROFITTING OF SILONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILONI PWSS",
+                "localname": "RETROFITTING OF SILONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161882",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILONI PWSS",
+                        "localname": "RETROFITTING OF SILONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161882/ws-services-calculation/Penalty.json b/data/as/8161882/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82c925e9ec
--- /dev/null
+++ b/data/as/8161882/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161882",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161882/ws-services-calculation/WCBillingSlab.json b/data/as/8161882/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5ad1c3847
--- /dev/null
+++ b/data/as/8161882/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161882",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161897/BillingService/BusinessService.json b/data/as/8161897/BillingService/BusinessService.json
new file mode 100644
index 0000000000..38a94ad9ba
--- /dev/null
+++ b/data/as/8161897/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161897",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161897/egov-location/boundary-data.json b/data/as/8161897/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43083a3b32
--- /dev/null
+++ b/data/as/8161897/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161897",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHARIKATI PWSS",
+                "localname": "RETROFITTING OF DHARIKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161897",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHARIKATI PWSS",
+                        "localname": "RETROFITTING OF DHARIKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHARIKATI PWSS",
+                "localname": "RETROFITTING OF DHARIKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161897",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHARIKATI PWSS",
+                        "localname": "RETROFITTING OF DHARIKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161897/ws-services-calculation/Penalty.json b/data/as/8161897/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a236a84d0b
--- /dev/null
+++ b/data/as/8161897/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161897",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161897/ws-services-calculation/WCBillingSlab.json b/data/as/8161897/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e4baf9b2c
--- /dev/null
+++ b/data/as/8161897/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161897",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161907/BillingService/BusinessService.json b/data/as/8161907/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9952e3c862
--- /dev/null
+++ b/data/as/8161907/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161907",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161907/egov-location/boundary-data.json b/data/as/8161907/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f5ef543ce
--- /dev/null
+++ b/data/as/8161907/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161907",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AKABASTI PWSS",
+                "localname": "RETROFITTING OF AKABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161907",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AKABASTI PWSS",
+                        "localname": "RETROFITTING OF AKABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AKABASTI PWSS",
+                "localname": "RETROFITTING OF AKABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161907",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AKABASTI PWSS",
+                        "localname": "RETROFITTING OF AKABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161907/ws-services-calculation/Penalty.json b/data/as/8161907/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..39a334b566
--- /dev/null
+++ b/data/as/8161907/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161907",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161907/ws-services-calculation/WCBillingSlab.json b/data/as/8161907/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1a2f7daef
--- /dev/null
+++ b/data/as/8161907/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161907",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161918/BillingService/BusinessService.json b/data/as/8161918/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97927c96b5
--- /dev/null
+++ b/data/as/8161918/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161918",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161918/egov-location/boundary-data.json b/data/as/8161918/egov-location/boundary-data.json
new file mode 100644
index 0000000000..16684c3c25
--- /dev/null
+++ b/data/as/8161918/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161918",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHERBHERI PWSS",
+                "localname": "RETROFITTING OF BHERBHERI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161918",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHERBHERI PWSS",
+                        "localname": "RETROFITTING OF BHERBHERI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHERBHERI PWSS",
+                "localname": "RETROFITTING OF BHERBHERI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161918",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHERBHERI PWSS",
+                        "localname": "RETROFITTING OF BHERBHERI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161918/ws-services-calculation/Penalty.json b/data/as/8161918/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de62da5aae
--- /dev/null
+++ b/data/as/8161918/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161918",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161918/ws-services-calculation/WCBillingSlab.json b/data/as/8161918/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b7faaa2491
--- /dev/null
+++ b/data/as/8161918/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161918",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161943/BillingService/BusinessService.json b/data/as/8161943/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1229696d29
--- /dev/null
+++ b/data/as/8161943/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161943",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161943/egov-location/boundary-data.json b/data/as/8161943/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed875d7c74
--- /dev/null
+++ b/data/as/8161943/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161943",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHANAMUKH PWSS",
+                "localname": "RETROFITTING OF KHANAMUKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161943",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHANAMUKH PWSS",
+                        "localname": "RETROFITTING OF KHANAMUKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHANAMUKH PWSS",
+                "localname": "RETROFITTING OF KHANAMUKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161943",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHANAMUKH PWSS",
+                        "localname": "RETROFITTING OF KHANAMUKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161943/ws-services-calculation/Penalty.json b/data/as/8161943/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94a1ddfaae
--- /dev/null
+++ b/data/as/8161943/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161943",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161943/ws-services-calculation/WCBillingSlab.json b/data/as/8161943/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..82f676cf82
--- /dev/null
+++ b/data/as/8161943/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161943",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161960/BillingService/BusinessService.json b/data/as/8161960/BillingService/BusinessService.json
new file mode 100644
index 0000000000..087a4933ec
--- /dev/null
+++ b/data/as/8161960/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161960",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161960/egov-location/boundary-data.json b/data/as/8161960/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5179873e27
--- /dev/null
+++ b/data/as/8161960/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161960",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                "localname": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                        "localname": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                "localname": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                        "localname": "RETROFITTING OF LAKHRA DAFALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161960/ws-services-calculation/Penalty.json b/data/as/8161960/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad7aaf1a63
--- /dev/null
+++ b/data/as/8161960/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161960",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161960/ws-services-calculation/WCBillingSlab.json b/data/as/8161960/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..601105faa6
--- /dev/null
+++ b/data/as/8161960/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161960",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161985/BillingService/BusinessService.json b/data/as/8161985/BillingService/BusinessService.json
new file mode 100644
index 0000000000..51469f9774
--- /dev/null
+++ b/data/as/8161985/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161985",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161985/egov-location/boundary-data.json b/data/as/8161985/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e572777f43
--- /dev/null
+++ b/data/as/8161985/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161985",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ERAGAON PWSS",
+                "localname": "RETROFITTING OF ERAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161985",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ERAGAON PWSS",
+                        "localname": "RETROFITTING OF ERAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ERAGAON PWSS",
+                "localname": "RETROFITTING OF ERAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161985",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ERAGAON PWSS",
+                        "localname": "RETROFITTING OF ERAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161985/ws-services-calculation/Penalty.json b/data/as/8161985/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ec8855585
--- /dev/null
+++ b/data/as/8161985/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161985",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161985/ws-services-calculation/WCBillingSlab.json b/data/as/8161985/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bda8dc3fb7
--- /dev/null
+++ b/data/as/8161985/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161985",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161998/BillingService/BusinessService.json b/data/as/8161998/BillingService/BusinessService.json
new file mode 100644
index 0000000000..84be92d421
--- /dev/null
+++ b/data/as/8161998/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8161998",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161998/egov-location/boundary-data.json b/data/as/8161998/egov-location/boundary-data.json
new file mode 100644
index 0000000000..802fa8745a
--- /dev/null
+++ b/data/as/8161998/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8161998",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NANDIKESWAR PWSS",
+                "localname": "RETROFITTING OF NANDIKESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NANDIKESWAR PWSS",
+                        "localname": "RETROFITTING OF NANDIKESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NANDIKESWAR PWSS",
+                "localname": "RETROFITTING OF NANDIKESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8161998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NANDIKESWAR PWSS",
+                        "localname": "RETROFITTING OF NANDIKESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161998/ws-services-calculation/Penalty.json b/data/as/8161998/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0659564f50
--- /dev/null
+++ b/data/as/8161998/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8161998",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8161998/ws-services-calculation/WCBillingSlab.json b/data/as/8161998/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7d624b22f8
--- /dev/null
+++ b/data/as/8161998/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8161998",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162013/BillingService/BusinessService.json b/data/as/8162013/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7e59b5d32
--- /dev/null
+++ b/data/as/8162013/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8162013",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162013/egov-location/boundary-data.json b/data/as/8162013/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f0860523ea
--- /dev/null
+++ b/data/as/8162013/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8162013",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                "localname": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162013",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                        "localname": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                "localname": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162013",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                        "localname": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162013/ws-services-calculation/Penalty.json b/data/as/8162013/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65cdccef4f
--- /dev/null
+++ b/data/as/8162013/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8162013",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162013/ws-services-calculation/WCBillingSlab.json b/data/as/8162013/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10a8a9e36c
--- /dev/null
+++ b/data/as/8162013/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8162013",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162057/BillingService/BusinessService.json b/data/as/8162057/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c90cbe42da
--- /dev/null
+++ b/data/as/8162057/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8162057",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162057/egov-location/boundary-data.json b/data/as/8162057/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20bd87e705
--- /dev/null
+++ b/data/as/8162057/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8162057",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                "localname": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                        "localname": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                "localname": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                        "localname": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162057/ws-services-calculation/Penalty.json b/data/as/8162057/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..630f5b62b7
--- /dev/null
+++ b/data/as/8162057/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8162057",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162057/ws-services-calculation/WCBillingSlab.json b/data/as/8162057/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cafde2c23c
--- /dev/null
+++ b/data/as/8162057/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8162057",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162079/BillingService/BusinessService.json b/data/as/8162079/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb8188f9c9
--- /dev/null
+++ b/data/as/8162079/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8162079",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162079/egov-location/boundary-data.json b/data/as/8162079/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c79441703f
--- /dev/null
+++ b/data/as/8162079/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8162079",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIPLONGA PWSS",
+                "localname": "RETROFITTING OF DIPLONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162079",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIPLONGA PWSS",
+                        "localname": "RETROFITTING OF DIPLONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIPLONGA PWSS",
+                "localname": "RETROFITTING OF DIPLONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162079",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIPLONGA PWSS",
+                        "localname": "RETROFITTING OF DIPLONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162079/ws-services-calculation/Penalty.json b/data/as/8162079/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a271d7a0cd
--- /dev/null
+++ b/data/as/8162079/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8162079",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162079/ws-services-calculation/WCBillingSlab.json b/data/as/8162079/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a82f60aff6
--- /dev/null
+++ b/data/as/8162079/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8162079",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162125/BillingService/BusinessService.json b/data/as/8162125/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36febcfe82
--- /dev/null
+++ b/data/as/8162125/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8162125",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162125/egov-location/boundary-data.json b/data/as/8162125/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3c1d4b8945
--- /dev/null
+++ b/data/as/8162125/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8162125",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RENGANIJHAR PWSS",
+                "localname": "RETROFITTING OF RENGANIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RENGANIJHAR PWSS",
+                        "localname": "RETROFITTING OF RENGANIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RENGANIJHAR PWSS",
+                "localname": "RETROFITTING OF RENGANIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RENGANIJHAR PWSS",
+                        "localname": "RETROFITTING OF RENGANIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162125/ws-services-calculation/Penalty.json b/data/as/8162125/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..57e5d70476
--- /dev/null
+++ b/data/as/8162125/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8162125",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162125/ws-services-calculation/WCBillingSlab.json b/data/as/8162125/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a903201382
--- /dev/null
+++ b/data/as/8162125/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8162125",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162166/BillingService/BusinessService.json b/data/as/8162166/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2509e19b2f
--- /dev/null
+++ b/data/as/8162166/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8162166",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162166/egov-location/boundary-data.json b/data/as/8162166/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c832716fa7
--- /dev/null
+++ b/data/as/8162166/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8162166",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAPEKHATI PWSS",
+                "localname": "RETROFITTING OF SAPEKHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAPEKHATI PWSS",
+                        "localname": "RETROFITTING OF SAPEKHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAPEKHATI PWSS",
+                "localname": "RETROFITTING OF SAPEKHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8162166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAPEKHATI PWSS",
+                        "localname": "RETROFITTING OF SAPEKHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162166/ws-services-calculation/Penalty.json b/data/as/8162166/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a82100c84
--- /dev/null
+++ b/data/as/8162166/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8162166",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8162166/ws-services-calculation/WCBillingSlab.json b/data/as/8162166/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c10b9b536
--- /dev/null
+++ b/data/as/8162166/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8162166",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171324/BillingService/BusinessService.json b/data/as/8171324/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17de8b007b
--- /dev/null
+++ b/data/as/8171324/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171324",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171324/egov-location/boundary-data.json b/data/as/8171324/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a66b0783c0
--- /dev/null
+++ b/data/as/8171324/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171324",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                "localname": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                        "localname": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                "localname": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                        "localname": "RETROFITTING OF SIMLITOLA TEA ESTATE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171324/ws-services-calculation/Penalty.json b/data/as/8171324/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..323463ced0
--- /dev/null
+++ b/data/as/8171324/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171324",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171324/ws-services-calculation/WCBillingSlab.json b/data/as/8171324/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d470b22f2
--- /dev/null
+++ b/data/as/8171324/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171324",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171366/BillingService/BusinessService.json b/data/as/8171366/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00de192d02
--- /dev/null
+++ b/data/as/8171366/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171366",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171366/egov-location/boundary-data.json b/data/as/8171366/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ebadd7f20
--- /dev/null
+++ b/data/as/8171366/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171366",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALDOBA PWSS",
+                "localname": "RETROFITTING OF NALDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171366",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALDOBA PWSS",
+                        "localname": "RETROFITTING OF NALDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALDOBA PWSS",
+                "localname": "RETROFITTING OF NALDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171366",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALDOBA PWSS",
+                        "localname": "RETROFITTING OF NALDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171366/ws-services-calculation/Penalty.json b/data/as/8171366/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86fdcb7fab
--- /dev/null
+++ b/data/as/8171366/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171366",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171366/ws-services-calculation/WCBillingSlab.json b/data/as/8171366/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7f84934ddc
--- /dev/null
+++ b/data/as/8171366/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171366",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171388/BillingService/BusinessService.json b/data/as/8171388/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c4b6eac486
--- /dev/null
+++ b/data/as/8171388/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171388",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171388/egov-location/boundary-data.json b/data/as/8171388/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2bea28925e
--- /dev/null
+++ b/data/as/8171388/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171388",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAGDOBA PWSS",
+                "localname": "RETROFITTING OF BAGDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171388",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAGDOBA PWSS",
+                        "localname": "RETROFITTING OF BAGDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAGDOBA PWSS",
+                "localname": "RETROFITTING OF BAGDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171388",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAGDOBA PWSS",
+                        "localname": "RETROFITTING OF BAGDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171388/ws-services-calculation/Penalty.json b/data/as/8171388/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e881e907e
--- /dev/null
+++ b/data/as/8171388/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171388",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171388/ws-services-calculation/WCBillingSlab.json b/data/as/8171388/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..066fc88182
--- /dev/null
+++ b/data/as/8171388/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171388",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171415/BillingService/BusinessService.json b/data/as/8171415/BillingService/BusinessService.json
new file mode 100644
index 0000000000..53cddbf11f
--- /dev/null
+++ b/data/as/8171415/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171415",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171415/egov-location/boundary-data.json b/data/as/8171415/egov-location/boundary-data.json
new file mode 100644
index 0000000000..309bff7c2a
--- /dev/null
+++ b/data/as/8171415/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171415",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NADIRPAR PWSS",
+                "localname": "RETROFITTING OF NADIRPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171415",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NADIRPAR PWSS",
+                        "localname": "RETROFITTING OF NADIRPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NADIRPAR PWSS",
+                "localname": "RETROFITTING OF NADIRPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171415",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NADIRPAR PWSS",
+                        "localname": "RETROFITTING OF NADIRPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171415/ws-services-calculation/Penalty.json b/data/as/8171415/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f779b45b87
--- /dev/null
+++ b/data/as/8171415/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171415",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171415/ws-services-calculation/WCBillingSlab.json b/data/as/8171415/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e02df41f1
--- /dev/null
+++ b/data/as/8171415/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171415",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171462/BillingService/BusinessService.json b/data/as/8171462/BillingService/BusinessService.json
new file mode 100644
index 0000000000..369f6af75e
--- /dev/null
+++ b/data/as/8171462/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171462",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171462/egov-location/boundary-data.json b/data/as/8171462/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e0668fd13
--- /dev/null
+++ b/data/as/8171462/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171462",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                "localname": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171462",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                        "localname": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                "localname": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171462",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                        "localname": "RETROFITTING OF RAWMARI MELOPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171462/ws-services-calculation/Penalty.json b/data/as/8171462/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1e69b3fa83
--- /dev/null
+++ b/data/as/8171462/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171462",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171462/ws-services-calculation/WCBillingSlab.json b/data/as/8171462/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0d06c6b1d
--- /dev/null
+++ b/data/as/8171462/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171462",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171475/BillingService/BusinessService.json b/data/as/8171475/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bc371066cc
--- /dev/null
+++ b/data/as/8171475/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171475",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171475/egov-location/boundary-data.json b/data/as/8171475/egov-location/boundary-data.json
new file mode 100644
index 0000000000..850cb78fbf
--- /dev/null
+++ b/data/as/8171475/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171475",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOGIPARA PWSS",
+                "localname": "RETROFITTING OF JOGIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOGIPARA PWSS",
+                        "localname": "RETROFITTING OF JOGIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOGIPARA PWSS",
+                "localname": "RETROFITTING OF JOGIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOGIPARA PWSS",
+                        "localname": "RETROFITTING OF JOGIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171475/ws-services-calculation/Penalty.json b/data/as/8171475/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d3637fe14
--- /dev/null
+++ b/data/as/8171475/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171475",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171475/ws-services-calculation/WCBillingSlab.json b/data/as/8171475/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..507da75d0f
--- /dev/null
+++ b/data/as/8171475/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171475",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171505/BillingService/BusinessService.json b/data/as/8171505/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6d6dc68f19
--- /dev/null
+++ b/data/as/8171505/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171505",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171505/egov-location/boundary-data.json b/data/as/8171505/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c22f52ce86
--- /dev/null
+++ b/data/as/8171505/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171505",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATPARA PWSS",
+                "localname": "RETROFITTING OF PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171505",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATPARA PWSS",
+                        "localname": "RETROFITTING OF PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATPARA PWSS",
+                "localname": "RETROFITTING OF PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171505",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATPARA PWSS",
+                        "localname": "RETROFITTING OF PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171505/ws-services-calculation/Penalty.json b/data/as/8171505/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c1441b3ae
--- /dev/null
+++ b/data/as/8171505/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171505",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171505/ws-services-calculation/WCBillingSlab.json b/data/as/8171505/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27ef7ceecd
--- /dev/null
+++ b/data/as/8171505/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171505",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171518/BillingService/BusinessService.json b/data/as/8171518/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfecf73349
--- /dev/null
+++ b/data/as/8171518/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171518",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171518/egov-location/boundary-data.json b/data/as/8171518/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e5dbfbb598
--- /dev/null
+++ b/data/as/8171518/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171518",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TPLAI PT II PWSS",
+                "localname": "RETROFITTING OF TPLAI PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TPLAI PT II PWSS",
+                        "localname": "RETROFITTING OF TPLAI PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TPLAI PT II PWSS",
+                "localname": "RETROFITTING OF TPLAI PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TPLAI PT II PWSS",
+                        "localname": "RETROFITTING OF TPLAI PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171518/ws-services-calculation/Penalty.json b/data/as/8171518/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19101bbee1
--- /dev/null
+++ b/data/as/8171518/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171518",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171518/ws-services-calculation/WCBillingSlab.json b/data/as/8171518/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8b2984967b
--- /dev/null
+++ b/data/as/8171518/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171518",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171531/BillingService/BusinessService.json b/data/as/8171531/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7a3e954e7
--- /dev/null
+++ b/data/as/8171531/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171531",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171531/egov-location/boundary-data.json b/data/as/8171531/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5b6904da28
--- /dev/null
+++ b/data/as/8171531/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171531",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAYASTHAPARA PWSS",
+                "localname": "RETROFITTING OF KAYASTHAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAYASTHAPARA PWSS",
+                        "localname": "RETROFITTING OF KAYASTHAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAYASTHAPARA PWSS",
+                "localname": "RETROFITTING OF KAYASTHAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAYASTHAPARA PWSS",
+                        "localname": "RETROFITTING OF KAYASTHAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171531/ws-services-calculation/Penalty.json b/data/as/8171531/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a89069a70
--- /dev/null
+++ b/data/as/8171531/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171531",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171531/ws-services-calculation/WCBillingSlab.json b/data/as/8171531/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..907849bef0
--- /dev/null
+++ b/data/as/8171531/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171531",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171572/BillingService/BusinessService.json b/data/as/8171572/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c50eccc6ce
--- /dev/null
+++ b/data/as/8171572/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171572",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171572/egov-location/boundary-data.json b/data/as/8171572/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49b211b082
--- /dev/null
+++ b/data/as/8171572/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171572",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARMOHRA PWSS",
+                "localname": "RETROFITTING OF BARMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171572",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARMOHRA PWSS",
+                        "localname": "RETROFITTING OF BARMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARMOHRA PWSS",
+                "localname": "RETROFITTING OF BARMOHRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171572",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARMOHRA PWSS",
+                        "localname": "RETROFITTING OF BARMOHRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171572/ws-services-calculation/Penalty.json b/data/as/8171572/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6314b6e78
--- /dev/null
+++ b/data/as/8171572/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171572",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171572/ws-services-calculation/WCBillingSlab.json b/data/as/8171572/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a9b9b0311f
--- /dev/null
+++ b/data/as/8171572/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171572",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171735/BillingService/BusinessService.json b/data/as/8171735/BillingService/BusinessService.json
new file mode 100644
index 0000000000..716b5a90a6
--- /dev/null
+++ b/data/as/8171735/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171735",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171735/egov-location/boundary-data.json b/data/as/8171735/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2769523e5d
--- /dev/null
+++ b/data/as/8171735/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171735",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHUMBANDHA PWSS",
+                "localname": "RETROFITTING OF DHUMBANDHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171735",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHUMBANDHA PWSS",
+                        "localname": "RETROFITTING OF DHUMBANDHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHUMBANDHA PWSS",
+                "localname": "RETROFITTING OF DHUMBANDHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171735",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHUMBANDHA PWSS",
+                        "localname": "RETROFITTING OF DHUMBANDHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171735/ws-services-calculation/Penalty.json b/data/as/8171735/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a368b1171a
--- /dev/null
+++ b/data/as/8171735/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171735",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171735/ws-services-calculation/WCBillingSlab.json b/data/as/8171735/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..918adacec5
--- /dev/null
+++ b/data/as/8171735/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171735",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171834/BillingService/BusinessService.json b/data/as/8171834/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc51c2d131
--- /dev/null
+++ b/data/as/8171834/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171834",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171834/egov-location/boundary-data.json b/data/as/8171834/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca97378a32
--- /dev/null
+++ b/data/as/8171834/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171834",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KURUABHASA PWSS",
+                "localname": "RETROFITTING OF KURUABHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KURUABHASA PWSS",
+                        "localname": "RETROFITTING OF KURUABHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KURUABHASA PWSS",
+                "localname": "RETROFITTING OF KURUABHASA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KURUABHASA PWSS",
+                        "localname": "RETROFITTING OF KURUABHASA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171834/ws-services-calculation/Penalty.json b/data/as/8171834/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bdc4ec6c07
--- /dev/null
+++ b/data/as/8171834/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171834",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171834/ws-services-calculation/WCBillingSlab.json b/data/as/8171834/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e951ea2289
--- /dev/null
+++ b/data/as/8171834/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171834",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171872/BillingService/BusinessService.json b/data/as/8171872/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b470246f55
--- /dev/null
+++ b/data/as/8171872/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171872",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171872/egov-location/boundary-data.json b/data/as/8171872/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef254d9503
--- /dev/null
+++ b/data/as/8171872/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171872",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MILAN NAGAR PWSS",
+                "localname": "RETROFITTING OF MILAN NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171872",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MILAN NAGAR PWSS",
+                        "localname": "RETROFITTING OF MILAN NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MILAN NAGAR PWSS",
+                "localname": "RETROFITTING OF MILAN NAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171872",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MILAN NAGAR PWSS",
+                        "localname": "RETROFITTING OF MILAN NAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171872/ws-services-calculation/Penalty.json b/data/as/8171872/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cad98ac761
--- /dev/null
+++ b/data/as/8171872/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171872",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171872/ws-services-calculation/WCBillingSlab.json b/data/as/8171872/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1090d18004
--- /dev/null
+++ b/data/as/8171872/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171872",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171904/BillingService/BusinessService.json b/data/as/8171904/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1fe7f51aee
--- /dev/null
+++ b/data/as/8171904/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171904",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171904/egov-location/boundary-data.json b/data/as/8171904/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b2c45cd5f
--- /dev/null
+++ b/data/as/8171904/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171904",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DARIARPAR PWSS",
+                "localname": "RETROFITTING OF DARIARPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171904",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DARIARPAR PWSS",
+                        "localname": "RETROFITTING OF DARIARPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DARIARPAR PWSS",
+                "localname": "RETROFITTING OF DARIARPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171904",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DARIARPAR PWSS",
+                        "localname": "RETROFITTING OF DARIARPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171904/ws-services-calculation/Penalty.json b/data/as/8171904/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2019eeebcd
--- /dev/null
+++ b/data/as/8171904/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171904",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171904/ws-services-calculation/WCBillingSlab.json b/data/as/8171904/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0d094fac4
--- /dev/null
+++ b/data/as/8171904/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171904",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171945/BillingService/BusinessService.json b/data/as/8171945/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5aa7d06528
--- /dev/null
+++ b/data/as/8171945/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171945",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171945/egov-location/boundary-data.json b/data/as/8171945/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19043b750d
--- /dev/null
+++ b/data/as/8171945/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171945",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MURALIJHAR PWSS",
+                "localname": "RETROFITTING OF MURALIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171945",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MURALIJHAR PWSS",
+                        "localname": "RETROFITTING OF MURALIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MURALIJHAR PWSS",
+                "localname": "RETROFITTING OF MURALIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171945",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MURALIJHAR PWSS",
+                        "localname": "RETROFITTING OF MURALIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171945/ws-services-calculation/Penalty.json b/data/as/8171945/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..063cd9ad6b
--- /dev/null
+++ b/data/as/8171945/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171945",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171945/ws-services-calculation/WCBillingSlab.json b/data/as/8171945/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..76cd66279a
--- /dev/null
+++ b/data/as/8171945/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171945",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171970/BillingService/BusinessService.json b/data/as/8171970/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d3d482b21
--- /dev/null
+++ b/data/as/8171970/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171970",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171970/egov-location/boundary-data.json b/data/as/8171970/egov-location/boundary-data.json
new file mode 100644
index 0000000000..82cf12b25e
--- /dev/null
+++ b/data/as/8171970/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171970",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                "localname": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171970",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                        "localname": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                "localname": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171970",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                        "localname": "RETROFITTING OF BAMUNIPANIKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171970/ws-services-calculation/Penalty.json b/data/as/8171970/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..795a3c7e17
--- /dev/null
+++ b/data/as/8171970/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171970",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171970/ws-services-calculation/WCBillingSlab.json b/data/as/8171970/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6ef3d4ff9b
--- /dev/null
+++ b/data/as/8171970/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171970",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171989/BillingService/BusinessService.json b/data/as/8171989/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eae9063210
--- /dev/null
+++ b/data/as/8171989/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8171989",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171989/egov-location/boundary-data.json b/data/as/8171989/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cb21c6e231
--- /dev/null
+++ b/data/as/8171989/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8171989",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                "localname": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                        "localname": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                "localname": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8171989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                        "localname": "RETROFITTING OF KHONAR PUBPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171989/ws-services-calculation/Penalty.json b/data/as/8171989/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e02080838
--- /dev/null
+++ b/data/as/8171989/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8171989",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8171989/ws-services-calculation/WCBillingSlab.json b/data/as/8171989/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6881083e62
--- /dev/null
+++ b/data/as/8171989/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8171989",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172016/BillingService/BusinessService.json b/data/as/8172016/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6af410dc90
--- /dev/null
+++ b/data/as/8172016/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8172016",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172016/egov-location/boundary-data.json b/data/as/8172016/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e5cba8955c
--- /dev/null
+++ b/data/as/8172016/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8172016",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMAKHYABARI PWSS",
+                "localname": "RETROFITTING OF KAMAKHYABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8172016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMAKHYABARI PWSS",
+                        "localname": "RETROFITTING OF KAMAKHYABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMAKHYABARI PWSS",
+                "localname": "RETROFITTING OF KAMAKHYABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8172016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMAKHYABARI PWSS",
+                        "localname": "RETROFITTING OF KAMAKHYABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172016/ws-services-calculation/Penalty.json b/data/as/8172016/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a2e99c5d41
--- /dev/null
+++ b/data/as/8172016/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8172016",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172016/ws-services-calculation/WCBillingSlab.json b/data/as/8172016/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..440b09e2c9
--- /dev/null
+++ b/data/as/8172016/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8172016",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172071/BillingService/BusinessService.json b/data/as/8172071/BillingService/BusinessService.json
new file mode 100644
index 0000000000..850396c4a8
--- /dev/null
+++ b/data/as/8172071/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8172071",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172071/egov-location/boundary-data.json b/data/as/8172071/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e23e4e29d2
--- /dev/null
+++ b/data/as/8172071/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8172071",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HASILA BEEL PWSS",
+                "localname": "RETROFITTING OF HASILA BEEL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8172071",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HASILA BEEL PWSS",
+                        "localname": "RETROFITTING OF HASILA BEEL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HASILA BEEL PWSS",
+                "localname": "RETROFITTING OF HASILA BEEL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8172071",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HASILA BEEL PWSS",
+                        "localname": "RETROFITTING OF HASILA BEEL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172071/ws-services-calculation/Penalty.json b/data/as/8172071/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5d887ea8ff
--- /dev/null
+++ b/data/as/8172071/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8172071",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8172071/ws-services-calculation/WCBillingSlab.json b/data/as/8172071/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e46dba0819
--- /dev/null
+++ b/data/as/8172071/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8172071",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175220/BillingService/BusinessService.json b/data/as/8175220/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b005da403
--- /dev/null
+++ b/data/as/8175220/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175220",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175220/egov-location/boundary-data.json b/data/as/8175220/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3292158868
--- /dev/null
+++ b/data/as/8175220/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175220",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKDUBI PWSS",
+                "localname": "RETROFITTING OF BHALUKDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKDUBI PWSS",
+                        "localname": "RETROFITTING OF BHALUKDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKDUBI PWSS",
+                "localname": "RETROFITTING OF BHALUKDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175220",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKDUBI PWSS",
+                        "localname": "RETROFITTING OF BHALUKDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175220/ws-services-calculation/Penalty.json b/data/as/8175220/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..315a77603d
--- /dev/null
+++ b/data/as/8175220/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175220",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175220/ws-services-calculation/WCBillingSlab.json b/data/as/8175220/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e9374688c
--- /dev/null
+++ b/data/as/8175220/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175220",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175227/BillingService/BusinessService.json b/data/as/8175227/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b14fb5e8d9
--- /dev/null
+++ b/data/as/8175227/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175227",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175227/egov-location/boundary-data.json b/data/as/8175227/egov-location/boundary-data.json
new file mode 100644
index 0000000000..074af0ee6c
--- /dev/null
+++ b/data/as/8175227/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175227",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHALLA PWSS",
+                "localname": "RETROFITTING OF CHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHALLA PWSS",
+                        "localname": "RETROFITTING OF CHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHALLA PWSS",
+                "localname": "RETROFITTING OF CHALLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHALLA PWSS",
+                        "localname": "RETROFITTING OF CHALLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175227/ws-services-calculation/Penalty.json b/data/as/8175227/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6b3cc7217
--- /dev/null
+++ b/data/as/8175227/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175227",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175227/ws-services-calculation/WCBillingSlab.json b/data/as/8175227/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9bc96c41d6
--- /dev/null
+++ b/data/as/8175227/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175227",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175232/BillingService/BusinessService.json b/data/as/8175232/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da7073a1ff
--- /dev/null
+++ b/data/as/8175232/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175232",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175232/egov-location/boundary-data.json b/data/as/8175232/egov-location/boundary-data.json
new file mode 100644
index 0000000000..30f664bbe3
--- /dev/null
+++ b/data/as/8175232/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175232",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                "localname": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175232",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                        "localname": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                "localname": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175232",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                        "localname": "RETROFITTING OF DEBOTTAR BAPUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175232/ws-services-calculation/Penalty.json b/data/as/8175232/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..10867ed9ef
--- /dev/null
+++ b/data/as/8175232/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175232",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175232/ws-services-calculation/WCBillingSlab.json b/data/as/8175232/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..746edfc5ba
--- /dev/null
+++ b/data/as/8175232/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175232",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175237/BillingService/BusinessService.json b/data/as/8175237/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8a586d4967
--- /dev/null
+++ b/data/as/8175237/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175237",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175237/egov-location/boundary-data.json b/data/as/8175237/egov-location/boundary-data.json
new file mode 100644
index 0000000000..012c574f8a
--- /dev/null
+++ b/data/as/8175237/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175237",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GENDRA PWSS",
+                "localname": "RETROFITTING OF GENDRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175237",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GENDRA PWSS",
+                        "localname": "RETROFITTING OF GENDRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GENDRA PWSS",
+                "localname": "RETROFITTING OF GENDRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175237",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GENDRA PWSS",
+                        "localname": "RETROFITTING OF GENDRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175237/ws-services-calculation/Penalty.json b/data/as/8175237/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bd4aa0079
--- /dev/null
+++ b/data/as/8175237/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175237",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175237/ws-services-calculation/WCBillingSlab.json b/data/as/8175237/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..978c2500de
--- /dev/null
+++ b/data/as/8175237/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175237",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175241/BillingService/BusinessService.json b/data/as/8175241/BillingService/BusinessService.json
new file mode 100644
index 0000000000..758d7fddf5
--- /dev/null
+++ b/data/as/8175241/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175241",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175241/egov-location/boundary-data.json b/data/as/8175241/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c491bb107
--- /dev/null
+++ b/data/as/8175241/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175241",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FAFANGA PWSS",
+                "localname": "RETROFITTING OF FAFANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FAFANGA PWSS",
+                        "localname": "RETROFITTING OF FAFANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FAFANGA PWSS",
+                "localname": "RETROFITTING OF FAFANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FAFANGA PWSS",
+                        "localname": "RETROFITTING OF FAFANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175241/ws-services-calculation/Penalty.json b/data/as/8175241/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..79796879ca
--- /dev/null
+++ b/data/as/8175241/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175241",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175241/ws-services-calculation/WCBillingSlab.json b/data/as/8175241/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c33849a2b5
--- /dev/null
+++ b/data/as/8175241/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175241",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175267/BillingService/BusinessService.json b/data/as/8175267/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0bb0b2634e
--- /dev/null
+++ b/data/as/8175267/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175267",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175267/egov-location/boundary-data.json b/data/as/8175267/egov-location/boundary-data.json
new file mode 100644
index 0000000000..363d900710
--- /dev/null
+++ b/data/as/8175267/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175267",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AGIA II PWSS",
+                "localname": "RETROFITTING OF AGIA II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AGIA II PWSS",
+                        "localname": "RETROFITTING OF AGIA II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AGIA II PWSS",
+                "localname": "RETROFITTING OF AGIA II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AGIA II PWSS",
+                        "localname": "RETROFITTING OF AGIA II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175267/ws-services-calculation/Penalty.json b/data/as/8175267/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a78f3d0044
--- /dev/null
+++ b/data/as/8175267/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175267",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175267/ws-services-calculation/WCBillingSlab.json b/data/as/8175267/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17a8e58675
--- /dev/null
+++ b/data/as/8175267/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175267",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175588/BillingService/BusinessService.json b/data/as/8175588/BillingService/BusinessService.json
new file mode 100644
index 0000000000..517710a35e
--- /dev/null
+++ b/data/as/8175588/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8175588",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175588/egov-location/boundary-data.json b/data/as/8175588/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e80a7cd45f
--- /dev/null
+++ b/data/as/8175588/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8175588",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                "localname": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                        "localname": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                "localname": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8175588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                        "localname": "RETROFITING OF SOLMARI KALYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175588/ws-services-calculation/Penalty.json b/data/as/8175588/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9056d7a610
--- /dev/null
+++ b/data/as/8175588/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8175588",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8175588/ws-services-calculation/WCBillingSlab.json b/data/as/8175588/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..906eadf7fd
--- /dev/null
+++ b/data/as/8175588/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8175588",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176558/BillingService/BusinessService.json b/data/as/8176558/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de00184793
--- /dev/null
+++ b/data/as/8176558/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8176558",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176558/egov-location/boundary-data.json b/data/as/8176558/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2622fa0a1e
--- /dev/null
+++ b/data/as/8176558/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8176558",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                "localname": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176558",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                        "localname": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                "localname": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176558",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                        "localname": "RETROFITTING OF TARANGAPUR BAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176558/ws-services-calculation/Penalty.json b/data/as/8176558/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8dda090417
--- /dev/null
+++ b/data/as/8176558/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8176558",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176558/ws-services-calculation/WCBillingSlab.json b/data/as/8176558/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2944b3aa8
--- /dev/null
+++ b/data/as/8176558/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8176558",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176578/BillingService/BusinessService.json b/data/as/8176578/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56ba557398
--- /dev/null
+++ b/data/as/8176578/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8176578",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176578/egov-location/boundary-data.json b/data/as/8176578/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7632acb3f
--- /dev/null
+++ b/data/as/8176578/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8176578",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAURNAGAR PWSS",
+                "localname": "RETROFITTING OF GAURNAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176578",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAURNAGAR PWSS",
+                        "localname": "RETROFITTING OF GAURNAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GAURNAGAR PWSS",
+                "localname": "RETROFITTING OF GAURNAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176578",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GAURNAGAR PWSS",
+                        "localname": "RETROFITTING OF GAURNAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176578/ws-services-calculation/Penalty.json b/data/as/8176578/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3abc0e7ff2
--- /dev/null
+++ b/data/as/8176578/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8176578",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176578/ws-services-calculation/WCBillingSlab.json b/data/as/8176578/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ff64e44254
--- /dev/null
+++ b/data/as/8176578/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8176578",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176607/BillingService/BusinessService.json b/data/as/8176607/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9cdba0cd13
--- /dev/null
+++ b/data/as/8176607/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8176607",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176607/egov-location/boundary-data.json b/data/as/8176607/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0908707539
--- /dev/null
+++ b/data/as/8176607/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8176607",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARUAFUTA PWSS",
+                "localname": "RETROFITTING OF HARUAFUTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARUAFUTA PWSS",
+                        "localname": "RETROFITTING OF HARUAFUTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARUAFUTA PWSS",
+                "localname": "RETROFITTING OF HARUAFUTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARUAFUTA PWSS",
+                        "localname": "RETROFITTING OF HARUAFUTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176607/ws-services-calculation/Penalty.json b/data/as/8176607/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9c340d48e5
--- /dev/null
+++ b/data/as/8176607/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8176607",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176607/ws-services-calculation/WCBillingSlab.json b/data/as/8176607/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a6892be48
--- /dev/null
+++ b/data/as/8176607/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8176607",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176627/BillingService/BusinessService.json b/data/as/8176627/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2bcec9e8e2
--- /dev/null
+++ b/data/as/8176627/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8176627",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176627/egov-location/boundary-data.json b/data/as/8176627/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b960e04f03
--- /dev/null
+++ b/data/as/8176627/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8176627",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                "localname": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176627",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                        "localname": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                "localname": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8176627",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                        "localname": "RETROFITTING OF DAIRANG SELAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176627/ws-services-calculation/Penalty.json b/data/as/8176627/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b99e172f31
--- /dev/null
+++ b/data/as/8176627/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8176627",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8176627/ws-services-calculation/WCBillingSlab.json b/data/as/8176627/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e70601ec6
--- /dev/null
+++ b/data/as/8176627/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8176627",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8177941/BillingService/BusinessService.json b/data/as/8177941/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da873c24f5
--- /dev/null
+++ b/data/as/8177941/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8177941",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8177941/egov-location/boundary-data.json b/data/as/8177941/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20994e33ae
--- /dev/null
+++ b/data/as/8177941/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8177941",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATAMARI PWSS",
+                "localname": "RETROFITTING OF BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8177941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATAMARI PWSS",
+                        "localname": "RETROFITTING OF BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATAMARI PWSS",
+                "localname": "RETROFITTING OF BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8177941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATAMARI PWSS",
+                        "localname": "RETROFITTING OF BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8177941/ws-services-calculation/Penalty.json b/data/as/8177941/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..633b9055d3
--- /dev/null
+++ b/data/as/8177941/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8177941",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8177941/ws-services-calculation/WCBillingSlab.json b/data/as/8177941/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..824931320c
--- /dev/null
+++ b/data/as/8177941/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8177941",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178172/BillingService/BusinessService.json b/data/as/8178172/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df70474338
--- /dev/null
+++ b/data/as/8178172/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178172",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178172/egov-location/boundary-data.json b/data/as/8178172/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cff63f3f0d
--- /dev/null
+++ b/data/as/8178172/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178172",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUTHIKHATI PWSS",
+                "localname": "RETROFITTING OF PUTHIKHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178172",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUTHIKHATI PWSS",
+                        "localname": "RETROFITTING OF PUTHIKHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUTHIKHATI PWSS",
+                "localname": "RETROFITTING OF PUTHIKHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178172",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUTHIKHATI PWSS",
+                        "localname": "RETROFITTING OF PUTHIKHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178172/ws-services-calculation/Penalty.json b/data/as/8178172/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..327275436a
--- /dev/null
+++ b/data/as/8178172/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178172",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178172/ws-services-calculation/WCBillingSlab.json b/data/as/8178172/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..86ef3f5a3d
--- /dev/null
+++ b/data/as/8178172/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178172",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178282/BillingService/BusinessService.json b/data/as/8178282/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0a27462f3a
--- /dev/null
+++ b/data/as/8178282/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178282",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178282/egov-location/boundary-data.json b/data/as/8178282/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb3f848c73
--- /dev/null
+++ b/data/as/8178282/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178282",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KETEKIBARI PWSS",
+                "localname": "RETROFITTING OF KETEKIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KETEKIBARI PWSS",
+                        "localname": "RETROFITTING OF KETEKIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KETEKIBARI PWSS",
+                "localname": "RETROFITTING OF KETEKIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KETEKIBARI PWSS",
+                        "localname": "RETROFITTING OF KETEKIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178282/ws-services-calculation/Penalty.json b/data/as/8178282/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..92d54e3423
--- /dev/null
+++ b/data/as/8178282/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178282",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178282/ws-services-calculation/WCBillingSlab.json b/data/as/8178282/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7dad4f092d
--- /dev/null
+++ b/data/as/8178282/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178282",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178343/BillingService/BusinessService.json b/data/as/8178343/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b365739b2d
--- /dev/null
+++ b/data/as/8178343/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178343",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178343/egov-location/boundary-data.json b/data/as/8178343/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b91f4e3059
--- /dev/null
+++ b/data/as/8178343/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178343",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHARIGAON TE PWSS",
+                "localname": "RETROFITTING OF KACHARIGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178343",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHARIGAON TE PWSS",
+                        "localname": "RETROFITTING OF KACHARIGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHARIGAON TE PWSS",
+                "localname": "RETROFITTING OF KACHARIGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178343",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHARIGAON TE PWSS",
+                        "localname": "RETROFITTING OF KACHARIGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178343/ws-services-calculation/Penalty.json b/data/as/8178343/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d35cffb379
--- /dev/null
+++ b/data/as/8178343/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178343",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178343/ws-services-calculation/WCBillingSlab.json b/data/as/8178343/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ef9cb30c4e
--- /dev/null
+++ b/data/as/8178343/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178343",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178428/BillingService/BusinessService.json b/data/as/8178428/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0fe12207a4
--- /dev/null
+++ b/data/as/8178428/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178428",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178428/egov-location/boundary-data.json b/data/as/8178428/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f52422f49f
--- /dev/null
+++ b/data/as/8178428/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178428",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATIPUKHURI PWSS",
+                "localname": "RETROFITTING OF HATIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATIPUKHURI PWSS",
+                        "localname": "RETROFITTING OF HATIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATIPUKHURI PWSS",
+                "localname": "RETROFITTING OF HATIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATIPUKHURI PWSS",
+                        "localname": "RETROFITTING OF HATIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178428/ws-services-calculation/Penalty.json b/data/as/8178428/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d917de83c7
--- /dev/null
+++ b/data/as/8178428/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178428",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178428/ws-services-calculation/WCBillingSlab.json b/data/as/8178428/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c92f0ad44b
--- /dev/null
+++ b/data/as/8178428/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178428",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178783/BillingService/BusinessService.json b/data/as/8178783/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4fb6c51d8a
--- /dev/null
+++ b/data/as/8178783/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178783",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178783/egov-location/boundary-data.json b/data/as/8178783/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b4cdbfefee
--- /dev/null
+++ b/data/as/8178783/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178783",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                "localname": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                        "localname": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                "localname": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                        "localname": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178783/ws-services-calculation/Penalty.json b/data/as/8178783/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cebc5605f1
--- /dev/null
+++ b/data/as/8178783/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178783",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178783/ws-services-calculation/WCBillingSlab.json b/data/as/8178783/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a734bd99c7
--- /dev/null
+++ b/data/as/8178783/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178783",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178821/BillingService/BusinessService.json b/data/as/8178821/BillingService/BusinessService.json
new file mode 100644
index 0000000000..290d1c06b5
--- /dev/null
+++ b/data/as/8178821/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178821",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178821/egov-location/boundary-data.json b/data/as/8178821/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a58c2f58a5
--- /dev/null
+++ b/data/as/8178821/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178821",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEKARGAON PWSS",
+                "localname": "RETROFITTING OF DEKARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEKARGAON PWSS",
+                        "localname": "RETROFITTING OF DEKARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DEKARGAON PWSS",
+                "localname": "RETROFITTING OF DEKARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DEKARGAON PWSS",
+                        "localname": "RETROFITTING OF DEKARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178821/ws-services-calculation/Penalty.json b/data/as/8178821/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bfcd070adb
--- /dev/null
+++ b/data/as/8178821/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178821",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178821/ws-services-calculation/WCBillingSlab.json b/data/as/8178821/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4081fe4a7a
--- /dev/null
+++ b/data/as/8178821/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178821",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178861/BillingService/BusinessService.json b/data/as/8178861/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da35053725
--- /dev/null
+++ b/data/as/8178861/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178861",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178861/egov-location/boundary-data.json b/data/as/8178861/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a13e33cc1d
--- /dev/null
+++ b/data/as/8178861/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178861",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHARIDUAR PWSS",
+                "localname": "RETROFITTING OF CHARIDUAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHARIDUAR PWSS",
+                        "localname": "RETROFITTING OF CHARIDUAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHARIDUAR PWSS",
+                "localname": "RETROFITTING OF CHARIDUAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHARIDUAR PWSS",
+                        "localname": "RETROFITTING OF CHARIDUAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178861/ws-services-calculation/Penalty.json b/data/as/8178861/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d6329f42c
--- /dev/null
+++ b/data/as/8178861/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178861",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178861/ws-services-calculation/WCBillingSlab.json b/data/as/8178861/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3df3ccd58a
--- /dev/null
+++ b/data/as/8178861/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178861",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178895/BillingService/BusinessService.json b/data/as/8178895/BillingService/BusinessService.json
new file mode 100644
index 0000000000..71a2bc1413
--- /dev/null
+++ b/data/as/8178895/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178895",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178895/egov-location/boundary-data.json b/data/as/8178895/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15738c565e
--- /dev/null
+++ b/data/as/8178895/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178895",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BURAGAON PWSS",
+                "localname": "RETROFITTING OF BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BURAGAON PWSS",
+                        "localname": "RETROFITTING OF BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BURAGAON PWSS",
+                "localname": "RETROFITTING OF BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BURAGAON PWSS",
+                        "localname": "RETROFITTING OF BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178895/ws-services-calculation/Penalty.json b/data/as/8178895/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d75489fba4
--- /dev/null
+++ b/data/as/8178895/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178895",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178895/ws-services-calculation/WCBillingSlab.json b/data/as/8178895/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..add25d2418
--- /dev/null
+++ b/data/as/8178895/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178895",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178929/BillingService/BusinessService.json b/data/as/8178929/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1dee16ee2a
--- /dev/null
+++ b/data/as/8178929/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8178929",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178929/egov-location/boundary-data.json b/data/as/8178929/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e5e93fc3fc
--- /dev/null
+++ b/data/as/8178929/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8178929",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOKAGAON PWSS",
+                "localname": "RETROFITTING OF BOKAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178929",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOKAGAON PWSS",
+                        "localname": "RETROFITTING OF BOKAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOKAGAON PWSS",
+                "localname": "RETROFITTING OF BOKAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8178929",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOKAGAON PWSS",
+                        "localname": "RETROFITTING OF BOKAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178929/ws-services-calculation/Penalty.json b/data/as/8178929/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90f871dcd0
--- /dev/null
+++ b/data/as/8178929/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8178929",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8178929/ws-services-calculation/WCBillingSlab.json b/data/as/8178929/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9445629412
--- /dev/null
+++ b/data/as/8178929/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8178929",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181830/BillingService/BusinessService.json b/data/as/8181830/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b54ac7584
--- /dev/null
+++ b/data/as/8181830/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8181830",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181830/egov-location/boundary-data.json b/data/as/8181830/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca0b05b921
--- /dev/null
+++ b/data/as/8181830/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8181830",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAM PARBATIA PWSS",
+                "localname": "RETROFITTING OF BAM PARBATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAM PARBATIA PWSS",
+                        "localname": "RETROFITTING OF BAM PARBATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAM PARBATIA PWSS",
+                "localname": "RETROFITTING OF BAM PARBATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAM PARBATIA PWSS",
+                        "localname": "RETROFITTING OF BAM PARBATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181830/ws-services-calculation/Penalty.json b/data/as/8181830/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a5f5de5bc2
--- /dev/null
+++ b/data/as/8181830/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8181830",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181830/ws-services-calculation/WCBillingSlab.json b/data/as/8181830/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6fd8a2d1d
--- /dev/null
+++ b/data/as/8181830/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8181830",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181848/BillingService/BusinessService.json b/data/as/8181848/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42477fa71d
--- /dev/null
+++ b/data/as/8181848/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8181848",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181848/egov-location/boundary-data.json b/data/as/8181848/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4273368d4a
--- /dev/null
+++ b/data/as/8181848/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8181848",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAHUMARI PWSS",
+                "localname": "RETROFITTING OF BAHUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAHUMARI PWSS",
+                        "localname": "RETROFITTING OF BAHUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAHUMARI PWSS",
+                "localname": "RETROFITTING OF BAHUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAHUMARI PWSS",
+                        "localname": "RETROFITTING OF BAHUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181848/ws-services-calculation/Penalty.json b/data/as/8181848/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b33ca9e7a3
--- /dev/null
+++ b/data/as/8181848/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8181848",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181848/ws-services-calculation/WCBillingSlab.json b/data/as/8181848/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..077eb70e64
--- /dev/null
+++ b/data/as/8181848/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8181848",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181875/BillingService/BusinessService.json b/data/as/8181875/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a41a6996f
--- /dev/null
+++ b/data/as/8181875/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8181875",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181875/egov-location/boundary-data.json b/data/as/8181875/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f5ee46a3c
--- /dev/null
+++ b/data/as/8181875/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8181875",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF UDMARI PWSS",
+                "localname": "RETROFITTING OF UDMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181875",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF UDMARI PWSS",
+                        "localname": "RETROFITTING OF UDMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF UDMARI PWSS",
+                "localname": "RETROFITTING OF UDMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181875",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF UDMARI PWSS",
+                        "localname": "RETROFITTING OF UDMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181875/ws-services-calculation/Penalty.json b/data/as/8181875/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..31547431b8
--- /dev/null
+++ b/data/as/8181875/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8181875",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181875/ws-services-calculation/WCBillingSlab.json b/data/as/8181875/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ee24afb05
--- /dev/null
+++ b/data/as/8181875/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8181875",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181912/BillingService/BusinessService.json b/data/as/8181912/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3afabe9203
--- /dev/null
+++ b/data/as/8181912/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8181912",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181912/egov-location/boundary-data.json b/data/as/8181912/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dba4a15ed7
--- /dev/null
+++ b/data/as/8181912/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8181912",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                "localname": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181912",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                        "localname": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                "localname": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8181912",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                        "localname": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181912/ws-services-calculation/Penalty.json b/data/as/8181912/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8735420579
--- /dev/null
+++ b/data/as/8181912/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8181912",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8181912/ws-services-calculation/WCBillingSlab.json b/data/as/8181912/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f7f334fa38
--- /dev/null
+++ b/data/as/8181912/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8181912",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183542/BillingService/BusinessService.json b/data/as/8183542/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d19f01f2a9
--- /dev/null
+++ b/data/as/8183542/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8183542",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183542/egov-location/boundary-data.json b/data/as/8183542/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74c8db469f
--- /dev/null
+++ b/data/as/8183542/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8183542",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORPUKHURI PWSS",
+                "localname": "RETROFITTING OF BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8183542",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORPUKHURI PWSS",
+                        "localname": "RETROFITTING OF BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORPUKHURI PWSS",
+                "localname": "RETROFITTING OF BORPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8183542",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORPUKHURI PWSS",
+                        "localname": "RETROFITTING OF BORPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183542/ws-services-calculation/Penalty.json b/data/as/8183542/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3845901532
--- /dev/null
+++ b/data/as/8183542/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8183542",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183542/ws-services-calculation/WCBillingSlab.json b/data/as/8183542/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15527297a9
--- /dev/null
+++ b/data/as/8183542/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8183542",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183933/BillingService/BusinessService.json b/data/as/8183933/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6e33ff204
--- /dev/null
+++ b/data/as/8183933/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8183933",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183933/egov-location/boundary-data.json b/data/as/8183933/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fdb70a6b6e
--- /dev/null
+++ b/data/as/8183933/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8183933",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                "localname": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8183933",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                        "localname": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                "localname": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8183933",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                        "localname": "RETROFITTING OF NO. 1 BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183933/ws-services-calculation/Penalty.json b/data/as/8183933/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6ba29de267
--- /dev/null
+++ b/data/as/8183933/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8183933",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8183933/ws-services-calculation/WCBillingSlab.json b/data/as/8183933/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8c6cdd2be6
--- /dev/null
+++ b/data/as/8183933/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8183933",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184246/BillingService/BusinessService.json b/data/as/8184246/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f41a0b3590
--- /dev/null
+++ b/data/as/8184246/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8184246",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184246/egov-location/boundary-data.json b/data/as/8184246/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d0f3262030
--- /dev/null
+++ b/data/as/8184246/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8184246",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PAKHIAJHAR PWSS",
+                "localname": "RETROFITTING OF PAKHIAJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8184246",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PAKHIAJHAR PWSS",
+                        "localname": "RETROFITTING OF PAKHIAJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PAKHIAJHAR PWSS",
+                "localname": "RETROFITTING OF PAKHIAJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8184246",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PAKHIAJHAR PWSS",
+                        "localname": "RETROFITTING OF PAKHIAJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184246/ws-services-calculation/Penalty.json b/data/as/8184246/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6aaaec33db
--- /dev/null
+++ b/data/as/8184246/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8184246",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184246/ws-services-calculation/WCBillingSlab.json b/data/as/8184246/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..39cad5c37a
--- /dev/null
+++ b/data/as/8184246/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8184246",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184256/BillingService/BusinessService.json b/data/as/8184256/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c76142868b
--- /dev/null
+++ b/data/as/8184256/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8184256",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184256/egov-location/boundary-data.json b/data/as/8184256/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eb5043d5a6
--- /dev/null
+++ b/data/as/8184256/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8184256",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ HALESWAR PWSS",
+                "localname": "RETROFITTING OF NIZ HALESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8184256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ HALESWAR PWSS",
+                        "localname": "RETROFITTING OF NIZ HALESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ HALESWAR PWSS",
+                "localname": "RETROFITTING OF NIZ HALESWAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8184256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ HALESWAR PWSS",
+                        "localname": "RETROFITTING OF NIZ HALESWAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184256/ws-services-calculation/Penalty.json b/data/as/8184256/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69bce2f66e
--- /dev/null
+++ b/data/as/8184256/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8184256",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184256/ws-services-calculation/WCBillingSlab.json b/data/as/8184256/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d2d519be8a
--- /dev/null
+++ b/data/as/8184256/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8184256",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184281/egov-location/boundary-data.json b/data/as/8184281/egov-location/boundary-data.json
index c95de810a7..b9ede99142 100644
--- a/data/as/8184281/egov-location/boundary-data.json
+++ b/data/as/8184281/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "KALIBARI PWSS",
-                "localname": "KALIBARI PWSS",
+                "name": "RETROFITTING OF NEW KALIBARI PWSS",
+                "localname": "RETROFITTING OF NEW KALIBARI PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "KALIBARI PWSS",
-                        "localname": "KALIBARI PWSS",
+                        "name": "RETROFITTING OF NEW KALIBARI PWSS",
+                        "localname": "RETROFITTING OF NEW KALIBARI PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "KALIBARI PWSS",
-                "localname": "KALIBARI PWSS",
+                "name": "RETROFITTING OF NEW KALIBARI PWSS",
+                "localname": "RETROFITTING OF NEW KALIBARI PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "KALIBARI PWSS",
-                        "localname": "KALIBARI PWSS",
+                        "name": "RETROFITTING OF NEW KALIBARI PWSS",
+                        "localname": "RETROFITTING OF NEW KALIBARI PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/8184281/ws-services-calculation/WCBillingSlab.json b/data/as/8184281/ws-services-calculation/WCBillingSlab.json
index 7cc0e0c90b..eeeee1a866 100644
--- a/data/as/8184281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184281/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184539/BillingService/BusinessService.json b/data/as/8184539/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5fe366f4fc
--- /dev/null
+++ b/data/as/8184539/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8184539",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184539/egov-location/boundary-data.json b/data/as/8184539/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1411a9be0
--- /dev/null
+++ b/data/as/8184539/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8184539",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHALAGAON PWSS",
+                "localname": "RETROFITTING OF CHALAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8184539",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHALAGAON PWSS",
+                        "localname": "RETROFITTING OF CHALAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHALAGAON PWSS",
+                "localname": "RETROFITTING OF CHALAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8184539",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHALAGAON PWSS",
+                        "localname": "RETROFITTING OF CHALAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184539/ws-services-calculation/Penalty.json b/data/as/8184539/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b298ca507c
--- /dev/null
+++ b/data/as/8184539/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8184539",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8184539/ws-services-calculation/WCBillingSlab.json b/data/as/8184539/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d3d49c9ed0
--- /dev/null
+++ b/data/as/8184539/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8184539",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185128/BillingService/BusinessService.json b/data/as/8185128/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6ced2ade6
--- /dev/null
+++ b/data/as/8185128/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185128",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185128/egov-location/boundary-data.json b/data/as/8185128/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74b0bff0f7
--- /dev/null
+++ b/data/as/8185128/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185128",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MALIJAN PWSS",
+                "localname": "RETROFITTING OF MALIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MALIJAN PWSS",
+                        "localname": "RETROFITTING OF MALIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MALIJAN PWSS",
+                "localname": "RETROFITTING OF MALIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MALIJAN PWSS",
+                        "localname": "RETROFITTING OF MALIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185128/ws-services-calculation/Penalty.json b/data/as/8185128/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5236455674
--- /dev/null
+++ b/data/as/8185128/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185128",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185128/ws-services-calculation/WCBillingSlab.json b/data/as/8185128/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d70e5c1f4c
--- /dev/null
+++ b/data/as/8185128/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185128",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185176/BillingService/BusinessService.json b/data/as/8185176/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f5f58d05d1
--- /dev/null
+++ b/data/as/8185176/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185176",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185176/egov-location/boundary-data.json b/data/as/8185176/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71571e1f4d
--- /dev/null
+++ b/data/as/8185176/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185176",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                "localname": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185176",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                        "localname": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                "localname": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185176",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                        "localname": "RETROFITTING OF KOROIONI PWSS (SD I)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185176/ws-services-calculation/Penalty.json b/data/as/8185176/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a71daa6a28
--- /dev/null
+++ b/data/as/8185176/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185176",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185176/ws-services-calculation/WCBillingSlab.json b/data/as/8185176/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ae0cb29c8
--- /dev/null
+++ b/data/as/8185176/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185176",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185212/BillingService/BusinessService.json b/data/as/8185212/BillingService/BusinessService.json
new file mode 100644
index 0000000000..74d8f3e5eb
--- /dev/null
+++ b/data/as/8185212/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185212",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185212/egov-location/boundary-data.json b/data/as/8185212/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95568286f4
--- /dev/null
+++ b/data/as/8185212/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185212",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JORGARH PWSS",
+                "localname": "RETROFITTING OF JORGARH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185212",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JORGARH PWSS",
+                        "localname": "RETROFITTING OF JORGARH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JORGARH PWSS",
+                "localname": "RETROFITTING OF JORGARH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185212",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JORGARH PWSS",
+                        "localname": "RETROFITTING OF JORGARH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185212/ws-services-calculation/Penalty.json b/data/as/8185212/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd7108d010
--- /dev/null
+++ b/data/as/8185212/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185212",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185212/ws-services-calculation/WCBillingSlab.json b/data/as/8185212/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a616e37b8f
--- /dev/null
+++ b/data/as/8185212/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185212",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185242/BillingService/BusinessService.json b/data/as/8185242/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ffcd95eaaa
--- /dev/null
+++ b/data/as/8185242/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185242",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185242/egov-location/boundary-data.json b/data/as/8185242/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e99c822dfb
--- /dev/null
+++ b/data/as/8185242/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185242",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARIGAON PWSS",
+                "localname": "RETROFITTING OF HARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARIGAON PWSS",
+                        "localname": "RETROFITTING OF HARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARIGAON PWSS",
+                "localname": "RETROFITTING OF HARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARIGAON PWSS",
+                        "localname": "RETROFITTING OF HARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185242/ws-services-calculation/Penalty.json b/data/as/8185242/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3db7d4c94d
--- /dev/null
+++ b/data/as/8185242/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185242",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185242/ws-services-calculation/WCBillingSlab.json b/data/as/8185242/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d9bce095a
--- /dev/null
+++ b/data/as/8185242/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185242",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185270/BillingService/BusinessService.json b/data/as/8185270/BillingService/BusinessService.json
new file mode 100644
index 0000000000..587ee466ea
--- /dev/null
+++ b/data/as/8185270/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185270",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185270/egov-location/boundary-data.json b/data/as/8185270/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f29241180
--- /dev/null
+++ b/data/as/8185270/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185270",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HAHCHURA PWSS",
+                "localname": "RETROFITTING OF HAHCHURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185270",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HAHCHURA PWSS",
+                        "localname": "RETROFITTING OF HAHCHURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HAHCHURA PWSS",
+                "localname": "RETROFITTING OF HAHCHURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185270",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HAHCHURA PWSS",
+                        "localname": "RETROFITTING OF HAHCHURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185270/ws-services-calculation/Penalty.json b/data/as/8185270/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f296dd08e
--- /dev/null
+++ b/data/as/8185270/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185270",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185270/ws-services-calculation/WCBillingSlab.json b/data/as/8185270/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ecd82ff8d6
--- /dev/null
+++ b/data/as/8185270/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185270",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185286/BillingService/BusinessService.json b/data/as/8185286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d586f28b58
--- /dev/null
+++ b/data/as/8185286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185286/egov-location/boundary-data.json b/data/as/8185286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..241b2cd376
--- /dev/null
+++ b/data/as/8185286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                "localname": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                        "localname": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                "localname": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                        "localname": "RETROFITTING OF GORMORA BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185286/ws-services-calculation/Penalty.json b/data/as/8185286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48eacd1151
--- /dev/null
+++ b/data/as/8185286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185286/ws-services-calculation/WCBillingSlab.json b/data/as/8185286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a7f731ac9
--- /dev/null
+++ b/data/as/8185286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185317/BillingService/BusinessService.json b/data/as/8185317/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fdacb85d93
--- /dev/null
+++ b/data/as/8185317/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185317",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185317/egov-location/boundary-data.json b/data/as/8185317/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0edc67b41b
--- /dev/null
+++ b/data/as/8185317/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185317",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                "localname": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                        "localname": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                "localname": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                        "localname": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185317/ws-services-calculation/Penalty.json b/data/as/8185317/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f96f05aea1
--- /dev/null
+++ b/data/as/8185317/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185317",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185317/ws-services-calculation/WCBillingSlab.json b/data/as/8185317/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..84a44b4d8e
--- /dev/null
+++ b/data/as/8185317/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185317",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185354/BillingService/BusinessService.json b/data/as/8185354/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b57e1a752
--- /dev/null
+++ b/data/as/8185354/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185354",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185354/egov-location/boundary-data.json b/data/as/8185354/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3550fba2a9
--- /dev/null
+++ b/data/as/8185354/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185354",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAKATGAON PWSS",
+                "localname": "RETROFITTING OF BHAKATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185354",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAKATGAON PWSS",
+                        "localname": "RETROFITTING OF BHAKATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAKATGAON PWSS",
+                "localname": "RETROFITTING OF BHAKATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185354",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAKATGAON PWSS",
+                        "localname": "RETROFITTING OF BHAKATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185354/ws-services-calculation/Penalty.json b/data/as/8185354/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c7ff7a4050
--- /dev/null
+++ b/data/as/8185354/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185354",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185354/ws-services-calculation/WCBillingSlab.json b/data/as/8185354/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1da9fbbe2f
--- /dev/null
+++ b/data/as/8185354/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185354",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185387/BillingService/BusinessService.json b/data/as/8185387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2fc4ffd4c3
--- /dev/null
+++ b/data/as/8185387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185387/egov-location/boundary-data.json b/data/as/8185387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a87297019e
--- /dev/null
+++ b/data/as/8185387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHOMORAGURI PWSS",
+                "localname": "RETROFITTING OF BHOMORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHOMORAGURI PWSS",
+                        "localname": "RETROFITTING OF BHOMORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHOMORAGURI PWSS",
+                "localname": "RETROFITTING OF BHOMORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHOMORAGURI PWSS",
+                        "localname": "RETROFITTING OF BHOMORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185387/ws-services-calculation/Penalty.json b/data/as/8185387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9af87ebe28
--- /dev/null
+++ b/data/as/8185387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185387/ws-services-calculation/WCBillingSlab.json b/data/as/8185387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6bddd4515
--- /dev/null
+++ b/data/as/8185387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185418/BillingService/BusinessService.json b/data/as/8185418/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31e6a8d5af
--- /dev/null
+++ b/data/as/8185418/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185418",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185418/egov-location/boundary-data.json b/data/as/8185418/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fa0adc88a2
--- /dev/null
+++ b/data/as/8185418/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185418",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                "localname": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185418",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                        "localname": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                "localname": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185418",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                        "localname": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185418/ws-services-calculation/Penalty.json b/data/as/8185418/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fca0f656fc
--- /dev/null
+++ b/data/as/8185418/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185418",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185418/ws-services-calculation/WCBillingSlab.json b/data/as/8185418/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..610d810ca7
--- /dev/null
+++ b/data/as/8185418/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185418",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185772/BillingService/BusinessService.json b/data/as/8185772/BillingService/BusinessService.json
new file mode 100644
index 0000000000..22c852cc8b
--- /dev/null
+++ b/data/as/8185772/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185772",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185772/egov-location/boundary-data.json b/data/as/8185772/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4c34f38fe1
--- /dev/null
+++ b/data/as/8185772/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185772",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHITABASTI PWSS",
+                "localname": "RETROFITTING OF CHITABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185772",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHITABASTI PWSS",
+                        "localname": "RETROFITTING OF CHITABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHITABASTI PWSS",
+                "localname": "RETROFITTING OF CHITABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185772",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHITABASTI PWSS",
+                        "localname": "RETROFITTING OF CHITABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185772/ws-services-calculation/Penalty.json b/data/as/8185772/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..63982a4518
--- /dev/null
+++ b/data/as/8185772/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185772",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185772/ws-services-calculation/WCBillingSlab.json b/data/as/8185772/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c52d7f7d1a
--- /dev/null
+++ b/data/as/8185772/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185772",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185789/BillingService/BusinessService.json b/data/as/8185789/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d450868b66
--- /dev/null
+++ b/data/as/8185789/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185789",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185789/egov-location/boundary-data.json b/data/as/8185789/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aeb690fce0
--- /dev/null
+++ b/data/as/8185789/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185789",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIGHALIGAON PWSS",
+                "localname": "RETROFITTING OF DIGHALIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185789",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIGHALIGAON PWSS",
+                        "localname": "RETROFITTING OF DIGHALIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIGHALIGAON PWSS",
+                "localname": "RETROFITTING OF DIGHALIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185789",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIGHALIGAON PWSS",
+                        "localname": "RETROFITTING OF DIGHALIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185789/ws-services-calculation/Penalty.json b/data/as/8185789/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9bdd3fee22
--- /dev/null
+++ b/data/as/8185789/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185789",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185789/ws-services-calculation/WCBillingSlab.json b/data/as/8185789/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..798cd921d2
--- /dev/null
+++ b/data/as/8185789/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185789",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185807/BillingService/BusinessService.json b/data/as/8185807/BillingService/BusinessService.json
new file mode 100644
index 0000000000..318970a60e
--- /dev/null
+++ b/data/as/8185807/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185807",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185807/egov-location/boundary-data.json b/data/as/8185807/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9498751081
--- /dev/null
+++ b/data/as/8185807/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185807",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOPDOPI PWSS",
+                "localname": "RETROFITTING OF DOPDOPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOPDOPI PWSS",
+                        "localname": "RETROFITTING OF DOPDOPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOPDOPI PWSS",
+                "localname": "RETROFITTING OF DOPDOPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOPDOPI PWSS",
+                        "localname": "RETROFITTING OF DOPDOPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185807/ws-services-calculation/Penalty.json b/data/as/8185807/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5f63addc2f
--- /dev/null
+++ b/data/as/8185807/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185807",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185807/ws-services-calculation/WCBillingSlab.json b/data/as/8185807/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d69709a2cf
--- /dev/null
+++ b/data/as/8185807/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185807",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185824/BillingService/BusinessService.json b/data/as/8185824/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8df6d5209b
--- /dev/null
+++ b/data/as/8185824/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8185824",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185824/egov-location/boundary-data.json b/data/as/8185824/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d69f457aa
--- /dev/null
+++ b/data/as/8185824/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8185824",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALIJURI PWSS",
+                "localname": "RETROFITTING OF BALIJURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALIJURI PWSS",
+                        "localname": "RETROFITTING OF BALIJURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALIJURI PWSS",
+                "localname": "RETROFITTING OF BALIJURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8185824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALIJURI PWSS",
+                        "localname": "RETROFITTING OF BALIJURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185824/ws-services-calculation/Penalty.json b/data/as/8185824/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..24c7e3845c
--- /dev/null
+++ b/data/as/8185824/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8185824",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8185824/ws-services-calculation/WCBillingSlab.json b/data/as/8185824/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6df869292
--- /dev/null
+++ b/data/as/8185824/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8185824",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186783/BillingService/BusinessService.json b/data/as/8186783/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9689289ce
--- /dev/null
+++ b/data/as/8186783/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8186783",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186783/egov-location/boundary-data.json b/data/as/8186783/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f7c6010b4
--- /dev/null
+++ b/data/as/8186783/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8186783",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                "localname": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8186783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                        "localname": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                "localname": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8186783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                        "localname": "RETROFITING OF KURSHAPAKHIRI PT I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186783/ws-services-calculation/Penalty.json b/data/as/8186783/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b25e7c2a1b
--- /dev/null
+++ b/data/as/8186783/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8186783",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186783/ws-services-calculation/WCBillingSlab.json b/data/as/8186783/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c03c33d4b7
--- /dev/null
+++ b/data/as/8186783/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8186783",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186803/BillingService/BusinessService.json b/data/as/8186803/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc7cafe905
--- /dev/null
+++ b/data/as/8186803/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8186803",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186803/egov-location/boundary-data.json b/data/as/8186803/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f4d14dd6df
--- /dev/null
+++ b/data/as/8186803/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8186803",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARUCHUTKA PWSS",
+                "localname": "RETROFITTING OF GARUCHUTKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8186803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARUCHUTKA PWSS",
+                        "localname": "RETROFITTING OF GARUCHUTKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARUCHUTKA PWSS",
+                "localname": "RETROFITTING OF GARUCHUTKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8186803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARUCHUTKA PWSS",
+                        "localname": "RETROFITTING OF GARUCHUTKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186803/ws-services-calculation/Penalty.json b/data/as/8186803/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..743588c603
--- /dev/null
+++ b/data/as/8186803/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8186803",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8186803/ws-services-calculation/WCBillingSlab.json b/data/as/8186803/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47a82a6eb4
--- /dev/null
+++ b/data/as/8186803/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8186803",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187077/BillingService/BusinessService.json b/data/as/8187077/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7742f330b
--- /dev/null
+++ b/data/as/8187077/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187077",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187077/egov-location/boundary-data.json b/data/as/8187077/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7cfcbcf91f
--- /dev/null
+++ b/data/as/8187077/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187077",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANGALGAON PWSS",
+                "localname": "RETROFITTING OF BANGALGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANGALGAON PWSS",
+                        "localname": "RETROFITTING OF BANGALGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANGALGAON PWSS",
+                "localname": "RETROFITTING OF BANGALGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANGALGAON PWSS",
+                        "localname": "RETROFITTING OF BANGALGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187077/ws-services-calculation/Penalty.json b/data/as/8187077/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bfe9b171af
--- /dev/null
+++ b/data/as/8187077/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187077",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187077/ws-services-calculation/WCBillingSlab.json b/data/as/8187077/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc9ce13032
--- /dev/null
+++ b/data/as/8187077/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187077",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187084/BillingService/BusinessService.json b/data/as/8187084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9cbb070d74
--- /dev/null
+++ b/data/as/8187084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187084/egov-location/boundary-data.json b/data/as/8187084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9f4355852
--- /dev/null
+++ b/data/as/8187084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIGHALDAL PWSS",
+                "localname": "RETROFITTING OF DIGHALDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIGHALDAL PWSS",
+                        "localname": "RETROFITTING OF DIGHALDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIGHALDAL PWSS",
+                "localname": "RETROFITTING OF DIGHALDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIGHALDAL PWSS",
+                        "localname": "RETROFITTING OF DIGHALDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187084/ws-services-calculation/Penalty.json b/data/as/8187084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2bbb2592a0
--- /dev/null
+++ b/data/as/8187084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187084/ws-services-calculation/WCBillingSlab.json b/data/as/8187084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f9113dc4f
--- /dev/null
+++ b/data/as/8187084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187090/BillingService/BusinessService.json b/data/as/8187090/BillingService/BusinessService.json
new file mode 100644
index 0000000000..571ad8ce88
--- /dev/null
+++ b/data/as/8187090/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187090",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187090/egov-location/boundary-data.json b/data/as/8187090/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c5357b15a7
--- /dev/null
+++ b/data/as/8187090/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187090",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MADHURIBIL PWSS",
+                "localname": "RETROFITTING OF MADHURIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187090",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MADHURIBIL PWSS",
+                        "localname": "RETROFITTING OF MADHURIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MADHURIBIL PWSS",
+                "localname": "RETROFITTING OF MADHURIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187090",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MADHURIBIL PWSS",
+                        "localname": "RETROFITTING OF MADHURIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187090/ws-services-calculation/Penalty.json b/data/as/8187090/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1658c6004
--- /dev/null
+++ b/data/as/8187090/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187090",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187090/ws-services-calculation/WCBillingSlab.json b/data/as/8187090/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6d87b944b
--- /dev/null
+++ b/data/as/8187090/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187090",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187146/BillingService/BusinessService.json b/data/as/8187146/BillingService/BusinessService.json
new file mode 100644
index 0000000000..72f0ffb775
--- /dev/null
+++ b/data/as/8187146/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187146",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187146/egov-location/boundary-data.json b/data/as/8187146/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e392b2519
--- /dev/null
+++ b/data/as/8187146/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187146",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                "localname": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                        "localname": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                "localname": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                        "localname": "RETROFITTING OF PATIDOI BHERLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187146/ws-services-calculation/Penalty.json b/data/as/8187146/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6203e9b701
--- /dev/null
+++ b/data/as/8187146/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187146",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187146/ws-services-calculation/WCBillingSlab.json b/data/as/8187146/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7591e8e9c3
--- /dev/null
+++ b/data/as/8187146/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187146",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187153/BillingService/BusinessService.json b/data/as/8187153/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99d2045946
--- /dev/null
+++ b/data/as/8187153/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187153",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187153/egov-location/boundary-data.json b/data/as/8187153/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a3ca22786
--- /dev/null
+++ b/data/as/8187153/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187153",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARMORA PWSS",
+                "localname": "RETROFITTING OF GARMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARMORA PWSS",
+                        "localname": "RETROFITTING OF GARMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARMORA PWSS",
+                "localname": "RETROFITTING OF GARMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARMORA PWSS",
+                        "localname": "RETROFITTING OF GARMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187153/ws-services-calculation/Penalty.json b/data/as/8187153/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f0296b05a6
--- /dev/null
+++ b/data/as/8187153/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187153",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187153/ws-services-calculation/WCBillingSlab.json b/data/as/8187153/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5175cd7a99
--- /dev/null
+++ b/data/as/8187153/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187153",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187157/BillingService/BusinessService.json b/data/as/8187157/BillingService/BusinessService.json
new file mode 100644
index 0000000000..65da3fdd97
--- /dev/null
+++ b/data/as/8187157/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187157",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187157/egov-location/boundary-data.json b/data/as/8187157/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34e4934632
--- /dev/null
+++ b/data/as/8187157/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187157",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIBRU DARANG PWSS",
+                "localname": "RETROFITTING OF DIBRU DARANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIBRU DARANG PWSS",
+                        "localname": "RETROFITTING OF DIBRU DARANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIBRU DARANG PWSS",
+                "localname": "RETROFITTING OF DIBRU DARANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIBRU DARANG PWSS",
+                        "localname": "RETROFITTING OF DIBRU DARANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187157/ws-services-calculation/Penalty.json b/data/as/8187157/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..12c4e8d56d
--- /dev/null
+++ b/data/as/8187157/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187157",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187157/ws-services-calculation/WCBillingSlab.json b/data/as/8187157/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e0d719cdc4
--- /dev/null
+++ b/data/as/8187157/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187157",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187165/BillingService/BusinessService.json b/data/as/8187165/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df2d799aa7
--- /dev/null
+++ b/data/as/8187165/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187165",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187165/egov-location/boundary-data.json b/data/as/8187165/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0875e01a63
--- /dev/null
+++ b/data/as/8187165/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187165",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                "localname": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                        "localname": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                "localname": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                        "localname": "RETROFITTING OF MATIKHUNDA MEDHIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187165/ws-services-calculation/Penalty.json b/data/as/8187165/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..075ff40f4a
--- /dev/null
+++ b/data/as/8187165/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187165",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187165/ws-services-calculation/WCBillingSlab.json b/data/as/8187165/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2eeea4416f
--- /dev/null
+++ b/data/as/8187165/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187165",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From 434a7b16b269618afeba51c9d1ce7c06c2d65632 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:34:16 +0530
Subject: [PATCH 03/23] added 400 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30001504/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30002704/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30002810/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30002848/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30002858/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30003558/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30003616/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30003640/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30003730/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30003828/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30003829/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004161/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004629/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004648/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004669/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004691/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004720/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004770/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004793/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004828/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004842/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004862/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004901/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004921/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004976/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004991/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30004999/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005115/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005154/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005283/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005412/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005420/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005441/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005445/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005446/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005536/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005781/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30005988/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30006456/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30006497/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30006954/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30007373/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30007375/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30009532/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30009627/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010046/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010156/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010193/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010223/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010291/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010494/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010625/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010634/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010783/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30010828/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011048/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011084/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011088/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011133/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011141/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011158/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011173/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011609/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011655/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011866/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30011891/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012177/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012178/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012221/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012439/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012517/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012531/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012538/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30012662/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013177/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013179/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013181/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013193/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013208/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013223/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013392/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013404/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013810/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013820/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013836/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013839/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013844/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013848/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013853/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013855/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013863/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30013915/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014184/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014239/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014264/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014427/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../30014441/egov-location/boundary-data.json |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014445/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014448/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014450/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014452/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014454/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014658/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014663/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014666/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014668/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014669/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014670/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014671/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014698/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014701/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014915/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014971/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014990/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014991/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30014992/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30015050/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30015700/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016452/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016458/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016472/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016510/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016693/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016720/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016724/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016755/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016761/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187171/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187175/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187179/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187185/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187193/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187270/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187278/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187290/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187298/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187307/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187315/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187323/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187332/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187337/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187344/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187350/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187548/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8187585/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8188301/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8188715/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8189136/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8189158/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../8192257/egov-location/boundary-data.json  |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192432/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../8192456/egov-location/boundary-data.json  |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192523/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192570/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192597/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192615/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192622/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192631/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192655/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192673/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8192716/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8195888/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8195974/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196020/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196023/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196027/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196029/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196038/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196756/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196774/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196779/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196786/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196792/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196816/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196837/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196871/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196879/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196894/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196903/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196910/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196914/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196954/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196972/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8196995/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197005/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197023/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197028/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197048/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197059/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197069/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197098/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197113/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197243/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8197282/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198168/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198173/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198179/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198205/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198213/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198223/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8198230/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8201977/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8201983/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8202008/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8202014/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8202020/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8202025/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8202278/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8202287/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203051/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203064/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203128/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203162/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203178/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203211/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203233/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203251/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203271/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203278/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203286/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203579/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203589/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203592/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203614/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203629/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203647/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203683/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203689/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203693/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203703/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203721/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203725/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203729/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203732/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203748/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203764/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203786/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203804/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203816/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203835/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203855/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203872/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203902/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203915/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203942/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8203947/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8204267/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205058/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205077/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205087/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205096/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205107/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205116/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205127/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205153/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205176/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205265/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205277/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205283/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205289/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205290/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205310/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205339/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205350/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205362/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205375/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205382/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205387/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8205395/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206044/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206058/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206068/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206074/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206091/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206111/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206116/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206170/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206177/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206194/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206219/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206280/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206284/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206297/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206302/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206316/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206425/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206436/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206445/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206457/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206469/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206477/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206486/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206496/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206510/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206524/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206535/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206542/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206547/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206554/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206558/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206789/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206800/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206811/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206824/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206834/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8206851/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215102/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215107/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215197/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215261/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215283/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215285/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215403/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215406/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215411/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215655/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215753/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215757/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215759/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215762/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215767/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215769/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8215771/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8218304/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8218315/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8218486/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8218509/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8218510/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222042/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222249/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222264/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222276/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222311/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222322/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222342/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222348/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222352/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222366/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8222386/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8227638/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8228162/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8228342/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8228352/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8228831/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8228832/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8230806/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8234493/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8234543/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8234577/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235302/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235314/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235328/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235338/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235347/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235358/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235371/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235387/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235394/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235405/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235411/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235421/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8235807/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237353/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237367/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237390/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237435/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237444/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237467/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237495/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237534/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237554/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237581/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237588/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237606/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8237611/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8239822/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8246724/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8250038/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8250626/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8252919/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8255134/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8257091/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8261500/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8261877/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8261995/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8264422/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8265409/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8266441/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8273083/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8279762/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8286607/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8298009/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8307469/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8310456/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8312752/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8320434/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8325212/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8326277/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8326909/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../8365758/egov-location/boundary-data.json  |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 1594 files changed, 135810 insertions(+), 36 deletions(-)
 create mode 100644 data/as/30001504/BillingService/BusinessService.json
 create mode 100644 data/as/30001504/egov-location/boundary-data.json
 create mode 100644 data/as/30001504/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30001504/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30002704/BillingService/BusinessService.json
 create mode 100644 data/as/30002704/egov-location/boundary-data.json
 create mode 100644 data/as/30002704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30002704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30002810/BillingService/BusinessService.json
 create mode 100644 data/as/30002810/egov-location/boundary-data.json
 create mode 100644 data/as/30002810/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30002810/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30002848/BillingService/BusinessService.json
 create mode 100644 data/as/30002848/egov-location/boundary-data.json
 create mode 100644 data/as/30002848/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30002848/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30002858/BillingService/BusinessService.json
 create mode 100644 data/as/30002858/egov-location/boundary-data.json
 create mode 100644 data/as/30002858/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30002858/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30003558/BillingService/BusinessService.json
 create mode 100644 data/as/30003558/egov-location/boundary-data.json
 create mode 100644 data/as/30003558/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30003558/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30003616/BillingService/BusinessService.json
 create mode 100644 data/as/30003616/egov-location/boundary-data.json
 create mode 100644 data/as/30003616/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30003616/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30003640/BillingService/BusinessService.json
 create mode 100644 data/as/30003640/egov-location/boundary-data.json
 create mode 100644 data/as/30003640/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30003640/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30003730/BillingService/BusinessService.json
 create mode 100644 data/as/30003730/egov-location/boundary-data.json
 create mode 100644 data/as/30003730/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30003730/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30003828/BillingService/BusinessService.json
 create mode 100644 data/as/30003828/egov-location/boundary-data.json
 create mode 100644 data/as/30003828/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30003828/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30003829/BillingService/BusinessService.json
 create mode 100644 data/as/30003829/egov-location/boundary-data.json
 create mode 100644 data/as/30003829/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30003829/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004161/BillingService/BusinessService.json
 create mode 100644 data/as/30004161/egov-location/boundary-data.json
 create mode 100644 data/as/30004161/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004161/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004629/BillingService/BusinessService.json
 create mode 100644 data/as/30004629/egov-location/boundary-data.json
 create mode 100644 data/as/30004629/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004629/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004648/BillingService/BusinessService.json
 create mode 100644 data/as/30004648/egov-location/boundary-data.json
 create mode 100644 data/as/30004648/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004648/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004669/BillingService/BusinessService.json
 create mode 100644 data/as/30004669/egov-location/boundary-data.json
 create mode 100644 data/as/30004669/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004669/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004691/BillingService/BusinessService.json
 create mode 100644 data/as/30004691/egov-location/boundary-data.json
 create mode 100644 data/as/30004691/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004691/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004720/BillingService/BusinessService.json
 create mode 100644 data/as/30004720/egov-location/boundary-data.json
 create mode 100644 data/as/30004720/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004720/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004770/BillingService/BusinessService.json
 create mode 100644 data/as/30004770/egov-location/boundary-data.json
 create mode 100644 data/as/30004770/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004770/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004793/BillingService/BusinessService.json
 create mode 100644 data/as/30004793/egov-location/boundary-data.json
 create mode 100644 data/as/30004793/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004793/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004828/BillingService/BusinessService.json
 create mode 100644 data/as/30004828/egov-location/boundary-data.json
 create mode 100644 data/as/30004828/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004828/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004842/BillingService/BusinessService.json
 create mode 100644 data/as/30004842/egov-location/boundary-data.json
 create mode 100644 data/as/30004842/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004842/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004862/BillingService/BusinessService.json
 create mode 100644 data/as/30004862/egov-location/boundary-data.json
 create mode 100644 data/as/30004862/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004862/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004901/BillingService/BusinessService.json
 create mode 100644 data/as/30004901/egov-location/boundary-data.json
 create mode 100644 data/as/30004901/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004901/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004921/BillingService/BusinessService.json
 create mode 100644 data/as/30004921/egov-location/boundary-data.json
 create mode 100644 data/as/30004921/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004921/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004976/BillingService/BusinessService.json
 create mode 100644 data/as/30004976/egov-location/boundary-data.json
 create mode 100644 data/as/30004976/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004976/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004991/BillingService/BusinessService.json
 create mode 100644 data/as/30004991/egov-location/boundary-data.json
 create mode 100644 data/as/30004991/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004991/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30004999/BillingService/BusinessService.json
 create mode 100644 data/as/30004999/egov-location/boundary-data.json
 create mode 100644 data/as/30004999/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30004999/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005115/BillingService/BusinessService.json
 create mode 100644 data/as/30005115/egov-location/boundary-data.json
 create mode 100644 data/as/30005115/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005115/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005154/BillingService/BusinessService.json
 create mode 100644 data/as/30005154/egov-location/boundary-data.json
 create mode 100644 data/as/30005154/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005154/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005283/BillingService/BusinessService.json
 create mode 100644 data/as/30005283/egov-location/boundary-data.json
 create mode 100644 data/as/30005283/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005283/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005412/BillingService/BusinessService.json
 create mode 100644 data/as/30005412/egov-location/boundary-data.json
 create mode 100644 data/as/30005412/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005412/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005420/BillingService/BusinessService.json
 create mode 100644 data/as/30005420/egov-location/boundary-data.json
 create mode 100644 data/as/30005420/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005420/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005441/BillingService/BusinessService.json
 create mode 100644 data/as/30005441/egov-location/boundary-data.json
 create mode 100644 data/as/30005441/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005441/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005445/BillingService/BusinessService.json
 create mode 100644 data/as/30005445/egov-location/boundary-data.json
 create mode 100644 data/as/30005445/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005445/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005446/BillingService/BusinessService.json
 create mode 100644 data/as/30005446/egov-location/boundary-data.json
 create mode 100644 data/as/30005446/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005446/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005536/BillingService/BusinessService.json
 create mode 100644 data/as/30005536/egov-location/boundary-data.json
 create mode 100644 data/as/30005536/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005536/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005781/BillingService/BusinessService.json
 create mode 100644 data/as/30005781/egov-location/boundary-data.json
 create mode 100644 data/as/30005781/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005781/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30005988/BillingService/BusinessService.json
 create mode 100644 data/as/30005988/egov-location/boundary-data.json
 create mode 100644 data/as/30005988/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30005988/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30006456/BillingService/BusinessService.json
 create mode 100644 data/as/30006456/egov-location/boundary-data.json
 create mode 100644 data/as/30006456/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30006456/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30006497/BillingService/BusinessService.json
 create mode 100644 data/as/30006497/egov-location/boundary-data.json
 create mode 100644 data/as/30006497/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30006497/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30006954/BillingService/BusinessService.json
 create mode 100644 data/as/30006954/egov-location/boundary-data.json
 create mode 100644 data/as/30006954/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30006954/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30007373/BillingService/BusinessService.json
 create mode 100644 data/as/30007373/egov-location/boundary-data.json
 create mode 100644 data/as/30007373/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30007373/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30007375/BillingService/BusinessService.json
 create mode 100644 data/as/30007375/egov-location/boundary-data.json
 create mode 100644 data/as/30007375/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30007375/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30009532/BillingService/BusinessService.json
 create mode 100644 data/as/30009532/egov-location/boundary-data.json
 create mode 100644 data/as/30009532/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30009532/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30009627/BillingService/BusinessService.json
 create mode 100644 data/as/30009627/egov-location/boundary-data.json
 create mode 100644 data/as/30009627/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30009627/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010046/BillingService/BusinessService.json
 create mode 100644 data/as/30010046/egov-location/boundary-data.json
 create mode 100644 data/as/30010046/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010046/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010156/BillingService/BusinessService.json
 create mode 100644 data/as/30010156/egov-location/boundary-data.json
 create mode 100644 data/as/30010156/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010156/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010193/BillingService/BusinessService.json
 create mode 100644 data/as/30010193/egov-location/boundary-data.json
 create mode 100644 data/as/30010193/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010193/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010223/BillingService/BusinessService.json
 create mode 100644 data/as/30010223/egov-location/boundary-data.json
 create mode 100644 data/as/30010223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010291/BillingService/BusinessService.json
 create mode 100644 data/as/30010291/egov-location/boundary-data.json
 create mode 100644 data/as/30010291/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010291/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010494/BillingService/BusinessService.json
 create mode 100644 data/as/30010494/egov-location/boundary-data.json
 create mode 100644 data/as/30010494/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010494/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010625/BillingService/BusinessService.json
 create mode 100644 data/as/30010625/egov-location/boundary-data.json
 create mode 100644 data/as/30010625/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010625/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010634/BillingService/BusinessService.json
 create mode 100644 data/as/30010634/egov-location/boundary-data.json
 create mode 100644 data/as/30010634/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010634/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010783/BillingService/BusinessService.json
 create mode 100644 data/as/30010783/egov-location/boundary-data.json
 create mode 100644 data/as/30010783/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010783/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30010828/BillingService/BusinessService.json
 create mode 100644 data/as/30010828/egov-location/boundary-data.json
 create mode 100644 data/as/30010828/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30010828/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011048/BillingService/BusinessService.json
 create mode 100644 data/as/30011048/egov-location/boundary-data.json
 create mode 100644 data/as/30011048/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011048/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011084/BillingService/BusinessService.json
 create mode 100644 data/as/30011084/egov-location/boundary-data.json
 create mode 100644 data/as/30011084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011088/BillingService/BusinessService.json
 create mode 100644 data/as/30011088/egov-location/boundary-data.json
 create mode 100644 data/as/30011088/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011088/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011133/BillingService/BusinessService.json
 create mode 100644 data/as/30011133/egov-location/boundary-data.json
 create mode 100644 data/as/30011133/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011133/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011141/BillingService/BusinessService.json
 create mode 100644 data/as/30011141/egov-location/boundary-data.json
 create mode 100644 data/as/30011141/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011141/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011158/BillingService/BusinessService.json
 create mode 100644 data/as/30011158/egov-location/boundary-data.json
 create mode 100644 data/as/30011158/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011158/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011173/BillingService/BusinessService.json
 create mode 100644 data/as/30011173/egov-location/boundary-data.json
 create mode 100644 data/as/30011173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011609/BillingService/BusinessService.json
 create mode 100644 data/as/30011609/egov-location/boundary-data.json
 create mode 100644 data/as/30011609/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011609/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011655/BillingService/BusinessService.json
 create mode 100644 data/as/30011655/egov-location/boundary-data.json
 create mode 100644 data/as/30011655/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011655/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011866/BillingService/BusinessService.json
 create mode 100644 data/as/30011866/egov-location/boundary-data.json
 create mode 100644 data/as/30011866/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011866/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30011891/BillingService/BusinessService.json
 create mode 100644 data/as/30011891/egov-location/boundary-data.json
 create mode 100644 data/as/30011891/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30011891/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012177/BillingService/BusinessService.json
 create mode 100644 data/as/30012177/egov-location/boundary-data.json
 create mode 100644 data/as/30012177/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012177/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012178/BillingService/BusinessService.json
 create mode 100644 data/as/30012178/egov-location/boundary-data.json
 create mode 100644 data/as/30012178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012221/BillingService/BusinessService.json
 create mode 100644 data/as/30012221/egov-location/boundary-data.json
 create mode 100644 data/as/30012221/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012221/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012439/BillingService/BusinessService.json
 create mode 100644 data/as/30012439/egov-location/boundary-data.json
 create mode 100644 data/as/30012439/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012439/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012517/BillingService/BusinessService.json
 create mode 100644 data/as/30012517/egov-location/boundary-data.json
 create mode 100644 data/as/30012517/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012517/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012531/BillingService/BusinessService.json
 create mode 100644 data/as/30012531/egov-location/boundary-data.json
 create mode 100644 data/as/30012531/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012531/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012538/BillingService/BusinessService.json
 create mode 100644 data/as/30012538/egov-location/boundary-data.json
 create mode 100644 data/as/30012538/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012538/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30012662/BillingService/BusinessService.json
 create mode 100644 data/as/30012662/egov-location/boundary-data.json
 create mode 100644 data/as/30012662/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30012662/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013177/BillingService/BusinessService.json
 create mode 100644 data/as/30013177/egov-location/boundary-data.json
 create mode 100644 data/as/30013177/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013177/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013179/BillingService/BusinessService.json
 create mode 100644 data/as/30013179/egov-location/boundary-data.json
 create mode 100644 data/as/30013179/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013179/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013181/BillingService/BusinessService.json
 create mode 100644 data/as/30013181/egov-location/boundary-data.json
 create mode 100644 data/as/30013181/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013181/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013193/BillingService/BusinessService.json
 create mode 100644 data/as/30013193/egov-location/boundary-data.json
 create mode 100644 data/as/30013193/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013193/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013208/BillingService/BusinessService.json
 create mode 100644 data/as/30013208/egov-location/boundary-data.json
 create mode 100644 data/as/30013208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013223/BillingService/BusinessService.json
 create mode 100644 data/as/30013223/egov-location/boundary-data.json
 create mode 100644 data/as/30013223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013392/BillingService/BusinessService.json
 create mode 100644 data/as/30013392/egov-location/boundary-data.json
 create mode 100644 data/as/30013392/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013392/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013404/BillingService/BusinessService.json
 create mode 100644 data/as/30013404/egov-location/boundary-data.json
 create mode 100644 data/as/30013404/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013404/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013810/BillingService/BusinessService.json
 create mode 100644 data/as/30013810/egov-location/boundary-data.json
 create mode 100644 data/as/30013810/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013810/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013820/BillingService/BusinessService.json
 create mode 100644 data/as/30013820/egov-location/boundary-data.json
 create mode 100644 data/as/30013820/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013820/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013836/BillingService/BusinessService.json
 create mode 100644 data/as/30013836/egov-location/boundary-data.json
 create mode 100644 data/as/30013836/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013836/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013839/BillingService/BusinessService.json
 create mode 100644 data/as/30013839/egov-location/boundary-data.json
 create mode 100644 data/as/30013839/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013839/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013844/BillingService/BusinessService.json
 create mode 100644 data/as/30013844/egov-location/boundary-data.json
 create mode 100644 data/as/30013844/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013844/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013848/BillingService/BusinessService.json
 create mode 100644 data/as/30013848/egov-location/boundary-data.json
 create mode 100644 data/as/30013848/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013848/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013853/BillingService/BusinessService.json
 create mode 100644 data/as/30013853/egov-location/boundary-data.json
 create mode 100644 data/as/30013853/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013853/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013855/BillingService/BusinessService.json
 create mode 100644 data/as/30013855/egov-location/boundary-data.json
 create mode 100644 data/as/30013855/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013855/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013863/BillingService/BusinessService.json
 create mode 100644 data/as/30013863/egov-location/boundary-data.json
 create mode 100644 data/as/30013863/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013863/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30013915/BillingService/BusinessService.json
 create mode 100644 data/as/30013915/egov-location/boundary-data.json
 create mode 100644 data/as/30013915/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30013915/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014184/BillingService/BusinessService.json
 create mode 100644 data/as/30014184/egov-location/boundary-data.json
 create mode 100644 data/as/30014184/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014184/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014239/BillingService/BusinessService.json
 create mode 100644 data/as/30014239/egov-location/boundary-data.json
 create mode 100644 data/as/30014239/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014239/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014264/BillingService/BusinessService.json
 create mode 100644 data/as/30014264/egov-location/boundary-data.json
 create mode 100644 data/as/30014264/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014264/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014427/BillingService/BusinessService.json
 create mode 100644 data/as/30014427/egov-location/boundary-data.json
 create mode 100644 data/as/30014427/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014427/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014445/BillingService/BusinessService.json
 create mode 100644 data/as/30014445/egov-location/boundary-data.json
 create mode 100644 data/as/30014445/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014445/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014448/BillingService/BusinessService.json
 create mode 100644 data/as/30014448/egov-location/boundary-data.json
 create mode 100644 data/as/30014448/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014448/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014450/BillingService/BusinessService.json
 create mode 100644 data/as/30014450/egov-location/boundary-data.json
 create mode 100644 data/as/30014450/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014450/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014452/BillingService/BusinessService.json
 create mode 100644 data/as/30014452/egov-location/boundary-data.json
 create mode 100644 data/as/30014452/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014452/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014454/BillingService/BusinessService.json
 create mode 100644 data/as/30014454/egov-location/boundary-data.json
 create mode 100644 data/as/30014454/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014454/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014658/BillingService/BusinessService.json
 create mode 100644 data/as/30014658/egov-location/boundary-data.json
 create mode 100644 data/as/30014658/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014658/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014663/BillingService/BusinessService.json
 create mode 100644 data/as/30014663/egov-location/boundary-data.json
 create mode 100644 data/as/30014663/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014663/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014666/BillingService/BusinessService.json
 create mode 100644 data/as/30014666/egov-location/boundary-data.json
 create mode 100644 data/as/30014666/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014666/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014668/BillingService/BusinessService.json
 create mode 100644 data/as/30014668/egov-location/boundary-data.json
 create mode 100644 data/as/30014668/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014668/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014669/BillingService/BusinessService.json
 create mode 100644 data/as/30014669/egov-location/boundary-data.json
 create mode 100644 data/as/30014669/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014669/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014670/BillingService/BusinessService.json
 create mode 100644 data/as/30014670/egov-location/boundary-data.json
 create mode 100644 data/as/30014670/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014670/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014671/BillingService/BusinessService.json
 create mode 100644 data/as/30014671/egov-location/boundary-data.json
 create mode 100644 data/as/30014671/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014671/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014698/BillingService/BusinessService.json
 create mode 100644 data/as/30014698/egov-location/boundary-data.json
 create mode 100644 data/as/30014698/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014698/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014701/BillingService/BusinessService.json
 create mode 100644 data/as/30014701/egov-location/boundary-data.json
 create mode 100644 data/as/30014701/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014701/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014915/BillingService/BusinessService.json
 create mode 100644 data/as/30014915/egov-location/boundary-data.json
 create mode 100644 data/as/30014915/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014915/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014971/BillingService/BusinessService.json
 create mode 100644 data/as/30014971/egov-location/boundary-data.json
 create mode 100644 data/as/30014971/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014971/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014990/BillingService/BusinessService.json
 create mode 100644 data/as/30014990/egov-location/boundary-data.json
 create mode 100644 data/as/30014990/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014990/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014991/BillingService/BusinessService.json
 create mode 100644 data/as/30014991/egov-location/boundary-data.json
 create mode 100644 data/as/30014991/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014991/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30014992/BillingService/BusinessService.json
 create mode 100644 data/as/30014992/egov-location/boundary-data.json
 create mode 100644 data/as/30014992/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30014992/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30015050/BillingService/BusinessService.json
 create mode 100644 data/as/30015050/egov-location/boundary-data.json
 create mode 100644 data/as/30015050/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30015050/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30015700/BillingService/BusinessService.json
 create mode 100644 data/as/30015700/egov-location/boundary-data.json
 create mode 100644 data/as/30015700/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30015700/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016452/BillingService/BusinessService.json
 create mode 100644 data/as/30016452/egov-location/boundary-data.json
 create mode 100644 data/as/30016452/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016452/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016458/BillingService/BusinessService.json
 create mode 100644 data/as/30016458/egov-location/boundary-data.json
 create mode 100644 data/as/30016458/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016458/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016472/BillingService/BusinessService.json
 create mode 100644 data/as/30016472/egov-location/boundary-data.json
 create mode 100644 data/as/30016472/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016472/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016510/BillingService/BusinessService.json
 create mode 100644 data/as/30016510/egov-location/boundary-data.json
 create mode 100644 data/as/30016510/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016510/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016693/BillingService/BusinessService.json
 create mode 100644 data/as/30016693/egov-location/boundary-data.json
 create mode 100644 data/as/30016693/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016693/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016720/BillingService/BusinessService.json
 create mode 100644 data/as/30016720/egov-location/boundary-data.json
 create mode 100644 data/as/30016720/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016720/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016724/BillingService/BusinessService.json
 create mode 100644 data/as/30016724/egov-location/boundary-data.json
 create mode 100644 data/as/30016724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016755/BillingService/BusinessService.json
 create mode 100644 data/as/30016755/egov-location/boundary-data.json
 create mode 100644 data/as/30016755/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016755/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016761/BillingService/BusinessService.json
 create mode 100644 data/as/30016761/egov-location/boundary-data.json
 create mode 100644 data/as/30016761/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016761/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187171/BillingService/BusinessService.json
 create mode 100644 data/as/8187171/egov-location/boundary-data.json
 create mode 100644 data/as/8187171/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187171/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187175/BillingService/BusinessService.json
 create mode 100644 data/as/8187175/egov-location/boundary-data.json
 create mode 100644 data/as/8187175/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187175/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187179/BillingService/BusinessService.json
 create mode 100644 data/as/8187179/egov-location/boundary-data.json
 create mode 100644 data/as/8187179/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187179/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187185/BillingService/BusinessService.json
 create mode 100644 data/as/8187185/egov-location/boundary-data.json
 create mode 100644 data/as/8187185/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187185/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187193/BillingService/BusinessService.json
 create mode 100644 data/as/8187193/egov-location/boundary-data.json
 create mode 100644 data/as/8187193/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187193/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187270/BillingService/BusinessService.json
 create mode 100644 data/as/8187270/egov-location/boundary-data.json
 create mode 100644 data/as/8187270/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187270/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187278/BillingService/BusinessService.json
 create mode 100644 data/as/8187278/egov-location/boundary-data.json
 create mode 100644 data/as/8187278/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187278/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187290/BillingService/BusinessService.json
 create mode 100644 data/as/8187290/egov-location/boundary-data.json
 create mode 100644 data/as/8187290/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187290/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187298/BillingService/BusinessService.json
 create mode 100644 data/as/8187298/egov-location/boundary-data.json
 create mode 100644 data/as/8187298/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187298/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187307/BillingService/BusinessService.json
 create mode 100644 data/as/8187307/egov-location/boundary-data.json
 create mode 100644 data/as/8187307/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187307/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187315/BillingService/BusinessService.json
 create mode 100644 data/as/8187315/egov-location/boundary-data.json
 create mode 100644 data/as/8187315/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187315/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187323/BillingService/BusinessService.json
 create mode 100644 data/as/8187323/egov-location/boundary-data.json
 create mode 100644 data/as/8187323/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187323/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187332/BillingService/BusinessService.json
 create mode 100644 data/as/8187332/egov-location/boundary-data.json
 create mode 100644 data/as/8187332/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187332/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187337/BillingService/BusinessService.json
 create mode 100644 data/as/8187337/egov-location/boundary-data.json
 create mode 100644 data/as/8187337/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187337/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187344/BillingService/BusinessService.json
 create mode 100644 data/as/8187344/egov-location/boundary-data.json
 create mode 100644 data/as/8187344/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187344/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187350/BillingService/BusinessService.json
 create mode 100644 data/as/8187350/egov-location/boundary-data.json
 create mode 100644 data/as/8187350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187548/BillingService/BusinessService.json
 create mode 100644 data/as/8187548/egov-location/boundary-data.json
 create mode 100644 data/as/8187548/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187548/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8187585/BillingService/BusinessService.json
 create mode 100644 data/as/8187585/egov-location/boundary-data.json
 create mode 100644 data/as/8187585/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8187585/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8188301/BillingService/BusinessService.json
 create mode 100644 data/as/8188301/egov-location/boundary-data.json
 create mode 100644 data/as/8188301/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8188301/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8188715/BillingService/BusinessService.json
 create mode 100644 data/as/8188715/egov-location/boundary-data.json
 create mode 100644 data/as/8188715/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8188715/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8189136/BillingService/BusinessService.json
 create mode 100644 data/as/8189136/egov-location/boundary-data.json
 create mode 100644 data/as/8189136/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8189136/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8189158/BillingService/BusinessService.json
 create mode 100644 data/as/8189158/egov-location/boundary-data.json
 create mode 100644 data/as/8189158/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8189158/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192432/BillingService/BusinessService.json
 create mode 100644 data/as/8192432/egov-location/boundary-data.json
 create mode 100644 data/as/8192432/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192432/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192523/BillingService/BusinessService.json
 create mode 100644 data/as/8192523/egov-location/boundary-data.json
 create mode 100644 data/as/8192523/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192523/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192570/BillingService/BusinessService.json
 create mode 100644 data/as/8192570/egov-location/boundary-data.json
 create mode 100644 data/as/8192570/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192570/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192597/BillingService/BusinessService.json
 create mode 100644 data/as/8192597/egov-location/boundary-data.json
 create mode 100644 data/as/8192597/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192597/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192615/BillingService/BusinessService.json
 create mode 100644 data/as/8192615/egov-location/boundary-data.json
 create mode 100644 data/as/8192615/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192615/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192622/BillingService/BusinessService.json
 create mode 100644 data/as/8192622/egov-location/boundary-data.json
 create mode 100644 data/as/8192622/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192622/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192631/BillingService/BusinessService.json
 create mode 100644 data/as/8192631/egov-location/boundary-data.json
 create mode 100644 data/as/8192631/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192631/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192655/BillingService/BusinessService.json
 create mode 100644 data/as/8192655/egov-location/boundary-data.json
 create mode 100644 data/as/8192655/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192655/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192673/BillingService/BusinessService.json
 create mode 100644 data/as/8192673/egov-location/boundary-data.json
 create mode 100644 data/as/8192673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8192716/BillingService/BusinessService.json
 create mode 100644 data/as/8192716/egov-location/boundary-data.json
 create mode 100644 data/as/8192716/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8192716/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8195888/BillingService/BusinessService.json
 create mode 100644 data/as/8195888/egov-location/boundary-data.json
 create mode 100644 data/as/8195888/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8195888/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8195974/BillingService/BusinessService.json
 create mode 100644 data/as/8195974/egov-location/boundary-data.json
 create mode 100644 data/as/8195974/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8195974/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196020/BillingService/BusinessService.json
 create mode 100644 data/as/8196020/egov-location/boundary-data.json
 create mode 100644 data/as/8196020/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196020/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196023/BillingService/BusinessService.json
 create mode 100644 data/as/8196023/egov-location/boundary-data.json
 create mode 100644 data/as/8196023/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196023/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196027/BillingService/BusinessService.json
 create mode 100644 data/as/8196027/egov-location/boundary-data.json
 create mode 100644 data/as/8196027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196029/BillingService/BusinessService.json
 create mode 100644 data/as/8196029/egov-location/boundary-data.json
 create mode 100644 data/as/8196029/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196029/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196038/BillingService/BusinessService.json
 create mode 100644 data/as/8196038/egov-location/boundary-data.json
 create mode 100644 data/as/8196038/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196038/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196756/BillingService/BusinessService.json
 create mode 100644 data/as/8196756/egov-location/boundary-data.json
 create mode 100644 data/as/8196756/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196756/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196774/BillingService/BusinessService.json
 create mode 100644 data/as/8196774/egov-location/boundary-data.json
 create mode 100644 data/as/8196774/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196774/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196779/BillingService/BusinessService.json
 create mode 100644 data/as/8196779/egov-location/boundary-data.json
 create mode 100644 data/as/8196779/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196779/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196786/BillingService/BusinessService.json
 create mode 100644 data/as/8196786/egov-location/boundary-data.json
 create mode 100644 data/as/8196786/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196786/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196792/BillingService/BusinessService.json
 create mode 100644 data/as/8196792/egov-location/boundary-data.json
 create mode 100644 data/as/8196792/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196792/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196816/BillingService/BusinessService.json
 create mode 100644 data/as/8196816/egov-location/boundary-data.json
 create mode 100644 data/as/8196816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196837/BillingService/BusinessService.json
 create mode 100644 data/as/8196837/egov-location/boundary-data.json
 create mode 100644 data/as/8196837/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196837/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196871/BillingService/BusinessService.json
 create mode 100644 data/as/8196871/egov-location/boundary-data.json
 create mode 100644 data/as/8196871/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196871/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196879/BillingService/BusinessService.json
 create mode 100644 data/as/8196879/egov-location/boundary-data.json
 create mode 100644 data/as/8196879/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196879/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196894/BillingService/BusinessService.json
 create mode 100644 data/as/8196894/egov-location/boundary-data.json
 create mode 100644 data/as/8196894/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196894/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196903/BillingService/BusinessService.json
 create mode 100644 data/as/8196903/egov-location/boundary-data.json
 create mode 100644 data/as/8196903/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196903/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196910/BillingService/BusinessService.json
 create mode 100644 data/as/8196910/egov-location/boundary-data.json
 create mode 100644 data/as/8196910/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196910/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196914/BillingService/BusinessService.json
 create mode 100644 data/as/8196914/egov-location/boundary-data.json
 create mode 100644 data/as/8196914/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196914/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196954/BillingService/BusinessService.json
 create mode 100644 data/as/8196954/egov-location/boundary-data.json
 create mode 100644 data/as/8196954/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196954/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196972/BillingService/BusinessService.json
 create mode 100644 data/as/8196972/egov-location/boundary-data.json
 create mode 100644 data/as/8196972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8196995/BillingService/BusinessService.json
 create mode 100644 data/as/8196995/egov-location/boundary-data.json
 create mode 100644 data/as/8196995/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8196995/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197005/BillingService/BusinessService.json
 create mode 100644 data/as/8197005/egov-location/boundary-data.json
 create mode 100644 data/as/8197005/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197005/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197023/BillingService/BusinessService.json
 create mode 100644 data/as/8197023/egov-location/boundary-data.json
 create mode 100644 data/as/8197023/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197023/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197028/BillingService/BusinessService.json
 create mode 100644 data/as/8197028/egov-location/boundary-data.json
 create mode 100644 data/as/8197028/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197028/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197048/BillingService/BusinessService.json
 create mode 100644 data/as/8197048/egov-location/boundary-data.json
 create mode 100644 data/as/8197048/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197048/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197059/BillingService/BusinessService.json
 create mode 100644 data/as/8197059/egov-location/boundary-data.json
 create mode 100644 data/as/8197059/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197059/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197069/BillingService/BusinessService.json
 create mode 100644 data/as/8197069/egov-location/boundary-data.json
 create mode 100644 data/as/8197069/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197069/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197098/BillingService/BusinessService.json
 create mode 100644 data/as/8197098/egov-location/boundary-data.json
 create mode 100644 data/as/8197098/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197098/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197113/BillingService/BusinessService.json
 create mode 100644 data/as/8197113/egov-location/boundary-data.json
 create mode 100644 data/as/8197113/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197113/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197243/BillingService/BusinessService.json
 create mode 100644 data/as/8197243/egov-location/boundary-data.json
 create mode 100644 data/as/8197243/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197243/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8197282/BillingService/BusinessService.json
 create mode 100644 data/as/8197282/egov-location/boundary-data.json
 create mode 100644 data/as/8197282/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8197282/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198168/BillingService/BusinessService.json
 create mode 100644 data/as/8198168/egov-location/boundary-data.json
 create mode 100644 data/as/8198168/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198168/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198173/BillingService/BusinessService.json
 create mode 100644 data/as/8198173/egov-location/boundary-data.json
 create mode 100644 data/as/8198173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198179/BillingService/BusinessService.json
 create mode 100644 data/as/8198179/egov-location/boundary-data.json
 create mode 100644 data/as/8198179/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198179/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198205/BillingService/BusinessService.json
 create mode 100644 data/as/8198205/egov-location/boundary-data.json
 create mode 100644 data/as/8198205/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198205/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198213/BillingService/BusinessService.json
 create mode 100644 data/as/8198213/egov-location/boundary-data.json
 create mode 100644 data/as/8198213/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198213/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198223/BillingService/BusinessService.json
 create mode 100644 data/as/8198223/egov-location/boundary-data.json
 create mode 100644 data/as/8198223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8198230/BillingService/BusinessService.json
 create mode 100644 data/as/8198230/egov-location/boundary-data.json
 create mode 100644 data/as/8198230/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8198230/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8201977/BillingService/BusinessService.json
 create mode 100644 data/as/8201977/egov-location/boundary-data.json
 create mode 100644 data/as/8201977/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8201977/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8201983/BillingService/BusinessService.json
 create mode 100644 data/as/8201983/egov-location/boundary-data.json
 create mode 100644 data/as/8201983/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8201983/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8202008/BillingService/BusinessService.json
 create mode 100644 data/as/8202008/egov-location/boundary-data.json
 create mode 100644 data/as/8202008/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8202008/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8202014/BillingService/BusinessService.json
 create mode 100644 data/as/8202014/egov-location/boundary-data.json
 create mode 100644 data/as/8202014/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8202014/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8202020/BillingService/BusinessService.json
 create mode 100644 data/as/8202020/egov-location/boundary-data.json
 create mode 100644 data/as/8202020/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8202020/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8202025/BillingService/BusinessService.json
 create mode 100644 data/as/8202025/egov-location/boundary-data.json
 create mode 100644 data/as/8202025/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8202025/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8202278/BillingService/BusinessService.json
 create mode 100644 data/as/8202278/egov-location/boundary-data.json
 create mode 100644 data/as/8202278/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8202278/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8202287/BillingService/BusinessService.json
 create mode 100644 data/as/8202287/egov-location/boundary-data.json
 create mode 100644 data/as/8202287/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8202287/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203051/BillingService/BusinessService.json
 create mode 100644 data/as/8203051/egov-location/boundary-data.json
 create mode 100644 data/as/8203051/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203051/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203064/BillingService/BusinessService.json
 create mode 100644 data/as/8203064/egov-location/boundary-data.json
 create mode 100644 data/as/8203064/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203064/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203128/BillingService/BusinessService.json
 create mode 100644 data/as/8203128/egov-location/boundary-data.json
 create mode 100644 data/as/8203128/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203128/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203162/BillingService/BusinessService.json
 create mode 100644 data/as/8203162/egov-location/boundary-data.json
 create mode 100644 data/as/8203162/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203162/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203178/BillingService/BusinessService.json
 create mode 100644 data/as/8203178/egov-location/boundary-data.json
 create mode 100644 data/as/8203178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203211/BillingService/BusinessService.json
 create mode 100644 data/as/8203211/egov-location/boundary-data.json
 create mode 100644 data/as/8203211/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203211/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203233/BillingService/BusinessService.json
 create mode 100644 data/as/8203233/egov-location/boundary-data.json
 create mode 100644 data/as/8203233/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203233/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203251/BillingService/BusinessService.json
 create mode 100644 data/as/8203251/egov-location/boundary-data.json
 create mode 100644 data/as/8203251/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203251/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203271/BillingService/BusinessService.json
 create mode 100644 data/as/8203271/egov-location/boundary-data.json
 create mode 100644 data/as/8203271/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203271/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203278/BillingService/BusinessService.json
 create mode 100644 data/as/8203278/egov-location/boundary-data.json
 create mode 100644 data/as/8203278/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203278/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203286/BillingService/BusinessService.json
 create mode 100644 data/as/8203286/egov-location/boundary-data.json
 create mode 100644 data/as/8203286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203579/BillingService/BusinessService.json
 create mode 100644 data/as/8203579/egov-location/boundary-data.json
 create mode 100644 data/as/8203579/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203579/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203589/BillingService/BusinessService.json
 create mode 100644 data/as/8203589/egov-location/boundary-data.json
 create mode 100644 data/as/8203589/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203589/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203592/BillingService/BusinessService.json
 create mode 100644 data/as/8203592/egov-location/boundary-data.json
 create mode 100644 data/as/8203592/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203592/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203614/BillingService/BusinessService.json
 create mode 100644 data/as/8203614/egov-location/boundary-data.json
 create mode 100644 data/as/8203614/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203614/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203629/BillingService/BusinessService.json
 create mode 100644 data/as/8203629/egov-location/boundary-data.json
 create mode 100644 data/as/8203629/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203629/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203647/BillingService/BusinessService.json
 create mode 100644 data/as/8203647/egov-location/boundary-data.json
 create mode 100644 data/as/8203647/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203647/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203683/BillingService/BusinessService.json
 create mode 100644 data/as/8203683/egov-location/boundary-data.json
 create mode 100644 data/as/8203683/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203683/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203689/BillingService/BusinessService.json
 create mode 100644 data/as/8203689/egov-location/boundary-data.json
 create mode 100644 data/as/8203689/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203689/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203693/BillingService/BusinessService.json
 create mode 100644 data/as/8203693/egov-location/boundary-data.json
 create mode 100644 data/as/8203693/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203693/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203703/BillingService/BusinessService.json
 create mode 100644 data/as/8203703/egov-location/boundary-data.json
 create mode 100644 data/as/8203703/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203703/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203721/BillingService/BusinessService.json
 create mode 100644 data/as/8203721/egov-location/boundary-data.json
 create mode 100644 data/as/8203721/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203721/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203725/BillingService/BusinessService.json
 create mode 100644 data/as/8203725/egov-location/boundary-data.json
 create mode 100644 data/as/8203725/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203725/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203729/BillingService/BusinessService.json
 create mode 100644 data/as/8203729/egov-location/boundary-data.json
 create mode 100644 data/as/8203729/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203729/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203732/BillingService/BusinessService.json
 create mode 100644 data/as/8203732/egov-location/boundary-data.json
 create mode 100644 data/as/8203732/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203732/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203748/BillingService/BusinessService.json
 create mode 100644 data/as/8203748/egov-location/boundary-data.json
 create mode 100644 data/as/8203748/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203748/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203764/BillingService/BusinessService.json
 create mode 100644 data/as/8203764/egov-location/boundary-data.json
 create mode 100644 data/as/8203764/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203764/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203786/BillingService/BusinessService.json
 create mode 100644 data/as/8203786/egov-location/boundary-data.json
 create mode 100644 data/as/8203786/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203786/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203804/BillingService/BusinessService.json
 create mode 100644 data/as/8203804/egov-location/boundary-data.json
 create mode 100644 data/as/8203804/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203804/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203816/BillingService/BusinessService.json
 create mode 100644 data/as/8203816/egov-location/boundary-data.json
 create mode 100644 data/as/8203816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203835/BillingService/BusinessService.json
 create mode 100644 data/as/8203835/egov-location/boundary-data.json
 create mode 100644 data/as/8203835/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203835/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203855/BillingService/BusinessService.json
 create mode 100644 data/as/8203855/egov-location/boundary-data.json
 create mode 100644 data/as/8203855/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203855/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203872/BillingService/BusinessService.json
 create mode 100644 data/as/8203872/egov-location/boundary-data.json
 create mode 100644 data/as/8203872/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203872/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203902/BillingService/BusinessService.json
 create mode 100644 data/as/8203902/egov-location/boundary-data.json
 create mode 100644 data/as/8203902/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203902/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203915/BillingService/BusinessService.json
 create mode 100644 data/as/8203915/egov-location/boundary-data.json
 create mode 100644 data/as/8203915/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203915/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203942/BillingService/BusinessService.json
 create mode 100644 data/as/8203942/egov-location/boundary-data.json
 create mode 100644 data/as/8203942/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203942/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8203947/BillingService/BusinessService.json
 create mode 100644 data/as/8203947/egov-location/boundary-data.json
 create mode 100644 data/as/8203947/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8203947/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8204267/BillingService/BusinessService.json
 create mode 100644 data/as/8204267/egov-location/boundary-data.json
 create mode 100644 data/as/8204267/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8204267/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205058/BillingService/BusinessService.json
 create mode 100644 data/as/8205058/egov-location/boundary-data.json
 create mode 100644 data/as/8205058/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205058/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205077/BillingService/BusinessService.json
 create mode 100644 data/as/8205077/egov-location/boundary-data.json
 create mode 100644 data/as/8205077/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205077/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205087/BillingService/BusinessService.json
 create mode 100644 data/as/8205087/egov-location/boundary-data.json
 create mode 100644 data/as/8205087/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205087/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205096/BillingService/BusinessService.json
 create mode 100644 data/as/8205096/egov-location/boundary-data.json
 create mode 100644 data/as/8205096/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205096/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205107/BillingService/BusinessService.json
 create mode 100644 data/as/8205107/egov-location/boundary-data.json
 create mode 100644 data/as/8205107/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205107/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205116/BillingService/BusinessService.json
 create mode 100644 data/as/8205116/egov-location/boundary-data.json
 create mode 100644 data/as/8205116/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205116/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205127/BillingService/BusinessService.json
 create mode 100644 data/as/8205127/egov-location/boundary-data.json
 create mode 100644 data/as/8205127/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205127/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205153/BillingService/BusinessService.json
 create mode 100644 data/as/8205153/egov-location/boundary-data.json
 create mode 100644 data/as/8205153/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205153/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205176/BillingService/BusinessService.json
 create mode 100644 data/as/8205176/egov-location/boundary-data.json
 create mode 100644 data/as/8205176/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205176/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205265/BillingService/BusinessService.json
 create mode 100644 data/as/8205265/egov-location/boundary-data.json
 create mode 100644 data/as/8205265/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205265/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205277/BillingService/BusinessService.json
 create mode 100644 data/as/8205277/egov-location/boundary-data.json
 create mode 100644 data/as/8205277/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205277/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205283/BillingService/BusinessService.json
 create mode 100644 data/as/8205283/egov-location/boundary-data.json
 create mode 100644 data/as/8205283/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205283/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205289/BillingService/BusinessService.json
 create mode 100644 data/as/8205289/egov-location/boundary-data.json
 create mode 100644 data/as/8205289/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205289/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205290/BillingService/BusinessService.json
 create mode 100644 data/as/8205290/egov-location/boundary-data.json
 create mode 100644 data/as/8205290/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205290/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205310/BillingService/BusinessService.json
 create mode 100644 data/as/8205310/egov-location/boundary-data.json
 create mode 100644 data/as/8205310/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205310/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205339/BillingService/BusinessService.json
 create mode 100644 data/as/8205339/egov-location/boundary-data.json
 create mode 100644 data/as/8205339/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205339/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205350/BillingService/BusinessService.json
 create mode 100644 data/as/8205350/egov-location/boundary-data.json
 create mode 100644 data/as/8205350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205362/BillingService/BusinessService.json
 create mode 100644 data/as/8205362/egov-location/boundary-data.json
 create mode 100644 data/as/8205362/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205362/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205375/BillingService/BusinessService.json
 create mode 100644 data/as/8205375/egov-location/boundary-data.json
 create mode 100644 data/as/8205375/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205375/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205382/BillingService/BusinessService.json
 create mode 100644 data/as/8205382/egov-location/boundary-data.json
 create mode 100644 data/as/8205382/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205382/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205387/BillingService/BusinessService.json
 create mode 100644 data/as/8205387/egov-location/boundary-data.json
 create mode 100644 data/as/8205387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8205395/BillingService/BusinessService.json
 create mode 100644 data/as/8205395/egov-location/boundary-data.json
 create mode 100644 data/as/8205395/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8205395/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206044/BillingService/BusinessService.json
 create mode 100644 data/as/8206044/egov-location/boundary-data.json
 create mode 100644 data/as/8206044/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206044/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206058/BillingService/BusinessService.json
 create mode 100644 data/as/8206058/egov-location/boundary-data.json
 create mode 100644 data/as/8206058/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206058/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206068/BillingService/BusinessService.json
 create mode 100644 data/as/8206068/egov-location/boundary-data.json
 create mode 100644 data/as/8206068/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206068/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206074/BillingService/BusinessService.json
 create mode 100644 data/as/8206074/egov-location/boundary-data.json
 create mode 100644 data/as/8206074/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206074/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206091/BillingService/BusinessService.json
 create mode 100644 data/as/8206091/egov-location/boundary-data.json
 create mode 100644 data/as/8206091/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206091/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206111/BillingService/BusinessService.json
 create mode 100644 data/as/8206111/egov-location/boundary-data.json
 create mode 100644 data/as/8206111/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206111/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206116/BillingService/BusinessService.json
 create mode 100644 data/as/8206116/egov-location/boundary-data.json
 create mode 100644 data/as/8206116/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206116/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206170/BillingService/BusinessService.json
 create mode 100644 data/as/8206170/egov-location/boundary-data.json
 create mode 100644 data/as/8206170/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206170/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206177/BillingService/BusinessService.json
 create mode 100644 data/as/8206177/egov-location/boundary-data.json
 create mode 100644 data/as/8206177/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206177/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206194/BillingService/BusinessService.json
 create mode 100644 data/as/8206194/egov-location/boundary-data.json
 create mode 100644 data/as/8206194/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206194/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206219/BillingService/BusinessService.json
 create mode 100644 data/as/8206219/egov-location/boundary-data.json
 create mode 100644 data/as/8206219/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206219/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206280/BillingService/BusinessService.json
 create mode 100644 data/as/8206280/egov-location/boundary-data.json
 create mode 100644 data/as/8206280/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206280/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206284/BillingService/BusinessService.json
 create mode 100644 data/as/8206284/egov-location/boundary-data.json
 create mode 100644 data/as/8206284/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206284/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206297/BillingService/BusinessService.json
 create mode 100644 data/as/8206297/egov-location/boundary-data.json
 create mode 100644 data/as/8206297/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206297/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206302/BillingService/BusinessService.json
 create mode 100644 data/as/8206302/egov-location/boundary-data.json
 create mode 100644 data/as/8206302/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206302/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206316/BillingService/BusinessService.json
 create mode 100644 data/as/8206316/egov-location/boundary-data.json
 create mode 100644 data/as/8206316/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206316/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206425/BillingService/BusinessService.json
 create mode 100644 data/as/8206425/egov-location/boundary-data.json
 create mode 100644 data/as/8206425/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206425/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206436/BillingService/BusinessService.json
 create mode 100644 data/as/8206436/egov-location/boundary-data.json
 create mode 100644 data/as/8206436/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206436/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206445/BillingService/BusinessService.json
 create mode 100644 data/as/8206445/egov-location/boundary-data.json
 create mode 100644 data/as/8206445/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206445/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206457/BillingService/BusinessService.json
 create mode 100644 data/as/8206457/egov-location/boundary-data.json
 create mode 100644 data/as/8206457/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206457/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206469/BillingService/BusinessService.json
 create mode 100644 data/as/8206469/egov-location/boundary-data.json
 create mode 100644 data/as/8206469/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206469/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206477/BillingService/BusinessService.json
 create mode 100644 data/as/8206477/egov-location/boundary-data.json
 create mode 100644 data/as/8206477/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206477/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206486/BillingService/BusinessService.json
 create mode 100644 data/as/8206486/egov-location/boundary-data.json
 create mode 100644 data/as/8206486/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206486/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206496/BillingService/BusinessService.json
 create mode 100644 data/as/8206496/egov-location/boundary-data.json
 create mode 100644 data/as/8206496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206510/BillingService/BusinessService.json
 create mode 100644 data/as/8206510/egov-location/boundary-data.json
 create mode 100644 data/as/8206510/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206510/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206524/BillingService/BusinessService.json
 create mode 100644 data/as/8206524/egov-location/boundary-data.json
 create mode 100644 data/as/8206524/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206524/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206535/BillingService/BusinessService.json
 create mode 100644 data/as/8206535/egov-location/boundary-data.json
 create mode 100644 data/as/8206535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206542/BillingService/BusinessService.json
 create mode 100644 data/as/8206542/egov-location/boundary-data.json
 create mode 100644 data/as/8206542/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206542/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206547/BillingService/BusinessService.json
 create mode 100644 data/as/8206547/egov-location/boundary-data.json
 create mode 100644 data/as/8206547/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206547/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206554/BillingService/BusinessService.json
 create mode 100644 data/as/8206554/egov-location/boundary-data.json
 create mode 100644 data/as/8206554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206558/BillingService/BusinessService.json
 create mode 100644 data/as/8206558/egov-location/boundary-data.json
 create mode 100644 data/as/8206558/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206558/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206789/BillingService/BusinessService.json
 create mode 100644 data/as/8206789/egov-location/boundary-data.json
 create mode 100644 data/as/8206789/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206789/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206800/BillingService/BusinessService.json
 create mode 100644 data/as/8206800/egov-location/boundary-data.json
 create mode 100644 data/as/8206800/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206800/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206811/BillingService/BusinessService.json
 create mode 100644 data/as/8206811/egov-location/boundary-data.json
 create mode 100644 data/as/8206811/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206811/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206824/BillingService/BusinessService.json
 create mode 100644 data/as/8206824/egov-location/boundary-data.json
 create mode 100644 data/as/8206824/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206824/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206834/BillingService/BusinessService.json
 create mode 100644 data/as/8206834/egov-location/boundary-data.json
 create mode 100644 data/as/8206834/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206834/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8206851/BillingService/BusinessService.json
 create mode 100644 data/as/8206851/egov-location/boundary-data.json
 create mode 100644 data/as/8206851/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8206851/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215102/BillingService/BusinessService.json
 create mode 100644 data/as/8215102/egov-location/boundary-data.json
 create mode 100644 data/as/8215102/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215102/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215107/BillingService/BusinessService.json
 create mode 100644 data/as/8215107/egov-location/boundary-data.json
 create mode 100644 data/as/8215107/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215107/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215197/BillingService/BusinessService.json
 create mode 100644 data/as/8215197/egov-location/boundary-data.json
 create mode 100644 data/as/8215197/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215197/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215261/BillingService/BusinessService.json
 create mode 100644 data/as/8215261/egov-location/boundary-data.json
 create mode 100644 data/as/8215261/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215261/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215283/BillingService/BusinessService.json
 create mode 100644 data/as/8215283/egov-location/boundary-data.json
 create mode 100644 data/as/8215283/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215283/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215285/BillingService/BusinessService.json
 create mode 100644 data/as/8215285/egov-location/boundary-data.json
 create mode 100644 data/as/8215285/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215285/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215403/BillingService/BusinessService.json
 create mode 100644 data/as/8215403/egov-location/boundary-data.json
 create mode 100644 data/as/8215403/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215403/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215406/BillingService/BusinessService.json
 create mode 100644 data/as/8215406/egov-location/boundary-data.json
 create mode 100644 data/as/8215406/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215406/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215411/BillingService/BusinessService.json
 create mode 100644 data/as/8215411/egov-location/boundary-data.json
 create mode 100644 data/as/8215411/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215411/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215655/BillingService/BusinessService.json
 create mode 100644 data/as/8215655/egov-location/boundary-data.json
 create mode 100644 data/as/8215655/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215655/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215753/BillingService/BusinessService.json
 create mode 100644 data/as/8215753/egov-location/boundary-data.json
 create mode 100644 data/as/8215753/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215753/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215757/BillingService/BusinessService.json
 create mode 100644 data/as/8215757/egov-location/boundary-data.json
 create mode 100644 data/as/8215757/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215757/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215759/BillingService/BusinessService.json
 create mode 100644 data/as/8215759/egov-location/boundary-data.json
 create mode 100644 data/as/8215759/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215759/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215762/BillingService/BusinessService.json
 create mode 100644 data/as/8215762/egov-location/boundary-data.json
 create mode 100644 data/as/8215762/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215762/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215767/BillingService/BusinessService.json
 create mode 100644 data/as/8215767/egov-location/boundary-data.json
 create mode 100644 data/as/8215767/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215767/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215769/BillingService/BusinessService.json
 create mode 100644 data/as/8215769/egov-location/boundary-data.json
 create mode 100644 data/as/8215769/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215769/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8215771/BillingService/BusinessService.json
 create mode 100644 data/as/8215771/egov-location/boundary-data.json
 create mode 100644 data/as/8215771/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8215771/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8218304/BillingService/BusinessService.json
 create mode 100644 data/as/8218304/egov-location/boundary-data.json
 create mode 100644 data/as/8218304/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8218304/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8218315/BillingService/BusinessService.json
 create mode 100644 data/as/8218315/egov-location/boundary-data.json
 create mode 100644 data/as/8218315/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8218315/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8218486/BillingService/BusinessService.json
 create mode 100644 data/as/8218486/egov-location/boundary-data.json
 create mode 100644 data/as/8218486/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8218486/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8218509/BillingService/BusinessService.json
 create mode 100644 data/as/8218509/egov-location/boundary-data.json
 create mode 100644 data/as/8218509/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8218509/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8218510/BillingService/BusinessService.json
 create mode 100644 data/as/8218510/egov-location/boundary-data.json
 create mode 100644 data/as/8218510/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8218510/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222042/BillingService/BusinessService.json
 create mode 100644 data/as/8222042/egov-location/boundary-data.json
 create mode 100644 data/as/8222042/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222042/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222249/BillingService/BusinessService.json
 create mode 100644 data/as/8222249/egov-location/boundary-data.json
 create mode 100644 data/as/8222249/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222249/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222264/BillingService/BusinessService.json
 create mode 100644 data/as/8222264/egov-location/boundary-data.json
 create mode 100644 data/as/8222264/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222264/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222276/BillingService/BusinessService.json
 create mode 100644 data/as/8222276/egov-location/boundary-data.json
 create mode 100644 data/as/8222276/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222276/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222311/BillingService/BusinessService.json
 create mode 100644 data/as/8222311/egov-location/boundary-data.json
 create mode 100644 data/as/8222311/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222311/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222322/BillingService/BusinessService.json
 create mode 100644 data/as/8222322/egov-location/boundary-data.json
 create mode 100644 data/as/8222322/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222322/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222342/BillingService/BusinessService.json
 create mode 100644 data/as/8222342/egov-location/boundary-data.json
 create mode 100644 data/as/8222342/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222342/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222348/BillingService/BusinessService.json
 create mode 100644 data/as/8222348/egov-location/boundary-data.json
 create mode 100644 data/as/8222348/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222348/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222352/BillingService/BusinessService.json
 create mode 100644 data/as/8222352/egov-location/boundary-data.json
 create mode 100644 data/as/8222352/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222352/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222366/BillingService/BusinessService.json
 create mode 100644 data/as/8222366/egov-location/boundary-data.json
 create mode 100644 data/as/8222366/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222366/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8222386/BillingService/BusinessService.json
 create mode 100644 data/as/8222386/egov-location/boundary-data.json
 create mode 100644 data/as/8222386/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8222386/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8227638/BillingService/BusinessService.json
 create mode 100644 data/as/8227638/egov-location/boundary-data.json
 create mode 100644 data/as/8227638/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8227638/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8228162/BillingService/BusinessService.json
 create mode 100644 data/as/8228162/egov-location/boundary-data.json
 create mode 100644 data/as/8228162/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8228162/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8228342/BillingService/BusinessService.json
 create mode 100644 data/as/8228342/egov-location/boundary-data.json
 create mode 100644 data/as/8228342/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8228342/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8228352/BillingService/BusinessService.json
 create mode 100644 data/as/8228352/egov-location/boundary-data.json
 create mode 100644 data/as/8228352/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8228352/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8228831/BillingService/BusinessService.json
 create mode 100644 data/as/8228831/egov-location/boundary-data.json
 create mode 100644 data/as/8228831/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8228831/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8228832/BillingService/BusinessService.json
 create mode 100644 data/as/8228832/egov-location/boundary-data.json
 create mode 100644 data/as/8228832/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8228832/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8230806/BillingService/BusinessService.json
 create mode 100644 data/as/8230806/egov-location/boundary-data.json
 create mode 100644 data/as/8230806/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8230806/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8234493/BillingService/BusinessService.json
 create mode 100644 data/as/8234493/egov-location/boundary-data.json
 create mode 100644 data/as/8234493/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8234493/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8234543/BillingService/BusinessService.json
 create mode 100644 data/as/8234543/egov-location/boundary-data.json
 create mode 100644 data/as/8234543/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8234543/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8234577/BillingService/BusinessService.json
 create mode 100644 data/as/8234577/egov-location/boundary-data.json
 create mode 100644 data/as/8234577/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8234577/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235302/BillingService/BusinessService.json
 create mode 100644 data/as/8235302/egov-location/boundary-data.json
 create mode 100644 data/as/8235302/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235302/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235314/BillingService/BusinessService.json
 create mode 100644 data/as/8235314/egov-location/boundary-data.json
 create mode 100644 data/as/8235314/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235314/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235328/BillingService/BusinessService.json
 create mode 100644 data/as/8235328/egov-location/boundary-data.json
 create mode 100644 data/as/8235328/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235328/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235338/BillingService/BusinessService.json
 create mode 100644 data/as/8235338/egov-location/boundary-data.json
 create mode 100644 data/as/8235338/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235338/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235347/BillingService/BusinessService.json
 create mode 100644 data/as/8235347/egov-location/boundary-data.json
 create mode 100644 data/as/8235347/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235347/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235358/BillingService/BusinessService.json
 create mode 100644 data/as/8235358/egov-location/boundary-data.json
 create mode 100644 data/as/8235358/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235358/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235371/BillingService/BusinessService.json
 create mode 100644 data/as/8235371/egov-location/boundary-data.json
 create mode 100644 data/as/8235371/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235371/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235387/BillingService/BusinessService.json
 create mode 100644 data/as/8235387/egov-location/boundary-data.json
 create mode 100644 data/as/8235387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235394/BillingService/BusinessService.json
 create mode 100644 data/as/8235394/egov-location/boundary-data.json
 create mode 100644 data/as/8235394/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235394/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235405/BillingService/BusinessService.json
 create mode 100644 data/as/8235405/egov-location/boundary-data.json
 create mode 100644 data/as/8235405/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235405/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235411/BillingService/BusinessService.json
 create mode 100644 data/as/8235411/egov-location/boundary-data.json
 create mode 100644 data/as/8235411/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235411/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235421/BillingService/BusinessService.json
 create mode 100644 data/as/8235421/egov-location/boundary-data.json
 create mode 100644 data/as/8235421/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235421/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8235807/BillingService/BusinessService.json
 create mode 100644 data/as/8235807/egov-location/boundary-data.json
 create mode 100644 data/as/8235807/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8235807/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237353/BillingService/BusinessService.json
 create mode 100644 data/as/8237353/egov-location/boundary-data.json
 create mode 100644 data/as/8237353/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237353/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237367/BillingService/BusinessService.json
 create mode 100644 data/as/8237367/egov-location/boundary-data.json
 create mode 100644 data/as/8237367/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237367/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237390/BillingService/BusinessService.json
 create mode 100644 data/as/8237390/egov-location/boundary-data.json
 create mode 100644 data/as/8237390/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237390/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237435/BillingService/BusinessService.json
 create mode 100644 data/as/8237435/egov-location/boundary-data.json
 create mode 100644 data/as/8237435/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237435/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237444/BillingService/BusinessService.json
 create mode 100644 data/as/8237444/egov-location/boundary-data.json
 create mode 100644 data/as/8237444/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237444/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237467/BillingService/BusinessService.json
 create mode 100644 data/as/8237467/egov-location/boundary-data.json
 create mode 100644 data/as/8237467/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237467/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237495/BillingService/BusinessService.json
 create mode 100644 data/as/8237495/egov-location/boundary-data.json
 create mode 100644 data/as/8237495/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237495/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237534/BillingService/BusinessService.json
 create mode 100644 data/as/8237534/egov-location/boundary-data.json
 create mode 100644 data/as/8237534/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237534/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237554/BillingService/BusinessService.json
 create mode 100644 data/as/8237554/egov-location/boundary-data.json
 create mode 100644 data/as/8237554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237581/BillingService/BusinessService.json
 create mode 100644 data/as/8237581/egov-location/boundary-data.json
 create mode 100644 data/as/8237581/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237581/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237588/BillingService/BusinessService.json
 create mode 100644 data/as/8237588/egov-location/boundary-data.json
 create mode 100644 data/as/8237588/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237588/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237606/BillingService/BusinessService.json
 create mode 100644 data/as/8237606/egov-location/boundary-data.json
 create mode 100644 data/as/8237606/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237606/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8237611/BillingService/BusinessService.json
 create mode 100644 data/as/8237611/egov-location/boundary-data.json
 create mode 100644 data/as/8237611/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8237611/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8239822/BillingService/BusinessService.json
 create mode 100644 data/as/8239822/egov-location/boundary-data.json
 create mode 100644 data/as/8239822/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8239822/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8246724/BillingService/BusinessService.json
 create mode 100644 data/as/8246724/egov-location/boundary-data.json
 create mode 100644 data/as/8246724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8246724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8250038/BillingService/BusinessService.json
 create mode 100644 data/as/8250038/egov-location/boundary-data.json
 create mode 100644 data/as/8250038/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8250038/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8250626/BillingService/BusinessService.json
 create mode 100644 data/as/8250626/egov-location/boundary-data.json
 create mode 100644 data/as/8250626/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8250626/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8252919/BillingService/BusinessService.json
 create mode 100644 data/as/8252919/egov-location/boundary-data.json
 create mode 100644 data/as/8252919/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8252919/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8255134/BillingService/BusinessService.json
 create mode 100644 data/as/8255134/egov-location/boundary-data.json
 create mode 100644 data/as/8255134/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8255134/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8257091/BillingService/BusinessService.json
 create mode 100644 data/as/8257091/egov-location/boundary-data.json
 create mode 100644 data/as/8257091/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8257091/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8261500/BillingService/BusinessService.json
 create mode 100644 data/as/8261500/egov-location/boundary-data.json
 create mode 100644 data/as/8261500/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8261500/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8261877/BillingService/BusinessService.json
 create mode 100644 data/as/8261877/egov-location/boundary-data.json
 create mode 100644 data/as/8261877/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8261877/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8261995/BillingService/BusinessService.json
 create mode 100644 data/as/8261995/egov-location/boundary-data.json
 create mode 100644 data/as/8261995/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8261995/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8264422/BillingService/BusinessService.json
 create mode 100644 data/as/8264422/egov-location/boundary-data.json
 create mode 100644 data/as/8264422/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8264422/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8265409/BillingService/BusinessService.json
 create mode 100644 data/as/8265409/egov-location/boundary-data.json
 create mode 100644 data/as/8265409/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8265409/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8266441/BillingService/BusinessService.json
 create mode 100644 data/as/8266441/egov-location/boundary-data.json
 create mode 100644 data/as/8266441/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8266441/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8273083/BillingService/BusinessService.json
 create mode 100644 data/as/8273083/egov-location/boundary-data.json
 create mode 100644 data/as/8273083/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8273083/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8279762/BillingService/BusinessService.json
 create mode 100644 data/as/8279762/egov-location/boundary-data.json
 create mode 100644 data/as/8279762/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8279762/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8286607/BillingService/BusinessService.json
 create mode 100644 data/as/8286607/egov-location/boundary-data.json
 create mode 100644 data/as/8286607/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8286607/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8298009/BillingService/BusinessService.json
 create mode 100644 data/as/8298009/egov-location/boundary-data.json
 create mode 100644 data/as/8298009/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8298009/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8307469/BillingService/BusinessService.json
 create mode 100644 data/as/8307469/egov-location/boundary-data.json
 create mode 100644 data/as/8307469/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8307469/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8310456/BillingService/BusinessService.json
 create mode 100644 data/as/8310456/egov-location/boundary-data.json
 create mode 100644 data/as/8310456/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8310456/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8312752/BillingService/BusinessService.json
 create mode 100644 data/as/8312752/egov-location/boundary-data.json
 create mode 100644 data/as/8312752/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8312752/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8320434/BillingService/BusinessService.json
 create mode 100644 data/as/8320434/egov-location/boundary-data.json
 create mode 100644 data/as/8320434/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8320434/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8325212/BillingService/BusinessService.json
 create mode 100644 data/as/8325212/egov-location/boundary-data.json
 create mode 100644 data/as/8325212/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8325212/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8326277/BillingService/BusinessService.json
 create mode 100644 data/as/8326277/egov-location/boundary-data.json
 create mode 100644 data/as/8326277/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8326277/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8326909/BillingService/BusinessService.json
 create mode 100644 data/as/8326909/egov-location/boundary-data.json
 create mode 100644 data/as/8326909/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8326909/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/8365758/BillingService/BusinessService.json
 create mode 100644 data/as/8365758/egov-location/boundary-data.json
 create mode 100644 data/as/8365758/ws-services-calculation/Penalty.json
 create mode 100644 data/as/8365758/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/30001504/BillingService/BusinessService.json b/data/as/30001504/BillingService/BusinessService.json
new file mode 100644
index 0000000000..96f1ff3a46
--- /dev/null
+++ b/data/as/30001504/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30001504",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30001504/egov-location/boundary-data.json b/data/as/30001504/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e42d70527
--- /dev/null
+++ b/data/as/30001504/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30001504",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 GHOGORA T.E. PWSS",
+                "localname": "NO.1 GHOGORA T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30001504",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 GHOGORA T.E. PWSS",
+                        "localname": "NO.1 GHOGORA T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 GHOGORA T.E. PWSS",
+                "localname": "NO.1 GHOGORA T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30001504",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 GHOGORA T.E. PWSS",
+                        "localname": "NO.1 GHOGORA T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30001504/ws-services-calculation/Penalty.json b/data/as/30001504/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..acbd483959
--- /dev/null
+++ b/data/as/30001504/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30001504",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30001504/ws-services-calculation/WCBillingSlab.json b/data/as/30001504/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..90b4e364e3
--- /dev/null
+++ b/data/as/30001504/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30001504",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002704/BillingService/BusinessService.json b/data/as/30002704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f10ebc91e
--- /dev/null
+++ b/data/as/30002704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30002704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002704/egov-location/boundary-data.json b/data/as/30002704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71bbf86f48
--- /dev/null
+++ b/data/as/30002704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30002704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABARI PWSS",
+                "localname": "KOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABARI PWSS",
+                        "localname": "KOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABARI PWSS",
+                "localname": "KOLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABARI PWSS",
+                        "localname": "KOLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002704/ws-services-calculation/Penalty.json b/data/as/30002704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83b0044d4e
--- /dev/null
+++ b/data/as/30002704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30002704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002704/ws-services-calculation/WCBillingSlab.json b/data/as/30002704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17f4782265
--- /dev/null
+++ b/data/as/30002704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30002704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002810/BillingService/BusinessService.json b/data/as/30002810/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9aeccf351d
--- /dev/null
+++ b/data/as/30002810/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30002810",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002810/egov-location/boundary-data.json b/data/as/30002810/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2d15187da7
--- /dev/null
+++ b/data/as/30002810/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30002810",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 AMARIBARI TE PWSS",
+                "localname": "NO. 1 AMARIBARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 AMARIBARI TE PWSS",
+                        "localname": "NO. 1 AMARIBARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 AMARIBARI TE PWSS",
+                "localname": "NO. 1 AMARIBARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 AMARIBARI TE PWSS",
+                        "localname": "NO. 1 AMARIBARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002810/ws-services-calculation/Penalty.json b/data/as/30002810/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6fb1ae6721
--- /dev/null
+++ b/data/as/30002810/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30002810",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002810/ws-services-calculation/WCBillingSlab.json b/data/as/30002810/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8edff933c4
--- /dev/null
+++ b/data/as/30002810/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30002810",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002848/BillingService/BusinessService.json b/data/as/30002848/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9fec707ced
--- /dev/null
+++ b/data/as/30002848/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30002848",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002848/egov-location/boundary-data.json b/data/as/30002848/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c6769d170
--- /dev/null
+++ b/data/as/30002848/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30002848",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARPAT GAON PWSS",
+                "localname": "BARPAT GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARPAT GAON PWSS",
+                        "localname": "BARPAT GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARPAT GAON PWSS",
+                "localname": "BARPAT GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARPAT GAON PWSS",
+                        "localname": "BARPAT GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002848/ws-services-calculation/Penalty.json b/data/as/30002848/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf3ae4f042
--- /dev/null
+++ b/data/as/30002848/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30002848",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002848/ws-services-calculation/WCBillingSlab.json b/data/as/30002848/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..53deebda91
--- /dev/null
+++ b/data/as/30002848/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30002848",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002858/BillingService/BusinessService.json b/data/as/30002858/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae00582eb9
--- /dev/null
+++ b/data/as/30002858/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30002858",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002858/egov-location/boundary-data.json b/data/as/30002858/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b19a4ddd4f
--- /dev/null
+++ b/data/as/30002858/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30002858",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHORAMORA PWSS",
+                "localname": "GHORAMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002858",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHORAMORA PWSS",
+                        "localname": "GHORAMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHORAMORA PWSS",
+                "localname": "GHORAMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30002858",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHORAMORA PWSS",
+                        "localname": "GHORAMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002858/ws-services-calculation/Penalty.json b/data/as/30002858/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ff2ae575b9
--- /dev/null
+++ b/data/as/30002858/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30002858",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30002858/ws-services-calculation/WCBillingSlab.json b/data/as/30002858/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d604bcc250
--- /dev/null
+++ b/data/as/30002858/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30002858",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003558/BillingService/BusinessService.json b/data/as/30003558/BillingService/BusinessService.json
new file mode 100644
index 0000000000..96297c1405
--- /dev/null
+++ b/data/as/30003558/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30003558",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003558/egov-location/boundary-data.json b/data/as/30003558/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bd9a974809
--- /dev/null
+++ b/data/as/30003558/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30003558",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 KATHALGURI TE PWSS",
+                "localname": "NO. 1 KATHALGURI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003558",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 KATHALGURI TE PWSS",
+                        "localname": "NO. 1 KATHALGURI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 KATHALGURI TE PWSS",
+                "localname": "NO. 1 KATHALGURI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003558",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 KATHALGURI TE PWSS",
+                        "localname": "NO. 1 KATHALGURI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003558/ws-services-calculation/Penalty.json b/data/as/30003558/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3d21b6c198
--- /dev/null
+++ b/data/as/30003558/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30003558",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003558/ws-services-calculation/WCBillingSlab.json b/data/as/30003558/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fe44c73be
--- /dev/null
+++ b/data/as/30003558/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30003558",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003616/BillingService/BusinessService.json b/data/as/30003616/BillingService/BusinessService.json
new file mode 100644
index 0000000000..761be17cc1
--- /dev/null
+++ b/data/as/30003616/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30003616",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003616/egov-location/boundary-data.json b/data/as/30003616/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6889da4925
--- /dev/null
+++ b/data/as/30003616/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30003616",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKOLA PWSS",
+                "localname": "BAKOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003616",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKOLA PWSS",
+                        "localname": "BAKOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKOLA PWSS",
+                "localname": "BAKOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003616",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKOLA PWSS",
+                        "localname": "BAKOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003616/ws-services-calculation/Penalty.json b/data/as/30003616/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..925d3aada8
--- /dev/null
+++ b/data/as/30003616/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30003616",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003616/ws-services-calculation/WCBillingSlab.json b/data/as/30003616/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21e4f9fbf6
--- /dev/null
+++ b/data/as/30003616/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30003616",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003640/BillingService/BusinessService.json b/data/as/30003640/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fff06c6305
--- /dev/null
+++ b/data/as/30003640/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30003640",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003640/egov-location/boundary-data.json b/data/as/30003640/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9ce1fffed8
--- /dev/null
+++ b/data/as/30003640/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30003640",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HARIGAON NO. 1 PWSS",
+                "localname": "NEW HARIGAON NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003640",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HARIGAON NO. 1 PWSS",
+                        "localname": "NEW HARIGAON NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HARIGAON NO. 1 PWSS",
+                "localname": "NEW HARIGAON NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003640",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HARIGAON NO. 1 PWSS",
+                        "localname": "NEW HARIGAON NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003640/ws-services-calculation/Penalty.json b/data/as/30003640/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4c93d2df84
--- /dev/null
+++ b/data/as/30003640/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30003640",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003640/ws-services-calculation/WCBillingSlab.json b/data/as/30003640/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c82e7a0b1
--- /dev/null
+++ b/data/as/30003640/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30003640",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003730/BillingService/BusinessService.json b/data/as/30003730/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ce04bd5f4
--- /dev/null
+++ b/data/as/30003730/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30003730",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003730/egov-location/boundary-data.json b/data/as/30003730/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3c46670bf1
--- /dev/null
+++ b/data/as/30003730/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30003730",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 NAHARANI TE PWSS",
+                "localname": "NO. 3 NAHARANI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003730",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 NAHARANI TE PWSS",
+                        "localname": "NO. 3 NAHARANI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 NAHARANI TE PWSS",
+                "localname": "NO. 3 NAHARANI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003730",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 NAHARANI TE PWSS",
+                        "localname": "NO. 3 NAHARANI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003730/ws-services-calculation/Penalty.json b/data/as/30003730/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5887488905
--- /dev/null
+++ b/data/as/30003730/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30003730",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003730/ws-services-calculation/WCBillingSlab.json b/data/as/30003730/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..182e41268d
--- /dev/null
+++ b/data/as/30003730/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30003730",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003828/BillingService/BusinessService.json b/data/as/30003828/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e2f392226
--- /dev/null
+++ b/data/as/30003828/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30003828",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003828/egov-location/boundary-data.json b/data/as/30003828/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a49195793a
--- /dev/null
+++ b/data/as/30003828/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30003828",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                "localname": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                        "localname": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                "localname": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                        "localname": "NO 2 DIBRUDARANG BAGAN (PART - A)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003828/ws-services-calculation/Penalty.json b/data/as/30003828/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b07d878983
--- /dev/null
+++ b/data/as/30003828/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30003828",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003828/ws-services-calculation/WCBillingSlab.json b/data/as/30003828/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca8568999a
--- /dev/null
+++ b/data/as/30003828/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30003828",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003829/BillingService/BusinessService.json b/data/as/30003829/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f98d56d66
--- /dev/null
+++ b/data/as/30003829/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30003829",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003829/egov-location/boundary-data.json b/data/as/30003829/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ba2b63a65
--- /dev/null
+++ b/data/as/30003829/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30003829",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                "localname": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003829",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                        "localname": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                "localname": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30003829",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                        "localname": "NO.1 DIBRU DARRANG(PART-A) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003829/ws-services-calculation/Penalty.json b/data/as/30003829/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..351e14e9dd
--- /dev/null
+++ b/data/as/30003829/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30003829",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30003829/ws-services-calculation/WCBillingSlab.json b/data/as/30003829/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f01c13f8b4
--- /dev/null
+++ b/data/as/30003829/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30003829",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004161/BillingService/BusinessService.json b/data/as/30004161/BillingService/BusinessService.json
new file mode 100644
index 0000000000..30132fda90
--- /dev/null
+++ b/data/as/30004161/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004161",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004161/egov-location/boundary-data.json b/data/as/30004161/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0dfae88b4a
--- /dev/null
+++ b/data/as/30004161/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004161",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 SINGRI BAGAN PWSS",
+                "localname": "NO.4 SINGRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004161",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 SINGRI BAGAN PWSS",
+                        "localname": "NO.4 SINGRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 SINGRI BAGAN PWSS",
+                "localname": "NO.4 SINGRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004161",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 SINGRI BAGAN PWSS",
+                        "localname": "NO.4 SINGRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004161/ws-services-calculation/Penalty.json b/data/as/30004161/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f04521088
--- /dev/null
+++ b/data/as/30004161/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004161",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004161/ws-services-calculation/WCBillingSlab.json b/data/as/30004161/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..226b6385b3
--- /dev/null
+++ b/data/as/30004161/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004161",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004629/BillingService/BusinessService.json b/data/as/30004629/BillingService/BusinessService.json
new file mode 100644
index 0000000000..283d15d567
--- /dev/null
+++ b/data/as/30004629/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004629",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004629/egov-location/boundary-data.json b/data/as/30004629/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5188009e99
--- /dev/null
+++ b/data/as/30004629/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004629",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": " BHARALI CHAPORI NO. 2 PWSS",
+                "localname": " BHARALI CHAPORI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": " BHARALI CHAPORI NO. 2 PWSS",
+                        "localname": " BHARALI CHAPORI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": " BHARALI CHAPORI NO. 2 PWSS",
+                "localname": " BHARALI CHAPORI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": " BHARALI CHAPORI NO. 2 PWSS",
+                        "localname": " BHARALI CHAPORI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004629/ws-services-calculation/Penalty.json b/data/as/30004629/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..91c8de5f5a
--- /dev/null
+++ b/data/as/30004629/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004629",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004629/ws-services-calculation/WCBillingSlab.json b/data/as/30004629/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac76856a97
--- /dev/null
+++ b/data/as/30004629/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004629",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004648/BillingService/BusinessService.json b/data/as/30004648/BillingService/BusinessService.json
new file mode 100644
index 0000000000..536cf50d4c
--- /dev/null
+++ b/data/as/30004648/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004648",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004648/egov-location/boundary-data.json b/data/as/30004648/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dc939d089f
--- /dev/null
+++ b/data/as/30004648/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004648",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALANY TE PWSS",
+                "localname": "KALANY TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALANY TE PWSS",
+                        "localname": "KALANY TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALANY TE PWSS",
+                "localname": "KALANY TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALANY TE PWSS",
+                        "localname": "KALANY TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004648/ws-services-calculation/Penalty.json b/data/as/30004648/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cdea37ed4d
--- /dev/null
+++ b/data/as/30004648/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004648",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004648/ws-services-calculation/WCBillingSlab.json b/data/as/30004648/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b8fec4f08c
--- /dev/null
+++ b/data/as/30004648/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004648",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004669/BillingService/BusinessService.json b/data/as/30004669/BillingService/BusinessService.json
new file mode 100644
index 0000000000..200de0ff4d
--- /dev/null
+++ b/data/as/30004669/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004669",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004669/egov-location/boundary-data.json b/data/as/30004669/egov-location/boundary-data.json
new file mode 100644
index 0000000000..25640562b4
--- /dev/null
+++ b/data/as/30004669/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004669",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 KALANI PWSS",
+                "localname": "NO. 1 KALANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004669",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 KALANI PWSS",
+                        "localname": "NO. 1 KALANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 KALANI PWSS",
+                "localname": "NO. 1 KALANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004669",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 KALANI PWSS",
+                        "localname": "NO. 1 KALANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004669/ws-services-calculation/Penalty.json b/data/as/30004669/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d289ef26e
--- /dev/null
+++ b/data/as/30004669/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004669",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004669/ws-services-calculation/WCBillingSlab.json b/data/as/30004669/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04b2707657
--- /dev/null
+++ b/data/as/30004669/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004669",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004691/BillingService/BusinessService.json b/data/as/30004691/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ddca9de0d7
--- /dev/null
+++ b/data/as/30004691/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004691",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004691/egov-location/boundary-data.json b/data/as/30004691/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ccefb42429
--- /dev/null
+++ b/data/as/30004691/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004691",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 PANIPOTA PWSS",
+                "localname": "NO. 2 PANIPOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 PANIPOTA PWSS",
+                        "localname": "NO. 2 PANIPOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 PANIPOTA PWSS",
+                "localname": "NO. 2 PANIPOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 PANIPOTA PWSS",
+                        "localname": "NO. 2 PANIPOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004691/ws-services-calculation/Penalty.json b/data/as/30004691/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..02b82efadb
--- /dev/null
+++ b/data/as/30004691/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004691",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004691/ws-services-calculation/WCBillingSlab.json b/data/as/30004691/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..266263f947
--- /dev/null
+++ b/data/as/30004691/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004691",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004720/BillingService/BusinessService.json b/data/as/30004720/BillingService/BusinessService.json
new file mode 100644
index 0000000000..972af67124
--- /dev/null
+++ b/data/as/30004720/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004720",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004720/egov-location/boundary-data.json b/data/as/30004720/egov-location/boundary-data.json
new file mode 100644
index 0000000000..793be26eb6
--- /dev/null
+++ b/data/as/30004720/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004720",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELOWATER GAON PWSS",
+                "localname": "BHELOWATER GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELOWATER GAON PWSS",
+                        "localname": "BHELOWATER GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELOWATER GAON PWSS",
+                "localname": "BHELOWATER GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELOWATER GAON PWSS",
+                        "localname": "BHELOWATER GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004720/ws-services-calculation/Penalty.json b/data/as/30004720/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64463e92bb
--- /dev/null
+++ b/data/as/30004720/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004720",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004720/ws-services-calculation/WCBillingSlab.json b/data/as/30004720/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21d3a51089
--- /dev/null
+++ b/data/as/30004720/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004720",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004770/BillingService/BusinessService.json b/data/as/30004770/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70acf95bf4
--- /dev/null
+++ b/data/as/30004770/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004770",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004770/egov-location/boundary-data.json b/data/as/30004770/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12c2abcb69
--- /dev/null
+++ b/data/as/30004770/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004770",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHARALI CHAPORI PWSS",
+                "localname": "NEW BHARALI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004770",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHARALI CHAPORI PWSS",
+                        "localname": "NEW BHARALI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHARALI CHAPORI PWSS",
+                "localname": "NEW BHARALI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004770",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHARALI CHAPORI PWSS",
+                        "localname": "NEW BHARALI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004770/ws-services-calculation/Penalty.json b/data/as/30004770/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5795998565
--- /dev/null
+++ b/data/as/30004770/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004770",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004770/ws-services-calculation/WCBillingSlab.json b/data/as/30004770/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5798bf755
--- /dev/null
+++ b/data/as/30004770/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004770",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004793/BillingService/BusinessService.json b/data/as/30004793/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2420d65330
--- /dev/null
+++ b/data/as/30004793/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004793",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004793/egov-location/boundary-data.json b/data/as/30004793/egov-location/boundary-data.json
new file mode 100644
index 0000000000..babc4d2f19
--- /dev/null
+++ b/data/as/30004793/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004793",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIPOTA TE PWSS",
+                "localname": "PANIPOTA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIPOTA TE PWSS",
+                        "localname": "PANIPOTA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIPOTA TE PWSS",
+                "localname": "PANIPOTA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIPOTA TE PWSS",
+                        "localname": "PANIPOTA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004793/ws-services-calculation/Penalty.json b/data/as/30004793/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6214e3ba43
--- /dev/null
+++ b/data/as/30004793/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004793",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004793/ws-services-calculation/WCBillingSlab.json b/data/as/30004793/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..45487095fa
--- /dev/null
+++ b/data/as/30004793/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004793",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004828/BillingService/BusinessService.json b/data/as/30004828/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5a347463a
--- /dev/null
+++ b/data/as/30004828/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004828",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004828/egov-location/boundary-data.json b/data/as/30004828/egov-location/boundary-data.json
new file mode 100644
index 0000000000..814def4142
--- /dev/null
+++ b/data/as/30004828/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004828",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 BARPATHAR PWSS",
+                "localname": "NO. 1 BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 BARPATHAR PWSS",
+                        "localname": "NO. 1 BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 BARPATHAR PWSS",
+                "localname": "NO. 1 BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 BARPATHAR PWSS",
+                        "localname": "NO. 1 BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004828/ws-services-calculation/Penalty.json b/data/as/30004828/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cdc1028550
--- /dev/null
+++ b/data/as/30004828/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004828",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004828/ws-services-calculation/WCBillingSlab.json b/data/as/30004828/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bee46e3ca8
--- /dev/null
+++ b/data/as/30004828/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004828",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004842/BillingService/BusinessService.json b/data/as/30004842/BillingService/BusinessService.json
new file mode 100644
index 0000000000..96e7e0c69f
--- /dev/null
+++ b/data/as/30004842/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004842",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004842/egov-location/boundary-data.json b/data/as/30004842/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50bfcefedf
--- /dev/null
+++ b/data/as/30004842/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004842",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATAIMARA NO. 2 PWSS",
+                "localname": "GATAIMARA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004842",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATAIMARA NO. 2 PWSS",
+                        "localname": "GATAIMARA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATAIMARA NO. 2 PWSS",
+                "localname": "GATAIMARA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004842",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATAIMARA NO. 2 PWSS",
+                        "localname": "GATAIMARA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004842/ws-services-calculation/Penalty.json b/data/as/30004842/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d04f3fcae
--- /dev/null
+++ b/data/as/30004842/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004842",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004842/ws-services-calculation/WCBillingSlab.json b/data/as/30004842/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b159b61f98
--- /dev/null
+++ b/data/as/30004842/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004842",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004862/BillingService/BusinessService.json b/data/as/30004862/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4a2f127ae6
--- /dev/null
+++ b/data/as/30004862/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004862",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004862/egov-location/boundary-data.json b/data/as/30004862/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4dd962d5fc
--- /dev/null
+++ b/data/as/30004862/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004862",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABAPUR PWSS",
+                "localname": "NABAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004862",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABAPUR PWSS",
+                        "localname": "NABAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABAPUR PWSS",
+                "localname": "NABAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004862",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABAPUR PWSS",
+                        "localname": "NABAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004862/ws-services-calculation/Penalty.json b/data/as/30004862/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7440d9e828
--- /dev/null
+++ b/data/as/30004862/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004862",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004862/ws-services-calculation/WCBillingSlab.json b/data/as/30004862/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04a36634e3
--- /dev/null
+++ b/data/as/30004862/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004862",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004901/BillingService/BusinessService.json b/data/as/30004901/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f101fe5071
--- /dev/null
+++ b/data/as/30004901/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004901",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004901/egov-location/boundary-data.json b/data/as/30004901/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03de827f0d
--- /dev/null
+++ b/data/as/30004901/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004901",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHOGIA NO.1",
+                "localname": "BORBHOGIA NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHOGIA NO.1",
+                        "localname": "BORBHOGIA NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHOGIA NO.1",
+                "localname": "BORBHOGIA NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHOGIA NO.1",
+                        "localname": "BORBHOGIA NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004901/ws-services-calculation/Penalty.json b/data/as/30004901/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e814e6a03b
--- /dev/null
+++ b/data/as/30004901/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004901",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004901/ws-services-calculation/WCBillingSlab.json b/data/as/30004901/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0d0bcbe829
--- /dev/null
+++ b/data/as/30004901/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004901",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004921/BillingService/BusinessService.json b/data/as/30004921/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1d2d09f221
--- /dev/null
+++ b/data/as/30004921/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004921",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004921/egov-location/boundary-data.json b/data/as/30004921/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d0adde3bcc
--- /dev/null
+++ b/data/as/30004921/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004921",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGA HILOI GAON PWSS",
+                "localname": "CHENGA HILOI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004921",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGA HILOI GAON PWSS",
+                        "localname": "CHENGA HILOI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGA HILOI GAON PWSS",
+                "localname": "CHENGA HILOI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004921",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGA HILOI GAON PWSS",
+                        "localname": "CHENGA HILOI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004921/ws-services-calculation/Penalty.json b/data/as/30004921/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..16698a721e
--- /dev/null
+++ b/data/as/30004921/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004921",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004921/ws-services-calculation/WCBillingSlab.json b/data/as/30004921/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e8da3931f5
--- /dev/null
+++ b/data/as/30004921/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004921",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004976/BillingService/BusinessService.json b/data/as/30004976/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b34706d8a
--- /dev/null
+++ b/data/as/30004976/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004976",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004976/egov-location/boundary-data.json b/data/as/30004976/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5f6735cf6
--- /dev/null
+++ b/data/as/30004976/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004976",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.5 SINGRI BAGAN PWSS",
+                "localname": "NO.5 SINGRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004976",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.5 SINGRI BAGAN PWSS",
+                        "localname": "NO.5 SINGRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.5 SINGRI BAGAN PWSS",
+                "localname": "NO.5 SINGRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004976",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.5 SINGRI BAGAN PWSS",
+                        "localname": "NO.5 SINGRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004976/ws-services-calculation/Penalty.json b/data/as/30004976/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8029d0315f
--- /dev/null
+++ b/data/as/30004976/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004976",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004976/ws-services-calculation/WCBillingSlab.json b/data/as/30004976/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..92ca9f04e6
--- /dev/null
+++ b/data/as/30004976/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004976",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004991/BillingService/BusinessService.json b/data/as/30004991/BillingService/BusinessService.json
new file mode 100644
index 0000000000..521f78cf17
--- /dev/null
+++ b/data/as/30004991/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004991",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004991/egov-location/boundary-data.json b/data/as/30004991/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cdfcb5f8b8
--- /dev/null
+++ b/data/as/30004991/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004991",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORGHOP PWSS",
+                "localname": "BORGHOP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004991",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORGHOP PWSS",
+                        "localname": "BORGHOP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORGHOP PWSS",
+                "localname": "BORGHOP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004991",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORGHOP PWSS",
+                        "localname": "BORGHOP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004991/ws-services-calculation/Penalty.json b/data/as/30004991/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6b877e9843
--- /dev/null
+++ b/data/as/30004991/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004991",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004991/ws-services-calculation/WCBillingSlab.json b/data/as/30004991/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..023ab5de52
--- /dev/null
+++ b/data/as/30004991/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004991",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004999/BillingService/BusinessService.json b/data/as/30004999/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9ab8e9ca1f
--- /dev/null
+++ b/data/as/30004999/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30004999",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004999/egov-location/boundary-data.json b/data/as/30004999/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1501dda932
--- /dev/null
+++ b/data/as/30004999/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30004999",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 FAIZABAD PWSS",
+                "localname": "NO.2 FAIZABAD PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004999",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 FAIZABAD PWSS",
+                        "localname": "NO.2 FAIZABAD PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 FAIZABAD PWSS",
+                "localname": "NO.2 FAIZABAD PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30004999",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 FAIZABAD PWSS",
+                        "localname": "NO.2 FAIZABAD PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004999/ws-services-calculation/Penalty.json b/data/as/30004999/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4a7eab4ad0
--- /dev/null
+++ b/data/as/30004999/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30004999",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30004999/ws-services-calculation/WCBillingSlab.json b/data/as/30004999/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e86242a2e
--- /dev/null
+++ b/data/as/30004999/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30004999",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005115/BillingService/BusinessService.json b/data/as/30005115/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eb85836181
--- /dev/null
+++ b/data/as/30005115/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005115",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005115/egov-location/boundary-data.json b/data/as/30005115/egov-location/boundary-data.json
new file mode 100644
index 0000000000..77c006a6e4
--- /dev/null
+++ b/data/as/30005115/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005115",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARBARI NO.1 PWSS",
+                "localname": "NAHARBARI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARBARI NO.1 PWSS",
+                        "localname": "NAHARBARI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARBARI NO.1 PWSS",
+                "localname": "NAHARBARI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARBARI NO.1 PWSS",
+                        "localname": "NAHARBARI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005115/ws-services-calculation/Penalty.json b/data/as/30005115/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..457d51201b
--- /dev/null
+++ b/data/as/30005115/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005115",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005115/ws-services-calculation/WCBillingSlab.json b/data/as/30005115/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ff0bd6c5e
--- /dev/null
+++ b/data/as/30005115/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005115",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005154/BillingService/BusinessService.json b/data/as/30005154/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3623ba58d1
--- /dev/null
+++ b/data/as/30005154/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005154",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005154/egov-location/boundary-data.json b/data/as/30005154/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47c3930324
--- /dev/null
+++ b/data/as/30005154/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005154",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUJULI PATHAR GAON",
+                "localname": "MANUJULI PATHAR GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005154",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUJULI PATHAR GAON",
+                        "localname": "MANUJULI PATHAR GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUJULI PATHAR GAON",
+                "localname": "MANUJULI PATHAR GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005154",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUJULI PATHAR GAON",
+                        "localname": "MANUJULI PATHAR GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005154/ws-services-calculation/Penalty.json b/data/as/30005154/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f165288e52
--- /dev/null
+++ b/data/as/30005154/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005154",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005154/ws-services-calculation/WCBillingSlab.json b/data/as/30005154/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cab5966fda
--- /dev/null
+++ b/data/as/30005154/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005154",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005283/BillingService/BusinessService.json b/data/as/30005283/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11ad4924e5
--- /dev/null
+++ b/data/as/30005283/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005283",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005283/egov-location/boundary-data.json b/data/as/30005283/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd04feba70
--- /dev/null
+++ b/data/as/30005283/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005283",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI GAON PWSS",
+                "localname": "DHEKIAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI GAON PWSS",
+                        "localname": "DHEKIAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI GAON PWSS",
+                "localname": "DHEKIAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI GAON PWSS",
+                        "localname": "DHEKIAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005283/ws-services-calculation/Penalty.json b/data/as/30005283/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e0bf0d34a
--- /dev/null
+++ b/data/as/30005283/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005283",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005283/ws-services-calculation/WCBillingSlab.json b/data/as/30005283/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fdd6418f5c
--- /dev/null
+++ b/data/as/30005283/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005283",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005412/BillingService/BusinessService.json b/data/as/30005412/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f04fc06fda
--- /dev/null
+++ b/data/as/30005412/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005412",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005412/egov-location/boundary-data.json b/data/as/30005412/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1bbe71e572
--- /dev/null
+++ b/data/as/30005412/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005412",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 FAIJABAD BAGAN PWSS",
+                "localname": "NO.3 FAIJABAD BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005412",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 FAIJABAD BAGAN PWSS",
+                        "localname": "NO.3 FAIJABAD BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 FAIJABAD BAGAN PWSS",
+                "localname": "NO.3 FAIJABAD BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005412",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 FAIJABAD BAGAN PWSS",
+                        "localname": "NO.3 FAIJABAD BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005412/ws-services-calculation/Penalty.json b/data/as/30005412/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1dd6d8eb65
--- /dev/null
+++ b/data/as/30005412/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005412",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005412/ws-services-calculation/WCBillingSlab.json b/data/as/30005412/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f307e013fa
--- /dev/null
+++ b/data/as/30005412/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005412",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005420/BillingService/BusinessService.json b/data/as/30005420/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9dd0dfc12e
--- /dev/null
+++ b/data/as/30005420/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005420",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005420/egov-location/boundary-data.json b/data/as/30005420/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9c797429b8
--- /dev/null
+++ b/data/as/30005420/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005420",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JULIA BAGAN PWSS",
+                "localname": "JULIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JULIA BAGAN PWSS",
+                        "localname": "JULIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JULIA BAGAN PWSS",
+                "localname": "JULIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JULIA BAGAN PWSS",
+                        "localname": "JULIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005420/ws-services-calculation/Penalty.json b/data/as/30005420/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..627b015e5c
--- /dev/null
+++ b/data/as/30005420/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005420",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005420/ws-services-calculation/WCBillingSlab.json b/data/as/30005420/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..519e829c4c
--- /dev/null
+++ b/data/as/30005420/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005420",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005441/BillingService/BusinessService.json b/data/as/30005441/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4efca394be
--- /dev/null
+++ b/data/as/30005441/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005441",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005441/egov-location/boundary-data.json b/data/as/30005441/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eb689e9b46
--- /dev/null
+++ b/data/as/30005441/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005441",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 PANBARI BAGAN PWSS",
+                "localname": "NO.3 PANBARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 PANBARI BAGAN PWSS",
+                        "localname": "NO.3 PANBARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 PANBARI BAGAN PWSS",
+                "localname": "NO.3 PANBARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 PANBARI BAGAN PWSS",
+                        "localname": "NO.3 PANBARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005441/ws-services-calculation/Penalty.json b/data/as/30005441/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..815e56aebc
--- /dev/null
+++ b/data/as/30005441/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005441",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005441/ws-services-calculation/WCBillingSlab.json b/data/as/30005441/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c3fc6bb3a2
--- /dev/null
+++ b/data/as/30005441/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005441",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005445/BillingService/BusinessService.json b/data/as/30005445/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5964d9d9c5
--- /dev/null
+++ b/data/as/30005445/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005445",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005445/egov-location/boundary-data.json b/data/as/30005445/egov-location/boundary-data.json
new file mode 100644
index 0000000000..adb837a16c
--- /dev/null
+++ b/data/as/30005445/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005445",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 HIRAJULI BAGAN",
+                "localname": "NO.2 HIRAJULI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 HIRAJULI BAGAN",
+                        "localname": "NO.2 HIRAJULI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 HIRAJULI BAGAN",
+                "localname": "NO.2 HIRAJULI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 HIRAJULI BAGAN",
+                        "localname": "NO.2 HIRAJULI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005445/ws-services-calculation/Penalty.json b/data/as/30005445/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0952fb9e73
--- /dev/null
+++ b/data/as/30005445/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005445",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005445/ws-services-calculation/WCBillingSlab.json b/data/as/30005445/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..272c61fe60
--- /dev/null
+++ b/data/as/30005445/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005445",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005446/BillingService/BusinessService.json b/data/as/30005446/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e96b793b72
--- /dev/null
+++ b/data/as/30005446/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005446",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005446/egov-location/boundary-data.json b/data/as/30005446/egov-location/boundary-data.json
new file mode 100644
index 0000000000..217ff3f381
--- /dev/null
+++ b/data/as/30005446/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005446",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBASTI NO.1 PWSS",
+                "localname": "PALASHBASTI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBASTI NO.1 PWSS",
+                        "localname": "PALASHBASTI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBASTI NO.1 PWSS",
+                "localname": "PALASHBASTI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBASTI NO.1 PWSS",
+                        "localname": "PALASHBASTI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005446/ws-services-calculation/Penalty.json b/data/as/30005446/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13b9b13d4c
--- /dev/null
+++ b/data/as/30005446/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005446",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005446/ws-services-calculation/WCBillingSlab.json b/data/as/30005446/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aec021c389
--- /dev/null
+++ b/data/as/30005446/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005446",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005536/BillingService/BusinessService.json b/data/as/30005536/BillingService/BusinessService.json
new file mode 100644
index 0000000000..658d808f9e
--- /dev/null
+++ b/data/as/30005536/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005536",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005536/egov-location/boundary-data.json b/data/as/30005536/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b3919bd0b8
--- /dev/null
+++ b/data/as/30005536/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005536",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAPAM NORTH PWSS",
+                "localname": "NAPAM NORTH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAPAM NORTH PWSS",
+                        "localname": "NAPAM NORTH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAPAM NORTH PWSS",
+                "localname": "NAPAM NORTH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAPAM NORTH PWSS",
+                        "localname": "NAPAM NORTH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005536/ws-services-calculation/Penalty.json b/data/as/30005536/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..362f8a4b64
--- /dev/null
+++ b/data/as/30005536/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005536",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005536/ws-services-calculation/WCBillingSlab.json b/data/as/30005536/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e902c0d1e
--- /dev/null
+++ b/data/as/30005536/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005536",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005781/BillingService/BusinessService.json b/data/as/30005781/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8fba8dde00
--- /dev/null
+++ b/data/as/30005781/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005781",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005781/egov-location/boundary-data.json b/data/as/30005781/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ee9a2511d
--- /dev/null
+++ b/data/as/30005781/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005781",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                "localname": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005781",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                        "localname": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                "localname": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005781",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                        "localname": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005781/ws-services-calculation/Penalty.json b/data/as/30005781/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab14c08129
--- /dev/null
+++ b/data/as/30005781/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005781",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005781/ws-services-calculation/WCBillingSlab.json b/data/as/30005781/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b58726477
--- /dev/null
+++ b/data/as/30005781/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005781",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005988/BillingService/BusinessService.json b/data/as/30005988/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe479bf151
--- /dev/null
+++ b/data/as/30005988/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30005988",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005988/egov-location/boundary-data.json b/data/as/30005988/egov-location/boundary-data.json
new file mode 100644
index 0000000000..99e3d6ba79
--- /dev/null
+++ b/data/as/30005988/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30005988",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAI BAGAN",
+                "localname": "DHIRAI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAI BAGAN",
+                        "localname": "DHIRAI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAI BAGAN",
+                "localname": "DHIRAI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30005988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAI BAGAN",
+                        "localname": "DHIRAI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005988/ws-services-calculation/Penalty.json b/data/as/30005988/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b93ddc0643
--- /dev/null
+++ b/data/as/30005988/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30005988",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30005988/ws-services-calculation/WCBillingSlab.json b/data/as/30005988/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4836ef3a4b
--- /dev/null
+++ b/data/as/30005988/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30005988",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006456/BillingService/BusinessService.json b/data/as/30006456/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a9b6d54cc9
--- /dev/null
+++ b/data/as/30006456/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30006456",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006456/egov-location/boundary-data.json b/data/as/30006456/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5af51be189
--- /dev/null
+++ b/data/as/30006456/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30006456",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAKUCHI BAGICHA GAON PWSS",
+                "localname": "KALAKUCHI BAGICHA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30006456",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAKUCHI BAGICHA GAON PWSS",
+                        "localname": "KALAKUCHI BAGICHA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAKUCHI BAGICHA GAON PWSS",
+                "localname": "KALAKUCHI BAGICHA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30006456",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAKUCHI BAGICHA GAON PWSS",
+                        "localname": "KALAKUCHI BAGICHA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006456/ws-services-calculation/Penalty.json b/data/as/30006456/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d154218ea4
--- /dev/null
+++ b/data/as/30006456/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30006456",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006456/ws-services-calculation/WCBillingSlab.json b/data/as/30006456/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0f8dad10eb
--- /dev/null
+++ b/data/as/30006456/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30006456",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006497/BillingService/BusinessService.json b/data/as/30006497/BillingService/BusinessService.json
new file mode 100644
index 0000000000..230ba9d7ec
--- /dev/null
+++ b/data/as/30006497/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30006497",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006497/egov-location/boundary-data.json b/data/as/30006497/egov-location/boundary-data.json
new file mode 100644
index 0000000000..efcf1f3f9c
--- /dev/null
+++ b/data/as/30006497/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30006497",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 TINKHARIA",
+                "localname": "NO. 4 TINKHARIA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30006497",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 TINKHARIA",
+                        "localname": "NO. 4 TINKHARIA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 TINKHARIA",
+                "localname": "NO. 4 TINKHARIA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30006497",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 TINKHARIA",
+                        "localname": "NO. 4 TINKHARIA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006497/ws-services-calculation/Penalty.json b/data/as/30006497/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7aca9f570f
--- /dev/null
+++ b/data/as/30006497/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30006497",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006497/ws-services-calculation/WCBillingSlab.json b/data/as/30006497/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..deeb6c3b6b
--- /dev/null
+++ b/data/as/30006497/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30006497",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006954/BillingService/BusinessService.json b/data/as/30006954/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c9265d293a
--- /dev/null
+++ b/data/as/30006954/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30006954",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006954/egov-location/boundary-data.json b/data/as/30006954/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a07924c1d6
--- /dev/null
+++ b/data/as/30006954/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30006954",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                "localname": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30006954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                        "localname": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                "localname": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30006954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                        "localname": "BHALUKEKHOWA KAMARCHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006954/ws-services-calculation/Penalty.json b/data/as/30006954/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..182b9e9039
--- /dev/null
+++ b/data/as/30006954/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30006954",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30006954/ws-services-calculation/WCBillingSlab.json b/data/as/30006954/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..746dff236a
--- /dev/null
+++ b/data/as/30006954/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30006954",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007373/BillingService/BusinessService.json b/data/as/30007373/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dff047bec
--- /dev/null
+++ b/data/as/30007373/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30007373",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007373/egov-location/boundary-data.json b/data/as/30007373/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7d0d65196c
--- /dev/null
+++ b/data/as/30007373/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30007373",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNPUKHURI NO 2 PWSS",
+                "localname": "BAMUNPUKHURI NO 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30007373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNPUKHURI NO 2 PWSS",
+                        "localname": "BAMUNPUKHURI NO 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNPUKHURI NO 2 PWSS",
+                "localname": "BAMUNPUKHURI NO 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30007373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNPUKHURI NO 2 PWSS",
+                        "localname": "BAMUNPUKHURI NO 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007373/ws-services-calculation/Penalty.json b/data/as/30007373/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6ba81e72cf
--- /dev/null
+++ b/data/as/30007373/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30007373",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007373/ws-services-calculation/WCBillingSlab.json b/data/as/30007373/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f825223341
--- /dev/null
+++ b/data/as/30007373/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30007373",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007375/BillingService/BusinessService.json b/data/as/30007375/BillingService/BusinessService.json
new file mode 100644
index 0000000000..085304813e
--- /dev/null
+++ b/data/as/30007375/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30007375",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007375/egov-location/boundary-data.json b/data/as/30007375/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac246b4bab
--- /dev/null
+++ b/data/as/30007375/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30007375",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI 3-A",
+                "localname": "SOPAI 3-A",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30007375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI 3-A",
+                        "localname": "SOPAI 3-A",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI 3-A",
+                "localname": "SOPAI 3-A",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30007375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI 3-A",
+                        "localname": "SOPAI 3-A",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007375/ws-services-calculation/Penalty.json b/data/as/30007375/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90c9c4c908
--- /dev/null
+++ b/data/as/30007375/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30007375",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30007375/ws-services-calculation/WCBillingSlab.json b/data/as/30007375/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7d72d26bf2
--- /dev/null
+++ b/data/as/30007375/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30007375",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009532/BillingService/BusinessService.json b/data/as/30009532/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0a36ac285e
--- /dev/null
+++ b/data/as/30009532/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30009532",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009532/egov-location/boundary-data.json b/data/as/30009532/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a724e6fb0
--- /dev/null
+++ b/data/as/30009532/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30009532",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "1 NO. HUGRAJULI BAGAN",
+                "localname": "1 NO. HUGRAJULI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30009532",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "1 NO. HUGRAJULI BAGAN",
+                        "localname": "1 NO. HUGRAJULI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "1 NO. HUGRAJULI BAGAN",
+                "localname": "1 NO. HUGRAJULI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30009532",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "1 NO. HUGRAJULI BAGAN",
+                        "localname": "1 NO. HUGRAJULI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009532/ws-services-calculation/Penalty.json b/data/as/30009532/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..214fda69ba
--- /dev/null
+++ b/data/as/30009532/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30009532",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009532/ws-services-calculation/WCBillingSlab.json b/data/as/30009532/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d7cf098d3
--- /dev/null
+++ b/data/as/30009532/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30009532",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009627/BillingService/BusinessService.json b/data/as/30009627/BillingService/BusinessService.json
new file mode 100644
index 0000000000..122035a504
--- /dev/null
+++ b/data/as/30009627/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30009627",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009627/egov-location/boundary-data.json b/data/as/30009627/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc711a8d95
--- /dev/null
+++ b/data/as/30009627/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30009627",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW SINGRIJAN TE PWSS",
+                "localname": "NEW SINGRIJAN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30009627",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW SINGRIJAN TE PWSS",
+                        "localname": "NEW SINGRIJAN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW SINGRIJAN TE PWSS",
+                "localname": "NEW SINGRIJAN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30009627",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW SINGRIJAN TE PWSS",
+                        "localname": "NEW SINGRIJAN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009627/ws-services-calculation/Penalty.json b/data/as/30009627/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..334acc01a5
--- /dev/null
+++ b/data/as/30009627/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30009627",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30009627/ws-services-calculation/WCBillingSlab.json b/data/as/30009627/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a7e997b3a4
--- /dev/null
+++ b/data/as/30009627/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30009627",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010046/BillingService/BusinessService.json b/data/as/30010046/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b19692673f
--- /dev/null
+++ b/data/as/30010046/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010046",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010046/egov-location/boundary-data.json b/data/as/30010046/egov-location/boundary-data.json
new file mode 100644
index 0000000000..edc7e41e6a
--- /dev/null
+++ b/data/as/30010046/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010046",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 PANIPOTA TE PWSS",
+                "localname": "NO. 1 PANIPOTA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010046",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 PANIPOTA TE PWSS",
+                        "localname": "NO. 1 PANIPOTA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 PANIPOTA TE PWSS",
+                "localname": "NO. 1 PANIPOTA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010046",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 PANIPOTA TE PWSS",
+                        "localname": "NO. 1 PANIPOTA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010046/ws-services-calculation/Penalty.json b/data/as/30010046/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..66253c54cd
--- /dev/null
+++ b/data/as/30010046/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010046",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010046/ws-services-calculation/WCBillingSlab.json b/data/as/30010046/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ff199cbd1
--- /dev/null
+++ b/data/as/30010046/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010046",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010156/BillingService/BusinessService.json b/data/as/30010156/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9ade740d9
--- /dev/null
+++ b/data/as/30010156/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010156",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010156/egov-location/boundary-data.json b/data/as/30010156/egov-location/boundary-data.json
new file mode 100644
index 0000000000..28cd590e3e
--- /dev/null
+++ b/data/as/30010156/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010156",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMOTA A PWSS",
+                "localname": "BORMOTA A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010156",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMOTA A PWSS",
+                        "localname": "BORMOTA A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMOTA A PWSS",
+                "localname": "BORMOTA A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010156",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMOTA A PWSS",
+                        "localname": "BORMOTA A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010156/ws-services-calculation/Penalty.json b/data/as/30010156/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b20c95107
--- /dev/null
+++ b/data/as/30010156/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010156",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010156/ws-services-calculation/WCBillingSlab.json b/data/as/30010156/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3fdc81738f
--- /dev/null
+++ b/data/as/30010156/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010156",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010193/BillingService/BusinessService.json b/data/as/30010193/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1bfdeca58e
--- /dev/null
+++ b/data/as/30010193/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010193",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010193/egov-location/boundary-data.json b/data/as/30010193/egov-location/boundary-data.json
new file mode 100644
index 0000000000..127be88529
--- /dev/null
+++ b/data/as/30010193/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010193",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERELUA CHUK PWSS",
+                "localname": "GERELUA CHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERELUA CHUK PWSS",
+                        "localname": "GERELUA CHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERELUA CHUK PWSS",
+                "localname": "GERELUA CHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERELUA CHUK PWSS",
+                        "localname": "GERELUA CHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010193/ws-services-calculation/Penalty.json b/data/as/30010193/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56b9e1e907
--- /dev/null
+++ b/data/as/30010193/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010193",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010193/ws-services-calculation/WCBillingSlab.json b/data/as/30010193/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e598fbfcf9
--- /dev/null
+++ b/data/as/30010193/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010193",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010223/BillingService/BusinessService.json b/data/as/30010223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6133172df6
--- /dev/null
+++ b/data/as/30010223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010223/egov-location/boundary-data.json b/data/as/30010223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed4f460541
--- /dev/null
+++ b/data/as/30010223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 BARPATHAR PWSS",
+                "localname": "NO. 2 BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 BARPATHAR PWSS",
+                        "localname": "NO. 2 BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 BARPATHAR PWSS",
+                "localname": "NO. 2 BARPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 BARPATHAR PWSS",
+                        "localname": "NO. 2 BARPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010223/ws-services-calculation/Penalty.json b/data/as/30010223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fed2a396e3
--- /dev/null
+++ b/data/as/30010223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010223/ws-services-calculation/WCBillingSlab.json b/data/as/30010223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e8a8ea42a
--- /dev/null
+++ b/data/as/30010223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010291/BillingService/BusinessService.json b/data/as/30010291/BillingService/BusinessService.json
new file mode 100644
index 0000000000..77ef671c2f
--- /dev/null
+++ b/data/as/30010291/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010291",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010291/egov-location/boundary-data.json b/data/as/30010291/egov-location/boundary-data.json
new file mode 100644
index 0000000000..90d4cdaa95
--- /dev/null
+++ b/data/as/30010291/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010291",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW UDMARI PWSS",
+                "localname": "NEW UDMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010291",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW UDMARI PWSS",
+                        "localname": "NEW UDMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW UDMARI PWSS",
+                "localname": "NEW UDMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010291",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW UDMARI PWSS",
+                        "localname": "NEW UDMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010291/ws-services-calculation/Penalty.json b/data/as/30010291/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..38567681a5
--- /dev/null
+++ b/data/as/30010291/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010291",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010291/ws-services-calculation/WCBillingSlab.json b/data/as/30010291/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7621c9d944
--- /dev/null
+++ b/data/as/30010291/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010291",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010494/BillingService/BusinessService.json b/data/as/30010494/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7bcc0e5be8
--- /dev/null
+++ b/data/as/30010494/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010494",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010494/egov-location/boundary-data.json b/data/as/30010494/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3979fad775
--- /dev/null
+++ b/data/as/30010494/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010494",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 NARAYANPUR BAGAN PWSS",
+                "localname": "NO. 3 NARAYANPUR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010494",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 NARAYANPUR BAGAN PWSS",
+                        "localname": "NO. 3 NARAYANPUR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 NARAYANPUR BAGAN PWSS",
+                "localname": "NO. 3 NARAYANPUR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010494",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 NARAYANPUR BAGAN PWSS",
+                        "localname": "NO. 3 NARAYANPUR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010494/ws-services-calculation/Penalty.json b/data/as/30010494/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cfe0c55da5
--- /dev/null
+++ b/data/as/30010494/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010494",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010494/ws-services-calculation/WCBillingSlab.json b/data/as/30010494/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad115bb0ec
--- /dev/null
+++ b/data/as/30010494/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010494",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010625/BillingService/BusinessService.json b/data/as/30010625/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3303740c52
--- /dev/null
+++ b/data/as/30010625/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010625",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010625/egov-location/boundary-data.json b/data/as/30010625/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f751e927c4
--- /dev/null
+++ b/data/as/30010625/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010625",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                "localname": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010625",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                        "localname": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                "localname": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010625",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                        "localname": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010625/ws-services-calculation/Penalty.json b/data/as/30010625/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9522844911
--- /dev/null
+++ b/data/as/30010625/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010625",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010625/ws-services-calculation/WCBillingSlab.json b/data/as/30010625/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..879435cdad
--- /dev/null
+++ b/data/as/30010625/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010625",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010634/BillingService/BusinessService.json b/data/as/30010634/BillingService/BusinessService.json
new file mode 100644
index 0000000000..139648c000
--- /dev/null
+++ b/data/as/30010634/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010634",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010634/egov-location/boundary-data.json b/data/as/30010634/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f6a97a817e
--- /dev/null
+++ b/data/as/30010634/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010634",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBIL PATHAR PWSS",
+                "localname": "BORBIL PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBIL PATHAR PWSS",
+                        "localname": "BORBIL PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBIL PATHAR PWSS",
+                "localname": "BORBIL PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBIL PATHAR PWSS",
+                        "localname": "BORBIL PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010634/ws-services-calculation/Penalty.json b/data/as/30010634/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f283b503d4
--- /dev/null
+++ b/data/as/30010634/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010634",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010634/ws-services-calculation/WCBillingSlab.json b/data/as/30010634/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8860a5ae16
--- /dev/null
+++ b/data/as/30010634/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010634",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010783/BillingService/BusinessService.json b/data/as/30010783/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d1ddd47579
--- /dev/null
+++ b/data/as/30010783/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010783",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010783/egov-location/boundary-data.json b/data/as/30010783/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3c299de9ef
--- /dev/null
+++ b/data/as/30010783/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010783",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 NAMGAON T.E. PWSS",
+                "localname": "NO. 2 NAMGAON T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 NAMGAON T.E. PWSS",
+                        "localname": "NO. 2 NAMGAON T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 NAMGAON T.E. PWSS",
+                "localname": "NO. 2 NAMGAON T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 NAMGAON T.E. PWSS",
+                        "localname": "NO. 2 NAMGAON T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010783/ws-services-calculation/Penalty.json b/data/as/30010783/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e391bec12b
--- /dev/null
+++ b/data/as/30010783/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010783",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010783/ws-services-calculation/WCBillingSlab.json b/data/as/30010783/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42d51d85dc
--- /dev/null
+++ b/data/as/30010783/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010783",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010828/BillingService/BusinessService.json b/data/as/30010828/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0798f6ada4
--- /dev/null
+++ b/data/as/30010828/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30010828",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010828/egov-location/boundary-data.json b/data/as/30010828/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b31ad4269
--- /dev/null
+++ b/data/as/30010828/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30010828",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 SINGARI BAGAN PWSS",
+                "localname": "NO.2 SINGARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 SINGARI BAGAN PWSS",
+                        "localname": "NO.2 SINGARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 SINGARI BAGAN PWSS",
+                "localname": "NO.2 SINGARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30010828",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 SINGARI BAGAN PWSS",
+                        "localname": "NO.2 SINGARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010828/ws-services-calculation/Penalty.json b/data/as/30010828/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8bce20d304
--- /dev/null
+++ b/data/as/30010828/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30010828",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30010828/ws-services-calculation/WCBillingSlab.json b/data/as/30010828/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..533a38baa6
--- /dev/null
+++ b/data/as/30010828/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30010828",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011048/BillingService/BusinessService.json b/data/as/30011048/BillingService/BusinessService.json
new file mode 100644
index 0000000000..71384bb656
--- /dev/null
+++ b/data/as/30011048/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011048",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011048/egov-location/boundary-data.json b/data/as/30011048/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3c30df016
--- /dev/null
+++ b/data/as/30011048/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011048",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN BENGALI",
+                "localname": "TARAJAN BENGALI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN BENGALI",
+                        "localname": "TARAJAN BENGALI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN BENGALI",
+                "localname": "TARAJAN BENGALI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN BENGALI",
+                        "localname": "TARAJAN BENGALI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011048/ws-services-calculation/Penalty.json b/data/as/30011048/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68e6c5065f
--- /dev/null
+++ b/data/as/30011048/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011048",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011048/ws-services-calculation/WCBillingSlab.json b/data/as/30011048/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91b1313956
--- /dev/null
+++ b/data/as/30011048/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011048",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011084/BillingService/BusinessService.json b/data/as/30011084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aaa1be2282
--- /dev/null
+++ b/data/as/30011084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011084/egov-location/boundary-data.json b/data/as/30011084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3fdaf1781f
--- /dev/null
+++ b/data/as/30011084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANIGAON NO-II PWSS",
+                "localname": "KATANIGAON NO-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANIGAON NO-II PWSS",
+                        "localname": "KATANIGAON NO-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANIGAON NO-II PWSS",
+                "localname": "KATANIGAON NO-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANIGAON NO-II PWSS",
+                        "localname": "KATANIGAON NO-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011084/ws-services-calculation/Penalty.json b/data/as/30011084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95247ee87b
--- /dev/null
+++ b/data/as/30011084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011084/ws-services-calculation/WCBillingSlab.json b/data/as/30011084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c45ca95495
--- /dev/null
+++ b/data/as/30011084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011088/BillingService/BusinessService.json b/data/as/30011088/BillingService/BusinessService.json
new file mode 100644
index 0000000000..67423af662
--- /dev/null
+++ b/data/as/30011088/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011088",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011088/egov-location/boundary-data.json b/data/as/30011088/egov-location/boundary-data.json
new file mode 100644
index 0000000000..488b6d0176
--- /dev/null
+++ b/data/as/30011088/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011088",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MICHAMARI GAON (PT-A)",
+                "localname": "MICHAMARI GAON (PT-A)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MICHAMARI GAON (PT-A)",
+                        "localname": "MICHAMARI GAON (PT-A)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MICHAMARI GAON (PT-A)",
+                "localname": "MICHAMARI GAON (PT-A)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MICHAMARI GAON (PT-A)",
+                        "localname": "MICHAMARI GAON (PT-A)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011088/ws-services-calculation/Penalty.json b/data/as/30011088/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..50df38e8e4
--- /dev/null
+++ b/data/as/30011088/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011088",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011088/ws-services-calculation/WCBillingSlab.json b/data/as/30011088/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b9b3d697a
--- /dev/null
+++ b/data/as/30011088/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011088",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011133/BillingService/BusinessService.json b/data/as/30011133/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a3f76f2701
--- /dev/null
+++ b/data/as/30011133/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011133",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011133/egov-location/boundary-data.json b/data/as/30011133/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd92f33abd
--- /dev/null
+++ b/data/as/30011133/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011133",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANI GAON NO 1",
+                "localname": "KATANI GAON NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANI GAON NO 1",
+                        "localname": "KATANI GAON NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATANI GAON NO 1",
+                "localname": "KATANI GAON NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATANI GAON NO 1",
+                        "localname": "KATANI GAON NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011133/ws-services-calculation/Penalty.json b/data/as/30011133/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d97a4ced8a
--- /dev/null
+++ b/data/as/30011133/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011133",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011133/ws-services-calculation/WCBillingSlab.json b/data/as/30011133/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e28f59208b
--- /dev/null
+++ b/data/as/30011133/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011133",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011141/BillingService/BusinessService.json b/data/as/30011141/BillingService/BusinessService.json
new file mode 100644
index 0000000000..905ae7abf8
--- /dev/null
+++ b/data/as/30011141/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011141",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011141/egov-location/boundary-data.json b/data/as/30011141/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9a0838d364
--- /dev/null
+++ b/data/as/30011141/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011141",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON PWSS",
+                "localname": "KACHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011141",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON PWSS",
+                        "localname": "KACHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON PWSS",
+                "localname": "KACHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011141",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON PWSS",
+                        "localname": "KACHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011141/ws-services-calculation/Penalty.json b/data/as/30011141/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aa8110d3dd
--- /dev/null
+++ b/data/as/30011141/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011141",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011141/ws-services-calculation/WCBillingSlab.json b/data/as/30011141/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..77e321ba53
--- /dev/null
+++ b/data/as/30011141/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011141",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011158/BillingService/BusinessService.json b/data/as/30011158/BillingService/BusinessService.json
new file mode 100644
index 0000000000..13f5a6e3e8
--- /dev/null
+++ b/data/as/30011158/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011158",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011158/egov-location/boundary-data.json b/data/as/30011158/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c1efbc311
--- /dev/null
+++ b/data/as/30011158/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011158",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 DHANMARA GAON",
+                "localname": "NO. 1 DHANMARA GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 DHANMARA GAON",
+                        "localname": "NO. 1 DHANMARA GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 DHANMARA GAON",
+                "localname": "NO. 1 DHANMARA GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 DHANMARA GAON",
+                        "localname": "NO. 1 DHANMARA GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011158/ws-services-calculation/Penalty.json b/data/as/30011158/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d560d2ceb0
--- /dev/null
+++ b/data/as/30011158/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011158",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011158/ws-services-calculation/WCBillingSlab.json b/data/as/30011158/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2112f8b114
--- /dev/null
+++ b/data/as/30011158/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011158",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011173/BillingService/BusinessService.json b/data/as/30011173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..67e1d6aaed
--- /dev/null
+++ b/data/as/30011173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011173/egov-location/boundary-data.json b/data/as/30011173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e9a8c2c42
--- /dev/null
+++ b/data/as/30011173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEGHAIJARANI PWSS",
+                "localname": "MEGHAIJARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEGHAIJARANI PWSS",
+                        "localname": "MEGHAIJARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEGHAIJARANI PWSS",
+                "localname": "MEGHAIJARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEGHAIJARANI PWSS",
+                        "localname": "MEGHAIJARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011173/ws-services-calculation/Penalty.json b/data/as/30011173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e73dc0282f
--- /dev/null
+++ b/data/as/30011173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011173/ws-services-calculation/WCBillingSlab.json b/data/as/30011173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..95293e3312
--- /dev/null
+++ b/data/as/30011173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011609/BillingService/BusinessService.json b/data/as/30011609/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ab817140ca
--- /dev/null
+++ b/data/as/30011609/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011609",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011609/egov-location/boundary-data.json b/data/as/30011609/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29ef631692
--- /dev/null
+++ b/data/as/30011609/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011609",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALA TE PWSS",
+                "localname": "CHALA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALA TE PWSS",
+                        "localname": "CHALA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALA TE PWSS",
+                "localname": "CHALA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALA TE PWSS",
+                        "localname": "CHALA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011609/ws-services-calculation/Penalty.json b/data/as/30011609/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9fed9d4f25
--- /dev/null
+++ b/data/as/30011609/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011609",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011609/ws-services-calculation/WCBillingSlab.json b/data/as/30011609/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b77ff111b0
--- /dev/null
+++ b/data/as/30011609/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011609",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011655/BillingService/BusinessService.json b/data/as/30011655/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5170b1d842
--- /dev/null
+++ b/data/as/30011655/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011655",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011655/egov-location/boundary-data.json b/data/as/30011655/egov-location/boundary-data.json
new file mode 100644
index 0000000000..831b9d5c8c
--- /dev/null
+++ b/data/as/30011655/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011655",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAGAON PWSS",
+                "localname": "DAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAGAON PWSS",
+                        "localname": "DAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAGAON PWSS",
+                "localname": "DAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAGAON PWSS",
+                        "localname": "DAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011655/ws-services-calculation/Penalty.json b/data/as/30011655/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ecf0bad6c
--- /dev/null
+++ b/data/as/30011655/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011655",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011655/ws-services-calculation/WCBillingSlab.json b/data/as/30011655/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c473d9f019
--- /dev/null
+++ b/data/as/30011655/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011655",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011866/BillingService/BusinessService.json b/data/as/30011866/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ea2de85cc
--- /dev/null
+++ b/data/as/30011866/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011866",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011866/egov-location/boundary-data.json b/data/as/30011866/egov-location/boundary-data.json
new file mode 100644
index 0000000000..18ac4466a2
--- /dev/null
+++ b/data/as/30011866/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011866",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW AKABASTI MIRI PWSS",
+                "localname": "NEW AKABASTI MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW AKABASTI MIRI PWSS",
+                        "localname": "NEW AKABASTI MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW AKABASTI MIRI PWSS",
+                "localname": "NEW AKABASTI MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW AKABASTI MIRI PWSS",
+                        "localname": "NEW AKABASTI MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011866/ws-services-calculation/Penalty.json b/data/as/30011866/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3da9c8201
--- /dev/null
+++ b/data/as/30011866/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011866",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011866/ws-services-calculation/WCBillingSlab.json b/data/as/30011866/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6863d387e
--- /dev/null
+++ b/data/as/30011866/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011866",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011891/BillingService/BusinessService.json b/data/as/30011891/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00aaa74164
--- /dev/null
+++ b/data/as/30011891/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30011891",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011891/egov-location/boundary-data.json b/data/as/30011891/egov-location/boundary-data.json
new file mode 100644
index 0000000000..526283ce37
--- /dev/null
+++ b/data/as/30011891/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30011891",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHAL GURI TE PWSS",
+                "localname": "KATHAL GURI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011891",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHAL GURI TE PWSS",
+                        "localname": "KATHAL GURI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHAL GURI TE PWSS",
+                "localname": "KATHAL GURI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30011891",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHAL GURI TE PWSS",
+                        "localname": "KATHAL GURI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011891/ws-services-calculation/Penalty.json b/data/as/30011891/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2633cb055f
--- /dev/null
+++ b/data/as/30011891/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30011891",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30011891/ws-services-calculation/WCBillingSlab.json b/data/as/30011891/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8e86fef33
--- /dev/null
+++ b/data/as/30011891/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30011891",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012177/BillingService/BusinessService.json b/data/as/30012177/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a1b4f9ad1
--- /dev/null
+++ b/data/as/30012177/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012177",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012177/egov-location/boundary-data.json b/data/as/30012177/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0efe2012d9
--- /dev/null
+++ b/data/as/30012177/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012177",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MICHAMARI GAON (PT-B)",
+                "localname": "MICHAMARI GAON (PT-B)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MICHAMARI GAON (PT-B)",
+                        "localname": "MICHAMARI GAON (PT-B)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MICHAMARI GAON (PT-B)",
+                "localname": "MICHAMARI GAON (PT-B)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MICHAMARI GAON (PT-B)",
+                        "localname": "MICHAMARI GAON (PT-B)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012177/ws-services-calculation/Penalty.json b/data/as/30012177/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cacab8293e
--- /dev/null
+++ b/data/as/30012177/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012177",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012177/ws-services-calculation/WCBillingSlab.json b/data/as/30012177/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bdaf1414b5
--- /dev/null
+++ b/data/as/30012177/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012177",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012178/BillingService/BusinessService.json b/data/as/30012178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e9683104a
--- /dev/null
+++ b/data/as/30012178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012178/egov-location/boundary-data.json b/data/as/30012178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12679a48a0
--- /dev/null
+++ b/data/as/30012178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MICHAMARI GAON (PT-C)",
+                "localname": "MICHAMARI GAON (PT-C)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MICHAMARI GAON (PT-C)",
+                        "localname": "MICHAMARI GAON (PT-C)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MICHAMARI GAON (PT-C)",
+                "localname": "MICHAMARI GAON (PT-C)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MICHAMARI GAON (PT-C)",
+                        "localname": "MICHAMARI GAON (PT-C)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012178/ws-services-calculation/Penalty.json b/data/as/30012178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d36143556a
--- /dev/null
+++ b/data/as/30012178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012178/ws-services-calculation/WCBillingSlab.json b/data/as/30012178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5fdef9838e
--- /dev/null
+++ b/data/as/30012178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012221/BillingService/BusinessService.json b/data/as/30012221/BillingService/BusinessService.json
new file mode 100644
index 0000000000..75a69053db
--- /dev/null
+++ b/data/as/30012221/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012221",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012221/egov-location/boundary-data.json b/data/as/30012221/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b1f87d47b
--- /dev/null
+++ b/data/as/30012221/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012221",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIDOIBHERLA CENTER",
+                "localname": "PATIDOIBHERLA CENTER",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012221",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIDOIBHERLA CENTER",
+                        "localname": "PATIDOIBHERLA CENTER",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIDOIBHERLA CENTER",
+                "localname": "PATIDOIBHERLA CENTER",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012221",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIDOIBHERLA CENTER",
+                        "localname": "PATIDOIBHERLA CENTER",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012221/ws-services-calculation/Penalty.json b/data/as/30012221/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9947428806
--- /dev/null
+++ b/data/as/30012221/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012221",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012221/ws-services-calculation/WCBillingSlab.json b/data/as/30012221/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..018dd67011
--- /dev/null
+++ b/data/as/30012221/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012221",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012439/BillingService/BusinessService.json b/data/as/30012439/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d01e02f6ee
--- /dev/null
+++ b/data/as/30012439/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012439",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012439/egov-location/boundary-data.json b/data/as/30012439/egov-location/boundary-data.json
new file mode 100644
index 0000000000..31d219608e
--- /dev/null
+++ b/data/as/30012439/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012439",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO. 4 PWSS",
+                "localname": "SESSA TE NO. 4 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO. 4 PWSS",
+                        "localname": "SESSA TE NO. 4 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO. 4 PWSS",
+                "localname": "SESSA TE NO. 4 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO. 4 PWSS",
+                        "localname": "SESSA TE NO. 4 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012439/ws-services-calculation/Penalty.json b/data/as/30012439/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b02cba307a
--- /dev/null
+++ b/data/as/30012439/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012439",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012439/ws-services-calculation/WCBillingSlab.json b/data/as/30012439/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2c22d93e56
--- /dev/null
+++ b/data/as/30012439/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012439",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012517/BillingService/BusinessService.json b/data/as/30012517/BillingService/BusinessService.json
new file mode 100644
index 0000000000..251affbe19
--- /dev/null
+++ b/data/as/30012517/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012517",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012517/egov-location/boundary-data.json b/data/as/30012517/egov-location/boundary-data.json
new file mode 100644
index 0000000000..325374b6c4
--- /dev/null
+++ b/data/as/30012517/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012517",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 TIULIP BAGAN PWSS",
+                "localname": "NO.2 TIULIP BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 TIULIP BAGAN PWSS",
+                        "localname": "NO.2 TIULIP BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 TIULIP BAGAN PWSS",
+                "localname": "NO.2 TIULIP BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 TIULIP BAGAN PWSS",
+                        "localname": "NO.2 TIULIP BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012517/ws-services-calculation/Penalty.json b/data/as/30012517/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0197e520a6
--- /dev/null
+++ b/data/as/30012517/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012517",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012517/ws-services-calculation/WCBillingSlab.json b/data/as/30012517/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..324be72f84
--- /dev/null
+++ b/data/as/30012517/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012517",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012531/BillingService/BusinessService.json b/data/as/30012531/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e6d4085831
--- /dev/null
+++ b/data/as/30012531/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012531",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012531/egov-location/boundary-data.json b/data/as/30012531/egov-location/boundary-data.json
new file mode 100644
index 0000000000..492c97f19b
--- /dev/null
+++ b/data/as/30012531/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012531",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE NO.1",
+                "localname": "SOPAI TE NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE NO.1",
+                        "localname": "SOPAI TE NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE NO.1",
+                "localname": "SOPAI TE NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE NO.1",
+                        "localname": "SOPAI TE NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012531/ws-services-calculation/Penalty.json b/data/as/30012531/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..066ade3253
--- /dev/null
+++ b/data/as/30012531/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012531",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012531/ws-services-calculation/WCBillingSlab.json b/data/as/30012531/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cef906d41a
--- /dev/null
+++ b/data/as/30012531/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012531",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012538/BillingService/BusinessService.json b/data/as/30012538/BillingService/BusinessService.json
new file mode 100644
index 0000000000..af6a3b1bd6
--- /dev/null
+++ b/data/as/30012538/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012538",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012538/egov-location/boundary-data.json b/data/as/30012538/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e2a84aaaad
--- /dev/null
+++ b/data/as/30012538/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012538",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMCHUBURI PANBARI NO 1",
+                "localname": "NAMCHUBURI PANBARI NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMCHUBURI PANBARI NO 1",
+                        "localname": "NAMCHUBURI PANBARI NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMCHUBURI PANBARI NO 1",
+                "localname": "NAMCHUBURI PANBARI NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMCHUBURI PANBARI NO 1",
+                        "localname": "NAMCHUBURI PANBARI NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012538/ws-services-calculation/Penalty.json b/data/as/30012538/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..268a94c4e0
--- /dev/null
+++ b/data/as/30012538/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012538",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012538/ws-services-calculation/WCBillingSlab.json b/data/as/30012538/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8cc76a70ef
--- /dev/null
+++ b/data/as/30012538/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012538",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012662/BillingService/BusinessService.json b/data/as/30012662/BillingService/BusinessService.json
new file mode 100644
index 0000000000..acd3a32972
--- /dev/null
+++ b/data/as/30012662/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30012662",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012662/egov-location/boundary-data.json b/data/as/30012662/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c2f245f3c
--- /dev/null
+++ b/data/as/30012662/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30012662",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARABARI GAON",
+                "localname": "ARABARI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARABARI GAON",
+                        "localname": "ARABARI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARABARI GAON",
+                "localname": "ARABARI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30012662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARABARI GAON",
+                        "localname": "ARABARI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012662/ws-services-calculation/Penalty.json b/data/as/30012662/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d4e93f31b2
--- /dev/null
+++ b/data/as/30012662/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30012662",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30012662/ws-services-calculation/WCBillingSlab.json b/data/as/30012662/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4899f2e10b
--- /dev/null
+++ b/data/as/30012662/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30012662",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013177/BillingService/BusinessService.json b/data/as/30013177/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d73ae49aa2
--- /dev/null
+++ b/data/as/30013177/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013177",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013177/egov-location/boundary-data.json b/data/as/30013177/egov-location/boundary-data.json
new file mode 100644
index 0000000000..142685ddf9
--- /dev/null
+++ b/data/as/30013177/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013177",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW ADABARI TE PWSS (ZONE-I)",
+                "localname": "NEW ADABARI TE PWSS (ZONE-I)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW ADABARI TE PWSS (ZONE-I)",
+                        "localname": "NEW ADABARI TE PWSS (ZONE-I)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW ADABARI TE PWSS (ZONE-I)",
+                "localname": "NEW ADABARI TE PWSS (ZONE-I)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW ADABARI TE PWSS (ZONE-I)",
+                        "localname": "NEW ADABARI TE PWSS (ZONE-I)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013177/ws-services-calculation/Penalty.json b/data/as/30013177/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b643ea8c9
--- /dev/null
+++ b/data/as/30013177/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013177",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013177/ws-services-calculation/WCBillingSlab.json b/data/as/30013177/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8db031e9b7
--- /dev/null
+++ b/data/as/30013177/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013177",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013179/BillingService/BusinessService.json b/data/as/30013179/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dd5cd6ff8c
--- /dev/null
+++ b/data/as/30013179/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013179",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013179/egov-location/boundary-data.json b/data/as/30013179/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e6d8446f8
--- /dev/null
+++ b/data/as/30013179/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013179",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 GHOIRALI TE PWSS",
+                "localname": "NO. 2 GHOIRALI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 GHOIRALI TE PWSS",
+                        "localname": "NO. 2 GHOIRALI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 GHOIRALI TE PWSS",
+                "localname": "NO. 2 GHOIRALI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 GHOIRALI TE PWSS",
+                        "localname": "NO. 2 GHOIRALI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013179/ws-services-calculation/Penalty.json b/data/as/30013179/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4a0c5ff33f
--- /dev/null
+++ b/data/as/30013179/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013179",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013179/ws-services-calculation/WCBillingSlab.json b/data/as/30013179/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0c50b2d175
--- /dev/null
+++ b/data/as/30013179/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013179",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013181/BillingService/BusinessService.json b/data/as/30013181/BillingService/BusinessService.json
new file mode 100644
index 0000000000..177a4ec5f0
--- /dev/null
+++ b/data/as/30013181/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013181",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013181/egov-location/boundary-data.json b/data/as/30013181/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71a470c465
--- /dev/null
+++ b/data/as/30013181/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013181",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHOIRALI TE NO.1 PWSS",
+                "localname": "GHOIRALI TE NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013181",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHOIRALI TE NO.1 PWSS",
+                        "localname": "GHOIRALI TE NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHOIRALI TE NO.1 PWSS",
+                "localname": "GHOIRALI TE NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013181",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHOIRALI TE NO.1 PWSS",
+                        "localname": "GHOIRALI TE NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013181/ws-services-calculation/Penalty.json b/data/as/30013181/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f2c0d55c41
--- /dev/null
+++ b/data/as/30013181/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013181",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013181/ws-services-calculation/WCBillingSlab.json b/data/as/30013181/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c691ee0689
--- /dev/null
+++ b/data/as/30013181/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013181",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013193/BillingService/BusinessService.json b/data/as/30013193/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27269e6f6a
--- /dev/null
+++ b/data/as/30013193/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013193",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013193/egov-location/boundary-data.json b/data/as/30013193/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1829632172
--- /dev/null
+++ b/data/as/30013193/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013193",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHAMARI GRANT PWSS",
+                "localname": "KACHAMARI GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHAMARI GRANT PWSS",
+                        "localname": "KACHAMARI GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHAMARI GRANT PWSS",
+                "localname": "KACHAMARI GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHAMARI GRANT PWSS",
+                        "localname": "KACHAMARI GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013193/ws-services-calculation/Penalty.json b/data/as/30013193/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86896d4d5b
--- /dev/null
+++ b/data/as/30013193/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013193",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013193/ws-services-calculation/WCBillingSlab.json b/data/as/30013193/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4958097fd4
--- /dev/null
+++ b/data/as/30013193/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013193",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013208/BillingService/BusinessService.json b/data/as/30013208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..febb4f7dbc
--- /dev/null
+++ b/data/as/30013208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013208/egov-location/boundary-data.json b/data/as/30013208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8628a500d
--- /dev/null
+++ b/data/as/30013208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 MAINAJULI TE PWSS",
+                "localname": "NO. 1 MAINAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 MAINAJULI TE PWSS",
+                        "localname": "NO. 1 MAINAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 MAINAJULI TE PWSS",
+                "localname": "NO. 1 MAINAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 MAINAJULI TE PWSS",
+                        "localname": "NO. 1 MAINAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013208/ws-services-calculation/Penalty.json b/data/as/30013208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..afe107bdfa
--- /dev/null
+++ b/data/as/30013208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013208/ws-services-calculation/WCBillingSlab.json b/data/as/30013208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b668b2b8d3
--- /dev/null
+++ b/data/as/30013208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013223/BillingService/BusinessService.json b/data/as/30013223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..076d1faa87
--- /dev/null
+++ b/data/as/30013223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013223/egov-location/boundary-data.json b/data/as/30013223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..addecc74dc
--- /dev/null
+++ b/data/as/30013223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAINAJULI GRANT PWSS",
+                "localname": "MAINAJULI GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAINAJULI GRANT PWSS",
+                        "localname": "MAINAJULI GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAINAJULI GRANT PWSS",
+                "localname": "MAINAJULI GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAINAJULI GRANT PWSS",
+                        "localname": "MAINAJULI GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013223/ws-services-calculation/Penalty.json b/data/as/30013223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3147a021f
--- /dev/null
+++ b/data/as/30013223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013223/ws-services-calculation/WCBillingSlab.json b/data/as/30013223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f18567e646
--- /dev/null
+++ b/data/as/30013223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013392/BillingService/BusinessService.json b/data/as/30013392/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fac31a50ee
--- /dev/null
+++ b/data/as/30013392/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013392",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013392/egov-location/boundary-data.json b/data/as/30013392/egov-location/boundary-data.json
new file mode 100644
index 0000000000..acd5b4f40d
--- /dev/null
+++ b/data/as/30013392/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013392",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHGAON PWSS",
+                "localname": "KOCHGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013392",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHGAON PWSS",
+                        "localname": "KOCHGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHGAON PWSS",
+                "localname": "KOCHGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013392",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHGAON PWSS",
+                        "localname": "KOCHGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013392/ws-services-calculation/Penalty.json b/data/as/30013392/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..25eb55a060
--- /dev/null
+++ b/data/as/30013392/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013392",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013392/ws-services-calculation/WCBillingSlab.json b/data/as/30013392/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0409c913ff
--- /dev/null
+++ b/data/as/30013392/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013392",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013404/BillingService/BusinessService.json b/data/as/30013404/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a5f32f530d
--- /dev/null
+++ b/data/as/30013404/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013404",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013404/egov-location/boundary-data.json b/data/as/30013404/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2113fc3825
--- /dev/null
+++ b/data/as/30013404/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013404",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                "localname": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013404",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                        "localname": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                "localname": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013404",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                        "localname": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013404/ws-services-calculation/Penalty.json b/data/as/30013404/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..766e547e9d
--- /dev/null
+++ b/data/as/30013404/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013404",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013404/ws-services-calculation/WCBillingSlab.json b/data/as/30013404/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e00a91f2c
--- /dev/null
+++ b/data/as/30013404/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013404",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013810/BillingService/BusinessService.json b/data/as/30013810/BillingService/BusinessService.json
new file mode 100644
index 0000000000..935041df3b
--- /dev/null
+++ b/data/as/30013810/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013810",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013810/egov-location/boundary-data.json b/data/as/30013810/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d8b69af02
--- /dev/null
+++ b/data/as/30013810/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013810",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOGULAMARI  PWSS (NEW)",
+                "localname": "BOGULAMARI  PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOGULAMARI  PWSS (NEW)",
+                        "localname": "BOGULAMARI  PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOGULAMARI  PWSS (NEW)",
+                "localname": "BOGULAMARI  PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOGULAMARI  PWSS (NEW)",
+                        "localname": "BOGULAMARI  PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013810/ws-services-calculation/Penalty.json b/data/as/30013810/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71f456b79a
--- /dev/null
+++ b/data/as/30013810/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013810",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013810/ws-services-calculation/WCBillingSlab.json b/data/as/30013810/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fcf390f7a
--- /dev/null
+++ b/data/as/30013810/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013810",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013820/BillingService/BusinessService.json b/data/as/30013820/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eb4de36a07
--- /dev/null
+++ b/data/as/30013820/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013820",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013820/egov-location/boundary-data.json b/data/as/30013820/egov-location/boundary-data.json
new file mode 100644
index 0000000000..777c20c4e9
--- /dev/null
+++ b/data/as/30013820/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013820",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "J. BLOCK (II) M PWSS (NEW)",
+                "localname": "J. BLOCK (II) M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "J. BLOCK (II) M PWSS (NEW)",
+                        "localname": "J. BLOCK (II) M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "J. BLOCK (II) M PWSS (NEW)",
+                "localname": "J. BLOCK (II) M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "J. BLOCK (II) M PWSS (NEW)",
+                        "localname": "J. BLOCK (II) M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013820/ws-services-calculation/Penalty.json b/data/as/30013820/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7591762f62
--- /dev/null
+++ b/data/as/30013820/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013820",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013820/ws-services-calculation/WCBillingSlab.json b/data/as/30013820/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..985fcbd863
--- /dev/null
+++ b/data/as/30013820/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013820",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013836/BillingService/BusinessService.json b/data/as/30013836/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e1dd124bb9
--- /dev/null
+++ b/data/as/30013836/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013836",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013836/egov-location/boundary-data.json b/data/as/30013836/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e9d32144e
--- /dev/null
+++ b/data/as/30013836/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013836",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BETANI JHAR PWSS",
+                "localname": "BETANI JHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013836",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BETANI JHAR PWSS",
+                        "localname": "BETANI JHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BETANI JHAR PWSS",
+                "localname": "BETANI JHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013836",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BETANI JHAR PWSS",
+                        "localname": "BETANI JHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013836/ws-services-calculation/Penalty.json b/data/as/30013836/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6fae91c391
--- /dev/null
+++ b/data/as/30013836/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013836",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013836/ws-services-calculation/WCBillingSlab.json b/data/as/30013836/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7657110033
--- /dev/null
+++ b/data/as/30013836/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013836",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013839/BillingService/BusinessService.json b/data/as/30013839/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f1024aae8
--- /dev/null
+++ b/data/as/30013839/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013839",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013839/egov-location/boundary-data.json b/data/as/30013839/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7aa38d517b
--- /dev/null
+++ b/data/as/30013839/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013839",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARUPATGAON PWSS",
+                "localname": "SARUPATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013839",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARUPATGAON PWSS",
+                        "localname": "SARUPATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARUPATGAON PWSS",
+                "localname": "SARUPATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013839",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARUPATGAON PWSS",
+                        "localname": "SARUPATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013839/ws-services-calculation/Penalty.json b/data/as/30013839/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bedd9fcb0d
--- /dev/null
+++ b/data/as/30013839/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013839",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013839/ws-services-calculation/WCBillingSlab.json b/data/as/30013839/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e82f5c5fd0
--- /dev/null
+++ b/data/as/30013839/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013839",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013844/BillingService/BusinessService.json b/data/as/30013844/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1c5643ca07
--- /dev/null
+++ b/data/as/30013844/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013844",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013844/egov-location/boundary-data.json b/data/as/30013844/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db5c70fe98
--- /dev/null
+++ b/data/as/30013844/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013844",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE NO. 17 LINE PWSS",
+                "localname": "BARJULI TE NO. 17 LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE NO. 17 LINE PWSS",
+                        "localname": "BARJULI TE NO. 17 LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE NO. 17 LINE PWSS",
+                "localname": "BARJULI TE NO. 17 LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013844",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE NO. 17 LINE PWSS",
+                        "localname": "BARJULI TE NO. 17 LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013844/ws-services-calculation/Penalty.json b/data/as/30013844/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4d99eeef9
--- /dev/null
+++ b/data/as/30013844/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013844",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013844/ws-services-calculation/WCBillingSlab.json b/data/as/30013844/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aee2bd6736
--- /dev/null
+++ b/data/as/30013844/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013844",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013848/BillingService/BusinessService.json b/data/as/30013848/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8f3256233
--- /dev/null
+++ b/data/as/30013848/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013848",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013848/egov-location/boundary-data.json b/data/as/30013848/egov-location/boundary-data.json
new file mode 100644
index 0000000000..55983b5841
--- /dev/null
+++ b/data/as/30013848/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013848",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 MALIJAN PWSS",
+                "localname": "NO. 1 MALIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 MALIJAN PWSS",
+                        "localname": "NO. 1 MALIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 MALIJAN PWSS",
+                "localname": "NO. 1 MALIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 MALIJAN PWSS",
+                        "localname": "NO. 1 MALIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013848/ws-services-calculation/Penalty.json b/data/as/30013848/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7c178d2a72
--- /dev/null
+++ b/data/as/30013848/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013848",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013848/ws-services-calculation/WCBillingSlab.json b/data/as/30013848/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..681680a8e4
--- /dev/null
+++ b/data/as/30013848/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013848",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013853/BillingService/BusinessService.json b/data/as/30013853/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ec282436f
--- /dev/null
+++ b/data/as/30013853/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013853",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013853/egov-location/boundary-data.json b/data/as/30013853/egov-location/boundary-data.json
new file mode 100644
index 0000000000..baa8683da2
--- /dev/null
+++ b/data/as/30013853/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013853",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUBUKIJHAR PWSS",
+                "localname": "TUBUKIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013853",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUBUKIJHAR PWSS",
+                        "localname": "TUBUKIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUBUKIJHAR PWSS",
+                "localname": "TUBUKIJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013853",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUBUKIJHAR PWSS",
+                        "localname": "TUBUKIJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013853/ws-services-calculation/Penalty.json b/data/as/30013853/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5cccd1c52d
--- /dev/null
+++ b/data/as/30013853/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013853",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013853/ws-services-calculation/WCBillingSlab.json b/data/as/30013853/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a50baaf691
--- /dev/null
+++ b/data/as/30013853/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013853",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013855/BillingService/BusinessService.json b/data/as/30013855/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2fe38deec7
--- /dev/null
+++ b/data/as/30013855/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013855",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013855/egov-location/boundary-data.json b/data/as/30013855/egov-location/boundary-data.json
new file mode 100644
index 0000000000..77c0da5916
--- /dev/null
+++ b/data/as/30013855/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013855",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAGLA BIL GAON PWSS",
+                "localname": "PAGLA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAGLA BIL GAON PWSS",
+                        "localname": "PAGLA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAGLA BIL GAON PWSS",
+                "localname": "PAGLA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAGLA BIL GAON PWSS",
+                        "localname": "PAGLA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013855/ws-services-calculation/Penalty.json b/data/as/30013855/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a4de290da2
--- /dev/null
+++ b/data/as/30013855/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013855",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013855/ws-services-calculation/WCBillingSlab.json b/data/as/30013855/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e010a70cb
--- /dev/null
+++ b/data/as/30013855/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013855",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013863/BillingService/BusinessService.json b/data/as/30013863/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b835431c5
--- /dev/null
+++ b/data/as/30013863/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013863",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013863/egov-location/boundary-data.json b/data/as/30013863/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4b234d4fe
--- /dev/null
+++ b/data/as/30013863/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013863",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM  NAHARANI PWSS",
+                "localname": "PACHIM  NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013863",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM  NAHARANI PWSS",
+                        "localname": "PACHIM  NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM  NAHARANI PWSS",
+                "localname": "PACHIM  NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013863",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM  NAHARANI PWSS",
+                        "localname": "PACHIM  NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013863/ws-services-calculation/Penalty.json b/data/as/30013863/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..189af40745
--- /dev/null
+++ b/data/as/30013863/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013863",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013863/ws-services-calculation/WCBillingSlab.json b/data/as/30013863/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..83958ade42
--- /dev/null
+++ b/data/as/30013863/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013863",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013915/BillingService/BusinessService.json b/data/as/30013915/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a937c4188
--- /dev/null
+++ b/data/as/30013915/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30013915",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013915/egov-location/boundary-data.json b/data/as/30013915/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a485ba362
--- /dev/null
+++ b/data/as/30013915/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30013915",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 RANGAPARA TE PWSS",
+                "localname": "NO. 2 RANGAPARA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 RANGAPARA TE PWSS",
+                        "localname": "NO. 2 RANGAPARA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 RANGAPARA TE PWSS",
+                "localname": "NO. 2 RANGAPARA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30013915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 RANGAPARA TE PWSS",
+                        "localname": "NO. 2 RANGAPARA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013915/ws-services-calculation/Penalty.json b/data/as/30013915/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e14a6037ff
--- /dev/null
+++ b/data/as/30013915/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30013915",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30013915/ws-services-calculation/WCBillingSlab.json b/data/as/30013915/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..933b826f66
--- /dev/null
+++ b/data/as/30013915/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30013915",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014184/BillingService/BusinessService.json b/data/as/30014184/BillingService/BusinessService.json
new file mode 100644
index 0000000000..62c31e70a8
--- /dev/null
+++ b/data/as/30014184/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014184",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014184/egov-location/boundary-data.json b/data/as/30014184/egov-location/boundary-data.json
new file mode 100644
index 0000000000..99171d6e85
--- /dev/null
+++ b/data/as/30014184/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014184",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANIPATHAR NO. 1 PWSS",
+                "localname": "UHANIPATHAR NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014184",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANIPATHAR NO. 1 PWSS",
+                        "localname": "UHANIPATHAR NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANIPATHAR NO. 1 PWSS",
+                "localname": "UHANIPATHAR NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014184",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANIPATHAR NO. 1 PWSS",
+                        "localname": "UHANIPATHAR NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014184/ws-services-calculation/Penalty.json b/data/as/30014184/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..49c90a5f2a
--- /dev/null
+++ b/data/as/30014184/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014184",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014184/ws-services-calculation/WCBillingSlab.json b/data/as/30014184/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1d0f236a08
--- /dev/null
+++ b/data/as/30014184/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014184",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014239/BillingService/BusinessService.json b/data/as/30014239/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1161f2a608
--- /dev/null
+++ b/data/as/30014239/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014239",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014239/egov-location/boundary-data.json b/data/as/30014239/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4b7dd73181
--- /dev/null
+++ b/data/as/30014239/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014239",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARASINGRI JUNGLE PWSS",
+                "localname": "BHARASINGRI JUNGLE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARASINGRI JUNGLE PWSS",
+                        "localname": "BHARASINGRI JUNGLE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARASINGRI JUNGLE PWSS",
+                "localname": "BHARASINGRI JUNGLE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARASINGRI JUNGLE PWSS",
+                        "localname": "BHARASINGRI JUNGLE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014239/ws-services-calculation/Penalty.json b/data/as/30014239/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..24e8751910
--- /dev/null
+++ b/data/as/30014239/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014239",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014239/ws-services-calculation/WCBillingSlab.json b/data/as/30014239/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68506a623c
--- /dev/null
+++ b/data/as/30014239/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014239",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014264/BillingService/BusinessService.json b/data/as/30014264/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c6765034ff
--- /dev/null
+++ b/data/as/30014264/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014264",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014264/egov-location/boundary-data.json b/data/as/30014264/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4d3f30c5d7
--- /dev/null
+++ b/data/as/30014264/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014264",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2. BELSIRI BAGAN",
+                "localname": "NO 2. BELSIRI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2. BELSIRI BAGAN",
+                        "localname": "NO 2. BELSIRI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2. BELSIRI BAGAN",
+                "localname": "NO 2. BELSIRI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2. BELSIRI BAGAN",
+                        "localname": "NO 2. BELSIRI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014264/ws-services-calculation/Penalty.json b/data/as/30014264/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..35f5db94c3
--- /dev/null
+++ b/data/as/30014264/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014264",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014264/ws-services-calculation/WCBillingSlab.json b/data/as/30014264/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7bce3cf36
--- /dev/null
+++ b/data/as/30014264/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014264",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014427/BillingService/BusinessService.json b/data/as/30014427/BillingService/BusinessService.json
new file mode 100644
index 0000000000..143b4a52b8
--- /dev/null
+++ b/data/as/30014427/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014427",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014427/egov-location/boundary-data.json b/data/as/30014427/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b66a90d21a
--- /dev/null
+++ b/data/as/30014427/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014427",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PT-II PWSS (NEW)",
+                "localname": "BAMUNDANGA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PT-II PWSS (NEW)",
+                        "localname": "BAMUNDANGA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PT-II PWSS (NEW)",
+                "localname": "BAMUNDANGA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PT-II PWSS (NEW)",
+                        "localname": "BAMUNDANGA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014427/ws-services-calculation/Penalty.json b/data/as/30014427/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e83f6d472d
--- /dev/null
+++ b/data/as/30014427/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014427",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014427/ws-services-calculation/WCBillingSlab.json b/data/as/30014427/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8241321093
--- /dev/null
+++ b/data/as/30014427/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014427",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014441/egov-location/boundary-data.json b/data/as/30014441/egov-location/boundary-data.json
index b96e9d4b00..c0dd1e896c 100644
--- a/data/as/30014441/egov-location/boundary-data.json
+++ b/data/as/30014441/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "SHYAMAGURI PWSS",
-                "localname": "SHYAMAGURI PWSS",
+                "name": "SHYAMAGURI PWSS (NEW)",
+                "localname": "SHYAMAGURI PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "SHYAMAGURI PWSS",
-                        "localname": "SHYAMAGURI PWSS",
+                        "name": "SHYAMAGURI PWSS (NEW)",
+                        "localname": "SHYAMAGURI PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "SHYAMAGURI PWSS",
-                "localname": "SHYAMAGURI PWSS",
+                "name": "SHYAMAGURI PWSS (NEW)",
+                "localname": "SHYAMAGURI PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "SHYAMAGURI PWSS",
-                        "localname": "SHYAMAGURI PWSS",
+                        "name": "SHYAMAGURI PWSS (NEW)",
+                        "localname": "SHYAMAGURI PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/30014441/ws-services-calculation/WCBillingSlab.json b/data/as/30014441/ws-services-calculation/WCBillingSlab.json
index a73a5e1551..ffa926ed3c 100644
--- a/data/as/30014441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014441/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014445/BillingService/BusinessService.json b/data/as/30014445/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c2fba51800
--- /dev/null
+++ b/data/as/30014445/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014445",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014445/egov-location/boundary-data.json b/data/as/30014445/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7565c83b72
--- /dev/null
+++ b/data/as/30014445/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014445",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-II PWSS (NEW)",
+                "localname": "NAYAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-II PWSS (NEW)",
+                        "localname": "NAYAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-II PWSS (NEW)",
+                "localname": "NAYAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-II PWSS (NEW)",
+                        "localname": "NAYAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014445/ws-services-calculation/Penalty.json b/data/as/30014445/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d46f677faa
--- /dev/null
+++ b/data/as/30014445/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014445",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014445/ws-services-calculation/WCBillingSlab.json b/data/as/30014445/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8632ef2322
--- /dev/null
+++ b/data/as/30014445/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014445",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014448/BillingService/BusinessService.json b/data/as/30014448/BillingService/BusinessService.json
new file mode 100644
index 0000000000..301d1a5a59
--- /dev/null
+++ b/data/as/30014448/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014448",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014448/egov-location/boundary-data.json b/data/as/30014448/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9eac09c380
--- /dev/null
+++ b/data/as/30014448/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014448",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I PWSS (NEW)",
+                "localname": "NAYAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014448",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I PWSS (NEW)",
+                "localname": "NAYAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014448",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014448/ws-services-calculation/Penalty.json b/data/as/30014448/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ccefcacf36
--- /dev/null
+++ b/data/as/30014448/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014448",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014448/ws-services-calculation/WCBillingSlab.json b/data/as/30014448/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e93cba3708
--- /dev/null
+++ b/data/as/30014448/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014448",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014450/BillingService/BusinessService.json b/data/as/30014450/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3dcb1bbd78
--- /dev/null
+++ b/data/as/30014450/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014450",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014450/egov-location/boundary-data.json b/data/as/30014450/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2f0be6d257
--- /dev/null
+++ b/data/as/30014450/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014450",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                "localname": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014450",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                "localname": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014450",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-II NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014450/ws-services-calculation/Penalty.json b/data/as/30014450/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ede96f286
--- /dev/null
+++ b/data/as/30014450/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014450",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014450/ws-services-calculation/WCBillingSlab.json b/data/as/30014450/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b0cd3a754c
--- /dev/null
+++ b/data/as/30014450/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014450",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014452/BillingService/BusinessService.json b/data/as/30014452/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d85b3acb67
--- /dev/null
+++ b/data/as/30014452/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014452",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014452/egov-location/boundary-data.json b/data/as/30014452/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7014434cbc
--- /dev/null
+++ b/data/as/30014452/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014452",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONUA PWSS (NEW)",
+                "localname": "RONUA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014452",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONUA PWSS (NEW)",
+                        "localname": "RONUA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONUA PWSS (NEW)",
+                "localname": "RONUA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014452",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONUA PWSS (NEW)",
+                        "localname": "RONUA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014452/ws-services-calculation/Penalty.json b/data/as/30014452/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c89be808cf
--- /dev/null
+++ b/data/as/30014452/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014452",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014452/ws-services-calculation/WCBillingSlab.json b/data/as/30014452/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4cac541e5f
--- /dev/null
+++ b/data/as/30014452/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014452",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014454/BillingService/BusinessService.json b/data/as/30014454/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a2e0a5013
--- /dev/null
+++ b/data/as/30014454/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014454",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014454/egov-location/boundary-data.json b/data/as/30014454/egov-location/boundary-data.json
new file mode 100644
index 0000000000..14df9ac878
--- /dev/null
+++ b/data/as/30014454/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014454",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OXYBARI PWSS (NEW)",
+                "localname": "OXYBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OXYBARI PWSS (NEW)",
+                        "localname": "OXYBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OXYBARI PWSS (NEW)",
+                "localname": "OXYBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OXYBARI PWSS (NEW)",
+                        "localname": "OXYBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014454/ws-services-calculation/Penalty.json b/data/as/30014454/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fbcaec921a
--- /dev/null
+++ b/data/as/30014454/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014454",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014454/ws-services-calculation/WCBillingSlab.json b/data/as/30014454/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c614c415e6
--- /dev/null
+++ b/data/as/30014454/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014454",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014658/BillingService/BusinessService.json b/data/as/30014658/BillingService/BusinessService.json
new file mode 100644
index 0000000000..28d3d09646
--- /dev/null
+++ b/data/as/30014658/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014658",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014658/egov-location/boundary-data.json b/data/as/30014658/egov-location/boundary-data.json
new file mode 100644
index 0000000000..96c7b1555d
--- /dev/null
+++ b/data/as/30014658/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014658",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                "localname": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014658",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                        "localname": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                "localname": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014658",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                        "localname": "KANKATA PT-I (NO 3) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014658/ws-services-calculation/Penalty.json b/data/as/30014658/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..846802650e
--- /dev/null
+++ b/data/as/30014658/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014658",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014658/ws-services-calculation/WCBillingSlab.json b/data/as/30014658/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..142529c677
--- /dev/null
+++ b/data/as/30014658/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014658",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014663/BillingService/BusinessService.json b/data/as/30014663/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ea2da8e989
--- /dev/null
+++ b/data/as/30014663/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014663",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014663/egov-location/boundary-data.json b/data/as/30014663/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db0d2862fd
--- /dev/null
+++ b/data/as/30014663/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014663",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUPDHARA PT-I PWSS (NEW)",
+                "localname": "DHUPDHARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014663",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUPDHARA PT-I PWSS (NEW)",
+                        "localname": "DHUPDHARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUPDHARA PT-I PWSS (NEW)",
+                "localname": "DHUPDHARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014663",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUPDHARA PT-I PWSS (NEW)",
+                        "localname": "DHUPDHARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014663/ws-services-calculation/Penalty.json b/data/as/30014663/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db13e4f2b6
--- /dev/null
+++ b/data/as/30014663/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014663",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014663/ws-services-calculation/WCBillingSlab.json b/data/as/30014663/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc282ddebd
--- /dev/null
+++ b/data/as/30014663/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014663",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014666/BillingService/BusinessService.json b/data/as/30014666/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99c1725e72
--- /dev/null
+++ b/data/as/30014666/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014666",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014666/egov-location/boundary-data.json b/data/as/30014666/egov-location/boundary-data.json
new file mode 100644
index 0000000000..831ff35f20
--- /dev/null
+++ b/data/as/30014666/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014666",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI PWSS (NEW)",
+                "localname": "TIPLAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014666",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI PWSS (NEW)",
+                        "localname": "TIPLAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIPLAI PWSS (NEW)",
+                "localname": "TIPLAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014666",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIPLAI PWSS (NEW)",
+                        "localname": "TIPLAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014666/ws-services-calculation/Penalty.json b/data/as/30014666/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78d177fea4
--- /dev/null
+++ b/data/as/30014666/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014666",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014666/ws-services-calculation/WCBillingSlab.json b/data/as/30014666/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0bd715a6a8
--- /dev/null
+++ b/data/as/30014666/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014666",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014668/BillingService/BusinessService.json b/data/as/30014668/BillingService/BusinessService.json
new file mode 100644
index 0000000000..80bf27bbaf
--- /dev/null
+++ b/data/as/30014668/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014668",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014668/egov-location/boundary-data.json b/data/as/30014668/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34bb0deb75
--- /dev/null
+++ b/data/as/30014668/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014668",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOETARI PWSS (NEW)",
+                "localname": "BOETARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014668",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOETARI PWSS (NEW)",
+                        "localname": "BOETARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOETARI PWSS (NEW)",
+                "localname": "BOETARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014668",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOETARI PWSS (NEW)",
+                        "localname": "BOETARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014668/ws-services-calculation/Penalty.json b/data/as/30014668/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b8f8849603
--- /dev/null
+++ b/data/as/30014668/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014668",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014668/ws-services-calculation/WCBillingSlab.json b/data/as/30014668/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f1d0951697
--- /dev/null
+++ b/data/as/30014668/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014668",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014669/BillingService/BusinessService.json b/data/as/30014669/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32c8ba5d07
--- /dev/null
+++ b/data/as/30014669/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014669",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014669/egov-location/boundary-data.json b/data/as/30014669/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a552e66244
--- /dev/null
+++ b/data/as/30014669/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014669",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAMABHAGINPARA PWSS (NEW)",
+                "localname": "MAMABHAGINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014669",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAMABHAGINPARA PWSS (NEW)",
+                        "localname": "MAMABHAGINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAMABHAGINPARA PWSS (NEW)",
+                "localname": "MAMABHAGINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014669",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAMABHAGINPARA PWSS (NEW)",
+                        "localname": "MAMABHAGINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014669/ws-services-calculation/Penalty.json b/data/as/30014669/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0e3e0a33de
--- /dev/null
+++ b/data/as/30014669/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014669",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014669/ws-services-calculation/WCBillingSlab.json b/data/as/30014669/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b61085f43
--- /dev/null
+++ b/data/as/30014669/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014669",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014670/BillingService/BusinessService.json b/data/as/30014670/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32bccb94be
--- /dev/null
+++ b/data/as/30014670/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014670",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014670/egov-location/boundary-data.json b/data/as/30014670/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9a6bd119b7
--- /dev/null
+++ b/data/as/30014670/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014670",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DORAPARA PT-III PWSS (NEW)",
+                "localname": "DORAPARA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DORAPARA PT-III PWSS (NEW)",
+                        "localname": "DORAPARA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DORAPARA PT-III PWSS (NEW)",
+                "localname": "DORAPARA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DORAPARA PT-III PWSS (NEW)",
+                        "localname": "DORAPARA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014670/ws-services-calculation/Penalty.json b/data/as/30014670/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a526478841
--- /dev/null
+++ b/data/as/30014670/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014670",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014670/ws-services-calculation/WCBillingSlab.json b/data/as/30014670/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85cf69da9d
--- /dev/null
+++ b/data/as/30014670/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014670",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014671/BillingService/BusinessService.json b/data/as/30014671/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ae75d78a5
--- /dev/null
+++ b/data/as/30014671/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014671",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014671/egov-location/boundary-data.json b/data/as/30014671/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f105734a46
--- /dev/null
+++ b/data/as/30014671/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014671",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                "localname": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014671",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                        "localname": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                "localname": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014671",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                        "localname": "MOJAI GAROPARA/RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014671/ws-services-calculation/Penalty.json b/data/as/30014671/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..be35af3701
--- /dev/null
+++ b/data/as/30014671/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014671",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014671/ws-services-calculation/WCBillingSlab.json b/data/as/30014671/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0cad3bc311
--- /dev/null
+++ b/data/as/30014671/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014671",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014698/BillingService/BusinessService.json b/data/as/30014698/BillingService/BusinessService.json
new file mode 100644
index 0000000000..971159fcff
--- /dev/null
+++ b/data/as/30014698/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014698",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014698/egov-location/boundary-data.json b/data/as/30014698/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e2be526ba7
--- /dev/null
+++ b/data/as/30014698/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014698",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PARMAIGHULI PWSS",
+                "localname": "PARMAIGHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014698",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PARMAIGHULI PWSS",
+                        "localname": "PARMAIGHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PARMAIGHULI PWSS",
+                "localname": "PARMAIGHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014698",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PARMAIGHULI PWSS",
+                        "localname": "PARMAIGHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014698/ws-services-calculation/Penalty.json b/data/as/30014698/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ed8e35a2e9
--- /dev/null
+++ b/data/as/30014698/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014698",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014698/ws-services-calculation/WCBillingSlab.json b/data/as/30014698/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e7c7fe0cd5
--- /dev/null
+++ b/data/as/30014698/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014698",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014701/BillingService/BusinessService.json b/data/as/30014701/BillingService/BusinessService.json
new file mode 100644
index 0000000000..087a98e352
--- /dev/null
+++ b/data/as/30014701/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014701",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014701/egov-location/boundary-data.json b/data/as/30014701/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e200ee3741
--- /dev/null
+++ b/data/as/30014701/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014701",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PARMAIGHULI SOUTH PWSS",
+                "localname": "PARMAIGHULI SOUTH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014701",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PARMAIGHULI SOUTH PWSS",
+                        "localname": "PARMAIGHULI SOUTH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PARMAIGHULI SOUTH PWSS",
+                "localname": "PARMAIGHULI SOUTH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014701",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PARMAIGHULI SOUTH PWSS",
+                        "localname": "PARMAIGHULI SOUTH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014701/ws-services-calculation/Penalty.json b/data/as/30014701/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c25d15c30
--- /dev/null
+++ b/data/as/30014701/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014701",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014701/ws-services-calculation/WCBillingSlab.json b/data/as/30014701/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0bd28fa107
--- /dev/null
+++ b/data/as/30014701/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014701",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014915/BillingService/BusinessService.json b/data/as/30014915/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42abc34e20
--- /dev/null
+++ b/data/as/30014915/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014915",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014915/egov-location/boundary-data.json b/data/as/30014915/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c0cb8301d8
--- /dev/null
+++ b/data/as/30014915/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014915",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGHMARA GAON PWSS",
+                "localname": "BAGHMARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGHMARA GAON PWSS",
+                        "localname": "BAGHMARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGHMARA GAON PWSS",
+                "localname": "BAGHMARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGHMARA GAON PWSS",
+                        "localname": "BAGHMARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014915/ws-services-calculation/Penalty.json b/data/as/30014915/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b132dbf7c
--- /dev/null
+++ b/data/as/30014915/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014915",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014915/ws-services-calculation/WCBillingSlab.json b/data/as/30014915/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c57933661
--- /dev/null
+++ b/data/as/30014915/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014915",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014971/BillingService/BusinessService.json b/data/as/30014971/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d79e8ea401
--- /dev/null
+++ b/data/as/30014971/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014971",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014971/egov-location/boundary-data.json b/data/as/30014971/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9b9d3c200d
--- /dev/null
+++ b/data/as/30014971/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014971",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NOORPUR JUTE PWSS",
+                "localname": "NO.2 NOORPUR JUTE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014971",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NOORPUR JUTE PWSS",
+                        "localname": "NO.2 NOORPUR JUTE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NOORPUR JUTE PWSS",
+                "localname": "NO.2 NOORPUR JUTE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014971",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NOORPUR JUTE PWSS",
+                        "localname": "NO.2 NOORPUR JUTE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014971/ws-services-calculation/Penalty.json b/data/as/30014971/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..928bca34ee
--- /dev/null
+++ b/data/as/30014971/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014971",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014971/ws-services-calculation/WCBillingSlab.json b/data/as/30014971/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..29820fc91e
--- /dev/null
+++ b/data/as/30014971/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014971",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014990/BillingService/BusinessService.json b/data/as/30014990/BillingService/BusinessService.json
new file mode 100644
index 0000000000..33866b4175
--- /dev/null
+++ b/data/as/30014990/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014990",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014990/egov-location/boundary-data.json b/data/as/30014990/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2f0908ad3
--- /dev/null
+++ b/data/as/30014990/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014990",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM KATHURI PWSS (NEW)",
+                "localname": "PACHIM KATHURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014990",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM KATHURI PWSS (NEW)",
+                        "localname": "PACHIM KATHURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM KATHURI PWSS (NEW)",
+                "localname": "PACHIM KATHURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014990",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM KATHURI PWSS (NEW)",
+                        "localname": "PACHIM KATHURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014990/ws-services-calculation/Penalty.json b/data/as/30014990/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f63f7196e
--- /dev/null
+++ b/data/as/30014990/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014990",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014990/ws-services-calculation/WCBillingSlab.json b/data/as/30014990/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..651785a3fd
--- /dev/null
+++ b/data/as/30014990/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014990",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014991/BillingService/BusinessService.json b/data/as/30014991/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ef7c45141
--- /dev/null
+++ b/data/as/30014991/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014991",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014991/egov-location/boundary-data.json b/data/as/30014991/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15e9cd3be0
--- /dev/null
+++ b/data/as/30014991/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014991",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANASPARA RESERVE PWSS (NEW)",
+                "localname": "MANASPARA RESERVE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014991",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANASPARA RESERVE PWSS (NEW)",
+                        "localname": "MANASPARA RESERVE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANASPARA RESERVE PWSS (NEW)",
+                "localname": "MANASPARA RESERVE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014991",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANASPARA RESERVE PWSS (NEW)",
+                        "localname": "MANASPARA RESERVE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014991/ws-services-calculation/Penalty.json b/data/as/30014991/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce5f8e065d
--- /dev/null
+++ b/data/as/30014991/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014991",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014991/ws-services-calculation/WCBillingSlab.json b/data/as/30014991/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5bbe38c9a
--- /dev/null
+++ b/data/as/30014991/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014991",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014992/BillingService/BusinessService.json b/data/as/30014992/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d56050524c
--- /dev/null
+++ b/data/as/30014992/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30014992",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014992/egov-location/boundary-data.json b/data/as/30014992/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc46179ac8
--- /dev/null
+++ b/data/as/30014992/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30014992",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERBARI (JALESWAR) PWSS (NEW)",
+                "localname": "KHERBARI (JALESWAR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014992",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERBARI (JALESWAR) PWSS (NEW)",
+                        "localname": "KHERBARI (JALESWAR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERBARI (JALESWAR) PWSS (NEW)",
+                "localname": "KHERBARI (JALESWAR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30014992",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERBARI (JALESWAR) PWSS (NEW)",
+                        "localname": "KHERBARI (JALESWAR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014992/ws-services-calculation/Penalty.json b/data/as/30014992/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c902e40c1
--- /dev/null
+++ b/data/as/30014992/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30014992",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30014992/ws-services-calculation/WCBillingSlab.json b/data/as/30014992/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04398063d5
--- /dev/null
+++ b/data/as/30014992/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30014992",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015050/BillingService/BusinessService.json b/data/as/30015050/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c0cd1e4f1f
--- /dev/null
+++ b/data/as/30015050/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30015050",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015050/egov-location/boundary-data.json b/data/as/30015050/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad990799fc
--- /dev/null
+++ b/data/as/30015050/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30015050",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.5 TINIKHORIA PWSS",
+                "localname": "NO.5 TINIKHORIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30015050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.5 TINIKHORIA PWSS",
+                        "localname": "NO.5 TINIKHORIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.5 TINIKHORIA PWSS",
+                "localname": "NO.5 TINIKHORIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30015050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.5 TINIKHORIA PWSS",
+                        "localname": "NO.5 TINIKHORIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015050/ws-services-calculation/Penalty.json b/data/as/30015050/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e990cead4f
--- /dev/null
+++ b/data/as/30015050/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30015050",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015050/ws-services-calculation/WCBillingSlab.json b/data/as/30015050/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..efdf4c30c6
--- /dev/null
+++ b/data/as/30015050/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30015050",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015700/BillingService/BusinessService.json b/data/as/30015700/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9dce9dc52e
--- /dev/null
+++ b/data/as/30015700/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30015700",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015700/egov-location/boundary-data.json b/data/as/30015700/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4e023eeec
--- /dev/null
+++ b/data/as/30015700/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30015700",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO KAKALBHAGI AWC",
+                "localname": "2 NO KAKALBHAGI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30015700",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO KAKALBHAGI AWC",
+                        "localname": "2 NO KAKALBHAGI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO KAKALBHAGI AWC",
+                "localname": "2 NO KAKALBHAGI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30015700",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO KAKALBHAGI AWC",
+                        "localname": "2 NO KAKALBHAGI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015700/ws-services-calculation/Penalty.json b/data/as/30015700/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d5b5e13b2d
--- /dev/null
+++ b/data/as/30015700/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30015700",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30015700/ws-services-calculation/WCBillingSlab.json b/data/as/30015700/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b72225b0a
--- /dev/null
+++ b/data/as/30015700/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30015700",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016452/BillingService/BusinessService.json b/data/as/30016452/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ccb01122b
--- /dev/null
+++ b/data/as/30016452/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016452",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016452/egov-location/boundary-data.json b/data/as/30016452/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a24073faa
--- /dev/null
+++ b/data/as/30016452/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016452",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATAIMARA NO 1 PWSS",
+                "localname": "GATAIMARA NO 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016452",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATAIMARA NO 1 PWSS",
+                        "localname": "GATAIMARA NO 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATAIMARA NO 1 PWSS",
+                "localname": "GATAIMARA NO 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016452",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATAIMARA NO 1 PWSS",
+                        "localname": "GATAIMARA NO 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016452/ws-services-calculation/Penalty.json b/data/as/30016452/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..07a3483c75
--- /dev/null
+++ b/data/as/30016452/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016452",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016452/ws-services-calculation/WCBillingSlab.json b/data/as/30016452/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fbaeb1dcdf
--- /dev/null
+++ b/data/as/30016452/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016452",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016458/BillingService/BusinessService.json b/data/as/30016458/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc6652ab68
--- /dev/null
+++ b/data/as/30016458/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016458",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016458/egov-location/boundary-data.json b/data/as/30016458/egov-location/boundary-data.json
new file mode 100644
index 0000000000..158d3fd773
--- /dev/null
+++ b/data/as/30016458/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016458",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANPUR PWSS",
+                "localname": "PANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016458",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANPUR PWSS",
+                        "localname": "PANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANPUR PWSS",
+                "localname": "PANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016458",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANPUR PWSS",
+                        "localname": "PANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016458/ws-services-calculation/Penalty.json b/data/as/30016458/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2adfad073c
--- /dev/null
+++ b/data/as/30016458/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016458",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016458/ws-services-calculation/WCBillingSlab.json b/data/as/30016458/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..adc9d94253
--- /dev/null
+++ b/data/as/30016458/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016458",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016472/BillingService/BusinessService.json b/data/as/30016472/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ce3e2a956
--- /dev/null
+++ b/data/as/30016472/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016472",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016472/egov-location/boundary-data.json b/data/as/30016472/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e123526b92
--- /dev/null
+++ b/data/as/30016472/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016472",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUPIA GRANT PWSS",
+                "localname": "TUPIA GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUPIA GRANT PWSS",
+                        "localname": "TUPIA GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUPIA GRANT PWSS",
+                "localname": "TUPIA GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUPIA GRANT PWSS",
+                        "localname": "TUPIA GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016472/ws-services-calculation/Penalty.json b/data/as/30016472/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef51b54293
--- /dev/null
+++ b/data/as/30016472/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016472",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016472/ws-services-calculation/WCBillingSlab.json b/data/as/30016472/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1efcb8c83d
--- /dev/null
+++ b/data/as/30016472/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016472",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016510/BillingService/BusinessService.json b/data/as/30016510/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79e6de95d6
--- /dev/null
+++ b/data/as/30016510/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016510",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016510/egov-location/boundary-data.json b/data/as/30016510/egov-location/boundary-data.json
new file mode 100644
index 0000000000..476e4b6b2c
--- /dev/null
+++ b/data/as/30016510/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016510",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHULAPADUNG GAON PWSS",
+                "localname": "DHULAPADUNG GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHULAPADUNG GAON PWSS",
+                        "localname": "DHULAPADUNG GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHULAPADUNG GAON PWSS",
+                "localname": "DHULAPADUNG GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHULAPADUNG GAON PWSS",
+                        "localname": "DHULAPADUNG GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016510/ws-services-calculation/Penalty.json b/data/as/30016510/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44d6494674
--- /dev/null
+++ b/data/as/30016510/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016510",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016510/ws-services-calculation/WCBillingSlab.json b/data/as/30016510/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..564bacec59
--- /dev/null
+++ b/data/as/30016510/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016510",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016693/BillingService/BusinessService.json b/data/as/30016693/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c968b2874c
--- /dev/null
+++ b/data/as/30016693/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016693",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016693/egov-location/boundary-data.json b/data/as/30016693/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71fd85c326
--- /dev/null
+++ b/data/as/30016693/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016693",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN ADABARI TE PWSS",
+                "localname": "NATUN ADABARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN ADABARI TE PWSS",
+                        "localname": "NATUN ADABARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN ADABARI TE PWSS",
+                "localname": "NATUN ADABARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN ADABARI TE PWSS",
+                        "localname": "NATUN ADABARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016693/ws-services-calculation/Penalty.json b/data/as/30016693/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf621a06de
--- /dev/null
+++ b/data/as/30016693/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016693",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016693/ws-services-calculation/WCBillingSlab.json b/data/as/30016693/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a26294ef1b
--- /dev/null
+++ b/data/as/30016693/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016693",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016720/BillingService/BusinessService.json b/data/as/30016720/BillingService/BusinessService.json
new file mode 100644
index 0000000000..763d1b0d5e
--- /dev/null
+++ b/data/as/30016720/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016720",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016720/egov-location/boundary-data.json b/data/as/30016720/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d775571131
--- /dev/null
+++ b/data/as/30016720/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016720",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PT-I PWSS (NEW)",
+                "localname": "KALYANPUR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PT-I PWSS (NEW)",
+                        "localname": "KALYANPUR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PT-I PWSS (NEW)",
+                "localname": "KALYANPUR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PT-I PWSS (NEW)",
+                        "localname": "KALYANPUR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016720/ws-services-calculation/Penalty.json b/data/as/30016720/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f2669e8fd2
--- /dev/null
+++ b/data/as/30016720/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016720",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016720/ws-services-calculation/WCBillingSlab.json b/data/as/30016720/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..34dbd69125
--- /dev/null
+++ b/data/as/30016720/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016720",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016724/BillingService/BusinessService.json b/data/as/30016724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57a7186e67
--- /dev/null
+++ b/data/as/30016724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016724/egov-location/boundary-data.json b/data/as/30016724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..57a396b0ea
--- /dev/null
+++ b/data/as/30016724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DORARPAR PWSS (NEW)",
+                "localname": "DORARPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DORARPAR PWSS (NEW)",
+                        "localname": "DORARPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DORARPAR PWSS (NEW)",
+                "localname": "DORARPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DORARPAR PWSS (NEW)",
+                        "localname": "DORARPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016724/ws-services-calculation/Penalty.json b/data/as/30016724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc390051ff
--- /dev/null
+++ b/data/as/30016724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016724/ws-services-calculation/WCBillingSlab.json b/data/as/30016724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8dc9b7f921
--- /dev/null
+++ b/data/as/30016724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016755/BillingService/BusinessService.json b/data/as/30016755/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70236317de
--- /dev/null
+++ b/data/as/30016755/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016755",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016755/egov-location/boundary-data.json b/data/as/30016755/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0611bba37b
--- /dev/null
+++ b/data/as/30016755/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016755",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                "localname": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016755",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                        "localname": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                "localname": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016755",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                        "localname": "DEBATTAR BAPUPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016755/ws-services-calculation/Penalty.json b/data/as/30016755/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6cd0b2e33b
--- /dev/null
+++ b/data/as/30016755/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016755",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016755/ws-services-calculation/WCBillingSlab.json b/data/as/30016755/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c388c7f258
--- /dev/null
+++ b/data/as/30016755/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016755",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016761/BillingService/BusinessService.json b/data/as/30016761/BillingService/BusinessService.json
new file mode 100644
index 0000000000..21802fe0cd
--- /dev/null
+++ b/data/as/30016761/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016761",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016761/egov-location/boundary-data.json b/data/as/30016761/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f22d884e1
--- /dev/null
+++ b/data/as/30016761/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016761",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE KALGHAR LINE",
+                "localname": "SOPAI TE KALGHAR LINE",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016761",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE KALGHAR LINE",
+                        "localname": "SOPAI TE KALGHAR LINE",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPAI TE KALGHAR LINE",
+                "localname": "SOPAI TE KALGHAR LINE",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016761",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPAI TE KALGHAR LINE",
+                        "localname": "SOPAI TE KALGHAR LINE",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016761/ws-services-calculation/Penalty.json b/data/as/30016761/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..add4bb69e5
--- /dev/null
+++ b/data/as/30016761/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016761",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016761/ws-services-calculation/WCBillingSlab.json b/data/as/30016761/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b5686bf4d0
--- /dev/null
+++ b/data/as/30016761/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016761",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187171/BillingService/BusinessService.json b/data/as/8187171/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a347f6b175
--- /dev/null
+++ b/data/as/8187171/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187171",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187171/egov-location/boundary-data.json b/data/as/8187171/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b663247493
--- /dev/null
+++ b/data/as/8187171/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187171",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LABARIGAON PWSS",
+                "localname": "RETROFITTING OF LABARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187171",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LABARIGAON PWSS",
+                        "localname": "RETROFITTING OF LABARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LABARIGAON PWSS",
+                "localname": "RETROFITTING OF LABARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187171",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LABARIGAON PWSS",
+                        "localname": "RETROFITTING OF LABARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187171/ws-services-calculation/Penalty.json b/data/as/8187171/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8a513df204
--- /dev/null
+++ b/data/as/8187171/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187171",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187171/ws-services-calculation/WCBillingSlab.json b/data/as/8187171/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b11f151f1
--- /dev/null
+++ b/data/as/8187171/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187171",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187175/BillingService/BusinessService.json b/data/as/8187175/BillingService/BusinessService.json
new file mode 100644
index 0000000000..904b90af1c
--- /dev/null
+++ b/data/as/8187175/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187175",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187175/egov-location/boundary-data.json b/data/as/8187175/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a31e22597
--- /dev/null
+++ b/data/as/8187175/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187175",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                "localname": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                        "localname": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                "localname": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                        "localname": "RETROFITTING OF NAHARBARI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187175/ws-services-calculation/Penalty.json b/data/as/8187175/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a51f4e60ed
--- /dev/null
+++ b/data/as/8187175/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187175",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187175/ws-services-calculation/WCBillingSlab.json b/data/as/8187175/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a691553227
--- /dev/null
+++ b/data/as/8187175/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187175",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187179/BillingService/BusinessService.json b/data/as/8187179/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9575dee976
--- /dev/null
+++ b/data/as/8187179/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187179",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187179/egov-location/boundary-data.json b/data/as/8187179/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a3a8745375
--- /dev/null
+++ b/data/as/8187179/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187179",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MIZIBARI PWSS",
+                "localname": "RETROFITTING OF MIZIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MIZIBARI PWSS",
+                        "localname": "RETROFITTING OF MIZIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MIZIBARI PWSS",
+                "localname": "RETROFITTING OF MIZIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MIZIBARI PWSS",
+                        "localname": "RETROFITTING OF MIZIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187179/ws-services-calculation/Penalty.json b/data/as/8187179/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a472a3702
--- /dev/null
+++ b/data/as/8187179/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187179",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187179/ws-services-calculation/WCBillingSlab.json b/data/as/8187179/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..18539d8f95
--- /dev/null
+++ b/data/as/8187179/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187179",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187185/BillingService/BusinessService.json b/data/as/8187185/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92e302129f
--- /dev/null
+++ b/data/as/8187185/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187185",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187185/egov-location/boundary-data.json b/data/as/8187185/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f9231d5bf
--- /dev/null
+++ b/data/as/8187185/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187185",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHERGAON PWSS",
+                "localname": "RETROFITTING OF BHERGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187185",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHERGAON PWSS",
+                        "localname": "RETROFITTING OF BHERGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHERGAON PWSS",
+                "localname": "RETROFITTING OF BHERGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187185",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHERGAON PWSS",
+                        "localname": "RETROFITTING OF BHERGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187185/ws-services-calculation/Penalty.json b/data/as/8187185/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..698883ff0f
--- /dev/null
+++ b/data/as/8187185/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187185",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187185/ws-services-calculation/WCBillingSlab.json b/data/as/8187185/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d7104490ce
--- /dev/null
+++ b/data/as/8187185/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187185",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187193/BillingService/BusinessService.json b/data/as/8187193/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1fc2805259
--- /dev/null
+++ b/data/as/8187193/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187193",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187193/egov-location/boundary-data.json b/data/as/8187193/egov-location/boundary-data.json
new file mode 100644
index 0000000000..82eb39e4a0
--- /dev/null
+++ b/data/as/8187193/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187193",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SANTIPUR PWSS",
+                "localname": "RETROFITTING OF SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SANTIPUR PWSS",
+                        "localname": "RETROFITTING OF SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SANTIPUR PWSS",
+                "localname": "RETROFITTING OF SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SANTIPUR PWSS",
+                        "localname": "RETROFITTING OF SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187193/ws-services-calculation/Penalty.json b/data/as/8187193/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dbe8badae1
--- /dev/null
+++ b/data/as/8187193/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187193",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187193/ws-services-calculation/WCBillingSlab.json b/data/as/8187193/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fed708d7dc
--- /dev/null
+++ b/data/as/8187193/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187193",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187270/BillingService/BusinessService.json b/data/as/8187270/BillingService/BusinessService.json
new file mode 100644
index 0000000000..76236734ef
--- /dev/null
+++ b/data/as/8187270/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187270",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187270/egov-location/boundary-data.json b/data/as/8187270/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f00e9ad287
--- /dev/null
+++ b/data/as/8187270/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187270",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BAHBARI PWSS",
+                "localname": "RETROFITTING OF NIZ BAHBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187270",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BAHBARI PWSS",
+                        "localname": "RETROFITTING OF NIZ BAHBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BAHBARI PWSS",
+                "localname": "RETROFITTING OF NIZ BAHBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187270",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BAHBARI PWSS",
+                        "localname": "RETROFITTING OF NIZ BAHBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187270/ws-services-calculation/Penalty.json b/data/as/8187270/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d419ae5646
--- /dev/null
+++ b/data/as/8187270/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187270",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187270/ws-services-calculation/WCBillingSlab.json b/data/as/8187270/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc2f55b46a
--- /dev/null
+++ b/data/as/8187270/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187270",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187278/BillingService/BusinessService.json b/data/as/8187278/BillingService/BusinessService.json
new file mode 100644
index 0000000000..442f0090c8
--- /dev/null
+++ b/data/as/8187278/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187278",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187278/egov-location/boundary-data.json b/data/as/8187278/egov-location/boundary-data.json
new file mode 100644
index 0000000000..37790fdc89
--- /dev/null
+++ b/data/as/8187278/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187278",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARSON PWSS",
+                "localname": "RETROFITTING OF BARSON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARSON PWSS",
+                        "localname": "RETROFITTING OF BARSON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARSON PWSS",
+                "localname": "RETROFITTING OF BARSON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARSON PWSS",
+                        "localname": "RETROFITTING OF BARSON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187278/ws-services-calculation/Penalty.json b/data/as/8187278/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..090d37fa32
--- /dev/null
+++ b/data/as/8187278/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187278",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187278/ws-services-calculation/WCBillingSlab.json b/data/as/8187278/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d971b3a152
--- /dev/null
+++ b/data/as/8187278/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187278",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187290/BillingService/BusinessService.json b/data/as/8187290/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b8fcd38d8
--- /dev/null
+++ b/data/as/8187290/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187290",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187290/egov-location/boundary-data.json b/data/as/8187290/egov-location/boundary-data.json
new file mode 100644
index 0000000000..755686f535
--- /dev/null
+++ b/data/as/8187290/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187290",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF OLD GHAGRA PWSS",
+                "localname": "RETROFITTING OF OLD GHAGRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187290",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF OLD GHAGRA PWSS",
+                        "localname": "RETROFITTING OF OLD GHAGRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF OLD GHAGRA PWSS",
+                "localname": "RETROFITTING OF OLD GHAGRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187290",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF OLD GHAGRA PWSS",
+                        "localname": "RETROFITTING OF OLD GHAGRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187290/ws-services-calculation/Penalty.json b/data/as/8187290/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8035902fe4
--- /dev/null
+++ b/data/as/8187290/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187290",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187290/ws-services-calculation/WCBillingSlab.json b/data/as/8187290/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd21a8c9cb
--- /dev/null
+++ b/data/as/8187290/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187290",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187298/BillingService/BusinessService.json b/data/as/8187298/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7be6ab057c
--- /dev/null
+++ b/data/as/8187298/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187298",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187298/egov-location/boundary-data.json b/data/as/8187298/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7898343db3
--- /dev/null
+++ b/data/as/8187298/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187298",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GERUAGAON PWSS",
+                "localname": "RETROFITTING OF GERUAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GERUAGAON PWSS",
+                        "localname": "RETROFITTING OF GERUAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GERUAGAON PWSS",
+                "localname": "RETROFITTING OF GERUAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GERUAGAON PWSS",
+                        "localname": "RETROFITTING OF GERUAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187298/ws-services-calculation/Penalty.json b/data/as/8187298/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3adbadb09b
--- /dev/null
+++ b/data/as/8187298/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187298",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187298/ws-services-calculation/WCBillingSlab.json b/data/as/8187298/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b551ea47d9
--- /dev/null
+++ b/data/as/8187298/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187298",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187307/BillingService/BusinessService.json b/data/as/8187307/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99c24d08a9
--- /dev/null
+++ b/data/as/8187307/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187307",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187307/egov-location/boundary-data.json b/data/as/8187307/egov-location/boundary-data.json
new file mode 100644
index 0000000000..59299a28c0
--- /dev/null
+++ b/data/as/8187307/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187307",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TUMUKI PWSS",
+                "localname": "RETROFITTING OF TUMUKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TUMUKI PWSS",
+                        "localname": "RETROFITTING OF TUMUKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TUMUKI PWSS",
+                "localname": "RETROFITTING OF TUMUKI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TUMUKI PWSS",
+                        "localname": "RETROFITTING OF TUMUKI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187307/ws-services-calculation/Penalty.json b/data/as/8187307/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b1e7e96aa
--- /dev/null
+++ b/data/as/8187307/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187307",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187307/ws-services-calculation/WCBillingSlab.json b/data/as/8187307/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..09b7699191
--- /dev/null
+++ b/data/as/8187307/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187307",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187315/BillingService/BusinessService.json b/data/as/8187315/BillingService/BusinessService.json
new file mode 100644
index 0000000000..776745d6ba
--- /dev/null
+++ b/data/as/8187315/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187315",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187315/egov-location/boundary-data.json b/data/as/8187315/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e3d0f9160
--- /dev/null
+++ b/data/as/8187315/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187315",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                "localname": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                        "localname": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                "localname": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                        "localname": "RETROFITTING OF SINGIMARI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187315/ws-services-calculation/Penalty.json b/data/as/8187315/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..458182e43f
--- /dev/null
+++ b/data/as/8187315/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187315",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187315/ws-services-calculation/WCBillingSlab.json b/data/as/8187315/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8da6ddd07b
--- /dev/null
+++ b/data/as/8187315/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187315",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187323/BillingService/BusinessService.json b/data/as/8187323/BillingService/BusinessService.json
new file mode 100644
index 0000000000..436c68da24
--- /dev/null
+++ b/data/as/8187323/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187323",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187323/egov-location/boundary-data.json b/data/as/8187323/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2de06c0fdf
--- /dev/null
+++ b/data/as/8187323/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187323",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ALISINGA PWSS",
+                "localname": "RETROFITTING OF ALISINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187323",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ALISINGA PWSS",
+                        "localname": "RETROFITTING OF ALISINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ALISINGA PWSS",
+                "localname": "RETROFITTING OF ALISINGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187323",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ALISINGA PWSS",
+                        "localname": "RETROFITTING OF ALISINGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187323/ws-services-calculation/Penalty.json b/data/as/8187323/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..995ec334e0
--- /dev/null
+++ b/data/as/8187323/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187323",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187323/ws-services-calculation/WCBillingSlab.json b/data/as/8187323/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..73f3b3b365
--- /dev/null
+++ b/data/as/8187323/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187323",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187332/BillingService/BusinessService.json b/data/as/8187332/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da1785f6cc
--- /dev/null
+++ b/data/as/8187332/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187332",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187332/egov-location/boundary-data.json b/data/as/8187332/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b105412f63
--- /dev/null
+++ b/data/as/8187332/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187332",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                "localname": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187332",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                        "localname": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                "localname": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187332",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                        "localname": "RETROFITTING OF DHEKIAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187332/ws-services-calculation/Penalty.json b/data/as/8187332/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..268b7c958d
--- /dev/null
+++ b/data/as/8187332/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187332",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187332/ws-services-calculation/WCBillingSlab.json b/data/as/8187332/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e2a6ff1381
--- /dev/null
+++ b/data/as/8187332/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187332",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187337/BillingService/BusinessService.json b/data/as/8187337/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d99656fa5
--- /dev/null
+++ b/data/as/8187337/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187337",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187337/egov-location/boundary-data.json b/data/as/8187337/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15dc98aa7b
--- /dev/null
+++ b/data/as/8187337/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187337",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ORIONTOLI PWSS",
+                "localname": "RETROFITTING OF ORIONTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ORIONTOLI PWSS",
+                        "localname": "RETROFITTING OF ORIONTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ORIONTOLI PWSS",
+                "localname": "RETROFITTING OF ORIONTOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ORIONTOLI PWSS",
+                        "localname": "RETROFITTING OF ORIONTOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187337/ws-services-calculation/Penalty.json b/data/as/8187337/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46f32cd1d1
--- /dev/null
+++ b/data/as/8187337/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187337",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187337/ws-services-calculation/WCBillingSlab.json b/data/as/8187337/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b484d2bd0f
--- /dev/null
+++ b/data/as/8187337/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187337",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187344/BillingService/BusinessService.json b/data/as/8187344/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e663b6aa1
--- /dev/null
+++ b/data/as/8187344/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187344",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187344/egov-location/boundary-data.json b/data/as/8187344/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a234a9359
--- /dev/null
+++ b/data/as/8187344/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187344",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PIRAKATA PWSS",
+                "localname": "RETROFITTING OF PIRAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PIRAKATA PWSS",
+                        "localname": "RETROFITTING OF PIRAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PIRAKATA PWSS",
+                "localname": "RETROFITTING OF PIRAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PIRAKATA PWSS",
+                        "localname": "RETROFITTING OF PIRAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187344/ws-services-calculation/Penalty.json b/data/as/8187344/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73fdb351fe
--- /dev/null
+++ b/data/as/8187344/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187344",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187344/ws-services-calculation/WCBillingSlab.json b/data/as/8187344/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4902ad32c3
--- /dev/null
+++ b/data/as/8187344/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187344",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187350/BillingService/BusinessService.json b/data/as/8187350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ab7055580
--- /dev/null
+++ b/data/as/8187350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187350/egov-location/boundary-data.json b/data/as/8187350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..442b5c542a
--- /dev/null
+++ b/data/as/8187350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MEDHICHUBURI PWSS",
+                "localname": "RETROFITTING OF MEDHICHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MEDHICHUBURI PWSS",
+                        "localname": "RETROFITTING OF MEDHICHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MEDHICHUBURI PWSS",
+                "localname": "RETROFITTING OF MEDHICHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MEDHICHUBURI PWSS",
+                        "localname": "RETROFITTING OF MEDHICHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187350/ws-services-calculation/Penalty.json b/data/as/8187350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5363753de
--- /dev/null
+++ b/data/as/8187350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187350/ws-services-calculation/WCBillingSlab.json b/data/as/8187350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93ff4647e4
--- /dev/null
+++ b/data/as/8187350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187548/BillingService/BusinessService.json b/data/as/8187548/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e07a1819f8
--- /dev/null
+++ b/data/as/8187548/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187548",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187548/egov-location/boundary-data.json b/data/as/8187548/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44a5e34b59
--- /dev/null
+++ b/data/as/8187548/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187548",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHENGELIMORA PWSS",
+                "localname": "RETROFITTING OF CHENGELIMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187548",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHENGELIMORA PWSS",
+                        "localname": "RETROFITTING OF CHENGELIMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHENGELIMORA PWSS",
+                "localname": "RETROFITTING OF CHENGELIMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187548",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHENGELIMORA PWSS",
+                        "localname": "RETROFITTING OF CHENGELIMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187548/ws-services-calculation/Penalty.json b/data/as/8187548/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dafefb3280
--- /dev/null
+++ b/data/as/8187548/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187548",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187548/ws-services-calculation/WCBillingSlab.json b/data/as/8187548/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a886ccaec6
--- /dev/null
+++ b/data/as/8187548/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187548",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187585/BillingService/BusinessService.json b/data/as/8187585/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa57273692
--- /dev/null
+++ b/data/as/8187585/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8187585",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187585/egov-location/boundary-data.json b/data/as/8187585/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4a0c20b4ea
--- /dev/null
+++ b/data/as/8187585/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8187585",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATIAMARI PWSS",
+                "localname": "RETROFITTING OF BATIAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187585",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATIAMARI PWSS",
+                        "localname": "RETROFITTING OF BATIAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATIAMARI PWSS",
+                "localname": "RETROFITTING OF BATIAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8187585",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATIAMARI PWSS",
+                        "localname": "RETROFITTING OF BATIAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187585/ws-services-calculation/Penalty.json b/data/as/8187585/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90af8f7886
--- /dev/null
+++ b/data/as/8187585/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8187585",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8187585/ws-services-calculation/WCBillingSlab.json b/data/as/8187585/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48b954618e
--- /dev/null
+++ b/data/as/8187585/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8187585",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188301/BillingService/BusinessService.json b/data/as/8188301/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a9fb369a9d
--- /dev/null
+++ b/data/as/8188301/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8188301",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188301/egov-location/boundary-data.json b/data/as/8188301/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2bc711f9e0
--- /dev/null
+++ b/data/as/8188301/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8188301",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MODOPI PWSS",
+                "localname": "RETROFITTING OF MODOPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8188301",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MODOPI PWSS",
+                        "localname": "RETROFITTING OF MODOPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MODOPI PWSS",
+                "localname": "RETROFITTING OF MODOPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8188301",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MODOPI PWSS",
+                        "localname": "RETROFITTING OF MODOPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188301/ws-services-calculation/Penalty.json b/data/as/8188301/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6f5b116b5
--- /dev/null
+++ b/data/as/8188301/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8188301",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188301/ws-services-calculation/WCBillingSlab.json b/data/as/8188301/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0117bf699d
--- /dev/null
+++ b/data/as/8188301/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8188301",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188715/BillingService/BusinessService.json b/data/as/8188715/BillingService/BusinessService.json
new file mode 100644
index 0000000000..38669b78db
--- /dev/null
+++ b/data/as/8188715/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8188715",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188715/egov-location/boundary-data.json b/data/as/8188715/egov-location/boundary-data.json
new file mode 100644
index 0000000000..129f8d6b92
--- /dev/null
+++ b/data/as/8188715/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8188715",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                "localname": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8188715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                        "localname": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                "localname": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8188715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                        "localname": "RETROFITTING OF BAMUNPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188715/ws-services-calculation/Penalty.json b/data/as/8188715/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c88dad35ad
--- /dev/null
+++ b/data/as/8188715/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8188715",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8188715/ws-services-calculation/WCBillingSlab.json b/data/as/8188715/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..887f5b8824
--- /dev/null
+++ b/data/as/8188715/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8188715",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189136/BillingService/BusinessService.json b/data/as/8189136/BillingService/BusinessService.json
new file mode 100644
index 0000000000..902c3a6c56
--- /dev/null
+++ b/data/as/8189136/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8189136",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189136/egov-location/boundary-data.json b/data/as/8189136/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f2d2658e3
--- /dev/null
+++ b/data/as/8189136/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8189136",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHULAPADUNG PWSS",
+                "localname": "RETROFITTING OF DHULAPADUNG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8189136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHULAPADUNG PWSS",
+                        "localname": "RETROFITTING OF DHULAPADUNG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHULAPADUNG PWSS",
+                "localname": "RETROFITTING OF DHULAPADUNG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8189136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHULAPADUNG PWSS",
+                        "localname": "RETROFITTING OF DHULAPADUNG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189136/ws-services-calculation/Penalty.json b/data/as/8189136/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dd1503da35
--- /dev/null
+++ b/data/as/8189136/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8189136",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189136/ws-services-calculation/WCBillingSlab.json b/data/as/8189136/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ec7bb7f9e4
--- /dev/null
+++ b/data/as/8189136/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8189136",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189158/BillingService/BusinessService.json b/data/as/8189158/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7bd2dbaf7b
--- /dev/null
+++ b/data/as/8189158/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8189158",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189158/egov-location/boundary-data.json b/data/as/8189158/egov-location/boundary-data.json
new file mode 100644
index 0000000000..826ffe648b
--- /dev/null
+++ b/data/as/8189158/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8189158",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                "localname": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8189158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                        "localname": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                "localname": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8189158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                        "localname": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189158/ws-services-calculation/Penalty.json b/data/as/8189158/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d877769f9a
--- /dev/null
+++ b/data/as/8189158/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8189158",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8189158/ws-services-calculation/WCBillingSlab.json b/data/as/8189158/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dede0b3eae
--- /dev/null
+++ b/data/as/8189158/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8189158",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192257/egov-location/boundary-data.json b/data/as/8192257/egov-location/boundary-data.json
index 717a132fcb..3f438a595e 100644
--- a/data/as/8192257/egov-location/boundary-data.json
+++ b/data/as/8192257/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "MAZGAON PWSS",
-                "localname": "MAZGAON PWSS",
+                "name": "RETROFITTING OF MAZGAON PWSS",
+                "localname": "RETROFITTING OF MAZGAON PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "MAZGAON PWSS",
-                        "localname": "MAZGAON PWSS",
+                        "name": "RETROFITTING OF MAZGAON PWSS",
+                        "localname": "RETROFITTING OF MAZGAON PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "MAZGAON PWSS",
-                "localname": "MAZGAON PWSS",
+                "name": "RETROFITTING OF MAZGAON PWSS",
+                "localname": "RETROFITTING OF MAZGAON PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "MAZGAON PWSS",
-                        "localname": "MAZGAON PWSS",
+                        "name": "RETROFITTING OF MAZGAON PWSS",
+                        "localname": "RETROFITTING OF MAZGAON PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/8192257/ws-services-calculation/WCBillingSlab.json b/data/as/8192257/ws-services-calculation/WCBillingSlab.json
index b7439d8f18..41274192f4 100644
--- a/data/as/8192257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192257/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 70.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192432/BillingService/BusinessService.json b/data/as/8192432/BillingService/BusinessService.json
new file mode 100644
index 0000000000..720dc52491
--- /dev/null
+++ b/data/as/8192432/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192432",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192432/egov-location/boundary-data.json b/data/as/8192432/egov-location/boundary-data.json
new file mode 100644
index 0000000000..240b458f85
--- /dev/null
+++ b/data/as/8192432/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192432",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                "localname": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192432",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                        "localname": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                "localname": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192432",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                        "localname": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192432/ws-services-calculation/Penalty.json b/data/as/8192432/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4248c00406
--- /dev/null
+++ b/data/as/8192432/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192432",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192432/ws-services-calculation/WCBillingSlab.json b/data/as/8192432/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47cf6287c1
--- /dev/null
+++ b/data/as/8192432/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192432",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192456/egov-location/boundary-data.json b/data/as/8192456/egov-location/boundary-data.json
index 9a69eb4ede..36bb68c4af 100644
--- a/data/as/8192456/egov-location/boundary-data.json
+++ b/data/as/8192456/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "DEORIGAON PWSS",
-                "localname": "DEORIGAON PWSS",
+                "name": "RETROFITTING OF DEORIGAON PWSS",
+                "localname": "RETROFITTING OF DEORIGAON PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "DEORIGAON PWSS",
-                        "localname": "DEORIGAON PWSS",
+                        "name": "RETROFITTING OF DEORIGAON PWSS",
+                        "localname": "RETROFITTING OF DEORIGAON PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "DEORIGAON PWSS",
-                "localname": "DEORIGAON PWSS",
+                "name": "RETROFITTING OF DEORIGAON PWSS",
+                "localname": "RETROFITTING OF DEORIGAON PWSS",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "DEORIGAON PWSS",
-                        "localname": "DEORIGAON PWSS",
+                        "name": "RETROFITTING OF DEORIGAON PWSS",
+                        "localname": "RETROFITTING OF DEORIGAON PWSS",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/8192456/ws-services-calculation/WCBillingSlab.json b/data/as/8192456/ws-services-calculation/WCBillingSlab.json
index 37179f231c..3148871056 100644
--- a/data/as/8192456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192456/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192523/BillingService/BusinessService.json b/data/as/8192523/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1c39368bfd
--- /dev/null
+++ b/data/as/8192523/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192523",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192523/egov-location/boundary-data.json b/data/as/8192523/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c1048ca1c
--- /dev/null
+++ b/data/as/8192523/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192523",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONAJULI TE PWSS",
+                "localname": "RETROFITTING OF SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192523",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONAJULI TE PWSS",
+                        "localname": "RETROFITTING OF SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONAJULI TE PWSS",
+                "localname": "RETROFITTING OF SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192523",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONAJULI TE PWSS",
+                        "localname": "RETROFITTING OF SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192523/ws-services-calculation/Penalty.json b/data/as/8192523/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..21a8e3be93
--- /dev/null
+++ b/data/as/8192523/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192523",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192523/ws-services-calculation/WCBillingSlab.json b/data/as/8192523/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..88fec3f1fa
--- /dev/null
+++ b/data/as/8192523/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192523",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192570/BillingService/BusinessService.json b/data/as/8192570/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86a4985dda
--- /dev/null
+++ b/data/as/8192570/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192570",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192570/egov-location/boundary-data.json b/data/as/8192570/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5e33dde44
--- /dev/null
+++ b/data/as/8192570/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192570",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                "localname": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                        "localname": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                "localname": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                        "localname": "RETROFITTING OF SOPORA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192570/ws-services-calculation/Penalty.json b/data/as/8192570/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b46eb15c7
--- /dev/null
+++ b/data/as/8192570/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192570",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192570/ws-services-calculation/WCBillingSlab.json b/data/as/8192570/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..19023d115c
--- /dev/null
+++ b/data/as/8192570/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192570",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192597/BillingService/BusinessService.json b/data/as/8192597/BillingService/BusinessService.json
new file mode 100644
index 0000000000..21f224ef93
--- /dev/null
+++ b/data/as/8192597/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192597",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192597/egov-location/boundary-data.json b/data/as/8192597/egov-location/boundary-data.json
new file mode 100644
index 0000000000..164821c92c
--- /dev/null
+++ b/data/as/8192597/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192597",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONABIL TE PWSS",
+                "localname": "RETROFITTING OF SONABIL TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192597",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONABIL TE PWSS",
+                        "localname": "RETROFITTING OF SONABIL TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONABIL TE PWSS",
+                "localname": "RETROFITTING OF SONABIL TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192597",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONABIL TE PWSS",
+                        "localname": "RETROFITTING OF SONABIL TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192597/ws-services-calculation/Penalty.json b/data/as/8192597/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9230f5a28d
--- /dev/null
+++ b/data/as/8192597/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192597",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192597/ws-services-calculation/WCBillingSlab.json b/data/as/8192597/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f929c44084
--- /dev/null
+++ b/data/as/8192597/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192597",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192615/BillingService/BusinessService.json b/data/as/8192615/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ba5c5c9fca
--- /dev/null
+++ b/data/as/8192615/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192615",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192615/egov-location/boundary-data.json b/data/as/8192615/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a8ed71c94a
--- /dev/null
+++ b/data/as/8192615/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192615",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TUPIA PWSS",
+                "localname": "RETROFITTING OF TUPIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TUPIA PWSS",
+                        "localname": "RETROFITTING OF TUPIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TUPIA PWSS",
+                "localname": "RETROFITTING OF TUPIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TUPIA PWSS",
+                        "localname": "RETROFITTING OF TUPIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192615/ws-services-calculation/Penalty.json b/data/as/8192615/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1350858a3
--- /dev/null
+++ b/data/as/8192615/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192615",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192615/ws-services-calculation/WCBillingSlab.json b/data/as/8192615/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1ecae61477
--- /dev/null
+++ b/data/as/8192615/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192615",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192622/BillingService/BusinessService.json b/data/as/8192622/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7885ee7678
--- /dev/null
+++ b/data/as/8192622/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192622",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192622/egov-location/boundary-data.json b/data/as/8192622/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d8ef6dbc8
--- /dev/null
+++ b/data/as/8192622/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192622",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                "localname": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192622",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                        "localname": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                "localname": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192622",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                        "localname": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192622/ws-services-calculation/Penalty.json b/data/as/8192622/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a54b06503
--- /dev/null
+++ b/data/as/8192622/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192622",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192622/ws-services-calculation/WCBillingSlab.json b/data/as/8192622/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..106a47e92e
--- /dev/null
+++ b/data/as/8192622/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192622",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192631/BillingService/BusinessService.json b/data/as/8192631/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd382289ae
--- /dev/null
+++ b/data/as/8192631/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192631",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192631/egov-location/boundary-data.json b/data/as/8192631/egov-location/boundary-data.json
new file mode 100644
index 0000000000..571808cafa
--- /dev/null
+++ b/data/as/8192631/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192631",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PURONI ALIMUR PWSS",
+                "localname": "RETROFITTING OF PURONI ALIMUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PURONI ALIMUR PWSS",
+                        "localname": "RETROFITTING OF PURONI ALIMUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PURONI ALIMUR PWSS",
+                "localname": "RETROFITTING OF PURONI ALIMUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PURONI ALIMUR PWSS",
+                        "localname": "RETROFITTING OF PURONI ALIMUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192631/ws-services-calculation/Penalty.json b/data/as/8192631/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bdaa6fd89a
--- /dev/null
+++ b/data/as/8192631/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192631",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192631/ws-services-calculation/WCBillingSlab.json b/data/as/8192631/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f17a29b1fd
--- /dev/null
+++ b/data/as/8192631/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192631",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192655/BillingService/BusinessService.json b/data/as/8192655/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a1860fb3f0
--- /dev/null
+++ b/data/as/8192655/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192655",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192655/egov-location/boundary-data.json b/data/as/8192655/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c0889f54f1
--- /dev/null
+++ b/data/as/8192655/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192655",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PHULAGURI PWSS",
+                "localname": "RETROFITTING OF PHULAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PHULAGURI PWSS",
+                        "localname": "RETROFITTING OF PHULAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PHULAGURI PWSS",
+                "localname": "RETROFITTING OF PHULAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PHULAGURI PWSS",
+                        "localname": "RETROFITTING OF PHULAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192655/ws-services-calculation/Penalty.json b/data/as/8192655/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..894ac529b4
--- /dev/null
+++ b/data/as/8192655/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192655",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192655/ws-services-calculation/WCBillingSlab.json b/data/as/8192655/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..228afbc701
--- /dev/null
+++ b/data/as/8192655/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192655",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192673/BillingService/BusinessService.json b/data/as/8192673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..959d1bb577
--- /dev/null
+++ b/data/as/8192673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192673/egov-location/boundary-data.json b/data/as/8192673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0966ac205e
--- /dev/null
+++ b/data/as/8192673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MARABHARALIPAR PWSS",
+                "localname": "RETROFITTING OF MARABHARALIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MARABHARALIPAR PWSS",
+                        "localname": "RETROFITTING OF MARABHARALIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MARABHARALIPAR PWSS",
+                "localname": "RETROFITTING OF MARABHARALIPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MARABHARALIPAR PWSS",
+                        "localname": "RETROFITTING OF MARABHARALIPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192673/ws-services-calculation/Penalty.json b/data/as/8192673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..36cf1ec02d
--- /dev/null
+++ b/data/as/8192673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192673/ws-services-calculation/WCBillingSlab.json b/data/as/8192673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41f81c2e6e
--- /dev/null
+++ b/data/as/8192673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192716/BillingService/BusinessService.json b/data/as/8192716/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8420ed61c
--- /dev/null
+++ b/data/as/8192716/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8192716",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192716/egov-location/boundary-data.json b/data/as/8192716/egov-location/boundary-data.json
new file mode 100644
index 0000000000..168ac454b0
--- /dev/null
+++ b/data/as/8192716/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8192716",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                "localname": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                        "localname": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                "localname": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8192716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                        "localname": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192716/ws-services-calculation/Penalty.json b/data/as/8192716/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..97e0eabe03
--- /dev/null
+++ b/data/as/8192716/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8192716",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8192716/ws-services-calculation/WCBillingSlab.json b/data/as/8192716/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58601046c0
--- /dev/null
+++ b/data/as/8192716/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8192716",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195888/BillingService/BusinessService.json b/data/as/8195888/BillingService/BusinessService.json
new file mode 100644
index 0000000000..835e066302
--- /dev/null
+++ b/data/as/8195888/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8195888",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195888/egov-location/boundary-data.json b/data/as/8195888/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0ee08ace98
--- /dev/null
+++ b/data/as/8195888/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8195888",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                "localname": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8195888",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                        "localname": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                "localname": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8195888",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                        "localname": "RETROFITTING OF TINSORIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195888/ws-services-calculation/Penalty.json b/data/as/8195888/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..75263bb71f
--- /dev/null
+++ b/data/as/8195888/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8195888",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195888/ws-services-calculation/WCBillingSlab.json b/data/as/8195888/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b105661bcd
--- /dev/null
+++ b/data/as/8195888/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8195888",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195974/BillingService/BusinessService.json b/data/as/8195974/BillingService/BusinessService.json
new file mode 100644
index 0000000000..83b51cfe9d
--- /dev/null
+++ b/data/as/8195974/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8195974",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195974/egov-location/boundary-data.json b/data/as/8195974/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a700db15b
--- /dev/null
+++ b/data/as/8195974/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8195974",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALAKUCHI PWSS",
+                "localname": "RETROFITTING OF KALAKUCHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8195974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALAKUCHI PWSS",
+                        "localname": "RETROFITTING OF KALAKUCHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALAKUCHI PWSS",
+                "localname": "RETROFITTING OF KALAKUCHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8195974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALAKUCHI PWSS",
+                        "localname": "RETROFITTING OF KALAKUCHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195974/ws-services-calculation/Penalty.json b/data/as/8195974/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7189220ef5
--- /dev/null
+++ b/data/as/8195974/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8195974",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8195974/ws-services-calculation/WCBillingSlab.json b/data/as/8195974/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..76a43560bb
--- /dev/null
+++ b/data/as/8195974/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8195974",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196020/BillingService/BusinessService.json b/data/as/8196020/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45a5cbbaf2
--- /dev/null
+++ b/data/as/8196020/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196020",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196020/egov-location/boundary-data.json b/data/as/8196020/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7aff3e827d
--- /dev/null
+++ b/data/as/8196020/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196020",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LAKHUPARA PWSS",
+                "localname": "RETROFITTING OF LAKHUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LAKHUPARA PWSS",
+                        "localname": "RETROFITTING OF LAKHUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LAKHUPARA PWSS",
+                "localname": "RETROFITTING OF LAKHUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LAKHUPARA PWSS",
+                        "localname": "RETROFITTING OF LAKHUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196020/ws-services-calculation/Penalty.json b/data/as/8196020/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f04499cba3
--- /dev/null
+++ b/data/as/8196020/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196020",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196020/ws-services-calculation/WCBillingSlab.json b/data/as/8196020/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed3debde2d
--- /dev/null
+++ b/data/as/8196020/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196020",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196023/BillingService/BusinessService.json b/data/as/8196023/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd42b19682
--- /dev/null
+++ b/data/as/8196023/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196023",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196023/egov-location/boundary-data.json b/data/as/8196023/egov-location/boundary-data.json
new file mode 100644
index 0000000000..396b3a3d4a
--- /dev/null
+++ b/data/as/8196023/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196023",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THEKERAJULI PWSS",
+                "localname": "RETROFITTING OF THEKERAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THEKERAJULI PWSS",
+                        "localname": "RETROFITTING OF THEKERAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THEKERAJULI PWSS",
+                "localname": "RETROFITTING OF THEKERAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THEKERAJULI PWSS",
+                        "localname": "RETROFITTING OF THEKERAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196023/ws-services-calculation/Penalty.json b/data/as/8196023/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0db9b7f53e
--- /dev/null
+++ b/data/as/8196023/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196023",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196023/ws-services-calculation/WCBillingSlab.json b/data/as/8196023/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c08308b7fe
--- /dev/null
+++ b/data/as/8196023/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196023",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196027/BillingService/BusinessService.json b/data/as/8196027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e9560a521
--- /dev/null
+++ b/data/as/8196027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196027/egov-location/boundary-data.json b/data/as/8196027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2fc022fd3
--- /dev/null
+++ b/data/as/8196027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINKHARIA PWSS",
+                "localname": "RETROFITTING OF TINKHARIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINKHARIA PWSS",
+                        "localname": "RETROFITTING OF TINKHARIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINKHARIA PWSS",
+                "localname": "RETROFITTING OF TINKHARIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINKHARIA PWSS",
+                        "localname": "RETROFITTING OF TINKHARIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196027/ws-services-calculation/Penalty.json b/data/as/8196027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a39bff137
--- /dev/null
+++ b/data/as/8196027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196027/ws-services-calculation/WCBillingSlab.json b/data/as/8196027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bddb03b337
--- /dev/null
+++ b/data/as/8196027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196029/BillingService/BusinessService.json b/data/as/8196029/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b612a5710
--- /dev/null
+++ b/data/as/8196029/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196029",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196029/egov-location/boundary-data.json b/data/as/8196029/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47886f9637
--- /dev/null
+++ b/data/as/8196029/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196029",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARBIL KACHARI PWSS",
+                "localname": "RETROFITTING OF BARBIL KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196029",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARBIL KACHARI PWSS",
+                        "localname": "RETROFITTING OF BARBIL KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARBIL KACHARI PWSS",
+                "localname": "RETROFITTING OF BARBIL KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196029",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARBIL KACHARI PWSS",
+                        "localname": "RETROFITTING OF BARBIL KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196029/ws-services-calculation/Penalty.json b/data/as/8196029/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6d0571535
--- /dev/null
+++ b/data/as/8196029/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196029",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196029/ws-services-calculation/WCBillingSlab.json b/data/as/8196029/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e6ca124e99
--- /dev/null
+++ b/data/as/8196029/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196029",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196038/BillingService/BusinessService.json b/data/as/8196038/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0aa979c3b8
--- /dev/null
+++ b/data/as/8196038/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196038",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196038/egov-location/boundary-data.json b/data/as/8196038/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aded07d718
--- /dev/null
+++ b/data/as/8196038/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196038",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF MEJENGJULI PWSS",
+                "localname": "RETROFITING OF MEJENGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF MEJENGJULI PWSS",
+                        "localname": "RETROFITING OF MEJENGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITING OF MEJENGJULI PWSS",
+                "localname": "RETROFITING OF MEJENGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITING OF MEJENGJULI PWSS",
+                        "localname": "RETROFITING OF MEJENGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196038/ws-services-calculation/Penalty.json b/data/as/8196038/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..564b629783
--- /dev/null
+++ b/data/as/8196038/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196038",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196038/ws-services-calculation/WCBillingSlab.json b/data/as/8196038/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e8a197dcb3
--- /dev/null
+++ b/data/as/8196038/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196038",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196756/BillingService/BusinessService.json b/data/as/8196756/BillingService/BusinessService.json
new file mode 100644
index 0000000000..06df8bc4b9
--- /dev/null
+++ b/data/as/8196756/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196756",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196756/egov-location/boundary-data.json b/data/as/8196756/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ed9fa2f96
--- /dev/null
+++ b/data/as/8196756/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196756",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARMORA SESABIL PWSS",
+                "localname": "RETROFITTING OF GARMORA SESABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196756",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARMORA SESABIL PWSS",
+                        "localname": "RETROFITTING OF GARMORA SESABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARMORA SESABIL PWSS",
+                "localname": "RETROFITTING OF GARMORA SESABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196756",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARMORA SESABIL PWSS",
+                        "localname": "RETROFITTING OF GARMORA SESABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196756/ws-services-calculation/Penalty.json b/data/as/8196756/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..866ff914f9
--- /dev/null
+++ b/data/as/8196756/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196756",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196756/ws-services-calculation/WCBillingSlab.json b/data/as/8196756/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..76c30f07d3
--- /dev/null
+++ b/data/as/8196756/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196756",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196774/BillingService/BusinessService.json b/data/as/8196774/BillingService/BusinessService.json
new file mode 100644
index 0000000000..acef5caa73
--- /dev/null
+++ b/data/as/8196774/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196774",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196774/egov-location/boundary-data.json b/data/as/8196774/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc96d03988
--- /dev/null
+++ b/data/as/8196774/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196774",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BELSIRI TE PWSS",
+                "localname": "RETROFITTING OF BELSIRI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196774",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BELSIRI TE PWSS",
+                        "localname": "RETROFITTING OF BELSIRI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BELSIRI TE PWSS",
+                "localname": "RETROFITTING OF BELSIRI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196774",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BELSIRI TE PWSS",
+                        "localname": "RETROFITTING OF BELSIRI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196774/ws-services-calculation/Penalty.json b/data/as/8196774/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df5427b3cb
--- /dev/null
+++ b/data/as/8196774/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196774",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196774/ws-services-calculation/WCBillingSlab.json b/data/as/8196774/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c561f01cc6
--- /dev/null
+++ b/data/as/8196774/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196774",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196779/BillingService/BusinessService.json b/data/as/8196779/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41a9ff37e4
--- /dev/null
+++ b/data/as/8196779/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196779",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196779/egov-location/boundary-data.json b/data/as/8196779/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6460db9c3c
--- /dev/null
+++ b/data/as/8196779/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196779",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORMORA KACHARI PWSS",
+                "localname": "RETROFITTING OF GORMORA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196779",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORMORA KACHARI PWSS",
+                        "localname": "RETROFITTING OF GORMORA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GORMORA KACHARI PWSS",
+                "localname": "RETROFITTING OF GORMORA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196779",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GORMORA KACHARI PWSS",
+                        "localname": "RETROFITTING OF GORMORA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196779/ws-services-calculation/Penalty.json b/data/as/8196779/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..06361f4fde
--- /dev/null
+++ b/data/as/8196779/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196779",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196779/ws-services-calculation/WCBillingSlab.json b/data/as/8196779/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42fffb474d
--- /dev/null
+++ b/data/as/8196779/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196779",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196786/BillingService/BusinessService.json b/data/as/8196786/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a809ba606
--- /dev/null
+++ b/data/as/8196786/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196786",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196786/egov-location/boundary-data.json b/data/as/8196786/egov-location/boundary-data.json
new file mode 100644
index 0000000000..875d6feb49
--- /dev/null
+++ b/data/as/8196786/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196786",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OG PAVAMARI PWSS",
+                "localname": "RETROFITTING OG PAVAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OG PAVAMARI PWSS",
+                        "localname": "RETROFITTING OG PAVAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OG PAVAMARI PWSS",
+                "localname": "RETROFITTING OG PAVAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OG PAVAMARI PWSS",
+                        "localname": "RETROFITTING OG PAVAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196786/ws-services-calculation/Penalty.json b/data/as/8196786/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0aad31eb29
--- /dev/null
+++ b/data/as/8196786/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196786",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196786/ws-services-calculation/WCBillingSlab.json b/data/as/8196786/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74347e18bd
--- /dev/null
+++ b/data/as/8196786/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196786",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196792/BillingService/BusinessService.json b/data/as/8196792/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d6e32fb1f
--- /dev/null
+++ b/data/as/8196792/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196792",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196792/egov-location/boundary-data.json b/data/as/8196792/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5b043cae7
--- /dev/null
+++ b/data/as/8196792/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196792",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OG JIAGABHARU PWSS",
+                "localname": "RETROFITTING OG JIAGABHARU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196792",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OG JIAGABHARU PWSS",
+                        "localname": "RETROFITTING OG JIAGABHARU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OG JIAGABHARU PWSS",
+                "localname": "RETROFITTING OG JIAGABHARU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196792",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OG JIAGABHARU PWSS",
+                        "localname": "RETROFITTING OG JIAGABHARU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196792/ws-services-calculation/Penalty.json b/data/as/8196792/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6b51295b45
--- /dev/null
+++ b/data/as/8196792/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196792",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196792/ws-services-calculation/WCBillingSlab.json b/data/as/8196792/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d7197fd83a
--- /dev/null
+++ b/data/as/8196792/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196792",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196816/BillingService/BusinessService.json b/data/as/8196816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..80542eb3e2
--- /dev/null
+++ b/data/as/8196816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196816/egov-location/boundary-data.json b/data/as/8196816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..96c6e39f03
--- /dev/null
+++ b/data/as/8196816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF REKAMARI PWSS",
+                "localname": "RETROFITTING OF REKAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF REKAMARI PWSS",
+                        "localname": "RETROFITTING OF REKAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF REKAMARI PWSS",
+                "localname": "RETROFITTING OF REKAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF REKAMARI PWSS",
+                        "localname": "RETROFITTING OF REKAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196816/ws-services-calculation/Penalty.json b/data/as/8196816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13ae1ce34a
--- /dev/null
+++ b/data/as/8196816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196816/ws-services-calculation/WCBillingSlab.json b/data/as/8196816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5ea87e70e
--- /dev/null
+++ b/data/as/8196816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196837/BillingService/BusinessService.json b/data/as/8196837/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4337b52069
--- /dev/null
+++ b/data/as/8196837/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196837",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196837/egov-location/boundary-data.json b/data/as/8196837/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44724b71ae
--- /dev/null
+++ b/data/as/8196837/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196837",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KEHRUKHANDA PWSS",
+                "localname": "RETROFITTING OF KEHRUKHANDA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196837",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KEHRUKHANDA PWSS",
+                        "localname": "RETROFITTING OF KEHRUKHANDA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KEHRUKHANDA PWSS",
+                "localname": "RETROFITTING OF KEHRUKHANDA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196837",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KEHRUKHANDA PWSS",
+                        "localname": "RETROFITTING OF KEHRUKHANDA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196837/ws-services-calculation/Penalty.json b/data/as/8196837/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8bf948a2b8
--- /dev/null
+++ b/data/as/8196837/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196837",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196837/ws-services-calculation/WCBillingSlab.json b/data/as/8196837/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..649db30329
--- /dev/null
+++ b/data/as/8196837/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196837",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196871/BillingService/BusinessService.json b/data/as/8196871/BillingService/BusinessService.json
new file mode 100644
index 0000000000..336a7d5213
--- /dev/null
+++ b/data/as/8196871/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196871",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196871/egov-location/boundary-data.json b/data/as/8196871/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4bffa1be9b
--- /dev/null
+++ b/data/as/8196871/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196871",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                "localname": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196871",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                        "localname": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                "localname": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196871",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                        "localname": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196871/ws-services-calculation/Penalty.json b/data/as/8196871/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..607a0c0b28
--- /dev/null
+++ b/data/as/8196871/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196871",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196871/ws-services-calculation/WCBillingSlab.json b/data/as/8196871/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a4053b878
--- /dev/null
+++ b/data/as/8196871/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196871",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196879/BillingService/BusinessService.json b/data/as/8196879/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a130afe49e
--- /dev/null
+++ b/data/as/8196879/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196879",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196879/egov-location/boundary-data.json b/data/as/8196879/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f68f977bd
--- /dev/null
+++ b/data/as/8196879/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196879",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GEJENGAGURI PWSS",
+                "localname": "RETROFITTING OF GEJENGAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GEJENGAGURI PWSS",
+                        "localname": "RETROFITTING OF GEJENGAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GEJENGAGURI PWSS",
+                "localname": "RETROFITTING OF GEJENGAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GEJENGAGURI PWSS",
+                        "localname": "RETROFITTING OF GEJENGAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196879/ws-services-calculation/Penalty.json b/data/as/8196879/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e482f33efc
--- /dev/null
+++ b/data/as/8196879/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196879",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196879/ws-services-calculation/WCBillingSlab.json b/data/as/8196879/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8d3115d8c
--- /dev/null
+++ b/data/as/8196879/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196879",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196894/BillingService/BusinessService.json b/data/as/8196894/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ff1955322e
--- /dev/null
+++ b/data/as/8196894/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196894",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196894/egov-location/boundary-data.json b/data/as/8196894/egov-location/boundary-data.json
new file mode 100644
index 0000000000..684a747c3e
--- /dev/null
+++ b/data/as/8196894/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196894",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARHAGI PWSS",
+                "localname": "RETROFITTING OF BANDARHAGI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196894",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARHAGI PWSS",
+                        "localname": "RETROFITTING OF BANDARHAGI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARHAGI PWSS",
+                "localname": "RETROFITTING OF BANDARHAGI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196894",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARHAGI PWSS",
+                        "localname": "RETROFITTING OF BANDARHAGI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196894/ws-services-calculation/Penalty.json b/data/as/8196894/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbe4632b83
--- /dev/null
+++ b/data/as/8196894/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196894",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196894/ws-services-calculation/WCBillingSlab.json b/data/as/8196894/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49ed4c8090
--- /dev/null
+++ b/data/as/8196894/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196894",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196903/BillingService/BusinessService.json b/data/as/8196903/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fcd10ff36c
--- /dev/null
+++ b/data/as/8196903/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196903",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196903/egov-location/boundary-data.json b/data/as/8196903/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7634926cec
--- /dev/null
+++ b/data/as/8196903/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196903",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANKHANABARI PWSS",
+                "localname": "RETROFITTING OF DHANKHANABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196903",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANKHANABARI PWSS",
+                        "localname": "RETROFITTING OF DHANKHANABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANKHANABARI PWSS",
+                "localname": "RETROFITTING OF DHANKHANABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196903",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANKHANABARI PWSS",
+                        "localname": "RETROFITTING OF DHANKHANABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196903/ws-services-calculation/Penalty.json b/data/as/8196903/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f322c5ab49
--- /dev/null
+++ b/data/as/8196903/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196903",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196903/ws-services-calculation/WCBillingSlab.json b/data/as/8196903/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f9dbf4ffa
--- /dev/null
+++ b/data/as/8196903/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196903",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196910/BillingService/BusinessService.json b/data/as/8196910/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bacbde3682
--- /dev/null
+++ b/data/as/8196910/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196910",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196910/egov-location/boundary-data.json b/data/as/8196910/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ee4a656fee
--- /dev/null
+++ b/data/as/8196910/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196910",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NABIL PATHER PWSS",
+                "localname": "RETROFITTING OF NABIL PATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NABIL PATHER PWSS",
+                        "localname": "RETROFITTING OF NABIL PATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NABIL PATHER PWSS",
+                "localname": "RETROFITTING OF NABIL PATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NABIL PATHER PWSS",
+                        "localname": "RETROFITTING OF NABIL PATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196910/ws-services-calculation/Penalty.json b/data/as/8196910/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7aead859cb
--- /dev/null
+++ b/data/as/8196910/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196910",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196910/ws-services-calculation/WCBillingSlab.json b/data/as/8196910/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..200306eb54
--- /dev/null
+++ b/data/as/8196910/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196910",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196914/BillingService/BusinessService.json b/data/as/8196914/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eccee6cbfd
--- /dev/null
+++ b/data/as/8196914/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196914",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196914/egov-location/boundary-data.json b/data/as/8196914/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c9ecceea6f
--- /dev/null
+++ b/data/as/8196914/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196914",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                "localname": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196914",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                        "localname": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                "localname": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196914",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                        "localname": "RETROFITTING OF BANDARSHREE PT III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196914/ws-services-calculation/Penalty.json b/data/as/8196914/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c3a2839e7
--- /dev/null
+++ b/data/as/8196914/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196914",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196914/ws-services-calculation/WCBillingSlab.json b/data/as/8196914/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea87356f2b
--- /dev/null
+++ b/data/as/8196914/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196914",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196954/BillingService/BusinessService.json b/data/as/8196954/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0905e64d33
--- /dev/null
+++ b/data/as/8196954/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196954",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196954/egov-location/boundary-data.json b/data/as/8196954/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3384c2e0a
--- /dev/null
+++ b/data/as/8196954/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196954",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAPURBHITA PWSS",
+                "localname": "RETROFITTING OF BAPURBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAPURBHITA PWSS",
+                        "localname": "RETROFITTING OF BAPURBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAPURBHITA PWSS",
+                "localname": "RETROFITTING OF BAPURBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAPURBHITA PWSS",
+                        "localname": "RETROFITTING OF BAPURBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196954/ws-services-calculation/Penalty.json b/data/as/8196954/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..221396b33d
--- /dev/null
+++ b/data/as/8196954/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196954",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196954/ws-services-calculation/WCBillingSlab.json b/data/as/8196954/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e515fc6d8
--- /dev/null
+++ b/data/as/8196954/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196954",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196972/BillingService/BusinessService.json b/data/as/8196972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d78e24857
--- /dev/null
+++ b/data/as/8196972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196972/egov-location/boundary-data.json b/data/as/8196972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..84aaf046a1
--- /dev/null
+++ b/data/as/8196972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOISTOMPARA PWSS",
+                "localname": "RETROFITTING OF BOISTOMPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOISTOMPARA PWSS",
+                        "localname": "RETROFITTING OF BOISTOMPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOISTOMPARA PWSS",
+                "localname": "RETROFITTING OF BOISTOMPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOISTOMPARA PWSS",
+                        "localname": "RETROFITTING OF BOISTOMPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196972/ws-services-calculation/Penalty.json b/data/as/8196972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..be84dc824f
--- /dev/null
+++ b/data/as/8196972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196972/ws-services-calculation/WCBillingSlab.json b/data/as/8196972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a0583941ba
--- /dev/null
+++ b/data/as/8196972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196995/BillingService/BusinessService.json b/data/as/8196995/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d87ecf67b8
--- /dev/null
+++ b/data/as/8196995/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8196995",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196995/egov-location/boundary-data.json b/data/as/8196995/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c3d25e136
--- /dev/null
+++ b/data/as/8196995/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8196995",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                "localname": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196995",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                        "localname": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                "localname": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8196995",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                        "localname": "RETROFITTING OF BOLAIKHAMAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196995/ws-services-calculation/Penalty.json b/data/as/8196995/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b17aeae909
--- /dev/null
+++ b/data/as/8196995/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8196995",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8196995/ws-services-calculation/WCBillingSlab.json b/data/as/8196995/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..065cbb0975
--- /dev/null
+++ b/data/as/8196995/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8196995",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197005/BillingService/BusinessService.json b/data/as/8197005/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70dcf61f97
--- /dev/null
+++ b/data/as/8197005/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197005",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197005/egov-location/boundary-data.json b/data/as/8197005/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40352d7a6f
--- /dev/null
+++ b/data/as/8197005/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197005",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOSKOPARA PWSS",
+                "localname": "RETROFITTING OF BOSKOPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOSKOPARA PWSS",
+                        "localname": "RETROFITTING OF BOSKOPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BOSKOPARA PWSS",
+                "localname": "RETROFITTING OF BOSKOPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197005",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BOSKOPARA PWSS",
+                        "localname": "RETROFITTING OF BOSKOPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197005/ws-services-calculation/Penalty.json b/data/as/8197005/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1d23551ece
--- /dev/null
+++ b/data/as/8197005/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197005",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197005/ws-services-calculation/WCBillingSlab.json b/data/as/8197005/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1201ec9184
--- /dev/null
+++ b/data/as/8197005/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197005",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197023/BillingService/BusinessService.json b/data/as/8197023/BillingService/BusinessService.json
new file mode 100644
index 0000000000..15d9219e25
--- /dev/null
+++ b/data/as/8197023/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197023",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197023/egov-location/boundary-data.json b/data/as/8197023/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3273c4928
--- /dev/null
+++ b/data/as/8197023/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197023",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                "localname": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                        "localname": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                "localname": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                        "localname": "RETROFITTING OF DHAMAR RESERVE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197023/ws-services-calculation/Penalty.json b/data/as/8197023/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1b286f21fb
--- /dev/null
+++ b/data/as/8197023/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197023",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197023/ws-services-calculation/WCBillingSlab.json b/data/as/8197023/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58d895a2a4
--- /dev/null
+++ b/data/as/8197023/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197023",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197028/BillingService/BusinessService.json b/data/as/8197028/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cefe3bb737
--- /dev/null
+++ b/data/as/8197028/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197028",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197028/egov-location/boundary-data.json b/data/as/8197028/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8bdafa0966
--- /dev/null
+++ b/data/as/8197028/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197028",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATISILA PWSS",
+                "localname": "RETROFITTING OF HATISILA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197028",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATISILA PWSS",
+                        "localname": "RETROFITTING OF HATISILA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATISILA PWSS",
+                "localname": "RETROFITTING OF HATISILA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197028",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATISILA PWSS",
+                        "localname": "RETROFITTING OF HATISILA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197028/ws-services-calculation/Penalty.json b/data/as/8197028/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d6707213f
--- /dev/null
+++ b/data/as/8197028/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197028",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197028/ws-services-calculation/WCBillingSlab.json b/data/as/8197028/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..879a6ef44f
--- /dev/null
+++ b/data/as/8197028/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197028",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197048/BillingService/BusinessService.json b/data/as/8197048/BillingService/BusinessService.json
new file mode 100644
index 0000000000..54041988f7
--- /dev/null
+++ b/data/as/8197048/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197048",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197048/egov-location/boundary-data.json b/data/as/8197048/egov-location/boundary-data.json
new file mode 100644
index 0000000000..647b788e98
--- /dev/null
+++ b/data/as/8197048/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197048",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANDALGRAM PWSS",
+                "localname": "RETROFITTING OF MANDALGRAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANDALGRAM PWSS",
+                        "localname": "RETROFITTING OF MANDALGRAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANDALGRAM PWSS",
+                "localname": "RETROFITTING OF MANDALGRAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANDALGRAM PWSS",
+                        "localname": "RETROFITTING OF MANDALGRAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197048/ws-services-calculation/Penalty.json b/data/as/8197048/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ed93243518
--- /dev/null
+++ b/data/as/8197048/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197048",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197048/ws-services-calculation/WCBillingSlab.json b/data/as/8197048/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a6306c848
--- /dev/null
+++ b/data/as/8197048/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197048",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197059/BillingService/BusinessService.json b/data/as/8197059/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc8ad9ac10
--- /dev/null
+++ b/data/as/8197059/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197059",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197059/egov-location/boundary-data.json b/data/as/8197059/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e7a19c5f7c
--- /dev/null
+++ b/data/as/8197059/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197059",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGJULI PWSS",
+                "localname": "RETROFITTING OF RANGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGJULI PWSS",
+                        "localname": "RETROFITTING OF RANGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGJULI PWSS",
+                "localname": "RETROFITTING OF RANGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGJULI PWSS",
+                        "localname": "RETROFITTING OF RANGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197059/ws-services-calculation/Penalty.json b/data/as/8197059/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5cab69e943
--- /dev/null
+++ b/data/as/8197059/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197059",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197059/ws-services-calculation/WCBillingSlab.json b/data/as/8197059/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fd2ee1b6b3
--- /dev/null
+++ b/data/as/8197059/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197059",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197069/BillingService/BusinessService.json b/data/as/8197069/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e280e22667
--- /dev/null
+++ b/data/as/8197069/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197069",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197069/egov-location/boundary-data.json b/data/as/8197069/egov-location/boundary-data.json
new file mode 100644
index 0000000000..86b5fc95b0
--- /dev/null
+++ b/data/as/8197069/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197069",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MADANG PT III PWSS",
+                "localname": "RETROFITTING OF MADANG PT III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197069",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MADANG PT III PWSS",
+                        "localname": "RETROFITTING OF MADANG PT III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MADANG PT III PWSS",
+                "localname": "RETROFITTING OF MADANG PT III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197069",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MADANG PT III PWSS",
+                        "localname": "RETROFITTING OF MADANG PT III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197069/ws-services-calculation/Penalty.json b/data/as/8197069/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fa5fa3f233
--- /dev/null
+++ b/data/as/8197069/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197069",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197069/ws-services-calculation/WCBillingSlab.json b/data/as/8197069/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..461dda90d0
--- /dev/null
+++ b/data/as/8197069/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197069",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197098/BillingService/BusinessService.json b/data/as/8197098/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c5d4c04dd
--- /dev/null
+++ b/data/as/8197098/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197098",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197098/egov-location/boundary-data.json b/data/as/8197098/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b23805322c
--- /dev/null
+++ b/data/as/8197098/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197098",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHALISABHITA PWSS",
+                "localname": "RETROFITTING OF KHALISABHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197098",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHALISABHITA PWSS",
+                        "localname": "RETROFITTING OF KHALISABHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHALISABHITA PWSS",
+                "localname": "RETROFITTING OF KHALISABHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197098",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHALISABHITA PWSS",
+                        "localname": "RETROFITTING OF KHALISABHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197098/ws-services-calculation/Penalty.json b/data/as/8197098/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fbcfbc4acd
--- /dev/null
+++ b/data/as/8197098/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197098",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197098/ws-services-calculation/WCBillingSlab.json b/data/as/8197098/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf888c6268
--- /dev/null
+++ b/data/as/8197098/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197098",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197113/BillingService/BusinessService.json b/data/as/8197113/BillingService/BusinessService.json
new file mode 100644
index 0000000000..26eed254eb
--- /dev/null
+++ b/data/as/8197113/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197113",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197113/egov-location/boundary-data.json b/data/as/8197113/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19674de8ac
--- /dev/null
+++ b/data/as/8197113/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197113",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIGRI PWSS",
+                "localname": "RETROFITTING OF SIGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197113",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIGRI PWSS",
+                        "localname": "RETROFITTING OF SIGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIGRI PWSS",
+                "localname": "RETROFITTING OF SIGRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197113",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIGRI PWSS",
+                        "localname": "RETROFITTING OF SIGRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197113/ws-services-calculation/Penalty.json b/data/as/8197113/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2ee79c656
--- /dev/null
+++ b/data/as/8197113/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197113",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197113/ws-services-calculation/WCBillingSlab.json b/data/as/8197113/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c9a5653b7d
--- /dev/null
+++ b/data/as/8197113/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197113",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197243/BillingService/BusinessService.json b/data/as/8197243/BillingService/BusinessService.json
new file mode 100644
index 0000000000..041390327c
--- /dev/null
+++ b/data/as/8197243/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197243",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197243/egov-location/boundary-data.json b/data/as/8197243/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f16449b987
--- /dev/null
+++ b/data/as/8197243/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197243",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUTABARI PWSS",
+                "localname": "RETROFITTING OF KHUTABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197243",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUTABARI PWSS",
+                        "localname": "RETROFITTING OF KHUTABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUTABARI PWSS",
+                "localname": "RETROFITTING OF KHUTABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197243",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUTABARI PWSS",
+                        "localname": "RETROFITTING OF KHUTABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197243/ws-services-calculation/Penalty.json b/data/as/8197243/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b7d17d03ea
--- /dev/null
+++ b/data/as/8197243/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197243",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197243/ws-services-calculation/WCBillingSlab.json b/data/as/8197243/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f562871fff
--- /dev/null
+++ b/data/as/8197243/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197243",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197282/BillingService/BusinessService.json b/data/as/8197282/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a434c3c186
--- /dev/null
+++ b/data/as/8197282/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8197282",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197282/egov-location/boundary-data.json b/data/as/8197282/egov-location/boundary-data.json
new file mode 100644
index 0000000000..426608bdc7
--- /dev/null
+++ b/data/as/8197282/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8197282",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JURIGAON PWSS",
+                "localname": "RETROFITTING OF JURIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JURIGAON PWSS",
+                        "localname": "RETROFITTING OF JURIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JURIGAON PWSS",
+                "localname": "RETROFITTING OF JURIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8197282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JURIGAON PWSS",
+                        "localname": "RETROFITTING OF JURIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197282/ws-services-calculation/Penalty.json b/data/as/8197282/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95f4c347ef
--- /dev/null
+++ b/data/as/8197282/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8197282",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8197282/ws-services-calculation/WCBillingSlab.json b/data/as/8197282/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4776b05c03
--- /dev/null
+++ b/data/as/8197282/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8197282",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198168/BillingService/BusinessService.json b/data/as/8198168/BillingService/BusinessService.json
new file mode 100644
index 0000000000..03c688a5f7
--- /dev/null
+++ b/data/as/8198168/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198168",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198168/egov-location/boundary-data.json b/data/as/8198168/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e3f43b323
--- /dev/null
+++ b/data/as/8198168/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198168",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NARAYANPUR PWSS",
+                "localname": "RETROFITTING OF NARAYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NARAYANPUR PWSS",
+                        "localname": "RETROFITTING OF NARAYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NARAYANPUR PWSS",
+                "localname": "RETROFITTING OF NARAYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NARAYANPUR PWSS",
+                        "localname": "RETROFITTING OF NARAYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198168/ws-services-calculation/Penalty.json b/data/as/8198168/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f70393b4d
--- /dev/null
+++ b/data/as/8198168/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198168",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198168/ws-services-calculation/WCBillingSlab.json b/data/as/8198168/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..be0ba4aa47
--- /dev/null
+++ b/data/as/8198168/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198168",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198173/BillingService/BusinessService.json b/data/as/8198173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e65b1a6fd
--- /dev/null
+++ b/data/as/8198173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198173/egov-location/boundary-data.json b/data/as/8198173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb5d5ee95b
--- /dev/null
+++ b/data/as/8198173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOILAALI PWSS",
+                "localname": "RETROFITTING OF MOILAALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOILAALI PWSS",
+                        "localname": "RETROFITTING OF MOILAALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOILAALI PWSS",
+                "localname": "RETROFITTING OF MOILAALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOILAALI PWSS",
+                        "localname": "RETROFITTING OF MOILAALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198173/ws-services-calculation/Penalty.json b/data/as/8198173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ceef04e266
--- /dev/null
+++ b/data/as/8198173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198173/ws-services-calculation/WCBillingSlab.json b/data/as/8198173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0cef784453
--- /dev/null
+++ b/data/as/8198173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198179/BillingService/BusinessService.json b/data/as/8198179/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e89cd93f37
--- /dev/null
+++ b/data/as/8198179/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198179",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198179/egov-location/boundary-data.json b/data/as/8198179/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3581ab7750
--- /dev/null
+++ b/data/as/8198179/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198179",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                "localname": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                        "localname": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                "localname": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                        "localname": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198179/ws-services-calculation/Penalty.json b/data/as/8198179/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..340ef00509
--- /dev/null
+++ b/data/as/8198179/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198179",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198179/ws-services-calculation/WCBillingSlab.json b/data/as/8198179/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8f2b19862
--- /dev/null
+++ b/data/as/8198179/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198179",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198205/BillingService/BusinessService.json b/data/as/8198205/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4367adddc4
--- /dev/null
+++ b/data/as/8198205/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198205",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198205/egov-location/boundary-data.json b/data/as/8198205/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8838b16898
--- /dev/null
+++ b/data/as/8198205/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198205",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                "localname": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                        "localname": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                "localname": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                        "localname": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198205/ws-services-calculation/Penalty.json b/data/as/8198205/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bd984b87d
--- /dev/null
+++ b/data/as/8198205/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198205",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198205/ws-services-calculation/WCBillingSlab.json b/data/as/8198205/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f36bdabee1
--- /dev/null
+++ b/data/as/8198205/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198205",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198213/BillingService/BusinessService.json b/data/as/8198213/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0090acd73b
--- /dev/null
+++ b/data/as/8198213/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198213",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198213/egov-location/boundary-data.json b/data/as/8198213/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c547066085
--- /dev/null
+++ b/data/as/8198213/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198213",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATIAPUKHURI PWSS",
+                "localname": "RETROFITTING OF PATIAPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATIAPUKHURI PWSS",
+                        "localname": "RETROFITTING OF PATIAPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATIAPUKHURI PWSS",
+                "localname": "RETROFITTING OF PATIAPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATIAPUKHURI PWSS",
+                        "localname": "RETROFITTING OF PATIAPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198213/ws-services-calculation/Penalty.json b/data/as/8198213/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..53edaf63cc
--- /dev/null
+++ b/data/as/8198213/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198213",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198213/ws-services-calculation/WCBillingSlab.json b/data/as/8198213/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d55746da10
--- /dev/null
+++ b/data/as/8198213/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198213",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198223/BillingService/BusinessService.json b/data/as/8198223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1386f68383
--- /dev/null
+++ b/data/as/8198223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198223/egov-location/boundary-data.json b/data/as/8198223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c7883e23bd
--- /dev/null
+++ b/data/as/8198223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORIGAON PWSS",
+                "localname": "RETROFITTING OF BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORIGAON PWSS",
+                        "localname": "RETROFITTING OF BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORIGAON PWSS",
+                "localname": "RETROFITTING OF BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORIGAON PWSS",
+                        "localname": "RETROFITTING OF BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198223/ws-services-calculation/Penalty.json b/data/as/8198223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df04107ce2
--- /dev/null
+++ b/data/as/8198223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198223/ws-services-calculation/WCBillingSlab.json b/data/as/8198223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..621e99eeda
--- /dev/null
+++ b/data/as/8198223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198230/BillingService/BusinessService.json b/data/as/8198230/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cbce766ed
--- /dev/null
+++ b/data/as/8198230/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8198230",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198230/egov-location/boundary-data.json b/data/as/8198230/egov-location/boundary-data.json
new file mode 100644
index 0000000000..df1df72870
--- /dev/null
+++ b/data/as/8198230/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8198230",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                "localname": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                        "localname": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                "localname": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8198230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                        "localname": "RETROFITTING OF SIPORIA BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198230/ws-services-calculation/Penalty.json b/data/as/8198230/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89f7f1aaec
--- /dev/null
+++ b/data/as/8198230/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8198230",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8198230/ws-services-calculation/WCBillingSlab.json b/data/as/8198230/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2904f15ab8
--- /dev/null
+++ b/data/as/8198230/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8198230",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201977/BillingService/BusinessService.json b/data/as/8201977/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da52d1e2e0
--- /dev/null
+++ b/data/as/8201977/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8201977",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201977/egov-location/boundary-data.json b/data/as/8201977/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3cc6968116
--- /dev/null
+++ b/data/as/8201977/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8201977",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOKIRA PWSS",
+                "localname": "RETROFITTING OF KOKIRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8201977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOKIRA PWSS",
+                        "localname": "RETROFITTING OF KOKIRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOKIRA PWSS",
+                "localname": "RETROFITTING OF KOKIRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8201977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOKIRA PWSS",
+                        "localname": "RETROFITTING OF KOKIRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201977/ws-services-calculation/Penalty.json b/data/as/8201977/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d22254eac
--- /dev/null
+++ b/data/as/8201977/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8201977",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201977/ws-services-calculation/WCBillingSlab.json b/data/as/8201977/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a4444a524
--- /dev/null
+++ b/data/as/8201977/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8201977",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201983/BillingService/BusinessService.json b/data/as/8201983/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7c71e4f6df
--- /dev/null
+++ b/data/as/8201983/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8201983",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201983/egov-location/boundary-data.json b/data/as/8201983/egov-location/boundary-data.json
new file mode 100644
index 0000000000..de687dbccb
--- /dev/null
+++ b/data/as/8201983/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8201983",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHIPIN CHALA PWSS",
+                "localname": "RETROFITTING OF CHIPIN CHALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8201983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHIPIN CHALA PWSS",
+                        "localname": "RETROFITTING OF CHIPIN CHALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHIPIN CHALA PWSS",
+                "localname": "RETROFITTING OF CHIPIN CHALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8201983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHIPIN CHALA PWSS",
+                        "localname": "RETROFITTING OF CHIPIN CHALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201983/ws-services-calculation/Penalty.json b/data/as/8201983/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..72e7fd2c32
--- /dev/null
+++ b/data/as/8201983/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8201983",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8201983/ws-services-calculation/WCBillingSlab.json b/data/as/8201983/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..873fbe7119
--- /dev/null
+++ b/data/as/8201983/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8201983",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202008/BillingService/BusinessService.json b/data/as/8202008/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36db375b37
--- /dev/null
+++ b/data/as/8202008/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8202008",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202008/egov-location/boundary-data.json b/data/as/8202008/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7bfd44a072
--- /dev/null
+++ b/data/as/8202008/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8202008",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARA PT II PWSS",
+                "localname": "RETROFITTING OF KHARA PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202008",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARA PT II PWSS",
+                        "localname": "RETROFITTING OF KHARA PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARA PT II PWSS",
+                "localname": "RETROFITTING OF KHARA PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202008",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARA PT II PWSS",
+                        "localname": "RETROFITTING OF KHARA PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202008/ws-services-calculation/Penalty.json b/data/as/8202008/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..76cc53d22b
--- /dev/null
+++ b/data/as/8202008/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8202008",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202008/ws-services-calculation/WCBillingSlab.json b/data/as/8202008/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb7758027d
--- /dev/null
+++ b/data/as/8202008/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8202008",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202014/BillingService/BusinessService.json b/data/as/8202014/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e8384dd723
--- /dev/null
+++ b/data/as/8202014/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8202014",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202014/egov-location/boundary-data.json b/data/as/8202014/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce13e3b20d
--- /dev/null
+++ b/data/as/8202014/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8202014",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SARAPARA PWSS",
+                "localname": "RETROFITTING OF SARAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202014",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SARAPARA PWSS",
+                        "localname": "RETROFITTING OF SARAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SARAPARA PWSS",
+                "localname": "RETROFITTING OF SARAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202014",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SARAPARA PWSS",
+                        "localname": "RETROFITTING OF SARAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202014/ws-services-calculation/Penalty.json b/data/as/8202014/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..52096773d0
--- /dev/null
+++ b/data/as/8202014/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8202014",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202014/ws-services-calculation/WCBillingSlab.json b/data/as/8202014/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f276a5a2c2
--- /dev/null
+++ b/data/as/8202014/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8202014",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202020/BillingService/BusinessService.json b/data/as/8202020/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f3ff47c1a
--- /dev/null
+++ b/data/as/8202020/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8202020",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202020/egov-location/boundary-data.json b/data/as/8202020/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a4620873d3
--- /dev/null
+++ b/data/as/8202020/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8202020",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                "localname": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                        "localname": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                "localname": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                        "localname": "RETROFITTING OF KADOMTOLA CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202020/ws-services-calculation/Penalty.json b/data/as/8202020/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c24be7dd3c
--- /dev/null
+++ b/data/as/8202020/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8202020",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202020/ws-services-calculation/WCBillingSlab.json b/data/as/8202020/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..284947f85d
--- /dev/null
+++ b/data/as/8202020/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8202020",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202025/BillingService/BusinessService.json b/data/as/8202025/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cbb1a30ea
--- /dev/null
+++ b/data/as/8202025/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8202025",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202025/egov-location/boundary-data.json b/data/as/8202025/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b21b5f1b1
--- /dev/null
+++ b/data/as/8202025/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8202025",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BARBHITA PWSS",
+                "localname": "RETROFITTING OF NIZ BARBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202025",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BARBHITA PWSS",
+                        "localname": "RETROFITTING OF NIZ BARBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ BARBHITA PWSS",
+                "localname": "RETROFITTING OF NIZ BARBHITA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202025",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ BARBHITA PWSS",
+                        "localname": "RETROFITTING OF NIZ BARBHITA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202025/ws-services-calculation/Penalty.json b/data/as/8202025/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df284488ba
--- /dev/null
+++ b/data/as/8202025/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8202025",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202025/ws-services-calculation/WCBillingSlab.json b/data/as/8202025/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e78dbd18ea
--- /dev/null
+++ b/data/as/8202025/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8202025",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202278/BillingService/BusinessService.json b/data/as/8202278/BillingService/BusinessService.json
new file mode 100644
index 0000000000..baf9f3d7fb
--- /dev/null
+++ b/data/as/8202278/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8202278",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202278/egov-location/boundary-data.json b/data/as/8202278/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1f8b47ea2c
--- /dev/null
+++ b/data/as/8202278/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8202278",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAGSANKAR PWSS",
+                "localname": "RETROFITTING OF NAGSANKAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAGSANKAR PWSS",
+                        "localname": "RETROFITTING OF NAGSANKAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAGSANKAR PWSS",
+                "localname": "RETROFITTING OF NAGSANKAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAGSANKAR PWSS",
+                        "localname": "RETROFITTING OF NAGSANKAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202278/ws-services-calculation/Penalty.json b/data/as/8202278/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d65239545
--- /dev/null
+++ b/data/as/8202278/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8202278",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202278/ws-services-calculation/WCBillingSlab.json b/data/as/8202278/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc42fe5b02
--- /dev/null
+++ b/data/as/8202278/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8202278",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202287/BillingService/BusinessService.json b/data/as/8202287/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a162a5ded
--- /dev/null
+++ b/data/as/8202287/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8202287",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202287/egov-location/boundary-data.json b/data/as/8202287/egov-location/boundary-data.json
new file mode 100644
index 0000000000..098130482f
--- /dev/null
+++ b/data/as/8202287/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8202287",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                "localname": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                        "localname": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                "localname": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8202287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                        "localname": "RETROFITTING OF KOROIONI PWSS (SD II)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202287/ws-services-calculation/Penalty.json b/data/as/8202287/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68c2b5dd16
--- /dev/null
+++ b/data/as/8202287/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8202287",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8202287/ws-services-calculation/WCBillingSlab.json b/data/as/8202287/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c27977594
--- /dev/null
+++ b/data/as/8202287/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8202287",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203051/BillingService/BusinessService.json b/data/as/8203051/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cde903e22b
--- /dev/null
+++ b/data/as/8203051/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203051",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203051/egov-location/boundary-data.json b/data/as/8203051/egov-location/boundary-data.json
new file mode 100644
index 0000000000..425c1c1b6a
--- /dev/null
+++ b/data/as/8203051/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203051",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARA (OLD) PWSS",
+                "localname": "RETROFITTING OF KHARA (OLD) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203051",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARA (OLD) PWSS",
+                        "localname": "RETROFITTING OF KHARA (OLD) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARA (OLD) PWSS",
+                "localname": "RETROFITTING OF KHARA (OLD) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203051",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARA (OLD) PWSS",
+                        "localname": "RETROFITTING OF KHARA (OLD) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203051/ws-services-calculation/Penalty.json b/data/as/8203051/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..137734a423
--- /dev/null
+++ b/data/as/8203051/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203051",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203051/ws-services-calculation/WCBillingSlab.json b/data/as/8203051/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0fe93d0606
--- /dev/null
+++ b/data/as/8203051/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203051",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203064/BillingService/BusinessService.json b/data/as/8203064/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31a3200a77
--- /dev/null
+++ b/data/as/8203064/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203064",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203064/egov-location/boundary-data.json b/data/as/8203064/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d10981fef4
--- /dev/null
+++ b/data/as/8203064/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203064",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                "localname": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203064",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                        "localname": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                "localname": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203064",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                        "localname": "RETROFITTING OF AMBARI DUMPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203064/ws-services-calculation/Penalty.json b/data/as/8203064/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce28f35fc7
--- /dev/null
+++ b/data/as/8203064/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203064",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203064/ws-services-calculation/WCBillingSlab.json b/data/as/8203064/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4c006a0dbf
--- /dev/null
+++ b/data/as/8203064/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203064",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203128/BillingService/BusinessService.json b/data/as/8203128/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c150a27667
--- /dev/null
+++ b/data/as/8203128/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203128",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203128/egov-location/boundary-data.json b/data/as/8203128/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc8b5148ff
--- /dev/null
+++ b/data/as/8203128/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203128",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                "localname": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                        "localname": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                "localname": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203128",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                        "localname": "RETROFITTING OF KRISHNAI GURIA PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203128/ws-services-calculation/Penalty.json b/data/as/8203128/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd3299ea1b
--- /dev/null
+++ b/data/as/8203128/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203128",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203128/ws-services-calculation/WCBillingSlab.json b/data/as/8203128/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..414c45a210
--- /dev/null
+++ b/data/as/8203128/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203128",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203162/BillingService/BusinessService.json b/data/as/8203162/BillingService/BusinessService.json
new file mode 100644
index 0000000000..329f681925
--- /dev/null
+++ b/data/as/8203162/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203162",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203162/egov-location/boundary-data.json b/data/as/8203162/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e7218d167
--- /dev/null
+++ b/data/as/8203162/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203162",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHORAPUTA PWSS",
+                "localname": "RETROFITTING OF GHORAPUTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203162",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHORAPUTA PWSS",
+                        "localname": "RETROFITTING OF GHORAPUTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHORAPUTA PWSS",
+                "localname": "RETROFITTING OF GHORAPUTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203162",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHORAPUTA PWSS",
+                        "localname": "RETROFITTING OF GHORAPUTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203162/ws-services-calculation/Penalty.json b/data/as/8203162/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d830281cf5
--- /dev/null
+++ b/data/as/8203162/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203162",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203162/ws-services-calculation/WCBillingSlab.json b/data/as/8203162/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2655a489bb
--- /dev/null
+++ b/data/as/8203162/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203162",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203178/BillingService/BusinessService.json b/data/as/8203178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e951b9a19e
--- /dev/null
+++ b/data/as/8203178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203178/egov-location/boundary-data.json b/data/as/8203178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc38c415eb
--- /dev/null
+++ b/data/as/8203178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KARKACHI PWSS",
+                "localname": "RETROFITTING OF KARKACHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KARKACHI PWSS",
+                        "localname": "RETROFITTING OF KARKACHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KARKACHI PWSS",
+                "localname": "RETROFITTING OF KARKACHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KARKACHI PWSS",
+                        "localname": "RETROFITTING OF KARKACHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203178/ws-services-calculation/Penalty.json b/data/as/8203178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..917c1ba9f9
--- /dev/null
+++ b/data/as/8203178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203178/ws-services-calculation/WCBillingSlab.json b/data/as/8203178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f728d8e54b
--- /dev/null
+++ b/data/as/8203178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203211/BillingService/BusinessService.json b/data/as/8203211/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d93bdb7c19
--- /dev/null
+++ b/data/as/8203211/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203211",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203211/egov-location/boundary-data.json b/data/as/8203211/egov-location/boundary-data.json
new file mode 100644
index 0000000000..afc939b1cc
--- /dev/null
+++ b/data/as/8203211/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203211",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                "localname": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203211",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                        "localname": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                "localname": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203211",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                        "localname": "RETROFITTING OF AMGURI PURANPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203211/ws-services-calculation/Penalty.json b/data/as/8203211/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a49fbd853d
--- /dev/null
+++ b/data/as/8203211/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203211",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203211/ws-services-calculation/WCBillingSlab.json b/data/as/8203211/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5bbcf0aa3e
--- /dev/null
+++ b/data/as/8203211/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203211",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203233/BillingService/BusinessService.json b/data/as/8203233/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e3ec770e7
--- /dev/null
+++ b/data/as/8203233/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203233",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203233/egov-location/boundary-data.json b/data/as/8203233/egov-location/boundary-data.json
new file mode 100644
index 0000000000..14de48f6c0
--- /dev/null
+++ b/data/as/8203233/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203233",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                "localname": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203233",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                        "localname": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                "localname": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203233",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                        "localname": "RETROFITTING OF SALPARA MOLANDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203233/ws-services-calculation/Penalty.json b/data/as/8203233/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9998a750a0
--- /dev/null
+++ b/data/as/8203233/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203233",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203233/ws-services-calculation/WCBillingSlab.json b/data/as/8203233/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f6f26a64e
--- /dev/null
+++ b/data/as/8203233/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203233",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203251/BillingService/BusinessService.json b/data/as/8203251/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b705b0f47
--- /dev/null
+++ b/data/as/8203251/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203251",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203251/egov-location/boundary-data.json b/data/as/8203251/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54996ce8ec
--- /dev/null
+++ b/data/as/8203251/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203251",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARDANG PWSS",
+                "localname": "RETROFITTING OF KHARDANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203251",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARDANG PWSS",
+                        "localname": "RETROFITTING OF KHARDANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARDANG PWSS",
+                "localname": "RETROFITTING OF KHARDANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203251",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARDANG PWSS",
+                        "localname": "RETROFITTING OF KHARDANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203251/ws-services-calculation/Penalty.json b/data/as/8203251/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df54684189
--- /dev/null
+++ b/data/as/8203251/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203251",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203251/ws-services-calculation/WCBillingSlab.json b/data/as/8203251/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d90767603
--- /dev/null
+++ b/data/as/8203251/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203251",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203271/BillingService/BusinessService.json b/data/as/8203271/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0da32272b
--- /dev/null
+++ b/data/as/8203271/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203271",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203271/egov-location/boundary-data.json b/data/as/8203271/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89672fd713
--- /dev/null
+++ b/data/as/8203271/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203271",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ASUDUBI PWSS",
+                "localname": "RETROFITTING OF ASUDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ASUDUBI PWSS",
+                        "localname": "RETROFITTING OF ASUDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ASUDUBI PWSS",
+                "localname": "RETROFITTING OF ASUDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203271",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ASUDUBI PWSS",
+                        "localname": "RETROFITTING OF ASUDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203271/ws-services-calculation/Penalty.json b/data/as/8203271/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ee2d10a1c
--- /dev/null
+++ b/data/as/8203271/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203271",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203271/ws-services-calculation/WCBillingSlab.json b/data/as/8203271/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37281f6646
--- /dev/null
+++ b/data/as/8203271/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203271",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203278/BillingService/BusinessService.json b/data/as/8203278/BillingService/BusinessService.json
new file mode 100644
index 0000000000..120dd3cd5a
--- /dev/null
+++ b/data/as/8203278/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203278",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203278/egov-location/boundary-data.json b/data/as/8203278/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9c1997c66
--- /dev/null
+++ b/data/as/8203278/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203278",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOHELA PWSS",
+                "localname": "RETROFITTING OF DOHELA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOHELA PWSS",
+                        "localname": "RETROFITTING OF DOHELA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOHELA PWSS",
+                "localname": "RETROFITTING OF DOHELA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOHELA PWSS",
+                        "localname": "RETROFITTING OF DOHELA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203278/ws-services-calculation/Penalty.json b/data/as/8203278/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..96e4171b3c
--- /dev/null
+++ b/data/as/8203278/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203278",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203278/ws-services-calculation/WCBillingSlab.json b/data/as/8203278/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..301d794751
--- /dev/null
+++ b/data/as/8203278/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203278",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203286/BillingService/BusinessService.json b/data/as/8203286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca66cbb323
--- /dev/null
+++ b/data/as/8203286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203286/egov-location/boundary-data.json b/data/as/8203286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..84d370b99e
--- /dev/null
+++ b/data/as/8203286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KARMAKARPARA PWSS",
+                "localname": "RETROFITTING OF KARMAKARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KARMAKARPARA PWSS",
+                        "localname": "RETROFITTING OF KARMAKARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KARMAKARPARA PWSS",
+                "localname": "RETROFITTING OF KARMAKARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KARMAKARPARA PWSS",
+                        "localname": "RETROFITTING OF KARMAKARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203286/ws-services-calculation/Penalty.json b/data/as/8203286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3241f3abed
--- /dev/null
+++ b/data/as/8203286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203286/ws-services-calculation/WCBillingSlab.json b/data/as/8203286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42caf02987
--- /dev/null
+++ b/data/as/8203286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203579/BillingService/BusinessService.json b/data/as/8203579/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9dbea8ce1e
--- /dev/null
+++ b/data/as/8203579/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203579",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203579/egov-location/boundary-data.json b/data/as/8203579/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c5400cefc
--- /dev/null
+++ b/data/as/8203579/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203579",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                "localname": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                        "localname": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                "localname": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                        "localname": "RETROFITTING OF BUJRUK MANIKPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203579/ws-services-calculation/Penalty.json b/data/as/8203579/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a9a23f500d
--- /dev/null
+++ b/data/as/8203579/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203579",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203579/ws-services-calculation/WCBillingSlab.json b/data/as/8203579/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a9453eb360
--- /dev/null
+++ b/data/as/8203579/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203579",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203589/BillingService/BusinessService.json b/data/as/8203589/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6dbb70b7b8
--- /dev/null
+++ b/data/as/8203589/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203589",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203589/egov-location/boundary-data.json b/data/as/8203589/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b28b3a672e
--- /dev/null
+++ b/data/as/8203589/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203589",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MONAKOCHA PWSS",
+                "localname": "RETROFITTING OF MONAKOCHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203589",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MONAKOCHA PWSS",
+                        "localname": "RETROFITTING OF MONAKOCHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MONAKOCHA PWSS",
+                "localname": "RETROFITTING OF MONAKOCHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203589",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MONAKOCHA PWSS",
+                        "localname": "RETROFITTING OF MONAKOCHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203589/ws-services-calculation/Penalty.json b/data/as/8203589/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..55a64763fc
--- /dev/null
+++ b/data/as/8203589/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203589",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203589/ws-services-calculation/WCBillingSlab.json b/data/as/8203589/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc95036808
--- /dev/null
+++ b/data/as/8203589/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203589",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203592/BillingService/BusinessService.json b/data/as/8203592/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0d6d7d39cf
--- /dev/null
+++ b/data/as/8203592/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203592",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203592/egov-location/boundary-data.json b/data/as/8203592/egov-location/boundary-data.json
new file mode 100644
index 0000000000..25026921fd
--- /dev/null
+++ b/data/as/8203592/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203592",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                "localname": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203592",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                        "localname": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                "localname": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203592",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                        "localname": "RETROFITTING OF NALANGA RAWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203592/ws-services-calculation/Penalty.json b/data/as/8203592/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4387b3d1ea
--- /dev/null
+++ b/data/as/8203592/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203592",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203592/ws-services-calculation/WCBillingSlab.json b/data/as/8203592/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8c6afb8504
--- /dev/null
+++ b/data/as/8203592/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203592",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203614/BillingService/BusinessService.json b/data/as/8203614/BillingService/BusinessService.json
new file mode 100644
index 0000000000..62685789a7
--- /dev/null
+++ b/data/as/8203614/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203614",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203614/egov-location/boundary-data.json b/data/as/8203614/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8ecb2bb0d
--- /dev/null
+++ b/data/as/8203614/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203614",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAKHALDUBI PWSS",
+                "localname": "RETROFITTING OF RAKHALDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203614",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAKHALDUBI PWSS",
+                        "localname": "RETROFITTING OF RAKHALDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAKHALDUBI PWSS",
+                "localname": "RETROFITTING OF RAKHALDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203614",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAKHALDUBI PWSS",
+                        "localname": "RETROFITTING OF RAKHALDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203614/ws-services-calculation/Penalty.json b/data/as/8203614/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e4c9eeb553
--- /dev/null
+++ b/data/as/8203614/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203614",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203614/ws-services-calculation/WCBillingSlab.json b/data/as/8203614/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc6dffd1f8
--- /dev/null
+++ b/data/as/8203614/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203614",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203629/BillingService/BusinessService.json b/data/as/8203629/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d770a54f0f
--- /dev/null
+++ b/data/as/8203629/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203629",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203629/egov-location/boundary-data.json b/data/as/8203629/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e400428212
--- /dev/null
+++ b/data/as/8203629/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203629",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                "localname": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                        "localname": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                "localname": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                        "localname": "RETROFITTING OF AMBARI BAGUAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203629/ws-services-calculation/Penalty.json b/data/as/8203629/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..162c1b1499
--- /dev/null
+++ b/data/as/8203629/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203629",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203629/ws-services-calculation/WCBillingSlab.json b/data/as/8203629/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ff67c52864
--- /dev/null
+++ b/data/as/8203629/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203629",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203647/BillingService/BusinessService.json b/data/as/8203647/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27af11c389
--- /dev/null
+++ b/data/as/8203647/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203647",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203647/egov-location/boundary-data.json b/data/as/8203647/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5374d6e8b9
--- /dev/null
+++ b/data/as/8203647/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203647",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                "localname": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203647",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                        "localname": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                "localname": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203647",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                        "localname": "RETROFITTING OF 5 NO SARANARTHI CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203647/ws-services-calculation/Penalty.json b/data/as/8203647/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4faa9cbefc
--- /dev/null
+++ b/data/as/8203647/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203647",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203647/ws-services-calculation/WCBillingSlab.json b/data/as/8203647/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea69b56e5c
--- /dev/null
+++ b/data/as/8203647/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203647",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203683/BillingService/BusinessService.json b/data/as/8203683/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d8007ff93
--- /dev/null
+++ b/data/as/8203683/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203683",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203683/egov-location/boundary-data.json b/data/as/8203683/egov-location/boundary-data.json
new file mode 100644
index 0000000000..596aaf0483
--- /dev/null
+++ b/data/as/8203683/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203683",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 9 NO. CAMP PWSS",
+                "localname": "RETROFITTING OF 9 NO. CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203683",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 9 NO. CAMP PWSS",
+                        "localname": "RETROFITTING OF 9 NO. CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 9 NO. CAMP PWSS",
+                "localname": "RETROFITTING OF 9 NO. CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203683",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 9 NO. CAMP PWSS",
+                        "localname": "RETROFITTING OF 9 NO. CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203683/ws-services-calculation/Penalty.json b/data/as/8203683/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..558384dcbd
--- /dev/null
+++ b/data/as/8203683/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203683",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203683/ws-services-calculation/WCBillingSlab.json b/data/as/8203683/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4a6939f0a
--- /dev/null
+++ b/data/as/8203683/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203683",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203689/BillingService/BusinessService.json b/data/as/8203689/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb76da8427
--- /dev/null
+++ b/data/as/8203689/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203689",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203689/egov-location/boundary-data.json b/data/as/8203689/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aebcd6ff3e
--- /dev/null
+++ b/data/as/8203689/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203689",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATIGAON PWSS",
+                "localname": "RETROFITTING OF HATIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203689",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATIGAON PWSS",
+                        "localname": "RETROFITTING OF HATIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATIGAON PWSS",
+                "localname": "RETROFITTING OF HATIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203689",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATIGAON PWSS",
+                        "localname": "RETROFITTING OF HATIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203689/ws-services-calculation/Penalty.json b/data/as/8203689/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df6f2272a7
--- /dev/null
+++ b/data/as/8203689/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203689",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203689/ws-services-calculation/WCBillingSlab.json b/data/as/8203689/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bab3b9aeed
--- /dev/null
+++ b/data/as/8203689/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203689",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203693/BillingService/BusinessService.json b/data/as/8203693/BillingService/BusinessService.json
new file mode 100644
index 0000000000..af90fdfaeb
--- /dev/null
+++ b/data/as/8203693/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203693",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203693/egov-location/boundary-data.json b/data/as/8203693/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b7de93277
--- /dev/null
+++ b/data/as/8203693/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203693",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RATANJULI PWSS",
+                "localname": "RETROFITTING OF RATANJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RATANJULI PWSS",
+                        "localname": "RETROFITTING OF RATANJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RATANJULI PWSS",
+                "localname": "RETROFITTING OF RATANJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RATANJULI PWSS",
+                        "localname": "RETROFITTING OF RATANJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203693/ws-services-calculation/Penalty.json b/data/as/8203693/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..828b6f0588
--- /dev/null
+++ b/data/as/8203693/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203693",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203693/ws-services-calculation/WCBillingSlab.json b/data/as/8203693/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e78bab8922
--- /dev/null
+++ b/data/as/8203693/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203693",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203703/BillingService/BusinessService.json b/data/as/8203703/BillingService/BusinessService.json
new file mode 100644
index 0000000000..841aa60e22
--- /dev/null
+++ b/data/as/8203703/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203703",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203703/egov-location/boundary-data.json b/data/as/8203703/egov-location/boundary-data.json
new file mode 100644
index 0000000000..743d3fa589
--- /dev/null
+++ b/data/as/8203703/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203703",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GERADUBI PWSS",
+                "localname": "RETROFITTING OF GERADUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GERADUBI PWSS",
+                        "localname": "RETROFITTING OF GERADUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GERADUBI PWSS",
+                "localname": "RETROFITTING OF GERADUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GERADUBI PWSS",
+                        "localname": "RETROFITTING OF GERADUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203703/ws-services-calculation/Penalty.json b/data/as/8203703/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..70455f7eed
--- /dev/null
+++ b/data/as/8203703/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203703",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203703/ws-services-calculation/WCBillingSlab.json b/data/as/8203703/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3696d3ae8
--- /dev/null
+++ b/data/as/8203703/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203703",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203721/BillingService/BusinessService.json b/data/as/8203721/BillingService/BusinessService.json
new file mode 100644
index 0000000000..15ddd6d0ce
--- /dev/null
+++ b/data/as/8203721/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203721",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203721/egov-location/boundary-data.json b/data/as/8203721/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f427bea36e
--- /dev/null
+++ b/data/as/8203721/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203721",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHOISKHULI PWSS",
+                "localname": "RETROFITTING OF BHOISKHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHOISKHULI PWSS",
+                        "localname": "RETROFITTING OF BHOISKHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHOISKHULI PWSS",
+                "localname": "RETROFITTING OF BHOISKHULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHOISKHULI PWSS",
+                        "localname": "RETROFITTING OF BHOISKHULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203721/ws-services-calculation/Penalty.json b/data/as/8203721/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8502eb305e
--- /dev/null
+++ b/data/as/8203721/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203721",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203721/ws-services-calculation/WCBillingSlab.json b/data/as/8203721/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..911fc85d3f
--- /dev/null
+++ b/data/as/8203721/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203721",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203725/BillingService/BusinessService.json b/data/as/8203725/BillingService/BusinessService.json
new file mode 100644
index 0000000000..693954ae57
--- /dev/null
+++ b/data/as/8203725/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203725",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203725/egov-location/boundary-data.json b/data/as/8203725/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e02abcd277
--- /dev/null
+++ b/data/as/8203725/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203725",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MISSAMARI  PWSS",
+                "localname": "RETROFITTING OF MISSAMARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203725",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MISSAMARI  PWSS",
+                        "localname": "RETROFITTING OF MISSAMARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MISSAMARI  PWSS",
+                "localname": "RETROFITTING OF MISSAMARI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203725",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MISSAMARI  PWSS",
+                        "localname": "RETROFITTING OF MISSAMARI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203725/ws-services-calculation/Penalty.json b/data/as/8203725/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c80edafed
--- /dev/null
+++ b/data/as/8203725/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203725",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203725/ws-services-calculation/WCBillingSlab.json b/data/as/8203725/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fae875d4d6
--- /dev/null
+++ b/data/as/8203725/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203725",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203729/BillingService/BusinessService.json b/data/as/8203729/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf60fee35a
--- /dev/null
+++ b/data/as/8203729/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203729",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203729/egov-location/boundary-data.json b/data/as/8203729/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c24b7c45b7
--- /dev/null
+++ b/data/as/8203729/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203729",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RUPAJULI PWSS",
+                "localname": "RETROFITTING OF RUPAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203729",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RUPAJULI PWSS",
+                        "localname": "RETROFITTING OF RUPAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RUPAJULI PWSS",
+                "localname": "RETROFITTING OF RUPAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203729",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RUPAJULI PWSS",
+                        "localname": "RETROFITTING OF RUPAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203729/ws-services-calculation/Penalty.json b/data/as/8203729/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f7a60d0597
--- /dev/null
+++ b/data/as/8203729/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203729",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203729/ws-services-calculation/WCBillingSlab.json b/data/as/8203729/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eab4fb3766
--- /dev/null
+++ b/data/as/8203729/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203729",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203732/BillingService/BusinessService.json b/data/as/8203732/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5bd771b81
--- /dev/null
+++ b/data/as/8203732/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203732",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203732/egov-location/boundary-data.json b/data/as/8203732/egov-location/boundary-data.json
new file mode 100644
index 0000000000..059fd42410
--- /dev/null
+++ b/data/as/8203732/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203732",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AGIA PWSS",
+                "localname": "RETROFITTING OF AGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AGIA PWSS",
+                        "localname": "RETROFITTING OF AGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AGIA PWSS",
+                "localname": "RETROFITTING OF AGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AGIA PWSS",
+                        "localname": "RETROFITTING OF AGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203732/ws-services-calculation/Penalty.json b/data/as/8203732/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7fb8c69c65
--- /dev/null
+++ b/data/as/8203732/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203732",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203732/ws-services-calculation/WCBillingSlab.json b/data/as/8203732/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30a322c886
--- /dev/null
+++ b/data/as/8203732/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203732",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203748/BillingService/BusinessService.json b/data/as/8203748/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a512236db8
--- /dev/null
+++ b/data/as/8203748/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203748",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203748/egov-location/boundary-data.json b/data/as/8203748/egov-location/boundary-data.json
new file mode 100644
index 0000000000..69686f7727
--- /dev/null
+++ b/data/as/8203748/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203748",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHEKOWARI PWSS",
+                "localname": "RETROFITTING OF CHEKOWARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHEKOWARI PWSS",
+                        "localname": "RETROFITTING OF CHEKOWARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHEKOWARI PWSS",
+                "localname": "RETROFITTING OF CHEKOWARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHEKOWARI PWSS",
+                        "localname": "RETROFITTING OF CHEKOWARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203748/ws-services-calculation/Penalty.json b/data/as/8203748/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..67816ae857
--- /dev/null
+++ b/data/as/8203748/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203748",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203748/ws-services-calculation/WCBillingSlab.json b/data/as/8203748/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f6be076839
--- /dev/null
+++ b/data/as/8203748/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203748",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203764/BillingService/BusinessService.json b/data/as/8203764/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7b3e76219
--- /dev/null
+++ b/data/as/8203764/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203764",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203764/egov-location/boundary-data.json b/data/as/8203764/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2b02eaa41
--- /dev/null
+++ b/data/as/8203764/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203764",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHESAJHARA PWSS",
+                "localname": "RETROFITTING OF CHESAJHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203764",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHESAJHARA PWSS",
+                        "localname": "RETROFITTING OF CHESAJHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHESAJHARA PWSS",
+                "localname": "RETROFITTING OF CHESAJHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203764",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHESAJHARA PWSS",
+                        "localname": "RETROFITTING OF CHESAJHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203764/ws-services-calculation/Penalty.json b/data/as/8203764/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86d42bb526
--- /dev/null
+++ b/data/as/8203764/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203764",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203764/ws-services-calculation/WCBillingSlab.json b/data/as/8203764/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a221d31792
--- /dev/null
+++ b/data/as/8203764/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203764",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203786/BillingService/BusinessService.json b/data/as/8203786/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f673693131
--- /dev/null
+++ b/data/as/8203786/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203786",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203786/egov-location/boundary-data.json b/data/as/8203786/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c88a5e1dde
--- /dev/null
+++ b/data/as/8203786/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203786",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOLAGAON PWSS",
+                "localname": "RETROFITTING OF DOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOLAGAON PWSS",
+                        "localname": "RETROFITTING OF DOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOLAGAON PWSS",
+                "localname": "RETROFITTING OF DOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOLAGAON PWSS",
+                        "localname": "RETROFITTING OF DOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203786/ws-services-calculation/Penalty.json b/data/as/8203786/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..832f29a47b
--- /dev/null
+++ b/data/as/8203786/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203786",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203786/ws-services-calculation/WCBillingSlab.json b/data/as/8203786/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..649fface58
--- /dev/null
+++ b/data/as/8203786/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203786",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203804/BillingService/BusinessService.json b/data/as/8203804/BillingService/BusinessService.json
new file mode 100644
index 0000000000..855f9c7d0f
--- /dev/null
+++ b/data/as/8203804/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203804",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203804/egov-location/boundary-data.json b/data/as/8203804/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ee12a8bb43
--- /dev/null
+++ b/data/as/8203804/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203804",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FAFAL PWSS",
+                "localname": "RETROFITTING OF FAFAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203804",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FAFAL PWSS",
+                        "localname": "RETROFITTING OF FAFAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FAFAL PWSS",
+                "localname": "RETROFITTING OF FAFAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203804",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FAFAL PWSS",
+                        "localname": "RETROFITTING OF FAFAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203804/ws-services-calculation/Penalty.json b/data/as/8203804/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bac9df98d6
--- /dev/null
+++ b/data/as/8203804/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203804",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203804/ws-services-calculation/WCBillingSlab.json b/data/as/8203804/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..465547d6ed
--- /dev/null
+++ b/data/as/8203804/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203804",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203816/BillingService/BusinessService.json b/data/as/8203816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..547cb755a9
--- /dev/null
+++ b/data/as/8203816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203816/egov-location/boundary-data.json b/data/as/8203816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d4e5511278
--- /dev/null
+++ b/data/as/8203816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BADIARPARA PWSS",
+                "localname": "RETROFITTING OF BADIARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BADIARPARA PWSS",
+                        "localname": "RETROFITTING OF BADIARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BADIARPARA PWSS",
+                "localname": "RETROFITTING OF BADIARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BADIARPARA PWSS",
+                        "localname": "RETROFITTING OF BADIARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203816/ws-services-calculation/Penalty.json b/data/as/8203816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3858ea5d2e
--- /dev/null
+++ b/data/as/8203816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203816/ws-services-calculation/WCBillingSlab.json b/data/as/8203816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..067f6d566b
--- /dev/null
+++ b/data/as/8203816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203835/BillingService/BusinessService.json b/data/as/8203835/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2dfc94c111
--- /dev/null
+++ b/data/as/8203835/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203835",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203835/egov-location/boundary-data.json b/data/as/8203835/egov-location/boundary-data.json
new file mode 100644
index 0000000000..64560d4611
--- /dev/null
+++ b/data/as/8203835/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203835",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAKHRAPARA PWSS",
+                "localname": "RETROFITTING OF BAKHRAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203835",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAKHRAPARA PWSS",
+                        "localname": "RETROFITTING OF BAKHRAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAKHRAPARA PWSS",
+                "localname": "RETROFITTING OF BAKHRAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203835",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAKHRAPARA PWSS",
+                        "localname": "RETROFITTING OF BAKHRAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203835/ws-services-calculation/Penalty.json b/data/as/8203835/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a09cb9fbdf
--- /dev/null
+++ b/data/as/8203835/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203835",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203835/ws-services-calculation/WCBillingSlab.json b/data/as/8203835/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f9d73a14b
--- /dev/null
+++ b/data/as/8203835/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203835",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203855/BillingService/BusinessService.json b/data/as/8203855/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6a03eaf787
--- /dev/null
+++ b/data/as/8203855/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203855",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203855/egov-location/boundary-data.json b/data/as/8203855/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3dea10f66e
--- /dev/null
+++ b/data/as/8203855/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203855",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAMPUR PWSS",
+                "localname": "RETROFITTING OF RAMPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAMPUR PWSS",
+                        "localname": "RETROFITTING OF RAMPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAMPUR PWSS",
+                "localname": "RETROFITTING OF RAMPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAMPUR PWSS",
+                        "localname": "RETROFITTING OF RAMPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203855/ws-services-calculation/Penalty.json b/data/as/8203855/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..953f2f0d70
--- /dev/null
+++ b/data/as/8203855/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203855",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203855/ws-services-calculation/WCBillingSlab.json b/data/as/8203855/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..99ea15df1f
--- /dev/null
+++ b/data/as/8203855/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203855",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203872/BillingService/BusinessService.json b/data/as/8203872/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8587f976d1
--- /dev/null
+++ b/data/as/8203872/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203872",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203872/egov-location/boundary-data.json b/data/as/8203872/egov-location/boundary-data.json
new file mode 100644
index 0000000000..17e7a9359f
--- /dev/null
+++ b/data/as/8203872/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203872",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUMRI PWSS",
+                "localname": "RETROFITTING OF KUMRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203872",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUMRI PWSS",
+                        "localname": "RETROFITTING OF KUMRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KUMRI PWSS",
+                "localname": "RETROFITTING OF KUMRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203872",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KUMRI PWSS",
+                        "localname": "RETROFITTING OF KUMRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203872/ws-services-calculation/Penalty.json b/data/as/8203872/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aed5c8e3e2
--- /dev/null
+++ b/data/as/8203872/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203872",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203872/ws-services-calculation/WCBillingSlab.json b/data/as/8203872/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9026d8e7b7
--- /dev/null
+++ b/data/as/8203872/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203872",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203902/BillingService/BusinessService.json b/data/as/8203902/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a08e26c4a2
--- /dev/null
+++ b/data/as/8203902/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203902",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203902/egov-location/boundary-data.json b/data/as/8203902/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2255a9501d
--- /dev/null
+++ b/data/as/8203902/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203902",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TELIPARA PWSS",
+                "localname": "RETROFITTING OF TELIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203902",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TELIPARA PWSS",
+                        "localname": "RETROFITTING OF TELIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TELIPARA PWSS",
+                "localname": "RETROFITTING OF TELIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203902",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TELIPARA PWSS",
+                        "localname": "RETROFITTING OF TELIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203902/ws-services-calculation/Penalty.json b/data/as/8203902/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..302af7b396
--- /dev/null
+++ b/data/as/8203902/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203902",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203902/ws-services-calculation/WCBillingSlab.json b/data/as/8203902/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e1c7de2882
--- /dev/null
+++ b/data/as/8203902/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203902",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203915/BillingService/BusinessService.json b/data/as/8203915/BillingService/BusinessService.json
new file mode 100644
index 0000000000..75e5270429
--- /dev/null
+++ b/data/as/8203915/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203915",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203915/egov-location/boundary-data.json b/data/as/8203915/egov-location/boundary-data.json
new file mode 100644
index 0000000000..08decb04a8
--- /dev/null
+++ b/data/as/8203915/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203915",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DARIDURI PWSS",
+                "localname": "RETROFITTING OF DARIDURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DARIDURI PWSS",
+                        "localname": "RETROFITTING OF DARIDURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DARIDURI PWSS",
+                "localname": "RETROFITTING OF DARIDURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DARIDURI PWSS",
+                        "localname": "RETROFITTING OF DARIDURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203915/ws-services-calculation/Penalty.json b/data/as/8203915/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..962aeb5e5a
--- /dev/null
+++ b/data/as/8203915/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203915",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203915/ws-services-calculation/WCBillingSlab.json b/data/as/8203915/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58892cc94d
--- /dev/null
+++ b/data/as/8203915/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203915",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203942/BillingService/BusinessService.json b/data/as/8203942/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a64108e6ac
--- /dev/null
+++ b/data/as/8203942/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203942",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203942/egov-location/boundary-data.json b/data/as/8203942/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ecf7b33a4c
--- /dev/null
+++ b/data/as/8203942/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203942",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALUBAZAR PWSS",
+                "localname": "RETROFITTING OF KALUBAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALUBAZAR PWSS",
+                        "localname": "RETROFITTING OF KALUBAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALUBAZAR PWSS",
+                "localname": "RETROFITTING OF KALUBAZAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALUBAZAR PWSS",
+                        "localname": "RETROFITTING OF KALUBAZAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203942/ws-services-calculation/Penalty.json b/data/as/8203942/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ecebe768c
--- /dev/null
+++ b/data/as/8203942/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203942",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203942/ws-services-calculation/WCBillingSlab.json b/data/as/8203942/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..606260b3d1
--- /dev/null
+++ b/data/as/8203942/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203942",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203947/BillingService/BusinessService.json b/data/as/8203947/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f5ee370dfa
--- /dev/null
+++ b/data/as/8203947/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8203947",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203947/egov-location/boundary-data.json b/data/as/8203947/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b349b3f410
--- /dev/null
+++ b/data/as/8203947/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8203947",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DUBAPARA PWSS",
+                "localname": "RETROFITTING OF DUBAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DUBAPARA PWSS",
+                        "localname": "RETROFITTING OF DUBAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DUBAPARA PWSS",
+                "localname": "RETROFITTING OF DUBAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8203947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DUBAPARA PWSS",
+                        "localname": "RETROFITTING OF DUBAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203947/ws-services-calculation/Penalty.json b/data/as/8203947/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0436ea13ec
--- /dev/null
+++ b/data/as/8203947/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8203947",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8203947/ws-services-calculation/WCBillingSlab.json b/data/as/8203947/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..01b9eb94be
--- /dev/null
+++ b/data/as/8203947/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8203947",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8204267/BillingService/BusinessService.json b/data/as/8204267/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a6e21b172
--- /dev/null
+++ b/data/as/8204267/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8204267",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8204267/egov-location/boundary-data.json b/data/as/8204267/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2aa3c1d353
--- /dev/null
+++ b/data/as/8204267/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8204267",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                "localname": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8204267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                        "localname": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                "localname": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8204267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                        "localname": "RETROFITTING OF SIMALUGURI COLONY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8204267/ws-services-calculation/Penalty.json b/data/as/8204267/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..91b77563c1
--- /dev/null
+++ b/data/as/8204267/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8204267",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8204267/ws-services-calculation/WCBillingSlab.json b/data/as/8204267/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f553dc5982
--- /dev/null
+++ b/data/as/8204267/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8204267",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205058/BillingService/BusinessService.json b/data/as/8205058/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f90eeb0ce7
--- /dev/null
+++ b/data/as/8205058/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205058",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205058/egov-location/boundary-data.json b/data/as/8205058/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7bb0e3629a
--- /dev/null
+++ b/data/as/8205058/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205058",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AOLATOLI PWSS",
+                "localname": "RETROFITTING OF AOLATOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AOLATOLI PWSS",
+                        "localname": "RETROFITTING OF AOLATOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AOLATOLI PWSS",
+                "localname": "RETROFITTING OF AOLATOLI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AOLATOLI PWSS",
+                        "localname": "RETROFITTING OF AOLATOLI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205058/ws-services-calculation/Penalty.json b/data/as/8205058/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..980a0db719
--- /dev/null
+++ b/data/as/8205058/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205058",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205058/ws-services-calculation/WCBillingSlab.json b/data/as/8205058/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4e96796932
--- /dev/null
+++ b/data/as/8205058/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205058",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205077/BillingService/BusinessService.json b/data/as/8205077/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad16634300
--- /dev/null
+++ b/data/as/8205077/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205077",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205077/egov-location/boundary-data.json b/data/as/8205077/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e5f670555
--- /dev/null
+++ b/data/as/8205077/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205077",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOBINDAPUR PWSS",
+                "localname": "RETROFITTING OF GOBINDAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOBINDAPUR PWSS",
+                        "localname": "RETROFITTING OF GOBINDAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOBINDAPUR PWSS",
+                "localname": "RETROFITTING OF GOBINDAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOBINDAPUR PWSS",
+                        "localname": "RETROFITTING OF GOBINDAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205077/ws-services-calculation/Penalty.json b/data/as/8205077/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b67e75bb2
--- /dev/null
+++ b/data/as/8205077/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205077",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205077/ws-services-calculation/WCBillingSlab.json b/data/as/8205077/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..06de180bee
--- /dev/null
+++ b/data/as/8205077/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205077",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205087/BillingService/BusinessService.json b/data/as/8205087/BillingService/BusinessService.json
new file mode 100644
index 0000000000..91d55160cc
--- /dev/null
+++ b/data/as/8205087/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205087",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205087/egov-location/boundary-data.json b/data/as/8205087/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f4e05a37c
--- /dev/null
+++ b/data/as/8205087/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205087",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHAMAR PWSS",
+                "localname": "RETROFITTING OF KHAMAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205087",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHAMAR PWSS",
+                        "localname": "RETROFITTING OF KHAMAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHAMAR PWSS",
+                "localname": "RETROFITTING OF KHAMAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205087",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHAMAR PWSS",
+                        "localname": "RETROFITTING OF KHAMAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205087/ws-services-calculation/Penalty.json b/data/as/8205087/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b0dcebfe9
--- /dev/null
+++ b/data/as/8205087/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205087",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205087/ws-services-calculation/WCBillingSlab.json b/data/as/8205087/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c1a30a2ea
--- /dev/null
+++ b/data/as/8205087/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205087",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205096/BillingService/BusinessService.json b/data/as/8205096/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1beae39681
--- /dev/null
+++ b/data/as/8205096/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205096",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205096/egov-location/boundary-data.json b/data/as/8205096/egov-location/boundary-data.json
new file mode 100644
index 0000000000..661f5f05de
--- /dev/null
+++ b/data/as/8205096/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205096",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNDANGA PWSS",
+                "localname": "RETROFITTING OF BAMUNDANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNDANGA PWSS",
+                        "localname": "RETROFITTING OF BAMUNDANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAMUNDANGA PWSS",
+                "localname": "RETROFITTING OF BAMUNDANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAMUNDANGA PWSS",
+                        "localname": "RETROFITTING OF BAMUNDANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205096/ws-services-calculation/Penalty.json b/data/as/8205096/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65400dc863
--- /dev/null
+++ b/data/as/8205096/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205096",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205096/ws-services-calculation/WCBillingSlab.json b/data/as/8205096/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5b6310126
--- /dev/null
+++ b/data/as/8205096/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205096",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205107/BillingService/BusinessService.json b/data/as/8205107/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b3a096b52
--- /dev/null
+++ b/data/as/8205107/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205107",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205107/egov-location/boundary-data.json b/data/as/8205107/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f86166b259
--- /dev/null
+++ b/data/as/8205107/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205107",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBARI PT III PWSS",
+                "localname": "RETROFITTING OF AMBARI PT III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205107",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBARI PT III PWSS",
+                        "localname": "RETROFITTING OF AMBARI PT III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBARI PT III PWSS",
+                "localname": "RETROFITTING OF AMBARI PT III PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205107",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBARI PT III PWSS",
+                        "localname": "RETROFITTING OF AMBARI PT III PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205107/ws-services-calculation/Penalty.json b/data/as/8205107/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cbe852754e
--- /dev/null
+++ b/data/as/8205107/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205107",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205107/ws-services-calculation/WCBillingSlab.json b/data/as/8205107/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..687d2d3d20
--- /dev/null
+++ b/data/as/8205107/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205107",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205116/BillingService/BusinessService.json b/data/as/8205116/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70eac16825
--- /dev/null
+++ b/data/as/8205116/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205116",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205116/egov-location/boundary-data.json b/data/as/8205116/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be714ec6ad
--- /dev/null
+++ b/data/as/8205116/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205116",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PADUPARA PWSS",
+                "localname": "RETROFITTING OF PADUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PADUPARA PWSS",
+                        "localname": "RETROFITTING OF PADUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PADUPARA PWSS",
+                "localname": "RETROFITTING OF PADUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PADUPARA PWSS",
+                        "localname": "RETROFITTING OF PADUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205116/ws-services-calculation/Penalty.json b/data/as/8205116/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..510396a1cb
--- /dev/null
+++ b/data/as/8205116/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205116",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205116/ws-services-calculation/WCBillingSlab.json b/data/as/8205116/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c57dbccf69
--- /dev/null
+++ b/data/as/8205116/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205116",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205127/BillingService/BusinessService.json b/data/as/8205127/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0d0ca620dc
--- /dev/null
+++ b/data/as/8205127/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205127",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205127/egov-location/boundary-data.json b/data/as/8205127/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab6bb2bd6e
--- /dev/null
+++ b/data/as/8205127/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205127",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SHANTINAGAR PWSS",
+                "localname": "RETROFITTING OF SHANTINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205127",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SHANTINAGAR PWSS",
+                        "localname": "RETROFITTING OF SHANTINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SHANTINAGAR PWSS",
+                "localname": "RETROFITTING OF SHANTINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205127",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SHANTINAGAR PWSS",
+                        "localname": "RETROFITTING OF SHANTINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205127/ws-services-calculation/Penalty.json b/data/as/8205127/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..77749e0ac4
--- /dev/null
+++ b/data/as/8205127/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205127",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205127/ws-services-calculation/WCBillingSlab.json b/data/as/8205127/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4065d74061
--- /dev/null
+++ b/data/as/8205127/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205127",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205153/BillingService/BusinessService.json b/data/as/8205153/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9d819a1554
--- /dev/null
+++ b/data/as/8205153/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205153",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205153/egov-location/boundary-data.json b/data/as/8205153/egov-location/boundary-data.json
new file mode 100644
index 0000000000..30ee21dc08
--- /dev/null
+++ b/data/as/8205153/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205153",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SHYAMAGAON PWSS",
+                "localname": "RETROFITTING OF SHYAMAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SHYAMAGAON PWSS",
+                        "localname": "RETROFITTING OF SHYAMAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SHYAMAGAON PWSS",
+                "localname": "RETROFITTING OF SHYAMAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SHYAMAGAON PWSS",
+                        "localname": "RETROFITTING OF SHYAMAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205153/ws-services-calculation/Penalty.json b/data/as/8205153/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b28585413a
--- /dev/null
+++ b/data/as/8205153/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205153",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205153/ws-services-calculation/WCBillingSlab.json b/data/as/8205153/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49e3f072aa
--- /dev/null
+++ b/data/as/8205153/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205153",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205176/BillingService/BusinessService.json b/data/as/8205176/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db61d9ae40
--- /dev/null
+++ b/data/as/8205176/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205176",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205176/egov-location/boundary-data.json b/data/as/8205176/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f65fa49827
--- /dev/null
+++ b/data/as/8205176/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205176",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHUPDHARA PWSS",
+                "localname": "RETROFITTING OF DHUPDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205176",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHUPDHARA PWSS",
+                        "localname": "RETROFITTING OF DHUPDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHUPDHARA PWSS",
+                "localname": "RETROFITTING OF DHUPDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205176",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHUPDHARA PWSS",
+                        "localname": "RETROFITTING OF DHUPDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205176/ws-services-calculation/Penalty.json b/data/as/8205176/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b9a134576b
--- /dev/null
+++ b/data/as/8205176/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205176",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205176/ws-services-calculation/WCBillingSlab.json b/data/as/8205176/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ec41751933
--- /dev/null
+++ b/data/as/8205176/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205176",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205265/BillingService/BusinessService.json b/data/as/8205265/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4356736a3
--- /dev/null
+++ b/data/as/8205265/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205265",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205265/egov-location/boundary-data.json b/data/as/8205265/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a69c73277
--- /dev/null
+++ b/data/as/8205265/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205265",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                "localname": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205265",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                        "localname": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                "localname": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205265",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                        "localname": "RETROFITTING OF ADOPARA SARDARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205265/ws-services-calculation/Penalty.json b/data/as/8205265/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ea59ad288
--- /dev/null
+++ b/data/as/8205265/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205265",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205265/ws-services-calculation/WCBillingSlab.json b/data/as/8205265/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..956430ae98
--- /dev/null
+++ b/data/as/8205265/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205265",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205277/BillingService/BusinessService.json b/data/as/8205277/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aeb751a06d
--- /dev/null
+++ b/data/as/8205277/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205277",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205277/egov-location/boundary-data.json b/data/as/8205277/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1f28d61a26
--- /dev/null
+++ b/data/as/8205277/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205277",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SUCIA PAHAR PWSS",
+                "localname": "RETROFITTING OF SUCIA PAHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SUCIA PAHAR PWSS",
+                        "localname": "RETROFITTING OF SUCIA PAHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SUCIA PAHAR PWSS",
+                "localname": "RETROFITTING OF SUCIA PAHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SUCIA PAHAR PWSS",
+                        "localname": "RETROFITTING OF SUCIA PAHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205277/ws-services-calculation/Penalty.json b/data/as/8205277/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..949b54211d
--- /dev/null
+++ b/data/as/8205277/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205277",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205277/ws-services-calculation/WCBillingSlab.json b/data/as/8205277/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..963e5679f6
--- /dev/null
+++ b/data/as/8205277/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205277",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205283/BillingService/BusinessService.json b/data/as/8205283/BillingService/BusinessService.json
new file mode 100644
index 0000000000..25813a4652
--- /dev/null
+++ b/data/as/8205283/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205283",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205283/egov-location/boundary-data.json b/data/as/8205283/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53fcc2ef5a
--- /dev/null
+++ b/data/as/8205283/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205283",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THEKASU PWSS",
+                "localname": "RETROFITTING OF THEKASU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THEKASU PWSS",
+                        "localname": "RETROFITTING OF THEKASU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THEKASU PWSS",
+                "localname": "RETROFITTING OF THEKASU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THEKASU PWSS",
+                        "localname": "RETROFITTING OF THEKASU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205283/ws-services-calculation/Penalty.json b/data/as/8205283/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..da352664de
--- /dev/null
+++ b/data/as/8205283/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205283",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205283/ws-services-calculation/WCBillingSlab.json b/data/as/8205283/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8b948c3089
--- /dev/null
+++ b/data/as/8205283/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205283",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205289/BillingService/BusinessService.json b/data/as/8205289/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da00fb9aba
--- /dev/null
+++ b/data/as/8205289/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205289",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205289/egov-location/boundary-data.json b/data/as/8205289/egov-location/boundary-data.json
new file mode 100644
index 0000000000..09bfa86f5e
--- /dev/null
+++ b/data/as/8205289/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205289",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAKRI PWSS",
+                "localname": "RETROFITTING OF MAKRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAKRI PWSS",
+                        "localname": "RETROFITTING OF MAKRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAKRI PWSS",
+                "localname": "RETROFITTING OF MAKRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAKRI PWSS",
+                        "localname": "RETROFITTING OF MAKRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205289/ws-services-calculation/Penalty.json b/data/as/8205289/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..185e47c61f
--- /dev/null
+++ b/data/as/8205289/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205289",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205289/ws-services-calculation/WCBillingSlab.json b/data/as/8205289/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54a8d1f05d
--- /dev/null
+++ b/data/as/8205289/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205289",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205290/BillingService/BusinessService.json b/data/as/8205290/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9bebd2e378
--- /dev/null
+++ b/data/as/8205290/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205290",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205290/egov-location/boundary-data.json b/data/as/8205290/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e288b9de5e
--- /dev/null
+++ b/data/as/8205290/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205290",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GATHIAPARA  PWSS",
+                "localname": "RETROFITTING OF GATHIAPARA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205290",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GATHIAPARA  PWSS",
+                        "localname": "RETROFITTING OF GATHIAPARA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GATHIAPARA  PWSS",
+                "localname": "RETROFITTING OF GATHIAPARA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205290",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GATHIAPARA  PWSS",
+                        "localname": "RETROFITTING OF GATHIAPARA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205290/ws-services-calculation/Penalty.json b/data/as/8205290/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f7463d3a22
--- /dev/null
+++ b/data/as/8205290/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205290",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205290/ws-services-calculation/WCBillingSlab.json b/data/as/8205290/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e886e063b
--- /dev/null
+++ b/data/as/8205290/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205290",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205310/BillingService/BusinessService.json b/data/as/8205310/BillingService/BusinessService.json
new file mode 100644
index 0000000000..103e7dcd8c
--- /dev/null
+++ b/data/as/8205310/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205310",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205310/egov-location/boundary-data.json b/data/as/8205310/egov-location/boundary-data.json
new file mode 100644
index 0000000000..21b8270539
--- /dev/null
+++ b/data/as/8205310/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205310",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KANYAKUCHI PWSS",
+                "localname": "RETROFITTING OF KANYAKUCHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KANYAKUCHI PWSS",
+                        "localname": "RETROFITTING OF KANYAKUCHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KANYAKUCHI PWSS",
+                "localname": "RETROFITTING OF KANYAKUCHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KANYAKUCHI PWSS",
+                        "localname": "RETROFITTING OF KANYAKUCHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205310/ws-services-calculation/Penalty.json b/data/as/8205310/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73ea4e8475
--- /dev/null
+++ b/data/as/8205310/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205310",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205310/ws-services-calculation/WCBillingSlab.json b/data/as/8205310/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..252786ab28
--- /dev/null
+++ b/data/as/8205310/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205310",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205339/BillingService/BusinessService.json b/data/as/8205339/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e2d2b64e1
--- /dev/null
+++ b/data/as/8205339/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205339",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205339/egov-location/boundary-data.json b/data/as/8205339/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6917fcf717
--- /dev/null
+++ b/data/as/8205339/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205339",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAKMARA PWSS",
+                "localname": "RETROFITTING OF BAKMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205339",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAKMARA PWSS",
+                        "localname": "RETROFITTING OF BAKMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAKMARA PWSS",
+                "localname": "RETROFITTING OF BAKMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205339",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAKMARA PWSS",
+                        "localname": "RETROFITTING OF BAKMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205339/ws-services-calculation/Penalty.json b/data/as/8205339/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d2fce1da96
--- /dev/null
+++ b/data/as/8205339/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205339",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205339/ws-services-calculation/WCBillingSlab.json b/data/as/8205339/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a935d8dcba
--- /dev/null
+++ b/data/as/8205339/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205339",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205350/BillingService/BusinessService.json b/data/as/8205350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86eb3ed21c
--- /dev/null
+++ b/data/as/8205350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205350/egov-location/boundary-data.json b/data/as/8205350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6a1feb9332
--- /dev/null
+++ b/data/as/8205350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAKAIDAL PWSS",
+                "localname": "RETROFITTING OF DAKAIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAKAIDAL PWSS",
+                        "localname": "RETROFITTING OF DAKAIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAKAIDAL PWSS",
+                "localname": "RETROFITTING OF DAKAIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAKAIDAL PWSS",
+                        "localname": "RETROFITTING OF DAKAIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205350/ws-services-calculation/Penalty.json b/data/as/8205350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6bd655037
--- /dev/null
+++ b/data/as/8205350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205350/ws-services-calculation/WCBillingSlab.json b/data/as/8205350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..76d5973b79
--- /dev/null
+++ b/data/as/8205350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205362/BillingService/BusinessService.json b/data/as/8205362/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e1e1ad399
--- /dev/null
+++ b/data/as/8205362/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205362",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205362/egov-location/boundary-data.json b/data/as/8205362/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f69d510758
--- /dev/null
+++ b/data/as/8205362/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205362",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LALABORI PWSS",
+                "localname": "RETROFITTING OF LALABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205362",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LALABORI PWSS",
+                        "localname": "RETROFITTING OF LALABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LALABORI PWSS",
+                "localname": "RETROFITTING OF LALABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205362",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LALABORI PWSS",
+                        "localname": "RETROFITTING OF LALABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205362/ws-services-calculation/Penalty.json b/data/as/8205362/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db9d4fce82
--- /dev/null
+++ b/data/as/8205362/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205362",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205362/ws-services-calculation/WCBillingSlab.json b/data/as/8205362/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a0b8dd674
--- /dev/null
+++ b/data/as/8205362/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205362",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205375/BillingService/BusinessService.json b/data/as/8205375/BillingService/BusinessService.json
new file mode 100644
index 0000000000..73c6b8a391
--- /dev/null
+++ b/data/as/8205375/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205375",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205375/egov-location/boundary-data.json b/data/as/8205375/egov-location/boundary-data.json
new file mode 100644
index 0000000000..68f286edcf
--- /dev/null
+++ b/data/as/8205375/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205375",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DASABHUJA PWSS",
+                "localname": "RETROFITTING OF DASABHUJA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DASABHUJA PWSS",
+                        "localname": "RETROFITTING OF DASABHUJA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DASABHUJA PWSS",
+                "localname": "RETROFITTING OF DASABHUJA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DASABHUJA PWSS",
+                        "localname": "RETROFITTING OF DASABHUJA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205375/ws-services-calculation/Penalty.json b/data/as/8205375/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1698716967
--- /dev/null
+++ b/data/as/8205375/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205375",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205375/ws-services-calculation/WCBillingSlab.json b/data/as/8205375/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf3aac5a6b
--- /dev/null
+++ b/data/as/8205375/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205375",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205382/BillingService/BusinessService.json b/data/as/8205382/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2456c249ec
--- /dev/null
+++ b/data/as/8205382/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205382",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205382/egov-location/boundary-data.json b/data/as/8205382/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3c02a53a6a
--- /dev/null
+++ b/data/as/8205382/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205382",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAKHYASINI PWSS",
+                "localname": "RETROFITTING OF RAKHYASINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAKHYASINI PWSS",
+                        "localname": "RETROFITTING OF RAKHYASINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAKHYASINI PWSS",
+                "localname": "RETROFITTING OF RAKHYASINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAKHYASINI PWSS",
+                        "localname": "RETROFITTING OF RAKHYASINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205382/ws-services-calculation/Penalty.json b/data/as/8205382/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb446d4bcf
--- /dev/null
+++ b/data/as/8205382/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205382",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205382/ws-services-calculation/WCBillingSlab.json b/data/as/8205382/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9b6b6bc77b
--- /dev/null
+++ b/data/as/8205382/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205382",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205387/BillingService/BusinessService.json b/data/as/8205387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4cfe29b3d6
--- /dev/null
+++ b/data/as/8205387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205387/egov-location/boundary-data.json b/data/as/8205387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab218af2a5
--- /dev/null
+++ b/data/as/8205387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOWAMARI PWSS",
+                "localname": "RETROFITTING OF MOWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOWAMARI PWSS",
+                        "localname": "RETROFITTING OF MOWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MOWAMARI PWSS",
+                "localname": "RETROFITTING OF MOWAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MOWAMARI PWSS",
+                        "localname": "RETROFITTING OF MOWAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205387/ws-services-calculation/Penalty.json b/data/as/8205387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..03910c0452
--- /dev/null
+++ b/data/as/8205387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205387/ws-services-calculation/WCBillingSlab.json b/data/as/8205387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a3537ed9d
--- /dev/null
+++ b/data/as/8205387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205395/BillingService/BusinessService.json b/data/as/8205395/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d7a777b2d
--- /dev/null
+++ b/data/as/8205395/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8205395",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205395/egov-location/boundary-data.json b/data/as/8205395/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe51aa37b3
--- /dev/null
+++ b/data/as/8205395/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8205395",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAKAITARY PWSS",
+                "localname": "RETROFITTING OF BAKAITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAKAITARY PWSS",
+                        "localname": "RETROFITTING OF BAKAITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAKAITARY PWSS",
+                "localname": "RETROFITTING OF BAKAITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8205395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAKAITARY PWSS",
+                        "localname": "RETROFITTING OF BAKAITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205395/ws-services-calculation/Penalty.json b/data/as/8205395/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a64359383
--- /dev/null
+++ b/data/as/8205395/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8205395",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8205395/ws-services-calculation/WCBillingSlab.json b/data/as/8205395/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e2418b37c5
--- /dev/null
+++ b/data/as/8205395/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8205395",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206044/BillingService/BusinessService.json b/data/as/8206044/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6dca74b7e0
--- /dev/null
+++ b/data/as/8206044/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206044",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206044/egov-location/boundary-data.json b/data/as/8206044/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fcd2a37b86
--- /dev/null
+++ b/data/as/8206044/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206044",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORBORI PWSS",
+                "localname": "RETROFITTING OF BORBORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORBORI PWSS",
+                        "localname": "RETROFITTING OF BORBORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORBORI PWSS",
+                "localname": "RETROFITTING OF BORBORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORBORI PWSS",
+                        "localname": "RETROFITTING OF BORBORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206044/ws-services-calculation/Penalty.json b/data/as/8206044/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc849550af
--- /dev/null
+++ b/data/as/8206044/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206044",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206044/ws-services-calculation/WCBillingSlab.json b/data/as/8206044/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1545128e0
--- /dev/null
+++ b/data/as/8206044/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206044",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206058/BillingService/BusinessService.json b/data/as/8206058/BillingService/BusinessService.json
new file mode 100644
index 0000000000..368779e6d1
--- /dev/null
+++ b/data/as/8206058/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206058",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206058/egov-location/boundary-data.json b/data/as/8206058/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a85d50f45b
--- /dev/null
+++ b/data/as/8206058/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206058",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHASIBORI PWSS",
+                "localname": "RETROFITTING OF CHASIBORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHASIBORI PWSS",
+                        "localname": "RETROFITTING OF CHASIBORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHASIBORI PWSS",
+                "localname": "RETROFITTING OF CHASIBORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHASIBORI PWSS",
+                        "localname": "RETROFITTING OF CHASIBORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206058/ws-services-calculation/Penalty.json b/data/as/8206058/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec44d8a58c
--- /dev/null
+++ b/data/as/8206058/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206058",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206058/ws-services-calculation/WCBillingSlab.json b/data/as/8206058/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21831b62d8
--- /dev/null
+++ b/data/as/8206058/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206058",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206068/BillingService/BusinessService.json b/data/as/8206068/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b7503c85a5
--- /dev/null
+++ b/data/as/8206068/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206068",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206068/egov-location/boundary-data.json b/data/as/8206068/egov-location/boundary-data.json
new file mode 100644
index 0000000000..79202baf05
--- /dev/null
+++ b/data/as/8206068/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206068",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GANDIMPATHAR PWSS",
+                "localname": "RETROFITTING OF GANDIMPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GANDIMPATHAR PWSS",
+                        "localname": "RETROFITTING OF GANDIMPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GANDIMPATHAR PWSS",
+                "localname": "RETROFITTING OF GANDIMPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GANDIMPATHAR PWSS",
+                        "localname": "RETROFITTING OF GANDIMPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206068/ws-services-calculation/Penalty.json b/data/as/8206068/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8b34c71942
--- /dev/null
+++ b/data/as/8206068/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206068",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206068/ws-services-calculation/WCBillingSlab.json b/data/as/8206068/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d509e8f6e6
--- /dev/null
+++ b/data/as/8206068/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206068",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206074/BillingService/BusinessService.json b/data/as/8206074/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4df10e5e02
--- /dev/null
+++ b/data/as/8206074/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206074",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206074/egov-location/boundary-data.json b/data/as/8206074/egov-location/boundary-data.json
new file mode 100644
index 0000000000..809cbbb76e
--- /dev/null
+++ b/data/as/8206074/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206074",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAKATPARA PWSS",
+                "localname": "RETROFITTING OF BHAKATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206074",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAKATPARA PWSS",
+                        "localname": "RETROFITTING OF BHAKATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAKATPARA PWSS",
+                "localname": "RETROFITTING OF BHAKATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206074",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAKATPARA PWSS",
+                        "localname": "RETROFITTING OF BHAKATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206074/ws-services-calculation/Penalty.json b/data/as/8206074/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..36bff42177
--- /dev/null
+++ b/data/as/8206074/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206074",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206074/ws-services-calculation/WCBillingSlab.json b/data/as/8206074/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..53186e260f
--- /dev/null
+++ b/data/as/8206074/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206074",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206091/BillingService/BusinessService.json b/data/as/8206091/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0b5959a857
--- /dev/null
+++ b/data/as/8206091/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206091",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206091/egov-location/boundary-data.json b/data/as/8206091/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5d68a35e5d
--- /dev/null
+++ b/data/as/8206091/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206091",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANIAPARA PWSS",
+                "localname": "RETROFITTING OF BANIAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANIAPARA PWSS",
+                        "localname": "RETROFITTING OF BANIAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANIAPARA PWSS",
+                "localname": "RETROFITTING OF BANIAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANIAPARA PWSS",
+                        "localname": "RETROFITTING OF BANIAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206091/ws-services-calculation/Penalty.json b/data/as/8206091/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ffb7e25f52
--- /dev/null
+++ b/data/as/8206091/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206091",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206091/ws-services-calculation/WCBillingSlab.json b/data/as/8206091/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..128d9a5d87
--- /dev/null
+++ b/data/as/8206091/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206091",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206111/BillingService/BusinessService.json b/data/as/8206111/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4b9b3bcd8
--- /dev/null
+++ b/data/as/8206111/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206111",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206111/egov-location/boundary-data.json b/data/as/8206111/egov-location/boundary-data.json
new file mode 100644
index 0000000000..833caa2906
--- /dev/null
+++ b/data/as/8206111/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206111",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILUK PWSS",
+                "localname": "RETROFITTING OF SILUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206111",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILUK PWSS",
+                        "localname": "RETROFITTING OF SILUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILUK PWSS",
+                "localname": "RETROFITTING OF SILUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206111",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILUK PWSS",
+                        "localname": "RETROFITTING OF SILUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206111/ws-services-calculation/Penalty.json b/data/as/8206111/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3b8603d85
--- /dev/null
+++ b/data/as/8206111/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206111",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206111/ws-services-calculation/WCBillingSlab.json b/data/as/8206111/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a5c99cc24
--- /dev/null
+++ b/data/as/8206111/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206111",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206116/BillingService/BusinessService.json b/data/as/8206116/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3095b30fe6
--- /dev/null
+++ b/data/as/8206116/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206116",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206116/egov-location/boundary-data.json b/data/as/8206116/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c37d278547
--- /dev/null
+++ b/data/as/8206116/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206116",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIGHELI PWSS",
+                "localname": "RETROFITTING OF DIGHELI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIGHELI PWSS",
+                        "localname": "RETROFITTING OF DIGHELI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIGHELI PWSS",
+                "localname": "RETROFITTING OF DIGHELI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIGHELI PWSS",
+                        "localname": "RETROFITTING OF DIGHELI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206116/ws-services-calculation/Penalty.json b/data/as/8206116/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..50e200909c
--- /dev/null
+++ b/data/as/8206116/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206116",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206116/ws-services-calculation/WCBillingSlab.json b/data/as/8206116/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f96bae2b2c
--- /dev/null
+++ b/data/as/8206116/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206116",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206170/BillingService/BusinessService.json b/data/as/8206170/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a5638b1e4
--- /dev/null
+++ b/data/as/8206170/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206170",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206170/egov-location/boundary-data.json b/data/as/8206170/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7aa0663428
--- /dev/null
+++ b/data/as/8206170/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206170",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FAKIRPARA PWSS",
+                "localname": "RETROFITTING OF FAKIRPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FAKIRPARA PWSS",
+                        "localname": "RETROFITTING OF FAKIRPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FAKIRPARA PWSS",
+                "localname": "RETROFITTING OF FAKIRPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FAKIRPARA PWSS",
+                        "localname": "RETROFITTING OF FAKIRPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206170/ws-services-calculation/Penalty.json b/data/as/8206170/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dcbbe05965
--- /dev/null
+++ b/data/as/8206170/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206170",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206170/ws-services-calculation/WCBillingSlab.json b/data/as/8206170/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b998f94ff
--- /dev/null
+++ b/data/as/8206170/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206170",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206177/BillingService/BusinessService.json b/data/as/8206177/BillingService/BusinessService.json
new file mode 100644
index 0000000000..23ed676a9c
--- /dev/null
+++ b/data/as/8206177/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206177",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206177/egov-location/boundary-data.json b/data/as/8206177/egov-location/boundary-data.json
new file mode 100644
index 0000000000..14ef0d63f3
--- /dev/null
+++ b/data/as/8206177/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206177",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANTOLA PWSS",
+                "localname": "RETROFITTING OF DHANTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANTOLA PWSS",
+                        "localname": "RETROFITTING OF DHANTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANTOLA PWSS",
+                "localname": "RETROFITTING OF DHANTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206177",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANTOLA PWSS",
+                        "localname": "RETROFITTING OF DHANTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206177/ws-services-calculation/Penalty.json b/data/as/8206177/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad676c49cc
--- /dev/null
+++ b/data/as/8206177/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206177",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206177/ws-services-calculation/WCBillingSlab.json b/data/as/8206177/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17084ee2c2
--- /dev/null
+++ b/data/as/8206177/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206177",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206194/BillingService/BusinessService.json b/data/as/8206194/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f99bd7e2e7
--- /dev/null
+++ b/data/as/8206194/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206194",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206194/egov-location/boundary-data.json b/data/as/8206194/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b443d54cd0
--- /dev/null
+++ b/data/as/8206194/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206194",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUTABARI PT II PWSS",
+                "localname": "RETROFITTING OF KHUTABARI PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUTABARI PT II PWSS",
+                        "localname": "RETROFITTING OF KHUTABARI PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUTABARI PT II PWSS",
+                "localname": "RETROFITTING OF KHUTABARI PT II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUTABARI PT II PWSS",
+                        "localname": "RETROFITTING OF KHUTABARI PT II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206194/ws-services-calculation/Penalty.json b/data/as/8206194/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5daee9033b
--- /dev/null
+++ b/data/as/8206194/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206194",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206194/ws-services-calculation/WCBillingSlab.json b/data/as/8206194/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d3d0ba3a37
--- /dev/null
+++ b/data/as/8206194/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206194",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206219/BillingService/BusinessService.json b/data/as/8206219/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a124a0e914
--- /dev/null
+++ b/data/as/8206219/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206219",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206219/egov-location/boundary-data.json b/data/as/8206219/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e98e32ab9
--- /dev/null
+++ b/data/as/8206219/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206219",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MASLAM PWSS",
+                "localname": "RETROFITTING OF MASLAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MASLAM PWSS",
+                        "localname": "RETROFITTING OF MASLAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MASLAM PWSS",
+                "localname": "RETROFITTING OF MASLAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MASLAM PWSS",
+                        "localname": "RETROFITTING OF MASLAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206219/ws-services-calculation/Penalty.json b/data/as/8206219/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4a3d9c173
--- /dev/null
+++ b/data/as/8206219/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206219",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206219/ws-services-calculation/WCBillingSlab.json b/data/as/8206219/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..63a850dafa
--- /dev/null
+++ b/data/as/8206219/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206219",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206280/BillingService/BusinessService.json b/data/as/8206280/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dc510b34d
--- /dev/null
+++ b/data/as/8206280/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206280",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206280/egov-location/boundary-data.json b/data/as/8206280/egov-location/boundary-data.json
new file mode 100644
index 0000000000..51eaa6ed45
--- /dev/null
+++ b/data/as/8206280/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206280",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARIMURA  PWSS",
+                "localname": "RETROFITTING OF HARIMURA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206280",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARIMURA  PWSS",
+                        "localname": "RETROFITTING OF HARIMURA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARIMURA  PWSS",
+                "localname": "RETROFITTING OF HARIMURA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206280",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARIMURA  PWSS",
+                        "localname": "RETROFITTING OF HARIMURA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206280/ws-services-calculation/Penalty.json b/data/as/8206280/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f24c82e96e
--- /dev/null
+++ b/data/as/8206280/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206280",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206280/ws-services-calculation/WCBillingSlab.json b/data/as/8206280/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e52e051517
--- /dev/null
+++ b/data/as/8206280/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206280",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206284/BillingService/BusinessService.json b/data/as/8206284/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d03d008a68
--- /dev/null
+++ b/data/as/8206284/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206284",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206284/egov-location/boundary-data.json b/data/as/8206284/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6dedb47e8
--- /dev/null
+++ b/data/as/8206284/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206284",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHATIPARA PWSS",
+                "localname": "RETROFITTING OF BHATIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHATIPARA PWSS",
+                        "localname": "RETROFITTING OF BHATIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHATIPARA PWSS",
+                "localname": "RETROFITTING OF BHATIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHATIPARA PWSS",
+                        "localname": "RETROFITTING OF BHATIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206284/ws-services-calculation/Penalty.json b/data/as/8206284/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dd3f367635
--- /dev/null
+++ b/data/as/8206284/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206284",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206284/ws-services-calculation/WCBillingSlab.json b/data/as/8206284/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7a62658a8a
--- /dev/null
+++ b/data/as/8206284/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206284",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206297/BillingService/BusinessService.json b/data/as/8206297/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37b813a774
--- /dev/null
+++ b/data/as/8206297/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206297",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206297/egov-location/boundary-data.json b/data/as/8206297/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0acc88825e
--- /dev/null
+++ b/data/as/8206297/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206297",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                "localname": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                        "localname": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                "localname": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                        "localname": "RETROFITTING OF KHUDRAPOITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206297/ws-services-calculation/Penalty.json b/data/as/8206297/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5e1efeb3b0
--- /dev/null
+++ b/data/as/8206297/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206297",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206297/ws-services-calculation/WCBillingSlab.json b/data/as/8206297/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..75c3e8e474
--- /dev/null
+++ b/data/as/8206297/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206297",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206302/BillingService/BusinessService.json b/data/as/8206302/BillingService/BusinessService.json
new file mode 100644
index 0000000000..347a9e57ee
--- /dev/null
+++ b/data/as/8206302/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206302",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206302/egov-location/boundary-data.json b/data/as/8206302/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2e2dc11ad
--- /dev/null
+++ b/data/as/8206302/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206302",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYBHUM PWSS",
+                "localname": "RETROFITTING OF JOYBHUM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYBHUM PWSS",
+                        "localname": "RETROFITTING OF JOYBHUM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOYBHUM PWSS",
+                "localname": "RETROFITTING OF JOYBHUM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOYBHUM PWSS",
+                        "localname": "RETROFITTING OF JOYBHUM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206302/ws-services-calculation/Penalty.json b/data/as/8206302/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f8fac1002
--- /dev/null
+++ b/data/as/8206302/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206302",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206302/ws-services-calculation/WCBillingSlab.json b/data/as/8206302/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0a01109fcf
--- /dev/null
+++ b/data/as/8206302/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206302",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206316/BillingService/BusinessService.json b/data/as/8206316/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66f7d439a6
--- /dev/null
+++ b/data/as/8206316/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206316",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206316/egov-location/boundary-data.json b/data/as/8206316/egov-location/boundary-data.json
new file mode 100644
index 0000000000..256d718c2a
--- /dev/null
+++ b/data/as/8206316/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206316",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUB MATIA PWSS",
+                "localname": "RETROFITTING OF PUB MATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUB MATIA PWSS",
+                        "localname": "RETROFITTING OF PUB MATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUB MATIA PWSS",
+                "localname": "RETROFITTING OF PUB MATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUB MATIA PWSS",
+                        "localname": "RETROFITTING OF PUB MATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206316/ws-services-calculation/Penalty.json b/data/as/8206316/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9457e561f7
--- /dev/null
+++ b/data/as/8206316/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206316",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206316/ws-services-calculation/WCBillingSlab.json b/data/as/8206316/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60f2fdac0e
--- /dev/null
+++ b/data/as/8206316/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206316",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206425/BillingService/BusinessService.json b/data/as/8206425/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6616dcc4cc
--- /dev/null
+++ b/data/as/8206425/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206425",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206425/egov-location/boundary-data.json b/data/as/8206425/egov-location/boundary-data.json
new file mode 100644
index 0000000000..145447c0be
--- /dev/null
+++ b/data/as/8206425/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206425",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINKONIAPARA PWSS",
+                "localname": "RETROFITTING OF TINKONIAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINKONIAPARA PWSS",
+                        "localname": "RETROFITTING OF TINKONIAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TINKONIAPARA PWSS",
+                "localname": "RETROFITTING OF TINKONIAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TINKONIAPARA PWSS",
+                        "localname": "RETROFITTING OF TINKONIAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206425/ws-services-calculation/Penalty.json b/data/as/8206425/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..67a6ff77a7
--- /dev/null
+++ b/data/as/8206425/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206425",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206425/ws-services-calculation/WCBillingSlab.json b/data/as/8206425/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad7b6f3120
--- /dev/null
+++ b/data/as/8206425/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206425",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206436/BillingService/BusinessService.json b/data/as/8206436/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1947c5d7c9
--- /dev/null
+++ b/data/as/8206436/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206436",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206436/egov-location/boundary-data.json b/data/as/8206436/egov-location/boundary-data.json
new file mode 100644
index 0000000000..64b81fa8fd
--- /dev/null
+++ b/data/as/8206436/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206436",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SUTARPARA PWSS",
+                "localname": "RETROFITTING OF SUTARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206436",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SUTARPARA PWSS",
+                        "localname": "RETROFITTING OF SUTARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SUTARPARA PWSS",
+                "localname": "RETROFITTING OF SUTARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206436",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SUTARPARA PWSS",
+                        "localname": "RETROFITTING OF SUTARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206436/ws-services-calculation/Penalty.json b/data/as/8206436/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71ee53ac83
--- /dev/null
+++ b/data/as/8206436/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206436",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206436/ws-services-calculation/WCBillingSlab.json b/data/as/8206436/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..667ffa9b56
--- /dev/null
+++ b/data/as/8206436/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206436",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206445/BillingService/BusinessService.json b/data/as/8206445/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec405455b5
--- /dev/null
+++ b/data/as/8206445/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206445",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206445/egov-location/boundary-data.json b/data/as/8206445/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3492a2417e
--- /dev/null
+++ b/data/as/8206445/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206445",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARUPURATARY PWSS",
+                "localname": "RETROFITTING OF GARUPURATARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARUPURATARY PWSS",
+                        "localname": "RETROFITTING OF GARUPURATARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GARUPURATARY PWSS",
+                "localname": "RETROFITTING OF GARUPURATARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206445",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GARUPURATARY PWSS",
+                        "localname": "RETROFITTING OF GARUPURATARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206445/ws-services-calculation/Penalty.json b/data/as/8206445/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..596e01ea1b
--- /dev/null
+++ b/data/as/8206445/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206445",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206445/ws-services-calculation/WCBillingSlab.json b/data/as/8206445/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67b803f2ac
--- /dev/null
+++ b/data/as/8206445/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206445",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206457/BillingService/BusinessService.json b/data/as/8206457/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99cbbe6f63
--- /dev/null
+++ b/data/as/8206457/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206457",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206457/egov-location/boundary-data.json b/data/as/8206457/egov-location/boundary-data.json
new file mode 100644
index 0000000000..019f171ea1
--- /dev/null
+++ b/data/as/8206457/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206457",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHERBHERY PWSS",
+                "localname": "RETROFITTING OF BHERBHERY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHERBHERY PWSS",
+                        "localname": "RETROFITTING OF BHERBHERY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHERBHERY PWSS",
+                "localname": "RETROFITTING OF BHERBHERY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHERBHERY PWSS",
+                        "localname": "RETROFITTING OF BHERBHERY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206457/ws-services-calculation/Penalty.json b/data/as/8206457/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b979096f1e
--- /dev/null
+++ b/data/as/8206457/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206457",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206457/ws-services-calculation/WCBillingSlab.json b/data/as/8206457/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a2f6eae8c7
--- /dev/null
+++ b/data/as/8206457/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206457",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206469/BillingService/BusinessService.json b/data/as/8206469/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94a537e65d
--- /dev/null
+++ b/data/as/8206469/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206469",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206469/egov-location/boundary-data.json b/data/as/8206469/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf6c219a5c
--- /dev/null
+++ b/data/as/8206469/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206469",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MORISHBARI PWSS",
+                "localname": "RETROFITTING OF MORISHBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MORISHBARI PWSS",
+                        "localname": "RETROFITTING OF MORISHBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MORISHBARI PWSS",
+                "localname": "RETROFITTING OF MORISHBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MORISHBARI PWSS",
+                        "localname": "RETROFITTING OF MORISHBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206469/ws-services-calculation/Penalty.json b/data/as/8206469/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..79c842dda7
--- /dev/null
+++ b/data/as/8206469/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206469",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206469/ws-services-calculation/WCBillingSlab.json b/data/as/8206469/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f6d857767
--- /dev/null
+++ b/data/as/8206469/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206469",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206477/BillingService/BusinessService.json b/data/as/8206477/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e32f4378c
--- /dev/null
+++ b/data/as/8206477/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206477",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206477/egov-location/boundary-data.json b/data/as/8206477/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6b02a478d
--- /dev/null
+++ b/data/as/8206477/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206477",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAKTOLA PWSS",
+                "localname": "RETROFITTING OF SAKTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAKTOLA PWSS",
+                        "localname": "RETROFITTING OF SAKTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAKTOLA PWSS",
+                "localname": "RETROFITTING OF SAKTOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAKTOLA PWSS",
+                        "localname": "RETROFITTING OF SAKTOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206477/ws-services-calculation/Penalty.json b/data/as/8206477/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19dc39f24b
--- /dev/null
+++ b/data/as/8206477/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206477",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206477/ws-services-calculation/WCBillingSlab.json b/data/as/8206477/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..346bbd70fe
--- /dev/null
+++ b/data/as/8206477/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206477",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206486/BillingService/BusinessService.json b/data/as/8206486/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b110f7b64e
--- /dev/null
+++ b/data/as/8206486/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206486",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206486/egov-location/boundary-data.json b/data/as/8206486/egov-location/boundary-data.json
new file mode 100644
index 0000000000..daf64bbbd4
--- /dev/null
+++ b/data/as/8206486/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206486",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ATHIABARI PWSS",
+                "localname": "RETROFITTING OF ATHIABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206486",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ATHIABARI PWSS",
+                        "localname": "RETROFITTING OF ATHIABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ATHIABARI PWSS",
+                "localname": "RETROFITTING OF ATHIABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206486",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ATHIABARI PWSS",
+                        "localname": "RETROFITTING OF ATHIABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206486/ws-services-calculation/Penalty.json b/data/as/8206486/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9aba8c6014
--- /dev/null
+++ b/data/as/8206486/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206486",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206486/ws-services-calculation/WCBillingSlab.json b/data/as/8206486/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9288fc9767
--- /dev/null
+++ b/data/as/8206486/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206486",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206496/BillingService/BusinessService.json b/data/as/8206496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4052848e20
--- /dev/null
+++ b/data/as/8206496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206496/egov-location/boundary-data.json b/data/as/8206496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e9f8a7781
--- /dev/null
+++ b/data/as/8206496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANUPARA PWSS",
+                "localname": "RETROFITTING OF MANUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANUPARA PWSS",
+                        "localname": "RETROFITTING OF MANUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANUPARA PWSS",
+                "localname": "RETROFITTING OF MANUPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANUPARA PWSS",
+                        "localname": "RETROFITTING OF MANUPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206496/ws-services-calculation/Penalty.json b/data/as/8206496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78cd37e963
--- /dev/null
+++ b/data/as/8206496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206496/ws-services-calculation/WCBillingSlab.json b/data/as/8206496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c04d978364
--- /dev/null
+++ b/data/as/8206496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206510/BillingService/BusinessService.json b/data/as/8206510/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa491b9733
--- /dev/null
+++ b/data/as/8206510/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206510",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206510/egov-location/boundary-data.json b/data/as/8206510/egov-location/boundary-data.json
new file mode 100644
index 0000000000..80f58ac1b6
--- /dev/null
+++ b/data/as/8206510/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206510",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                "localname": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                        "localname": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                "localname": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                        "localname": "RETROFITTING OF BANDARSHREE NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206510/ws-services-calculation/Penalty.json b/data/as/8206510/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ca4398563
--- /dev/null
+++ b/data/as/8206510/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206510",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206510/ws-services-calculation/WCBillingSlab.json b/data/as/8206510/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..927242a32f
--- /dev/null
+++ b/data/as/8206510/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206510",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206524/BillingService/BusinessService.json b/data/as/8206524/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e30fbfa1c2
--- /dev/null
+++ b/data/as/8206524/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206524",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206524/egov-location/boundary-data.json b/data/as/8206524/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5831dd8ae2
--- /dev/null
+++ b/data/as/8206524/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206524",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHOMARI PWSS",
+                "localname": "RETROFITTING OF KACHOMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHOMARI PWSS",
+                        "localname": "RETROFITTING OF KACHOMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KACHOMARI PWSS",
+                "localname": "RETROFITTING OF KACHOMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KACHOMARI PWSS",
+                        "localname": "RETROFITTING OF KACHOMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206524/ws-services-calculation/Penalty.json b/data/as/8206524/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..daae187a19
--- /dev/null
+++ b/data/as/8206524/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206524",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206524/ws-services-calculation/WCBillingSlab.json b/data/as/8206524/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2369497cff
--- /dev/null
+++ b/data/as/8206524/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206524",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206535/BillingService/BusinessService.json b/data/as/8206535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8a2444a23a
--- /dev/null
+++ b/data/as/8206535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206535/egov-location/boundary-data.json b/data/as/8206535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02bfd037ca
--- /dev/null
+++ b/data/as/8206535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MATIHOLA PWSS",
+                "localname": "RETROFITTING OF MATIHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MATIHOLA PWSS",
+                        "localname": "RETROFITTING OF MATIHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MATIHOLA PWSS",
+                "localname": "RETROFITTING OF MATIHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MATIHOLA PWSS",
+                        "localname": "RETROFITTING OF MATIHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206535/ws-services-calculation/Penalty.json b/data/as/8206535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94d28d60ab
--- /dev/null
+++ b/data/as/8206535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206535/ws-services-calculation/WCBillingSlab.json b/data/as/8206535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58c3095b3e
--- /dev/null
+++ b/data/as/8206535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206542/BillingService/BusinessService.json b/data/as/8206542/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e6349c622b
--- /dev/null
+++ b/data/as/8206542/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206542",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206542/egov-location/boundary-data.json b/data/as/8206542/egov-location/boundary-data.json
new file mode 100644
index 0000000000..661049e24f
--- /dev/null
+++ b/data/as/8206542/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206542",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANUBHANGA PWSS",
+                "localname": "RETROFITTING OF DHANUBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206542",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANUBHANGA PWSS",
+                        "localname": "RETROFITTING OF DHANUBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANUBHANGA PWSS",
+                "localname": "RETROFITTING OF DHANUBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206542",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANUBHANGA PWSS",
+                        "localname": "RETROFITTING OF DHANUBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206542/ws-services-calculation/Penalty.json b/data/as/8206542/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1cb97b5875
--- /dev/null
+++ b/data/as/8206542/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206542",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206542/ws-services-calculation/WCBillingSlab.json b/data/as/8206542/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9e641ab573
--- /dev/null
+++ b/data/as/8206542/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206542",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206547/BillingService/BusinessService.json b/data/as/8206547/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97f217b603
--- /dev/null
+++ b/data/as/8206547/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206547",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206547/egov-location/boundary-data.json b/data/as/8206547/egov-location/boundary-data.json
new file mode 100644
index 0000000000..58aa19752c
--- /dev/null
+++ b/data/as/8206547/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206547",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOREMARI PWSS",
+                "localname": "RETROFITTING OF GOREMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206547",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOREMARI PWSS",
+                        "localname": "RETROFITTING OF GOREMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOREMARI PWSS",
+                "localname": "RETROFITTING OF GOREMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206547",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOREMARI PWSS",
+                        "localname": "RETROFITTING OF GOREMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206547/ws-services-calculation/Penalty.json b/data/as/8206547/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5846cd46dc
--- /dev/null
+++ b/data/as/8206547/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206547",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206547/ws-services-calculation/WCBillingSlab.json b/data/as/8206547/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5370c5ba98
--- /dev/null
+++ b/data/as/8206547/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206547",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206554/BillingService/BusinessService.json b/data/as/8206554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9288bf3a37
--- /dev/null
+++ b/data/as/8206554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206554/egov-location/boundary-data.json b/data/as/8206554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1086841781
--- /dev/null
+++ b/data/as/8206554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DALGOMA PWSS",
+                "localname": "RETROFITTING OF DALGOMA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DALGOMA PWSS",
+                        "localname": "RETROFITTING OF DALGOMA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DALGOMA PWSS",
+                "localname": "RETROFITTING OF DALGOMA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DALGOMA PWSS",
+                        "localname": "RETROFITTING OF DALGOMA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206554/ws-services-calculation/Penalty.json b/data/as/8206554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4bf3f5a8f0
--- /dev/null
+++ b/data/as/8206554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206554/ws-services-calculation/WCBillingSlab.json b/data/as/8206554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9879f9cbc2
--- /dev/null
+++ b/data/as/8206554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206558/BillingService/BusinessService.json b/data/as/8206558/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9bd3b0ab40
--- /dev/null
+++ b/data/as/8206558/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206558",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206558/egov-location/boundary-data.json b/data/as/8206558/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6e6b32a624
--- /dev/null
+++ b/data/as/8206558/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206558",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SUNDARPUR PWSS",
+                "localname": "RETROFITTING OF SUNDARPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206558",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SUNDARPUR PWSS",
+                        "localname": "RETROFITTING OF SUNDARPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SUNDARPUR PWSS",
+                "localname": "RETROFITTING OF SUNDARPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206558",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SUNDARPUR PWSS",
+                        "localname": "RETROFITTING OF SUNDARPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206558/ws-services-calculation/Penalty.json b/data/as/8206558/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..85109ab133
--- /dev/null
+++ b/data/as/8206558/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206558",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206558/ws-services-calculation/WCBillingSlab.json b/data/as/8206558/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..644bf08472
--- /dev/null
+++ b/data/as/8206558/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206558",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206789/BillingService/BusinessService.json b/data/as/8206789/BillingService/BusinessService.json
new file mode 100644
index 0000000000..67ec2c9cce
--- /dev/null
+++ b/data/as/8206789/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206789",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206789/egov-location/boundary-data.json b/data/as/8206789/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf855dd5c5
--- /dev/null
+++ b/data/as/8206789/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206789",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DA ATI PWSS",
+                "localname": "RETROFITTING OF DA ATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206789",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DA ATI PWSS",
+                        "localname": "RETROFITTING OF DA ATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DA ATI PWSS",
+                "localname": "RETROFITTING OF DA ATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206789",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DA ATI PWSS",
+                        "localname": "RETROFITTING OF DA ATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206789/ws-services-calculation/Penalty.json b/data/as/8206789/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a8ff09d4c
--- /dev/null
+++ b/data/as/8206789/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206789",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206789/ws-services-calculation/WCBillingSlab.json b/data/as/8206789/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49c7c45f08
--- /dev/null
+++ b/data/as/8206789/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206789",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206800/BillingService/BusinessService.json b/data/as/8206800/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd71c90416
--- /dev/null
+++ b/data/as/8206800/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206800",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206800/egov-location/boundary-data.json b/data/as/8206800/egov-location/boundary-data.json
new file mode 100644
index 0000000000..997adce4b3
--- /dev/null
+++ b/data/as/8206800/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206800",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SESSA PANBARI PWSS",
+                "localname": "RETROFITTING OF SESSA PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SESSA PANBARI PWSS",
+                        "localname": "RETROFITTING OF SESSA PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SESSA PANBARI PWSS",
+                "localname": "RETROFITTING OF SESSA PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SESSA PANBARI PWSS",
+                        "localname": "RETROFITTING OF SESSA PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206800/ws-services-calculation/Penalty.json b/data/as/8206800/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2bd2a3698e
--- /dev/null
+++ b/data/as/8206800/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206800",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206800/ws-services-calculation/WCBillingSlab.json b/data/as/8206800/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b4539537b
--- /dev/null
+++ b/data/as/8206800/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206800",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206811/BillingService/BusinessService.json b/data/as/8206811/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7dc7dc6c8e
--- /dev/null
+++ b/data/as/8206811/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206811",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206811/egov-location/boundary-data.json b/data/as/8206811/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb86225130
--- /dev/null
+++ b/data/as/8206811/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206811",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                "localname": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206811",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                        "localname": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                "localname": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206811",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                        "localname": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206811/ws-services-calculation/Penalty.json b/data/as/8206811/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1d93f4696
--- /dev/null
+++ b/data/as/8206811/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206811",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206811/ws-services-calculation/WCBillingSlab.json b/data/as/8206811/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22c7164da9
--- /dev/null
+++ b/data/as/8206811/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206811",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206824/BillingService/BusinessService.json b/data/as/8206824/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9776ced01e
--- /dev/null
+++ b/data/as/8206824/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206824",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206824/egov-location/boundary-data.json b/data/as/8206824/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6687ce8b4
--- /dev/null
+++ b/data/as/8206824/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206824",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BERAJAN PWSS",
+                "localname": "RETROFITTING OF BERAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BERAJAN PWSS",
+                        "localname": "RETROFITTING OF BERAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BERAJAN PWSS",
+                "localname": "RETROFITTING OF BERAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BERAJAN PWSS",
+                        "localname": "RETROFITTING OF BERAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206824/ws-services-calculation/Penalty.json b/data/as/8206824/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1483cd364
--- /dev/null
+++ b/data/as/8206824/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206824",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206824/ws-services-calculation/WCBillingSlab.json b/data/as/8206824/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..056e34853f
--- /dev/null
+++ b/data/as/8206824/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206824",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206834/BillingService/BusinessService.json b/data/as/8206834/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b9841384e
--- /dev/null
+++ b/data/as/8206834/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206834",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206834/egov-location/boundary-data.json b/data/as/8206834/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f110890de6
--- /dev/null
+++ b/data/as/8206834/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206834",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                "localname": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                        "localname": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                "localname": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                        "localname": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206834/ws-services-calculation/Penalty.json b/data/as/8206834/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca1c8b7cdb
--- /dev/null
+++ b/data/as/8206834/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206834",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206834/ws-services-calculation/WCBillingSlab.json b/data/as/8206834/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a79ec3c67b
--- /dev/null
+++ b/data/as/8206834/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206834",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206851/BillingService/BusinessService.json b/data/as/8206851/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3bc4afb70
--- /dev/null
+++ b/data/as/8206851/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8206851",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206851/egov-location/boundary-data.json b/data/as/8206851/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b01d319c57
--- /dev/null
+++ b/data/as/8206851/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8206851",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BASANTIPUR PWSS",
+                "localname": "RETROFITTING OF BASANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BASANTIPUR PWSS",
+                        "localname": "RETROFITTING OF BASANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BASANTIPUR PWSS",
+                "localname": "RETROFITTING OF BASANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8206851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BASANTIPUR PWSS",
+                        "localname": "RETROFITTING OF BASANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206851/ws-services-calculation/Penalty.json b/data/as/8206851/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a82b7dd906
--- /dev/null
+++ b/data/as/8206851/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8206851",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8206851/ws-services-calculation/WCBillingSlab.json b/data/as/8206851/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3af12a3aaf
--- /dev/null
+++ b/data/as/8206851/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8206851",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215102/BillingService/BusinessService.json b/data/as/8215102/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d0e1eec9a8
--- /dev/null
+++ b/data/as/8215102/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215102",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215102/egov-location/boundary-data.json b/data/as/8215102/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3b5b9da36f
--- /dev/null
+++ b/data/as/8215102/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215102",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANIJARANI PWSS",
+                "localname": "RETROFITTING OF MANIJARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215102",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANIJARANI PWSS",
+                        "localname": "RETROFITTING OF MANIJARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MANIJARANI PWSS",
+                "localname": "RETROFITTING OF MANIJARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215102",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MANIJARANI PWSS",
+                        "localname": "RETROFITTING OF MANIJARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215102/ws-services-calculation/Penalty.json b/data/as/8215102/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d6be2d173a
--- /dev/null
+++ b/data/as/8215102/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215102",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215102/ws-services-calculation/WCBillingSlab.json b/data/as/8215102/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b72e272a73
--- /dev/null
+++ b/data/as/8215102/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215102",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215107/BillingService/BusinessService.json b/data/as/8215107/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d48986b52c
--- /dev/null
+++ b/data/as/8215107/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215107",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215107/egov-location/boundary-data.json b/data/as/8215107/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fa945d0509
--- /dev/null
+++ b/data/as/8215107/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215107",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARCHUBURI PWSS",
+                "localname": "RETROFITTING OF KAMARCHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215107",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARCHUBURI PWSS",
+                        "localname": "RETROFITTING OF KAMARCHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARCHUBURI PWSS",
+                "localname": "RETROFITTING OF KAMARCHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215107",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARCHUBURI PWSS",
+                        "localname": "RETROFITTING OF KAMARCHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215107/ws-services-calculation/Penalty.json b/data/as/8215107/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..28abac825b
--- /dev/null
+++ b/data/as/8215107/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215107",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215107/ws-services-calculation/WCBillingSlab.json b/data/as/8215107/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..55278341a1
--- /dev/null
+++ b/data/as/8215107/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215107",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215197/BillingService/BusinessService.json b/data/as/8215197/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f62137021
--- /dev/null
+++ b/data/as/8215197/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215197",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215197/egov-location/boundary-data.json b/data/as/8215197/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e3e775dff
--- /dev/null
+++ b/data/as/8215197/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215197",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIPELOWA PWSS",
+                "localname": "RETROFITTING OF DHEKIPELOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIPELOWA PWSS",
+                        "localname": "RETROFITTING OF DHEKIPELOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIPELOWA PWSS",
+                "localname": "RETROFITTING OF DHEKIPELOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIPELOWA PWSS",
+                        "localname": "RETROFITTING OF DHEKIPELOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215197/ws-services-calculation/Penalty.json b/data/as/8215197/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f2b1ca66c
--- /dev/null
+++ b/data/as/8215197/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215197",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215197/ws-services-calculation/WCBillingSlab.json b/data/as/8215197/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b49d90af6
--- /dev/null
+++ b/data/as/8215197/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215197",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215261/BillingService/BusinessService.json b/data/as/8215261/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d71cc874e
--- /dev/null
+++ b/data/as/8215261/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215261",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215261/egov-location/boundary-data.json b/data/as/8215261/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fdcbffcbf0
--- /dev/null
+++ b/data/as/8215261/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215261",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAHBERA PWSS",
+                "localname": "RETROFITTING OF BAHBERA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215261",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAHBERA PWSS",
+                        "localname": "RETROFITTING OF BAHBERA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAHBERA PWSS",
+                "localname": "RETROFITTING OF BAHBERA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215261",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAHBERA PWSS",
+                        "localname": "RETROFITTING OF BAHBERA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215261/ws-services-calculation/Penalty.json b/data/as/8215261/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d8b98a0d5
--- /dev/null
+++ b/data/as/8215261/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215261",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215261/ws-services-calculation/WCBillingSlab.json b/data/as/8215261/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..538798eb78
--- /dev/null
+++ b/data/as/8215261/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215261",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215283/BillingService/BusinessService.json b/data/as/8215283/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f66f6a488
--- /dev/null
+++ b/data/as/8215283/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215283",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215283/egov-location/boundary-data.json b/data/as/8215283/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7d26517623
--- /dev/null
+++ b/data/as/8215283/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215283",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                "localname": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                        "localname": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                "localname": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                        "localname": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215283/ws-services-calculation/Penalty.json b/data/as/8215283/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..959031197a
--- /dev/null
+++ b/data/as/8215283/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215283",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215283/ws-services-calculation/WCBillingSlab.json b/data/as/8215283/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fe3908e820
--- /dev/null
+++ b/data/as/8215283/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215283",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215285/BillingService/BusinessService.json b/data/as/8215285/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f7cafa8963
--- /dev/null
+++ b/data/as/8215285/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215285",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215285/egov-location/boundary-data.json b/data/as/8215285/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c392e8a040
--- /dev/null
+++ b/data/as/8215285/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215285",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                "localname": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215285",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                        "localname": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                "localname": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215285",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                        "localname": "RETROFITTING OF DHANMORA NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215285/ws-services-calculation/Penalty.json b/data/as/8215285/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..402243f82e
--- /dev/null
+++ b/data/as/8215285/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215285",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215285/ws-services-calculation/WCBillingSlab.json b/data/as/8215285/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..decaca1d11
--- /dev/null
+++ b/data/as/8215285/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215285",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215403/BillingService/BusinessService.json b/data/as/8215403/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c4317cabe
--- /dev/null
+++ b/data/as/8215403/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215403",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215403/egov-location/boundary-data.json b/data/as/8215403/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4fcf540a29
--- /dev/null
+++ b/data/as/8215403/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215403",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                "localname": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215403",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                        "localname": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                "localname": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215403",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                        "localname": "RETROFITTING OF  BHERBHERIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215403/ws-services-calculation/Penalty.json b/data/as/8215403/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c74bc5d333
--- /dev/null
+++ b/data/as/8215403/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215403",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215403/ws-services-calculation/WCBillingSlab.json b/data/as/8215403/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e331257b32
--- /dev/null
+++ b/data/as/8215403/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215403",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215406/BillingService/BusinessService.json b/data/as/8215406/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98495160c7
--- /dev/null
+++ b/data/as/8215406/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215406",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215406/egov-location/boundary-data.json b/data/as/8215406/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d7ae645e6f
--- /dev/null
+++ b/data/as/8215406/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215406",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TELIAGAON PWSS",
+                "localname": "RETROFITTING OF TELIAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215406",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TELIAGAON PWSS",
+                        "localname": "RETROFITTING OF TELIAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TELIAGAON PWSS",
+                "localname": "RETROFITTING OF TELIAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215406",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TELIAGAON PWSS",
+                        "localname": "RETROFITTING OF TELIAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215406/ws-services-calculation/Penalty.json b/data/as/8215406/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a98d14c73c
--- /dev/null
+++ b/data/as/8215406/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215406",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215406/ws-services-calculation/WCBillingSlab.json b/data/as/8215406/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e80e3300cb
--- /dev/null
+++ b/data/as/8215406/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215406",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215411/BillingService/BusinessService.json b/data/as/8215411/BillingService/BusinessService.json
new file mode 100644
index 0000000000..77b5e0e997
--- /dev/null
+++ b/data/as/8215411/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215411",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215411/egov-location/boundary-data.json b/data/as/8215411/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ccff73a73
--- /dev/null
+++ b/data/as/8215411/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215411",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUNIANI PWSS",
+                "localname": "RETROFITTING OF PUNIANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUNIANI PWSS",
+                        "localname": "RETROFITTING OF PUNIANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PUNIANI PWSS",
+                "localname": "RETROFITTING OF PUNIANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PUNIANI PWSS",
+                        "localname": "RETROFITTING OF PUNIANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215411/ws-services-calculation/Penalty.json b/data/as/8215411/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..54e71e0c59
--- /dev/null
+++ b/data/as/8215411/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215411",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215411/ws-services-calculation/WCBillingSlab.json b/data/as/8215411/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93b90f47c3
--- /dev/null
+++ b/data/as/8215411/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215411",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215655/BillingService/BusinessService.json b/data/as/8215655/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0e7294be2
--- /dev/null
+++ b/data/as/8215655/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215655",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215655/egov-location/boundary-data.json b/data/as/8215655/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bbebf32aa2
--- /dev/null
+++ b/data/as/8215655/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215655",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                "localname": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                        "localname": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                "localname": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                        "localname": "RETROFITTING OF DHEKERIGAON PWSS,BIHAGURI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215655/ws-services-calculation/Penalty.json b/data/as/8215655/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8a2c0df2c5
--- /dev/null
+++ b/data/as/8215655/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215655",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215655/ws-services-calculation/WCBillingSlab.json b/data/as/8215655/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..90b8990985
--- /dev/null
+++ b/data/as/8215655/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215655",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215753/BillingService/BusinessService.json b/data/as/8215753/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aabb9c4327
--- /dev/null
+++ b/data/as/8215753/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215753",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215753/egov-location/boundary-data.json b/data/as/8215753/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5719516076
--- /dev/null
+++ b/data/as/8215753/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215753",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LIKHAKGAON PWSS",
+                "localname": "RETROFITTING OF LIKHAKGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215753",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LIKHAKGAON PWSS",
+                        "localname": "RETROFITTING OF LIKHAKGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LIKHAKGAON PWSS",
+                "localname": "RETROFITTING OF LIKHAKGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215753",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LIKHAKGAON PWSS",
+                        "localname": "RETROFITTING OF LIKHAKGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215753/ws-services-calculation/Penalty.json b/data/as/8215753/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..905dc0202d
--- /dev/null
+++ b/data/as/8215753/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215753",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215753/ws-services-calculation/WCBillingSlab.json b/data/as/8215753/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1a4d31858a
--- /dev/null
+++ b/data/as/8215753/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215753",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215757/BillingService/BusinessService.json b/data/as/8215757/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2fff2f682a
--- /dev/null
+++ b/data/as/8215757/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215757",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215757/egov-location/boundary-data.json b/data/as/8215757/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf06cb36c4
--- /dev/null
+++ b/data/as/8215757/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215757",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PITHAKHOWA PWSS",
+                "localname": "RETROFITTING OF PITHAKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215757",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PITHAKHOWA PWSS",
+                        "localname": "RETROFITTING OF PITHAKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PITHAKHOWA PWSS",
+                "localname": "RETROFITTING OF PITHAKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215757",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PITHAKHOWA PWSS",
+                        "localname": "RETROFITTING OF PITHAKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215757/ws-services-calculation/Penalty.json b/data/as/8215757/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62349b2470
--- /dev/null
+++ b/data/as/8215757/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215757",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215757/ws-services-calculation/WCBillingSlab.json b/data/as/8215757/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..908991829e
--- /dev/null
+++ b/data/as/8215757/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215757",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215759/BillingService/BusinessService.json b/data/as/8215759/BillingService/BusinessService.json
new file mode 100644
index 0000000000..21b2fdce35
--- /dev/null
+++ b/data/as/8215759/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215759",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215759/egov-location/boundary-data.json b/data/as/8215759/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20f4d1dd24
--- /dev/null
+++ b/data/as/8215759/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215759",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORBHOGIA PWSS",
+                "localname": "RETROFITTING OF BORBHOGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215759",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORBHOGIA PWSS",
+                        "localname": "RETROFITTING OF BORBHOGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORBHOGIA PWSS",
+                "localname": "RETROFITTING OF BORBHOGIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215759",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORBHOGIA PWSS",
+                        "localname": "RETROFITTING OF BORBHOGIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215759/ws-services-calculation/Penalty.json b/data/as/8215759/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d20224e37d
--- /dev/null
+++ b/data/as/8215759/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215759",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215759/ws-services-calculation/WCBillingSlab.json b/data/as/8215759/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f8b4bbd8f
--- /dev/null
+++ b/data/as/8215759/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215759",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215762/BillingService/BusinessService.json b/data/as/8215762/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec1f9bc1ae
--- /dev/null
+++ b/data/as/8215762/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215762",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215762/egov-location/boundary-data.json b/data/as/8215762/egov-location/boundary-data.json
new file mode 100644
index 0000000000..134c106add
--- /dev/null
+++ b/data/as/8215762/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215762",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHALAGURI PWSS",
+                "localname": "RETROFITTING OF DHALAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215762",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHALAGURI PWSS",
+                        "localname": "RETROFITTING OF DHALAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHALAGURI PWSS",
+                "localname": "RETROFITTING OF DHALAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215762",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHALAGURI PWSS",
+                        "localname": "RETROFITTING OF DHALAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215762/ws-services-calculation/Penalty.json b/data/as/8215762/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d1506f2c00
--- /dev/null
+++ b/data/as/8215762/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215762",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215762/ws-services-calculation/WCBillingSlab.json b/data/as/8215762/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..269ab71c4c
--- /dev/null
+++ b/data/as/8215762/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215762",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215767/BillingService/BusinessService.json b/data/as/8215767/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1974e910ed
--- /dev/null
+++ b/data/as/8215767/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215767",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215767/egov-location/boundary-data.json b/data/as/8215767/egov-location/boundary-data.json
new file mode 100644
index 0000000000..da8fa1fc6f
--- /dev/null
+++ b/data/as/8215767/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215767",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ALIMABAD PWSS",
+                "localname": "RETROFITTING OF ALIMABAD PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ALIMABAD PWSS",
+                        "localname": "RETROFITTING OF ALIMABAD PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF ALIMABAD PWSS",
+                "localname": "RETROFITTING OF ALIMABAD PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF ALIMABAD PWSS",
+                        "localname": "RETROFITTING OF ALIMABAD PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215767/ws-services-calculation/Penalty.json b/data/as/8215767/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0a12749760
--- /dev/null
+++ b/data/as/8215767/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215767",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215767/ws-services-calculation/WCBillingSlab.json b/data/as/8215767/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6aff71e75a
--- /dev/null
+++ b/data/as/8215767/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215767",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215769/BillingService/BusinessService.json b/data/as/8215769/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d1f3ae002
--- /dev/null
+++ b/data/as/8215769/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215769",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215769/egov-location/boundary-data.json b/data/as/8215769/egov-location/boundary-data.json
new file mode 100644
index 0000000000..340cf1fd97
--- /dev/null
+++ b/data/as/8215769/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215769",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOOMDOMA PWSS",
+                "localname": "RETROFITTING OF DOOMDOMA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOOMDOMA PWSS",
+                        "localname": "RETROFITTING OF DOOMDOMA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DOOMDOMA PWSS",
+                "localname": "RETROFITTING OF DOOMDOMA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DOOMDOMA PWSS",
+                        "localname": "RETROFITTING OF DOOMDOMA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215769/ws-services-calculation/Penalty.json b/data/as/8215769/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13e95a3b1f
--- /dev/null
+++ b/data/as/8215769/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215769",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215769/ws-services-calculation/WCBillingSlab.json b/data/as/8215769/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cbe41a7f4e
--- /dev/null
+++ b/data/as/8215769/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215769",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215771/BillingService/BusinessService.json b/data/as/8215771/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fdc878210a
--- /dev/null
+++ b/data/as/8215771/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8215771",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215771/egov-location/boundary-data.json b/data/as/8215771/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0ae28b3fe
--- /dev/null
+++ b/data/as/8215771/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8215771",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAHMANPUR  PWSS",
+                "localname": "RETROFITTING OF RAHMANPUR  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215771",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAHMANPUR  PWSS",
+                        "localname": "RETROFITTING OF RAHMANPUR  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RAHMANPUR  PWSS",
+                "localname": "RETROFITTING OF RAHMANPUR  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8215771",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RAHMANPUR  PWSS",
+                        "localname": "RETROFITTING OF RAHMANPUR  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215771/ws-services-calculation/Penalty.json b/data/as/8215771/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..513745a6d7
--- /dev/null
+++ b/data/as/8215771/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8215771",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8215771/ws-services-calculation/WCBillingSlab.json b/data/as/8215771/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cea59e1365
--- /dev/null
+++ b/data/as/8215771/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8215771",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218304/BillingService/BusinessService.json b/data/as/8218304/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d2fe5aea59
--- /dev/null
+++ b/data/as/8218304/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8218304",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218304/egov-location/boundary-data.json b/data/as/8218304/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e9452415d
--- /dev/null
+++ b/data/as/8218304/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8218304",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAKUAMARI PWSS",
+                "localname": "RETROFITTING OF BHAKUAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218304",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAKUAMARI PWSS",
+                        "localname": "RETROFITTING OF BHAKUAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BHAKUAMARI PWSS",
+                "localname": "RETROFITTING OF BHAKUAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218304",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BHAKUAMARI PWSS",
+                        "localname": "RETROFITTING OF BHAKUAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218304/ws-services-calculation/Penalty.json b/data/as/8218304/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ea3ece6737
--- /dev/null
+++ b/data/as/8218304/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8218304",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218304/ws-services-calculation/WCBillingSlab.json b/data/as/8218304/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1e91067b7
--- /dev/null
+++ b/data/as/8218304/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8218304",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218315/BillingService/BusinessService.json b/data/as/8218315/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5643bb454
--- /dev/null
+++ b/data/as/8218315/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8218315",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218315/egov-location/boundary-data.json b/data/as/8218315/egov-location/boundary-data.json
new file mode 100644
index 0000000000..941c156528
--- /dev/null
+++ b/data/as/8218315/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8218315",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAKHINPAR PWSS",
+                "localname": "RETROFITTING OF DAKHINPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAKHINPAR PWSS",
+                        "localname": "RETROFITTING OF DAKHINPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAKHINPAR PWSS",
+                "localname": "RETROFITTING OF DAKHINPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAKHINPAR PWSS",
+                        "localname": "RETROFITTING OF DAKHINPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218315/ws-services-calculation/Penalty.json b/data/as/8218315/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..afa56f34ed
--- /dev/null
+++ b/data/as/8218315/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8218315",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218315/ws-services-calculation/WCBillingSlab.json b/data/as/8218315/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7a88504e8
--- /dev/null
+++ b/data/as/8218315/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8218315",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218486/BillingService/BusinessService.json b/data/as/8218486/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d2f70bf813
--- /dev/null
+++ b/data/as/8218486/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8218486",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218486/egov-location/boundary-data.json b/data/as/8218486/egov-location/boundary-data.json
new file mode 100644
index 0000000000..652df378ef
--- /dev/null
+++ b/data/as/8218486/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8218486",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LULUKAI PWSS",
+                "localname": "RETROFITTING OF LULUKAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218486",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LULUKAI PWSS",
+                        "localname": "RETROFITTING OF LULUKAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF LULUKAI PWSS",
+                "localname": "RETROFITTING OF LULUKAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218486",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF LULUKAI PWSS",
+                        "localname": "RETROFITTING OF LULUKAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218486/ws-services-calculation/Penalty.json b/data/as/8218486/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dbdda798fc
--- /dev/null
+++ b/data/as/8218486/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8218486",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218486/ws-services-calculation/WCBillingSlab.json b/data/as/8218486/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c0657edd3d
--- /dev/null
+++ b/data/as/8218486/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8218486",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218509/BillingService/BusinessService.json b/data/as/8218509/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8fbe5948b4
--- /dev/null
+++ b/data/as/8218509/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8218509",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218509/egov-location/boundary-data.json b/data/as/8218509/egov-location/boundary-data.json
new file mode 100644
index 0000000000..59329d7940
--- /dev/null
+++ b/data/as/8218509/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8218509",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                "localname": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                        "localname": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                "localname": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                        "localname": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218509/ws-services-calculation/Penalty.json b/data/as/8218509/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9e0cee7ac
--- /dev/null
+++ b/data/as/8218509/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8218509",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218509/ws-services-calculation/WCBillingSlab.json b/data/as/8218509/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cdb4f3e7ac
--- /dev/null
+++ b/data/as/8218509/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8218509",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218510/BillingService/BusinessService.json b/data/as/8218510/BillingService/BusinessService.json
new file mode 100644
index 0000000000..91958fc964
--- /dev/null
+++ b/data/as/8218510/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8218510",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218510/egov-location/boundary-data.json b/data/as/8218510/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c07effbff8
--- /dev/null
+++ b/data/as/8218510/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8218510",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGAGARABIL PWSS",
+                "localname": "RETROFITTING OF RANGAGARABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGAGARABIL PWSS",
+                        "localname": "RETROFITTING OF RANGAGARABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGAGARABIL PWSS",
+                "localname": "RETROFITTING OF RANGAGARABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8218510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGAGARABIL PWSS",
+                        "localname": "RETROFITTING OF RANGAGARABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218510/ws-services-calculation/Penalty.json b/data/as/8218510/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3526326d1b
--- /dev/null
+++ b/data/as/8218510/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8218510",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8218510/ws-services-calculation/WCBillingSlab.json b/data/as/8218510/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9dad025112
--- /dev/null
+++ b/data/as/8218510/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8218510",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222042/BillingService/BusinessService.json b/data/as/8222042/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37c0935c78
--- /dev/null
+++ b/data/as/8222042/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222042",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222042/egov-location/boundary-data.json b/data/as/8222042/egov-location/boundary-data.json
new file mode 100644
index 0000000000..196a8a2749
--- /dev/null
+++ b/data/as/8222042/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222042",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF  CHAPLAI PWSS",
+                "localname": "RETROFITTING OF  CHAPLAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222042",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF  CHAPLAI PWSS",
+                        "localname": "RETROFITTING OF  CHAPLAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF  CHAPLAI PWSS",
+                "localname": "RETROFITTING OF  CHAPLAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222042",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF  CHAPLAI PWSS",
+                        "localname": "RETROFITTING OF  CHAPLAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222042/ws-services-calculation/Penalty.json b/data/as/8222042/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82ef71bfa9
--- /dev/null
+++ b/data/as/8222042/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222042",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222042/ws-services-calculation/WCBillingSlab.json b/data/as/8222042/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6f965c117
--- /dev/null
+++ b/data/as/8222042/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222042",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222249/BillingService/BusinessService.json b/data/as/8222249/BillingService/BusinessService.json
new file mode 100644
index 0000000000..39386b61d7
--- /dev/null
+++ b/data/as/8222249/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222249",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222249/egov-location/boundary-data.json b/data/as/8222249/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95d6f9a070
--- /dev/null
+++ b/data/as/8222249/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222249",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBUK PWSS",
+                "localname": "RETROFITTING OF AMBUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBUK PWSS",
+                        "localname": "RETROFITTING OF AMBUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF AMBUK PWSS",
+                "localname": "RETROFITTING OF AMBUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF AMBUK PWSS",
+                        "localname": "RETROFITTING OF AMBUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222249/ws-services-calculation/Penalty.json b/data/as/8222249/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee28dfb2d2
--- /dev/null
+++ b/data/as/8222249/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222249",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222249/ws-services-calculation/WCBillingSlab.json b/data/as/8222249/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a923876f36
--- /dev/null
+++ b/data/as/8222249/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222249",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222264/BillingService/BusinessService.json b/data/as/8222264/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8345e959e3
--- /dev/null
+++ b/data/as/8222264/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222264",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222264/egov-location/boundary-data.json b/data/as/8222264/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f976f92d47
--- /dev/null
+++ b/data/as/8222264/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222264",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KRISHNAI PWSS",
+                "localname": "RETROFITTING OF KRISHNAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KRISHNAI PWSS",
+                        "localname": "RETROFITTING OF KRISHNAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KRISHNAI PWSS",
+                "localname": "RETROFITTING OF KRISHNAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KRISHNAI PWSS",
+                        "localname": "RETROFITTING OF KRISHNAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222264/ws-services-calculation/Penalty.json b/data/as/8222264/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de7bf0d99a
--- /dev/null
+++ b/data/as/8222264/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222264",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222264/ws-services-calculation/WCBillingSlab.json b/data/as/8222264/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..380a1929be
--- /dev/null
+++ b/data/as/8222264/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222264",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222276/BillingService/BusinessService.json b/data/as/8222276/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c546edb65
--- /dev/null
+++ b/data/as/8222276/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222276",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222276/egov-location/boundary-data.json b/data/as/8222276/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a1e6dd1fe
--- /dev/null
+++ b/data/as/8222276/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222276",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATIMURA PWSS",
+                "localname": "RETROFITTING OF HATIMURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATIMURA PWSS",
+                        "localname": "RETROFITTING OF HATIMURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HATIMURA PWSS",
+                "localname": "RETROFITTING OF HATIMURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HATIMURA PWSS",
+                        "localname": "RETROFITTING OF HATIMURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222276/ws-services-calculation/Penalty.json b/data/as/8222276/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d42ca2f97c
--- /dev/null
+++ b/data/as/8222276/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222276",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222276/ws-services-calculation/WCBillingSlab.json b/data/as/8222276/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..883b4cc221
--- /dev/null
+++ b/data/as/8222276/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222276",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222311/BillingService/BusinessService.json b/data/as/8222311/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0fd4b1c746
--- /dev/null
+++ b/data/as/8222311/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222311",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222311/egov-location/boundary-data.json b/data/as/8222311/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d4cf25f9d3
--- /dev/null
+++ b/data/as/8222311/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222311",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                "localname": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                        "localname": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                "localname": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                        "localname": "RETROFITTING OF TUKURA HADIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222311/ws-services-calculation/Penalty.json b/data/as/8222311/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1c3133141
--- /dev/null
+++ b/data/as/8222311/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222311",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222311/ws-services-calculation/WCBillingSlab.json b/data/as/8222311/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48e5d6d346
--- /dev/null
+++ b/data/as/8222311/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222311",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222322/BillingService/BusinessService.json b/data/as/8222322/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc1d0ad5b9
--- /dev/null
+++ b/data/as/8222322/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222322",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222322/egov-location/boundary-data.json b/data/as/8222322/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b580d027a4
--- /dev/null
+++ b/data/as/8222322/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222322",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATABARI PWSS",
+                "localname": "RETROFITTING OF BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222322",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATABARI PWSS",
+                        "localname": "RETROFITTING OF BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATABARI PWSS",
+                "localname": "RETROFITTING OF BATABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222322",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATABARI PWSS",
+                        "localname": "RETROFITTING OF BATABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222322/ws-services-calculation/Penalty.json b/data/as/8222322/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d71a944d09
--- /dev/null
+++ b/data/as/8222322/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222322",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222322/ws-services-calculation/WCBillingSlab.json b/data/as/8222322/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a40c2cb448
--- /dev/null
+++ b/data/as/8222322/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222322",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222342/BillingService/BusinessService.json b/data/as/8222342/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0557f32c4e
--- /dev/null
+++ b/data/as/8222342/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222342",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222342/egov-location/boundary-data.json b/data/as/8222342/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe4aee61f2
--- /dev/null
+++ b/data/as/8222342/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222342",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONAPUR 1 PWSS",
+                "localname": "RETROFITTING OF SONAPUR 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONAPUR 1 PWSS",
+                        "localname": "RETROFITTING OF SONAPUR 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SONAPUR 1 PWSS",
+                "localname": "RETROFITTING OF SONAPUR 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SONAPUR 1 PWSS",
+                        "localname": "RETROFITTING OF SONAPUR 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222342/ws-services-calculation/Penalty.json b/data/as/8222342/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44a4f63662
--- /dev/null
+++ b/data/as/8222342/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222342",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222342/ws-services-calculation/WCBillingSlab.json b/data/as/8222342/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dbeba431b2
--- /dev/null
+++ b/data/as/8222342/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222342",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222348/BillingService/BusinessService.json b/data/as/8222348/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3e6154c099
--- /dev/null
+++ b/data/as/8222348/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222348",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222348/egov-location/boundary-data.json b/data/as/8222348/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0465e358fe
--- /dev/null
+++ b/data/as/8222348/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222348",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TARAPARA PWSS",
+                "localname": "RETROFITTING OF TARAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222348",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TARAPARA PWSS",
+                        "localname": "RETROFITTING OF TARAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TARAPARA PWSS",
+                "localname": "RETROFITTING OF TARAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222348",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TARAPARA PWSS",
+                        "localname": "RETROFITTING OF TARAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222348/ws-services-calculation/Penalty.json b/data/as/8222348/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6873d66566
--- /dev/null
+++ b/data/as/8222348/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222348",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222348/ws-services-calculation/WCBillingSlab.json b/data/as/8222348/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b831ead85a
--- /dev/null
+++ b/data/as/8222348/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222348",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222352/BillingService/BusinessService.json b/data/as/8222352/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d6bec4648e
--- /dev/null
+++ b/data/as/8222352/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222352",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222352/egov-location/boundary-data.json b/data/as/8222352/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c04def7688
--- /dev/null
+++ b/data/as/8222352/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222352",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HABANGIRI PWSS",
+                "localname": "RETROFITTING OF HABANGIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HABANGIRI PWSS",
+                        "localname": "RETROFITTING OF HABANGIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HABANGIRI PWSS",
+                "localname": "RETROFITTING OF HABANGIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HABANGIRI PWSS",
+                        "localname": "RETROFITTING OF HABANGIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222352/ws-services-calculation/Penalty.json b/data/as/8222352/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a4ef821396
--- /dev/null
+++ b/data/as/8222352/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222352",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222352/ws-services-calculation/WCBillingSlab.json b/data/as/8222352/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea037c0fb2
--- /dev/null
+++ b/data/as/8222352/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222352",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222366/BillingService/BusinessService.json b/data/as/8222366/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a28d3767d
--- /dev/null
+++ b/data/as/8222366/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222366",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222366/egov-location/boundary-data.json b/data/as/8222366/egov-location/boundary-data.json
new file mode 100644
index 0000000000..570bb43c5d
--- /dev/null
+++ b/data/as/8222366/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222366",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARPUTA  PWSS",
+                "localname": "RETROFITTING OF KAMARPUTA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222366",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARPUTA  PWSS",
+                        "localname": "RETROFITTING OF KAMARPUTA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KAMARPUTA  PWSS",
+                "localname": "RETROFITTING OF KAMARPUTA  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222366",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KAMARPUTA  PWSS",
+                        "localname": "RETROFITTING OF KAMARPUTA  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222366/ws-services-calculation/Penalty.json b/data/as/8222366/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bc7aa215a2
--- /dev/null
+++ b/data/as/8222366/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222366",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222366/ws-services-calculation/WCBillingSlab.json b/data/as/8222366/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4e81928a4
--- /dev/null
+++ b/data/as/8222366/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222366",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222386/BillingService/BusinessService.json b/data/as/8222386/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e6d0fedbdb
--- /dev/null
+++ b/data/as/8222386/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8222386",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222386/egov-location/boundary-data.json b/data/as/8222386/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb08cdeb4d
--- /dev/null
+++ b/data/as/8222386/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8222386",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAHARI PWSS",
+                "localname": "RETROFITTING OF SAHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAHARI PWSS",
+                        "localname": "RETROFITTING OF SAHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SAHARI PWSS",
+                "localname": "RETROFITTING OF SAHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8222386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SAHARI PWSS",
+                        "localname": "RETROFITTING OF SAHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222386/ws-services-calculation/Penalty.json b/data/as/8222386/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3141a4e945
--- /dev/null
+++ b/data/as/8222386/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8222386",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8222386/ws-services-calculation/WCBillingSlab.json b/data/as/8222386/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8df48e17e
--- /dev/null
+++ b/data/as/8222386/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8222386",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8227638/BillingService/BusinessService.json b/data/as/8227638/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aed0f7fc3e
--- /dev/null
+++ b/data/as/8227638/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8227638",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8227638/egov-location/boundary-data.json b/data/as/8227638/egov-location/boundary-data.json
new file mode 100644
index 0000000000..37a8a3a1cd
--- /dev/null
+++ b/data/as/8227638/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8227638",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARMUZA PWSS",
+                "localname": "RETROFITTING OF KHARMUZA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8227638",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARMUZA PWSS",
+                        "localname": "RETROFITTING OF KHARMUZA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHARMUZA PWSS",
+                "localname": "RETROFITTING OF KHARMUZA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8227638",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHARMUZA PWSS",
+                        "localname": "RETROFITTING OF KHARMUZA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8227638/ws-services-calculation/Penalty.json b/data/as/8227638/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..741268a072
--- /dev/null
+++ b/data/as/8227638/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8227638",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8227638/ws-services-calculation/WCBillingSlab.json b/data/as/8227638/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7d1f8b7c0d
--- /dev/null
+++ b/data/as/8227638/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8227638",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228162/BillingService/BusinessService.json b/data/as/8228162/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5bf75c35ec
--- /dev/null
+++ b/data/as/8228162/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8228162",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228162/egov-location/boundary-data.json b/data/as/8228162/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02171bead1
--- /dev/null
+++ b/data/as/8228162/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8228162",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                "localname": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228162",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                        "localname": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                "localname": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228162",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                        "localname": "RETROFITTING OF NAHARANI PWSS(JIA GABHARU)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228162/ws-services-calculation/Penalty.json b/data/as/8228162/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..abb4560958
--- /dev/null
+++ b/data/as/8228162/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8228162",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228162/ws-services-calculation/WCBillingSlab.json b/data/as/8228162/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d102b0398
--- /dev/null
+++ b/data/as/8228162/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8228162",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228342/BillingService/BusinessService.json b/data/as/8228342/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c3d13dfe4
--- /dev/null
+++ b/data/as/8228342/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8228342",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228342/egov-location/boundary-data.json b/data/as/8228342/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7555e18cde
--- /dev/null
+++ b/data/as/8228342/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8228342",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CELABORI PWSS",
+                "localname": "RETROFITTING OF CELABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CELABORI PWSS",
+                        "localname": "RETROFITTING OF CELABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CELABORI PWSS",
+                "localname": "RETROFITTING OF CELABORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CELABORI PWSS",
+                        "localname": "RETROFITTING OF CELABORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228342/ws-services-calculation/Penalty.json b/data/as/8228342/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26e80cb19c
--- /dev/null
+++ b/data/as/8228342/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8228342",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228342/ws-services-calculation/WCBillingSlab.json b/data/as/8228342/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf820bffcc
--- /dev/null
+++ b/data/as/8228342/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8228342",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228352/BillingService/BusinessService.json b/data/as/8228352/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c13c783626
--- /dev/null
+++ b/data/as/8228352/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8228352",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228352/egov-location/boundary-data.json b/data/as/8228352/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c5c9eef9b1
--- /dev/null
+++ b/data/as/8228352/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8228352",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NISHANGRAM PWSS",
+                "localname": "RETROFITTING OF NISHANGRAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NISHANGRAM PWSS",
+                        "localname": "RETROFITTING OF NISHANGRAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NISHANGRAM PWSS",
+                "localname": "RETROFITTING OF NISHANGRAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NISHANGRAM PWSS",
+                        "localname": "RETROFITTING OF NISHANGRAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228352/ws-services-calculation/Penalty.json b/data/as/8228352/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c65fa49bd4
--- /dev/null
+++ b/data/as/8228352/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8228352",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228352/ws-services-calculation/WCBillingSlab.json b/data/as/8228352/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..104fcf62e8
--- /dev/null
+++ b/data/as/8228352/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8228352",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228831/BillingService/BusinessService.json b/data/as/8228831/BillingService/BusinessService.json
new file mode 100644
index 0000000000..24d24b88f9
--- /dev/null
+++ b/data/as/8228831/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8228831",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228831/egov-location/boundary-data.json b/data/as/8228831/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f8da545d08
--- /dev/null
+++ b/data/as/8228831/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8228831",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORBIL KACHARI PWSS",
+                "localname": "RETROFITTING OF BORBIL KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORBIL KACHARI PWSS",
+                        "localname": "RETROFITTING OF BORBIL KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORBIL KACHARI PWSS",
+                "localname": "RETROFITTING OF BORBIL KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORBIL KACHARI PWSS",
+                        "localname": "RETROFITTING OF BORBIL KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228831/ws-services-calculation/Penalty.json b/data/as/8228831/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8b5b8614d0
--- /dev/null
+++ b/data/as/8228831/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8228831",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228831/ws-services-calculation/WCBillingSlab.json b/data/as/8228831/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a2b0b46a95
--- /dev/null
+++ b/data/as/8228831/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8228831",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228832/BillingService/BusinessService.json b/data/as/8228832/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b19ebc2df
--- /dev/null
+++ b/data/as/8228832/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8228832",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228832/egov-location/boundary-data.json b/data/as/8228832/egov-location/boundary-data.json
new file mode 100644
index 0000000000..10648f8881
--- /dev/null
+++ b/data/as/8228832/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8228832",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHAGRA TE PWSS",
+                "localname": "RETROFITTING OF GHAGRA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHAGRA TE PWSS",
+                        "localname": "RETROFITTING OF GHAGRA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GHAGRA TE PWSS",
+                "localname": "RETROFITTING OF GHAGRA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8228832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GHAGRA TE PWSS",
+                        "localname": "RETROFITTING OF GHAGRA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228832/ws-services-calculation/Penalty.json b/data/as/8228832/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..616403247e
--- /dev/null
+++ b/data/as/8228832/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8228832",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8228832/ws-services-calculation/WCBillingSlab.json b/data/as/8228832/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e28df7898e
--- /dev/null
+++ b/data/as/8228832/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8228832",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8230806/BillingService/BusinessService.json b/data/as/8230806/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de7ed2daaa
--- /dev/null
+++ b/data/as/8230806/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8230806",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8230806/egov-location/boundary-data.json b/data/as/8230806/egov-location/boundary-data.json
new file mode 100644
index 0000000000..758a966e33
--- /dev/null
+++ b/data/as/8230806/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8230806",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MADANG  PWSS",
+                "localname": "RETROFITTING OF MADANG  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8230806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MADANG  PWSS",
+                        "localname": "RETROFITTING OF MADANG  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MADANG  PWSS",
+                "localname": "RETROFITTING OF MADANG  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8230806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MADANG  PWSS",
+                        "localname": "RETROFITTING OF MADANG  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8230806/ws-services-calculation/Penalty.json b/data/as/8230806/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cab61aa7c8
--- /dev/null
+++ b/data/as/8230806/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8230806",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8230806/ws-services-calculation/WCBillingSlab.json b/data/as/8230806/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0125b4b8e0
--- /dev/null
+++ b/data/as/8230806/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8230806",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234493/BillingService/BusinessService.json b/data/as/8234493/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ba9b55e95f
--- /dev/null
+++ b/data/as/8234493/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8234493",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234493/egov-location/boundary-data.json b/data/as/8234493/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e020f2d02
--- /dev/null
+++ b/data/as/8234493/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8234493",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHARAIJONIA PWSS",
+                "localname": "RETROFITTING OF CHARAIJONIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8234493",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHARAIJONIA PWSS",
+                        "localname": "RETROFITTING OF CHARAIJONIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHARAIJONIA PWSS",
+                "localname": "RETROFITTING OF CHARAIJONIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8234493",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHARAIJONIA PWSS",
+                        "localname": "RETROFITTING OF CHARAIJONIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234493/ws-services-calculation/Penalty.json b/data/as/8234493/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7c9f33c0cc
--- /dev/null
+++ b/data/as/8234493/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8234493",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234493/ws-services-calculation/WCBillingSlab.json b/data/as/8234493/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8b1107f5b6
--- /dev/null
+++ b/data/as/8234493/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8234493",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234543/BillingService/BusinessService.json b/data/as/8234543/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c0de9ff18b
--- /dev/null
+++ b/data/as/8234543/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8234543",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234543/egov-location/boundary-data.json b/data/as/8234543/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0034c0957
--- /dev/null
+++ b/data/as/8234543/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8234543",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 8 NO CAMP PWSS",
+                "localname": "RETROFITTING OF 8 NO CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8234543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 8 NO CAMP PWSS",
+                        "localname": "RETROFITTING OF 8 NO CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF 8 NO CAMP PWSS",
+                "localname": "RETROFITTING OF 8 NO CAMP PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8234543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF 8 NO CAMP PWSS",
+                        "localname": "RETROFITTING OF 8 NO CAMP PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234543/ws-services-calculation/Penalty.json b/data/as/8234543/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf62eb0295
--- /dev/null
+++ b/data/as/8234543/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8234543",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234543/ws-services-calculation/WCBillingSlab.json b/data/as/8234543/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e1d363f1db
--- /dev/null
+++ b/data/as/8234543/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8234543",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234577/BillingService/BusinessService.json b/data/as/8234577/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5232c0c37b
--- /dev/null
+++ b/data/as/8234577/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8234577",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234577/egov-location/boundary-data.json b/data/as/8234577/egov-location/boundary-data.json
new file mode 100644
index 0000000000..acde65b21b
--- /dev/null
+++ b/data/as/8234577/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8234577",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOSSAIBORI PWSS",
+                "localname": "RETROFITTING OF GOSSAIBORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8234577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOSSAIBORI PWSS",
+                        "localname": "RETROFITTING OF GOSSAIBORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GOSSAIBORI PWSS",
+                "localname": "RETROFITTING OF GOSSAIBORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8234577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GOSSAIBORI PWSS",
+                        "localname": "RETROFITTING OF GOSSAIBORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234577/ws-services-calculation/Penalty.json b/data/as/8234577/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..647a7cbd56
--- /dev/null
+++ b/data/as/8234577/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8234577",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8234577/ws-services-calculation/WCBillingSlab.json b/data/as/8234577/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8da08433b1
--- /dev/null
+++ b/data/as/8234577/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8234577",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235302/BillingService/BusinessService.json b/data/as/8235302/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f7f70774b
--- /dev/null
+++ b/data/as/8235302/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235302",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235302/egov-location/boundary-data.json b/data/as/8235302/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9bc64f499a
--- /dev/null
+++ b/data/as/8235302/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235302",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAMUDPUR PWSS",
+                "localname": "RETROFITTING OF MAMUDPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAMUDPUR PWSS",
+                        "localname": "RETROFITTING OF MAMUDPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MAMUDPUR PWSS",
+                "localname": "RETROFITTING OF MAMUDPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MAMUDPUR PWSS",
+                        "localname": "RETROFITTING OF MAMUDPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235302/ws-services-calculation/Penalty.json b/data/as/8235302/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d87dfdc61e
--- /dev/null
+++ b/data/as/8235302/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235302",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235302/ws-services-calculation/WCBillingSlab.json b/data/as/8235302/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a0bbedaa0
--- /dev/null
+++ b/data/as/8235302/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235302",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235314/BillingService/BusinessService.json b/data/as/8235314/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e665d5331
--- /dev/null
+++ b/data/as/8235314/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235314",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235314/egov-location/boundary-data.json b/data/as/8235314/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e4ec57d94
--- /dev/null
+++ b/data/as/8235314/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235314",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PACHIM MATIA PWSS",
+                "localname": "RETROFITTING OF PACHIM MATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PACHIM MATIA PWSS",
+                        "localname": "RETROFITTING OF PACHIM MATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PACHIM MATIA PWSS",
+                "localname": "RETROFITTING OF PACHIM MATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PACHIM MATIA PWSS",
+                        "localname": "RETROFITTING OF PACHIM MATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235314/ws-services-calculation/Penalty.json b/data/as/8235314/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..132f31cf81
--- /dev/null
+++ b/data/as/8235314/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235314",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235314/ws-services-calculation/WCBillingSlab.json b/data/as/8235314/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f23a05a96e
--- /dev/null
+++ b/data/as/8235314/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235314",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235328/BillingService/BusinessService.json b/data/as/8235328/BillingService/BusinessService.json
new file mode 100644
index 0000000000..442fe49844
--- /dev/null
+++ b/data/as/8235328/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235328",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235328/egov-location/boundary-data.json b/data/as/8235328/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c3e0423fb3
--- /dev/null
+++ b/data/as/8235328/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235328",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FATEHPUR PWSS",
+                "localname": "RETROFITTING OF FATEHPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235328",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FATEHPUR PWSS",
+                        "localname": "RETROFITTING OF FATEHPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF FATEHPUR PWSS",
+                "localname": "RETROFITTING OF FATEHPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235328",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF FATEHPUR PWSS",
+                        "localname": "RETROFITTING OF FATEHPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235328/ws-services-calculation/Penalty.json b/data/as/8235328/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5b95bbc92
--- /dev/null
+++ b/data/as/8235328/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235328",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235328/ws-services-calculation/WCBillingSlab.json b/data/as/8235328/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..883842d344
--- /dev/null
+++ b/data/as/8235328/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235328",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235338/BillingService/BusinessService.json b/data/as/8235338/BillingService/BusinessService.json
new file mode 100644
index 0000000000..559bb8593e
--- /dev/null
+++ b/data/as/8235338/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235338",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235338/egov-location/boundary-data.json b/data/as/8235338/egov-location/boundary-data.json
new file mode 100644
index 0000000000..22e962c586
--- /dev/null
+++ b/data/as/8235338/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235338",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DORAPARA PWSS",
+                "localname": "RETROFITTING OF DORAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235338",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DORAPARA PWSS",
+                        "localname": "RETROFITTING OF DORAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DORAPARA PWSS",
+                "localname": "RETROFITTING OF DORAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235338",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DORAPARA PWSS",
+                        "localname": "RETROFITTING OF DORAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235338/ws-services-calculation/Penalty.json b/data/as/8235338/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6fa653a662
--- /dev/null
+++ b/data/as/8235338/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235338",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235338/ws-services-calculation/WCBillingSlab.json b/data/as/8235338/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21463ba89e
--- /dev/null
+++ b/data/as/8235338/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235338",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235347/BillingService/BusinessService.json b/data/as/8235347/BillingService/BusinessService.json
new file mode 100644
index 0000000000..39703d6b60
--- /dev/null
+++ b/data/as/8235347/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235347",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235347/egov-location/boundary-data.json b/data/as/8235347/egov-location/boundary-data.json
new file mode 100644
index 0000000000..124bbb136d
--- /dev/null
+++ b/data/as/8235347/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235347",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILSAK DAMAS PWSS",
+                "localname": "RETROFITTING OF SILSAK DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235347",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILSAK DAMAS PWSS",
+                        "localname": "RETROFITTING OF SILSAK DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SILSAK DAMAS PWSS",
+                "localname": "RETROFITTING OF SILSAK DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235347",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SILSAK DAMAS PWSS",
+                        "localname": "RETROFITTING OF SILSAK DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235347/ws-services-calculation/Penalty.json b/data/as/8235347/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44e17fc863
--- /dev/null
+++ b/data/as/8235347/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235347",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235347/ws-services-calculation/WCBillingSlab.json b/data/as/8235347/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fba37f36ac
--- /dev/null
+++ b/data/as/8235347/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235347",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235358/BillingService/BusinessService.json b/data/as/8235358/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4bda598211
--- /dev/null
+++ b/data/as/8235358/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235358",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235358/egov-location/boundary-data.json b/data/as/8235358/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a99059556
--- /dev/null
+++ b/data/as/8235358/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235358",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALPANI PWSS",
+                "localname": "RETROFITTING OF KALPANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235358",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALPANI PWSS",
+                        "localname": "RETROFITTING OF KALPANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KALPANI PWSS",
+                "localname": "RETROFITTING OF KALPANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235358",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KALPANI PWSS",
+                        "localname": "RETROFITTING OF KALPANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235358/ws-services-calculation/Penalty.json b/data/as/8235358/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..96e2d2a290
--- /dev/null
+++ b/data/as/8235358/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235358",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235358/ws-services-calculation/WCBillingSlab.json b/data/as/8235358/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0ac7b73cb3
--- /dev/null
+++ b/data/as/8235358/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235358",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235371/BillingService/BusinessService.json b/data/as/8235371/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c637c116e
--- /dev/null
+++ b/data/as/8235371/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235371",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235371/egov-location/boundary-data.json b/data/as/8235371/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bc2500ef2f
--- /dev/null
+++ b/data/as/8235371/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235371",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAMRA PATPARA PWSS",
+                "localname": "RETROFITTING OF DAMRA PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235371",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAMRA PATPARA PWSS",
+                        "localname": "RETROFITTING OF DAMRA PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAMRA PATPARA PWSS",
+                "localname": "RETROFITTING OF DAMRA PATPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235371",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAMRA PATPARA PWSS",
+                        "localname": "RETROFITTING OF DAMRA PATPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235371/ws-services-calculation/Penalty.json b/data/as/8235371/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11eaf6bf41
--- /dev/null
+++ b/data/as/8235371/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235371",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235371/ws-services-calculation/WCBillingSlab.json b/data/as/8235371/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..28fae1c0d2
--- /dev/null
+++ b/data/as/8235371/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235371",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235387/BillingService/BusinessService.json b/data/as/8235387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d246da7bb7
--- /dev/null
+++ b/data/as/8235387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235387/egov-location/boundary-data.json b/data/as/8235387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..46d242ab63
--- /dev/null
+++ b/data/as/8235387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIDHABARI PWSS",
+                "localname": "RETROFITTING OF SIDHABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIDHABARI PWSS",
+                        "localname": "RETROFITTING OF SIDHABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIDHABARI PWSS",
+                "localname": "RETROFITTING OF SIDHABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIDHABARI PWSS",
+                        "localname": "RETROFITTING OF SIDHABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235387/ws-services-calculation/Penalty.json b/data/as/8235387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eb39b080fd
--- /dev/null
+++ b/data/as/8235387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235387/ws-services-calculation/WCBillingSlab.json b/data/as/8235387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a378f931ce
--- /dev/null
+++ b/data/as/8235387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235394/BillingService/BusinessService.json b/data/as/8235394/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a01cee69a9
--- /dev/null
+++ b/data/as/8235394/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235394",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235394/egov-location/boundary-data.json b/data/as/8235394/egov-location/boundary-data.json
new file mode 100644
index 0000000000..246ac12c67
--- /dev/null
+++ b/data/as/8235394/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235394",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMLABARI PWSS",
+                "localname": "RETROFITTING OF SIMLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235394",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMLABARI PWSS",
+                        "localname": "RETROFITTING OF SIMLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SIMLABARI PWSS",
+                "localname": "RETROFITTING OF SIMLABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235394",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SIMLABARI PWSS",
+                        "localname": "RETROFITTING OF SIMLABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235394/ws-services-calculation/Penalty.json b/data/as/8235394/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37b45edb4b
--- /dev/null
+++ b/data/as/8235394/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235394",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235394/ws-services-calculation/WCBillingSlab.json b/data/as/8235394/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b77a82c605
--- /dev/null
+++ b/data/as/8235394/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235394",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235405/BillingService/BusinessService.json b/data/as/8235405/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fb670d5484
--- /dev/null
+++ b/data/as/8235405/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235405",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235405/egov-location/boundary-data.json b/data/as/8235405/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9984ebe34e
--- /dev/null
+++ b/data/as/8235405/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235405",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                "localname": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235405",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                        "localname": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                "localname": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235405",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                        "localname": "RETROFITTING OF KHAMAR MANIKPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235405/ws-services-calculation/Penalty.json b/data/as/8235405/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..33768979e5
--- /dev/null
+++ b/data/as/8235405/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235405",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235405/ws-services-calculation/WCBillingSlab.json b/data/as/8235405/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..306e010e56
--- /dev/null
+++ b/data/as/8235405/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235405",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235411/BillingService/BusinessService.json b/data/as/8235411/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79c64508e7
--- /dev/null
+++ b/data/as/8235411/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235411",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235411/egov-location/boundary-data.json b/data/as/8235411/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5093a86b79
--- /dev/null
+++ b/data/as/8235411/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235411",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THEPKAI PWSS",
+                "localname": "RETROFITTING OF THEPKAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THEPKAI PWSS",
+                        "localname": "RETROFITTING OF THEPKAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF THEPKAI PWSS",
+                "localname": "RETROFITTING OF THEPKAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF THEPKAI PWSS",
+                        "localname": "RETROFITTING OF THEPKAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235411/ws-services-calculation/Penalty.json b/data/as/8235411/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..34a1e28f52
--- /dev/null
+++ b/data/as/8235411/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235411",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235411/ws-services-calculation/WCBillingSlab.json b/data/as/8235411/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de14f6c2ee
--- /dev/null
+++ b/data/as/8235411/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235411",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235421/BillingService/BusinessService.json b/data/as/8235421/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9977592da3
--- /dev/null
+++ b/data/as/8235421/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235421",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235421/egov-location/boundary-data.json b/data/as/8235421/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b9d0b93ee
--- /dev/null
+++ b/data/as/8235421/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235421",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                "localname": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235421",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                        "localname": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                "localname": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235421",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                        "localname": "RETROFITTING OF DHAIGAON DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235421/ws-services-calculation/Penalty.json b/data/as/8235421/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d416247396
--- /dev/null
+++ b/data/as/8235421/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235421",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235421/ws-services-calculation/WCBillingSlab.json b/data/as/8235421/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b0edec4e8
--- /dev/null
+++ b/data/as/8235421/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235421",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235807/BillingService/BusinessService.json b/data/as/8235807/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88170c6b18
--- /dev/null
+++ b/data/as/8235807/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8235807",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235807/egov-location/boundary-data.json b/data/as/8235807/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eb9cc5963e
--- /dev/null
+++ b/data/as/8235807/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8235807",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                "localname": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                        "localname": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                "localname": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8235807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                        "localname": "RETROFITTING OF DIKORAI TE NLR 42/42 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235807/ws-services-calculation/Penalty.json b/data/as/8235807/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ff131da58
--- /dev/null
+++ b/data/as/8235807/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8235807",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8235807/ws-services-calculation/WCBillingSlab.json b/data/as/8235807/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..207c0bc295
--- /dev/null
+++ b/data/as/8235807/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8235807",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237353/BillingService/BusinessService.json b/data/as/8237353/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b950f3e25
--- /dev/null
+++ b/data/as/8237353/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237353",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237353/egov-location/boundary-data.json b/data/as/8237353/egov-location/boundary-data.json
new file mode 100644
index 0000000000..983cd50217
--- /dev/null
+++ b/data/as/8237353/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237353",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAKUAKATA PWSS",
+                "localname": "RETROFITTING OF DAKUAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237353",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAKUAKATA PWSS",
+                        "localname": "RETROFITTING OF DAKUAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DAKUAKATA PWSS",
+                "localname": "RETROFITTING OF DAKUAKATA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237353",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DAKUAKATA PWSS",
+                        "localname": "RETROFITTING OF DAKUAKATA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237353/ws-services-calculation/Penalty.json b/data/as/8237353/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..739f4aaaa8
--- /dev/null
+++ b/data/as/8237353/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237353",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237353/ws-services-calculation/WCBillingSlab.json b/data/as/8237353/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c07c3a1d41
--- /dev/null
+++ b/data/as/8237353/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237353",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237367/BillingService/BusinessService.json b/data/as/8237367/BillingService/BusinessService.json
new file mode 100644
index 0000000000..003fa04a99
--- /dev/null
+++ b/data/as/8237367/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237367",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237367/egov-location/boundary-data.json b/data/as/8237367/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40ec71adff
--- /dev/null
+++ b/data/as/8237367/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237367",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BIRSING PT I MPWSS",
+                "localname": "RETROFITTING OF BIRSING PT I MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BIRSING PT I MPWSS",
+                        "localname": "RETROFITTING OF BIRSING PT I MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BIRSING PT I MPWSS",
+                "localname": "RETROFITTING OF BIRSING PT I MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BIRSING PT I MPWSS",
+                        "localname": "RETROFITTING OF BIRSING PT I MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237367/ws-services-calculation/Penalty.json b/data/as/8237367/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..10ebfdbf91
--- /dev/null
+++ b/data/as/8237367/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237367",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237367/ws-services-calculation/WCBillingSlab.json b/data/as/8237367/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5f96ee3525
--- /dev/null
+++ b/data/as/8237367/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237367",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237390/BillingService/BusinessService.json b/data/as/8237390/BillingService/BusinessService.json
new file mode 100644
index 0000000000..73a17c29c4
--- /dev/null
+++ b/data/as/8237390/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237390",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237390/egov-location/boundary-data.json b/data/as/8237390/egov-location/boundary-data.json
new file mode 100644
index 0000000000..df922a6d63
--- /dev/null
+++ b/data/as/8237390/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237390",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                "localname": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237390",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                        "localname": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                "localname": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237390",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                        "localname": "RETROFITTING OF SOPAI ROWMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237390/ws-services-calculation/Penalty.json b/data/as/8237390/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2c7209c61d
--- /dev/null
+++ b/data/as/8237390/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237390",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237390/ws-services-calculation/WCBillingSlab.json b/data/as/8237390/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0c9022c6a
--- /dev/null
+++ b/data/as/8237390/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237390",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237435/BillingService/BusinessService.json b/data/as/8237435/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c89bc9bad3
--- /dev/null
+++ b/data/as/8237435/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237435",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237435/egov-location/boundary-data.json b/data/as/8237435/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c759e1bb5
--- /dev/null
+++ b/data/as/8237435/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237435",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                "localname": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                        "localname": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                "localname": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                        "localname": "RETROFITTING OF BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237435/ws-services-calculation/Penalty.json b/data/as/8237435/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c6525e35b
--- /dev/null
+++ b/data/as/8237435/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237435",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237435/ws-services-calculation/WCBillingSlab.json b/data/as/8237435/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..901fd7edf9
--- /dev/null
+++ b/data/as/8237435/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237435",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237444/BillingService/BusinessService.json b/data/as/8237444/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e0396ddbd
--- /dev/null
+++ b/data/as/8237444/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237444",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237444/egov-location/boundary-data.json b/data/as/8237444/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c33b365670
--- /dev/null
+++ b/data/as/8237444/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237444",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                "localname": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                        "localname": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                "localname": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                        "localname": "RETROFITTING OF NO.2 NARAYANPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237444/ws-services-calculation/Penalty.json b/data/as/8237444/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5dbcba908a
--- /dev/null
+++ b/data/as/8237444/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237444",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237444/ws-services-calculation/WCBillingSlab.json b/data/as/8237444/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b4e366b5a8
--- /dev/null
+++ b/data/as/8237444/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237444",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237467/BillingService/BusinessService.json b/data/as/8237467/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc8da05f61
--- /dev/null
+++ b/data/as/8237467/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237467",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237467/egov-location/boundary-data.json b/data/as/8237467/egov-location/boundary-data.json
new file mode 100644
index 0000000000..93210b871b
--- /dev/null
+++ b/data/as/8237467/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237467",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALASARA PWSS",
+                "localname": "RETROFITTING OF BALASARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237467",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALASARA PWSS",
+                        "localname": "RETROFITTING OF BALASARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BALASARA PWSS",
+                "localname": "RETROFITTING OF BALASARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237467",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BALASARA PWSS",
+                        "localname": "RETROFITTING OF BALASARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237467/ws-services-calculation/Penalty.json b/data/as/8237467/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b41668662
--- /dev/null
+++ b/data/as/8237467/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237467",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237467/ws-services-calculation/WCBillingSlab.json b/data/as/8237467/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b7092a8988
--- /dev/null
+++ b/data/as/8237467/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237467",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237495/BillingService/BusinessService.json b/data/as/8237495/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f0961ce9a7
--- /dev/null
+++ b/data/as/8237495/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237495",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237495/egov-location/boundary-data.json b/data/as/8237495/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4eccb39dfb
--- /dev/null
+++ b/data/as/8237495/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237495",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUTABARI PT V PWSS",
+                "localname": "RETROFITTING OF KHUTABARI PT V PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237495",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUTABARI PT V PWSS",
+                        "localname": "RETROFITTING OF KHUTABARI PT V PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KHUTABARI PT V PWSS",
+                "localname": "RETROFITTING OF KHUTABARI PT V PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237495",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KHUTABARI PT V PWSS",
+                        "localname": "RETROFITTING OF KHUTABARI PT V PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237495/ws-services-calculation/Penalty.json b/data/as/8237495/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dcd9d989d8
--- /dev/null
+++ b/data/as/8237495/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237495",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237495/ws-services-calculation/WCBillingSlab.json b/data/as/8237495/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42e3f2483a
--- /dev/null
+++ b/data/as/8237495/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237495",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237534/BillingService/BusinessService.json b/data/as/8237534/BillingService/BusinessService.json
new file mode 100644
index 0000000000..249e7f6aee
--- /dev/null
+++ b/data/as/8237534/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237534",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237534/egov-location/boundary-data.json b/data/as/8237534/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9c35f7c5b5
--- /dev/null
+++ b/data/as/8237534/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237534",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                "localname": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237534",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                        "localname": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                "localname": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237534",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                        "localname": "RETROFITTING OF KATHALMURI ( SANPARA)PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237534/ws-services-calculation/Penalty.json b/data/as/8237534/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3861b82ed5
--- /dev/null
+++ b/data/as/8237534/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237534",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237534/ws-services-calculation/WCBillingSlab.json b/data/as/8237534/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2ad79d5b65
--- /dev/null
+++ b/data/as/8237534/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237534",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237554/BillingService/BusinessService.json b/data/as/8237554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..71b070a28d
--- /dev/null
+++ b/data/as/8237554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237554/egov-location/boundary-data.json b/data/as/8237554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..038e27a1a7
--- /dev/null
+++ b/data/as/8237554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAGULAMARI PWSS",
+                "localname": "RETROFITTING OF BAGULAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAGULAMARI PWSS",
+                        "localname": "RETROFITTING OF BAGULAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BAGULAMARI PWSS",
+                "localname": "RETROFITTING OF BAGULAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BAGULAMARI PWSS",
+                        "localname": "RETROFITTING OF BAGULAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237554/ws-services-calculation/Penalty.json b/data/as/8237554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..906f2edbc7
--- /dev/null
+++ b/data/as/8237554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237554/ws-services-calculation/WCBillingSlab.json b/data/as/8237554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2defaa471f
--- /dev/null
+++ b/data/as/8237554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237581/BillingService/BusinessService.json b/data/as/8237581/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56b13fc8ce
--- /dev/null
+++ b/data/as/8237581/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237581",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237581/egov-location/boundary-data.json b/data/as/8237581/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4b5bc4a1a4
--- /dev/null
+++ b/data/as/8237581/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237581",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NICHALAMARI PWSS",
+                "localname": "RETROFITTING OF NICHALAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237581",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NICHALAMARI PWSS",
+                        "localname": "RETROFITTING OF NICHALAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NICHALAMARI PWSS",
+                "localname": "RETROFITTING OF NICHALAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237581",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NICHALAMARI PWSS",
+                        "localname": "RETROFITTING OF NICHALAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237581/ws-services-calculation/Penalty.json b/data/as/8237581/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5defe1bdd6
--- /dev/null
+++ b/data/as/8237581/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237581",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237581/ws-services-calculation/WCBillingSlab.json b/data/as/8237581/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2b6fcfd08c
--- /dev/null
+++ b/data/as/8237581/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237581",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237588/BillingService/BusinessService.json b/data/as/8237588/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c316688b9
--- /dev/null
+++ b/data/as/8237588/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237588",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237588/egov-location/boundary-data.json b/data/as/8237588/egov-location/boundary-data.json
new file mode 100644
index 0000000000..589eaac7df
--- /dev/null
+++ b/data/as/8237588/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237588",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARIMURA T E PWSS",
+                "localname": "RETROFITTING OF HARIMURA T E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARIMURA T E PWSS",
+                        "localname": "RETROFITTING OF HARIMURA T E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF HARIMURA T E PWSS",
+                "localname": "RETROFITTING OF HARIMURA T E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF HARIMURA T E PWSS",
+                        "localname": "RETROFITTING OF HARIMURA T E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237588/ws-services-calculation/Penalty.json b/data/as/8237588/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d484272c82
--- /dev/null
+++ b/data/as/8237588/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237588",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237588/ws-services-calculation/WCBillingSlab.json b/data/as/8237588/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e0ca6147cd
--- /dev/null
+++ b/data/as/8237588/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237588",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237606/BillingService/BusinessService.json b/data/as/8237606/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b8088db99
--- /dev/null
+++ b/data/as/8237606/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237606",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237606/egov-location/boundary-data.json b/data/as/8237606/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9abbd54618
--- /dev/null
+++ b/data/as/8237606/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237606",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARDAMAL PWSS",
+                "localname": "RETROFITTING OF BARDAMAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARDAMAL PWSS",
+                        "localname": "RETROFITTING OF BARDAMAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BARDAMAL PWSS",
+                "localname": "RETROFITTING OF BARDAMAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BARDAMAL PWSS",
+                        "localname": "RETROFITTING OF BARDAMAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237606/ws-services-calculation/Penalty.json b/data/as/8237606/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fdf9c6d44c
--- /dev/null
+++ b/data/as/8237606/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237606",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237606/ws-services-calculation/WCBillingSlab.json b/data/as/8237606/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ccd1ba77b0
--- /dev/null
+++ b/data/as/8237606/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237606",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237611/BillingService/BusinessService.json b/data/as/8237611/BillingService/BusinessService.json
new file mode 100644
index 0000000000..61ffaf25bc
--- /dev/null
+++ b/data/as/8237611/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8237611",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237611/egov-location/boundary-data.json b/data/as/8237611/egov-location/boundary-data.json
new file mode 100644
index 0000000000..568c5a7567
--- /dev/null
+++ b/data/as/8237611/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8237611",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALINIDUBA PWSS",
+                "localname": "RETROFITTING OF NALINIDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALINIDUBA PWSS",
+                        "localname": "RETROFITTING OF NALINIDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NALINIDUBA PWSS",
+                "localname": "RETROFITTING OF NALINIDUBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8237611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NALINIDUBA PWSS",
+                        "localname": "RETROFITTING OF NALINIDUBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237611/ws-services-calculation/Penalty.json b/data/as/8237611/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8f6788f9a2
--- /dev/null
+++ b/data/as/8237611/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8237611",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8237611/ws-services-calculation/WCBillingSlab.json b/data/as/8237611/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b2c04a02e
--- /dev/null
+++ b/data/as/8237611/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8237611",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8239822/BillingService/BusinessService.json b/data/as/8239822/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e206d26da2
--- /dev/null
+++ b/data/as/8239822/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8239822",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8239822/egov-location/boundary-data.json b/data/as/8239822/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6463633da5
--- /dev/null
+++ b/data/as/8239822/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8239822",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOGIBIL PWSS",
+                "localname": "RETROFITTING OF JOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8239822",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOGIBIL PWSS",
+                        "localname": "RETROFITTING OF JOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JOGIBIL PWSS",
+                "localname": "RETROFITTING OF JOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8239822",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JOGIBIL PWSS",
+                        "localname": "RETROFITTING OF JOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8239822/ws-services-calculation/Penalty.json b/data/as/8239822/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b99dafe194
--- /dev/null
+++ b/data/as/8239822/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8239822",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8239822/ws-services-calculation/WCBillingSlab.json b/data/as/8239822/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f8c36911fc
--- /dev/null
+++ b/data/as/8239822/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8239822",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8246724/BillingService/BusinessService.json b/data/as/8246724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6088f6d848
--- /dev/null
+++ b/data/as/8246724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8246724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8246724/egov-location/boundary-data.json b/data/as/8246724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5fa1db875a
--- /dev/null
+++ b/data/as/8246724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8246724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIHIYA GAON TINI ALI LPS",
+                "localname": "BIHIYA GAON TINI ALI LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8246724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIHIYA GAON TINI ALI LPS",
+                        "localname": "BIHIYA GAON TINI ALI LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIHIYA GAON TINI ALI LPS",
+                "localname": "BIHIYA GAON TINI ALI LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8246724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIHIYA GAON TINI ALI LPS",
+                        "localname": "BIHIYA GAON TINI ALI LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8246724/ws-services-calculation/Penalty.json b/data/as/8246724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ee91d2990
--- /dev/null
+++ b/data/as/8246724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8246724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8246724/ws-services-calculation/WCBillingSlab.json b/data/as/8246724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df78e8b125
--- /dev/null
+++ b/data/as/8246724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8246724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250038/BillingService/BusinessService.json b/data/as/8250038/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f9cf2edf12
--- /dev/null
+++ b/data/as/8250038/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8250038",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250038/egov-location/boundary-data.json b/data/as/8250038/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a2801506b5
--- /dev/null
+++ b/data/as/8250038/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8250038",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALI SINGA URIUM GURI",
+                "localname": "ALI SINGA URIUM GURI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8250038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALI SINGA URIUM GURI",
+                        "localname": "ALI SINGA URIUM GURI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALI SINGA URIUM GURI",
+                "localname": "ALI SINGA URIUM GURI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8250038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALI SINGA URIUM GURI",
+                        "localname": "ALI SINGA URIUM GURI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250038/ws-services-calculation/Penalty.json b/data/as/8250038/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b7ac64a697
--- /dev/null
+++ b/data/as/8250038/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8250038",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250038/ws-services-calculation/WCBillingSlab.json b/data/as/8250038/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42964db112
--- /dev/null
+++ b/data/as/8250038/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8250038",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250626/BillingService/BusinessService.json b/data/as/8250626/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6eebec74b
--- /dev/null
+++ b/data/as/8250626/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8250626",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250626/egov-location/boundary-data.json b/data/as/8250626/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8cb5fc571a
--- /dev/null
+++ b/data/as/8250626/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8250626",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOKAJAN",
+                "localname": "HOKAJAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8250626",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOKAJAN",
+                        "localname": "HOKAJAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOKAJAN",
+                "localname": "HOKAJAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8250626",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOKAJAN",
+                        "localname": "HOKAJAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250626/ws-services-calculation/Penalty.json b/data/as/8250626/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5350ef119a
--- /dev/null
+++ b/data/as/8250626/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8250626",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8250626/ws-services-calculation/WCBillingSlab.json b/data/as/8250626/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..af60daa003
--- /dev/null
+++ b/data/as/8250626/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8250626",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8252919/BillingService/BusinessService.json b/data/as/8252919/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d7b5f5d907
--- /dev/null
+++ b/data/as/8252919/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8252919",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8252919/egov-location/boundary-data.json b/data/as/8252919/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2709096bfa
--- /dev/null
+++ b/data/as/8252919/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8252919",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POGOLA BIL",
+                "localname": "POGOLA BIL",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8252919",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POGOLA BIL",
+                        "localname": "POGOLA BIL",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POGOLA BIL",
+                "localname": "POGOLA BIL",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8252919",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POGOLA BIL",
+                        "localname": "POGOLA BIL",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8252919/ws-services-calculation/Penalty.json b/data/as/8252919/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59b50dbd83
--- /dev/null
+++ b/data/as/8252919/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8252919",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8252919/ws-services-calculation/WCBillingSlab.json b/data/as/8252919/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58a61dae15
--- /dev/null
+++ b/data/as/8252919/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8252919",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8255134/BillingService/BusinessService.json b/data/as/8255134/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed6661cf7b
--- /dev/null
+++ b/data/as/8255134/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8255134",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8255134/egov-location/boundary-data.json b/data/as/8255134/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5744e61b69
--- /dev/null
+++ b/data/as/8255134/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8255134",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORPUKHURIPAR",
+                "localname": "BORPUKHURIPAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8255134",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORPUKHURIPAR",
+                        "localname": "BORPUKHURIPAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORPUKHURIPAR",
+                "localname": "BORPUKHURIPAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8255134",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORPUKHURIPAR",
+                        "localname": "BORPUKHURIPAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8255134/ws-services-calculation/Penalty.json b/data/as/8255134/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..723391d45b
--- /dev/null
+++ b/data/as/8255134/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8255134",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8255134/ws-services-calculation/WCBillingSlab.json b/data/as/8255134/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..512d3935d6
--- /dev/null
+++ b/data/as/8255134/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8255134",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8257091/BillingService/BusinessService.json b/data/as/8257091/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae4d513296
--- /dev/null
+++ b/data/as/8257091/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8257091",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8257091/egov-location/boundary-data.json b/data/as/8257091/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b1b2c8c155
--- /dev/null
+++ b/data/as/8257091/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8257091",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPOR KOCHARI",
+                "localname": "UPOR KOCHARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8257091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPOR KOCHARI",
+                        "localname": "UPOR KOCHARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPOR KOCHARI",
+                "localname": "UPOR KOCHARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8257091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPOR KOCHARI",
+                        "localname": "UPOR KOCHARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8257091/ws-services-calculation/Penalty.json b/data/as/8257091/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab3b543d79
--- /dev/null
+++ b/data/as/8257091/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8257091",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8257091/ws-services-calculation/WCBillingSlab.json b/data/as/8257091/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..223f168a6a
--- /dev/null
+++ b/data/as/8257091/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8257091",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261500/BillingService/BusinessService.json b/data/as/8261500/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b7ffd3e8a5
--- /dev/null
+++ b/data/as/8261500/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8261500",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261500/egov-location/boundary-data.json b/data/as/8261500/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a4a7e52ebb
--- /dev/null
+++ b/data/as/8261500/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8261500",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDAL L.P.S.",
+                "localname": "BORDAL L.P.S.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8261500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDAL L.P.S.",
+                        "localname": "BORDAL L.P.S.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDAL L.P.S.",
+                "localname": "BORDAL L.P.S.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8261500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDAL L.P.S.",
+                        "localname": "BORDAL L.P.S.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261500/ws-services-calculation/Penalty.json b/data/as/8261500/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a830e2e41
--- /dev/null
+++ b/data/as/8261500/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8261500",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261500/ws-services-calculation/WCBillingSlab.json b/data/as/8261500/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f670313a11
--- /dev/null
+++ b/data/as/8261500/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8261500",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261877/BillingService/BusinessService.json b/data/as/8261877/BillingService/BusinessService.json
new file mode 100644
index 0000000000..96a78fdc3f
--- /dev/null
+++ b/data/as/8261877/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8261877",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261877/egov-location/boundary-data.json b/data/as/8261877/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c074b8c316
--- /dev/null
+++ b/data/as/8261877/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8261877",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "1 NO URIAMGURI LPS",
+                "localname": "1 NO URIAMGURI LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8261877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "1 NO URIAMGURI LPS",
+                        "localname": "1 NO URIAMGURI LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "1 NO URIAMGURI LPS",
+                "localname": "1 NO URIAMGURI LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8261877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "1 NO URIAMGURI LPS",
+                        "localname": "1 NO URIAMGURI LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261877/ws-services-calculation/Penalty.json b/data/as/8261877/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f138ab2f9e
--- /dev/null
+++ b/data/as/8261877/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8261877",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261877/ws-services-calculation/WCBillingSlab.json b/data/as/8261877/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4022fdd79d
--- /dev/null
+++ b/data/as/8261877/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8261877",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261995/BillingService/BusinessService.json b/data/as/8261995/BillingService/BusinessService.json
new file mode 100644
index 0000000000..24121b783e
--- /dev/null
+++ b/data/as/8261995/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8261995",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261995/egov-location/boundary-data.json b/data/as/8261995/egov-location/boundary-data.json
new file mode 100644
index 0000000000..994b330d3f
--- /dev/null
+++ b/data/as/8261995/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8261995",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOALPARIA GAON LPS",
+                "localname": "GOALPARIA GAON LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8261995",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOALPARIA GAON LPS",
+                        "localname": "GOALPARIA GAON LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOALPARIA GAON LPS",
+                "localname": "GOALPARIA GAON LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8261995",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOALPARIA GAON LPS",
+                        "localname": "GOALPARIA GAON LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261995/ws-services-calculation/Penalty.json b/data/as/8261995/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..af621f5a96
--- /dev/null
+++ b/data/as/8261995/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8261995",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8261995/ws-services-calculation/WCBillingSlab.json b/data/as/8261995/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1457c7656e
--- /dev/null
+++ b/data/as/8261995/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8261995",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8264422/BillingService/BusinessService.json b/data/as/8264422/BillingService/BusinessService.json
new file mode 100644
index 0000000000..65a256bc31
--- /dev/null
+++ b/data/as/8264422/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8264422",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8264422/egov-location/boundary-data.json b/data/as/8264422/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dbe450ab45
--- /dev/null
+++ b/data/as/8264422/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8264422",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "207 NO NICHINTA LPS",
+                "localname": "207 NO NICHINTA LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8264422",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "207 NO NICHINTA LPS",
+                        "localname": "207 NO NICHINTA LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "207 NO NICHINTA LPS",
+                "localname": "207 NO NICHINTA LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8264422",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "207 NO NICHINTA LPS",
+                        "localname": "207 NO NICHINTA LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8264422/ws-services-calculation/Penalty.json b/data/as/8264422/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a9a6ee0ddc
--- /dev/null
+++ b/data/as/8264422/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8264422",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8264422/ws-services-calculation/WCBillingSlab.json b/data/as/8264422/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6fe523efd3
--- /dev/null
+++ b/data/as/8264422/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8264422",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8265409/BillingService/BusinessService.json b/data/as/8265409/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4a095cbf4e
--- /dev/null
+++ b/data/as/8265409/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8265409",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8265409/egov-location/boundary-data.json b/data/as/8265409/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c6c43c4f81
--- /dev/null
+++ b/data/as/8265409/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8265409",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANOBAG CHARCHOBARI LPS",
+                "localname": "MANOBAG CHARCHOBARI LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8265409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANOBAG CHARCHOBARI LPS",
+                        "localname": "MANOBAG CHARCHOBARI LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANOBAG CHARCHOBARI LPS",
+                "localname": "MANOBAG CHARCHOBARI LPS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8265409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANOBAG CHARCHOBARI LPS",
+                        "localname": "MANOBAG CHARCHOBARI LPS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8265409/ws-services-calculation/Penalty.json b/data/as/8265409/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37706d0bfa
--- /dev/null
+++ b/data/as/8265409/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8265409",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8265409/ws-services-calculation/WCBillingSlab.json b/data/as/8265409/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9d0363a3e2
--- /dev/null
+++ b/data/as/8265409/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8265409",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8266441/BillingService/BusinessService.json b/data/as/8266441/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9ca49382a3
--- /dev/null
+++ b/data/as/8266441/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8266441",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8266441/egov-location/boundary-data.json b/data/as/8266441/egov-location/boundary-data.json
new file mode 100644
index 0000000000..940f063b38
--- /dev/null
+++ b/data/as/8266441/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8266441",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATAI CHAPORI F AWC",
+                "localname": "CHATAI CHAPORI F AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8266441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATAI CHAPORI F AWC",
+                        "localname": "CHATAI CHAPORI F AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATAI CHAPORI F AWC",
+                "localname": "CHATAI CHAPORI F AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8266441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATAI CHAPORI F AWC",
+                        "localname": "CHATAI CHAPORI F AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8266441/ws-services-calculation/Penalty.json b/data/as/8266441/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f546f4924
--- /dev/null
+++ b/data/as/8266441/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8266441",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8266441/ws-services-calculation/WCBillingSlab.json b/data/as/8266441/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..96f9b99462
--- /dev/null
+++ b/data/as/8266441/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8266441",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8273083/BillingService/BusinessService.json b/data/as/8273083/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b33febd38
--- /dev/null
+++ b/data/as/8273083/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8273083",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8273083/egov-location/boundary-data.json b/data/as/8273083/egov-location/boundary-data.json
new file mode 100644
index 0000000000..10f6b96c13
--- /dev/null
+++ b/data/as/8273083/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8273083",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAM CHUBURI  PANBARI ( 88) AWC",
+                "localname": "NAM CHUBURI  PANBARI ( 88) AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8273083",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAM CHUBURI  PANBARI ( 88) AWC",
+                        "localname": "NAM CHUBURI  PANBARI ( 88) AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAM CHUBURI  PANBARI ( 88) AWC",
+                "localname": "NAM CHUBURI  PANBARI ( 88) AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8273083",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAM CHUBURI  PANBARI ( 88) AWC",
+                        "localname": "NAM CHUBURI  PANBARI ( 88) AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8273083/ws-services-calculation/Penalty.json b/data/as/8273083/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..47750404ae
--- /dev/null
+++ b/data/as/8273083/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8273083",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8273083/ws-services-calculation/WCBillingSlab.json b/data/as/8273083/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b09b933498
--- /dev/null
+++ b/data/as/8273083/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8273083",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8279762/BillingService/BusinessService.json b/data/as/8279762/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b643be56a2
--- /dev/null
+++ b/data/as/8279762/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8279762",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8279762/egov-location/boundary-data.json b/data/as/8279762/egov-location/boundary-data.json
new file mode 100644
index 0000000000..51c449418f
--- /dev/null
+++ b/data/as/8279762/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8279762",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMZADIA ME MADRASSA",
+                "localname": "AMZADIA ME MADRASSA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8279762",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMZADIA ME MADRASSA",
+                        "localname": "AMZADIA ME MADRASSA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMZADIA ME MADRASSA",
+                "localname": "AMZADIA ME MADRASSA",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8279762",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMZADIA ME MADRASSA",
+                        "localname": "AMZADIA ME MADRASSA",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8279762/ws-services-calculation/Penalty.json b/data/as/8279762/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce6730f28e
--- /dev/null
+++ b/data/as/8279762/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8279762",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8279762/ws-services-calculation/WCBillingSlab.json b/data/as/8279762/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9a3d849f7
--- /dev/null
+++ b/data/as/8279762/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8279762",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8286607/BillingService/BusinessService.json b/data/as/8286607/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca01bd1793
--- /dev/null
+++ b/data/as/8286607/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8286607",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8286607/egov-location/boundary-data.json b/data/as/8286607/egov-location/boundary-data.json
new file mode 100644
index 0000000000..42dab4e62b
--- /dev/null
+++ b/data/as/8286607/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8286607",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRI TE PWSS",
+                "localname": "RETROFITTING OF SINGRI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8286607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRI TE PWSS",
+                        "localname": "RETROFITTING OF SINGRI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SINGRI TE PWSS",
+                "localname": "RETROFITTING OF SINGRI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8286607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SINGRI TE PWSS",
+                        "localname": "RETROFITTING OF SINGRI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8286607/ws-services-calculation/Penalty.json b/data/as/8286607/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..102fc0ffa8
--- /dev/null
+++ b/data/as/8286607/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8286607",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8286607/ws-services-calculation/WCBillingSlab.json b/data/as/8286607/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df36a563fb
--- /dev/null
+++ b/data/as/8286607/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8286607",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8298009/BillingService/BusinessService.json b/data/as/8298009/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88e9f50474
--- /dev/null
+++ b/data/as/8298009/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8298009",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8298009/egov-location/boundary-data.json b/data/as/8298009/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd59b7f9ba
--- /dev/null
+++ b/data/as/8298009/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8298009",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIPOTA T.E. 18306120212",
+                "localname": "PANIPOTA T.E. 18306120212",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8298009",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIPOTA T.E. 18306120212",
+                        "localname": "PANIPOTA T.E. 18306120212",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIPOTA T.E. 18306120212",
+                "localname": "PANIPOTA T.E. 18306120212",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8298009",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIPOTA T.E. 18306120212",
+                        "localname": "PANIPOTA T.E. 18306120212",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8298009/ws-services-calculation/Penalty.json b/data/as/8298009/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..994c585272
--- /dev/null
+++ b/data/as/8298009/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8298009",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8298009/ws-services-calculation/WCBillingSlab.json b/data/as/8298009/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed2327658a
--- /dev/null
+++ b/data/as/8298009/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8298009",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8307469/BillingService/BusinessService.json b/data/as/8307469/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07accc776a
--- /dev/null
+++ b/data/as/8307469/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8307469",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8307469/egov-location/boundary-data.json b/data/as/8307469/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca71a23c36
--- /dev/null
+++ b/data/as/8307469/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8307469",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "143 NO. MAZGAON AWC",
+                "localname": "143 NO. MAZGAON AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8307469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "143 NO. MAZGAON AWC",
+                        "localname": "143 NO. MAZGAON AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "143 NO. MAZGAON AWC",
+                "localname": "143 NO. MAZGAON AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8307469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "143 NO. MAZGAON AWC",
+                        "localname": "143 NO. MAZGAON AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8307469/ws-services-calculation/Penalty.json b/data/as/8307469/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d213e60a6a
--- /dev/null
+++ b/data/as/8307469/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8307469",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8307469/ws-services-calculation/WCBillingSlab.json b/data/as/8307469/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..323c4a8057
--- /dev/null
+++ b/data/as/8307469/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8307469",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8310456/BillingService/BusinessService.json b/data/as/8310456/BillingService/BusinessService.json
new file mode 100644
index 0000000000..61c542c954
--- /dev/null
+++ b/data/as/8310456/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8310456",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8310456/egov-location/boundary-data.json b/data/as/8310456/egov-location/boundary-data.json
new file mode 100644
index 0000000000..01010bd346
--- /dev/null
+++ b/data/as/8310456/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8310456",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "208 NO HADLAPARA LP.",
+                "localname": "208 NO HADLAPARA LP.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8310456",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "208 NO HADLAPARA LP.",
+                        "localname": "208 NO HADLAPARA LP.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "208 NO HADLAPARA LP.",
+                "localname": "208 NO HADLAPARA LP.",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8310456",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "208 NO HADLAPARA LP.",
+                        "localname": "208 NO HADLAPARA LP.",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8310456/ws-services-calculation/Penalty.json b/data/as/8310456/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..237cb70a4e
--- /dev/null
+++ b/data/as/8310456/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8310456",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8310456/ws-services-calculation/WCBillingSlab.json b/data/as/8310456/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13c8394169
--- /dev/null
+++ b/data/as/8310456/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8310456",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8312752/BillingService/BusinessService.json b/data/as/8312752/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45d785adf1
--- /dev/null
+++ b/data/as/8312752/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8312752",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8312752/egov-location/boundary-data.json b/data/as/8312752/egov-location/boundary-data.json
new file mode 100644
index 0000000000..203c8ff422
--- /dev/null
+++ b/data/as/8312752/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8312752",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHUTKI AWC",
+                "localname": "CHUTKI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8312752",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHUTKI AWC",
+                        "localname": "CHUTKI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHUTKI AWC",
+                "localname": "CHUTKI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8312752",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHUTKI AWC",
+                        "localname": "CHUTKI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8312752/ws-services-calculation/Penalty.json b/data/as/8312752/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c37be9c8b
--- /dev/null
+++ b/data/as/8312752/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8312752",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8312752/ws-services-calculation/WCBillingSlab.json b/data/as/8312752/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5e90417ab
--- /dev/null
+++ b/data/as/8312752/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8312752",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8320434/BillingService/BusinessService.json b/data/as/8320434/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7690e0b9ab
--- /dev/null
+++ b/data/as/8320434/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8320434",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8320434/egov-location/boundary-data.json b/data/as/8320434/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9deba71808
--- /dev/null
+++ b/data/as/8320434/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8320434",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                "localname": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8320434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                        "localname": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                "localname": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8320434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                        "localname": "182 NO. GOSAIBORI PUB MILANPUR AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8320434/ws-services-calculation/Penalty.json b/data/as/8320434/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbad2d4b3c
--- /dev/null
+++ b/data/as/8320434/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8320434",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8320434/ws-services-calculation/WCBillingSlab.json b/data/as/8320434/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3880c07768
--- /dev/null
+++ b/data/as/8320434/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8320434",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8325212/BillingService/BusinessService.json b/data/as/8325212/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10b154ba25
--- /dev/null
+++ b/data/as/8325212/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8325212",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8325212/egov-location/boundary-data.json b/data/as/8325212/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e97d4691a
--- /dev/null
+++ b/data/as/8325212/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8325212",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GODHARBORI AWC",
+                "localname": "GODHARBORI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8325212",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GODHARBORI AWC",
+                        "localname": "GODHARBORI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GODHARBORI AWC",
+                "localname": "GODHARBORI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8325212",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GODHARBORI AWC",
+                        "localname": "GODHARBORI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8325212/ws-services-calculation/Penalty.json b/data/as/8325212/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e00fc36509
--- /dev/null
+++ b/data/as/8325212/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8325212",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8325212/ws-services-calculation/WCBillingSlab.json b/data/as/8325212/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5691a338b
--- /dev/null
+++ b/data/as/8325212/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8325212",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326277/BillingService/BusinessService.json b/data/as/8326277/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9aa5bc47a8
--- /dev/null
+++ b/data/as/8326277/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8326277",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326277/egov-location/boundary-data.json b/data/as/8326277/egov-location/boundary-data.json
new file mode 100644
index 0000000000..511cdcaaca
--- /dev/null
+++ b/data/as/8326277/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8326277",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUZA CHARPARA A AWC",
+                "localname": "KHARMUZA CHARPARA A AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8326277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUZA CHARPARA A AWC",
+                        "localname": "KHARMUZA CHARPARA A AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUZA CHARPARA A AWC",
+                "localname": "KHARMUZA CHARPARA A AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8326277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUZA CHARPARA A AWC",
+                        "localname": "KHARMUZA CHARPARA A AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326277/ws-services-calculation/Penalty.json b/data/as/8326277/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f79a1abb6
--- /dev/null
+++ b/data/as/8326277/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8326277",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326277/ws-services-calculation/WCBillingSlab.json b/data/as/8326277/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c31b20e9c0
--- /dev/null
+++ b/data/as/8326277/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8326277",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326909/BillingService/BusinessService.json b/data/as/8326909/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86f0ba9795
--- /dev/null
+++ b/data/as/8326909/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8326909",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326909/egov-location/boundary-data.json b/data/as/8326909/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba90ef2dd8
--- /dev/null
+++ b/data/as/8326909/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8326909",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                "localname": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8326909",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                        "localname": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                "localname": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8326909",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                        "localname": "193 NO. SIDHABARI SARANARTHI SIBIR  9 AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326909/ws-services-calculation/Penalty.json b/data/as/8326909/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee12f56c48
--- /dev/null
+++ b/data/as/8326909/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8326909",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8326909/ws-services-calculation/WCBillingSlab.json b/data/as/8326909/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ebaec66d4b
--- /dev/null
+++ b/data/as/8326909/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8326909",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8365758/BillingService/BusinessService.json b/data/as/8365758/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9e05738bb8
--- /dev/null
+++ b/data/as/8365758/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.8365758",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8365758/egov-location/boundary-data.json b/data/as/8365758/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e94e6222a7
--- /dev/null
+++ b/data/as/8365758/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.8365758",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABIL KACHARI AWC",
+                "localname": "NABIL KACHARI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8365758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABIL KACHARI AWC",
+                        "localname": "NABIL KACHARI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABIL KACHARI AWC",
+                "localname": "NABIL KACHARI AWC",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.8365758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABIL KACHARI AWC",
+                        "localname": "NABIL KACHARI AWC",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8365758/ws-services-calculation/Penalty.json b/data/as/8365758/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e1a0747271
--- /dev/null
+++ b/data/as/8365758/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.8365758",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/8365758/ws-services-calculation/WCBillingSlab.json b/data/as/8365758/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1fbfb45aeb
--- /dev/null
+++ b/data/as/8365758/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.8365758",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From 0e392f33c7c74dadc52a0daecc1a91cd1df8adc2 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:37:22 +0530
Subject: [PATCH 04/23] added 400 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016769/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016773/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016776/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016777/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016779/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016893/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30016917/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017080/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017213/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017259/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017426/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017520/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017697/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017715/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017720/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017735/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017892/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017895/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30017896/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018185/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018227/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018243/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018312/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018441/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018712/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018720/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018721/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018738/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018739/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018741/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018824/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018921/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018935/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30018941/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019121/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019130/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019135/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019139/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019144/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019151/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019154/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019163/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019166/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019168/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019170/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019171/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019173/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019266/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019465/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019506/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019535/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019544/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019572/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019680/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019686/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019793/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019799/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019826/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30019832/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020076/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020201/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020202/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020369/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020383/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020502/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020635/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020637/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020760/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020766/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020777/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30020972/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30021055/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30021475/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30021482/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30021560/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30021973/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30021987/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022258/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022299/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022418/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022523/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022537/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022693/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022702/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022721/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022760/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022777/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022787/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022800/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022816/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022851/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022854/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022858/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022862/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022947/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022975/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30022986/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023075/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023084/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023147/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023196/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023283/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023298/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023308/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023317/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023324/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023337/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023347/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023360/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023708/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023894/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023984/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30023999/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30027151/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30027153/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30027587/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30027681/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30030288/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30030309/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30030458/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30031382/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30033116/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036349/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036685/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036696/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036706/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036712/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036747/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036796/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036799/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30036923/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037050/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037052/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037053/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037055/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037056/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037057/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037058/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037282/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037284/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037286/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037287/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037289/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037516/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037943/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037947/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037948/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037949/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037950/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037951/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037952/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037953/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037954/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037955/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30037960/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038014/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038150/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038176/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038197/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038208/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038633/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038634/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038635/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038636/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038738/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038913/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038945/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038960/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30038988/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30039003/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30039714/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30039715/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30039748/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30040182/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30040815/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041202/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041203/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041386/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041849/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041850/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041853/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041854/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041859/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041866/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041873/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041886/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041901/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30041907/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042788/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042793/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042799/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042803/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042807/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042812/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042816/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042819/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042954/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042955/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042957/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042959/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042961/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042963/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30042965/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043286/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043298/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043311/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043314/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043321/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043327/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043330/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043335/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043343/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043349/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043358/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043557/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043601/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043606/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043782/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043797/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043820/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043846/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043851/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30043879/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30044254/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30044293/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30044481/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30044491/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30045140/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30045632/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30045635/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../30046142/egov-location/boundary-data.json |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30046178/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30046241/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30046274/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30046286/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30046465/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048127/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048267/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048408/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048644/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048673/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048680/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048696/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048776/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048965/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048987/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30048994/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049004/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049048/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049049/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049050/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049081/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049228/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049262/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049278/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049299/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049604/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049608/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049610/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049624/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049625/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049629/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049631/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049632/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049922/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049941/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30049949/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30050030/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30050223/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30050805/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30050939/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30050952/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051014/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051018/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051021/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051023/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051099/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051263/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051272/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051276/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051373/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051391/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051400/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051407/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051492/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051495/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051497/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051501/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051507/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051529/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051562/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051569/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051624/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30051683/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30052428/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30052432/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30052437/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30052518/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30052737/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30052787/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30053173/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30053615/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30053688/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054045/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054048/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054057/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054383/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054393/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054598/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30054601/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055210/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055216/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055275/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055680/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055696/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055718/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055724/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055929/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30055936/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056016/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056027/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056041/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056050/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056072/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056080/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056087/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056104/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056141/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056146/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056407/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056412/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056417/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056425/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056431/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056433/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056435/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056490/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056609/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056640/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056810/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056913/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056918/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30056922/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057164/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057166/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057174/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057288/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057297/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057361/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057363/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057369/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057524/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057641/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057745/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057746/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057748/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057972/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057974/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057979/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057983/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057985/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057989/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30057993/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058019/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058023/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058044/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058047/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058052/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058057/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058109/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058320/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058339/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30058545/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059252/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059318/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059391/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059490/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059492/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059495/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059497/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059500/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059502/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059510/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059517/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30059589/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060114/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060116/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060146/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060151/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060155/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060169/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060173/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060178/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060179/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060206/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060256/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060309/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060313/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060518/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060621/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 1598 files changed, 136470 insertions(+), 12 deletions(-)
 create mode 100644 data/as/30016769/BillingService/BusinessService.json
 create mode 100644 data/as/30016769/egov-location/boundary-data.json
 create mode 100644 data/as/30016769/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016769/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016773/BillingService/BusinessService.json
 create mode 100644 data/as/30016773/egov-location/boundary-data.json
 create mode 100644 data/as/30016773/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016773/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016776/BillingService/BusinessService.json
 create mode 100644 data/as/30016776/egov-location/boundary-data.json
 create mode 100644 data/as/30016776/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016776/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016777/BillingService/BusinessService.json
 create mode 100644 data/as/30016777/egov-location/boundary-data.json
 create mode 100644 data/as/30016777/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016777/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016779/BillingService/BusinessService.json
 create mode 100644 data/as/30016779/egov-location/boundary-data.json
 create mode 100644 data/as/30016779/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016779/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016893/BillingService/BusinessService.json
 create mode 100644 data/as/30016893/egov-location/boundary-data.json
 create mode 100644 data/as/30016893/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016893/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30016917/BillingService/BusinessService.json
 create mode 100644 data/as/30016917/egov-location/boundary-data.json
 create mode 100644 data/as/30016917/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30016917/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017080/BillingService/BusinessService.json
 create mode 100644 data/as/30017080/egov-location/boundary-data.json
 create mode 100644 data/as/30017080/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017080/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017213/BillingService/BusinessService.json
 create mode 100644 data/as/30017213/egov-location/boundary-data.json
 create mode 100644 data/as/30017213/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017213/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017259/BillingService/BusinessService.json
 create mode 100644 data/as/30017259/egov-location/boundary-data.json
 create mode 100644 data/as/30017259/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017259/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017426/BillingService/BusinessService.json
 create mode 100644 data/as/30017426/egov-location/boundary-data.json
 create mode 100644 data/as/30017426/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017426/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017520/BillingService/BusinessService.json
 create mode 100644 data/as/30017520/egov-location/boundary-data.json
 create mode 100644 data/as/30017520/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017520/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017697/BillingService/BusinessService.json
 create mode 100644 data/as/30017697/egov-location/boundary-data.json
 create mode 100644 data/as/30017697/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017697/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017715/BillingService/BusinessService.json
 create mode 100644 data/as/30017715/egov-location/boundary-data.json
 create mode 100644 data/as/30017715/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017715/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017720/BillingService/BusinessService.json
 create mode 100644 data/as/30017720/egov-location/boundary-data.json
 create mode 100644 data/as/30017720/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017720/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017735/BillingService/BusinessService.json
 create mode 100644 data/as/30017735/egov-location/boundary-data.json
 create mode 100644 data/as/30017735/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017735/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017892/BillingService/BusinessService.json
 create mode 100644 data/as/30017892/egov-location/boundary-data.json
 create mode 100644 data/as/30017892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017892/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017895/BillingService/BusinessService.json
 create mode 100644 data/as/30017895/egov-location/boundary-data.json
 create mode 100644 data/as/30017895/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017895/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30017896/BillingService/BusinessService.json
 create mode 100644 data/as/30017896/egov-location/boundary-data.json
 create mode 100644 data/as/30017896/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30017896/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018185/BillingService/BusinessService.json
 create mode 100644 data/as/30018185/egov-location/boundary-data.json
 create mode 100644 data/as/30018185/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018185/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018227/BillingService/BusinessService.json
 create mode 100644 data/as/30018227/egov-location/boundary-data.json
 create mode 100644 data/as/30018227/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018227/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018243/BillingService/BusinessService.json
 create mode 100644 data/as/30018243/egov-location/boundary-data.json
 create mode 100644 data/as/30018243/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018243/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018312/BillingService/BusinessService.json
 create mode 100644 data/as/30018312/egov-location/boundary-data.json
 create mode 100644 data/as/30018312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018441/BillingService/BusinessService.json
 create mode 100644 data/as/30018441/egov-location/boundary-data.json
 create mode 100644 data/as/30018441/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018441/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018712/BillingService/BusinessService.json
 create mode 100644 data/as/30018712/egov-location/boundary-data.json
 create mode 100644 data/as/30018712/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018712/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018720/BillingService/BusinessService.json
 create mode 100644 data/as/30018720/egov-location/boundary-data.json
 create mode 100644 data/as/30018720/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018720/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018721/BillingService/BusinessService.json
 create mode 100644 data/as/30018721/egov-location/boundary-data.json
 create mode 100644 data/as/30018721/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018721/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018738/BillingService/BusinessService.json
 create mode 100644 data/as/30018738/egov-location/boundary-data.json
 create mode 100644 data/as/30018738/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018738/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018739/BillingService/BusinessService.json
 create mode 100644 data/as/30018739/egov-location/boundary-data.json
 create mode 100644 data/as/30018739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018741/BillingService/BusinessService.json
 create mode 100644 data/as/30018741/egov-location/boundary-data.json
 create mode 100644 data/as/30018741/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018741/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018824/BillingService/BusinessService.json
 create mode 100644 data/as/30018824/egov-location/boundary-data.json
 create mode 100644 data/as/30018824/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018824/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018921/BillingService/BusinessService.json
 create mode 100644 data/as/30018921/egov-location/boundary-data.json
 create mode 100644 data/as/30018921/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018921/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018935/BillingService/BusinessService.json
 create mode 100644 data/as/30018935/egov-location/boundary-data.json
 create mode 100644 data/as/30018935/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018935/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30018941/BillingService/BusinessService.json
 create mode 100644 data/as/30018941/egov-location/boundary-data.json
 create mode 100644 data/as/30018941/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30018941/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019121/BillingService/BusinessService.json
 create mode 100644 data/as/30019121/egov-location/boundary-data.json
 create mode 100644 data/as/30019121/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019121/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019130/BillingService/BusinessService.json
 create mode 100644 data/as/30019130/egov-location/boundary-data.json
 create mode 100644 data/as/30019130/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019130/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019135/BillingService/BusinessService.json
 create mode 100644 data/as/30019135/egov-location/boundary-data.json
 create mode 100644 data/as/30019135/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019135/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019139/BillingService/BusinessService.json
 create mode 100644 data/as/30019139/egov-location/boundary-data.json
 create mode 100644 data/as/30019139/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019139/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019144/BillingService/BusinessService.json
 create mode 100644 data/as/30019144/egov-location/boundary-data.json
 create mode 100644 data/as/30019144/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019144/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019151/BillingService/BusinessService.json
 create mode 100644 data/as/30019151/egov-location/boundary-data.json
 create mode 100644 data/as/30019151/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019151/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019154/BillingService/BusinessService.json
 create mode 100644 data/as/30019154/egov-location/boundary-data.json
 create mode 100644 data/as/30019154/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019154/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019163/BillingService/BusinessService.json
 create mode 100644 data/as/30019163/egov-location/boundary-data.json
 create mode 100644 data/as/30019163/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019163/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019166/BillingService/BusinessService.json
 create mode 100644 data/as/30019166/egov-location/boundary-data.json
 create mode 100644 data/as/30019166/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019166/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019168/BillingService/BusinessService.json
 create mode 100644 data/as/30019168/egov-location/boundary-data.json
 create mode 100644 data/as/30019168/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019168/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019170/BillingService/BusinessService.json
 create mode 100644 data/as/30019170/egov-location/boundary-data.json
 create mode 100644 data/as/30019170/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019170/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019171/BillingService/BusinessService.json
 create mode 100644 data/as/30019171/egov-location/boundary-data.json
 create mode 100644 data/as/30019171/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019171/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019173/BillingService/BusinessService.json
 create mode 100644 data/as/30019173/egov-location/boundary-data.json
 create mode 100644 data/as/30019173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019266/BillingService/BusinessService.json
 create mode 100644 data/as/30019266/egov-location/boundary-data.json
 create mode 100644 data/as/30019266/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019266/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019465/BillingService/BusinessService.json
 create mode 100644 data/as/30019465/egov-location/boundary-data.json
 create mode 100644 data/as/30019465/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019465/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019506/BillingService/BusinessService.json
 create mode 100644 data/as/30019506/egov-location/boundary-data.json
 create mode 100644 data/as/30019506/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019506/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019535/BillingService/BusinessService.json
 create mode 100644 data/as/30019535/egov-location/boundary-data.json
 create mode 100644 data/as/30019535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019544/BillingService/BusinessService.json
 create mode 100644 data/as/30019544/egov-location/boundary-data.json
 create mode 100644 data/as/30019544/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019544/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019572/BillingService/BusinessService.json
 create mode 100644 data/as/30019572/egov-location/boundary-data.json
 create mode 100644 data/as/30019572/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019572/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019680/BillingService/BusinessService.json
 create mode 100644 data/as/30019680/egov-location/boundary-data.json
 create mode 100644 data/as/30019680/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019680/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019686/BillingService/BusinessService.json
 create mode 100644 data/as/30019686/egov-location/boundary-data.json
 create mode 100644 data/as/30019686/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019686/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019793/BillingService/BusinessService.json
 create mode 100644 data/as/30019793/egov-location/boundary-data.json
 create mode 100644 data/as/30019793/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019793/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019799/BillingService/BusinessService.json
 create mode 100644 data/as/30019799/egov-location/boundary-data.json
 create mode 100644 data/as/30019799/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019799/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019826/BillingService/BusinessService.json
 create mode 100644 data/as/30019826/egov-location/boundary-data.json
 create mode 100644 data/as/30019826/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019826/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30019832/BillingService/BusinessService.json
 create mode 100644 data/as/30019832/egov-location/boundary-data.json
 create mode 100644 data/as/30019832/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30019832/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020076/BillingService/BusinessService.json
 create mode 100644 data/as/30020076/egov-location/boundary-data.json
 create mode 100644 data/as/30020076/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020076/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020201/BillingService/BusinessService.json
 create mode 100644 data/as/30020201/egov-location/boundary-data.json
 create mode 100644 data/as/30020201/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020201/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020202/BillingService/BusinessService.json
 create mode 100644 data/as/30020202/egov-location/boundary-data.json
 create mode 100644 data/as/30020202/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020202/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020369/BillingService/BusinessService.json
 create mode 100644 data/as/30020369/egov-location/boundary-data.json
 create mode 100644 data/as/30020369/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020369/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020383/BillingService/BusinessService.json
 create mode 100644 data/as/30020383/egov-location/boundary-data.json
 create mode 100644 data/as/30020383/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020383/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020502/BillingService/BusinessService.json
 create mode 100644 data/as/30020502/egov-location/boundary-data.json
 create mode 100644 data/as/30020502/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020502/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020635/BillingService/BusinessService.json
 create mode 100644 data/as/30020635/egov-location/boundary-data.json
 create mode 100644 data/as/30020635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020637/BillingService/BusinessService.json
 create mode 100644 data/as/30020637/egov-location/boundary-data.json
 create mode 100644 data/as/30020637/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020637/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020760/BillingService/BusinessService.json
 create mode 100644 data/as/30020760/egov-location/boundary-data.json
 create mode 100644 data/as/30020760/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020760/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020766/BillingService/BusinessService.json
 create mode 100644 data/as/30020766/egov-location/boundary-data.json
 create mode 100644 data/as/30020766/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020766/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020777/BillingService/BusinessService.json
 create mode 100644 data/as/30020777/egov-location/boundary-data.json
 create mode 100644 data/as/30020777/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020777/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30020972/BillingService/BusinessService.json
 create mode 100644 data/as/30020972/egov-location/boundary-data.json
 create mode 100644 data/as/30020972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30020972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30021055/BillingService/BusinessService.json
 create mode 100644 data/as/30021055/egov-location/boundary-data.json
 create mode 100644 data/as/30021055/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30021055/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30021475/BillingService/BusinessService.json
 create mode 100644 data/as/30021475/egov-location/boundary-data.json
 create mode 100644 data/as/30021475/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30021475/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30021482/BillingService/BusinessService.json
 create mode 100644 data/as/30021482/egov-location/boundary-data.json
 create mode 100644 data/as/30021482/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30021482/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30021560/BillingService/BusinessService.json
 create mode 100644 data/as/30021560/egov-location/boundary-data.json
 create mode 100644 data/as/30021560/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30021560/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30021973/BillingService/BusinessService.json
 create mode 100644 data/as/30021973/egov-location/boundary-data.json
 create mode 100644 data/as/30021973/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30021973/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30021987/BillingService/BusinessService.json
 create mode 100644 data/as/30021987/egov-location/boundary-data.json
 create mode 100644 data/as/30021987/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30021987/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022258/BillingService/BusinessService.json
 create mode 100644 data/as/30022258/egov-location/boundary-data.json
 create mode 100644 data/as/30022258/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022258/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022299/BillingService/BusinessService.json
 create mode 100644 data/as/30022299/egov-location/boundary-data.json
 create mode 100644 data/as/30022299/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022299/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022418/BillingService/BusinessService.json
 create mode 100644 data/as/30022418/egov-location/boundary-data.json
 create mode 100644 data/as/30022418/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022418/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022523/BillingService/BusinessService.json
 create mode 100644 data/as/30022523/egov-location/boundary-data.json
 create mode 100644 data/as/30022523/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022523/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022537/BillingService/BusinessService.json
 create mode 100644 data/as/30022537/egov-location/boundary-data.json
 create mode 100644 data/as/30022537/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022537/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022693/BillingService/BusinessService.json
 create mode 100644 data/as/30022693/egov-location/boundary-data.json
 create mode 100644 data/as/30022693/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022693/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022702/BillingService/BusinessService.json
 create mode 100644 data/as/30022702/egov-location/boundary-data.json
 create mode 100644 data/as/30022702/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022702/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022721/BillingService/BusinessService.json
 create mode 100644 data/as/30022721/egov-location/boundary-data.json
 create mode 100644 data/as/30022721/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022721/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022760/BillingService/BusinessService.json
 create mode 100644 data/as/30022760/egov-location/boundary-data.json
 create mode 100644 data/as/30022760/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022760/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022777/BillingService/BusinessService.json
 create mode 100644 data/as/30022777/egov-location/boundary-data.json
 create mode 100644 data/as/30022777/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022777/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022787/BillingService/BusinessService.json
 create mode 100644 data/as/30022787/egov-location/boundary-data.json
 create mode 100644 data/as/30022787/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022787/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022800/BillingService/BusinessService.json
 create mode 100644 data/as/30022800/egov-location/boundary-data.json
 create mode 100644 data/as/30022800/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022800/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022816/BillingService/BusinessService.json
 create mode 100644 data/as/30022816/egov-location/boundary-data.json
 create mode 100644 data/as/30022816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022851/BillingService/BusinessService.json
 create mode 100644 data/as/30022851/egov-location/boundary-data.json
 create mode 100644 data/as/30022851/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022851/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022854/BillingService/BusinessService.json
 create mode 100644 data/as/30022854/egov-location/boundary-data.json
 create mode 100644 data/as/30022854/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022854/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022858/BillingService/BusinessService.json
 create mode 100644 data/as/30022858/egov-location/boundary-data.json
 create mode 100644 data/as/30022858/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022858/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022862/BillingService/BusinessService.json
 create mode 100644 data/as/30022862/egov-location/boundary-data.json
 create mode 100644 data/as/30022862/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022862/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022947/BillingService/BusinessService.json
 create mode 100644 data/as/30022947/egov-location/boundary-data.json
 create mode 100644 data/as/30022947/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022947/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022975/BillingService/BusinessService.json
 create mode 100644 data/as/30022975/egov-location/boundary-data.json
 create mode 100644 data/as/30022975/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022975/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30022986/BillingService/BusinessService.json
 create mode 100644 data/as/30022986/egov-location/boundary-data.json
 create mode 100644 data/as/30022986/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30022986/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023075/BillingService/BusinessService.json
 create mode 100644 data/as/30023075/egov-location/boundary-data.json
 create mode 100644 data/as/30023075/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023075/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023084/BillingService/BusinessService.json
 create mode 100644 data/as/30023084/egov-location/boundary-data.json
 create mode 100644 data/as/30023084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023147/BillingService/BusinessService.json
 create mode 100644 data/as/30023147/egov-location/boundary-data.json
 create mode 100644 data/as/30023147/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023147/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023196/BillingService/BusinessService.json
 create mode 100644 data/as/30023196/egov-location/boundary-data.json
 create mode 100644 data/as/30023196/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023196/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023283/BillingService/BusinessService.json
 create mode 100644 data/as/30023283/egov-location/boundary-data.json
 create mode 100644 data/as/30023283/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023283/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023298/BillingService/BusinessService.json
 create mode 100644 data/as/30023298/egov-location/boundary-data.json
 create mode 100644 data/as/30023298/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023298/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023308/BillingService/BusinessService.json
 create mode 100644 data/as/30023308/egov-location/boundary-data.json
 create mode 100644 data/as/30023308/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023308/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023317/BillingService/BusinessService.json
 create mode 100644 data/as/30023317/egov-location/boundary-data.json
 create mode 100644 data/as/30023317/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023317/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023324/BillingService/BusinessService.json
 create mode 100644 data/as/30023324/egov-location/boundary-data.json
 create mode 100644 data/as/30023324/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023324/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023337/BillingService/BusinessService.json
 create mode 100644 data/as/30023337/egov-location/boundary-data.json
 create mode 100644 data/as/30023337/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023337/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023347/BillingService/BusinessService.json
 create mode 100644 data/as/30023347/egov-location/boundary-data.json
 create mode 100644 data/as/30023347/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023347/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023360/BillingService/BusinessService.json
 create mode 100644 data/as/30023360/egov-location/boundary-data.json
 create mode 100644 data/as/30023360/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023360/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023708/BillingService/BusinessService.json
 create mode 100644 data/as/30023708/egov-location/boundary-data.json
 create mode 100644 data/as/30023708/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023708/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023894/BillingService/BusinessService.json
 create mode 100644 data/as/30023894/egov-location/boundary-data.json
 create mode 100644 data/as/30023894/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023894/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023984/BillingService/BusinessService.json
 create mode 100644 data/as/30023984/egov-location/boundary-data.json
 create mode 100644 data/as/30023984/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023984/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30023999/BillingService/BusinessService.json
 create mode 100644 data/as/30023999/egov-location/boundary-data.json
 create mode 100644 data/as/30023999/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30023999/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30027151/BillingService/BusinessService.json
 create mode 100644 data/as/30027151/egov-location/boundary-data.json
 create mode 100644 data/as/30027151/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30027151/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30027153/BillingService/BusinessService.json
 create mode 100644 data/as/30027153/egov-location/boundary-data.json
 create mode 100644 data/as/30027153/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30027153/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30027587/BillingService/BusinessService.json
 create mode 100644 data/as/30027587/egov-location/boundary-data.json
 create mode 100644 data/as/30027587/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30027587/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30027681/BillingService/BusinessService.json
 create mode 100644 data/as/30027681/egov-location/boundary-data.json
 create mode 100644 data/as/30027681/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30027681/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30030288/BillingService/BusinessService.json
 create mode 100644 data/as/30030288/egov-location/boundary-data.json
 create mode 100644 data/as/30030288/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30030288/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30030309/BillingService/BusinessService.json
 create mode 100644 data/as/30030309/egov-location/boundary-data.json
 create mode 100644 data/as/30030309/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30030309/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30030458/BillingService/BusinessService.json
 create mode 100644 data/as/30030458/egov-location/boundary-data.json
 create mode 100644 data/as/30030458/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30030458/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30031382/BillingService/BusinessService.json
 create mode 100644 data/as/30031382/egov-location/boundary-data.json
 create mode 100644 data/as/30031382/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30031382/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30033116/BillingService/BusinessService.json
 create mode 100644 data/as/30033116/egov-location/boundary-data.json
 create mode 100644 data/as/30033116/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30033116/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036349/BillingService/BusinessService.json
 create mode 100644 data/as/30036349/egov-location/boundary-data.json
 create mode 100644 data/as/30036349/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036349/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036685/BillingService/BusinessService.json
 create mode 100644 data/as/30036685/egov-location/boundary-data.json
 create mode 100644 data/as/30036685/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036685/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036696/BillingService/BusinessService.json
 create mode 100644 data/as/30036696/egov-location/boundary-data.json
 create mode 100644 data/as/30036696/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036696/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036706/BillingService/BusinessService.json
 create mode 100644 data/as/30036706/egov-location/boundary-data.json
 create mode 100644 data/as/30036706/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036706/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036712/BillingService/BusinessService.json
 create mode 100644 data/as/30036712/egov-location/boundary-data.json
 create mode 100644 data/as/30036712/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036712/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036747/BillingService/BusinessService.json
 create mode 100644 data/as/30036747/egov-location/boundary-data.json
 create mode 100644 data/as/30036747/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036747/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036796/BillingService/BusinessService.json
 create mode 100644 data/as/30036796/egov-location/boundary-data.json
 create mode 100644 data/as/30036796/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036796/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036799/BillingService/BusinessService.json
 create mode 100644 data/as/30036799/egov-location/boundary-data.json
 create mode 100644 data/as/30036799/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036799/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30036923/BillingService/BusinessService.json
 create mode 100644 data/as/30036923/egov-location/boundary-data.json
 create mode 100644 data/as/30036923/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30036923/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037050/BillingService/BusinessService.json
 create mode 100644 data/as/30037050/egov-location/boundary-data.json
 create mode 100644 data/as/30037050/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037050/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037052/BillingService/BusinessService.json
 create mode 100644 data/as/30037052/egov-location/boundary-data.json
 create mode 100644 data/as/30037052/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037052/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037053/BillingService/BusinessService.json
 create mode 100644 data/as/30037053/egov-location/boundary-data.json
 create mode 100644 data/as/30037053/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037053/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037055/BillingService/BusinessService.json
 create mode 100644 data/as/30037055/egov-location/boundary-data.json
 create mode 100644 data/as/30037055/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037055/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037056/BillingService/BusinessService.json
 create mode 100644 data/as/30037056/egov-location/boundary-data.json
 create mode 100644 data/as/30037056/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037056/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037057/BillingService/BusinessService.json
 create mode 100644 data/as/30037057/egov-location/boundary-data.json
 create mode 100644 data/as/30037057/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037057/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037058/BillingService/BusinessService.json
 create mode 100644 data/as/30037058/egov-location/boundary-data.json
 create mode 100644 data/as/30037058/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037058/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037282/BillingService/BusinessService.json
 create mode 100644 data/as/30037282/egov-location/boundary-data.json
 create mode 100644 data/as/30037282/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037282/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037284/BillingService/BusinessService.json
 create mode 100644 data/as/30037284/egov-location/boundary-data.json
 create mode 100644 data/as/30037284/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037284/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037286/BillingService/BusinessService.json
 create mode 100644 data/as/30037286/egov-location/boundary-data.json
 create mode 100644 data/as/30037286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037287/BillingService/BusinessService.json
 create mode 100644 data/as/30037287/egov-location/boundary-data.json
 create mode 100644 data/as/30037287/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037287/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037289/BillingService/BusinessService.json
 create mode 100644 data/as/30037289/egov-location/boundary-data.json
 create mode 100644 data/as/30037289/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037289/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037516/BillingService/BusinessService.json
 create mode 100644 data/as/30037516/egov-location/boundary-data.json
 create mode 100644 data/as/30037516/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037516/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037943/BillingService/BusinessService.json
 create mode 100644 data/as/30037943/egov-location/boundary-data.json
 create mode 100644 data/as/30037943/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037943/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037947/BillingService/BusinessService.json
 create mode 100644 data/as/30037947/egov-location/boundary-data.json
 create mode 100644 data/as/30037947/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037947/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037948/BillingService/BusinessService.json
 create mode 100644 data/as/30037948/egov-location/boundary-data.json
 create mode 100644 data/as/30037948/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037948/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037949/BillingService/BusinessService.json
 create mode 100644 data/as/30037949/egov-location/boundary-data.json
 create mode 100644 data/as/30037949/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037949/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037950/BillingService/BusinessService.json
 create mode 100644 data/as/30037950/egov-location/boundary-data.json
 create mode 100644 data/as/30037950/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037950/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037951/BillingService/BusinessService.json
 create mode 100644 data/as/30037951/egov-location/boundary-data.json
 create mode 100644 data/as/30037951/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037951/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037952/BillingService/BusinessService.json
 create mode 100644 data/as/30037952/egov-location/boundary-data.json
 create mode 100644 data/as/30037952/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037952/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037953/BillingService/BusinessService.json
 create mode 100644 data/as/30037953/egov-location/boundary-data.json
 create mode 100644 data/as/30037953/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037953/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037954/BillingService/BusinessService.json
 create mode 100644 data/as/30037954/egov-location/boundary-data.json
 create mode 100644 data/as/30037954/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037954/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037955/BillingService/BusinessService.json
 create mode 100644 data/as/30037955/egov-location/boundary-data.json
 create mode 100644 data/as/30037955/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037955/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30037960/BillingService/BusinessService.json
 create mode 100644 data/as/30037960/egov-location/boundary-data.json
 create mode 100644 data/as/30037960/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30037960/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038014/BillingService/BusinessService.json
 create mode 100644 data/as/30038014/egov-location/boundary-data.json
 create mode 100644 data/as/30038014/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038014/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038150/BillingService/BusinessService.json
 create mode 100644 data/as/30038150/egov-location/boundary-data.json
 create mode 100644 data/as/30038150/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038150/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038176/BillingService/BusinessService.json
 create mode 100644 data/as/30038176/egov-location/boundary-data.json
 create mode 100644 data/as/30038176/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038176/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038197/BillingService/BusinessService.json
 create mode 100644 data/as/30038197/egov-location/boundary-data.json
 create mode 100644 data/as/30038197/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038197/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038208/BillingService/BusinessService.json
 create mode 100644 data/as/30038208/egov-location/boundary-data.json
 create mode 100644 data/as/30038208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038633/BillingService/BusinessService.json
 create mode 100644 data/as/30038633/egov-location/boundary-data.json
 create mode 100644 data/as/30038633/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038633/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038634/BillingService/BusinessService.json
 create mode 100644 data/as/30038634/egov-location/boundary-data.json
 create mode 100644 data/as/30038634/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038634/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038635/BillingService/BusinessService.json
 create mode 100644 data/as/30038635/egov-location/boundary-data.json
 create mode 100644 data/as/30038635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038636/BillingService/BusinessService.json
 create mode 100644 data/as/30038636/egov-location/boundary-data.json
 create mode 100644 data/as/30038636/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038636/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038738/BillingService/BusinessService.json
 create mode 100644 data/as/30038738/egov-location/boundary-data.json
 create mode 100644 data/as/30038738/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038738/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038913/BillingService/BusinessService.json
 create mode 100644 data/as/30038913/egov-location/boundary-data.json
 create mode 100644 data/as/30038913/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038913/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038945/BillingService/BusinessService.json
 create mode 100644 data/as/30038945/egov-location/boundary-data.json
 create mode 100644 data/as/30038945/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038945/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038960/BillingService/BusinessService.json
 create mode 100644 data/as/30038960/egov-location/boundary-data.json
 create mode 100644 data/as/30038960/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038960/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30038988/BillingService/BusinessService.json
 create mode 100644 data/as/30038988/egov-location/boundary-data.json
 create mode 100644 data/as/30038988/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30038988/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30039003/BillingService/BusinessService.json
 create mode 100644 data/as/30039003/egov-location/boundary-data.json
 create mode 100644 data/as/30039003/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30039003/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30039714/BillingService/BusinessService.json
 create mode 100644 data/as/30039714/egov-location/boundary-data.json
 create mode 100644 data/as/30039714/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30039714/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30039715/BillingService/BusinessService.json
 create mode 100644 data/as/30039715/egov-location/boundary-data.json
 create mode 100644 data/as/30039715/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30039715/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30039748/BillingService/BusinessService.json
 create mode 100644 data/as/30039748/egov-location/boundary-data.json
 create mode 100644 data/as/30039748/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30039748/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30040182/BillingService/BusinessService.json
 create mode 100644 data/as/30040182/egov-location/boundary-data.json
 create mode 100644 data/as/30040182/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30040182/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30040815/BillingService/BusinessService.json
 create mode 100644 data/as/30040815/egov-location/boundary-data.json
 create mode 100644 data/as/30040815/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30040815/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041202/BillingService/BusinessService.json
 create mode 100644 data/as/30041202/egov-location/boundary-data.json
 create mode 100644 data/as/30041202/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041202/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041203/BillingService/BusinessService.json
 create mode 100644 data/as/30041203/egov-location/boundary-data.json
 create mode 100644 data/as/30041203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041386/BillingService/BusinessService.json
 create mode 100644 data/as/30041386/egov-location/boundary-data.json
 create mode 100644 data/as/30041386/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041386/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041849/BillingService/BusinessService.json
 create mode 100644 data/as/30041849/egov-location/boundary-data.json
 create mode 100644 data/as/30041849/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041849/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041850/BillingService/BusinessService.json
 create mode 100644 data/as/30041850/egov-location/boundary-data.json
 create mode 100644 data/as/30041850/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041850/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041853/BillingService/BusinessService.json
 create mode 100644 data/as/30041853/egov-location/boundary-data.json
 create mode 100644 data/as/30041853/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041853/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041854/BillingService/BusinessService.json
 create mode 100644 data/as/30041854/egov-location/boundary-data.json
 create mode 100644 data/as/30041854/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041854/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041859/BillingService/BusinessService.json
 create mode 100644 data/as/30041859/egov-location/boundary-data.json
 create mode 100644 data/as/30041859/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041859/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041866/BillingService/BusinessService.json
 create mode 100644 data/as/30041866/egov-location/boundary-data.json
 create mode 100644 data/as/30041866/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041866/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041873/BillingService/BusinessService.json
 create mode 100644 data/as/30041873/egov-location/boundary-data.json
 create mode 100644 data/as/30041873/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041873/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041886/BillingService/BusinessService.json
 create mode 100644 data/as/30041886/egov-location/boundary-data.json
 create mode 100644 data/as/30041886/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041886/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041901/BillingService/BusinessService.json
 create mode 100644 data/as/30041901/egov-location/boundary-data.json
 create mode 100644 data/as/30041901/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041901/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30041907/BillingService/BusinessService.json
 create mode 100644 data/as/30041907/egov-location/boundary-data.json
 create mode 100644 data/as/30041907/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30041907/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042788/BillingService/BusinessService.json
 create mode 100644 data/as/30042788/egov-location/boundary-data.json
 create mode 100644 data/as/30042788/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042788/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042793/BillingService/BusinessService.json
 create mode 100644 data/as/30042793/egov-location/boundary-data.json
 create mode 100644 data/as/30042793/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042793/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042799/BillingService/BusinessService.json
 create mode 100644 data/as/30042799/egov-location/boundary-data.json
 create mode 100644 data/as/30042799/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042799/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042803/BillingService/BusinessService.json
 create mode 100644 data/as/30042803/egov-location/boundary-data.json
 create mode 100644 data/as/30042803/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042803/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042807/BillingService/BusinessService.json
 create mode 100644 data/as/30042807/egov-location/boundary-data.json
 create mode 100644 data/as/30042807/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042807/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042812/BillingService/BusinessService.json
 create mode 100644 data/as/30042812/egov-location/boundary-data.json
 create mode 100644 data/as/30042812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042816/BillingService/BusinessService.json
 create mode 100644 data/as/30042816/egov-location/boundary-data.json
 create mode 100644 data/as/30042816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042819/BillingService/BusinessService.json
 create mode 100644 data/as/30042819/egov-location/boundary-data.json
 create mode 100644 data/as/30042819/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042819/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042954/BillingService/BusinessService.json
 create mode 100644 data/as/30042954/egov-location/boundary-data.json
 create mode 100644 data/as/30042954/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042954/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042955/BillingService/BusinessService.json
 create mode 100644 data/as/30042955/egov-location/boundary-data.json
 create mode 100644 data/as/30042955/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042955/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042957/BillingService/BusinessService.json
 create mode 100644 data/as/30042957/egov-location/boundary-data.json
 create mode 100644 data/as/30042957/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042957/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042959/BillingService/BusinessService.json
 create mode 100644 data/as/30042959/egov-location/boundary-data.json
 create mode 100644 data/as/30042959/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042959/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042961/BillingService/BusinessService.json
 create mode 100644 data/as/30042961/egov-location/boundary-data.json
 create mode 100644 data/as/30042961/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042961/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042963/BillingService/BusinessService.json
 create mode 100644 data/as/30042963/egov-location/boundary-data.json
 create mode 100644 data/as/30042963/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042963/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30042965/BillingService/BusinessService.json
 create mode 100644 data/as/30042965/egov-location/boundary-data.json
 create mode 100644 data/as/30042965/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30042965/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043286/BillingService/BusinessService.json
 create mode 100644 data/as/30043286/egov-location/boundary-data.json
 create mode 100644 data/as/30043286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043298/BillingService/BusinessService.json
 create mode 100644 data/as/30043298/egov-location/boundary-data.json
 create mode 100644 data/as/30043298/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043298/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043311/BillingService/BusinessService.json
 create mode 100644 data/as/30043311/egov-location/boundary-data.json
 create mode 100644 data/as/30043311/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043311/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043314/BillingService/BusinessService.json
 create mode 100644 data/as/30043314/egov-location/boundary-data.json
 create mode 100644 data/as/30043314/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043314/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043321/BillingService/BusinessService.json
 create mode 100644 data/as/30043321/egov-location/boundary-data.json
 create mode 100644 data/as/30043321/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043321/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043327/BillingService/BusinessService.json
 create mode 100644 data/as/30043327/egov-location/boundary-data.json
 create mode 100644 data/as/30043327/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043327/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043330/BillingService/BusinessService.json
 create mode 100644 data/as/30043330/egov-location/boundary-data.json
 create mode 100644 data/as/30043330/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043330/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043335/BillingService/BusinessService.json
 create mode 100644 data/as/30043335/egov-location/boundary-data.json
 create mode 100644 data/as/30043335/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043335/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043343/BillingService/BusinessService.json
 create mode 100644 data/as/30043343/egov-location/boundary-data.json
 create mode 100644 data/as/30043343/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043343/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043349/BillingService/BusinessService.json
 create mode 100644 data/as/30043349/egov-location/boundary-data.json
 create mode 100644 data/as/30043349/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043349/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043358/BillingService/BusinessService.json
 create mode 100644 data/as/30043358/egov-location/boundary-data.json
 create mode 100644 data/as/30043358/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043358/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043557/BillingService/BusinessService.json
 create mode 100644 data/as/30043557/egov-location/boundary-data.json
 create mode 100644 data/as/30043557/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043557/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043601/BillingService/BusinessService.json
 create mode 100644 data/as/30043601/egov-location/boundary-data.json
 create mode 100644 data/as/30043601/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043601/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043606/BillingService/BusinessService.json
 create mode 100644 data/as/30043606/egov-location/boundary-data.json
 create mode 100644 data/as/30043606/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043606/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043782/BillingService/BusinessService.json
 create mode 100644 data/as/30043782/egov-location/boundary-data.json
 create mode 100644 data/as/30043782/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043782/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043797/BillingService/BusinessService.json
 create mode 100644 data/as/30043797/egov-location/boundary-data.json
 create mode 100644 data/as/30043797/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043797/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043820/BillingService/BusinessService.json
 create mode 100644 data/as/30043820/egov-location/boundary-data.json
 create mode 100644 data/as/30043820/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043820/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043846/BillingService/BusinessService.json
 create mode 100644 data/as/30043846/egov-location/boundary-data.json
 create mode 100644 data/as/30043846/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043846/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043851/BillingService/BusinessService.json
 create mode 100644 data/as/30043851/egov-location/boundary-data.json
 create mode 100644 data/as/30043851/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043851/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30043879/BillingService/BusinessService.json
 create mode 100644 data/as/30043879/egov-location/boundary-data.json
 create mode 100644 data/as/30043879/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30043879/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30044254/BillingService/BusinessService.json
 create mode 100644 data/as/30044254/egov-location/boundary-data.json
 create mode 100644 data/as/30044254/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30044254/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30044293/BillingService/BusinessService.json
 create mode 100644 data/as/30044293/egov-location/boundary-data.json
 create mode 100644 data/as/30044293/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30044293/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30044481/BillingService/BusinessService.json
 create mode 100644 data/as/30044481/egov-location/boundary-data.json
 create mode 100644 data/as/30044481/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30044481/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30044491/BillingService/BusinessService.json
 create mode 100644 data/as/30044491/egov-location/boundary-data.json
 create mode 100644 data/as/30044491/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30044491/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30045140/BillingService/BusinessService.json
 create mode 100644 data/as/30045140/egov-location/boundary-data.json
 create mode 100644 data/as/30045140/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30045140/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30045632/BillingService/BusinessService.json
 create mode 100644 data/as/30045632/egov-location/boundary-data.json
 create mode 100644 data/as/30045632/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30045632/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30045635/BillingService/BusinessService.json
 create mode 100644 data/as/30045635/egov-location/boundary-data.json
 create mode 100644 data/as/30045635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30045635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30046178/BillingService/BusinessService.json
 create mode 100644 data/as/30046178/egov-location/boundary-data.json
 create mode 100644 data/as/30046178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30046178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30046241/BillingService/BusinessService.json
 create mode 100644 data/as/30046241/egov-location/boundary-data.json
 create mode 100644 data/as/30046241/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30046241/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30046274/BillingService/BusinessService.json
 create mode 100644 data/as/30046274/egov-location/boundary-data.json
 create mode 100644 data/as/30046274/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30046274/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30046286/BillingService/BusinessService.json
 create mode 100644 data/as/30046286/egov-location/boundary-data.json
 create mode 100644 data/as/30046286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30046286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30046465/BillingService/BusinessService.json
 create mode 100644 data/as/30046465/egov-location/boundary-data.json
 create mode 100644 data/as/30046465/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30046465/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048127/BillingService/BusinessService.json
 create mode 100644 data/as/30048127/egov-location/boundary-data.json
 create mode 100644 data/as/30048127/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048127/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048267/BillingService/BusinessService.json
 create mode 100644 data/as/30048267/egov-location/boundary-data.json
 create mode 100644 data/as/30048267/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048267/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048408/BillingService/BusinessService.json
 create mode 100644 data/as/30048408/egov-location/boundary-data.json
 create mode 100644 data/as/30048408/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048408/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048644/BillingService/BusinessService.json
 create mode 100644 data/as/30048644/egov-location/boundary-data.json
 create mode 100644 data/as/30048644/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048644/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048673/BillingService/BusinessService.json
 create mode 100644 data/as/30048673/egov-location/boundary-data.json
 create mode 100644 data/as/30048673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048680/BillingService/BusinessService.json
 create mode 100644 data/as/30048680/egov-location/boundary-data.json
 create mode 100644 data/as/30048680/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048680/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048696/BillingService/BusinessService.json
 create mode 100644 data/as/30048696/egov-location/boundary-data.json
 create mode 100644 data/as/30048696/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048696/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048776/BillingService/BusinessService.json
 create mode 100644 data/as/30048776/egov-location/boundary-data.json
 create mode 100644 data/as/30048776/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048776/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048965/BillingService/BusinessService.json
 create mode 100644 data/as/30048965/egov-location/boundary-data.json
 create mode 100644 data/as/30048965/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048965/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048987/BillingService/BusinessService.json
 create mode 100644 data/as/30048987/egov-location/boundary-data.json
 create mode 100644 data/as/30048987/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048987/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30048994/BillingService/BusinessService.json
 create mode 100644 data/as/30048994/egov-location/boundary-data.json
 create mode 100644 data/as/30048994/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30048994/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049004/BillingService/BusinessService.json
 create mode 100644 data/as/30049004/egov-location/boundary-data.json
 create mode 100644 data/as/30049004/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049004/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049048/BillingService/BusinessService.json
 create mode 100644 data/as/30049048/egov-location/boundary-data.json
 create mode 100644 data/as/30049048/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049048/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049049/BillingService/BusinessService.json
 create mode 100644 data/as/30049049/egov-location/boundary-data.json
 create mode 100644 data/as/30049049/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049049/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049050/BillingService/BusinessService.json
 create mode 100644 data/as/30049050/egov-location/boundary-data.json
 create mode 100644 data/as/30049050/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049050/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049081/BillingService/BusinessService.json
 create mode 100644 data/as/30049081/egov-location/boundary-data.json
 create mode 100644 data/as/30049081/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049081/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049228/BillingService/BusinessService.json
 create mode 100644 data/as/30049228/egov-location/boundary-data.json
 create mode 100644 data/as/30049228/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049228/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049262/BillingService/BusinessService.json
 create mode 100644 data/as/30049262/egov-location/boundary-data.json
 create mode 100644 data/as/30049262/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049262/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049278/BillingService/BusinessService.json
 create mode 100644 data/as/30049278/egov-location/boundary-data.json
 create mode 100644 data/as/30049278/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049278/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049299/BillingService/BusinessService.json
 create mode 100644 data/as/30049299/egov-location/boundary-data.json
 create mode 100644 data/as/30049299/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049299/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049604/BillingService/BusinessService.json
 create mode 100644 data/as/30049604/egov-location/boundary-data.json
 create mode 100644 data/as/30049604/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049604/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049608/BillingService/BusinessService.json
 create mode 100644 data/as/30049608/egov-location/boundary-data.json
 create mode 100644 data/as/30049608/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049608/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049610/BillingService/BusinessService.json
 create mode 100644 data/as/30049610/egov-location/boundary-data.json
 create mode 100644 data/as/30049610/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049610/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049624/BillingService/BusinessService.json
 create mode 100644 data/as/30049624/egov-location/boundary-data.json
 create mode 100644 data/as/30049624/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049624/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049625/BillingService/BusinessService.json
 create mode 100644 data/as/30049625/egov-location/boundary-data.json
 create mode 100644 data/as/30049625/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049625/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049629/BillingService/BusinessService.json
 create mode 100644 data/as/30049629/egov-location/boundary-data.json
 create mode 100644 data/as/30049629/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049629/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049631/BillingService/BusinessService.json
 create mode 100644 data/as/30049631/egov-location/boundary-data.json
 create mode 100644 data/as/30049631/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049631/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049632/BillingService/BusinessService.json
 create mode 100644 data/as/30049632/egov-location/boundary-data.json
 create mode 100644 data/as/30049632/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049632/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049922/BillingService/BusinessService.json
 create mode 100644 data/as/30049922/egov-location/boundary-data.json
 create mode 100644 data/as/30049922/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049922/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049941/BillingService/BusinessService.json
 create mode 100644 data/as/30049941/egov-location/boundary-data.json
 create mode 100644 data/as/30049941/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049941/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30049949/BillingService/BusinessService.json
 create mode 100644 data/as/30049949/egov-location/boundary-data.json
 create mode 100644 data/as/30049949/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30049949/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30050030/BillingService/BusinessService.json
 create mode 100644 data/as/30050030/egov-location/boundary-data.json
 create mode 100644 data/as/30050030/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30050030/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30050223/BillingService/BusinessService.json
 create mode 100644 data/as/30050223/egov-location/boundary-data.json
 create mode 100644 data/as/30050223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30050223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30050805/BillingService/BusinessService.json
 create mode 100644 data/as/30050805/egov-location/boundary-data.json
 create mode 100644 data/as/30050805/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30050805/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30050939/BillingService/BusinessService.json
 create mode 100644 data/as/30050939/egov-location/boundary-data.json
 create mode 100644 data/as/30050939/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30050939/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30050952/BillingService/BusinessService.json
 create mode 100644 data/as/30050952/egov-location/boundary-data.json
 create mode 100644 data/as/30050952/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30050952/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051014/BillingService/BusinessService.json
 create mode 100644 data/as/30051014/egov-location/boundary-data.json
 create mode 100644 data/as/30051014/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051014/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051018/BillingService/BusinessService.json
 create mode 100644 data/as/30051018/egov-location/boundary-data.json
 create mode 100644 data/as/30051018/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051018/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051021/BillingService/BusinessService.json
 create mode 100644 data/as/30051021/egov-location/boundary-data.json
 create mode 100644 data/as/30051021/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051021/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051023/BillingService/BusinessService.json
 create mode 100644 data/as/30051023/egov-location/boundary-data.json
 create mode 100644 data/as/30051023/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051023/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051099/BillingService/BusinessService.json
 create mode 100644 data/as/30051099/egov-location/boundary-data.json
 create mode 100644 data/as/30051099/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051099/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051263/BillingService/BusinessService.json
 create mode 100644 data/as/30051263/egov-location/boundary-data.json
 create mode 100644 data/as/30051263/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051263/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051272/BillingService/BusinessService.json
 create mode 100644 data/as/30051272/egov-location/boundary-data.json
 create mode 100644 data/as/30051272/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051272/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051276/BillingService/BusinessService.json
 create mode 100644 data/as/30051276/egov-location/boundary-data.json
 create mode 100644 data/as/30051276/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051276/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051373/BillingService/BusinessService.json
 create mode 100644 data/as/30051373/egov-location/boundary-data.json
 create mode 100644 data/as/30051373/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051373/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051391/BillingService/BusinessService.json
 create mode 100644 data/as/30051391/egov-location/boundary-data.json
 create mode 100644 data/as/30051391/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051391/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051400/BillingService/BusinessService.json
 create mode 100644 data/as/30051400/egov-location/boundary-data.json
 create mode 100644 data/as/30051400/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051400/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051407/BillingService/BusinessService.json
 create mode 100644 data/as/30051407/egov-location/boundary-data.json
 create mode 100644 data/as/30051407/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051407/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051492/BillingService/BusinessService.json
 create mode 100644 data/as/30051492/egov-location/boundary-data.json
 create mode 100644 data/as/30051492/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051492/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051495/BillingService/BusinessService.json
 create mode 100644 data/as/30051495/egov-location/boundary-data.json
 create mode 100644 data/as/30051495/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051495/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051497/BillingService/BusinessService.json
 create mode 100644 data/as/30051497/egov-location/boundary-data.json
 create mode 100644 data/as/30051497/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051497/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051501/BillingService/BusinessService.json
 create mode 100644 data/as/30051501/egov-location/boundary-data.json
 create mode 100644 data/as/30051501/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051501/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051507/BillingService/BusinessService.json
 create mode 100644 data/as/30051507/egov-location/boundary-data.json
 create mode 100644 data/as/30051507/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051507/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051529/BillingService/BusinessService.json
 create mode 100644 data/as/30051529/egov-location/boundary-data.json
 create mode 100644 data/as/30051529/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051529/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051562/BillingService/BusinessService.json
 create mode 100644 data/as/30051562/egov-location/boundary-data.json
 create mode 100644 data/as/30051562/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051562/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051569/BillingService/BusinessService.json
 create mode 100644 data/as/30051569/egov-location/boundary-data.json
 create mode 100644 data/as/30051569/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051569/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051624/BillingService/BusinessService.json
 create mode 100644 data/as/30051624/egov-location/boundary-data.json
 create mode 100644 data/as/30051624/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051624/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30051683/BillingService/BusinessService.json
 create mode 100644 data/as/30051683/egov-location/boundary-data.json
 create mode 100644 data/as/30051683/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30051683/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30052428/BillingService/BusinessService.json
 create mode 100644 data/as/30052428/egov-location/boundary-data.json
 create mode 100644 data/as/30052428/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30052428/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30052432/BillingService/BusinessService.json
 create mode 100644 data/as/30052432/egov-location/boundary-data.json
 create mode 100644 data/as/30052432/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30052432/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30052437/BillingService/BusinessService.json
 create mode 100644 data/as/30052437/egov-location/boundary-data.json
 create mode 100644 data/as/30052437/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30052437/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30052518/BillingService/BusinessService.json
 create mode 100644 data/as/30052518/egov-location/boundary-data.json
 create mode 100644 data/as/30052518/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30052518/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30052737/BillingService/BusinessService.json
 create mode 100644 data/as/30052737/egov-location/boundary-data.json
 create mode 100644 data/as/30052737/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30052737/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30052787/BillingService/BusinessService.json
 create mode 100644 data/as/30052787/egov-location/boundary-data.json
 create mode 100644 data/as/30052787/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30052787/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30053173/BillingService/BusinessService.json
 create mode 100644 data/as/30053173/egov-location/boundary-data.json
 create mode 100644 data/as/30053173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30053173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30053615/BillingService/BusinessService.json
 create mode 100644 data/as/30053615/egov-location/boundary-data.json
 create mode 100644 data/as/30053615/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30053615/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30053688/BillingService/BusinessService.json
 create mode 100644 data/as/30053688/egov-location/boundary-data.json
 create mode 100644 data/as/30053688/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30053688/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054045/BillingService/BusinessService.json
 create mode 100644 data/as/30054045/egov-location/boundary-data.json
 create mode 100644 data/as/30054045/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054045/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054048/BillingService/BusinessService.json
 create mode 100644 data/as/30054048/egov-location/boundary-data.json
 create mode 100644 data/as/30054048/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054048/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054057/BillingService/BusinessService.json
 create mode 100644 data/as/30054057/egov-location/boundary-data.json
 create mode 100644 data/as/30054057/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054057/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054383/BillingService/BusinessService.json
 create mode 100644 data/as/30054383/egov-location/boundary-data.json
 create mode 100644 data/as/30054383/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054383/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054393/BillingService/BusinessService.json
 create mode 100644 data/as/30054393/egov-location/boundary-data.json
 create mode 100644 data/as/30054393/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054393/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054598/BillingService/BusinessService.json
 create mode 100644 data/as/30054598/egov-location/boundary-data.json
 create mode 100644 data/as/30054598/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054598/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30054601/BillingService/BusinessService.json
 create mode 100644 data/as/30054601/egov-location/boundary-data.json
 create mode 100644 data/as/30054601/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30054601/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055210/BillingService/BusinessService.json
 create mode 100644 data/as/30055210/egov-location/boundary-data.json
 create mode 100644 data/as/30055210/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055210/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055216/BillingService/BusinessService.json
 create mode 100644 data/as/30055216/egov-location/boundary-data.json
 create mode 100644 data/as/30055216/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055216/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055275/BillingService/BusinessService.json
 create mode 100644 data/as/30055275/egov-location/boundary-data.json
 create mode 100644 data/as/30055275/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055275/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055680/BillingService/BusinessService.json
 create mode 100644 data/as/30055680/egov-location/boundary-data.json
 create mode 100644 data/as/30055680/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055680/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055696/BillingService/BusinessService.json
 create mode 100644 data/as/30055696/egov-location/boundary-data.json
 create mode 100644 data/as/30055696/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055696/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055718/BillingService/BusinessService.json
 create mode 100644 data/as/30055718/egov-location/boundary-data.json
 create mode 100644 data/as/30055718/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055718/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055724/BillingService/BusinessService.json
 create mode 100644 data/as/30055724/egov-location/boundary-data.json
 create mode 100644 data/as/30055724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055929/BillingService/BusinessService.json
 create mode 100644 data/as/30055929/egov-location/boundary-data.json
 create mode 100644 data/as/30055929/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055929/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30055936/BillingService/BusinessService.json
 create mode 100644 data/as/30055936/egov-location/boundary-data.json
 create mode 100644 data/as/30055936/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30055936/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056016/BillingService/BusinessService.json
 create mode 100644 data/as/30056016/egov-location/boundary-data.json
 create mode 100644 data/as/30056016/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056016/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056027/BillingService/BusinessService.json
 create mode 100644 data/as/30056027/egov-location/boundary-data.json
 create mode 100644 data/as/30056027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056041/BillingService/BusinessService.json
 create mode 100644 data/as/30056041/egov-location/boundary-data.json
 create mode 100644 data/as/30056041/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056041/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056050/BillingService/BusinessService.json
 create mode 100644 data/as/30056050/egov-location/boundary-data.json
 create mode 100644 data/as/30056050/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056050/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056072/BillingService/BusinessService.json
 create mode 100644 data/as/30056072/egov-location/boundary-data.json
 create mode 100644 data/as/30056072/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056072/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056080/BillingService/BusinessService.json
 create mode 100644 data/as/30056080/egov-location/boundary-data.json
 create mode 100644 data/as/30056080/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056080/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056087/BillingService/BusinessService.json
 create mode 100644 data/as/30056087/egov-location/boundary-data.json
 create mode 100644 data/as/30056087/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056087/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056104/BillingService/BusinessService.json
 create mode 100644 data/as/30056104/egov-location/boundary-data.json
 create mode 100644 data/as/30056104/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056104/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056141/BillingService/BusinessService.json
 create mode 100644 data/as/30056141/egov-location/boundary-data.json
 create mode 100644 data/as/30056141/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056141/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056146/BillingService/BusinessService.json
 create mode 100644 data/as/30056146/egov-location/boundary-data.json
 create mode 100644 data/as/30056146/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056146/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056407/BillingService/BusinessService.json
 create mode 100644 data/as/30056407/egov-location/boundary-data.json
 create mode 100644 data/as/30056407/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056407/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056412/BillingService/BusinessService.json
 create mode 100644 data/as/30056412/egov-location/boundary-data.json
 create mode 100644 data/as/30056412/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056412/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056417/BillingService/BusinessService.json
 create mode 100644 data/as/30056417/egov-location/boundary-data.json
 create mode 100644 data/as/30056417/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056417/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056425/BillingService/BusinessService.json
 create mode 100644 data/as/30056425/egov-location/boundary-data.json
 create mode 100644 data/as/30056425/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056425/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056431/BillingService/BusinessService.json
 create mode 100644 data/as/30056431/egov-location/boundary-data.json
 create mode 100644 data/as/30056431/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056431/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056433/BillingService/BusinessService.json
 create mode 100644 data/as/30056433/egov-location/boundary-data.json
 create mode 100644 data/as/30056433/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056433/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056435/BillingService/BusinessService.json
 create mode 100644 data/as/30056435/egov-location/boundary-data.json
 create mode 100644 data/as/30056435/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056435/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056490/BillingService/BusinessService.json
 create mode 100644 data/as/30056490/egov-location/boundary-data.json
 create mode 100644 data/as/30056490/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056490/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056609/BillingService/BusinessService.json
 create mode 100644 data/as/30056609/egov-location/boundary-data.json
 create mode 100644 data/as/30056609/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056609/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056640/BillingService/BusinessService.json
 create mode 100644 data/as/30056640/egov-location/boundary-data.json
 create mode 100644 data/as/30056640/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056640/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056810/BillingService/BusinessService.json
 create mode 100644 data/as/30056810/egov-location/boundary-data.json
 create mode 100644 data/as/30056810/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056810/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056913/BillingService/BusinessService.json
 create mode 100644 data/as/30056913/egov-location/boundary-data.json
 create mode 100644 data/as/30056913/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056913/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056918/BillingService/BusinessService.json
 create mode 100644 data/as/30056918/egov-location/boundary-data.json
 create mode 100644 data/as/30056918/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056918/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30056922/BillingService/BusinessService.json
 create mode 100644 data/as/30056922/egov-location/boundary-data.json
 create mode 100644 data/as/30056922/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30056922/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057164/BillingService/BusinessService.json
 create mode 100644 data/as/30057164/egov-location/boundary-data.json
 create mode 100644 data/as/30057164/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057164/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057166/BillingService/BusinessService.json
 create mode 100644 data/as/30057166/egov-location/boundary-data.json
 create mode 100644 data/as/30057166/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057166/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057174/BillingService/BusinessService.json
 create mode 100644 data/as/30057174/egov-location/boundary-data.json
 create mode 100644 data/as/30057174/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057174/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057288/BillingService/BusinessService.json
 create mode 100644 data/as/30057288/egov-location/boundary-data.json
 create mode 100644 data/as/30057288/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057288/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057297/BillingService/BusinessService.json
 create mode 100644 data/as/30057297/egov-location/boundary-data.json
 create mode 100644 data/as/30057297/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057297/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057361/BillingService/BusinessService.json
 create mode 100644 data/as/30057361/egov-location/boundary-data.json
 create mode 100644 data/as/30057361/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057361/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057363/BillingService/BusinessService.json
 create mode 100644 data/as/30057363/egov-location/boundary-data.json
 create mode 100644 data/as/30057363/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057363/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057369/BillingService/BusinessService.json
 create mode 100644 data/as/30057369/egov-location/boundary-data.json
 create mode 100644 data/as/30057369/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057369/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057524/BillingService/BusinessService.json
 create mode 100644 data/as/30057524/egov-location/boundary-data.json
 create mode 100644 data/as/30057524/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057524/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057641/BillingService/BusinessService.json
 create mode 100644 data/as/30057641/egov-location/boundary-data.json
 create mode 100644 data/as/30057641/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057641/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057745/BillingService/BusinessService.json
 create mode 100644 data/as/30057745/egov-location/boundary-data.json
 create mode 100644 data/as/30057745/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057745/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057746/BillingService/BusinessService.json
 create mode 100644 data/as/30057746/egov-location/boundary-data.json
 create mode 100644 data/as/30057746/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057746/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057748/BillingService/BusinessService.json
 create mode 100644 data/as/30057748/egov-location/boundary-data.json
 create mode 100644 data/as/30057748/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057748/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057972/BillingService/BusinessService.json
 create mode 100644 data/as/30057972/egov-location/boundary-data.json
 create mode 100644 data/as/30057972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057974/BillingService/BusinessService.json
 create mode 100644 data/as/30057974/egov-location/boundary-data.json
 create mode 100644 data/as/30057974/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057974/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057979/BillingService/BusinessService.json
 create mode 100644 data/as/30057979/egov-location/boundary-data.json
 create mode 100644 data/as/30057979/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057979/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057983/BillingService/BusinessService.json
 create mode 100644 data/as/30057983/egov-location/boundary-data.json
 create mode 100644 data/as/30057983/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057983/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057985/BillingService/BusinessService.json
 create mode 100644 data/as/30057985/egov-location/boundary-data.json
 create mode 100644 data/as/30057985/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057985/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057989/BillingService/BusinessService.json
 create mode 100644 data/as/30057989/egov-location/boundary-data.json
 create mode 100644 data/as/30057989/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057989/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30057993/BillingService/BusinessService.json
 create mode 100644 data/as/30057993/egov-location/boundary-data.json
 create mode 100644 data/as/30057993/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30057993/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058019/BillingService/BusinessService.json
 create mode 100644 data/as/30058019/egov-location/boundary-data.json
 create mode 100644 data/as/30058019/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058019/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058023/BillingService/BusinessService.json
 create mode 100644 data/as/30058023/egov-location/boundary-data.json
 create mode 100644 data/as/30058023/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058023/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058044/BillingService/BusinessService.json
 create mode 100644 data/as/30058044/egov-location/boundary-data.json
 create mode 100644 data/as/30058044/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058044/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058047/BillingService/BusinessService.json
 create mode 100644 data/as/30058047/egov-location/boundary-data.json
 create mode 100644 data/as/30058047/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058047/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058052/BillingService/BusinessService.json
 create mode 100644 data/as/30058052/egov-location/boundary-data.json
 create mode 100644 data/as/30058052/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058052/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058057/BillingService/BusinessService.json
 create mode 100644 data/as/30058057/egov-location/boundary-data.json
 create mode 100644 data/as/30058057/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058057/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058109/BillingService/BusinessService.json
 create mode 100644 data/as/30058109/egov-location/boundary-data.json
 create mode 100644 data/as/30058109/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058109/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058320/BillingService/BusinessService.json
 create mode 100644 data/as/30058320/egov-location/boundary-data.json
 create mode 100644 data/as/30058320/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058320/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058339/BillingService/BusinessService.json
 create mode 100644 data/as/30058339/egov-location/boundary-data.json
 create mode 100644 data/as/30058339/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058339/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30058545/BillingService/BusinessService.json
 create mode 100644 data/as/30058545/egov-location/boundary-data.json
 create mode 100644 data/as/30058545/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30058545/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059252/BillingService/BusinessService.json
 create mode 100644 data/as/30059252/egov-location/boundary-data.json
 create mode 100644 data/as/30059252/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059252/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059318/BillingService/BusinessService.json
 create mode 100644 data/as/30059318/egov-location/boundary-data.json
 create mode 100644 data/as/30059318/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059318/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059391/BillingService/BusinessService.json
 create mode 100644 data/as/30059391/egov-location/boundary-data.json
 create mode 100644 data/as/30059391/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059391/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059490/BillingService/BusinessService.json
 create mode 100644 data/as/30059490/egov-location/boundary-data.json
 create mode 100644 data/as/30059490/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059490/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059492/BillingService/BusinessService.json
 create mode 100644 data/as/30059492/egov-location/boundary-data.json
 create mode 100644 data/as/30059492/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059492/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059495/BillingService/BusinessService.json
 create mode 100644 data/as/30059495/egov-location/boundary-data.json
 create mode 100644 data/as/30059495/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059495/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059497/BillingService/BusinessService.json
 create mode 100644 data/as/30059497/egov-location/boundary-data.json
 create mode 100644 data/as/30059497/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059497/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059500/BillingService/BusinessService.json
 create mode 100644 data/as/30059500/egov-location/boundary-data.json
 create mode 100644 data/as/30059500/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059500/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059502/BillingService/BusinessService.json
 create mode 100644 data/as/30059502/egov-location/boundary-data.json
 create mode 100644 data/as/30059502/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059502/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059510/BillingService/BusinessService.json
 create mode 100644 data/as/30059510/egov-location/boundary-data.json
 create mode 100644 data/as/30059510/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059510/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059517/BillingService/BusinessService.json
 create mode 100644 data/as/30059517/egov-location/boundary-data.json
 create mode 100644 data/as/30059517/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059517/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30059589/BillingService/BusinessService.json
 create mode 100644 data/as/30059589/egov-location/boundary-data.json
 create mode 100644 data/as/30059589/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30059589/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060114/BillingService/BusinessService.json
 create mode 100644 data/as/30060114/egov-location/boundary-data.json
 create mode 100644 data/as/30060114/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060114/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060116/BillingService/BusinessService.json
 create mode 100644 data/as/30060116/egov-location/boundary-data.json
 create mode 100644 data/as/30060116/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060116/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060146/BillingService/BusinessService.json
 create mode 100644 data/as/30060146/egov-location/boundary-data.json
 create mode 100644 data/as/30060146/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060146/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060151/BillingService/BusinessService.json
 create mode 100644 data/as/30060151/egov-location/boundary-data.json
 create mode 100644 data/as/30060151/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060151/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060155/BillingService/BusinessService.json
 create mode 100644 data/as/30060155/egov-location/boundary-data.json
 create mode 100644 data/as/30060155/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060155/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060169/BillingService/BusinessService.json
 create mode 100644 data/as/30060169/egov-location/boundary-data.json
 create mode 100644 data/as/30060169/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060169/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060173/BillingService/BusinessService.json
 create mode 100644 data/as/30060173/egov-location/boundary-data.json
 create mode 100644 data/as/30060173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060178/BillingService/BusinessService.json
 create mode 100644 data/as/30060178/egov-location/boundary-data.json
 create mode 100644 data/as/30060178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060179/BillingService/BusinessService.json
 create mode 100644 data/as/30060179/egov-location/boundary-data.json
 create mode 100644 data/as/30060179/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060179/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060206/BillingService/BusinessService.json
 create mode 100644 data/as/30060206/egov-location/boundary-data.json
 create mode 100644 data/as/30060206/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060206/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060256/BillingService/BusinessService.json
 create mode 100644 data/as/30060256/egov-location/boundary-data.json
 create mode 100644 data/as/30060256/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060256/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060309/BillingService/BusinessService.json
 create mode 100644 data/as/30060309/egov-location/boundary-data.json
 create mode 100644 data/as/30060309/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060309/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060313/BillingService/BusinessService.json
 create mode 100644 data/as/30060313/egov-location/boundary-data.json
 create mode 100644 data/as/30060313/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060313/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060518/BillingService/BusinessService.json
 create mode 100644 data/as/30060518/egov-location/boundary-data.json
 create mode 100644 data/as/30060518/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060518/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060621/BillingService/BusinessService.json
 create mode 100644 data/as/30060621/egov-location/boundary-data.json
 create mode 100644 data/as/30060621/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060621/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/30016769/BillingService/BusinessService.json b/data/as/30016769/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db8de00059
--- /dev/null
+++ b/data/as/30016769/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016769",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016769/egov-location/boundary-data.json b/data/as/30016769/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7944c1796f
--- /dev/null
+++ b/data/as/30016769/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016769",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDAMRI PT-II PWSS NEW)",
+                "localname": "CHANDAMRI PT-II PWSS NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDAMRI PT-II PWSS NEW)",
+                        "localname": "CHANDAMRI PT-II PWSS NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDAMRI PT-II PWSS NEW)",
+                "localname": "CHANDAMRI PT-II PWSS NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDAMRI PT-II PWSS NEW)",
+                        "localname": "CHANDAMRI PT-II PWSS NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016769/ws-services-calculation/Penalty.json b/data/as/30016769/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb588c00c0
--- /dev/null
+++ b/data/as/30016769/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016769",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016769/ws-services-calculation/WCBillingSlab.json b/data/as/30016769/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5bd85237e9
--- /dev/null
+++ b/data/as/30016769/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016769",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016773/BillingService/BusinessService.json b/data/as/30016773/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f7acc2b173
--- /dev/null
+++ b/data/as/30016773/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016773",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016773/egov-location/boundary-data.json b/data/as/30016773/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1dc1281623
--- /dev/null
+++ b/data/as/30016773/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016773",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTAMARI EAST PWSS (NEW)",
+                "localname": "KHUTAMARI EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016773",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTAMARI EAST PWSS (NEW)",
+                        "localname": "KHUTAMARI EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTAMARI EAST PWSS (NEW)",
+                "localname": "KHUTAMARI EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016773",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTAMARI EAST PWSS (NEW)",
+                        "localname": "KHUTAMARI EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016773/ws-services-calculation/Penalty.json b/data/as/30016773/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3b97cf71e5
--- /dev/null
+++ b/data/as/30016773/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016773",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016773/ws-services-calculation/WCBillingSlab.json b/data/as/30016773/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ea44ba4b3
--- /dev/null
+++ b/data/as/30016773/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016773",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016776/BillingService/BusinessService.json b/data/as/30016776/BillingService/BusinessService.json
new file mode 100644
index 0000000000..505dfedd5e
--- /dev/null
+++ b/data/as/30016776/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016776",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016776/egov-location/boundary-data.json b/data/as/30016776/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5606ac538
--- /dev/null
+++ b/data/as/30016776/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016776",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KETKIBARI PWSS(NEW)",
+                "localname": "KETKIBARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KETKIBARI PWSS(NEW)",
+                        "localname": "KETKIBARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KETKIBARI PWSS(NEW)",
+                "localname": "KETKIBARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KETKIBARI PWSS(NEW)",
+                        "localname": "KETKIBARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016776/ws-services-calculation/Penalty.json b/data/as/30016776/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bfd5887a69
--- /dev/null
+++ b/data/as/30016776/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016776",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016776/ws-services-calculation/WCBillingSlab.json b/data/as/30016776/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..20a5d073c5
--- /dev/null
+++ b/data/as/30016776/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016776",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016777/BillingService/BusinessService.json b/data/as/30016777/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37fae32f15
--- /dev/null
+++ b/data/as/30016777/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016777",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016777/egov-location/boundary-data.json b/data/as/30016777/egov-location/boundary-data.json
new file mode 100644
index 0000000000..09f747c9dc
--- /dev/null
+++ b/data/as/30016777/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016777",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMPUR PT-II PWSS (NEW)",
+                "localname": "RAMPUR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMPUR PT-II PWSS (NEW)",
+                        "localname": "RAMPUR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMPUR PT-II PWSS (NEW)",
+                "localname": "RAMPUR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMPUR PT-II PWSS (NEW)",
+                        "localname": "RAMPUR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016777/ws-services-calculation/Penalty.json b/data/as/30016777/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56db860b61
--- /dev/null
+++ b/data/as/30016777/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016777",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016777/ws-services-calculation/WCBillingSlab.json b/data/as/30016777/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2ff69d49ab
--- /dev/null
+++ b/data/as/30016777/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016777",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016779/BillingService/BusinessService.json b/data/as/30016779/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c42fc70fa
--- /dev/null
+++ b/data/as/30016779/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016779",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016779/egov-location/boundary-data.json b/data/as/30016779/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ba3b35e06
--- /dev/null
+++ b/data/as/30016779/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016779",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIRANG PWSS",
+                "localname": "BAIRANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016779",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIRANG PWSS",
+                        "localname": "BAIRANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIRANG PWSS",
+                "localname": "BAIRANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016779",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIRANG PWSS",
+                        "localname": "BAIRANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016779/ws-services-calculation/Penalty.json b/data/as/30016779/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d93cd6ddf
--- /dev/null
+++ b/data/as/30016779/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016779",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016779/ws-services-calculation/WCBillingSlab.json b/data/as/30016779/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4cbb1d8247
--- /dev/null
+++ b/data/as/30016779/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016779",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016893/BillingService/BusinessService.json b/data/as/30016893/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f70df97ec2
--- /dev/null
+++ b/data/as/30016893/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016893",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016893/egov-location/boundary-data.json b/data/as/30016893/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b047894309
--- /dev/null
+++ b/data/as/30016893/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016893",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARJULI GAON PWSS",
+                "localname": "GARJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARJULI GAON PWSS",
+                        "localname": "GARJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARJULI GAON PWSS",
+                "localname": "GARJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARJULI GAON PWSS",
+                        "localname": "GARJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016893/ws-services-calculation/Penalty.json b/data/as/30016893/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ff024f1877
--- /dev/null
+++ b/data/as/30016893/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016893",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016893/ws-services-calculation/WCBillingSlab.json b/data/as/30016893/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f2926cc04
--- /dev/null
+++ b/data/as/30016893/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016893",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016917/BillingService/BusinessService.json b/data/as/30016917/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1d8c6d0e64
--- /dev/null
+++ b/data/as/30016917/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30016917",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016917/egov-location/boundary-data.json b/data/as/30016917/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e9597f017b
--- /dev/null
+++ b/data/as/30016917/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30016917",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 3 HIRAJULI BAGAN PWSS",
+                "localname": "NO 3 HIRAJULI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 3 HIRAJULI BAGAN PWSS",
+                        "localname": "NO 3 HIRAJULI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 3 HIRAJULI BAGAN PWSS",
+                "localname": "NO 3 HIRAJULI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30016917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 3 HIRAJULI BAGAN PWSS",
+                        "localname": "NO 3 HIRAJULI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016917/ws-services-calculation/Penalty.json b/data/as/30016917/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..67dfba1be6
--- /dev/null
+++ b/data/as/30016917/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30016917",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30016917/ws-services-calculation/WCBillingSlab.json b/data/as/30016917/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fd812fb6c
--- /dev/null
+++ b/data/as/30016917/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30016917",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017080/BillingService/BusinessService.json b/data/as/30017080/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b434ae456
--- /dev/null
+++ b/data/as/30017080/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017080",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017080/egov-location/boundary-data.json b/data/as/30017080/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0badc99a2
--- /dev/null
+++ b/data/as/30017080/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017080",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAJAN PWSS",
+                "localname": "RANGAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAJAN PWSS",
+                        "localname": "RANGAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAJAN PWSS",
+                "localname": "RANGAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAJAN PWSS",
+                        "localname": "RANGAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017080/ws-services-calculation/Penalty.json b/data/as/30017080/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d5971395f
--- /dev/null
+++ b/data/as/30017080/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017080",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017080/ws-services-calculation/WCBillingSlab.json b/data/as/30017080/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1aaa6900cc
--- /dev/null
+++ b/data/as/30017080/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017080",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017213/BillingService/BusinessService.json b/data/as/30017213/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7dd12860b3
--- /dev/null
+++ b/data/as/30017213/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017213",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017213/egov-location/boundary-data.json b/data/as/30017213/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c6d4b6b551
--- /dev/null
+++ b/data/as/30017213/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017213",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 HUGRAJULI BAGAN",
+                "localname": "NO 2 HUGRAJULI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 HUGRAJULI BAGAN",
+                        "localname": "NO 2 HUGRAJULI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 HUGRAJULI BAGAN",
+                "localname": "NO 2 HUGRAJULI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 HUGRAJULI BAGAN",
+                        "localname": "NO 2 HUGRAJULI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017213/ws-services-calculation/Penalty.json b/data/as/30017213/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5d8c2c2bb6
--- /dev/null
+++ b/data/as/30017213/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017213",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017213/ws-services-calculation/WCBillingSlab.json b/data/as/30017213/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bfd21fec5d
--- /dev/null
+++ b/data/as/30017213/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017213",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017259/BillingService/BusinessService.json b/data/as/30017259/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d7f8ce00a7
--- /dev/null
+++ b/data/as/30017259/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017259",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017259/egov-location/boundary-data.json b/data/as/30017259/egov-location/boundary-data.json
new file mode 100644
index 0000000000..66a1834509
--- /dev/null
+++ b/data/as/30017259/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017259",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 4 BELSIRI BAGAN",
+                "localname": "NO 4 BELSIRI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017259",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 4 BELSIRI BAGAN",
+                        "localname": "NO 4 BELSIRI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 4 BELSIRI BAGAN",
+                "localname": "NO 4 BELSIRI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017259",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 4 BELSIRI BAGAN",
+                        "localname": "NO 4 BELSIRI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017259/ws-services-calculation/Penalty.json b/data/as/30017259/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a4f0266972
--- /dev/null
+++ b/data/as/30017259/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017259",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017259/ws-services-calculation/WCBillingSlab.json b/data/as/30017259/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7713a0a782
--- /dev/null
+++ b/data/as/30017259/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017259",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017426/BillingService/BusinessService.json b/data/as/30017426/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d01dc05ce4
--- /dev/null
+++ b/data/as/30017426/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017426",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017426/egov-location/boundary-data.json b/data/as/30017426/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8298b4f76a
--- /dev/null
+++ b/data/as/30017426/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017426",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 SANMILANI",
+                "localname": "NO 2 SANMILANI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017426",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 SANMILANI",
+                        "localname": "NO 2 SANMILANI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 SANMILANI",
+                "localname": "NO 2 SANMILANI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017426",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 SANMILANI",
+                        "localname": "NO 2 SANMILANI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017426/ws-services-calculation/Penalty.json b/data/as/30017426/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..76e19c4efd
--- /dev/null
+++ b/data/as/30017426/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017426",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017426/ws-services-calculation/WCBillingSlab.json b/data/as/30017426/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..01e0e5490e
--- /dev/null
+++ b/data/as/30017426/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017426",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017520/BillingService/BusinessService.json b/data/as/30017520/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98e2479e12
--- /dev/null
+++ b/data/as/30017520/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017520",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017520/egov-location/boundary-data.json b/data/as/30017520/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c4b29f5da
--- /dev/null
+++ b/data/as/30017520/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017520",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIDOI BHERLA NO 1",
+                "localname": "PATIDOI BHERLA NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017520",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIDOI BHERLA NO 1",
+                        "localname": "PATIDOI BHERLA NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIDOI BHERLA NO 1",
+                "localname": "PATIDOI BHERLA NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017520",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIDOI BHERLA NO 1",
+                        "localname": "PATIDOI BHERLA NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017520/ws-services-calculation/Penalty.json b/data/as/30017520/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..06b6d3e29d
--- /dev/null
+++ b/data/as/30017520/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017520",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017520/ws-services-calculation/WCBillingSlab.json b/data/as/30017520/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7690c4c1a0
--- /dev/null
+++ b/data/as/30017520/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017520",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017697/BillingService/BusinessService.json b/data/as/30017697/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c4add97900
--- /dev/null
+++ b/data/as/30017697/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017697",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017697/egov-location/boundary-data.json b/data/as/30017697/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e692f03b8f
--- /dev/null
+++ b/data/as/30017697/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017697",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BURAGAON PWSS",
+                "localname": "NEW BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017697",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BURAGAON PWSS",
+                        "localname": "NEW BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BURAGAON PWSS",
+                "localname": "NEW BURAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017697",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BURAGAON PWSS",
+                        "localname": "NEW BURAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017697/ws-services-calculation/Penalty.json b/data/as/30017697/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9576c5aae5
--- /dev/null
+++ b/data/as/30017697/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017697",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017697/ws-services-calculation/WCBillingSlab.json b/data/as/30017697/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0390c264df
--- /dev/null
+++ b/data/as/30017697/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017697",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017715/BillingService/BusinessService.json b/data/as/30017715/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7010fd2bd4
--- /dev/null
+++ b/data/as/30017715/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017715",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017715/egov-location/boundary-data.json b/data/as/30017715/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e49541cd1
--- /dev/null
+++ b/data/as/30017715/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017715",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW  P U N I O N I  PWSS",
+                "localname": "NEW  P U N I O N I  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW  P U N I O N I  PWSS",
+                        "localname": "NEW  P U N I O N I  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW  P U N I O N I  PWSS",
+                "localname": "NEW  P U N I O N I  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW  P U N I O N I  PWSS",
+                        "localname": "NEW  P U N I O N I  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017715/ws-services-calculation/Penalty.json b/data/as/30017715/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d6a1b152e1
--- /dev/null
+++ b/data/as/30017715/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017715",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017715/ws-services-calculation/WCBillingSlab.json b/data/as/30017715/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..63f9554233
--- /dev/null
+++ b/data/as/30017715/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017715",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017720/BillingService/BusinessService.json b/data/as/30017720/BillingService/BusinessService.json
new file mode 100644
index 0000000000..29a5b35bb7
--- /dev/null
+++ b/data/as/30017720/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017720",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017720/egov-location/boundary-data.json b/data/as/30017720/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf4b1fa21e
--- /dev/null
+++ b/data/as/30017720/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017720",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAITHA BHANGA BANGALI PWSS",
+                "localname": "BAITHA BHANGA BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAITHA BHANGA BANGALI PWSS",
+                        "localname": "BAITHA BHANGA BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAITHA BHANGA BANGALI PWSS",
+                "localname": "BAITHA BHANGA BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAITHA BHANGA BANGALI PWSS",
+                        "localname": "BAITHA BHANGA BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017720/ws-services-calculation/Penalty.json b/data/as/30017720/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81b292f2ff
--- /dev/null
+++ b/data/as/30017720/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017720",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017720/ws-services-calculation/WCBillingSlab.json b/data/as/30017720/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f1b1bd2d0
--- /dev/null
+++ b/data/as/30017720/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017720",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017735/BillingService/BusinessService.json b/data/as/30017735/BillingService/BusinessService.json
new file mode 100644
index 0000000000..60610e960b
--- /dev/null
+++ b/data/as/30017735/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017735",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017735/egov-location/boundary-data.json b/data/as/30017735/egov-location/boundary-data.json
new file mode 100644
index 0000000000..82afdfd906
--- /dev/null
+++ b/data/as/30017735/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017735",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUK JHARANI PWSS",
+                "localname": "BHALUK JHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017735",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUK JHARANI PWSS",
+                        "localname": "BHALUK JHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUK JHARANI PWSS",
+                "localname": "BHALUK JHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017735",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUK JHARANI PWSS",
+                        "localname": "BHALUK JHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017735/ws-services-calculation/Penalty.json b/data/as/30017735/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bf7b68084
--- /dev/null
+++ b/data/as/30017735/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017735",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017735/ws-services-calculation/WCBillingSlab.json b/data/as/30017735/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4eef58c644
--- /dev/null
+++ b/data/as/30017735/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017735",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017892/BillingService/BusinessService.json b/data/as/30017892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..205529c40a
--- /dev/null
+++ b/data/as/30017892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017892/egov-location/boundary-data.json b/data/as/30017892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f3e896887
--- /dev/null
+++ b/data/as/30017892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHANIBARI PWSS",
+                "localname": "KATHANIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHANIBARI PWSS",
+                        "localname": "KATHANIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHANIBARI PWSS",
+                "localname": "KATHANIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHANIBARI PWSS",
+                        "localname": "KATHANIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017892/ws-services-calculation/Penalty.json b/data/as/30017892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f2eb45ab6
--- /dev/null
+++ b/data/as/30017892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017892/ws-services-calculation/WCBillingSlab.json b/data/as/30017892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b0db3e0c7
--- /dev/null
+++ b/data/as/30017892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017895/BillingService/BusinessService.json b/data/as/30017895/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5d813178f0
--- /dev/null
+++ b/data/as/30017895/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017895",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017895/egov-location/boundary-data.json b/data/as/30017895/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cacf469e93
--- /dev/null
+++ b/data/as/30017895/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017895",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN KACHARI PWSS",
+                "localname": "BALIJAN KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN KACHARI PWSS",
+                        "localname": "BALIJAN KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN KACHARI PWSS",
+                "localname": "BALIJAN KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN KACHARI PWSS",
+                        "localname": "BALIJAN KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017895/ws-services-calculation/Penalty.json b/data/as/30017895/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c70306ec71
--- /dev/null
+++ b/data/as/30017895/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017895",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017895/ws-services-calculation/WCBillingSlab.json b/data/as/30017895/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea2161f339
--- /dev/null
+++ b/data/as/30017895/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017895",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017896/BillingService/BusinessService.json b/data/as/30017896/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d25d898070
--- /dev/null
+++ b/data/as/30017896/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30017896",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017896/egov-location/boundary-data.json b/data/as/30017896/egov-location/boundary-data.json
new file mode 100644
index 0000000000..186dd32a06
--- /dev/null
+++ b/data/as/30017896/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30017896",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHOGIA NO 3 WSS",
+                "localname": "BORBHOGIA NO 3 WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017896",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHOGIA NO 3 WSS",
+                        "localname": "BORBHOGIA NO 3 WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHOGIA NO 3 WSS",
+                "localname": "BORBHOGIA NO 3 WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30017896",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHOGIA NO 3 WSS",
+                        "localname": "BORBHOGIA NO 3 WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017896/ws-services-calculation/Penalty.json b/data/as/30017896/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..675f555f9a
--- /dev/null
+++ b/data/as/30017896/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30017896",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30017896/ws-services-calculation/WCBillingSlab.json b/data/as/30017896/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0f91ae655
--- /dev/null
+++ b/data/as/30017896/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30017896",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018185/BillingService/BusinessService.json b/data/as/30018185/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7325838bb4
--- /dev/null
+++ b/data/as/30018185/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018185",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018185/egov-location/boundary-data.json b/data/as/30018185/egov-location/boundary-data.json
new file mode 100644
index 0000000000..462bb2e5ca
--- /dev/null
+++ b/data/as/30018185/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018185",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN BASTI GAON",
+                "localname": "NATUN BASTI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018185",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN BASTI GAON",
+                        "localname": "NATUN BASTI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN BASTI GAON",
+                "localname": "NATUN BASTI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018185",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN BASTI GAON",
+                        "localname": "NATUN BASTI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018185/ws-services-calculation/Penalty.json b/data/as/30018185/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..613f0d0ea7
--- /dev/null
+++ b/data/as/30018185/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018185",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018185/ws-services-calculation/WCBillingSlab.json b/data/as/30018185/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f4a8e24b5
--- /dev/null
+++ b/data/as/30018185/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018185",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018227/BillingService/BusinessService.json b/data/as/30018227/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0eaf148b53
--- /dev/null
+++ b/data/as/30018227/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018227",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018227/egov-location/boundary-data.json b/data/as/30018227/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c61b716247
--- /dev/null
+++ b/data/as/30018227/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018227",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAYIA GAON ",
+                "localname": "GAYIA GAON ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAYIA GAON ",
+                        "localname": "GAYIA GAON ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAYIA GAON ",
+                "localname": "GAYIA GAON ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAYIA GAON ",
+                        "localname": "GAYIA GAON ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018227/ws-services-calculation/Penalty.json b/data/as/30018227/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4db3e8b986
--- /dev/null
+++ b/data/as/30018227/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018227",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018227/ws-services-calculation/WCBillingSlab.json b/data/as/30018227/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fae6e986f
--- /dev/null
+++ b/data/as/30018227/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018227",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018243/BillingService/BusinessService.json b/data/as/30018243/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56083d4eb0
--- /dev/null
+++ b/data/as/30018243/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018243",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018243/egov-location/boundary-data.json b/data/as/30018243/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15e197b162
--- /dev/null
+++ b/data/as/30018243/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018243",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 3 PUTHIMARI PWSS",
+                "localname": "NO 3 PUTHIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018243",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 3 PUTHIMARI PWSS",
+                        "localname": "NO 3 PUTHIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 3 PUTHIMARI PWSS",
+                "localname": "NO 3 PUTHIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018243",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 3 PUTHIMARI PWSS",
+                        "localname": "NO 3 PUTHIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018243/ws-services-calculation/Penalty.json b/data/as/30018243/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1402becc27
--- /dev/null
+++ b/data/as/30018243/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018243",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018243/ws-services-calculation/WCBillingSlab.json b/data/as/30018243/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d2b13ee39
--- /dev/null
+++ b/data/as/30018243/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018243",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018312/BillingService/BusinessService.json b/data/as/30018312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57995864a9
--- /dev/null
+++ b/data/as/30018312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018312/egov-location/boundary-data.json b/data/as/30018312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60554bc90b
--- /dev/null
+++ b/data/as/30018312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "VERVERI PWSS (NEW)",
+                "localname": "VERVERI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "VERVERI PWSS (NEW)",
+                        "localname": "VERVERI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "VERVERI PWSS (NEW)",
+                "localname": "VERVERI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "VERVERI PWSS (NEW)",
+                        "localname": "VERVERI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018312/ws-services-calculation/Penalty.json b/data/as/30018312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ea7b7d69f
--- /dev/null
+++ b/data/as/30018312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018312/ws-services-calculation/WCBillingSlab.json b/data/as/30018312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3534ee5f67
--- /dev/null
+++ b/data/as/30018312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018441/BillingService/BusinessService.json b/data/as/30018441/BillingService/BusinessService.json
new file mode 100644
index 0000000000..937f0024c7
--- /dev/null
+++ b/data/as/30018441/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018441",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018441/egov-location/boundary-data.json b/data/as/30018441/egov-location/boundary-data.json
new file mode 100644
index 0000000000..78cfa0d7ff
--- /dev/null
+++ b/data/as/30018441/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018441",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SEMRAJULI PWSS",
+                "localname": "SEMRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SEMRAJULI PWSS",
+                        "localname": "SEMRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SEMRAJULI PWSS",
+                "localname": "SEMRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SEMRAJULI PWSS",
+                        "localname": "SEMRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018441/ws-services-calculation/Penalty.json b/data/as/30018441/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8eb957765a
--- /dev/null
+++ b/data/as/30018441/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018441",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018441/ws-services-calculation/WCBillingSlab.json b/data/as/30018441/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc00641d8f
--- /dev/null
+++ b/data/as/30018441/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018441",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018712/BillingService/BusinessService.json b/data/as/30018712/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e964692be6
--- /dev/null
+++ b/data/as/30018712/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018712",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018712/egov-location/boundary-data.json b/data/as/30018712/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc3527f555
--- /dev/null
+++ b/data/as/30018712/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018712",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BAGIPUKHURI GAON PWSS",
+                "localname": "NO.1 BAGIPUKHURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018712",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BAGIPUKHURI GAON PWSS",
+                        "localname": "NO.1 BAGIPUKHURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BAGIPUKHURI GAON PWSS",
+                "localname": "NO.1 BAGIPUKHURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018712",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BAGIPUKHURI GAON PWSS",
+                        "localname": "NO.1 BAGIPUKHURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018712/ws-services-calculation/Penalty.json b/data/as/30018712/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f7d40f0bfd
--- /dev/null
+++ b/data/as/30018712/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018712",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018712/ws-services-calculation/WCBillingSlab.json b/data/as/30018712/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf93f3a040
--- /dev/null
+++ b/data/as/30018712/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018712",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018720/BillingService/BusinessService.json b/data/as/30018720/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0d1b90d2ee
--- /dev/null
+++ b/data/as/30018720/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018720",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018720/egov-location/boundary-data.json b/data/as/30018720/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44ccc88e4e
--- /dev/null
+++ b/data/as/30018720/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018720",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "1 NO BALADMARI CHAR PWSS(NEW)",
+                "localname": "1 NO BALADMARI CHAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "1 NO BALADMARI CHAR PWSS(NEW)",
+                        "localname": "1 NO BALADMARI CHAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "1 NO BALADMARI CHAR PWSS(NEW)",
+                "localname": "1 NO BALADMARI CHAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "1 NO BALADMARI CHAR PWSS(NEW)",
+                        "localname": "1 NO BALADMARI CHAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018720/ws-services-calculation/Penalty.json b/data/as/30018720/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5505f292d0
--- /dev/null
+++ b/data/as/30018720/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018720",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018720/ws-services-calculation/WCBillingSlab.json b/data/as/30018720/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f228c94691
--- /dev/null
+++ b/data/as/30018720/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018720",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018721/BillingService/BusinessService.json b/data/as/30018721/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a593f14cd
--- /dev/null
+++ b/data/as/30018721/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018721",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018721/egov-location/boundary-data.json b/data/as/30018721/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9960f71834
--- /dev/null
+++ b/data/as/30018721/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018721",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFAL NO 3 PWSS (NEW)",
+                "localname": "FAFAL NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFAL NO 3 PWSS (NEW)",
+                        "localname": "FAFAL NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFAL NO 3 PWSS (NEW)",
+                "localname": "FAFAL NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFAL NO 3 PWSS (NEW)",
+                        "localname": "FAFAL NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018721/ws-services-calculation/Penalty.json b/data/as/30018721/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3c49db486
--- /dev/null
+++ b/data/as/30018721/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018721",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018721/ws-services-calculation/WCBillingSlab.json b/data/as/30018721/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f84d8b3292
--- /dev/null
+++ b/data/as/30018721/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018721",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018738/BillingService/BusinessService.json b/data/as/30018738/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8347fdf129
--- /dev/null
+++ b/data/as/30018738/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018738",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018738/egov-location/boundary-data.json b/data/as/30018738/egov-location/boundary-data.json
new file mode 100644
index 0000000000..235da8cab6
--- /dev/null
+++ b/data/as/30018738/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018738",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFAL NO 4 PWSS(NEW)",
+                "localname": "FAFAL NO 4 PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFAL NO 4 PWSS(NEW)",
+                        "localname": "FAFAL NO 4 PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFAL NO 4 PWSS(NEW)",
+                "localname": "FAFAL NO 4 PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFAL NO 4 PWSS(NEW)",
+                        "localname": "FAFAL NO 4 PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018738/ws-services-calculation/Penalty.json b/data/as/30018738/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42e4daf793
--- /dev/null
+++ b/data/as/30018738/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018738",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018738/ws-services-calculation/WCBillingSlab.json b/data/as/30018738/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..26b3d0fb04
--- /dev/null
+++ b/data/as/30018738/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018738",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018739/BillingService/BusinessService.json b/data/as/30018739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db7c2bb690
--- /dev/null
+++ b/data/as/30018739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018739/egov-location/boundary-data.json b/data/as/30018739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..328067745e
--- /dev/null
+++ b/data/as/30018739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                "localname": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                        "localname": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                "localname": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                        "localname": "BAJE MONDAL SIALMARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018739/ws-services-calculation/Penalty.json b/data/as/30018739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c09d931cbd
--- /dev/null
+++ b/data/as/30018739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018739/ws-services-calculation/WCBillingSlab.json b/data/as/30018739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91cc051d00
--- /dev/null
+++ b/data/as/30018739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018741/BillingService/BusinessService.json b/data/as/30018741/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5d6dd6c22
--- /dev/null
+++ b/data/as/30018741/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018741",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018741/egov-location/boundary-data.json b/data/as/30018741/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ccc5f62aac
--- /dev/null
+++ b/data/as/30018741/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018741",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATPARA PWSS(NEW)",
+                "localname": "PATPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018741",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATPARA PWSS(NEW)",
+                        "localname": "PATPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATPARA PWSS(NEW)",
+                "localname": "PATPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018741",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATPARA PWSS(NEW)",
+                        "localname": "PATPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018741/ws-services-calculation/Penalty.json b/data/as/30018741/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13fe53e942
--- /dev/null
+++ b/data/as/30018741/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018741",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018741/ws-services-calculation/WCBillingSlab.json b/data/as/30018741/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6bbc4ff632
--- /dev/null
+++ b/data/as/30018741/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018741",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018824/BillingService/BusinessService.json b/data/as/30018824/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8de5f030a0
--- /dev/null
+++ b/data/as/30018824/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018824",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018824/egov-location/boundary-data.json b/data/as/30018824/egov-location/boundary-data.json
new file mode 100644
index 0000000000..161e34c510
--- /dev/null
+++ b/data/as/30018824/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018824",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 BAGIPUKHURI PWSS",
+                "localname": "NO 2 BAGIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 BAGIPUKHURI PWSS",
+                        "localname": "NO 2 BAGIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 BAGIPUKHURI PWSS",
+                "localname": "NO 2 BAGIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 BAGIPUKHURI PWSS",
+                        "localname": "NO 2 BAGIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018824/ws-services-calculation/Penalty.json b/data/as/30018824/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b05d73aafb
--- /dev/null
+++ b/data/as/30018824/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018824",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018824/ws-services-calculation/WCBillingSlab.json b/data/as/30018824/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ab0cc942d1
--- /dev/null
+++ b/data/as/30018824/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018824",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018921/BillingService/BusinessService.json b/data/as/30018921/BillingService/BusinessService.json
new file mode 100644
index 0000000000..913271a4aa
--- /dev/null
+++ b/data/as/30018921/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018921",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018921/egov-location/boundary-data.json b/data/as/30018921/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6ed96acd0
--- /dev/null
+++ b/data/as/30018921/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018921",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALISIHA KACHARI PWSS",
+                "localname": "BALISIHA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018921",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALISIHA KACHARI PWSS",
+                        "localname": "BALISIHA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALISIHA KACHARI PWSS",
+                "localname": "BALISIHA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018921",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALISIHA KACHARI PWSS",
+                        "localname": "BALISIHA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018921/ws-services-calculation/Penalty.json b/data/as/30018921/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..20819fe06e
--- /dev/null
+++ b/data/as/30018921/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018921",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018921/ws-services-calculation/WCBillingSlab.json b/data/as/30018921/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dfce3e9c74
--- /dev/null
+++ b/data/as/30018921/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018921",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018935/BillingService/BusinessService.json b/data/as/30018935/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc9f0afe1f
--- /dev/null
+++ b/data/as/30018935/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018935",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018935/egov-location/boundary-data.json b/data/as/30018935/egov-location/boundary-data.json
new file mode 100644
index 0000000000..41fac4e9d9
--- /dev/null
+++ b/data/as/30018935/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018935",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARENKATI KACHARI PWSS",
+                "localname": "NARENKATI KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARENKATI KACHARI PWSS",
+                        "localname": "NARENKATI KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARENKATI KACHARI PWSS",
+                "localname": "NARENKATI KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARENKATI KACHARI PWSS",
+                        "localname": "NARENKATI KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018935/ws-services-calculation/Penalty.json b/data/as/30018935/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..898373a55c
--- /dev/null
+++ b/data/as/30018935/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018935",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018935/ws-services-calculation/WCBillingSlab.json b/data/as/30018935/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e109182d3d
--- /dev/null
+++ b/data/as/30018935/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018935",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018941/BillingService/BusinessService.json b/data/as/30018941/BillingService/BusinessService.json
new file mode 100644
index 0000000000..54b3bf0836
--- /dev/null
+++ b/data/as/30018941/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30018941",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018941/egov-location/boundary-data.json b/data/as/30018941/egov-location/boundary-data.json
new file mode 100644
index 0000000000..334cb5a153
--- /dev/null
+++ b/data/as/30018941/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30018941",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARU GRANT NO 2",
+                "localname": "GABHARU GRANT NO 2",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARU GRANT NO 2",
+                        "localname": "GABHARU GRANT NO 2",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARU GRANT NO 2",
+                "localname": "GABHARU GRANT NO 2",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30018941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARU GRANT NO 2",
+                        "localname": "GABHARU GRANT NO 2",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018941/ws-services-calculation/Penalty.json b/data/as/30018941/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c78bd78933
--- /dev/null
+++ b/data/as/30018941/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30018941",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30018941/ws-services-calculation/WCBillingSlab.json b/data/as/30018941/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d404882f92
--- /dev/null
+++ b/data/as/30018941/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30018941",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019121/BillingService/BusinessService.json b/data/as/30019121/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31347f5e85
--- /dev/null
+++ b/data/as/30019121/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019121",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019121/egov-location/boundary-data.json b/data/as/30019121/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e73ee909c
--- /dev/null
+++ b/data/as/30019121/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019121",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARUBHAJ BAZAR PWSS(NEW)",
+                "localname": "KHARUBHAJ BAZAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019121",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARUBHAJ BAZAR PWSS(NEW)",
+                        "localname": "KHARUBHAJ BAZAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARUBHAJ BAZAR PWSS(NEW)",
+                "localname": "KHARUBHAJ BAZAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019121",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARUBHAJ BAZAR PWSS(NEW)",
+                        "localname": "KHARUBHAJ BAZAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019121/ws-services-calculation/Penalty.json b/data/as/30019121/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a41c81c61
--- /dev/null
+++ b/data/as/30019121/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019121",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019121/ws-services-calculation/WCBillingSlab.json b/data/as/30019121/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c493598b19
--- /dev/null
+++ b/data/as/30019121/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019121",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019130/BillingService/BusinessService.json b/data/as/30019130/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5542b4262
--- /dev/null
+++ b/data/as/30019130/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019130",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019130/egov-location/boundary-data.json b/data/as/30019130/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97fc14f342
--- /dev/null
+++ b/data/as/30019130/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019130",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUMER GHAT PWSS(NEW)",
+                "localname": "DHUMER GHAT PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUMER GHAT PWSS(NEW)",
+                        "localname": "DHUMER GHAT PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUMER GHAT PWSS(NEW)",
+                "localname": "DHUMER GHAT PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUMER GHAT PWSS(NEW)",
+                        "localname": "DHUMER GHAT PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019130/ws-services-calculation/Penalty.json b/data/as/30019130/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..96eadc8884
--- /dev/null
+++ b/data/as/30019130/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019130",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019130/ws-services-calculation/WCBillingSlab.json b/data/as/30019130/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..00335de82b
--- /dev/null
+++ b/data/as/30019130/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019130",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019135/BillingService/BusinessService.json b/data/as/30019135/BillingService/BusinessService.json
new file mode 100644
index 0000000000..be4f60def8
--- /dev/null
+++ b/data/as/30019135/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019135",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019135/egov-location/boundary-data.json b/data/as/30019135/egov-location/boundary-data.json
new file mode 100644
index 0000000000..93266e25ee
--- /dev/null
+++ b/data/as/30019135/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019135",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLABARI BAZAR PWSS(NEW)",
+                "localname": "SIMLABARI BAZAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLABARI BAZAR PWSS(NEW)",
+                        "localname": "SIMLABARI BAZAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLABARI BAZAR PWSS(NEW)",
+                "localname": "SIMLABARI BAZAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLABARI BAZAR PWSS(NEW)",
+                        "localname": "SIMLABARI BAZAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019135/ws-services-calculation/Penalty.json b/data/as/30019135/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6909ecc9c9
--- /dev/null
+++ b/data/as/30019135/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019135",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019135/ws-services-calculation/WCBillingSlab.json b/data/as/30019135/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5082a44d8d
--- /dev/null
+++ b/data/as/30019135/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019135",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019139/BillingService/BusinessService.json b/data/as/30019139/BillingService/BusinessService.json
new file mode 100644
index 0000000000..82ad271441
--- /dev/null
+++ b/data/as/30019139/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019139",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019139/egov-location/boundary-data.json b/data/as/30019139/egov-location/boundary-data.json
new file mode 100644
index 0000000000..82a03dfecf
--- /dev/null
+++ b/data/as/30019139/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019139",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BASHMURA PWSS(NEW)",
+                "localname": "BASHMURA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019139",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BASHMURA PWSS(NEW)",
+                        "localname": "BASHMURA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BASHMURA PWSS(NEW)",
+                "localname": "BASHMURA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019139",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BASHMURA PWSS(NEW)",
+                        "localname": "BASHMURA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019139/ws-services-calculation/Penalty.json b/data/as/30019139/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..30f49f149f
--- /dev/null
+++ b/data/as/30019139/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019139",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019139/ws-services-calculation/WCBillingSlab.json b/data/as/30019139/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ff754fa44
--- /dev/null
+++ b/data/as/30019139/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019139",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019144/BillingService/BusinessService.json b/data/as/30019144/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f90d598cca
--- /dev/null
+++ b/data/as/30019144/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019144",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019144/egov-location/boundary-data.json b/data/as/30019144/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a40f317437
--- /dev/null
+++ b/data/as/30019144/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019144",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR TARANGAPUR PWSS(NEW)",
+                "localname": "UTTAR TARANGAPUR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019144",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR TARANGAPUR PWSS(NEW)",
+                        "localname": "UTTAR TARANGAPUR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR TARANGAPUR PWSS(NEW)",
+                "localname": "UTTAR TARANGAPUR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019144",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR TARANGAPUR PWSS(NEW)",
+                        "localname": "UTTAR TARANGAPUR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019144/ws-services-calculation/Penalty.json b/data/as/30019144/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c125004e32
--- /dev/null
+++ b/data/as/30019144/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019144",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019144/ws-services-calculation/WCBillingSlab.json b/data/as/30019144/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..895bf3fcfb
--- /dev/null
+++ b/data/as/30019144/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019144",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019151/BillingService/BusinessService.json b/data/as/30019151/BillingService/BusinessService.json
new file mode 100644
index 0000000000..974823640c
--- /dev/null
+++ b/data/as/30019151/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019151",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019151/egov-location/boundary-data.json b/data/as/30019151/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d491264da
--- /dev/null
+++ b/data/as/30019151/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019151",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHIMKHOJ PWSS(NEW)",
+                "localname": "BHIMKHOJ PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019151",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHIMKHOJ PWSS(NEW)",
+                        "localname": "BHIMKHOJ PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHIMKHOJ PWSS(NEW)",
+                "localname": "BHIMKHOJ PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019151",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHIMKHOJ PWSS(NEW)",
+                        "localname": "BHIMKHOJ PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019151/ws-services-calculation/Penalty.json b/data/as/30019151/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c13e15660b
--- /dev/null
+++ b/data/as/30019151/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019151",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019151/ws-services-calculation/WCBillingSlab.json b/data/as/30019151/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4fa55cbe67
--- /dev/null
+++ b/data/as/30019151/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019151",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019154/BillingService/BusinessService.json b/data/as/30019154/BillingService/BusinessService.json
new file mode 100644
index 0000000000..65cd273d0b
--- /dev/null
+++ b/data/as/30019154/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019154",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019154/egov-location/boundary-data.json b/data/as/30019154/egov-location/boundary-data.json
new file mode 100644
index 0000000000..13d9f2ee60
--- /dev/null
+++ b/data/as/30019154/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019154",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOWAMARI PWSS(NEW)",
+                "localname": "MOWAMARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019154",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOWAMARI PWSS(NEW)",
+                        "localname": "MOWAMARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOWAMARI PWSS(NEW)",
+                "localname": "MOWAMARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019154",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOWAMARI PWSS(NEW)",
+                        "localname": "MOWAMARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019154/ws-services-calculation/Penalty.json b/data/as/30019154/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44f7e0ee47
--- /dev/null
+++ b/data/as/30019154/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019154",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019154/ws-services-calculation/WCBillingSlab.json b/data/as/30019154/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..88d385856d
--- /dev/null
+++ b/data/as/30019154/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019154",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019163/BillingService/BusinessService.json b/data/as/30019163/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2165955574
--- /dev/null
+++ b/data/as/30019163/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019163",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019163/egov-location/boundary-data.json b/data/as/30019163/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d10388d16b
--- /dev/null
+++ b/data/as/30019163/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019163",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HURKASINGI PWSS(NEW)",
+                "localname": "HURKASINGI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019163",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HURKASINGI PWSS(NEW)",
+                        "localname": "HURKASINGI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HURKASINGI PWSS(NEW)",
+                "localname": "HURKASINGI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019163",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HURKASINGI PWSS(NEW)",
+                        "localname": "HURKASINGI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019163/ws-services-calculation/Penalty.json b/data/as/30019163/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..01ad750101
--- /dev/null
+++ b/data/as/30019163/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019163",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019163/ws-services-calculation/WCBillingSlab.json b/data/as/30019163/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1c2539624
--- /dev/null
+++ b/data/as/30019163/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019163",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019166/BillingService/BusinessService.json b/data/as/30019166/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc3ffea381
--- /dev/null
+++ b/data/as/30019166/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019166",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019166/egov-location/boundary-data.json b/data/as/30019166/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b1bc738670
--- /dev/null
+++ b/data/as/30019166/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019166",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAGANNATHPUR PWSS (NEW)",
+                "localname": "JAGANNATHPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAGANNATHPUR PWSS (NEW)",
+                        "localname": "JAGANNATHPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAGANNATHPUR PWSS (NEW)",
+                "localname": "JAGANNATHPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAGANNATHPUR PWSS (NEW)",
+                        "localname": "JAGANNATHPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019166/ws-services-calculation/Penalty.json b/data/as/30019166/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c644712f7b
--- /dev/null
+++ b/data/as/30019166/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019166",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019166/ws-services-calculation/WCBillingSlab.json b/data/as/30019166/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..523e4b9224
--- /dev/null
+++ b/data/as/30019166/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019166",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019168/BillingService/BusinessService.json b/data/as/30019168/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2996c4d3d8
--- /dev/null
+++ b/data/as/30019168/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019168",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019168/egov-location/boundary-data.json b/data/as/30019168/egov-location/boundary-data.json
new file mode 100644
index 0000000000..67f7bd68ea
--- /dev/null
+++ b/data/as/30019168/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019168",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BINYACHAL PWSS(NEW)",
+                "localname": "BINYACHAL PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BINYACHAL PWSS(NEW)",
+                        "localname": "BINYACHAL PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BINYACHAL PWSS(NEW)",
+                "localname": "BINYACHAL PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BINYACHAL PWSS(NEW)",
+                        "localname": "BINYACHAL PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019168/ws-services-calculation/Penalty.json b/data/as/30019168/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..876888f04a
--- /dev/null
+++ b/data/as/30019168/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019168",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019168/ws-services-calculation/WCBillingSlab.json b/data/as/30019168/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..01c14cd5cc
--- /dev/null
+++ b/data/as/30019168/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019168",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019170/BillingService/BusinessService.json b/data/as/30019170/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4755751388
--- /dev/null
+++ b/data/as/30019170/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019170",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019170/egov-location/boundary-data.json b/data/as/30019170/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe0f109562
--- /dev/null
+++ b/data/as/30019170/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019170",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALAGAPARA PWSS(NEW)",
+                "localname": "NALAGAPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALAGAPARA PWSS(NEW)",
+                        "localname": "NALAGAPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALAGAPARA PWSS(NEW)",
+                "localname": "NALAGAPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALAGAPARA PWSS(NEW)",
+                        "localname": "NALAGAPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019170/ws-services-calculation/Penalty.json b/data/as/30019170/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7954b12f63
--- /dev/null
+++ b/data/as/30019170/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019170",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019170/ws-services-calculation/WCBillingSlab.json b/data/as/30019170/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aa72ef4cde
--- /dev/null
+++ b/data/as/30019170/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019170",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019171/BillingService/BusinessService.json b/data/as/30019171/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1bd1469157
--- /dev/null
+++ b/data/as/30019171/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019171",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019171/egov-location/boundary-data.json b/data/as/30019171/egov-location/boundary-data.json
new file mode 100644
index 0000000000..62edaa303d
--- /dev/null
+++ b/data/as/30019171/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019171",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PT-I PWSS(NEW)",
+                "localname": "BAPURBHITA PT-I PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019171",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PT-I PWSS(NEW)",
+                        "localname": "BAPURBHITA PT-I PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PT-I PWSS(NEW)",
+                "localname": "BAPURBHITA PT-I PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019171",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PT-I PWSS(NEW)",
+                        "localname": "BAPURBHITA PT-I PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019171/ws-services-calculation/Penalty.json b/data/as/30019171/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6ff04d425f
--- /dev/null
+++ b/data/as/30019171/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019171",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019171/ws-services-calculation/WCBillingSlab.json b/data/as/30019171/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dee7952937
--- /dev/null
+++ b/data/as/30019171/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019171",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019173/BillingService/BusinessService.json b/data/as/30019173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3554c80f8e
--- /dev/null
+++ b/data/as/30019173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019173/egov-location/boundary-data.json b/data/as/30019173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87107b16fb
--- /dev/null
+++ b/data/as/30019173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATHKHOLA PWSS (NEW)",
+                "localname": "HATHKHOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATHKHOLA PWSS (NEW)",
+                        "localname": "HATHKHOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATHKHOLA PWSS (NEW)",
+                "localname": "HATHKHOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATHKHOLA PWSS (NEW)",
+                        "localname": "HATHKHOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019173/ws-services-calculation/Penalty.json b/data/as/30019173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..abae81acfa
--- /dev/null
+++ b/data/as/30019173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019173/ws-services-calculation/WCBillingSlab.json b/data/as/30019173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..82d3fc33d0
--- /dev/null
+++ b/data/as/30019173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019266/BillingService/BusinessService.json b/data/as/30019266/BillingService/BusinessService.json
new file mode 100644
index 0000000000..08adc9631d
--- /dev/null
+++ b/data/as/30019266/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019266",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019266/egov-location/boundary-data.json b/data/as/30019266/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3dcacee287
--- /dev/null
+++ b/data/as/30019266/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019266",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALUDUB GAON PWSS",
+                "localname": "KATHALUDUB GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019266",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALUDUB GAON PWSS",
+                        "localname": "KATHALUDUB GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALUDUB GAON PWSS",
+                "localname": "KATHALUDUB GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019266",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALUDUB GAON PWSS",
+                        "localname": "KATHALUDUB GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019266/ws-services-calculation/Penalty.json b/data/as/30019266/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..982cc1490f
--- /dev/null
+++ b/data/as/30019266/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019266",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019266/ws-services-calculation/WCBillingSlab.json b/data/as/30019266/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f85d47088d
--- /dev/null
+++ b/data/as/30019266/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019266",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019465/BillingService/BusinessService.json b/data/as/30019465/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ce6789e01
--- /dev/null
+++ b/data/as/30019465/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019465",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019465/egov-location/boundary-data.json b/data/as/30019465/egov-location/boundary-data.json
new file mode 100644
index 0000000000..472e308e5c
--- /dev/null
+++ b/data/as/30019465/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019465",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 3 CHARIALI PWSS",
+                "localname": "NO 3 CHARIALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 3 CHARIALI PWSS",
+                        "localname": "NO 3 CHARIALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 3 CHARIALI PWSS",
+                "localname": "NO 3 CHARIALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 3 CHARIALI PWSS",
+                        "localname": "NO 3 CHARIALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019465/ws-services-calculation/Penalty.json b/data/as/30019465/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e2ec5e4ee1
--- /dev/null
+++ b/data/as/30019465/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019465",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019465/ws-services-calculation/WCBillingSlab.json b/data/as/30019465/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c2bb11a599
--- /dev/null
+++ b/data/as/30019465/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019465",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019506/BillingService/BusinessService.json b/data/as/30019506/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f045741e8
--- /dev/null
+++ b/data/as/30019506/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019506",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019506/egov-location/boundary-data.json b/data/as/30019506/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29889f1f5b
--- /dev/null
+++ b/data/as/30019506/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019506",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                "localname": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                        "localname": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                "localname": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                        "localname": "MORISHBARI FERRARJHAR PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019506/ws-services-calculation/Penalty.json b/data/as/30019506/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..121a27a49c
--- /dev/null
+++ b/data/as/30019506/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019506",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019506/ws-services-calculation/WCBillingSlab.json b/data/as/30019506/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c08cf1ef5
--- /dev/null
+++ b/data/as/30019506/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019506",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019535/BillingService/BusinessService.json b/data/as/30019535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d3c4a375bf
--- /dev/null
+++ b/data/as/30019535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019535/egov-location/boundary-data.json b/data/as/30019535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e46231f4d9
--- /dev/null
+++ b/data/as/30019535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUBAKURA PUBPARA PWSS(NEW)",
+                "localname": "DHUBAKURA PUBPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUBAKURA PUBPARA PWSS(NEW)",
+                        "localname": "DHUBAKURA PUBPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUBAKURA PUBPARA PWSS(NEW)",
+                "localname": "DHUBAKURA PUBPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUBAKURA PUBPARA PWSS(NEW)",
+                        "localname": "DHUBAKURA PUBPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019535/ws-services-calculation/Penalty.json b/data/as/30019535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5908021aed
--- /dev/null
+++ b/data/as/30019535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019535/ws-services-calculation/WCBillingSlab.json b/data/as/30019535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d9e7b8413
--- /dev/null
+++ b/data/as/30019535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019544/BillingService/BusinessService.json b/data/as/30019544/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55df9f6615
--- /dev/null
+++ b/data/as/30019544/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019544",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019544/egov-location/boundary-data.json b/data/as/30019544/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f426bafcb
--- /dev/null
+++ b/data/as/30019544/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019544",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOBDARVITA PWSS(NEW)",
+                "localname": "JOBDARVITA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019544",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOBDARVITA PWSS(NEW)",
+                        "localname": "JOBDARVITA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOBDARVITA PWSS(NEW)",
+                "localname": "JOBDARVITA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019544",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOBDARVITA PWSS(NEW)",
+                        "localname": "JOBDARVITA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019544/ws-services-calculation/Penalty.json b/data/as/30019544/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71802a83d4
--- /dev/null
+++ b/data/as/30019544/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019544",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019544/ws-services-calculation/WCBillingSlab.json b/data/as/30019544/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5226ca850f
--- /dev/null
+++ b/data/as/30019544/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019544",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019572/BillingService/BusinessService.json b/data/as/30019572/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b8ba794e1
--- /dev/null
+++ b/data/as/30019572/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019572",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019572/egov-location/boundary-data.json b/data/as/30019572/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e2974556d3
--- /dev/null
+++ b/data/as/30019572/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019572",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI PT-III PWSS(NEW)",
+                "localname": "DIGHALI PT-III PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019572",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI PT-III PWSS(NEW)",
+                        "localname": "DIGHALI PT-III PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI PT-III PWSS(NEW)",
+                "localname": "DIGHALI PT-III PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019572",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI PT-III PWSS(NEW)",
+                        "localname": "DIGHALI PT-III PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019572/ws-services-calculation/Penalty.json b/data/as/30019572/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26478a7790
--- /dev/null
+++ b/data/as/30019572/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019572",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019572/ws-services-calculation/WCBillingSlab.json b/data/as/30019572/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd0dd4fedd
--- /dev/null
+++ b/data/as/30019572/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019572",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019680/BillingService/BusinessService.json b/data/as/30019680/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a11ed32d6c
--- /dev/null
+++ b/data/as/30019680/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019680",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019680/egov-location/boundary-data.json b/data/as/30019680/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0edf60b579
--- /dev/null
+++ b/data/as/30019680/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019680",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYNAGAR NO-2 PWSS",
+                "localname": "JOYNAGAR NO-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYNAGAR NO-2 PWSS",
+                        "localname": "JOYNAGAR NO-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYNAGAR NO-2 PWSS",
+                "localname": "JOYNAGAR NO-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYNAGAR NO-2 PWSS",
+                        "localname": "JOYNAGAR NO-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019680/ws-services-calculation/Penalty.json b/data/as/30019680/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e3a158561
--- /dev/null
+++ b/data/as/30019680/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019680",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019680/ws-services-calculation/WCBillingSlab.json b/data/as/30019680/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f14aeef3bf
--- /dev/null
+++ b/data/as/30019680/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019680",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019686/BillingService/BusinessService.json b/data/as/30019686/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fdb503c190
--- /dev/null
+++ b/data/as/30019686/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019686",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019686/egov-location/boundary-data.json b/data/as/30019686/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d549c0e642
--- /dev/null
+++ b/data/as/30019686/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019686",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMGAON NO. 2 PWSS",
+                "localname": "BAMGAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMGAON NO. 2 PWSS",
+                        "localname": "BAMGAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMGAON NO. 2 PWSS",
+                "localname": "BAMGAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMGAON NO. 2 PWSS",
+                        "localname": "BAMGAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019686/ws-services-calculation/Penalty.json b/data/as/30019686/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f79f06401d
--- /dev/null
+++ b/data/as/30019686/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019686",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019686/ws-services-calculation/WCBillingSlab.json b/data/as/30019686/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..456dfeb570
--- /dev/null
+++ b/data/as/30019686/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019686",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019793/BillingService/BusinessService.json b/data/as/30019793/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e29d685473
--- /dev/null
+++ b/data/as/30019793/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019793",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019793/egov-location/boundary-data.json b/data/as/30019793/egov-location/boundary-data.json
new file mode 100644
index 0000000000..77b801f5ed
--- /dev/null
+++ b/data/as/30019793/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019793",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAROWA BAGICHA NO. 1 PWSS",
+                "localname": "PAROWA BAGICHA NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAROWA BAGICHA NO. 1 PWSS",
+                        "localname": "PAROWA BAGICHA NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAROWA BAGICHA NO. 1 PWSS",
+                "localname": "PAROWA BAGICHA NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAROWA BAGICHA NO. 1 PWSS",
+                        "localname": "PAROWA BAGICHA NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019793/ws-services-calculation/Penalty.json b/data/as/30019793/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5195ca147
--- /dev/null
+++ b/data/as/30019793/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019793",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019793/ws-services-calculation/WCBillingSlab.json b/data/as/30019793/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b0a1047a61
--- /dev/null
+++ b/data/as/30019793/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019793",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019799/BillingService/BusinessService.json b/data/as/30019799/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32d15e99a9
--- /dev/null
+++ b/data/as/30019799/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019799",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019799/egov-location/boundary-data.json b/data/as/30019799/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8c9ab7386
--- /dev/null
+++ b/data/as/30019799/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019799",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUDAMGHAT MIRI PWSS",
+                "localname": "GUDAMGHAT MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUDAMGHAT MIRI PWSS",
+                        "localname": "GUDAMGHAT MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUDAMGHAT MIRI PWSS",
+                "localname": "GUDAMGHAT MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUDAMGHAT MIRI PWSS",
+                        "localname": "GUDAMGHAT MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019799/ws-services-calculation/Penalty.json b/data/as/30019799/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d35a87e025
--- /dev/null
+++ b/data/as/30019799/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019799",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019799/ws-services-calculation/WCBillingSlab.json b/data/as/30019799/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b8c47f65ac
--- /dev/null
+++ b/data/as/30019799/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019799",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019826/BillingService/BusinessService.json b/data/as/30019826/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90a64fcd53
--- /dev/null
+++ b/data/as/30019826/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019826",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019826/egov-location/boundary-data.json b/data/as/30019826/egov-location/boundary-data.json
new file mode 100644
index 0000000000..01a660af89
--- /dev/null
+++ b/data/as/30019826/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019826",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                "localname": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019826",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                        "localname": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                "localname": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019826",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                        "localname": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019826/ws-services-calculation/Penalty.json b/data/as/30019826/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..18763050f5
--- /dev/null
+++ b/data/as/30019826/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019826",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019826/ws-services-calculation/WCBillingSlab.json b/data/as/30019826/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6583fb0915
--- /dev/null
+++ b/data/as/30019826/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019826",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019832/BillingService/BusinessService.json b/data/as/30019832/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e633f38232
--- /dev/null
+++ b/data/as/30019832/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30019832",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019832/egov-location/boundary-data.json b/data/as/30019832/egov-location/boundary-data.json
new file mode 100644
index 0000000000..836d5f9e64
--- /dev/null
+++ b/data/as/30019832/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30019832",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANPARA TELIPARA PWSS(NEW)",
+                "localname": "PURANPARA TELIPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANPARA TELIPARA PWSS(NEW)",
+                        "localname": "PURANPARA TELIPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANPARA TELIPARA PWSS(NEW)",
+                "localname": "PURANPARA TELIPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30019832",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANPARA TELIPARA PWSS(NEW)",
+                        "localname": "PURANPARA TELIPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019832/ws-services-calculation/Penalty.json b/data/as/30019832/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1043a5522f
--- /dev/null
+++ b/data/as/30019832/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30019832",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30019832/ws-services-calculation/WCBillingSlab.json b/data/as/30019832/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e7548f81a7
--- /dev/null
+++ b/data/as/30019832/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30019832",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020076/BillingService/BusinessService.json b/data/as/30020076/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d344d9d6f7
--- /dev/null
+++ b/data/as/30020076/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020076",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020076/egov-location/boundary-data.json b/data/as/30020076/egov-location/boundary-data.json
new file mode 100644
index 0000000000..792a184513
--- /dev/null
+++ b/data/as/30020076/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020076",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OSURMARI PATHAR PWSS",
+                "localname": "OSURMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020076",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OSURMARI PATHAR PWSS",
+                        "localname": "OSURMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OSURMARI PATHAR PWSS",
+                "localname": "OSURMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020076",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OSURMARI PATHAR PWSS",
+                        "localname": "OSURMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020076/ws-services-calculation/Penalty.json b/data/as/30020076/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..708e677873
--- /dev/null
+++ b/data/as/30020076/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020076",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020076/ws-services-calculation/WCBillingSlab.json b/data/as/30020076/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d17bf34013
--- /dev/null
+++ b/data/as/30020076/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020076",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020201/BillingService/BusinessService.json b/data/as/30020201/BillingService/BusinessService.json
new file mode 100644
index 0000000000..600e6967f7
--- /dev/null
+++ b/data/as/30020201/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020201",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020201/egov-location/boundary-data.json b/data/as/30020201/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a3328fed0
--- /dev/null
+++ b/data/as/30020201/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020201",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                "localname": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020201",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                        "localname": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                "localname": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020201",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                        "localname": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020201/ws-services-calculation/Penalty.json b/data/as/30020201/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..328452fa8e
--- /dev/null
+++ b/data/as/30020201/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020201",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020201/ws-services-calculation/WCBillingSlab.json b/data/as/30020201/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..55cec2c376
--- /dev/null
+++ b/data/as/30020201/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020201",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020202/BillingService/BusinessService.json b/data/as/30020202/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e69b9474fd
--- /dev/null
+++ b/data/as/30020202/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020202",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020202/egov-location/boundary-data.json b/data/as/30020202/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e47fb0f91
--- /dev/null
+++ b/data/as/30020202/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020202",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BILL DONGA PWSS",
+                "localname": "BILL DONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BILL DONGA PWSS",
+                        "localname": "BILL DONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BILL DONGA PWSS",
+                "localname": "BILL DONGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BILL DONGA PWSS",
+                        "localname": "BILL DONGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020202/ws-services-calculation/Penalty.json b/data/as/30020202/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b4d063d30c
--- /dev/null
+++ b/data/as/30020202/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020202",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020202/ws-services-calculation/WCBillingSlab.json b/data/as/30020202/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..425f3c6c31
--- /dev/null
+++ b/data/as/30020202/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020202",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020369/BillingService/BusinessService.json b/data/as/30020369/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b2da32ac3e
--- /dev/null
+++ b/data/as/30020369/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020369",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020369/egov-location/boundary-data.json b/data/as/30020369/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1b29446a76
--- /dev/null
+++ b/data/as/30020369/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020369",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI BAGAN LINE NO 5",
+                "localname": "DHEKIAJULI BAGAN LINE NO 5",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020369",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI BAGAN LINE NO 5",
+                        "localname": "DHEKIAJULI BAGAN LINE NO 5",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI BAGAN LINE NO 5",
+                "localname": "DHEKIAJULI BAGAN LINE NO 5",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020369",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI BAGAN LINE NO 5",
+                        "localname": "DHEKIAJULI BAGAN LINE NO 5",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020369/ws-services-calculation/Penalty.json b/data/as/30020369/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..607d264373
--- /dev/null
+++ b/data/as/30020369/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020369",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020369/ws-services-calculation/WCBillingSlab.json b/data/as/30020369/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..26b38e60f2
--- /dev/null
+++ b/data/as/30020369/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020369",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020383/BillingService/BusinessService.json b/data/as/30020383/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31434e6936
--- /dev/null
+++ b/data/as/30020383/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020383",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020383/egov-location/boundary-data.json b/data/as/30020383/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1af7196121
--- /dev/null
+++ b/data/as/30020383/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020383",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 NATUN SIRAJULI PWSS",
+                "localname": "NO 2 NATUN SIRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 NATUN SIRAJULI PWSS",
+                        "localname": "NO 2 NATUN SIRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 2 NATUN SIRAJULI PWSS",
+                "localname": "NO 2 NATUN SIRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 2 NATUN SIRAJULI PWSS",
+                        "localname": "NO 2 NATUN SIRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020383/ws-services-calculation/Penalty.json b/data/as/30020383/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db78f4d98e
--- /dev/null
+++ b/data/as/30020383/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020383",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020383/ws-services-calculation/WCBillingSlab.json b/data/as/30020383/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f92aa8be31
--- /dev/null
+++ b/data/as/30020383/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020383",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020502/BillingService/BusinessService.json b/data/as/30020502/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ea3a4f45e
--- /dev/null
+++ b/data/as/30020502/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020502",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020502/egov-location/boundary-data.json b/data/as/30020502/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70e6e0fb29
--- /dev/null
+++ b/data/as/30020502/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020502",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 NARAYANPUR PATHAR PWSS",
+                "localname": "NO.1 NARAYANPUR PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 NARAYANPUR PATHAR PWSS",
+                        "localname": "NO.1 NARAYANPUR PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 NARAYANPUR PATHAR PWSS",
+                "localname": "NO.1 NARAYANPUR PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 NARAYANPUR PATHAR PWSS",
+                        "localname": "NO.1 NARAYANPUR PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020502/ws-services-calculation/Penalty.json b/data/as/30020502/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a6a6c587cd
--- /dev/null
+++ b/data/as/30020502/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020502",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020502/ws-services-calculation/WCBillingSlab.json b/data/as/30020502/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..be0d3a9a30
--- /dev/null
+++ b/data/as/30020502/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020502",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020635/BillingService/BusinessService.json b/data/as/30020635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4bb14cb80b
--- /dev/null
+++ b/data/as/30020635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020635/egov-location/boundary-data.json b/data/as/30020635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35c0d7600a
--- /dev/null
+++ b/data/as/30020635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALKILLAH PWSS (NEW)",
+                "localname": "RAKHALKILLAH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALKILLAH PWSS (NEW)",
+                        "localname": "RAKHALKILLAH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALKILLAH PWSS (NEW)",
+                "localname": "RAKHALKILLAH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALKILLAH PWSS (NEW)",
+                        "localname": "RAKHALKILLAH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020635/ws-services-calculation/Penalty.json b/data/as/30020635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a5df0aee12
--- /dev/null
+++ b/data/as/30020635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020635/ws-services-calculation/WCBillingSlab.json b/data/as/30020635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9fa87e98a
--- /dev/null
+++ b/data/as/30020635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020637/BillingService/BusinessService.json b/data/as/30020637/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35e37cec4c
--- /dev/null
+++ b/data/as/30020637/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020637",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020637/egov-location/boundary-data.json b/data/as/30020637/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad0447a36e
--- /dev/null
+++ b/data/as/30020637/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020637",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BINDUKURI PWSS",
+                "localname": "BINDUKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020637",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BINDUKURI PWSS",
+                        "localname": "BINDUKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BINDUKURI PWSS",
+                "localname": "BINDUKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020637",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BINDUKURI PWSS",
+                        "localname": "BINDUKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020637/ws-services-calculation/Penalty.json b/data/as/30020637/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5ecdb70107
--- /dev/null
+++ b/data/as/30020637/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020637",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020637/ws-services-calculation/WCBillingSlab.json b/data/as/30020637/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e7f178acd
--- /dev/null
+++ b/data/as/30020637/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020637",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020760/BillingService/BusinessService.json b/data/as/30020760/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ce8054a3e
--- /dev/null
+++ b/data/as/30020760/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020760",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020760/egov-location/boundary-data.json b/data/as/30020760/egov-location/boundary-data.json
new file mode 100644
index 0000000000..819eec8abc
--- /dev/null
+++ b/data/as/30020760/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020760",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 ULUBARI",
+                "localname": "NO.1 ULUBARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020760",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 ULUBARI",
+                        "localname": "NO.1 ULUBARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 ULUBARI",
+                "localname": "NO.1 ULUBARI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020760",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 ULUBARI",
+                        "localname": "NO.1 ULUBARI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020760/ws-services-calculation/Penalty.json b/data/as/30020760/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05f7b615c3
--- /dev/null
+++ b/data/as/30020760/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020760",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020760/ws-services-calculation/WCBillingSlab.json b/data/as/30020760/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f6bf28479
--- /dev/null
+++ b/data/as/30020760/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020760",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020766/BillingService/BusinessService.json b/data/as/30020766/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5212b2cad
--- /dev/null
+++ b/data/as/30020766/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020766",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020766/egov-location/boundary-data.json b/data/as/30020766/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce5a195b40
--- /dev/null
+++ b/data/as/30020766/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020766",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERBHERI GAON PWSS",
+                "localname": "BHERBHERI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020766",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERBHERI GAON PWSS",
+                        "localname": "BHERBHERI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERBHERI GAON PWSS",
+                "localname": "BHERBHERI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020766",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERBHERI GAON PWSS",
+                        "localname": "BHERBHERI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020766/ws-services-calculation/Penalty.json b/data/as/30020766/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d131b37bfa
--- /dev/null
+++ b/data/as/30020766/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020766",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020766/ws-services-calculation/WCBillingSlab.json b/data/as/30020766/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ccc0fb93bc
--- /dev/null
+++ b/data/as/30020766/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020766",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020777/BillingService/BusinessService.json b/data/as/30020777/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b671c93c6
--- /dev/null
+++ b/data/as/30020777/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020777",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020777/egov-location/boundary-data.json b/data/as/30020777/egov-location/boundary-data.json
new file mode 100644
index 0000000000..83c26f7514
--- /dev/null
+++ b/data/as/30020777/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020777",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOORBASTI GAON",
+                "localname": "GOORBASTI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOORBASTI GAON",
+                        "localname": "GOORBASTI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOORBASTI GAON",
+                "localname": "GOORBASTI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOORBASTI GAON",
+                        "localname": "GOORBASTI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020777/ws-services-calculation/Penalty.json b/data/as/30020777/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9704e19753
--- /dev/null
+++ b/data/as/30020777/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020777",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020777/ws-services-calculation/WCBillingSlab.json b/data/as/30020777/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db4a1fae1a
--- /dev/null
+++ b/data/as/30020777/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020777",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020972/BillingService/BusinessService.json b/data/as/30020972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8df10b33e1
--- /dev/null
+++ b/data/as/30020972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30020972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020972/egov-location/boundary-data.json b/data/as/30020972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..77c340b259
--- /dev/null
+++ b/data/as/30020972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30020972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANGA MANDIR ANGANWADI",
+                "localname": "BHANGA MANDIR ANGANWADI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANGA MANDIR ANGANWADI",
+                        "localname": "BHANGA MANDIR ANGANWADI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANGA MANDIR ANGANWADI",
+                "localname": "BHANGA MANDIR ANGANWADI",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30020972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANGA MANDIR ANGANWADI",
+                        "localname": "BHANGA MANDIR ANGANWADI",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020972/ws-services-calculation/Penalty.json b/data/as/30020972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b54e0df2c
--- /dev/null
+++ b/data/as/30020972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30020972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30020972/ws-services-calculation/WCBillingSlab.json b/data/as/30020972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..14d01822ca
--- /dev/null
+++ b/data/as/30020972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30020972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021055/BillingService/BusinessService.json b/data/as/30021055/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa1e9fd9cc
--- /dev/null
+++ b/data/as/30021055/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30021055",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021055/egov-location/boundary-data.json b/data/as/30021055/egov-location/boundary-data.json
new file mode 100644
index 0000000000..170b0c3596
--- /dev/null
+++ b/data/as/30021055/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30021055",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAKUCHI NO 1",
+                "localname": "KALAKUCHI NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAKUCHI NO 1",
+                        "localname": "KALAKUCHI NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAKUCHI NO 1",
+                "localname": "KALAKUCHI NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAKUCHI NO 1",
+                        "localname": "KALAKUCHI NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021055/ws-services-calculation/Penalty.json b/data/as/30021055/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2884db3961
--- /dev/null
+++ b/data/as/30021055/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30021055",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021055/ws-services-calculation/WCBillingSlab.json b/data/as/30021055/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a3d606a48c
--- /dev/null
+++ b/data/as/30021055/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30021055",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021475/BillingService/BusinessService.json b/data/as/30021475/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e74c3d760
--- /dev/null
+++ b/data/as/30021475/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30021475",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021475/egov-location/boundary-data.json b/data/as/30021475/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a1455369f
--- /dev/null
+++ b/data/as/30021475/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30021475",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATARIHARA PWSS (NEW)",
+                "localname": "KATARIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATARIHARA PWSS (NEW)",
+                        "localname": "KATARIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATARIHARA PWSS (NEW)",
+                "localname": "KATARIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATARIHARA PWSS (NEW)",
+                        "localname": "KATARIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021475/ws-services-calculation/Penalty.json b/data/as/30021475/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d194f3e6f
--- /dev/null
+++ b/data/as/30021475/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30021475",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021475/ws-services-calculation/WCBillingSlab.json b/data/as/30021475/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a8cbd3250
--- /dev/null
+++ b/data/as/30021475/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30021475",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021482/BillingService/BusinessService.json b/data/as/30021482/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2f52f78c29
--- /dev/null
+++ b/data/as/30021482/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30021482",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021482/egov-location/boundary-data.json b/data/as/30021482/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b60ba2e1e
--- /dev/null
+++ b/data/as/30021482/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30021482",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                "localname": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                        "localname": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                "localname": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                        "localname": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021482/ws-services-calculation/Penalty.json b/data/as/30021482/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c95d56931a
--- /dev/null
+++ b/data/as/30021482/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30021482",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021482/ws-services-calculation/WCBillingSlab.json b/data/as/30021482/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0626837c2e
--- /dev/null
+++ b/data/as/30021482/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30021482",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021560/BillingService/BusinessService.json b/data/as/30021560/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09fc9b53d6
--- /dev/null
+++ b/data/as/30021560/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30021560",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021560/egov-location/boundary-data.json b/data/as/30021560/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a5852761ff
--- /dev/null
+++ b/data/as/30021560/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30021560",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUMAPARA PWSS (NEW)",
+                "localname": "DUMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021560",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUMAPARA PWSS (NEW)",
+                        "localname": "DUMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUMAPARA PWSS (NEW)",
+                "localname": "DUMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021560",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUMAPARA PWSS (NEW)",
+                        "localname": "DUMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021560/ws-services-calculation/Penalty.json b/data/as/30021560/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..791244ccee
--- /dev/null
+++ b/data/as/30021560/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30021560",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021560/ws-services-calculation/WCBillingSlab.json b/data/as/30021560/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b33f839ff
--- /dev/null
+++ b/data/as/30021560/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30021560",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021973/BillingService/BusinessService.json b/data/as/30021973/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d9021b9d10
--- /dev/null
+++ b/data/as/30021973/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30021973",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021973/egov-location/boundary-data.json b/data/as/30021973/egov-location/boundary-data.json
new file mode 100644
index 0000000000..592de68260
--- /dev/null
+++ b/data/as/30021973/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30021973",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHATIPARA MAJORPARA PWSS (NEW)",
+                "localname": "BHATIPARA MAJORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHATIPARA MAJORPARA PWSS (NEW)",
+                        "localname": "BHATIPARA MAJORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHATIPARA MAJORPARA PWSS (NEW)",
+                "localname": "BHATIPARA MAJORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHATIPARA MAJORPARA PWSS (NEW)",
+                        "localname": "BHATIPARA MAJORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021973/ws-services-calculation/Penalty.json b/data/as/30021973/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3955082442
--- /dev/null
+++ b/data/as/30021973/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30021973",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021973/ws-services-calculation/WCBillingSlab.json b/data/as/30021973/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e47ec75cc2
--- /dev/null
+++ b/data/as/30021973/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30021973",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021987/BillingService/BusinessService.json b/data/as/30021987/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8131db12a3
--- /dev/null
+++ b/data/as/30021987/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30021987",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021987/egov-location/boundary-data.json b/data/as/30021987/egov-location/boundary-data.json
new file mode 100644
index 0000000000..715d2eddb8
--- /dev/null
+++ b/data/as/30021987/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30021987",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATOGAON BARMANPARA PWSS (NEW)",
+                "localname": "HATOGAON BARMANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021987",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATOGAON BARMANPARA PWSS (NEW)",
+                        "localname": "HATOGAON BARMANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATOGAON BARMANPARA PWSS (NEW)",
+                "localname": "HATOGAON BARMANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30021987",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATOGAON BARMANPARA PWSS (NEW)",
+                        "localname": "HATOGAON BARMANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021987/ws-services-calculation/Penalty.json b/data/as/30021987/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc8f1e2414
--- /dev/null
+++ b/data/as/30021987/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30021987",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30021987/ws-services-calculation/WCBillingSlab.json b/data/as/30021987/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4008271530
--- /dev/null
+++ b/data/as/30021987/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30021987",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022258/BillingService/BusinessService.json b/data/as/30022258/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5f326d890
--- /dev/null
+++ b/data/as/30022258/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022258",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022258/egov-location/boundary-data.json b/data/as/30022258/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8f33a7a71c
--- /dev/null
+++ b/data/as/30022258/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022258",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAIMARI NO.2 PWSS(NEW)",
+                "localname": "CHARAIMARI NO.2 PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022258",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAIMARI NO.2 PWSS(NEW)",
+                        "localname": "CHARAIMARI NO.2 PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAIMARI NO.2 PWSS(NEW)",
+                "localname": "CHARAIMARI NO.2 PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022258",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAIMARI NO.2 PWSS(NEW)",
+                        "localname": "CHARAIMARI NO.2 PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022258/ws-services-calculation/Penalty.json b/data/as/30022258/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b1e1611cb
--- /dev/null
+++ b/data/as/30022258/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022258",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022258/ws-services-calculation/WCBillingSlab.json b/data/as/30022258/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f7852ff3c
--- /dev/null
+++ b/data/as/30022258/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022258",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022299/BillingService/BusinessService.json b/data/as/30022299/BillingService/BusinessService.json
new file mode 100644
index 0000000000..63de878dd5
--- /dev/null
+++ b/data/as/30022299/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022299",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022299/egov-location/boundary-data.json b/data/as/30022299/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c72bb1bb39
--- /dev/null
+++ b/data/as/30022299/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022299",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BORCHALA-II PWSS",
+                "localname": "NIZ-BORCHALA-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022299",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BORCHALA-II PWSS",
+                        "localname": "NIZ-BORCHALA-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BORCHALA-II PWSS",
+                "localname": "NIZ-BORCHALA-II PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022299",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BORCHALA-II PWSS",
+                        "localname": "NIZ-BORCHALA-II PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022299/ws-services-calculation/Penalty.json b/data/as/30022299/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a5f10a94da
--- /dev/null
+++ b/data/as/30022299/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022299",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022299/ws-services-calculation/WCBillingSlab.json b/data/as/30022299/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..353bd79c14
--- /dev/null
+++ b/data/as/30022299/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022299",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022418/BillingService/BusinessService.json b/data/as/30022418/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c58d62bf80
--- /dev/null
+++ b/data/as/30022418/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022418",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022418/egov-location/boundary-data.json b/data/as/30022418/egov-location/boundary-data.json
new file mode 100644
index 0000000000..88229f3a9f
--- /dev/null
+++ b/data/as/30022418/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022418",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAIGOAN PWSS (NEW)",
+                "localname": "DHAIGOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022418",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAIGOAN PWSS (NEW)",
+                        "localname": "DHAIGOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAIGOAN PWSS (NEW)",
+                "localname": "DHAIGOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022418",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAIGOAN PWSS (NEW)",
+                        "localname": "DHAIGOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022418/ws-services-calculation/Penalty.json b/data/as/30022418/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eaa8e0deef
--- /dev/null
+++ b/data/as/30022418/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022418",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022418/ws-services-calculation/WCBillingSlab.json b/data/as/30022418/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..049f1386ff
--- /dev/null
+++ b/data/as/30022418/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022418",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022523/BillingService/BusinessService.json b/data/as/30022523/BillingService/BusinessService.json
new file mode 100644
index 0000000000..faa0196948
--- /dev/null
+++ b/data/as/30022523/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022523",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022523/egov-location/boundary-data.json b/data/as/30022523/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6e8605e4d
--- /dev/null
+++ b/data/as/30022523/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022523",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POKALAGI PWSS (NEW)",
+                "localname": "POKALAGI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022523",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POKALAGI PWSS (NEW)",
+                        "localname": "POKALAGI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POKALAGI PWSS (NEW)",
+                "localname": "POKALAGI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022523",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POKALAGI PWSS (NEW)",
+                        "localname": "POKALAGI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022523/ws-services-calculation/Penalty.json b/data/as/30022523/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..338d4ff1dc
--- /dev/null
+++ b/data/as/30022523/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022523",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022523/ws-services-calculation/WCBillingSlab.json b/data/as/30022523/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..20d65412ab
--- /dev/null
+++ b/data/as/30022523/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022523",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022537/BillingService/BusinessService.json b/data/as/30022537/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6bd82fc698
--- /dev/null
+++ b/data/as/30022537/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022537",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022537/egov-location/boundary-data.json b/data/as/30022537/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e118688bd
--- /dev/null
+++ b/data/as/30022537/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022537",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANGULKATI BATABARI PWSS (NEW)",
+                "localname": "ANGULKATI BATABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANGULKATI BATABARI PWSS (NEW)",
+                        "localname": "ANGULKATI BATABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANGULKATI BATABARI PWSS (NEW)",
+                "localname": "ANGULKATI BATABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANGULKATI BATABARI PWSS (NEW)",
+                        "localname": "ANGULKATI BATABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022537/ws-services-calculation/Penalty.json b/data/as/30022537/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..61ee076e5d
--- /dev/null
+++ b/data/as/30022537/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022537",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022537/ws-services-calculation/WCBillingSlab.json b/data/as/30022537/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f978a8018d
--- /dev/null
+++ b/data/as/30022537/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022537",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022693/BillingService/BusinessService.json b/data/as/30022693/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f455e6897f
--- /dev/null
+++ b/data/as/30022693/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022693",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022693/egov-location/boundary-data.json b/data/as/30022693/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0445b1b0fd
--- /dev/null
+++ b/data/as/30022693/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022693",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORA BELSIRI PWSS",
+                "localname": "MORA BELSIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORA BELSIRI PWSS",
+                        "localname": "MORA BELSIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORA BELSIRI PWSS",
+                "localname": "MORA BELSIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORA BELSIRI PWSS",
+                        "localname": "MORA BELSIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022693/ws-services-calculation/Penalty.json b/data/as/30022693/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a50fbda6f
--- /dev/null
+++ b/data/as/30022693/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022693",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022693/ws-services-calculation/WCBillingSlab.json b/data/as/30022693/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dfa4767154
--- /dev/null
+++ b/data/as/30022693/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022693",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022702/BillingService/BusinessService.json b/data/as/30022702/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe68d63cd2
--- /dev/null
+++ b/data/as/30022702/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022702",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022702/egov-location/boundary-data.json b/data/as/30022702/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e29441239
--- /dev/null
+++ b/data/as/30022702/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022702",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONAICHAPARA PWSS(NEW)",
+                "localname": "KONAICHAPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022702",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONAICHAPARA PWSS(NEW)",
+                        "localname": "KONAICHAPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONAICHAPARA PWSS(NEW)",
+                "localname": "KONAICHAPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022702",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONAICHAPARA PWSS(NEW)",
+                        "localname": "KONAICHAPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022702/ws-services-calculation/Penalty.json b/data/as/30022702/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..585fa7f930
--- /dev/null
+++ b/data/as/30022702/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022702",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022702/ws-services-calculation/WCBillingSlab.json b/data/as/30022702/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..28bb300778
--- /dev/null
+++ b/data/as/30022702/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022702",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022721/BillingService/BusinessService.json b/data/as/30022721/BillingService/BusinessService.json
new file mode 100644
index 0000000000..64d382dd94
--- /dev/null
+++ b/data/as/30022721/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022721",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022721/egov-location/boundary-data.json b/data/as/30022721/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea9ce9a6b7
--- /dev/null
+++ b/data/as/30022721/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022721",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB PANDOBA PWSS (NEW)",
+                "localname": "PUB PANDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB PANDOBA PWSS (NEW)",
+                        "localname": "PUB PANDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB PANDOBA PWSS (NEW)",
+                "localname": "PUB PANDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB PANDOBA PWSS (NEW)",
+                        "localname": "PUB PANDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022721/ws-services-calculation/Penalty.json b/data/as/30022721/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37e9015a69
--- /dev/null
+++ b/data/as/30022721/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022721",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022721/ws-services-calculation/WCBillingSlab.json b/data/as/30022721/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..63f0f101af
--- /dev/null
+++ b/data/as/30022721/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022721",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022760/BillingService/BusinessService.json b/data/as/30022760/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36b02ffeba
--- /dev/null
+++ b/data/as/30022760/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022760",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022760/egov-location/boundary-data.json b/data/as/30022760/egov-location/boundary-data.json
new file mode 100644
index 0000000000..825c26b181
--- /dev/null
+++ b/data/as/30022760/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022760",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PT-III PWSS (NEW)",
+                "localname": "BAPURBHITA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022760",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PT-III PWSS (NEW)",
+                        "localname": "BAPURBHITA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PT-III PWSS (NEW)",
+                "localname": "BAPURBHITA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022760",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PT-III PWSS (NEW)",
+                        "localname": "BAPURBHITA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022760/ws-services-calculation/Penalty.json b/data/as/30022760/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1550bd623e
--- /dev/null
+++ b/data/as/30022760/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022760",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022760/ws-services-calculation/WCBillingSlab.json b/data/as/30022760/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0780742c7
--- /dev/null
+++ b/data/as/30022760/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022760",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022777/BillingService/BusinessService.json b/data/as/30022777/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79057909df
--- /dev/null
+++ b/data/as/30022777/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022777",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022777/egov-location/boundary-data.json b/data/as/30022777/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad9fe29faf
--- /dev/null
+++ b/data/as/30022777/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022777",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA UJANPARA PWSS(NEW)",
+                "localname": "NALANGA UJANPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA UJANPARA PWSS(NEW)",
+                        "localname": "NALANGA UJANPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA UJANPARA PWSS(NEW)",
+                "localname": "NALANGA UJANPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022777",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA UJANPARA PWSS(NEW)",
+                        "localname": "NALANGA UJANPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022777/ws-services-calculation/Penalty.json b/data/as/30022777/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b97e9250b4
--- /dev/null
+++ b/data/as/30022777/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022777",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022777/ws-services-calculation/WCBillingSlab.json b/data/as/30022777/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..92c4ab11b7
--- /dev/null
+++ b/data/as/30022777/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022777",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022787/BillingService/BusinessService.json b/data/as/30022787/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac3bbb9209
--- /dev/null
+++ b/data/as/30022787/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022787",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022787/egov-location/boundary-data.json b/data/as/30022787/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4c9df39bac
--- /dev/null
+++ b/data/as/30022787/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022787",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA MAJERPARA PWSS (NEW)",
+                "localname": "NALANGA MAJERPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA MAJERPARA PWSS (NEW)",
+                        "localname": "NALANGA MAJERPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA MAJERPARA PWSS (NEW)",
+                "localname": "NALANGA MAJERPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA MAJERPARA PWSS (NEW)",
+                        "localname": "NALANGA MAJERPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022787/ws-services-calculation/Penalty.json b/data/as/30022787/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15ca5246b6
--- /dev/null
+++ b/data/as/30022787/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022787",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022787/ws-services-calculation/WCBillingSlab.json b/data/as/30022787/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6243bac3b3
--- /dev/null
+++ b/data/as/30022787/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022787",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022800/BillingService/BusinessService.json b/data/as/30022800/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7548061871
--- /dev/null
+++ b/data/as/30022800/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022800",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022800/egov-location/boundary-data.json b/data/as/30022800/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0561d9fff
--- /dev/null
+++ b/data/as/30022800/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022800",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAMADARPARA PWSS(NEW)",
+                "localname": "JAMADARPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAMADARPARA PWSS(NEW)",
+                        "localname": "JAMADARPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAMADARPARA PWSS(NEW)",
+                "localname": "JAMADARPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAMADARPARA PWSS(NEW)",
+                        "localname": "JAMADARPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022800/ws-services-calculation/Penalty.json b/data/as/30022800/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..98365b284c
--- /dev/null
+++ b/data/as/30022800/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022800",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022800/ws-services-calculation/WCBillingSlab.json b/data/as/30022800/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..804bd78ce7
--- /dev/null
+++ b/data/as/30022800/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022800",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022816/BillingService/BusinessService.json b/data/as/30022816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e23a145b7e
--- /dev/null
+++ b/data/as/30022816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022816/egov-location/boundary-data.json b/data/as/30022816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e84eed9d75
--- /dev/null
+++ b/data/as/30022816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAGLAPARA PWSS (NEW)",
+                "localname": "DAGLAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAGLAPARA PWSS (NEW)",
+                        "localname": "DAGLAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAGLAPARA PWSS (NEW)",
+                "localname": "DAGLAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAGLAPARA PWSS (NEW)",
+                        "localname": "DAGLAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022816/ws-services-calculation/Penalty.json b/data/as/30022816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6bac5b3b38
--- /dev/null
+++ b/data/as/30022816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022816/ws-services-calculation/WCBillingSlab.json b/data/as/30022816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a5a1e4222
--- /dev/null
+++ b/data/as/30022816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022851/BillingService/BusinessService.json b/data/as/30022851/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fccb436b09
--- /dev/null
+++ b/data/as/30022851/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022851",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022851/egov-location/boundary-data.json b/data/as/30022851/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60d0688f56
--- /dev/null
+++ b/data/as/30022851/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022851",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAKRIBORI PWSS(NEW)",
+                "localname": "MAKRIBORI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAKRIBORI PWSS(NEW)",
+                        "localname": "MAKRIBORI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAKRIBORI PWSS(NEW)",
+                "localname": "MAKRIBORI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAKRIBORI PWSS(NEW)",
+                        "localname": "MAKRIBORI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022851/ws-services-calculation/Penalty.json b/data/as/30022851/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c48762d290
--- /dev/null
+++ b/data/as/30022851/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022851",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022851/ws-services-calculation/WCBillingSlab.json b/data/as/30022851/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db46b8c140
--- /dev/null
+++ b/data/as/30022851/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022851",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022854/BillingService/BusinessService.json b/data/as/30022854/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9704066a7a
--- /dev/null
+++ b/data/as/30022854/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022854",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022854/egov-location/boundary-data.json b/data/as/30022854/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1b2f1bfaaa
--- /dev/null
+++ b/data/as/30022854/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022854",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHORPARA PWSS (NEW)",
+                "localname": "CHORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHORPARA PWSS (NEW)",
+                        "localname": "CHORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHORPARA PWSS (NEW)",
+                "localname": "CHORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHORPARA PWSS (NEW)",
+                        "localname": "CHORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022854/ws-services-calculation/Penalty.json b/data/as/30022854/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c516cc6547
--- /dev/null
+++ b/data/as/30022854/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022854",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022854/ws-services-calculation/WCBillingSlab.json b/data/as/30022854/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8e8e9ee0a
--- /dev/null
+++ b/data/as/30022854/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022854",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022858/BillingService/BusinessService.json b/data/as/30022858/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c8b1e9b72
--- /dev/null
+++ b/data/as/30022858/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022858",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022858/egov-location/boundary-data.json b/data/as/30022858/egov-location/boundary-data.json
new file mode 100644
index 0000000000..266fdf5967
--- /dev/null
+++ b/data/as/30022858/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022858",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHRITARI TITAPARA PWSS (NEW)",
+                "localname": "PAKHRITARI TITAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022858",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHRITARI TITAPARA PWSS (NEW)",
+                        "localname": "PAKHRITARI TITAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHRITARI TITAPARA PWSS (NEW)",
+                "localname": "PAKHRITARI TITAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022858",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHRITARI TITAPARA PWSS (NEW)",
+                        "localname": "PAKHRITARI TITAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022858/ws-services-calculation/Penalty.json b/data/as/30022858/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a9f711c921
--- /dev/null
+++ b/data/as/30022858/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022858",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022858/ws-services-calculation/WCBillingSlab.json b/data/as/30022858/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f20db70b59
--- /dev/null
+++ b/data/as/30022858/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022858",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022862/BillingService/BusinessService.json b/data/as/30022862/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2253bdc385
--- /dev/null
+++ b/data/as/30022862/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022862",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022862/egov-location/boundary-data.json b/data/as/30022862/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e77835c1ed
--- /dev/null
+++ b/data/as/30022862/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022862",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LEWABARI MADHYAPARA PWSS(NEW)",
+                "localname": "LEWABARI MADHYAPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022862",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LEWABARI MADHYAPARA PWSS(NEW)",
+                        "localname": "LEWABARI MADHYAPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LEWABARI MADHYAPARA PWSS(NEW)",
+                "localname": "LEWABARI MADHYAPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022862",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LEWABARI MADHYAPARA PWSS(NEW)",
+                        "localname": "LEWABARI MADHYAPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022862/ws-services-calculation/Penalty.json b/data/as/30022862/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8a9ff8f666
--- /dev/null
+++ b/data/as/30022862/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022862",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022862/ws-services-calculation/WCBillingSlab.json b/data/as/30022862/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ddf7892cf1
--- /dev/null
+++ b/data/as/30022862/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022862",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022947/BillingService/BusinessService.json b/data/as/30022947/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00d7ebd433
--- /dev/null
+++ b/data/as/30022947/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022947",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022947/egov-location/boundary-data.json b/data/as/30022947/egov-location/boundary-data.json
new file mode 100644
index 0000000000..405db0614c
--- /dev/null
+++ b/data/as/30022947/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022947",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARO BHAT KHAWA PWSS (NEW)",
+                "localname": "GARO BHAT KHAWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARO BHAT KHAWA PWSS (NEW)",
+                        "localname": "GARO BHAT KHAWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARO BHAT KHAWA PWSS (NEW)",
+                "localname": "GARO BHAT KHAWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARO BHAT KHAWA PWSS (NEW)",
+                        "localname": "GARO BHAT KHAWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022947/ws-services-calculation/Penalty.json b/data/as/30022947/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32af3412b6
--- /dev/null
+++ b/data/as/30022947/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022947",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022947/ws-services-calculation/WCBillingSlab.json b/data/as/30022947/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30de91b0c0
--- /dev/null
+++ b/data/as/30022947/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022947",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022975/BillingService/BusinessService.json b/data/as/30022975/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f9ad446a1
--- /dev/null
+++ b/data/as/30022975/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022975",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022975/egov-location/boundary-data.json b/data/as/30022975/egov-location/boundary-data.json
new file mode 100644
index 0000000000..21b24c7cf7
--- /dev/null
+++ b/data/as/30022975/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022975",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARANGABARI PWSS (NEW)",
+                "localname": "NARANGABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARANGABARI PWSS (NEW)",
+                        "localname": "NARANGABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARANGABARI PWSS (NEW)",
+                "localname": "NARANGABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARANGABARI PWSS (NEW)",
+                        "localname": "NARANGABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022975/ws-services-calculation/Penalty.json b/data/as/30022975/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4bb0b914af
--- /dev/null
+++ b/data/as/30022975/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022975",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022975/ws-services-calculation/WCBillingSlab.json b/data/as/30022975/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d60f2146e0
--- /dev/null
+++ b/data/as/30022975/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022975",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022986/BillingService/BusinessService.json b/data/as/30022986/BillingService/BusinessService.json
new file mode 100644
index 0000000000..309fb60c97
--- /dev/null
+++ b/data/as/30022986/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30022986",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022986/egov-location/boundary-data.json b/data/as/30022986/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ec5748fd54
--- /dev/null
+++ b/data/as/30022986/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30022986",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOWALMARI PWSS (NEW)",
+                "localname": "BOWALMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022986",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOWALMARI PWSS (NEW)",
+                        "localname": "BOWALMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOWALMARI PWSS (NEW)",
+                "localname": "BOWALMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30022986",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOWALMARI PWSS (NEW)",
+                        "localname": "BOWALMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022986/ws-services-calculation/Penalty.json b/data/as/30022986/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f37eb24838
--- /dev/null
+++ b/data/as/30022986/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30022986",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30022986/ws-services-calculation/WCBillingSlab.json b/data/as/30022986/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..34843c5709
--- /dev/null
+++ b/data/as/30022986/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30022986",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023075/BillingService/BusinessService.json b/data/as/30023075/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa8699e46e
--- /dev/null
+++ b/data/as/30023075/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023075",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023075/egov-location/boundary-data.json b/data/as/30023075/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35d96090d9
--- /dev/null
+++ b/data/as/30023075/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023075",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENIMARI PT-II PWSS (NEW)",
+                "localname": "CHENIMARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023075",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENIMARI PT-II PWSS (NEW)",
+                        "localname": "CHENIMARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENIMARI PT-II PWSS (NEW)",
+                "localname": "CHENIMARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023075",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENIMARI PT-II PWSS (NEW)",
+                        "localname": "CHENIMARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023075/ws-services-calculation/Penalty.json b/data/as/30023075/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65ed216fc8
--- /dev/null
+++ b/data/as/30023075/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023075",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023075/ws-services-calculation/WCBillingSlab.json b/data/as/30023075/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04bc23d6b7
--- /dev/null
+++ b/data/as/30023075/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023075",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023084/BillingService/BusinessService.json b/data/as/30023084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8dc0db5a5e
--- /dev/null
+++ b/data/as/30023084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023084/egov-location/boundary-data.json b/data/as/30023084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54093973e3
--- /dev/null
+++ b/data/as/30023084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                "localname": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                        "localname": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                "localname": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                        "localname": "SIGRI PT-I LAMBUPARA MVS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023084/ws-services-calculation/Penalty.json b/data/as/30023084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4287a9d706
--- /dev/null
+++ b/data/as/30023084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023084/ws-services-calculation/WCBillingSlab.json b/data/as/30023084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..858df56bdd
--- /dev/null
+++ b/data/as/30023084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023147/BillingService/BusinessService.json b/data/as/30023147/BillingService/BusinessService.json
new file mode 100644
index 0000000000..808b742268
--- /dev/null
+++ b/data/as/30023147/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023147",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023147/egov-location/boundary-data.json b/data/as/30023147/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d44deada5f
--- /dev/null
+++ b/data/as/30023147/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023147",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                "localname": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023147",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                        "localname": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                "localname": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023147",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                        "localname": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023147/ws-services-calculation/Penalty.json b/data/as/30023147/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46d1f0ee1d
--- /dev/null
+++ b/data/as/30023147/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023147",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023147/ws-services-calculation/WCBillingSlab.json b/data/as/30023147/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..475c18499e
--- /dev/null
+++ b/data/as/30023147/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023147",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023196/BillingService/BusinessService.json b/data/as/30023196/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a60e0cc10
--- /dev/null
+++ b/data/as/30023196/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023196",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023196/egov-location/boundary-data.json b/data/as/30023196/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2edca1963
--- /dev/null
+++ b/data/as/30023196/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023196",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 1 ARUN TE ",
+                "localname": "NO 1 ARUN TE ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023196",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 1 ARUN TE ",
+                        "localname": "NO 1 ARUN TE ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO 1 ARUN TE ",
+                "localname": "NO 1 ARUN TE ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023196",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO 1 ARUN TE ",
+                        "localname": "NO 1 ARUN TE ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023196/ws-services-calculation/Penalty.json b/data/as/30023196/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0be879c38d
--- /dev/null
+++ b/data/as/30023196/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023196",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023196/ws-services-calculation/WCBillingSlab.json b/data/as/30023196/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..757114c90e
--- /dev/null
+++ b/data/as/30023196/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023196",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023283/BillingService/BusinessService.json b/data/as/30023283/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe38e34453
--- /dev/null
+++ b/data/as/30023283/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023283",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023283/egov-location/boundary-data.json b/data/as/30023283/egov-location/boundary-data.json
new file mode 100644
index 0000000000..90de9bdf37
--- /dev/null
+++ b/data/as/30023283/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023283",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADOPARA PWSS (NEW)",
+                "localname": "ADOPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADOPARA PWSS (NEW)",
+                        "localname": "ADOPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADOPARA PWSS (NEW)",
+                "localname": "ADOPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADOPARA PWSS (NEW)",
+                        "localname": "ADOPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023283/ws-services-calculation/Penalty.json b/data/as/30023283/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..50559c7c9a
--- /dev/null
+++ b/data/as/30023283/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023283",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023283/ws-services-calculation/WCBillingSlab.json b/data/as/30023283/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e99271166d
--- /dev/null
+++ b/data/as/30023283/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023283",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023298/BillingService/BusinessService.json b/data/as/30023298/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31189ad5ef
--- /dev/null
+++ b/data/as/30023298/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023298",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023298/egov-location/boundary-data.json b/data/as/30023298/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40faaa1069
--- /dev/null
+++ b/data/as/30023298/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023298",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PT-I PWSS (NEW)",
+                "localname": "AMBARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PT-I PWSS (NEW)",
+                        "localname": "AMBARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PT-I PWSS (NEW)",
+                "localname": "AMBARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PT-I PWSS (NEW)",
+                        "localname": "AMBARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023298/ws-services-calculation/Penalty.json b/data/as/30023298/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..01a9ee2448
--- /dev/null
+++ b/data/as/30023298/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023298",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023298/ws-services-calculation/WCBillingSlab.json b/data/as/30023298/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0fef62d96d
--- /dev/null
+++ b/data/as/30023298/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023298",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023308/BillingService/BusinessService.json b/data/as/30023308/BillingService/BusinessService.json
new file mode 100644
index 0000000000..500586f584
--- /dev/null
+++ b/data/as/30023308/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023308",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023308/egov-location/boundary-data.json b/data/as/30023308/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f726d5bca
--- /dev/null
+++ b/data/as/30023308/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023308",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBUK HAKOJULI PWSS",
+                "localname": "AMBUK HAKOJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023308",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBUK HAKOJULI PWSS",
+                        "localname": "AMBUK HAKOJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBUK HAKOJULI PWSS",
+                "localname": "AMBUK HAKOJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023308",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBUK HAKOJULI PWSS",
+                        "localname": "AMBUK HAKOJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023308/ws-services-calculation/Penalty.json b/data/as/30023308/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f3f3e6076
--- /dev/null
+++ b/data/as/30023308/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023308",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023308/ws-services-calculation/WCBillingSlab.json b/data/as/30023308/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6ba4b8fd1d
--- /dev/null
+++ b/data/as/30023308/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023308",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023317/BillingService/BusinessService.json b/data/as/30023317/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b99a02deb2
--- /dev/null
+++ b/data/as/30023317/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023317",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023317/egov-location/boundary-data.json b/data/as/30023317/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a2f96f252
--- /dev/null
+++ b/data/as/30023317/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023317",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                "localname": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                        "localname": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                "localname": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                        "localname": "BUDLUNG CHANCHALIPARA PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023317/ws-services-calculation/Penalty.json b/data/as/30023317/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d23b06fbdb
--- /dev/null
+++ b/data/as/30023317/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023317",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023317/ws-services-calculation/WCBillingSlab.json b/data/as/30023317/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba24b91f5f
--- /dev/null
+++ b/data/as/30023317/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023317",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023324/BillingService/BusinessService.json b/data/as/30023324/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e73b423597
--- /dev/null
+++ b/data/as/30023324/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023324",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023324/egov-location/boundary-data.json b/data/as/30023324/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b14183f719
--- /dev/null
+++ b/data/as/30023324/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023324",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAHIBARI ALIBARI PWSS(NEW)",
+                "localname": "KAHIBARI ALIBARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAHIBARI ALIBARI PWSS(NEW)",
+                        "localname": "KAHIBARI ALIBARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAHIBARI ALIBARI PWSS(NEW)",
+                "localname": "KAHIBARI ALIBARI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAHIBARI ALIBARI PWSS(NEW)",
+                        "localname": "KAHIBARI ALIBARI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023324/ws-services-calculation/Penalty.json b/data/as/30023324/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..882908a772
--- /dev/null
+++ b/data/as/30023324/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023324",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023324/ws-services-calculation/WCBillingSlab.json b/data/as/30023324/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b3ca6667e
--- /dev/null
+++ b/data/as/30023324/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023324",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023337/BillingService/BusinessService.json b/data/as/30023337/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9eb98c23d3
--- /dev/null
+++ b/data/as/30023337/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023337",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023337/egov-location/boundary-data.json b/data/as/30023337/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1566133ade
--- /dev/null
+++ b/data/as/30023337/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023337",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOTHAKUTHI PT-I PWSS(NEW)",
+                "localname": "KOTHAKUTHI PT-I PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOTHAKUTHI PT-I PWSS(NEW)",
+                        "localname": "KOTHAKUTHI PT-I PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOTHAKUTHI PT-I PWSS(NEW)",
+                "localname": "KOTHAKUTHI PT-I PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023337",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOTHAKUTHI PT-I PWSS(NEW)",
+                        "localname": "KOTHAKUTHI PT-I PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023337/ws-services-calculation/Penalty.json b/data/as/30023337/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6a2596819
--- /dev/null
+++ b/data/as/30023337/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023337",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023337/ws-services-calculation/WCBillingSlab.json b/data/as/30023337/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d727b26ca
--- /dev/null
+++ b/data/as/30023337/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023337",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023347/BillingService/BusinessService.json b/data/as/30023347/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3eb147def5
--- /dev/null
+++ b/data/as/30023347/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023347",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023347/egov-location/boundary-data.json b/data/as/30023347/egov-location/boundary-data.json
new file mode 100644
index 0000000000..acba4f83ac
--- /dev/null
+++ b/data/as/30023347/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023347",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOTHAKUTHI PWSS(NEW)",
+                "localname": "KOTHAKUTHI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023347",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOTHAKUTHI PWSS(NEW)",
+                        "localname": "KOTHAKUTHI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOTHAKUTHI PWSS(NEW)",
+                "localname": "KOTHAKUTHI PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023347",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOTHAKUTHI PWSS(NEW)",
+                        "localname": "KOTHAKUTHI PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023347/ws-services-calculation/Penalty.json b/data/as/30023347/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db840ce156
--- /dev/null
+++ b/data/as/30023347/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023347",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023347/ws-services-calculation/WCBillingSlab.json b/data/as/30023347/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c7a934d5b
--- /dev/null
+++ b/data/as/30023347/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023347",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023360/BillingService/BusinessService.json b/data/as/30023360/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e9066a2df8
--- /dev/null
+++ b/data/as/30023360/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023360",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023360/egov-location/boundary-data.json b/data/as/30023360/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc0beb4049
--- /dev/null
+++ b/data/as/30023360/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023360",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA NO.2 PWSS(NEW)",
+                "localname": "SIMLITOLA NO.2 PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023360",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA NO.2 PWSS(NEW)",
+                        "localname": "SIMLITOLA NO.2 PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA NO.2 PWSS(NEW)",
+                "localname": "SIMLITOLA NO.2 PWSS(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023360",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA NO.2 PWSS(NEW)",
+                        "localname": "SIMLITOLA NO.2 PWSS(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023360/ws-services-calculation/Penalty.json b/data/as/30023360/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95b2abeecd
--- /dev/null
+++ b/data/as/30023360/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023360",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023360/ws-services-calculation/WCBillingSlab.json b/data/as/30023360/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac5bb4eae4
--- /dev/null
+++ b/data/as/30023360/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023360",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023708/BillingService/BusinessService.json b/data/as/30023708/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed4f5c5f22
--- /dev/null
+++ b/data/as/30023708/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023708",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023708/egov-location/boundary-data.json b/data/as/30023708/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8542f1465c
--- /dev/null
+++ b/data/as/30023708/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023708",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LUHARDUNG PWSS",
+                "localname": "LUHARDUNG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LUHARDUNG PWSS",
+                        "localname": "LUHARDUNG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LUHARDUNG PWSS",
+                "localname": "LUHARDUNG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LUHARDUNG PWSS",
+                        "localname": "LUHARDUNG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023708/ws-services-calculation/Penalty.json b/data/as/30023708/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a29e5089a
--- /dev/null
+++ b/data/as/30023708/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023708",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023708/ws-services-calculation/WCBillingSlab.json b/data/as/30023708/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0cf4fe8483
--- /dev/null
+++ b/data/as/30023708/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023708",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023894/BillingService/BusinessService.json b/data/as/30023894/BillingService/BusinessService.json
new file mode 100644
index 0000000000..02f241da8d
--- /dev/null
+++ b/data/as/30023894/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023894",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023894/egov-location/boundary-data.json b/data/as/30023894/egov-location/boundary-data.json
new file mode 100644
index 0000000000..32f54efa9f
--- /dev/null
+++ b/data/as/30023894/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023894",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-II PWSS (NEW)",
+                "localname": "KANKATA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023894",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-II PWSS (NEW)",
+                        "localname": "KANKATA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-II PWSS (NEW)",
+                "localname": "KANKATA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023894",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-II PWSS (NEW)",
+                        "localname": "KANKATA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023894/ws-services-calculation/Penalty.json b/data/as/30023894/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1ffe45b2d
--- /dev/null
+++ b/data/as/30023894/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023894",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023894/ws-services-calculation/WCBillingSlab.json b/data/as/30023894/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ffa06b39a
--- /dev/null
+++ b/data/as/30023894/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023894",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023984/BillingService/BusinessService.json b/data/as/30023984/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d13fd7603
--- /dev/null
+++ b/data/as/30023984/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023984",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023984/egov-location/boundary-data.json b/data/as/30023984/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e8e1db834
--- /dev/null
+++ b/data/as/30023984/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023984",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LATAPARA PWSS (NEW)",
+                "localname": "LATAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LATAPARA PWSS (NEW)",
+                        "localname": "LATAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LATAPARA PWSS (NEW)",
+                "localname": "LATAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LATAPARA PWSS (NEW)",
+                        "localname": "LATAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023984/ws-services-calculation/Penalty.json b/data/as/30023984/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..30196c0994
--- /dev/null
+++ b/data/as/30023984/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023984",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023984/ws-services-calculation/WCBillingSlab.json b/data/as/30023984/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e57d2a573c
--- /dev/null
+++ b/data/as/30023984/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023984",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023999/BillingService/BusinessService.json b/data/as/30023999/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36d25f00e3
--- /dev/null
+++ b/data/as/30023999/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30023999",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023999/egov-location/boundary-data.json b/data/as/30023999/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b394b684a1
--- /dev/null
+++ b/data/as/30023999/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30023999",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUPDHARA PT-II PWSS (NEW)",
+                "localname": "DHUPDHARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023999",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUPDHARA PT-II PWSS (NEW)",
+                        "localname": "DHUPDHARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUPDHARA PT-II PWSS (NEW)",
+                "localname": "DHUPDHARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30023999",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUPDHARA PT-II PWSS (NEW)",
+                        "localname": "DHUPDHARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023999/ws-services-calculation/Penalty.json b/data/as/30023999/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0fdbc10136
--- /dev/null
+++ b/data/as/30023999/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30023999",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30023999/ws-services-calculation/WCBillingSlab.json b/data/as/30023999/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b8307d6290
--- /dev/null
+++ b/data/as/30023999/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30023999",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027151/BillingService/BusinessService.json b/data/as/30027151/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2c87b7fd89
--- /dev/null
+++ b/data/as/30027151/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30027151",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027151/egov-location/boundary-data.json b/data/as/30027151/egov-location/boundary-data.json
new file mode 100644
index 0000000000..14b25dac88
--- /dev/null
+++ b/data/as/30027151/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30027151",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABIL BORO CHUBURI PWSS",
+                "localname": "NABIL BORO CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027151",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABIL BORO CHUBURI PWSS",
+                        "localname": "NABIL BORO CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABIL BORO CHUBURI PWSS",
+                "localname": "NABIL BORO CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027151",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABIL BORO CHUBURI PWSS",
+                        "localname": "NABIL BORO CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027151/ws-services-calculation/Penalty.json b/data/as/30027151/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..77c1166e32
--- /dev/null
+++ b/data/as/30027151/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30027151",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027151/ws-services-calculation/WCBillingSlab.json b/data/as/30027151/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fbca1dd243
--- /dev/null
+++ b/data/as/30027151/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30027151",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027153/BillingService/BusinessService.json b/data/as/30027153/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cfde5dee1f
--- /dev/null
+++ b/data/as/30027153/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30027153",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027153/egov-location/boundary-data.json b/data/as/30027153/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac7a0757d9
--- /dev/null
+++ b/data/as/30027153/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30027153",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSHLIMPARA PWSS (NEW)",
+                "localname": "MUSHLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSHLIMPARA PWSS (NEW)",
+                        "localname": "MUSHLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSHLIMPARA PWSS (NEW)",
+                "localname": "MUSHLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSHLIMPARA PWSS (NEW)",
+                        "localname": "MUSHLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027153/ws-services-calculation/Penalty.json b/data/as/30027153/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c062181cbd
--- /dev/null
+++ b/data/as/30027153/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30027153",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027153/ws-services-calculation/WCBillingSlab.json b/data/as/30027153/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d786737cbc
--- /dev/null
+++ b/data/as/30027153/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30027153",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027587/BillingService/BusinessService.json b/data/as/30027587/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1de7d6db82
--- /dev/null
+++ b/data/as/30027587/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30027587",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027587/egov-location/boundary-data.json b/data/as/30027587/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac8ae44824
--- /dev/null
+++ b/data/as/30027587/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30027587",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATILAR TARI PWSS (NEW)",
+                "localname": "KATILAR TARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATILAR TARI PWSS (NEW)",
+                        "localname": "KATILAR TARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATILAR TARI PWSS (NEW)",
+                "localname": "KATILAR TARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATILAR TARI PWSS (NEW)",
+                        "localname": "KATILAR TARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027587/ws-services-calculation/Penalty.json b/data/as/30027587/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e3bb98fd10
--- /dev/null
+++ b/data/as/30027587/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30027587",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027587/ws-services-calculation/WCBillingSlab.json b/data/as/30027587/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94f412b47c
--- /dev/null
+++ b/data/as/30027587/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30027587",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027681/BillingService/BusinessService.json b/data/as/30027681/BillingService/BusinessService.json
new file mode 100644
index 0000000000..691ba3098d
--- /dev/null
+++ b/data/as/30027681/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30027681",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027681/egov-location/boundary-data.json b/data/as/30027681/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c39fb5e8ef
--- /dev/null
+++ b/data/as/30027681/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30027681",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MIRI PATHAR PWSS",
+                "localname": "NO. 2 MIRI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MIRI PATHAR PWSS",
+                        "localname": "NO. 2 MIRI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MIRI PATHAR PWSS",
+                "localname": "NO. 2 MIRI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30027681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MIRI PATHAR PWSS",
+                        "localname": "NO. 2 MIRI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027681/ws-services-calculation/Penalty.json b/data/as/30027681/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..57c61af72e
--- /dev/null
+++ b/data/as/30027681/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30027681",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30027681/ws-services-calculation/WCBillingSlab.json b/data/as/30027681/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bfe5aff3ad
--- /dev/null
+++ b/data/as/30027681/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30027681",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030288/BillingService/BusinessService.json b/data/as/30030288/BillingService/BusinessService.json
new file mode 100644
index 0000000000..965d57f802
--- /dev/null
+++ b/data/as/30030288/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30030288",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030288/egov-location/boundary-data.json b/data/as/30030288/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b44f4dc408
--- /dev/null
+++ b/data/as/30030288/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30030288",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HUKAIN GAON PWSS",
+                "localname": "HUKAIN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30030288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HUKAIN GAON PWSS",
+                        "localname": "HUKAIN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HUKAIN GAON PWSS",
+                "localname": "HUKAIN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30030288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HUKAIN GAON PWSS",
+                        "localname": "HUKAIN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030288/ws-services-calculation/Penalty.json b/data/as/30030288/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef4425ca3a
--- /dev/null
+++ b/data/as/30030288/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30030288",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030288/ws-services-calculation/WCBillingSlab.json b/data/as/30030288/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37208a1f13
--- /dev/null
+++ b/data/as/30030288/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30030288",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030309/BillingService/BusinessService.json b/data/as/30030309/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8f8b4174dc
--- /dev/null
+++ b/data/as/30030309/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30030309",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030309/egov-location/boundary-data.json b/data/as/30030309/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2095a2c818
--- /dev/null
+++ b/data/as/30030309/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30030309",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARALI CHAPORI PWSS",
+                "localname": "BHARALI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30030309",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARALI CHAPORI PWSS",
+                        "localname": "BHARALI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARALI CHAPORI PWSS",
+                "localname": "BHARALI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30030309",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARALI CHAPORI PWSS",
+                        "localname": "BHARALI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030309/ws-services-calculation/Penalty.json b/data/as/30030309/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..02cf659c78
--- /dev/null
+++ b/data/as/30030309/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30030309",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030309/ws-services-calculation/WCBillingSlab.json b/data/as/30030309/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3f18afe179
--- /dev/null
+++ b/data/as/30030309/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30030309",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030458/BillingService/BusinessService.json b/data/as/30030458/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1e34f2e8f6
--- /dev/null
+++ b/data/as/30030458/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30030458",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030458/egov-location/boundary-data.json b/data/as/30030458/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce50221ed5
--- /dev/null
+++ b/data/as/30030458/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30030458",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOAL GAON PWSS",
+                "localname": "GOAL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30030458",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOAL GAON PWSS",
+                        "localname": "GOAL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOAL GAON PWSS",
+                "localname": "GOAL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30030458",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOAL GAON PWSS",
+                        "localname": "GOAL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030458/ws-services-calculation/Penalty.json b/data/as/30030458/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c838a389e2
--- /dev/null
+++ b/data/as/30030458/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30030458",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30030458/ws-services-calculation/WCBillingSlab.json b/data/as/30030458/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3c0dd4c170
--- /dev/null
+++ b/data/as/30030458/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30030458",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30031382/BillingService/BusinessService.json b/data/as/30031382/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b05659183c
--- /dev/null
+++ b/data/as/30031382/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30031382",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30031382/egov-location/boundary-data.json b/data/as/30031382/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b79de1ef6b
--- /dev/null
+++ b/data/as/30031382/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30031382",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIPUR KOROIKHOWA PWSS",
+                "localname": "HARIPUR KOROIKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30031382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIPUR KOROIKHOWA PWSS",
+                        "localname": "HARIPUR KOROIKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIPUR KOROIKHOWA PWSS",
+                "localname": "HARIPUR KOROIKHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30031382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIPUR KOROIKHOWA PWSS",
+                        "localname": "HARIPUR KOROIKHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30031382/ws-services-calculation/Penalty.json b/data/as/30031382/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..297a01a5a5
--- /dev/null
+++ b/data/as/30031382/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30031382",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30031382/ws-services-calculation/WCBillingSlab.json b/data/as/30031382/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c560e6ac60
--- /dev/null
+++ b/data/as/30031382/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30031382",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30033116/BillingService/BusinessService.json b/data/as/30033116/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45d65fcddb
--- /dev/null
+++ b/data/as/30033116/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30033116",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30033116/egov-location/boundary-data.json b/data/as/30033116/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e5bdb33539
--- /dev/null
+++ b/data/as/30033116/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30033116",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALBARI KACHARI PWSS",
+                "localname": "DALBARI KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30033116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALBARI KACHARI PWSS",
+                        "localname": "DALBARI KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALBARI KACHARI PWSS",
+                "localname": "DALBARI KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30033116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALBARI KACHARI PWSS",
+                        "localname": "DALBARI KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30033116/ws-services-calculation/Penalty.json b/data/as/30033116/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7fdda28094
--- /dev/null
+++ b/data/as/30033116/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30033116",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30033116/ws-services-calculation/WCBillingSlab.json b/data/as/30033116/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fe718b0141
--- /dev/null
+++ b/data/as/30033116/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30033116",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036349/BillingService/BusinessService.json b/data/as/30036349/BillingService/BusinessService.json
new file mode 100644
index 0000000000..210fa0925b
--- /dev/null
+++ b/data/as/30036349/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036349",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036349/egov-location/boundary-data.json b/data/as/30036349/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f55308d68
--- /dev/null
+++ b/data/as/30036349/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036349",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALINDI DOBA PWSS (NEW) PWSS",
+                "localname": "KALINDI DOBA PWSS (NEW) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036349",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALINDI DOBA PWSS (NEW) PWSS",
+                        "localname": "KALINDI DOBA PWSS (NEW) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALINDI DOBA PWSS (NEW) PWSS",
+                "localname": "KALINDI DOBA PWSS (NEW) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036349",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALINDI DOBA PWSS (NEW) PWSS",
+                        "localname": "KALINDI DOBA PWSS (NEW) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036349/ws-services-calculation/Penalty.json b/data/as/30036349/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3121c390a
--- /dev/null
+++ b/data/as/30036349/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036349",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036349/ws-services-calculation/WCBillingSlab.json b/data/as/30036349/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..337fed7d42
--- /dev/null
+++ b/data/as/30036349/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036349",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036685/BillingService/BusinessService.json b/data/as/30036685/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e4df09fba1
--- /dev/null
+++ b/data/as/30036685/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036685",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036685/egov-location/boundary-data.json b/data/as/30036685/egov-location/boundary-data.json
new file mode 100644
index 0000000000..39b20ea83c
--- /dev/null
+++ b/data/as/30036685/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036685",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR SATVENDI PWSS (NEW)",
+                "localname": "UTTAR SATVENDI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR SATVENDI PWSS (NEW)",
+                        "localname": "UTTAR SATVENDI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR SATVENDI PWSS (NEW)",
+                "localname": "UTTAR SATVENDI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR SATVENDI PWSS (NEW)",
+                        "localname": "UTTAR SATVENDI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036685/ws-services-calculation/Penalty.json b/data/as/30036685/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a33064548c
--- /dev/null
+++ b/data/as/30036685/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036685",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036685/ws-services-calculation/WCBillingSlab.json b/data/as/30036685/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..413537c9bd
--- /dev/null
+++ b/data/as/30036685/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036685",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036696/BillingService/BusinessService.json b/data/as/30036696/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a9d3e4db77
--- /dev/null
+++ b/data/as/30036696/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036696",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036696/egov-location/boundary-data.json b/data/as/30036696/egov-location/boundary-data.json
new file mode 100644
index 0000000000..72e5237f15
--- /dev/null
+++ b/data/as/30036696/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036696",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGAHARA PWSS (NEW)",
+                "localname": "SINGAHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGAHARA PWSS (NEW)",
+                        "localname": "SINGAHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGAHARA PWSS (NEW)",
+                "localname": "SINGAHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGAHARA PWSS (NEW)",
+                        "localname": "SINGAHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036696/ws-services-calculation/Penalty.json b/data/as/30036696/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56db4931c4
--- /dev/null
+++ b/data/as/30036696/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036696",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036696/ws-services-calculation/WCBillingSlab.json b/data/as/30036696/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0293c16e4
--- /dev/null
+++ b/data/as/30036696/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036696",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036706/BillingService/BusinessService.json b/data/as/30036706/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9be301c6c9
--- /dev/null
+++ b/data/as/30036706/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036706",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036706/egov-location/boundary-data.json b/data/as/30036706/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9715a61cc7
--- /dev/null
+++ b/data/as/30036706/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036706",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "EKLA SALBARI PWSS (NEW)",
+                "localname": "EKLA SALBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "EKLA SALBARI PWSS (NEW)",
+                        "localname": "EKLA SALBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "EKLA SALBARI PWSS (NEW)",
+                "localname": "EKLA SALBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "EKLA SALBARI PWSS (NEW)",
+                        "localname": "EKLA SALBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036706/ws-services-calculation/Penalty.json b/data/as/30036706/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a21324619d
--- /dev/null
+++ b/data/as/30036706/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036706",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036706/ws-services-calculation/WCBillingSlab.json b/data/as/30036706/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce09280428
--- /dev/null
+++ b/data/as/30036706/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036706",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036712/BillingService/BusinessService.json b/data/as/30036712/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f37c4dbd0e
--- /dev/null
+++ b/data/as/30036712/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036712",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036712/egov-location/boundary-data.json b/data/as/30036712/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4705203ed8
--- /dev/null
+++ b/data/as/30036712/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036712",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FULGASA PWSS (NEW)",
+                "localname": "FULGASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036712",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FULGASA PWSS (NEW)",
+                        "localname": "FULGASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FULGASA PWSS (NEW)",
+                "localname": "FULGASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036712",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FULGASA PWSS (NEW)",
+                        "localname": "FULGASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036712/ws-services-calculation/Penalty.json b/data/as/30036712/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..35b125b7e4
--- /dev/null
+++ b/data/as/30036712/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036712",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036712/ws-services-calculation/WCBillingSlab.json b/data/as/30036712/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..610882b85c
--- /dev/null
+++ b/data/as/30036712/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036712",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036747/BillingService/BusinessService.json b/data/as/30036747/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee250b8fdd
--- /dev/null
+++ b/data/as/30036747/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036747",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036747/egov-location/boundary-data.json b/data/as/30036747/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a7be59425
--- /dev/null
+++ b/data/as/30036747/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036747",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHURIBIL PATHAR PWSS",
+                "localname": "MADHURIBIL PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHURIBIL PATHAR PWSS",
+                        "localname": "MADHURIBIL PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHURIBIL PATHAR PWSS",
+                "localname": "MADHURIBIL PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHURIBIL PATHAR PWSS",
+                        "localname": "MADHURIBIL PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036747/ws-services-calculation/Penalty.json b/data/as/30036747/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f19280fc1a
--- /dev/null
+++ b/data/as/30036747/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036747",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036747/ws-services-calculation/WCBillingSlab.json b/data/as/30036747/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60ca57918e
--- /dev/null
+++ b/data/as/30036747/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036747",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036796/BillingService/BusinessService.json b/data/as/30036796/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b23b8212d
--- /dev/null
+++ b/data/as/30036796/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036796",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036796/egov-location/boundary-data.json b/data/as/30036796/egov-location/boundary-data.json
new file mode 100644
index 0000000000..94cace631f
--- /dev/null
+++ b/data/as/30036796/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036796",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 CHARIALI PWSS",
+                "localname": "NO. 1 CHARIALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 CHARIALI PWSS",
+                        "localname": "NO. 1 CHARIALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 CHARIALI PWSS",
+                "localname": "NO. 1 CHARIALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 CHARIALI PWSS",
+                        "localname": "NO. 1 CHARIALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036796/ws-services-calculation/Penalty.json b/data/as/30036796/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64baa52046
--- /dev/null
+++ b/data/as/30036796/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036796",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036796/ws-services-calculation/WCBillingSlab.json b/data/as/30036796/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..671ff8d756
--- /dev/null
+++ b/data/as/30036796/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036796",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036799/BillingService/BusinessService.json b/data/as/30036799/BillingService/BusinessService.json
new file mode 100644
index 0000000000..244fc6acec
--- /dev/null
+++ b/data/as/30036799/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036799",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036799/egov-location/boundary-data.json b/data/as/30036799/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d6f82148c9
--- /dev/null
+++ b/data/as/30036799/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036799",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 CHAMAGURI BAGAN PWSS",
+                "localname": "NO.3 CHAMAGURI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 CHAMAGURI BAGAN PWSS",
+                        "localname": "NO.3 CHAMAGURI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 CHAMAGURI BAGAN PWSS",
+                "localname": "NO.3 CHAMAGURI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 CHAMAGURI BAGAN PWSS",
+                        "localname": "NO.3 CHAMAGURI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036799/ws-services-calculation/Penalty.json b/data/as/30036799/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..613eb26a52
--- /dev/null
+++ b/data/as/30036799/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036799",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036799/ws-services-calculation/WCBillingSlab.json b/data/as/30036799/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27c4ba5fc7
--- /dev/null
+++ b/data/as/30036799/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036799",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036923/BillingService/BusinessService.json b/data/as/30036923/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b4f1e02a2
--- /dev/null
+++ b/data/as/30036923/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30036923",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036923/egov-location/boundary-data.json b/data/as/30036923/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5bd96a3a9
--- /dev/null
+++ b/data/as/30036923/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30036923",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOROIMARI PATHAR PWSS",
+                "localname": "GOROIMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOROIMARI PATHAR PWSS",
+                        "localname": "GOROIMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOROIMARI PATHAR PWSS",
+                "localname": "GOROIMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30036923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOROIMARI PATHAR PWSS",
+                        "localname": "GOROIMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036923/ws-services-calculation/Penalty.json b/data/as/30036923/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d4b7490b1
--- /dev/null
+++ b/data/as/30036923/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30036923",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30036923/ws-services-calculation/WCBillingSlab.json b/data/as/30036923/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..478fcf34b6
--- /dev/null
+++ b/data/as/30036923/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30036923",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037050/BillingService/BusinessService.json b/data/as/30037050/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6bc6693a8e
--- /dev/null
+++ b/data/as/30037050/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037050",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037050/egov-location/boundary-data.json b/data/as/30037050/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54026a012a
--- /dev/null
+++ b/data/as/30037050/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037050",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEKONA PWSS (NEW)",
+                "localname": "TEKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEKONA PWSS (NEW)",
+                        "localname": "TEKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEKONA PWSS (NEW)",
+                "localname": "TEKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEKONA PWSS (NEW)",
+                        "localname": "TEKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037050/ws-services-calculation/Penalty.json b/data/as/30037050/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5d012bd468
--- /dev/null
+++ b/data/as/30037050/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037050",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037050/ws-services-calculation/WCBillingSlab.json b/data/as/30037050/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7585a4ee13
--- /dev/null
+++ b/data/as/30037050/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037050",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037052/BillingService/BusinessService.json b/data/as/30037052/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1c23d79ec5
--- /dev/null
+++ b/data/as/30037052/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037052",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037052/egov-location/boundary-data.json b/data/as/30037052/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47db184697
--- /dev/null
+++ b/data/as/30037052/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037052",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIMURA PWSS (NEW)",
+                "localname": "HATIMURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIMURA PWSS (NEW)",
+                        "localname": "HATIMURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIMURA PWSS (NEW)",
+                "localname": "HATIMURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIMURA PWSS (NEW)",
+                        "localname": "HATIMURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037052/ws-services-calculation/Penalty.json b/data/as/30037052/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56bcb3ff31
--- /dev/null
+++ b/data/as/30037052/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037052",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037052/ws-services-calculation/WCBillingSlab.json b/data/as/30037052/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aab5f36ec2
--- /dev/null
+++ b/data/as/30037052/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037052",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037053/BillingService/BusinessService.json b/data/as/30037053/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8dab5f13ec
--- /dev/null
+++ b/data/as/30037053/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037053",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037053/egov-location/boundary-data.json b/data/as/30037053/egov-location/boundary-data.json
new file mode 100644
index 0000000000..827acb06b9
--- /dev/null
+++ b/data/as/30037053/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037053",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                "localname": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                        "localname": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                "localname": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                        "localname": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037053/ws-services-calculation/Penalty.json b/data/as/30037053/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..febd1f00ca
--- /dev/null
+++ b/data/as/30037053/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037053",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037053/ws-services-calculation/WCBillingSlab.json b/data/as/30037053/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed4787a052
--- /dev/null
+++ b/data/as/30037053/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037053",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037055/BillingService/BusinessService.json b/data/as/30037055/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f4d617e373
--- /dev/null
+++ b/data/as/30037055/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037055",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037055/egov-location/boundary-data.json b/data/as/30037055/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a40af128be
--- /dev/null
+++ b/data/as/30037055/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037055",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAMARI PWSS (NEW)",
+                "localname": "KHAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAMARI PWSS (NEW)",
+                        "localname": "KHAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAMARI PWSS (NEW)",
+                "localname": "KHAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAMARI PWSS (NEW)",
+                        "localname": "KHAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037055/ws-services-calculation/Penalty.json b/data/as/30037055/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9430b0d5a9
--- /dev/null
+++ b/data/as/30037055/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037055",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037055/ws-services-calculation/WCBillingSlab.json b/data/as/30037055/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8958ad8068
--- /dev/null
+++ b/data/as/30037055/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037055",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037056/BillingService/BusinessService.json b/data/as/30037056/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e8b3df4b4a
--- /dev/null
+++ b/data/as/30037056/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037056",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037056/egov-location/boundary-data.json b/data/as/30037056/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7004e38c9e
--- /dev/null
+++ b/data/as/30037056/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037056",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJULI PWSS (NEW)",
+                "localname": "BORJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037056",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJULI PWSS (NEW)",
+                        "localname": "BORJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJULI PWSS (NEW)",
+                "localname": "BORJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037056",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJULI PWSS (NEW)",
+                        "localname": "BORJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037056/ws-services-calculation/Penalty.json b/data/as/30037056/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8b1691e94a
--- /dev/null
+++ b/data/as/30037056/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037056",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037056/ws-services-calculation/WCBillingSlab.json b/data/as/30037056/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eae2a127c6
--- /dev/null
+++ b/data/as/30037056/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037056",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037057/BillingService/BusinessService.json b/data/as/30037057/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f20777b75
--- /dev/null
+++ b/data/as/30037057/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037057",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037057/egov-location/boundary-data.json b/data/as/30037057/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12d9693bbf
--- /dev/null
+++ b/data/as/30037057/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037057",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-II PWSS (NEW)",
+                "localname": "BAHATI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-II PWSS (NEW)",
+                        "localname": "BAHATI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-II PWSS (NEW)",
+                "localname": "BAHATI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-II PWSS (NEW)",
+                        "localname": "BAHATI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037057/ws-services-calculation/Penalty.json b/data/as/30037057/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f0a692377
--- /dev/null
+++ b/data/as/30037057/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037057",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037057/ws-services-calculation/WCBillingSlab.json b/data/as/30037057/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..989e3dddf8
--- /dev/null
+++ b/data/as/30037057/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037057",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037058/BillingService/BusinessService.json b/data/as/30037058/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19cc87236f
--- /dev/null
+++ b/data/as/30037058/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037058",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037058/egov-location/boundary-data.json b/data/as/30037058/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e82c738805
--- /dev/null
+++ b/data/as/30037058/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037058",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATHPARA (CHUNARI) PWSS (NEW)",
+                "localname": "NATHPARA (CHUNARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATHPARA (CHUNARI) PWSS (NEW)",
+                        "localname": "NATHPARA (CHUNARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATHPARA (CHUNARI) PWSS (NEW)",
+                "localname": "NATHPARA (CHUNARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATHPARA (CHUNARI) PWSS (NEW)",
+                        "localname": "NATHPARA (CHUNARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037058/ws-services-calculation/Penalty.json b/data/as/30037058/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c789f6d941
--- /dev/null
+++ b/data/as/30037058/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037058",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037058/ws-services-calculation/WCBillingSlab.json b/data/as/30037058/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5027a5462a
--- /dev/null
+++ b/data/as/30037058/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037058",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037282/BillingService/BusinessService.json b/data/as/30037282/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6258580d1
--- /dev/null
+++ b/data/as/30037282/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037282",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037282/egov-location/boundary-data.json b/data/as/30037282/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe1ec02648
--- /dev/null
+++ b/data/as/30037282/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037282",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                "localname": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                        "localname": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                "localname": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                        "localname": "NUNKHOWAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037282/ws-services-calculation/Penalty.json b/data/as/30037282/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d0ca4df73
--- /dev/null
+++ b/data/as/30037282/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037282",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037282/ws-services-calculation/WCBillingSlab.json b/data/as/30037282/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c42fda7d7d
--- /dev/null
+++ b/data/as/30037282/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037282",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037284/BillingService/BusinessService.json b/data/as/30037284/BillingService/BusinessService.json
new file mode 100644
index 0000000000..22db676157
--- /dev/null
+++ b/data/as/30037284/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037284",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037284/egov-location/boundary-data.json b/data/as/30037284/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3d40707dca
--- /dev/null
+++ b/data/as/30037284/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037284",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHYA KANGKAI PWSS (NEW)",
+                "localname": "MADHYA KANGKAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHYA KANGKAI PWSS (NEW)",
+                        "localname": "MADHYA KANGKAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHYA KANGKAI PWSS (NEW)",
+                "localname": "MADHYA KANGKAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHYA KANGKAI PWSS (NEW)",
+                        "localname": "MADHYA KANGKAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037284/ws-services-calculation/Penalty.json b/data/as/30037284/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7084a314c3
--- /dev/null
+++ b/data/as/30037284/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037284",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037284/ws-services-calculation/WCBillingSlab.json b/data/as/30037284/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..11a87fa07d
--- /dev/null
+++ b/data/as/30037284/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037284",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037286/BillingService/BusinessService.json b/data/as/30037286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42fd5adb93
--- /dev/null
+++ b/data/as/30037286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037286/egov-location/boundary-data.json b/data/as/30037286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6994e2e54
--- /dev/null
+++ b/data/as/30037286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                "localname": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                "localname": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037286/ws-services-calculation/Penalty.json b/data/as/30037286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..833e9bc78b
--- /dev/null
+++ b/data/as/30037286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037286/ws-services-calculation/WCBillingSlab.json b/data/as/30037286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8305662eac
--- /dev/null
+++ b/data/as/30037286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037287/BillingService/BusinessService.json b/data/as/30037287/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5be4f97e98
--- /dev/null
+++ b/data/as/30037287/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037287",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037287/egov-location/boundary-data.json b/data/as/30037287/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87d1bbc8a2
--- /dev/null
+++ b/data/as/30037287/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037287",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SABAJI BAGUAN PWSS (NEW)",
+                "localname": "SABAJI BAGUAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SABAJI BAGUAN PWSS (NEW)",
+                        "localname": "SABAJI BAGUAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SABAJI BAGUAN PWSS (NEW)",
+                "localname": "SABAJI BAGUAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SABAJI BAGUAN PWSS (NEW)",
+                        "localname": "SABAJI BAGUAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037287/ws-services-calculation/Penalty.json b/data/as/30037287/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40208fd2ba
--- /dev/null
+++ b/data/as/30037287/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037287",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037287/ws-services-calculation/WCBillingSlab.json b/data/as/30037287/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2b3d2673dd
--- /dev/null
+++ b/data/as/30037287/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037287",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037289/BillingService/BusinessService.json b/data/as/30037289/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0499018e45
--- /dev/null
+++ b/data/as/30037289/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037289",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037289/egov-location/boundary-data.json b/data/as/30037289/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ade172653
--- /dev/null
+++ b/data/as/30037289/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037289",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-I PWSS (NEW)",
+                "localname": "SIDHABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-I PWSS (NEW)",
+                        "localname": "SIDHABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-I PWSS (NEW)",
+                "localname": "SIDHABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037289",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-I PWSS (NEW)",
+                        "localname": "SIDHABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037289/ws-services-calculation/Penalty.json b/data/as/30037289/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2bd7bb9663
--- /dev/null
+++ b/data/as/30037289/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037289",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037289/ws-services-calculation/WCBillingSlab.json b/data/as/30037289/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a19642960b
--- /dev/null
+++ b/data/as/30037289/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037289",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037516/BillingService/BusinessService.json b/data/as/30037516/BillingService/BusinessService.json
new file mode 100644
index 0000000000..78476f98a4
--- /dev/null
+++ b/data/as/30037516/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037516",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037516/egov-location/boundary-data.json b/data/as/30037516/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea5cc74333
--- /dev/null
+++ b/data/as/30037516/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037516",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                "localname": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                        "localname": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                "localname": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                        "localname": "KANKATA PT-I (NO 2) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037516/ws-services-calculation/Penalty.json b/data/as/30037516/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..121495f700
--- /dev/null
+++ b/data/as/30037516/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037516",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037516/ws-services-calculation/WCBillingSlab.json b/data/as/30037516/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee09935e68
--- /dev/null
+++ b/data/as/30037516/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037516",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037943/BillingService/BusinessService.json b/data/as/30037943/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e1bcd45efa
--- /dev/null
+++ b/data/as/30037943/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037943",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037943/egov-location/boundary-data.json b/data/as/30037943/egov-location/boundary-data.json
new file mode 100644
index 0000000000..00dbc27400
--- /dev/null
+++ b/data/as/30037943/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037943",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARGHAT PWSS",
+                "localname": "BARGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037943",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARGHAT PWSS",
+                        "localname": "BARGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARGHAT PWSS",
+                "localname": "BARGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037943",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARGHAT PWSS",
+                        "localname": "BARGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037943/ws-services-calculation/Penalty.json b/data/as/30037943/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b19bd83eb
--- /dev/null
+++ b/data/as/30037943/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037943",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037943/ws-services-calculation/WCBillingSlab.json b/data/as/30037943/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c159de1681
--- /dev/null
+++ b/data/as/30037943/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037943",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037947/BillingService/BusinessService.json b/data/as/30037947/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e87f9af8c3
--- /dev/null
+++ b/data/as/30037947/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037947",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037947/egov-location/boundary-data.json b/data/as/30037947/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e9c875a8e4
--- /dev/null
+++ b/data/as/30037947/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037947",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLIBARI PWSS",
+                "localname": "KOLIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLIBARI PWSS",
+                        "localname": "KOLIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLIBARI PWSS",
+                "localname": "KOLIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037947",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLIBARI PWSS",
+                        "localname": "KOLIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037947/ws-services-calculation/Penalty.json b/data/as/30037947/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d02f581d34
--- /dev/null
+++ b/data/as/30037947/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037947",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037947/ws-services-calculation/WCBillingSlab.json b/data/as/30037947/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b95ef53c49
--- /dev/null
+++ b/data/as/30037947/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037947",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037948/BillingService/BusinessService.json b/data/as/30037948/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c946f114ef
--- /dev/null
+++ b/data/as/30037948/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037948",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037948/egov-location/boundary-data.json b/data/as/30037948/egov-location/boundary-data.json
new file mode 100644
index 0000000000..274b8ca726
--- /dev/null
+++ b/data/as/30037948/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037948",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAROWA PWSS",
+                "localname": "PAROWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAROWA PWSS",
+                        "localname": "PAROWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAROWA PWSS",
+                "localname": "PAROWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAROWA PWSS",
+                        "localname": "PAROWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037948/ws-services-calculation/Penalty.json b/data/as/30037948/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce11f7d849
--- /dev/null
+++ b/data/as/30037948/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037948",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037948/ws-services-calculation/WCBillingSlab.json b/data/as/30037948/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5a0d5f3d9
--- /dev/null
+++ b/data/as/30037948/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037948",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037949/BillingService/BusinessService.json b/data/as/30037949/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c73e1a68f1
--- /dev/null
+++ b/data/as/30037949/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037949",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037949/egov-location/boundary-data.json b/data/as/30037949/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c659d71411
--- /dev/null
+++ b/data/as/30037949/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037949",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANI RESERVE GRANT PWSS",
+                "localname": "NAHARANI RESERVE GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037949",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANI RESERVE GRANT PWSS",
+                        "localname": "NAHARANI RESERVE GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANI RESERVE GRANT PWSS",
+                "localname": "NAHARANI RESERVE GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037949",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANI RESERVE GRANT PWSS",
+                        "localname": "NAHARANI RESERVE GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037949/ws-services-calculation/Penalty.json b/data/as/30037949/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..667f7de29e
--- /dev/null
+++ b/data/as/30037949/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037949",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037949/ws-services-calculation/WCBillingSlab.json b/data/as/30037949/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5ac2d8d82d
--- /dev/null
+++ b/data/as/30037949/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037949",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037950/BillingService/BusinessService.json b/data/as/30037950/BillingService/BusinessService.json
new file mode 100644
index 0000000000..44f1148bf8
--- /dev/null
+++ b/data/as/30037950/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037950",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037950/egov-location/boundary-data.json b/data/as/30037950/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5130b4dde9
--- /dev/null
+++ b/data/as/30037950/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037950",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZARTIKA PWSS",
+                "localname": "MAZARTIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037950",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZARTIKA PWSS",
+                        "localname": "MAZARTIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZARTIKA PWSS",
+                "localname": "MAZARTIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037950",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZARTIKA PWSS",
+                        "localname": "MAZARTIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037950/ws-services-calculation/Penalty.json b/data/as/30037950/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c7684c8cb3
--- /dev/null
+++ b/data/as/30037950/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037950",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037950/ws-services-calculation/WCBillingSlab.json b/data/as/30037950/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b9a7ea0f35
--- /dev/null
+++ b/data/as/30037950/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037950",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037951/BillingService/BusinessService.json b/data/as/30037951/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb97a12915
--- /dev/null
+++ b/data/as/30037951/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037951",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037951/egov-location/boundary-data.json b/data/as/30037951/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b4beeb6b08
--- /dev/null
+++ b/data/as/30037951/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037951",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOROKANI PWSS",
+                "localname": "KOROKANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037951",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOROKANI PWSS",
+                        "localname": "KOROKANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOROKANI PWSS",
+                "localname": "KOROKANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037951",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOROKANI PWSS",
+                        "localname": "KOROKANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037951/ws-services-calculation/Penalty.json b/data/as/30037951/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..93b671ce6c
--- /dev/null
+++ b/data/as/30037951/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037951",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037951/ws-services-calculation/WCBillingSlab.json b/data/as/30037951/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b44638ac2d
--- /dev/null
+++ b/data/as/30037951/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037951",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037952/BillingService/BusinessService.json b/data/as/30037952/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66267d91fd
--- /dev/null
+++ b/data/as/30037952/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037952",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037952/egov-location/boundary-data.json b/data/as/30037952/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bd0a720193
--- /dev/null
+++ b/data/as/30037952/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037952",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MAINAJULI TE PWSS",
+                "localname": "NO. 2 MAINAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MAINAJULI TE PWSS",
+                        "localname": "NO. 2 MAINAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MAINAJULI TE PWSS",
+                "localname": "NO. 2 MAINAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MAINAJULI TE PWSS",
+                        "localname": "NO. 2 MAINAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037952/ws-services-calculation/Penalty.json b/data/as/30037952/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dfe161f1cc
--- /dev/null
+++ b/data/as/30037952/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037952",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037952/ws-services-calculation/WCBillingSlab.json b/data/as/30037952/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f512bc1265
--- /dev/null
+++ b/data/as/30037952/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037952",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037953/BillingService/BusinessService.json b/data/as/30037953/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc5877005c
--- /dev/null
+++ b/data/as/30037953/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037953",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037953/egov-location/boundary-data.json b/data/as/30037953/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be6d26ab44
--- /dev/null
+++ b/data/as/30037953/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037953",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAK BIL PWSS",
+                "localname": "PAK BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037953",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAK BIL PWSS",
+                        "localname": "PAK BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAK BIL PWSS",
+                "localname": "PAK BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037953",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAK BIL PWSS",
+                        "localname": "PAK BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037953/ws-services-calculation/Penalty.json b/data/as/30037953/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..449f85da94
--- /dev/null
+++ b/data/as/30037953/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037953",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037953/ws-services-calculation/WCBillingSlab.json b/data/as/30037953/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..608fd4921b
--- /dev/null
+++ b/data/as/30037953/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037953",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037954/BillingService/BusinessService.json b/data/as/30037954/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f504e4820
--- /dev/null
+++ b/data/as/30037954/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037954",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037954/egov-location/boundary-data.json b/data/as/30037954/egov-location/boundary-data.json
new file mode 100644
index 0000000000..46a8752c01
--- /dev/null
+++ b/data/as/30037954/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037954",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYABASTI PWSS",
+                "localname": "NAYABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYABASTI PWSS",
+                        "localname": "NAYABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYABASTI PWSS",
+                "localname": "NAYABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYABASTI PWSS",
+                        "localname": "NAYABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037954/ws-services-calculation/Penalty.json b/data/as/30037954/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1471684ffc
--- /dev/null
+++ b/data/as/30037954/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037954",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037954/ws-services-calculation/WCBillingSlab.json b/data/as/30037954/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dac12e1075
--- /dev/null
+++ b/data/as/30037954/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037954",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037955/BillingService/BusinessService.json b/data/as/30037955/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1450994927
--- /dev/null
+++ b/data/as/30037955/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037955",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037955/egov-location/boundary-data.json b/data/as/30037955/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a207bea9dc
--- /dev/null
+++ b/data/as/30037955/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037955",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 SONAJULI T E PWSS",
+                "localname": "NO. 2 SONAJULI T E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 SONAJULI T E PWSS",
+                        "localname": "NO. 2 SONAJULI T E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 SONAJULI T E PWSS",
+                "localname": "NO. 2 SONAJULI T E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 SONAJULI T E PWSS",
+                        "localname": "NO. 2 SONAJULI T E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037955/ws-services-calculation/Penalty.json b/data/as/30037955/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1f58e479f6
--- /dev/null
+++ b/data/as/30037955/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037955",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037955/ws-services-calculation/WCBillingSlab.json b/data/as/30037955/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b53619e94b
--- /dev/null
+++ b/data/as/30037955/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037955",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037960/BillingService/BusinessService.json b/data/as/30037960/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e82e1fb4d
--- /dev/null
+++ b/data/as/30037960/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30037960",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037960/egov-location/boundary-data.json b/data/as/30037960/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ddc230e0b0
--- /dev/null
+++ b/data/as/30037960/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30037960",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUNG PANI BANGALI PWSS",
+                "localname": "PUNG PANI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUNG PANI BANGALI PWSS",
+                        "localname": "PUNG PANI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUNG PANI BANGALI PWSS",
+                "localname": "PUNG PANI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30037960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUNG PANI BANGALI PWSS",
+                        "localname": "PUNG PANI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037960/ws-services-calculation/Penalty.json b/data/as/30037960/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81edb6caa1
--- /dev/null
+++ b/data/as/30037960/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30037960",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30037960/ws-services-calculation/WCBillingSlab.json b/data/as/30037960/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42935aa106
--- /dev/null
+++ b/data/as/30037960/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30037960",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038014/BillingService/BusinessService.json b/data/as/30038014/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8f259aefe9
--- /dev/null
+++ b/data/as/30038014/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038014",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038014/egov-location/boundary-data.json b/data/as/30038014/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0da796b724
--- /dev/null
+++ b/data/as/30038014/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038014",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHMILE MVS",
+                "localname": "PANCHMILE MVS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038014",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHMILE MVS",
+                        "localname": "PANCHMILE MVS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHMILE MVS",
+                "localname": "PANCHMILE MVS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038014",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHMILE MVS",
+                        "localname": "PANCHMILE MVS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038014/ws-services-calculation/Penalty.json b/data/as/30038014/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e6e5827e6
--- /dev/null
+++ b/data/as/30038014/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038014",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038014/ws-services-calculation/WCBillingSlab.json b/data/as/30038014/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..034c65a31d
--- /dev/null
+++ b/data/as/30038014/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038014",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038150/BillingService/BusinessService.json b/data/as/30038150/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f61739cc9
--- /dev/null
+++ b/data/as/30038150/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038150",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038150/egov-location/boundary-data.json b/data/as/30038150/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8bb7a6f65c
--- /dev/null
+++ b/data/as/30038150/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038150",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLKOBA TE. PWSS",
+                "localname": "DHOLKOBA TE. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLKOBA TE. PWSS",
+                        "localname": "DHOLKOBA TE. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLKOBA TE. PWSS",
+                "localname": "DHOLKOBA TE. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLKOBA TE. PWSS",
+                        "localname": "DHOLKOBA TE. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038150/ws-services-calculation/Penalty.json b/data/as/30038150/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..87cbb28462
--- /dev/null
+++ b/data/as/30038150/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038150",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038150/ws-services-calculation/WCBillingSlab.json b/data/as/30038150/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c55375f1a
--- /dev/null
+++ b/data/as/30038150/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038150",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038176/BillingService/BusinessService.json b/data/as/30038176/BillingService/BusinessService.json
new file mode 100644
index 0000000000..410561ad27
--- /dev/null
+++ b/data/as/30038176/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038176",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038176/egov-location/boundary-data.json b/data/as/30038176/egov-location/boundary-data.json
new file mode 100644
index 0000000000..81aab463b7
--- /dev/null
+++ b/data/as/30038176/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038176",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJHAR PWSS",
+                "localname": "BARJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038176",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJHAR PWSS",
+                        "localname": "BARJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJHAR PWSS",
+                "localname": "BARJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038176",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJHAR PWSS",
+                        "localname": "BARJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038176/ws-services-calculation/Penalty.json b/data/as/30038176/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..904318f1f6
--- /dev/null
+++ b/data/as/30038176/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038176",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038176/ws-services-calculation/WCBillingSlab.json b/data/as/30038176/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..611843e654
--- /dev/null
+++ b/data/as/30038176/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038176",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038197/BillingService/BusinessService.json b/data/as/30038197/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e8e4a4c64
--- /dev/null
+++ b/data/as/30038197/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038197",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038197/egov-location/boundary-data.json b/data/as/30038197/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8e98234da
--- /dev/null
+++ b/data/as/30038197/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038197",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMAPARA PWSS (NEW)",
+                "localname": "NAMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMAPARA PWSS (NEW)",
+                        "localname": "NAMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMAPARA PWSS (NEW)",
+                "localname": "NAMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMAPARA PWSS (NEW)",
+                        "localname": "NAMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038197/ws-services-calculation/Penalty.json b/data/as/30038197/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40cfd13132
--- /dev/null
+++ b/data/as/30038197/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038197",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038197/ws-services-calculation/WCBillingSlab.json b/data/as/30038197/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10086d182b
--- /dev/null
+++ b/data/as/30038197/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038197",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038208/BillingService/BusinessService.json b/data/as/30038208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36a123fb99
--- /dev/null
+++ b/data/as/30038208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038208/egov-location/boundary-data.json b/data/as/30038208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..267e981735
--- /dev/null
+++ b/data/as/30038208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA KALITAPARA PWSS (NEW)",
+                "localname": "KARIPARA KALITAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA KALITAPARA PWSS (NEW)",
+                        "localname": "KARIPARA KALITAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA KALITAPARA PWSS (NEW)",
+                "localname": "KARIPARA KALITAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA KALITAPARA PWSS (NEW)",
+                        "localname": "KARIPARA KALITAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038208/ws-services-calculation/Penalty.json b/data/as/30038208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e935e33308
--- /dev/null
+++ b/data/as/30038208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038208/ws-services-calculation/WCBillingSlab.json b/data/as/30038208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fddd6d564
--- /dev/null
+++ b/data/as/30038208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038633/BillingService/BusinessService.json b/data/as/30038633/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ee586ef36
--- /dev/null
+++ b/data/as/30038633/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038633",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038633/egov-location/boundary-data.json b/data/as/30038633/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ac86c10ee
--- /dev/null
+++ b/data/as/30038633/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038633",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA PWSS (NEW)",
+                "localname": "TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038633",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA PWSS (NEW)",
+                        "localname": "TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA PWSS (NEW)",
+                "localname": "TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038633",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA PWSS (NEW)",
+                        "localname": "TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038633/ws-services-calculation/Penalty.json b/data/as/30038633/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ca34abac9
--- /dev/null
+++ b/data/as/30038633/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038633",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038633/ws-services-calculation/WCBillingSlab.json b/data/as/30038633/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b70542b605
--- /dev/null
+++ b/data/as/30038633/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038633",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038634/BillingService/BusinessService.json b/data/as/30038634/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b795cf5ff8
--- /dev/null
+++ b/data/as/30038634/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038634",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038634/egov-location/boundary-data.json b/data/as/30038634/egov-location/boundary-data.json
new file mode 100644
index 0000000000..489549454d
--- /dev/null
+++ b/data/as/30038634/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038634",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                "localname": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                        "localname": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                "localname": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                        "localname": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038634/ws-services-calculation/Penalty.json b/data/as/30038634/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15879544e1
--- /dev/null
+++ b/data/as/30038634/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038634",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038634/ws-services-calculation/WCBillingSlab.json b/data/as/30038634/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94067c7f8a
--- /dev/null
+++ b/data/as/30038634/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038634",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038635/BillingService/BusinessService.json b/data/as/30038635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0be99789ce
--- /dev/null
+++ b/data/as/30038635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038635/egov-location/boundary-data.json b/data/as/30038635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3e5bbdd68
--- /dev/null
+++ b/data/as/30038635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHRISTANPARA GAON PWSS",
+                "localname": "KHRISTANPARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHRISTANPARA GAON PWSS",
+                        "localname": "KHRISTANPARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHRISTANPARA GAON PWSS",
+                "localname": "KHRISTANPARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHRISTANPARA GAON PWSS",
+                        "localname": "KHRISTANPARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038635/ws-services-calculation/Penalty.json b/data/as/30038635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..54439e31fa
--- /dev/null
+++ b/data/as/30038635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038635/ws-services-calculation/WCBillingSlab.json b/data/as/30038635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d9f1bbf96
--- /dev/null
+++ b/data/as/30038635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038636/BillingService/BusinessService.json b/data/as/30038636/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3922c83d08
--- /dev/null
+++ b/data/as/30038636/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038636",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038636/egov-location/boundary-data.json b/data/as/30038636/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bf8d85f5e4
--- /dev/null
+++ b/data/as/30038636/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038636",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                "localname": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038636",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                        "localname": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                "localname": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038636",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                        "localname": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038636/ws-services-calculation/Penalty.json b/data/as/30038636/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..45f3792a73
--- /dev/null
+++ b/data/as/30038636/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038636",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038636/ws-services-calculation/WCBillingSlab.json b/data/as/30038636/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b732e4543
--- /dev/null
+++ b/data/as/30038636/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038636",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038738/BillingService/BusinessService.json b/data/as/30038738/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d112a0add7
--- /dev/null
+++ b/data/as/30038738/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038738",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038738/egov-location/boundary-data.json b/data/as/30038738/egov-location/boundary-data.json
new file mode 100644
index 0000000000..08601d0c3b
--- /dev/null
+++ b/data/as/30038738/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038738",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAS BATABARI PWSS (NEW)",
+                "localname": "KHAS BATABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAS BATABARI PWSS (NEW)",
+                        "localname": "KHAS BATABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAS BATABARI PWSS (NEW)",
+                "localname": "KHAS BATABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAS BATABARI PWSS (NEW)",
+                        "localname": "KHAS BATABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038738/ws-services-calculation/Penalty.json b/data/as/30038738/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..402534a861
--- /dev/null
+++ b/data/as/30038738/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038738",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038738/ws-services-calculation/WCBillingSlab.json b/data/as/30038738/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9bf6a6210d
--- /dev/null
+++ b/data/as/30038738/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038738",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038913/BillingService/BusinessService.json b/data/as/30038913/BillingService/BusinessService.json
new file mode 100644
index 0000000000..235b2d7bfa
--- /dev/null
+++ b/data/as/30038913/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038913",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038913/egov-location/boundary-data.json b/data/as/30038913/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ff0eb0df28
--- /dev/null
+++ b/data/as/30038913/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038913",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PUB PWSS (NEW)",
+                "localname": "AMBARI PUB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038913",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PUB PWSS (NEW)",
+                        "localname": "AMBARI PUB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PUB PWSS (NEW)",
+                "localname": "AMBARI PUB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038913",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PUB PWSS (NEW)",
+                        "localname": "AMBARI PUB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038913/ws-services-calculation/Penalty.json b/data/as/30038913/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..da2da61f2d
--- /dev/null
+++ b/data/as/30038913/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038913",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038913/ws-services-calculation/WCBillingSlab.json b/data/as/30038913/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de1776fb6c
--- /dev/null
+++ b/data/as/30038913/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038913",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038945/BillingService/BusinessService.json b/data/as/30038945/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c5d459d4f
--- /dev/null
+++ b/data/as/30038945/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038945",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038945/egov-location/boundary-data.json b/data/as/30038945/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4cbc894fee
--- /dev/null
+++ b/data/as/30038945/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038945",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIRPAR(A) (NEW)",
+                "localname": "DARIRPAR(A) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038945",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIRPAR(A) (NEW)",
+                        "localname": "DARIRPAR(A) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIRPAR(A) (NEW)",
+                "localname": "DARIRPAR(A) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038945",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIRPAR(A) (NEW)",
+                        "localname": "DARIRPAR(A) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038945/ws-services-calculation/Penalty.json b/data/as/30038945/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ade9204aa
--- /dev/null
+++ b/data/as/30038945/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038945",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038945/ws-services-calculation/WCBillingSlab.json b/data/as/30038945/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2495e42192
--- /dev/null
+++ b/data/as/30038945/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038945",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038960/BillingService/BusinessService.json b/data/as/30038960/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85f245ad31
--- /dev/null
+++ b/data/as/30038960/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038960",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038960/egov-location/boundary-data.json b/data/as/30038960/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a2bd55942c
--- /dev/null
+++ b/data/as/30038960/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038960",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESERVE MADHYAPARA PWSS (NEW)",
+                "localname": "RESERVE MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESERVE MADHYAPARA PWSS (NEW)",
+                        "localname": "RESERVE MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESERVE MADHYAPARA PWSS (NEW)",
+                "localname": "RESERVE MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038960",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESERVE MADHYAPARA PWSS (NEW)",
+                        "localname": "RESERVE MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038960/ws-services-calculation/Penalty.json b/data/as/30038960/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..372ebfc0c4
--- /dev/null
+++ b/data/as/30038960/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038960",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038960/ws-services-calculation/WCBillingSlab.json b/data/as/30038960/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6c4aedbc3
--- /dev/null
+++ b/data/as/30038960/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038960",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038988/BillingService/BusinessService.json b/data/as/30038988/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4de974055f
--- /dev/null
+++ b/data/as/30038988/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30038988",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038988/egov-location/boundary-data.json b/data/as/30038988/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1cde6db329
--- /dev/null
+++ b/data/as/30038988/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30038988",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                "localname": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                        "localname": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                "localname": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30038988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                        "localname": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038988/ws-services-calculation/Penalty.json b/data/as/30038988/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..862ccaeff7
--- /dev/null
+++ b/data/as/30038988/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30038988",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30038988/ws-services-calculation/WCBillingSlab.json b/data/as/30038988/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..daf062d877
--- /dev/null
+++ b/data/as/30038988/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30038988",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039003/BillingService/BusinessService.json b/data/as/30039003/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5d3eb2392e
--- /dev/null
+++ b/data/as/30039003/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30039003",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039003/egov-location/boundary-data.json b/data/as/30039003/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70ed89092c
--- /dev/null
+++ b/data/as/30039003/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30039003",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALDUBI PWSS (NEW)",
+                "localname": "RAKHALDUBI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039003",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALDUBI PWSS (NEW)",
+                        "localname": "RAKHALDUBI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALDUBI PWSS (NEW)",
+                "localname": "RAKHALDUBI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039003",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALDUBI PWSS (NEW)",
+                        "localname": "RAKHALDUBI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039003/ws-services-calculation/Penalty.json b/data/as/30039003/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..34d9eb24e2
--- /dev/null
+++ b/data/as/30039003/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30039003",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039003/ws-services-calculation/WCBillingSlab.json b/data/as/30039003/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad57302094
--- /dev/null
+++ b/data/as/30039003/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30039003",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039714/BillingService/BusinessService.json b/data/as/30039714/BillingService/BusinessService.json
new file mode 100644
index 0000000000..091a35bdec
--- /dev/null
+++ b/data/as/30039714/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30039714",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039714/egov-location/boundary-data.json b/data/as/30039714/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e1876f657
--- /dev/null
+++ b/data/as/30039714/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30039714",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORIGAON NO. 1",
+                "localname": "BORIGAON NO. 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039714",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORIGAON NO. 1",
+                        "localname": "BORIGAON NO. 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORIGAON NO. 1",
+                "localname": "BORIGAON NO. 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039714",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORIGAON NO. 1",
+                        "localname": "BORIGAON NO. 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039714/ws-services-calculation/Penalty.json b/data/as/30039714/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9180b36be3
--- /dev/null
+++ b/data/as/30039714/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30039714",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039714/ws-services-calculation/WCBillingSlab.json b/data/as/30039714/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ccd5cfbe9
--- /dev/null
+++ b/data/as/30039714/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30039714",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039715/BillingService/BusinessService.json b/data/as/30039715/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0bcf397b9
--- /dev/null
+++ b/data/as/30039715/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30039715",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039715/egov-location/boundary-data.json b/data/as/30039715/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5fb862556b
--- /dev/null
+++ b/data/as/30039715/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30039715",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARDAL PWSS (NEW)",
+                "localname": "BARDAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARDAL PWSS (NEW)",
+                        "localname": "BARDAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARDAL PWSS (NEW)",
+                "localname": "BARDAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARDAL PWSS (NEW)",
+                        "localname": "BARDAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039715/ws-services-calculation/Penalty.json b/data/as/30039715/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..02f999b4e3
--- /dev/null
+++ b/data/as/30039715/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30039715",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039715/ws-services-calculation/WCBillingSlab.json b/data/as/30039715/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22c444dc04
--- /dev/null
+++ b/data/as/30039715/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30039715",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039748/BillingService/BusinessService.json b/data/as/30039748/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d97ac01080
--- /dev/null
+++ b/data/as/30039748/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30039748",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039748/egov-location/boundary-data.json b/data/as/30039748/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bde92fa418
--- /dev/null
+++ b/data/as/30039748/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30039748",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMGURI CHAPARI PWSS",
+                "localname": "AMGURI CHAPARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMGURI CHAPARI PWSS",
+                        "localname": "AMGURI CHAPARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMGURI CHAPARI PWSS",
+                "localname": "AMGURI CHAPARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30039748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMGURI CHAPARI PWSS",
+                        "localname": "AMGURI CHAPARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039748/ws-services-calculation/Penalty.json b/data/as/30039748/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b8b08ebb5
--- /dev/null
+++ b/data/as/30039748/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30039748",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30039748/ws-services-calculation/WCBillingSlab.json b/data/as/30039748/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e6b0a2e70
--- /dev/null
+++ b/data/as/30039748/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30039748",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040182/BillingService/BusinessService.json b/data/as/30040182/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3d76a3745
--- /dev/null
+++ b/data/as/30040182/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30040182",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040182/egov-location/boundary-data.json b/data/as/30040182/egov-location/boundary-data.json
new file mode 100644
index 0000000000..40a6e5d97c
--- /dev/null
+++ b/data/as/30040182/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30040182",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHAKOWAPARA PWSS (NEW)",
+                "localname": "JHAKOWAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30040182",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHAKOWAPARA PWSS (NEW)",
+                        "localname": "JHAKOWAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHAKOWAPARA PWSS (NEW)",
+                "localname": "JHAKOWAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30040182",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHAKOWAPARA PWSS (NEW)",
+                        "localname": "JHAKOWAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040182/ws-services-calculation/Penalty.json b/data/as/30040182/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca264f482b
--- /dev/null
+++ b/data/as/30040182/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30040182",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040182/ws-services-calculation/WCBillingSlab.json b/data/as/30040182/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..29a64defbc
--- /dev/null
+++ b/data/as/30040182/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30040182",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040815/BillingService/BusinessService.json b/data/as/30040815/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e982e31b0
--- /dev/null
+++ b/data/as/30040815/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30040815",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040815/egov-location/boundary-data.json b/data/as/30040815/egov-location/boundary-data.json
new file mode 100644
index 0000000000..72311dcb3b
--- /dev/null
+++ b/data/as/30040815/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30040815",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HARIGAON NO. 2 PWSS",
+                "localname": "NEW HARIGAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30040815",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HARIGAON NO. 2 PWSS",
+                        "localname": "NEW HARIGAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HARIGAON NO. 2 PWSS",
+                "localname": "NEW HARIGAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30040815",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HARIGAON NO. 2 PWSS",
+                        "localname": "NEW HARIGAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040815/ws-services-calculation/Penalty.json b/data/as/30040815/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c32496a4da
--- /dev/null
+++ b/data/as/30040815/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30040815",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30040815/ws-services-calculation/WCBillingSlab.json b/data/as/30040815/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b538dc0a9d
--- /dev/null
+++ b/data/as/30040815/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30040815",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041202/BillingService/BusinessService.json b/data/as/30041202/BillingService/BusinessService.json
new file mode 100644
index 0000000000..faa32dcb40
--- /dev/null
+++ b/data/as/30041202/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041202",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041202/egov-location/boundary-data.json b/data/as/30041202/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e342a09a9e
--- /dev/null
+++ b/data/as/30041202/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041202",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLA MOTHABARI PWSS (NEW)",
+                "localname": "CHAKLA MOTHABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLA MOTHABARI PWSS (NEW)",
+                        "localname": "CHAKLA MOTHABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLA MOTHABARI PWSS (NEW)",
+                "localname": "CHAKLA MOTHABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLA MOTHABARI PWSS (NEW)",
+                        "localname": "CHAKLA MOTHABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041202/ws-services-calculation/Penalty.json b/data/as/30041202/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f6fb511fa
--- /dev/null
+++ b/data/as/30041202/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041202",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041202/ws-services-calculation/WCBillingSlab.json b/data/as/30041202/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a39cbbc03
--- /dev/null
+++ b/data/as/30041202/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041202",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041203/BillingService/BusinessService.json b/data/as/30041203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..944d3ec5d8
--- /dev/null
+++ b/data/as/30041203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041203/egov-location/boundary-data.json b/data/as/30041203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d357c29699
--- /dev/null
+++ b/data/as/30041203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKPARA PWSS (NEW)",
+                "localname": "SAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKPARA PWSS (NEW)",
+                        "localname": "SAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKPARA PWSS (NEW)",
+                "localname": "SAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKPARA PWSS (NEW)",
+                        "localname": "SAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041203/ws-services-calculation/Penalty.json b/data/as/30041203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b0bf6fc3de
--- /dev/null
+++ b/data/as/30041203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041203/ws-services-calculation/WCBillingSlab.json b/data/as/30041203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a9952d4e4e
--- /dev/null
+++ b/data/as/30041203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041386/BillingService/BusinessService.json b/data/as/30041386/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f214830b28
--- /dev/null
+++ b/data/as/30041386/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041386",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041386/egov-location/boundary-data.json b/data/as/30041386/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06070d2515
--- /dev/null
+++ b/data/as/30041386/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041386",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOKAPARA PWSS (NEW)",
+                "localname": "DHOKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOKAPARA PWSS (NEW)",
+                        "localname": "DHOKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOKAPARA PWSS (NEW)",
+                "localname": "DHOKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOKAPARA PWSS (NEW)",
+                        "localname": "DHOKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041386/ws-services-calculation/Penalty.json b/data/as/30041386/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a6cf2f717
--- /dev/null
+++ b/data/as/30041386/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041386",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041386/ws-services-calculation/WCBillingSlab.json b/data/as/30041386/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1c8756ce51
--- /dev/null
+++ b/data/as/30041386/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041386",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041849/BillingService/BusinessService.json b/data/as/30041849/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8cd8dea90f
--- /dev/null
+++ b/data/as/30041849/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041849",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041849/egov-location/boundary-data.json b/data/as/30041849/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cfd14acdc5
--- /dev/null
+++ b/data/as/30041849/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041849",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                "localname": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                        "localname": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                "localname": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                        "localname": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041849/ws-services-calculation/Penalty.json b/data/as/30041849/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d130412b93
--- /dev/null
+++ b/data/as/30041849/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041849",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041849/ws-services-calculation/WCBillingSlab.json b/data/as/30041849/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2561ec9143
--- /dev/null
+++ b/data/as/30041849/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041849",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041850/BillingService/BusinessService.json b/data/as/30041850/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c2b97dbcc1
--- /dev/null
+++ b/data/as/30041850/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041850",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041850/egov-location/boundary-data.json b/data/as/30041850/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8647a83dfd
--- /dev/null
+++ b/data/as/30041850/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041850",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                "localname": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                        "localname": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                "localname": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                        "localname": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041850/ws-services-calculation/Penalty.json b/data/as/30041850/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cae6b7f935
--- /dev/null
+++ b/data/as/30041850/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041850",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041850/ws-services-calculation/WCBillingSlab.json b/data/as/30041850/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..586dd5df8b
--- /dev/null
+++ b/data/as/30041850/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041850",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041853/BillingService/BusinessService.json b/data/as/30041853/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f495123b55
--- /dev/null
+++ b/data/as/30041853/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041853",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041853/egov-location/boundary-data.json b/data/as/30041853/egov-location/boundary-data.json
new file mode 100644
index 0000000000..078a4a53d5
--- /dev/null
+++ b/data/as/30041853/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041853",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANGTHIHARA PWSS (NEW)",
+                "localname": "ANGTHIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041853",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANGTHIHARA PWSS (NEW)",
+                        "localname": "ANGTHIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANGTHIHARA PWSS (NEW)",
+                "localname": "ANGTHIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041853",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANGTHIHARA PWSS (NEW)",
+                        "localname": "ANGTHIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041853/ws-services-calculation/Penalty.json b/data/as/30041853/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..88fea64b2d
--- /dev/null
+++ b/data/as/30041853/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041853",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041853/ws-services-calculation/WCBillingSlab.json b/data/as/30041853/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce7eb7cacd
--- /dev/null
+++ b/data/as/30041853/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041853",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041854/BillingService/BusinessService.json b/data/as/30041854/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e87d9f94ad
--- /dev/null
+++ b/data/as/30041854/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041854",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041854/egov-location/boundary-data.json b/data/as/30041854/egov-location/boundary-data.json
new file mode 100644
index 0000000000..273cda5018
--- /dev/null
+++ b/data/as/30041854/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041854",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABARI PWSS (NEW)",
+                "localname": "KOLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABARI PWSS (NEW)",
+                        "localname": "KOLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABARI PWSS (NEW)",
+                "localname": "KOLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABARI PWSS (NEW)",
+                        "localname": "KOLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041854/ws-services-calculation/Penalty.json b/data/as/30041854/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a8ff980e2e
--- /dev/null
+++ b/data/as/30041854/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041854",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041854/ws-services-calculation/WCBillingSlab.json b/data/as/30041854/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f1d8935351
--- /dev/null
+++ b/data/as/30041854/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041854",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041859/BillingService/BusinessService.json b/data/as/30041859/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc1fa1f5df
--- /dev/null
+++ b/data/as/30041859/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041859",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041859/egov-location/boundary-data.json b/data/as/30041859/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d5843a2c4
--- /dev/null
+++ b/data/as/30041859/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041859",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATLAMARI PWSS (NEW)",
+                "localname": "KATLAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041859",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATLAMARI PWSS (NEW)",
+                        "localname": "KATLAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATLAMARI PWSS (NEW)",
+                "localname": "KATLAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041859",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATLAMARI PWSS (NEW)",
+                        "localname": "KATLAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041859/ws-services-calculation/Penalty.json b/data/as/30041859/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..87b6712cb2
--- /dev/null
+++ b/data/as/30041859/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041859",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041859/ws-services-calculation/WCBillingSlab.json b/data/as/30041859/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a67b6125c8
--- /dev/null
+++ b/data/as/30041859/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041859",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041866/BillingService/BusinessService.json b/data/as/30041866/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d28d43416d
--- /dev/null
+++ b/data/as/30041866/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041866",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041866/egov-location/boundary-data.json b/data/as/30041866/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c6d1831f66
--- /dev/null
+++ b/data/as/30041866/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041866",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARI PWSS (NEW)",
+                "localname": "PUTHIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARI PWSS (NEW)",
+                        "localname": "PUTHIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARI PWSS (NEW)",
+                "localname": "PUTHIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041866",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARI PWSS (NEW)",
+                        "localname": "PUTHIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041866/ws-services-calculation/Penalty.json b/data/as/30041866/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65eed6a07d
--- /dev/null
+++ b/data/as/30041866/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041866",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041866/ws-services-calculation/WCBillingSlab.json b/data/as/30041866/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba61534fef
--- /dev/null
+++ b/data/as/30041866/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041866",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041873/BillingService/BusinessService.json b/data/as/30041873/BillingService/BusinessService.json
new file mode 100644
index 0000000000..696b758be6
--- /dev/null
+++ b/data/as/30041873/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041873",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041873/egov-location/boundary-data.json b/data/as/30041873/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf8640891c
--- /dev/null
+++ b/data/as/30041873/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041873",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARALJHAR PWSS (NEW)",
+                "localname": "CHARALJHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041873",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARALJHAR PWSS (NEW)",
+                        "localname": "CHARALJHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARALJHAR PWSS (NEW)",
+                "localname": "CHARALJHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041873",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARALJHAR PWSS (NEW)",
+                        "localname": "CHARALJHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041873/ws-services-calculation/Penalty.json b/data/as/30041873/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b012ffd543
--- /dev/null
+++ b/data/as/30041873/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041873",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041873/ws-services-calculation/WCBillingSlab.json b/data/as/30041873/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e0d61463d9
--- /dev/null
+++ b/data/as/30041873/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041873",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041886/BillingService/BusinessService.json b/data/as/30041886/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e399fc654
--- /dev/null
+++ b/data/as/30041886/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041886",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041886/egov-location/boundary-data.json b/data/as/30041886/egov-location/boundary-data.json
new file mode 100644
index 0000000000..41a6b46a96
--- /dev/null
+++ b/data/as/30041886/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041886",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTIKHOWA PWSS (NEW)",
+                "localname": "MOTIKHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041886",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTIKHOWA PWSS (NEW)",
+                        "localname": "MOTIKHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTIKHOWA PWSS (NEW)",
+                "localname": "MOTIKHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041886",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTIKHOWA PWSS (NEW)",
+                        "localname": "MOTIKHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041886/ws-services-calculation/Penalty.json b/data/as/30041886/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..daf1077d38
--- /dev/null
+++ b/data/as/30041886/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041886",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041886/ws-services-calculation/WCBillingSlab.json b/data/as/30041886/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..457e3a57b6
--- /dev/null
+++ b/data/as/30041886/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041886",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041901/BillingService/BusinessService.json b/data/as/30041901/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca69e0394d
--- /dev/null
+++ b/data/as/30041901/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041901",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041901/egov-location/boundary-data.json b/data/as/30041901/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8f7dc469ce
--- /dev/null
+++ b/data/as/30041901/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041901",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1  NABIL KACHARI GAON PWSS",
+                "localname": "NO.1  NABIL KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1  NABIL KACHARI GAON PWSS",
+                        "localname": "NO.1  NABIL KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1  NABIL KACHARI GAON PWSS",
+                "localname": "NO.1  NABIL KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1  NABIL KACHARI GAON PWSS",
+                        "localname": "NO.1  NABIL KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041901/ws-services-calculation/Penalty.json b/data/as/30041901/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fbc8a0ae69
--- /dev/null
+++ b/data/as/30041901/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041901",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041901/ws-services-calculation/WCBillingSlab.json b/data/as/30041901/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69ac734292
--- /dev/null
+++ b/data/as/30041901/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041901",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041907/BillingService/BusinessService.json b/data/as/30041907/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f5126be4c
--- /dev/null
+++ b/data/as/30041907/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30041907",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041907/egov-location/boundary-data.json b/data/as/30041907/egov-location/boundary-data.json
new file mode 100644
index 0000000000..42ac7a9794
--- /dev/null
+++ b/data/as/30041907/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30041907",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NABIL KACHARI GAON PWSS",
+                "localname": "NO.2 NABIL KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041907",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NABIL KACHARI GAON PWSS",
+                        "localname": "NO.2 NABIL KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NABIL KACHARI GAON PWSS",
+                "localname": "NO.2 NABIL KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30041907",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NABIL KACHARI GAON PWSS",
+                        "localname": "NO.2 NABIL KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041907/ws-services-calculation/Penalty.json b/data/as/30041907/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56a04c4aa2
--- /dev/null
+++ b/data/as/30041907/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30041907",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30041907/ws-services-calculation/WCBillingSlab.json b/data/as/30041907/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0f2838c175
--- /dev/null
+++ b/data/as/30041907/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30041907",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042788/BillingService/BusinessService.json b/data/as/30042788/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bc31824270
--- /dev/null
+++ b/data/as/30042788/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042788",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042788/egov-location/boundary-data.json b/data/as/30042788/egov-location/boundary-data.json
new file mode 100644
index 0000000000..42c749327e
--- /dev/null
+++ b/data/as/30042788/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042788",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOWALMARI NO-I PWSS (NEW)",
+                "localname": "BOWALMARI NO-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOWALMARI NO-I PWSS (NEW)",
+                        "localname": "BOWALMARI NO-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOWALMARI NO-I PWSS (NEW)",
+                "localname": "BOWALMARI NO-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOWALMARI NO-I PWSS (NEW)",
+                        "localname": "BOWALMARI NO-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042788/ws-services-calculation/Penalty.json b/data/as/30042788/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81bcb46c7c
--- /dev/null
+++ b/data/as/30042788/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042788",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042788/ws-services-calculation/WCBillingSlab.json b/data/as/30042788/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41cb288456
--- /dev/null
+++ b/data/as/30042788/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042788",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042793/BillingService/BusinessService.json b/data/as/30042793/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f65b3da7bb
--- /dev/null
+++ b/data/as/30042793/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042793",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042793/egov-location/boundary-data.json b/data/as/30042793/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8d79394852
--- /dev/null
+++ b/data/as/30042793/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042793",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAT BAINI PT-III PWSS (NEW)",
+                "localname": "SAT BAINI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAT BAINI PT-III PWSS (NEW)",
+                        "localname": "SAT BAINI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAT BAINI PT-III PWSS (NEW)",
+                "localname": "SAT BAINI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAT BAINI PT-III PWSS (NEW)",
+                        "localname": "SAT BAINI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042793/ws-services-calculation/Penalty.json b/data/as/30042793/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82c07b1a33
--- /dev/null
+++ b/data/as/30042793/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042793",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042793/ws-services-calculation/WCBillingSlab.json b/data/as/30042793/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0078fa427e
--- /dev/null
+++ b/data/as/30042793/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042793",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042799/BillingService/BusinessService.json b/data/as/30042799/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2cdce00783
--- /dev/null
+++ b/data/as/30042799/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042799",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042799/egov-location/boundary-data.json b/data/as/30042799/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c161ad4b5
--- /dev/null
+++ b/data/as/30042799/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042799",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILABORI PWSS (NEW)",
+                "localname": "GHILABORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILABORI PWSS (NEW)",
+                        "localname": "GHILABORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILABORI PWSS (NEW)",
+                "localname": "GHILABORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILABORI PWSS (NEW)",
+                        "localname": "GHILABORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042799/ws-services-calculation/Penalty.json b/data/as/30042799/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1d98281523
--- /dev/null
+++ b/data/as/30042799/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042799",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042799/ws-services-calculation/WCBillingSlab.json b/data/as/30042799/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3f4fc1a34
--- /dev/null
+++ b/data/as/30042799/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042799",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042803/BillingService/BusinessService.json b/data/as/30042803/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8bdeac5497
--- /dev/null
+++ b/data/as/30042803/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042803",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042803/egov-location/boundary-data.json b/data/as/30042803/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f47ba2e4eb
--- /dev/null
+++ b/data/as/30042803/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042803",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAKASA BELTOLA PWSS (NEW)",
+                "localname": "MONAKASA BELTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAKASA BELTOLA PWSS (NEW)",
+                        "localname": "MONAKASA BELTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAKASA BELTOLA PWSS (NEW)",
+                "localname": "MONAKASA BELTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAKASA BELTOLA PWSS (NEW)",
+                        "localname": "MONAKASA BELTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042803/ws-services-calculation/Penalty.json b/data/as/30042803/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cfe1ee7f40
--- /dev/null
+++ b/data/as/30042803/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042803",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042803/ws-services-calculation/WCBillingSlab.json b/data/as/30042803/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f317ee639
--- /dev/null
+++ b/data/as/30042803/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042803",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042807/BillingService/BusinessService.json b/data/as/30042807/BillingService/BusinessService.json
new file mode 100644
index 0000000000..208719d01b
--- /dev/null
+++ b/data/as/30042807/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042807",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042807/egov-location/boundary-data.json b/data/as/30042807/egov-location/boundary-data.json
new file mode 100644
index 0000000000..46881f3cb9
--- /dev/null
+++ b/data/as/30042807/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042807",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONEHERA UTTARPARA PWSS (NEW)",
+                "localname": "SONEHERA UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONEHERA UTTARPARA PWSS (NEW)",
+                        "localname": "SONEHERA UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONEHERA UTTARPARA PWSS (NEW)",
+                "localname": "SONEHERA UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONEHERA UTTARPARA PWSS (NEW)",
+                        "localname": "SONEHERA UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042807/ws-services-calculation/Penalty.json b/data/as/30042807/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ae72a02dff
--- /dev/null
+++ b/data/as/30042807/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042807",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042807/ws-services-calculation/WCBillingSlab.json b/data/as/30042807/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60aee3001b
--- /dev/null
+++ b/data/as/30042807/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042807",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042812/BillingService/BusinessService.json b/data/as/30042812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98e5398d1c
--- /dev/null
+++ b/data/as/30042812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042812/egov-location/boundary-data.json b/data/as/30042812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..577aa5a429
--- /dev/null
+++ b/data/as/30042812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LIKIRI PARA PWSS (NEW)",
+                "localname": "LIKIRI PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LIKIRI PARA PWSS (NEW)",
+                        "localname": "LIKIRI PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LIKIRI PARA PWSS (NEW)",
+                "localname": "LIKIRI PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LIKIRI PARA PWSS (NEW)",
+                        "localname": "LIKIRI PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042812/ws-services-calculation/Penalty.json b/data/as/30042812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..829696689c
--- /dev/null
+++ b/data/as/30042812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042812/ws-services-calculation/WCBillingSlab.json b/data/as/30042812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..689cb58af0
--- /dev/null
+++ b/data/as/30042812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042816/BillingService/BusinessService.json b/data/as/30042816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6c6a4795a
--- /dev/null
+++ b/data/as/30042816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042816/egov-location/boundary-data.json b/data/as/30042816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d048b6cfcb
--- /dev/null
+++ b/data/as/30042816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                "localname": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                        "localname": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                "localname": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                        "localname": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042816/ws-services-calculation/Penalty.json b/data/as/30042816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..694cfe9ec1
--- /dev/null
+++ b/data/as/30042816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042816/ws-services-calculation/WCBillingSlab.json b/data/as/30042816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5f29a291e5
--- /dev/null
+++ b/data/as/30042816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042819/BillingService/BusinessService.json b/data/as/30042819/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5102f7d8d1
--- /dev/null
+++ b/data/as/30042819/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042819",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042819/egov-location/boundary-data.json b/data/as/30042819/egov-location/boundary-data.json
new file mode 100644
index 0000000000..beaa9692b4
--- /dev/null
+++ b/data/as/30042819/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042819",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KORIRCHALA BATABARI A PWSS (NEW)",
+                "localname": "KORIRCHALA BATABARI A PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042819",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KORIRCHALA BATABARI A PWSS (NEW)",
+                        "localname": "KORIRCHALA BATABARI A PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KORIRCHALA BATABARI A PWSS (NEW)",
+                "localname": "KORIRCHALA BATABARI A PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042819",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KORIRCHALA BATABARI A PWSS (NEW)",
+                        "localname": "KORIRCHALA BATABARI A PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042819/ws-services-calculation/Penalty.json b/data/as/30042819/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69c740f989
--- /dev/null
+++ b/data/as/30042819/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042819",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042819/ws-services-calculation/WCBillingSlab.json b/data/as/30042819/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8961d853cf
--- /dev/null
+++ b/data/as/30042819/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042819",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042954/BillingService/BusinessService.json b/data/as/30042954/BillingService/BusinessService.json
new file mode 100644
index 0000000000..579b556e65
--- /dev/null
+++ b/data/as/30042954/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042954",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042954/egov-location/boundary-data.json b/data/as/30042954/egov-location/boundary-data.json
new file mode 100644
index 0000000000..39b443036d
--- /dev/null
+++ b/data/as/30042954/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042954",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTARPARA NO 2 PWSS (NEW)",
+                "localname": "SUTARPARA NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTARPARA NO 2 PWSS (NEW)",
+                        "localname": "SUTARPARA NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTARPARA NO 2 PWSS (NEW)",
+                "localname": "SUTARPARA NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTARPARA NO 2 PWSS (NEW)",
+                        "localname": "SUTARPARA NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042954/ws-services-calculation/Penalty.json b/data/as/30042954/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..be98abaed5
--- /dev/null
+++ b/data/as/30042954/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042954",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042954/ws-services-calculation/WCBillingSlab.json b/data/as/30042954/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..108535fd9b
--- /dev/null
+++ b/data/as/30042954/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042954",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042955/BillingService/BusinessService.json b/data/as/30042955/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a085161a0f
--- /dev/null
+++ b/data/as/30042955/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042955",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042955/egov-location/boundary-data.json b/data/as/30042955/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd094238e2
--- /dev/null
+++ b/data/as/30042955/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042955",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                "localname": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                "localname": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042955/ws-services-calculation/Penalty.json b/data/as/30042955/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..877e28012d
--- /dev/null
+++ b/data/as/30042955/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042955",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042955/ws-services-calculation/WCBillingSlab.json b/data/as/30042955/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07029010c8
--- /dev/null
+++ b/data/as/30042955/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042955",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042957/BillingService/BusinessService.json b/data/as/30042957/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a5d976169
--- /dev/null
+++ b/data/as/30042957/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042957",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042957/egov-location/boundary-data.json b/data/as/30042957/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5b86748399
--- /dev/null
+++ b/data/as/30042957/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042957",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042957",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042957",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042957/ws-services-calculation/Penalty.json b/data/as/30042957/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd5f9fb5c9
--- /dev/null
+++ b/data/as/30042957/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042957",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042957/ws-services-calculation/WCBillingSlab.json b/data/as/30042957/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a9f83e7c40
--- /dev/null
+++ b/data/as/30042957/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042957",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042959/BillingService/BusinessService.json b/data/as/30042959/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dbd62a295
--- /dev/null
+++ b/data/as/30042959/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042959",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042959/egov-location/boundary-data.json b/data/as/30042959/egov-location/boundary-data.json
new file mode 100644
index 0000000000..72bfeef9de
--- /dev/null
+++ b/data/as/30042959/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042959",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBILA PWSS (NEW)",
+                "localname": "BORBILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042959",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBILA PWSS (NEW)",
+                        "localname": "BORBILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBILA PWSS (NEW)",
+                "localname": "BORBILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042959",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBILA PWSS (NEW)",
+                        "localname": "BORBILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042959/ws-services-calculation/Penalty.json b/data/as/30042959/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..84ecff0890
--- /dev/null
+++ b/data/as/30042959/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042959",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042959/ws-services-calculation/WCBillingSlab.json b/data/as/30042959/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e0af082670
--- /dev/null
+++ b/data/as/30042959/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042959",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042961/BillingService/BusinessService.json b/data/as/30042961/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a4aca62d74
--- /dev/null
+++ b/data/as/30042961/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042961",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042961/egov-location/boundary-data.json b/data/as/30042961/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e5e10dcea
--- /dev/null
+++ b/data/as/30042961/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042961",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KRISHNAPUR PWSS (NEW)",
+                "localname": "KRISHNAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042961",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KRISHNAPUR PWSS (NEW)",
+                        "localname": "KRISHNAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KRISHNAPUR PWSS (NEW)",
+                "localname": "KRISHNAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042961",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KRISHNAPUR PWSS (NEW)",
+                        "localname": "KRISHNAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042961/ws-services-calculation/Penalty.json b/data/as/30042961/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..654b04d5a0
--- /dev/null
+++ b/data/as/30042961/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042961",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042961/ws-services-calculation/WCBillingSlab.json b/data/as/30042961/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..96863dc0b2
--- /dev/null
+++ b/data/as/30042961/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042961",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042963/BillingService/BusinessService.json b/data/as/30042963/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce79ee7d35
--- /dev/null
+++ b/data/as/30042963/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042963",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042963/egov-location/boundary-data.json b/data/as/30042963/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ec873dbec0
--- /dev/null
+++ b/data/as/30042963/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042963",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                "localname": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042963",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                        "localname": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                "localname": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042963",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                        "localname": "NEW MORNAI FIELDPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042963/ws-services-calculation/Penalty.json b/data/as/30042963/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f063f33e1
--- /dev/null
+++ b/data/as/30042963/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042963",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042963/ws-services-calculation/WCBillingSlab.json b/data/as/30042963/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..698aa6f667
--- /dev/null
+++ b/data/as/30042963/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042963",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042965/BillingService/BusinessService.json b/data/as/30042965/BillingService/BusinessService.json
new file mode 100644
index 0000000000..926aa54d4e
--- /dev/null
+++ b/data/as/30042965/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30042965",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042965/egov-location/boundary-data.json b/data/as/30042965/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b5c706a5b
--- /dev/null
+++ b/data/as/30042965/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30042965",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                "localname": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                        "localname": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                "localname": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30042965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                        "localname": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042965/ws-services-calculation/Penalty.json b/data/as/30042965/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9bc47f64e0
--- /dev/null
+++ b/data/as/30042965/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30042965",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30042965/ws-services-calculation/WCBillingSlab.json b/data/as/30042965/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bec3ae21e5
--- /dev/null
+++ b/data/as/30042965/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30042965",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043286/BillingService/BusinessService.json b/data/as/30043286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99f4d963ec
--- /dev/null
+++ b/data/as/30043286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043286/egov-location/boundary-data.json b/data/as/30043286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..671a7562d2
--- /dev/null
+++ b/data/as/30043286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAM HARIPARA PWSS (NEW)",
+                "localname": "RAM HARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAM HARIPARA PWSS (NEW)",
+                        "localname": "RAM HARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAM HARIPARA PWSS (NEW)",
+                "localname": "RAM HARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAM HARIPARA PWSS (NEW)",
+                        "localname": "RAM HARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043286/ws-services-calculation/Penalty.json b/data/as/30043286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b08365168f
--- /dev/null
+++ b/data/as/30043286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043286/ws-services-calculation/WCBillingSlab.json b/data/as/30043286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e262ab38d
--- /dev/null
+++ b/data/as/30043286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043298/BillingService/BusinessService.json b/data/as/30043298/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ae78eab65
--- /dev/null
+++ b/data/as/30043298/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043298",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043298/egov-location/boundary-data.json b/data/as/30043298/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c4ca3cf53d
--- /dev/null
+++ b/data/as/30043298/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043298",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGMARI PWSS (NEW)",
+                "localname": "CHENGMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGMARI PWSS (NEW)",
+                        "localname": "CHENGMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGMARI PWSS (NEW)",
+                "localname": "CHENGMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGMARI PWSS (NEW)",
+                        "localname": "CHENGMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043298/ws-services-calculation/Penalty.json b/data/as/30043298/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73fc7c5e21
--- /dev/null
+++ b/data/as/30043298/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043298",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043298/ws-services-calculation/WCBillingSlab.json b/data/as/30043298/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a9fbeea48
--- /dev/null
+++ b/data/as/30043298/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043298",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043311/BillingService/BusinessService.json b/data/as/30043311/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc3816cf35
--- /dev/null
+++ b/data/as/30043311/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043311",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043311/egov-location/boundary-data.json b/data/as/30043311/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7672e5b6f
--- /dev/null
+++ b/data/as/30043311/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043311",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUMARPARA PATIARPARA PWSS (NEW)",
+                "localname": "KUMARPARA PATIARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUMARPARA PATIARPARA PWSS (NEW)",
+                        "localname": "KUMARPARA PATIARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUMARPARA PATIARPARA PWSS (NEW)",
+                "localname": "KUMARPARA PATIARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUMARPARA PATIARPARA PWSS (NEW)",
+                        "localname": "KUMARPARA PATIARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043311/ws-services-calculation/Penalty.json b/data/as/30043311/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e56771f69f
--- /dev/null
+++ b/data/as/30043311/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043311",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043311/ws-services-calculation/WCBillingSlab.json b/data/as/30043311/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c20ad96b0d
--- /dev/null
+++ b/data/as/30043311/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043311",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043314/BillingService/BusinessService.json b/data/as/30043314/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2a0f59e14e
--- /dev/null
+++ b/data/as/30043314/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043314",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043314/egov-location/boundary-data.json b/data/as/30043314/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ec41efe3a9
--- /dev/null
+++ b/data/as/30043314/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043314",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKURBHITA PWSS (NEW)",
+                "localname": "DAKURBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKURBHITA PWSS (NEW)",
+                        "localname": "DAKURBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKURBHITA PWSS (NEW)",
+                "localname": "DAKURBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKURBHITA PWSS (NEW)",
+                        "localname": "DAKURBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043314/ws-services-calculation/Penalty.json b/data/as/30043314/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef202dacdf
--- /dev/null
+++ b/data/as/30043314/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043314",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043314/ws-services-calculation/WCBillingSlab.json b/data/as/30043314/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3651e37bd
--- /dev/null
+++ b/data/as/30043314/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043314",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043321/BillingService/BusinessService.json b/data/as/30043321/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66d9f5520c
--- /dev/null
+++ b/data/as/30043321/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043321",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043321/egov-location/boundary-data.json b/data/as/30043321/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd63e07afc
--- /dev/null
+++ b/data/as/30043321/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043321",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDOBA PWSS (NEW)",
+                "localname": "BAMUNDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043321",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDOBA PWSS (NEW)",
+                        "localname": "BAMUNDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDOBA PWSS (NEW)",
+                "localname": "BAMUNDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043321",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDOBA PWSS (NEW)",
+                        "localname": "BAMUNDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043321/ws-services-calculation/Penalty.json b/data/as/30043321/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..28842c09f9
--- /dev/null
+++ b/data/as/30043321/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043321",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043321/ws-services-calculation/WCBillingSlab.json b/data/as/30043321/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ab3726507f
--- /dev/null
+++ b/data/as/30043321/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043321",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043327/BillingService/BusinessService.json b/data/as/30043327/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87580590b8
--- /dev/null
+++ b/data/as/30043327/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043327",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043327/egov-location/boundary-data.json b/data/as/30043327/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1121141346
--- /dev/null
+++ b/data/as/30043327/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043327",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURUNG PWSS (NEW)",
+                "localname": "KURUNG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043327",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURUNG PWSS (NEW)",
+                        "localname": "KURUNG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURUNG PWSS (NEW)",
+                "localname": "KURUNG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043327",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURUNG PWSS (NEW)",
+                        "localname": "KURUNG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043327/ws-services-calculation/Penalty.json b/data/as/30043327/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1f3b6147c
--- /dev/null
+++ b/data/as/30043327/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043327",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043327/ws-services-calculation/WCBillingSlab.json b/data/as/30043327/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21c5133991
--- /dev/null
+++ b/data/as/30043327/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043327",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043330/BillingService/BusinessService.json b/data/as/30043330/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c6b6dd5865
--- /dev/null
+++ b/data/as/30043330/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043330",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043330/egov-location/boundary-data.json b/data/as/30043330/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7e617b051
--- /dev/null
+++ b/data/as/30043330/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043330",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTARPARA NO 3 PWSS (NEW)",
+                "localname": "SUTARPARA NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTARPARA NO 3 PWSS (NEW)",
+                        "localname": "SUTARPARA NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTARPARA NO 3 PWSS (NEW)",
+                "localname": "SUTARPARA NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTARPARA NO 3 PWSS (NEW)",
+                        "localname": "SUTARPARA NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043330/ws-services-calculation/Penalty.json b/data/as/30043330/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d1e3b215b
--- /dev/null
+++ b/data/as/30043330/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043330",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043330/ws-services-calculation/WCBillingSlab.json b/data/as/30043330/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e17a281d8b
--- /dev/null
+++ b/data/as/30043330/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043330",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043335/BillingService/BusinessService.json b/data/as/30043335/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e1c19a7d53
--- /dev/null
+++ b/data/as/30043335/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043335",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043335/egov-location/boundary-data.json b/data/as/30043335/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd92f46b9f
--- /dev/null
+++ b/data/as/30043335/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043335",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                "localname": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043335",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                        "localname": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                "localname": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043335",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                        "localname": "TINKONIAPARA UJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043335/ws-services-calculation/Penalty.json b/data/as/30043335/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ad1da9fea
--- /dev/null
+++ b/data/as/30043335/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043335",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043335/ws-services-calculation/WCBillingSlab.json b/data/as/30043335/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b754fac184
--- /dev/null
+++ b/data/as/30043335/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043335",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043343/BillingService/BusinessService.json b/data/as/30043343/BillingService/BusinessService.json
new file mode 100644
index 0000000000..51bf00f740
--- /dev/null
+++ b/data/as/30043343/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043343",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043343/egov-location/boundary-data.json b/data/as/30043343/egov-location/boundary-data.json
new file mode 100644
index 0000000000..953489a852
--- /dev/null
+++ b/data/as/30043343/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043343",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKMARI PWSS (NEW)",
+                "localname": "BHALUKMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043343",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKMARI PWSS (NEW)",
+                        "localname": "BHALUKMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKMARI PWSS (NEW)",
+                "localname": "BHALUKMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043343",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKMARI PWSS (NEW)",
+                        "localname": "BHALUKMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043343/ws-services-calculation/Penalty.json b/data/as/30043343/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7dfd67a946
--- /dev/null
+++ b/data/as/30043343/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043343",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043343/ws-services-calculation/WCBillingSlab.json b/data/as/30043343/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..491c98a290
--- /dev/null
+++ b/data/as/30043343/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043343",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043349/BillingService/BusinessService.json b/data/as/30043349/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94ce477e20
--- /dev/null
+++ b/data/as/30043349/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043349",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043349/egov-location/boundary-data.json b/data/as/30043349/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6045dd6911
--- /dev/null
+++ b/data/as/30043349/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043349",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARKATA PWSS (NEW)",
+                "localname": "PAHARKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043349",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARKATA PWSS (NEW)",
+                        "localname": "PAHARKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARKATA PWSS (NEW)",
+                "localname": "PAHARKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043349",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARKATA PWSS (NEW)",
+                        "localname": "PAHARKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043349/ws-services-calculation/Penalty.json b/data/as/30043349/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f1cf27709
--- /dev/null
+++ b/data/as/30043349/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043349",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043349/ws-services-calculation/WCBillingSlab.json b/data/as/30043349/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..da927e9491
--- /dev/null
+++ b/data/as/30043349/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043349",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043358/BillingService/BusinessService.json b/data/as/30043358/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8060204272
--- /dev/null
+++ b/data/as/30043358/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043358",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043358/egov-location/boundary-data.json b/data/as/30043358/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c50fa456a5
--- /dev/null
+++ b/data/as/30043358/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043358",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI SIMLABARI PWSS (NEW)",
+                "localname": "AMBARI SIMLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043358",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI SIMLABARI PWSS (NEW)",
+                        "localname": "AMBARI SIMLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI SIMLABARI PWSS (NEW)",
+                "localname": "AMBARI SIMLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043358",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI SIMLABARI PWSS (NEW)",
+                        "localname": "AMBARI SIMLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043358/ws-services-calculation/Penalty.json b/data/as/30043358/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..675c810b5a
--- /dev/null
+++ b/data/as/30043358/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043358",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043358/ws-services-calculation/WCBillingSlab.json b/data/as/30043358/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bbf517a7ce
--- /dev/null
+++ b/data/as/30043358/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043358",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043557/BillingService/BusinessService.json b/data/as/30043557/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa6794d676
--- /dev/null
+++ b/data/as/30043557/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043557",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043557/egov-location/boundary-data.json b/data/as/30043557/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab58754554
--- /dev/null
+++ b/data/as/30043557/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043557",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBILA BORI PWSS (NEW)",
+                "localname": "NOBILA BORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043557",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBILA BORI PWSS (NEW)",
+                        "localname": "NOBILA BORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBILA BORI PWSS (NEW)",
+                "localname": "NOBILA BORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043557",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBILA BORI PWSS (NEW)",
+                        "localname": "NOBILA BORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043557/ws-services-calculation/Penalty.json b/data/as/30043557/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99fb38bdf2
--- /dev/null
+++ b/data/as/30043557/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043557",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043557/ws-services-calculation/WCBillingSlab.json b/data/as/30043557/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13fdafbed3
--- /dev/null
+++ b/data/as/30043557/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043557",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043601/BillingService/BusinessService.json b/data/as/30043601/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0e1660451
--- /dev/null
+++ b/data/as/30043601/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043601",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043601/egov-location/boundary-data.json b/data/as/30043601/egov-location/boundary-data.json
new file mode 100644
index 0000000000..30344dab73
--- /dev/null
+++ b/data/as/30043601/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043601",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHIPARA PT-I PWSS (NEW)",
+                "localname": "MEDHIPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHIPARA PT-I PWSS (NEW)",
+                        "localname": "MEDHIPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHIPARA PT-I PWSS (NEW)",
+                "localname": "MEDHIPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHIPARA PT-I PWSS (NEW)",
+                        "localname": "MEDHIPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043601/ws-services-calculation/Penalty.json b/data/as/30043601/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37c9402f76
--- /dev/null
+++ b/data/as/30043601/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043601",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043601/ws-services-calculation/WCBillingSlab.json b/data/as/30043601/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46dfb47c40
--- /dev/null
+++ b/data/as/30043601/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043601",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043606/BillingService/BusinessService.json b/data/as/30043606/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ab2d9fa28
--- /dev/null
+++ b/data/as/30043606/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043606",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043606/egov-location/boundary-data.json b/data/as/30043606/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a353512b95
--- /dev/null
+++ b/data/as/30043606/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043606",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARAYANPARA PWSS (NEW)",
+                "localname": "NARAYANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARAYANPARA PWSS (NEW)",
+                        "localname": "NARAYANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARAYANPARA PWSS (NEW)",
+                "localname": "NARAYANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARAYANPARA PWSS (NEW)",
+                        "localname": "NARAYANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043606/ws-services-calculation/Penalty.json b/data/as/30043606/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..03775a97f0
--- /dev/null
+++ b/data/as/30043606/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043606",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043606/ws-services-calculation/WCBillingSlab.json b/data/as/30043606/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3827982693
--- /dev/null
+++ b/data/as/30043606/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043606",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043782/BillingService/BusinessService.json b/data/as/30043782/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dabd2d35b9
--- /dev/null
+++ b/data/as/30043782/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043782",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043782/egov-location/boundary-data.json b/data/as/30043782/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db5bffad9c
--- /dev/null
+++ b/data/as/30043782/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043782",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAGALI CHUBURI PWSS",
+                "localname": "CHAGALI CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043782",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAGALI CHUBURI PWSS",
+                        "localname": "CHAGALI CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAGALI CHUBURI PWSS",
+                "localname": "CHAGALI CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043782",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAGALI CHUBURI PWSS",
+                        "localname": "CHAGALI CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043782/ws-services-calculation/Penalty.json b/data/as/30043782/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1e729390f6
--- /dev/null
+++ b/data/as/30043782/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043782",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043782/ws-services-calculation/WCBillingSlab.json b/data/as/30043782/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cdfa33e37e
--- /dev/null
+++ b/data/as/30043782/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043782",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043797/BillingService/BusinessService.json b/data/as/30043797/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2f46a9a2fc
--- /dev/null
+++ b/data/as/30043797/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043797",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043797/egov-location/boundary-data.json b/data/as/30043797/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8911e87fde
--- /dev/null
+++ b/data/as/30043797/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043797",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AHATA GURI GAON PWSS",
+                "localname": "AHATA GURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043797",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AHATA GURI GAON PWSS",
+                        "localname": "AHATA GURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AHATA GURI GAON PWSS",
+                "localname": "AHATA GURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043797",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AHATA GURI GAON PWSS",
+                        "localname": "AHATA GURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043797/ws-services-calculation/Penalty.json b/data/as/30043797/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..562b03bdce
--- /dev/null
+++ b/data/as/30043797/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043797",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043797/ws-services-calculation/WCBillingSlab.json b/data/as/30043797/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0bcbd0c175
--- /dev/null
+++ b/data/as/30043797/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043797",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043820/BillingService/BusinessService.json b/data/as/30043820/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3de793941e
--- /dev/null
+++ b/data/as/30043820/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043820",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043820/egov-location/boundary-data.json b/data/as/30043820/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03dfc204ad
--- /dev/null
+++ b/data/as/30043820/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043820",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDUBIA PWSS",
+                "localname": "BORDUBIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDUBIA PWSS",
+                        "localname": "BORDUBIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDUBIA PWSS",
+                "localname": "BORDUBIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDUBIA PWSS",
+                        "localname": "BORDUBIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043820/ws-services-calculation/Penalty.json b/data/as/30043820/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5975c015d3
--- /dev/null
+++ b/data/as/30043820/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043820",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043820/ws-services-calculation/WCBillingSlab.json b/data/as/30043820/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e54c192d70
--- /dev/null
+++ b/data/as/30043820/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043820",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043846/BillingService/BusinessService.json b/data/as/30043846/BillingService/BusinessService.json
new file mode 100644
index 0000000000..590e65b517
--- /dev/null
+++ b/data/as/30043846/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043846",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043846/egov-location/boundary-data.json b/data/as/30043846/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9cbe038740
--- /dev/null
+++ b/data/as/30043846/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043846",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJULI TE PWSS",
+                "localname": "TARAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043846",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJULI TE PWSS",
+                        "localname": "TARAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJULI TE PWSS",
+                "localname": "TARAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043846",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJULI TE PWSS",
+                        "localname": "TARAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043846/ws-services-calculation/Penalty.json b/data/as/30043846/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..18670e2057
--- /dev/null
+++ b/data/as/30043846/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043846",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043846/ws-services-calculation/WCBillingSlab.json b/data/as/30043846/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..904c3155f5
--- /dev/null
+++ b/data/as/30043846/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043846",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043851/BillingService/BusinessService.json b/data/as/30043851/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aedfec29aa
--- /dev/null
+++ b/data/as/30043851/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043851",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043851/egov-location/boundary-data.json b/data/as/30043851/egov-location/boundary-data.json
new file mode 100644
index 0000000000..28bcc60ffe
--- /dev/null
+++ b/data/as/30043851/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043851",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AKABASTI BENGALI PWSS",
+                "localname": "AKABASTI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AKABASTI BENGALI PWSS",
+                        "localname": "AKABASTI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AKABASTI BENGALI PWSS",
+                "localname": "AKABASTI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043851",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AKABASTI BENGALI PWSS",
+                        "localname": "AKABASTI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043851/ws-services-calculation/Penalty.json b/data/as/30043851/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb32a89175
--- /dev/null
+++ b/data/as/30043851/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043851",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043851/ws-services-calculation/WCBillingSlab.json b/data/as/30043851/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed6f401df3
--- /dev/null
+++ b/data/as/30043851/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043851",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043879/BillingService/BusinessService.json b/data/as/30043879/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1789af062e
--- /dev/null
+++ b/data/as/30043879/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30043879",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043879/egov-location/boundary-data.json b/data/as/30043879/egov-location/boundary-data.json
new file mode 100644
index 0000000000..80ae651d2a
--- /dev/null
+++ b/data/as/30043879/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30043879",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                "localname": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                        "localname": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                "localname": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30043879",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                        "localname": "NO. 2 GHOGORA T.E.(EAST) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043879/ws-services-calculation/Penalty.json b/data/as/30043879/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..45384f6266
--- /dev/null
+++ b/data/as/30043879/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30043879",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30043879/ws-services-calculation/WCBillingSlab.json b/data/as/30043879/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0d6a117f6e
--- /dev/null
+++ b/data/as/30043879/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30043879",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044254/BillingService/BusinessService.json b/data/as/30044254/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4bcb9f5a6
--- /dev/null
+++ b/data/as/30044254/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30044254",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044254/egov-location/boundary-data.json b/data/as/30044254/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2d48e0c3c
--- /dev/null
+++ b/data/as/30044254/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30044254",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIRAI ATI PWSS",
+                "localname": "NIRAI ATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044254",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIRAI ATI PWSS",
+                        "localname": "NIRAI ATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIRAI ATI PWSS",
+                "localname": "NIRAI ATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044254",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIRAI ATI PWSS",
+                        "localname": "NIRAI ATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044254/ws-services-calculation/Penalty.json b/data/as/30044254/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68359bc51c
--- /dev/null
+++ b/data/as/30044254/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30044254",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044254/ws-services-calculation/WCBillingSlab.json b/data/as/30044254/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e3ca1d80b
--- /dev/null
+++ b/data/as/30044254/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30044254",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044293/BillingService/BusinessService.json b/data/as/30044293/BillingService/BusinessService.json
new file mode 100644
index 0000000000..087c450e60
--- /dev/null
+++ b/data/as/30044293/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30044293",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044293/egov-location/boundary-data.json b/data/as/30044293/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49985f8c86
--- /dev/null
+++ b/data/as/30044293/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30044293",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI NO-1 PWSS",
+                "localname": "DHEKIAJULI NO-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044293",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI NO-1 PWSS",
+                        "localname": "DHEKIAJULI NO-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI NO-1 PWSS",
+                "localname": "DHEKIAJULI NO-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044293",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI NO-1 PWSS",
+                        "localname": "DHEKIAJULI NO-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044293/ws-services-calculation/Penalty.json b/data/as/30044293/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e59c7b19da
--- /dev/null
+++ b/data/as/30044293/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30044293",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044293/ws-services-calculation/WCBillingSlab.json b/data/as/30044293/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b14af2f151
--- /dev/null
+++ b/data/as/30044293/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30044293",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044481/BillingService/BusinessService.json b/data/as/30044481/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c536a6e474
--- /dev/null
+++ b/data/as/30044481/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30044481",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044481/egov-location/boundary-data.json b/data/as/30044481/egov-location/boundary-data.json
new file mode 100644
index 0000000000..911df46e60
--- /dev/null
+++ b/data/as/30044481/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30044481",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMTAL BALI GAON PWSS",
+                "localname": "AMTAL BALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044481",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMTAL BALI GAON PWSS",
+                        "localname": "AMTAL BALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMTAL BALI GAON PWSS",
+                "localname": "AMTAL BALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044481",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMTAL BALI GAON PWSS",
+                        "localname": "AMTAL BALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044481/ws-services-calculation/Penalty.json b/data/as/30044481/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..462566a0f0
--- /dev/null
+++ b/data/as/30044481/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30044481",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044481/ws-services-calculation/WCBillingSlab.json b/data/as/30044481/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..694988798f
--- /dev/null
+++ b/data/as/30044481/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30044481",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044491/BillingService/BusinessService.json b/data/as/30044491/BillingService/BusinessService.json
new file mode 100644
index 0000000000..efbc1abb36
--- /dev/null
+++ b/data/as/30044491/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30044491",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044491/egov-location/boundary-data.json b/data/as/30044491/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e6bd64ea8
--- /dev/null
+++ b/data/as/30044491/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30044491",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMTOL BENGALI GAON PWSS",
+                "localname": "AMTOL BENGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044491",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMTOL BENGALI GAON PWSS",
+                        "localname": "AMTOL BENGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMTOL BENGALI GAON PWSS",
+                "localname": "AMTOL BENGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30044491",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMTOL BENGALI GAON PWSS",
+                        "localname": "AMTOL BENGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044491/ws-services-calculation/Penalty.json b/data/as/30044491/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..17f2a20e69
--- /dev/null
+++ b/data/as/30044491/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30044491",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30044491/ws-services-calculation/WCBillingSlab.json b/data/as/30044491/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b477f38ed9
--- /dev/null
+++ b/data/as/30044491/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30044491",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045140/BillingService/BusinessService.json b/data/as/30045140/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df8efc6575
--- /dev/null
+++ b/data/as/30045140/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30045140",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045140/egov-location/boundary-data.json b/data/as/30045140/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c06cbb5726
--- /dev/null
+++ b/data/as/30045140/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30045140",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENCHIMARI GAON PWSS",
+                "localname": "BENCHIMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30045140",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENCHIMARI GAON PWSS",
+                        "localname": "BENCHIMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENCHIMARI GAON PWSS",
+                "localname": "BENCHIMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30045140",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENCHIMARI GAON PWSS",
+                        "localname": "BENCHIMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045140/ws-services-calculation/Penalty.json b/data/as/30045140/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6583f37024
--- /dev/null
+++ b/data/as/30045140/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30045140",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045140/ws-services-calculation/WCBillingSlab.json b/data/as/30045140/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8582859b7b
--- /dev/null
+++ b/data/as/30045140/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30045140",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045632/BillingService/BusinessService.json b/data/as/30045632/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a8508d9149
--- /dev/null
+++ b/data/as/30045632/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30045632",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045632/egov-location/boundary-data.json b/data/as/30045632/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f1222c98c2
--- /dev/null
+++ b/data/as/30045632/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30045632",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 SONAJULI TE PWSS",
+                "localname": "NO. 3 SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30045632",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 SONAJULI TE PWSS",
+                        "localname": "NO. 3 SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 SONAJULI TE PWSS",
+                "localname": "NO. 3 SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30045632",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 SONAJULI TE PWSS",
+                        "localname": "NO. 3 SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045632/ws-services-calculation/Penalty.json b/data/as/30045632/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..707ee19aca
--- /dev/null
+++ b/data/as/30045632/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30045632",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045632/ws-services-calculation/WCBillingSlab.json b/data/as/30045632/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1cf930f141
--- /dev/null
+++ b/data/as/30045632/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30045632",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045635/BillingService/BusinessService.json b/data/as/30045635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6ae8982c2
--- /dev/null
+++ b/data/as/30045635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30045635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045635/egov-location/boundary-data.json b/data/as/30045635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70544c1e7c
--- /dev/null
+++ b/data/as/30045635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30045635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 SONAJULI TE PWSS",
+                "localname": "NO. 1 SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30045635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 SONAJULI TE PWSS",
+                        "localname": "NO. 1 SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 SONAJULI TE PWSS",
+                "localname": "NO. 1 SONAJULI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30045635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 SONAJULI TE PWSS",
+                        "localname": "NO. 1 SONAJULI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045635/ws-services-calculation/Penalty.json b/data/as/30045635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..423a0e2d74
--- /dev/null
+++ b/data/as/30045635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30045635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30045635/ws-services-calculation/WCBillingSlab.json b/data/as/30045635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b8da524b6b
--- /dev/null
+++ b/data/as/30045635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30045635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046142/egov-location/boundary-data.json b/data/as/30046142/egov-location/boundary-data.json
index 1214ce1401..07eb0bbd24 100644
--- a/data/as/30046142/egov-location/boundary-data.json
+++ b/data/as/30046142/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "TISIMPUR PWSS",
-                "localname": "TISIMPUR PWSS",
+                "name": "TISIMPUR PWSS (NEW)",
+                "localname": "TISIMPUR PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "TISIMPUR PWSS",
-                        "localname": "TISIMPUR PWSS",
+                        "name": "TISIMPUR PWSS (NEW)",
+                        "localname": "TISIMPUR PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "TISIMPUR PWSS",
-                "localname": "TISIMPUR PWSS",
+                "name": "TISIMPUR PWSS (NEW)",
+                "localname": "TISIMPUR PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "TISIMPUR PWSS",
-                        "localname": "TISIMPUR PWSS",
+                        "name": "TISIMPUR PWSS (NEW)",
+                        "localname": "TISIMPUR PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/30046142/ws-services-calculation/WCBillingSlab.json b/data/as/30046142/ws-services-calculation/WCBillingSlab.json
index 222cbb876f..6c40934f2f 100644
--- a/data/as/30046142/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046142/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046178/BillingService/BusinessService.json b/data/as/30046178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5c11e2d6a
--- /dev/null
+++ b/data/as/30046178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30046178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046178/egov-location/boundary-data.json b/data/as/30046178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d90603743
--- /dev/null
+++ b/data/as/30046178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30046178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULGURI PWSS (NEW)",
+                "localname": "PHULGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULGURI PWSS (NEW)",
+                        "localname": "PHULGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULGURI PWSS (NEW)",
+                "localname": "PHULGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULGURI PWSS (NEW)",
+                        "localname": "PHULGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046178/ws-services-calculation/Penalty.json b/data/as/30046178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6849f66141
--- /dev/null
+++ b/data/as/30046178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30046178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046178/ws-services-calculation/WCBillingSlab.json b/data/as/30046178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..648cfaf863
--- /dev/null
+++ b/data/as/30046178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30046178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046241/BillingService/BusinessService.json b/data/as/30046241/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36639cfc0a
--- /dev/null
+++ b/data/as/30046241/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30046241",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046241/egov-location/boundary-data.json b/data/as/30046241/egov-location/boundary-data.json
new file mode 100644
index 0000000000..13861697d7
--- /dev/null
+++ b/data/as/30046241/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30046241",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR BEEL PUBPARA (NEW)",
+                "localname": "JALESWAR BEEL PUBPARA (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR BEEL PUBPARA (NEW)",
+                        "localname": "JALESWAR BEEL PUBPARA (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR BEEL PUBPARA (NEW)",
+                "localname": "JALESWAR BEEL PUBPARA (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR BEEL PUBPARA (NEW)",
+                        "localname": "JALESWAR BEEL PUBPARA (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046241/ws-services-calculation/Penalty.json b/data/as/30046241/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a67316da05
--- /dev/null
+++ b/data/as/30046241/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30046241",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046241/ws-services-calculation/WCBillingSlab.json b/data/as/30046241/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..914a0eaea3
--- /dev/null
+++ b/data/as/30046241/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30046241",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046274/BillingService/BusinessService.json b/data/as/30046274/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0aded8d7f0
--- /dev/null
+++ b/data/as/30046274/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30046274",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046274/egov-location/boundary-data.json b/data/as/30046274/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2808adc249
--- /dev/null
+++ b/data/as/30046274/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30046274",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURIA PT-I PWSS (NEW)",
+                "localname": "KUKURIA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046274",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURIA PT-I PWSS (NEW)",
+                        "localname": "KUKURIA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURIA PT-I PWSS (NEW)",
+                "localname": "KUKURIA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046274",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURIA PT-I PWSS (NEW)",
+                        "localname": "KUKURIA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046274/ws-services-calculation/Penalty.json b/data/as/30046274/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..456f162d06
--- /dev/null
+++ b/data/as/30046274/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30046274",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046274/ws-services-calculation/WCBillingSlab.json b/data/as/30046274/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15af529efa
--- /dev/null
+++ b/data/as/30046274/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30046274",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046286/BillingService/BusinessService.json b/data/as/30046286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..05dcef7a71
--- /dev/null
+++ b/data/as/30046286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30046286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046286/egov-location/boundary-data.json b/data/as/30046286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70f2f06533
--- /dev/null
+++ b/data/as/30046286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30046286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                "localname": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                        "localname": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                "localname": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                        "localname": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046286/ws-services-calculation/Penalty.json b/data/as/30046286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eba3cbffab
--- /dev/null
+++ b/data/as/30046286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30046286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046286/ws-services-calculation/WCBillingSlab.json b/data/as/30046286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4ee0ba3a12
--- /dev/null
+++ b/data/as/30046286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30046286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046465/BillingService/BusinessService.json b/data/as/30046465/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cdeb4651b
--- /dev/null
+++ b/data/as/30046465/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30046465",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046465/egov-location/boundary-data.json b/data/as/30046465/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4d62aa342d
--- /dev/null
+++ b/data/as/30046465/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30046465",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULAGURI NEPALI PWSS",
+                "localname": "PHULAGURI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULAGURI NEPALI PWSS",
+                        "localname": "PHULAGURI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULAGURI NEPALI PWSS",
+                "localname": "PHULAGURI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30046465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULAGURI NEPALI PWSS",
+                        "localname": "PHULAGURI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046465/ws-services-calculation/Penalty.json b/data/as/30046465/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..72d59842c0
--- /dev/null
+++ b/data/as/30046465/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30046465",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30046465/ws-services-calculation/WCBillingSlab.json b/data/as/30046465/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc82e7efba
--- /dev/null
+++ b/data/as/30046465/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30046465",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048127/BillingService/BusinessService.json b/data/as/30048127/BillingService/BusinessService.json
new file mode 100644
index 0000000000..21428bdaaf
--- /dev/null
+++ b/data/as/30048127/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048127",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048127/egov-location/boundary-data.json b/data/as/30048127/egov-location/boundary-data.json
new file mode 100644
index 0000000000..13fae646e5
--- /dev/null
+++ b/data/as/30048127/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048127",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO. 2 PWSS",
+                "localname": "SESSA TE NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048127",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO. 2 PWSS",
+                        "localname": "SESSA TE NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO. 2 PWSS",
+                "localname": "SESSA TE NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048127",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO. 2 PWSS",
+                        "localname": "SESSA TE NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048127/ws-services-calculation/Penalty.json b/data/as/30048127/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..537d9bbf4f
--- /dev/null
+++ b/data/as/30048127/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048127",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048127/ws-services-calculation/WCBillingSlab.json b/data/as/30048127/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5e0ae9868
--- /dev/null
+++ b/data/as/30048127/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048127",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048267/BillingService/BusinessService.json b/data/as/30048267/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b96f344f69
--- /dev/null
+++ b/data/as/30048267/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048267",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048267/egov-location/boundary-data.json b/data/as/30048267/egov-location/boundary-data.json
new file mode 100644
index 0000000000..132f664988
--- /dev/null
+++ b/data/as/30048267/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048267",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAJAN NO. 2 PWSS",
+                "localname": "BOKAJAN NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAJAN NO. 2 PWSS",
+                        "localname": "BOKAJAN NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAJAN NO. 2 PWSS",
+                "localname": "BOKAJAN NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAJAN NO. 2 PWSS",
+                        "localname": "BOKAJAN NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048267/ws-services-calculation/Penalty.json b/data/as/30048267/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e183d18ca
--- /dev/null
+++ b/data/as/30048267/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048267",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048267/ws-services-calculation/WCBillingSlab.json b/data/as/30048267/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..117fa2a9cf
--- /dev/null
+++ b/data/as/30048267/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048267",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048408/BillingService/BusinessService.json b/data/as/30048408/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da3a8c149e
--- /dev/null
+++ b/data/as/30048408/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048408",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048408/egov-location/boundary-data.json b/data/as/30048408/egov-location/boundary-data.json
new file mode 100644
index 0000000000..170cad46d0
--- /dev/null
+++ b/data/as/30048408/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048408",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAJAN MIRI GAON PWSS",
+                "localname": "RANGAJAN MIRI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048408",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAJAN MIRI GAON PWSS",
+                        "localname": "RANGAJAN MIRI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAJAN MIRI GAON PWSS",
+                "localname": "RANGAJAN MIRI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048408",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAJAN MIRI GAON PWSS",
+                        "localname": "RANGAJAN MIRI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048408/ws-services-calculation/Penalty.json b/data/as/30048408/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b4df82d2e5
--- /dev/null
+++ b/data/as/30048408/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048408",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048408/ws-services-calculation/WCBillingSlab.json b/data/as/30048408/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ec2378711
--- /dev/null
+++ b/data/as/30048408/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048408",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048644/BillingService/BusinessService.json b/data/as/30048644/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db0d3f1246
--- /dev/null
+++ b/data/as/30048644/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048644",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048644/egov-location/boundary-data.json b/data/as/30048644/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7fb12d406a
--- /dev/null
+++ b/data/as/30048644/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048644",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONEHERA PACHIMPARA PWSS (NEW)",
+                "localname": "SONEHERA PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048644",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONEHERA PACHIMPARA PWSS (NEW)",
+                        "localname": "SONEHERA PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONEHERA PACHIMPARA PWSS (NEW)",
+                "localname": "SONEHERA PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048644",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONEHERA PACHIMPARA PWSS (NEW)",
+                        "localname": "SONEHERA PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048644/ws-services-calculation/Penalty.json b/data/as/30048644/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e284c4730b
--- /dev/null
+++ b/data/as/30048644/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048644",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048644/ws-services-calculation/WCBillingSlab.json b/data/as/30048644/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a3301ea8f8
--- /dev/null
+++ b/data/as/30048644/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048644",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048673/BillingService/BusinessService.json b/data/as/30048673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4209c33024
--- /dev/null
+++ b/data/as/30048673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048673/egov-location/boundary-data.json b/data/as/30048673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d70d77283d
--- /dev/null
+++ b/data/as/30048673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADAKONA PWSS (NEW)",
+                "localname": "HADAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADAKONA PWSS (NEW)",
+                        "localname": "HADAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADAKONA PWSS (NEW)",
+                "localname": "HADAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADAKONA PWSS (NEW)",
+                        "localname": "HADAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048673/ws-services-calculation/Penalty.json b/data/as/30048673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..35208acb50
--- /dev/null
+++ b/data/as/30048673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048673/ws-services-calculation/WCBillingSlab.json b/data/as/30048673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2fc4bfd082
--- /dev/null
+++ b/data/as/30048673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048680/BillingService/BusinessService.json b/data/as/30048680/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3289729dc1
--- /dev/null
+++ b/data/as/30048680/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048680",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048680/egov-location/boundary-data.json b/data/as/30048680/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b8158217f0
--- /dev/null
+++ b/data/as/30048680/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048680",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PIPLIBARI PWSS (NEW)",
+                "localname": "PIPLIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PIPLIBARI PWSS (NEW)",
+                        "localname": "PIPLIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PIPLIBARI PWSS (NEW)",
+                "localname": "PIPLIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PIPLIBARI PWSS (NEW)",
+                        "localname": "PIPLIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048680/ws-services-calculation/Penalty.json b/data/as/30048680/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0304d0e8bf
--- /dev/null
+++ b/data/as/30048680/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048680",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048680/ws-services-calculation/WCBillingSlab.json b/data/as/30048680/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d5251bf23
--- /dev/null
+++ b/data/as/30048680/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048680",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048696/BillingService/BusinessService.json b/data/as/30048696/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b23917921f
--- /dev/null
+++ b/data/as/30048696/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048696",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048696/egov-location/boundary-data.json b/data/as/30048696/egov-location/boundary-data.json
new file mode 100644
index 0000000000..102f69a831
--- /dev/null
+++ b/data/as/30048696/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048696",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PIRAKATA NO 2 PWSS",
+                "localname": "PIRAKATA NO 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PIRAKATA NO 2 PWSS",
+                        "localname": "PIRAKATA NO 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PIRAKATA NO 2 PWSS",
+                "localname": "PIRAKATA NO 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PIRAKATA NO 2 PWSS",
+                        "localname": "PIRAKATA NO 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048696/ws-services-calculation/Penalty.json b/data/as/30048696/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de67b6a27e
--- /dev/null
+++ b/data/as/30048696/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048696",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048696/ws-services-calculation/WCBillingSlab.json b/data/as/30048696/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eef3018f94
--- /dev/null
+++ b/data/as/30048696/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048696",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048776/BillingService/BusinessService.json b/data/as/30048776/BillingService/BusinessService.json
new file mode 100644
index 0000000000..69d1cfdd87
--- /dev/null
+++ b/data/as/30048776/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048776",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048776/egov-location/boundary-data.json b/data/as/30048776/egov-location/boundary-data.json
new file mode 100644
index 0000000000..61af46f892
--- /dev/null
+++ b/data/as/30048776/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048776",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048776",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048776/ws-services-calculation/Penalty.json b/data/as/30048776/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cbcad9259b
--- /dev/null
+++ b/data/as/30048776/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048776",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048776/ws-services-calculation/WCBillingSlab.json b/data/as/30048776/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..73931d9ee8
--- /dev/null
+++ b/data/as/30048776/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048776",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048965/BillingService/BusinessService.json b/data/as/30048965/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f5c38f9bf9
--- /dev/null
+++ b/data/as/30048965/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048965",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048965/egov-location/boundary-data.json b/data/as/30048965/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4165567814
--- /dev/null
+++ b/data/as/30048965/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048965",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GURUCHATKA 1 PWSS (NEW)",
+                "localname": "GURUCHATKA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GURUCHATKA 1 PWSS (NEW)",
+                        "localname": "GURUCHATKA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GURUCHATKA 1 PWSS (NEW)",
+                "localname": "GURUCHATKA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GURUCHATKA 1 PWSS (NEW)",
+                        "localname": "GURUCHATKA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048965/ws-services-calculation/Penalty.json b/data/as/30048965/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e71e0fabf
--- /dev/null
+++ b/data/as/30048965/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048965",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048965/ws-services-calculation/WCBillingSlab.json b/data/as/30048965/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80ac11781e
--- /dev/null
+++ b/data/as/30048965/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048965",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048987/BillingService/BusinessService.json b/data/as/30048987/BillingService/BusinessService.json
new file mode 100644
index 0000000000..069d90a97b
--- /dev/null
+++ b/data/as/30048987/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048987",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048987/egov-location/boundary-data.json b/data/as/30048987/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8176370265
--- /dev/null
+++ b/data/as/30048987/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048987",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAPARA PWSS (NEW)",
+                "localname": "SARAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048987",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAPARA PWSS (NEW)",
+                        "localname": "SARAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAPARA PWSS (NEW)",
+                "localname": "SARAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048987",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAPARA PWSS (NEW)",
+                        "localname": "SARAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048987/ws-services-calculation/Penalty.json b/data/as/30048987/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f8cfd9e62
--- /dev/null
+++ b/data/as/30048987/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048987",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048987/ws-services-calculation/WCBillingSlab.json b/data/as/30048987/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56d932f18a
--- /dev/null
+++ b/data/as/30048987/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048987",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048994/BillingService/BusinessService.json b/data/as/30048994/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db0632d567
--- /dev/null
+++ b/data/as/30048994/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30048994",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048994/egov-location/boundary-data.json b/data/as/30048994/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0aeaff972c
--- /dev/null
+++ b/data/as/30048994/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30048994",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB DEKDHOWA PWSS (NEW)",
+                "localname": "PUB DEKDHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048994",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB DEKDHOWA PWSS (NEW)",
+                        "localname": "PUB DEKDHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB DEKDHOWA PWSS (NEW)",
+                "localname": "PUB DEKDHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30048994",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB DEKDHOWA PWSS (NEW)",
+                        "localname": "PUB DEKDHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048994/ws-services-calculation/Penalty.json b/data/as/30048994/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d334302f56
--- /dev/null
+++ b/data/as/30048994/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30048994",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30048994/ws-services-calculation/WCBillingSlab.json b/data/as/30048994/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7819925e07
--- /dev/null
+++ b/data/as/30048994/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30048994",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049004/BillingService/BusinessService.json b/data/as/30049004/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09761288af
--- /dev/null
+++ b/data/as/30049004/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049004",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049004/egov-location/boundary-data.json b/data/as/30049004/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7fcda549a
--- /dev/null
+++ b/data/as/30049004/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049004",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANPARA PWSS (NEW)",
+                "localname": "PURANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049004",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANPARA PWSS (NEW)",
+                        "localname": "PURANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANPARA PWSS (NEW)",
+                "localname": "PURANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049004",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANPARA PWSS (NEW)",
+                        "localname": "PURANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049004/ws-services-calculation/Penalty.json b/data/as/30049004/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..80c40defcf
--- /dev/null
+++ b/data/as/30049004/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049004",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049004/ws-services-calculation/WCBillingSlab.json b/data/as/30049004/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc70b5cec1
--- /dev/null
+++ b/data/as/30049004/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049004",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049048/BillingService/BusinessService.json b/data/as/30049048/BillingService/BusinessService.json
new file mode 100644
index 0000000000..95d62d6e28
--- /dev/null
+++ b/data/as/30049048/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049048",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049048/egov-location/boundary-data.json b/data/as/30049048/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2b45d80cdf
--- /dev/null
+++ b/data/as/30049048/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049048",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                "localname": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                        "localname": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                "localname": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                        "localname": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049048/ws-services-calculation/Penalty.json b/data/as/30049048/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3ed9d3fba6
--- /dev/null
+++ b/data/as/30049048/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049048",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049048/ws-services-calculation/WCBillingSlab.json b/data/as/30049048/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c91bad2c72
--- /dev/null
+++ b/data/as/30049048/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049048",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049049/BillingService/BusinessService.json b/data/as/30049049/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de12875458
--- /dev/null
+++ b/data/as/30049049/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049049",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049049/egov-location/boundary-data.json b/data/as/30049049/egov-location/boundary-data.json
new file mode 100644
index 0000000000..856568375c
--- /dev/null
+++ b/data/as/30049049/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049049",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON TILAPARA PWSS (NEW)",
+                "localname": "JURIGAON TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049049",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON TILAPARA PWSS (NEW)",
+                        "localname": "JURIGAON TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON TILAPARA PWSS (NEW)",
+                "localname": "JURIGAON TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049049",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON TILAPARA PWSS (NEW)",
+                        "localname": "JURIGAON TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049049/ws-services-calculation/Penalty.json b/data/as/30049049/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68dea1d40b
--- /dev/null
+++ b/data/as/30049049/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049049",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049049/ws-services-calculation/WCBillingSlab.json b/data/as/30049049/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea097eb61f
--- /dev/null
+++ b/data/as/30049049/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049049",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049050/BillingService/BusinessService.json b/data/as/30049050/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d84a9b41bd
--- /dev/null
+++ b/data/as/30049050/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049050",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049050/egov-location/boundary-data.json b/data/as/30049050/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1bac516457
--- /dev/null
+++ b/data/as/30049050/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049050",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIMPARA PWSS (NEW)",
+                "localname": "PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIMPARA PWSS (NEW)",
+                        "localname": "PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIMPARA PWSS (NEW)",
+                "localname": "PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIMPARA PWSS (NEW)",
+                        "localname": "PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049050/ws-services-calculation/Penalty.json b/data/as/30049050/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69d9492a5c
--- /dev/null
+++ b/data/as/30049050/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049050",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049050/ws-services-calculation/WCBillingSlab.json b/data/as/30049050/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c3140a3d64
--- /dev/null
+++ b/data/as/30049050/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049050",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049081/BillingService/BusinessService.json b/data/as/30049081/BillingService/BusinessService.json
new file mode 100644
index 0000000000..89f701b8ba
--- /dev/null
+++ b/data/as/30049081/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049081",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049081/egov-location/boundary-data.json b/data/as/30049081/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b9effff6e
--- /dev/null
+++ b/data/as/30049081/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049081",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEPARIPARA PWSS (NEW)",
+                "localname": "BEPARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049081",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEPARIPARA PWSS (NEW)",
+                        "localname": "BEPARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEPARIPARA PWSS (NEW)",
+                "localname": "BEPARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049081",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEPARIPARA PWSS (NEW)",
+                        "localname": "BEPARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049081/ws-services-calculation/Penalty.json b/data/as/30049081/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1e1c585f9
--- /dev/null
+++ b/data/as/30049081/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049081",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049081/ws-services-calculation/WCBillingSlab.json b/data/as/30049081/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a02ce2a558
--- /dev/null
+++ b/data/as/30049081/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049081",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049228/BillingService/BusinessService.json b/data/as/30049228/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dda37c0118
--- /dev/null
+++ b/data/as/30049228/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049228",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049228/egov-location/boundary-data.json b/data/as/30049228/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ce3031c5a
--- /dev/null
+++ b/data/as/30049228/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049228",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALAVITA PWSS (NEW)",
+                "localname": "BALAVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALAVITA PWSS (NEW)",
+                        "localname": "BALAVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALAVITA PWSS (NEW)",
+                "localname": "BALAVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALAVITA PWSS (NEW)",
+                        "localname": "BALAVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049228/ws-services-calculation/Penalty.json b/data/as/30049228/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b993f3cd4
--- /dev/null
+++ b/data/as/30049228/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049228",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049228/ws-services-calculation/WCBillingSlab.json b/data/as/30049228/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46dbdafb52
--- /dev/null
+++ b/data/as/30049228/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049228",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049262/BillingService/BusinessService.json b/data/as/30049262/BillingService/BusinessService.json
new file mode 100644
index 0000000000..135c60afd1
--- /dev/null
+++ b/data/as/30049262/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049262",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049262/egov-location/boundary-data.json b/data/as/30049262/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7e1411875
--- /dev/null
+++ b/data/as/30049262/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049262",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049262",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049262",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049262/ws-services-calculation/Penalty.json b/data/as/30049262/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7962bb2437
--- /dev/null
+++ b/data/as/30049262/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049262",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049262/ws-services-calculation/WCBillingSlab.json b/data/as/30049262/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2bde694962
--- /dev/null
+++ b/data/as/30049262/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049262",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049278/BillingService/BusinessService.json b/data/as/30049278/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9a8d72cbb
--- /dev/null
+++ b/data/as/30049278/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049278",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049278/egov-location/boundary-data.json b/data/as/30049278/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8f4fbfe007
--- /dev/null
+++ b/data/as/30049278/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049278",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PETKATA PWSS (NEW)",
+                "localname": "PETKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PETKATA PWSS (NEW)",
+                        "localname": "PETKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PETKATA PWSS (NEW)",
+                "localname": "PETKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049278",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PETKATA PWSS (NEW)",
+                        "localname": "PETKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049278/ws-services-calculation/Penalty.json b/data/as/30049278/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1c169d627d
--- /dev/null
+++ b/data/as/30049278/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049278",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049278/ws-services-calculation/WCBillingSlab.json b/data/as/30049278/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..70c35297e5
--- /dev/null
+++ b/data/as/30049278/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049278",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049299/BillingService/BusinessService.json b/data/as/30049299/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86558489d0
--- /dev/null
+++ b/data/as/30049299/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049299",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049299/egov-location/boundary-data.json b/data/as/30049299/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ff889ea828
--- /dev/null
+++ b/data/as/30049299/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049299",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGABARI PWSS (NEW)",
+                "localname": "TENGABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049299",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGABARI PWSS (NEW)",
+                        "localname": "TENGABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGABARI PWSS (NEW)",
+                "localname": "TENGABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049299",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGABARI PWSS (NEW)",
+                        "localname": "TENGABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049299/ws-services-calculation/Penalty.json b/data/as/30049299/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..049cef3d35
--- /dev/null
+++ b/data/as/30049299/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049299",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049299/ws-services-calculation/WCBillingSlab.json b/data/as/30049299/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cbe01fd6f1
--- /dev/null
+++ b/data/as/30049299/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049299",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049604/BillingService/BusinessService.json b/data/as/30049604/BillingService/BusinessService.json
new file mode 100644
index 0000000000..69c449454a
--- /dev/null
+++ b/data/as/30049604/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049604",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049604/egov-location/boundary-data.json b/data/as/30049604/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bcbbb5b41a
--- /dev/null
+++ b/data/as/30049604/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049604",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOJMALA PT-II PWSS (NEW)",
+                "localname": "BHOJMALA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049604",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOJMALA PT-II PWSS (NEW)",
+                        "localname": "BHOJMALA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOJMALA PT-II PWSS (NEW)",
+                "localname": "BHOJMALA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049604",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOJMALA PT-II PWSS (NEW)",
+                        "localname": "BHOJMALA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049604/ws-services-calculation/Penalty.json b/data/as/30049604/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..66262c9690
--- /dev/null
+++ b/data/as/30049604/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049604",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049604/ws-services-calculation/WCBillingSlab.json b/data/as/30049604/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0a90be1acf
--- /dev/null
+++ b/data/as/30049604/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049604",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049608/BillingService/BusinessService.json b/data/as/30049608/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aadd87ca23
--- /dev/null
+++ b/data/as/30049608/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049608",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049608/egov-location/boundary-data.json b/data/as/30049608/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd3842a489
--- /dev/null
+++ b/data/as/30049608/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049608",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHITOR PAROWA GAON PWSS",
+                "localname": "BHITOR PAROWA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049608",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHITOR PAROWA GAON PWSS",
+                        "localname": "BHITOR PAROWA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHITOR PAROWA GAON PWSS",
+                "localname": "BHITOR PAROWA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049608",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHITOR PAROWA GAON PWSS",
+                        "localname": "BHITOR PAROWA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049608/ws-services-calculation/Penalty.json b/data/as/30049608/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a0f3f18d1
--- /dev/null
+++ b/data/as/30049608/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049608",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049608/ws-services-calculation/WCBillingSlab.json b/data/as/30049608/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..64575e7f2d
--- /dev/null
+++ b/data/as/30049608/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049608",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049610/BillingService/BusinessService.json b/data/as/30049610/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc318cb36b
--- /dev/null
+++ b/data/as/30049610/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049610",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049610/egov-location/boundary-data.json b/data/as/30049610/egov-location/boundary-data.json
new file mode 100644
index 0000000000..320e893aee
--- /dev/null
+++ b/data/as/30049610/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049610",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                "localname": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049610",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                        "localname": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                "localname": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049610",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                        "localname": "HELAPAKHRI TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049610/ws-services-calculation/Penalty.json b/data/as/30049610/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4adf77d7f7
--- /dev/null
+++ b/data/as/30049610/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049610",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049610/ws-services-calculation/WCBillingSlab.json b/data/as/30049610/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0022f16e3e
--- /dev/null
+++ b/data/as/30049610/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049610",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049624/BillingService/BusinessService.json b/data/as/30049624/BillingService/BusinessService.json
new file mode 100644
index 0000000000..28d9b26273
--- /dev/null
+++ b/data/as/30049624/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049624",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049624/egov-location/boundary-data.json b/data/as/30049624/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a4ef99969
--- /dev/null
+++ b/data/as/30049624/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049624",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 FAIJABAD BAGAN PWSS",
+                "localname": "NO.1 FAIJABAD BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049624",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 FAIJABAD BAGAN PWSS",
+                        "localname": "NO.1 FAIJABAD BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 FAIJABAD BAGAN PWSS",
+                "localname": "NO.1 FAIJABAD BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049624",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 FAIJABAD BAGAN PWSS",
+                        "localname": "NO.1 FAIJABAD BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049624/ws-services-calculation/Penalty.json b/data/as/30049624/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d1cb33251f
--- /dev/null
+++ b/data/as/30049624/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049624",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049624/ws-services-calculation/WCBillingSlab.json b/data/as/30049624/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5857ad499a
--- /dev/null
+++ b/data/as/30049624/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049624",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049625/BillingService/BusinessService.json b/data/as/30049625/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8480aaf0d2
--- /dev/null
+++ b/data/as/30049625/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049625",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049625/egov-location/boundary-data.json b/data/as/30049625/egov-location/boundary-data.json
new file mode 100644
index 0000000000..56e3480673
--- /dev/null
+++ b/data/as/30049625/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049625",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PADDAMARI PWSS (NEW)",
+                "localname": "PADDAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049625",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PADDAMARI PWSS (NEW)",
+                        "localname": "PADDAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PADDAMARI PWSS (NEW)",
+                "localname": "PADDAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049625",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PADDAMARI PWSS (NEW)",
+                        "localname": "PADDAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049625/ws-services-calculation/Penalty.json b/data/as/30049625/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d7c364307
--- /dev/null
+++ b/data/as/30049625/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049625",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049625/ws-services-calculation/WCBillingSlab.json b/data/as/30049625/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c05b1733fe
--- /dev/null
+++ b/data/as/30049625/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049625",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049629/BillingService/BusinessService.json b/data/as/30049629/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b4227238d
--- /dev/null
+++ b/data/as/30049629/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049629",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049629/egov-location/boundary-data.json b/data/as/30049629/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d53db15ee
--- /dev/null
+++ b/data/as/30049629/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049629",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LEZAM PWSS (NEW)",
+                "localname": "LEZAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LEZAM PWSS (NEW)",
+                        "localname": "LEZAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LEZAM PWSS (NEW)",
+                "localname": "LEZAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LEZAM PWSS (NEW)",
+                        "localname": "LEZAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049629/ws-services-calculation/Penalty.json b/data/as/30049629/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1eb2880f23
--- /dev/null
+++ b/data/as/30049629/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049629",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049629/ws-services-calculation/WCBillingSlab.json b/data/as/30049629/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f4de198460
--- /dev/null
+++ b/data/as/30049629/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049629",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049631/BillingService/BusinessService.json b/data/as/30049631/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d85f7268a
--- /dev/null
+++ b/data/as/30049631/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049631",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049631/egov-location/boundary-data.json b/data/as/30049631/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f6c0afdf3
--- /dev/null
+++ b/data/as/30049631/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049631",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALAIPARA PWSS (NEW)",
+                "localname": "KHALAIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALAIPARA PWSS (NEW)",
+                        "localname": "KHALAIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALAIPARA PWSS (NEW)",
+                "localname": "KHALAIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALAIPARA PWSS (NEW)",
+                        "localname": "KHALAIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049631/ws-services-calculation/Penalty.json b/data/as/30049631/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5ab7c39961
--- /dev/null
+++ b/data/as/30049631/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049631",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049631/ws-services-calculation/WCBillingSlab.json b/data/as/30049631/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..da1258de31
--- /dev/null
+++ b/data/as/30049631/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049631",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049632/BillingService/BusinessService.json b/data/as/30049632/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ecb7911e7a
--- /dev/null
+++ b/data/as/30049632/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049632",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049632/egov-location/boundary-data.json b/data/as/30049632/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9def27a9b5
--- /dev/null
+++ b/data/as/30049632/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049632",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 FAIZABAD BAGAN PWSS",
+                "localname": "NO.4 FAIZABAD BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049632",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 FAIZABAD BAGAN PWSS",
+                        "localname": "NO.4 FAIZABAD BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 FAIZABAD BAGAN PWSS",
+                "localname": "NO.4 FAIZABAD BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049632",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 FAIZABAD BAGAN PWSS",
+                        "localname": "NO.4 FAIZABAD BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049632/ws-services-calculation/Penalty.json b/data/as/30049632/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dabf4a4893
--- /dev/null
+++ b/data/as/30049632/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049632",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049632/ws-services-calculation/WCBillingSlab.json b/data/as/30049632/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..991ddc8183
--- /dev/null
+++ b/data/as/30049632/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049632",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049922/BillingService/BusinessService.json b/data/as/30049922/BillingService/BusinessService.json
new file mode 100644
index 0000000000..58e7c93092
--- /dev/null
+++ b/data/as/30049922/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049922",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049922/egov-location/boundary-data.json b/data/as/30049922/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3f051d662
--- /dev/null
+++ b/data/as/30049922/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049922",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPAI ROUMARI PATHAR",
+                "localname": "CHAPAI ROUMARI PATHAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPAI ROUMARI PATHAR",
+                        "localname": "CHAPAI ROUMARI PATHAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPAI ROUMARI PATHAR",
+                "localname": "CHAPAI ROUMARI PATHAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPAI ROUMARI PATHAR",
+                        "localname": "CHAPAI ROUMARI PATHAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049922/ws-services-calculation/Penalty.json b/data/as/30049922/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a168b0401e
--- /dev/null
+++ b/data/as/30049922/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049922",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049922/ws-services-calculation/WCBillingSlab.json b/data/as/30049922/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2edd83f059
--- /dev/null
+++ b/data/as/30049922/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049922",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049941/BillingService/BusinessService.json b/data/as/30049941/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ca3eeb9d1
--- /dev/null
+++ b/data/as/30049941/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049941",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049941/egov-location/boundary-data.json b/data/as/30049941/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a3da791c1f
--- /dev/null
+++ b/data/as/30049941/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049941",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHNOI NEPALI PWSS",
+                "localname": "PACHNOI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHNOI NEPALI PWSS",
+                        "localname": "PACHNOI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHNOI NEPALI PWSS",
+                "localname": "PACHNOI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHNOI NEPALI PWSS",
+                        "localname": "PACHNOI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049941/ws-services-calculation/Penalty.json b/data/as/30049941/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5db4babe94
--- /dev/null
+++ b/data/as/30049941/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049941",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049941/ws-services-calculation/WCBillingSlab.json b/data/as/30049941/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba8a82d625
--- /dev/null
+++ b/data/as/30049941/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049941",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049949/BillingService/BusinessService.json b/data/as/30049949/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b4b17ddb62
--- /dev/null
+++ b/data/as/30049949/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30049949",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049949/egov-location/boundary-data.json b/data/as/30049949/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b3bded868d
--- /dev/null
+++ b/data/as/30049949/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30049949",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHNOI BANGALI PWSS",
+                "localname": "PACHNOI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049949",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHNOI BANGALI PWSS",
+                        "localname": "PACHNOI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHNOI BANGALI PWSS",
+                "localname": "PACHNOI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30049949",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHNOI BANGALI PWSS",
+                        "localname": "PACHNOI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049949/ws-services-calculation/Penalty.json b/data/as/30049949/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..619870b52c
--- /dev/null
+++ b/data/as/30049949/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30049949",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30049949/ws-services-calculation/WCBillingSlab.json b/data/as/30049949/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2ff1e01ce2
--- /dev/null
+++ b/data/as/30049949/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30049949",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050030/BillingService/BusinessService.json b/data/as/30050030/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfbfcc7bea
--- /dev/null
+++ b/data/as/30050030/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30050030",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050030/egov-location/boundary-data.json b/data/as/30050030/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0664e2f7b
--- /dev/null
+++ b/data/as/30050030/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30050030",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHUPUR BANGAON",
+                "localname": "MADHUPUR BANGAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHUPUR BANGAON",
+                        "localname": "MADHUPUR BANGAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHUPUR BANGAON",
+                "localname": "MADHUPUR BANGAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHUPUR BANGAON",
+                        "localname": "MADHUPUR BANGAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050030/ws-services-calculation/Penalty.json b/data/as/30050030/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe9c004e73
--- /dev/null
+++ b/data/as/30050030/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30050030",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050030/ws-services-calculation/WCBillingSlab.json b/data/as/30050030/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ece54aed3
--- /dev/null
+++ b/data/as/30050030/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30050030",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050223/BillingService/BusinessService.json b/data/as/30050223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87211a3bf0
--- /dev/null
+++ b/data/as/30050223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30050223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050223/egov-location/boundary-data.json b/data/as/30050223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e31032c5f6
--- /dev/null
+++ b/data/as/30050223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30050223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHA BASTI PWSS",
+                "localname": "PACHA BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHA BASTI PWSS",
+                        "localname": "PACHA BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHA BASTI PWSS",
+                "localname": "PACHA BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHA BASTI PWSS",
+                        "localname": "PACHA BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050223/ws-services-calculation/Penalty.json b/data/as/30050223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db290c86b5
--- /dev/null
+++ b/data/as/30050223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30050223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050223/ws-services-calculation/WCBillingSlab.json b/data/as/30050223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..23636a5506
--- /dev/null
+++ b/data/as/30050223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30050223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050805/BillingService/BusinessService.json b/data/as/30050805/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bef952cbf7
--- /dev/null
+++ b/data/as/30050805/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30050805",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050805/egov-location/boundary-data.json b/data/as/30050805/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d4ec2ea58d
--- /dev/null
+++ b/data/as/30050805/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30050805",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGARI BARI GAON",
+                "localname": "BAGARI BARI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGARI BARI GAON",
+                        "localname": "BAGARI BARI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGARI BARI GAON",
+                "localname": "BAGARI BARI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGARI BARI GAON",
+                        "localname": "BAGARI BARI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050805/ws-services-calculation/Penalty.json b/data/as/30050805/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3c371576d
--- /dev/null
+++ b/data/as/30050805/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30050805",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050805/ws-services-calculation/WCBillingSlab.json b/data/as/30050805/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e933e41bd3
--- /dev/null
+++ b/data/as/30050805/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30050805",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050939/BillingService/BusinessService.json b/data/as/30050939/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5428cab6d
--- /dev/null
+++ b/data/as/30050939/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30050939",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050939/egov-location/boundary-data.json b/data/as/30050939/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db261f93f5
--- /dev/null
+++ b/data/as/30050939/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30050939",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALISUTI BENGALI GAON PWSS",
+                "localname": "BALISUTI BENGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALISUTI BENGALI GAON PWSS",
+                        "localname": "BALISUTI BENGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALISUTI BENGALI GAON PWSS",
+                "localname": "BALISUTI BENGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALISUTI BENGALI GAON PWSS",
+                        "localname": "BALISUTI BENGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050939/ws-services-calculation/Penalty.json b/data/as/30050939/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9329175fb9
--- /dev/null
+++ b/data/as/30050939/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30050939",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050939/ws-services-calculation/WCBillingSlab.json b/data/as/30050939/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..711b87027f
--- /dev/null
+++ b/data/as/30050939/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30050939",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050952/BillingService/BusinessService.json b/data/as/30050952/BillingService/BusinessService.json
new file mode 100644
index 0000000000..efe592b05e
--- /dev/null
+++ b/data/as/30050952/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30050952",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050952/egov-location/boundary-data.json b/data/as/30050952/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0496d2fa76
--- /dev/null
+++ b/data/as/30050952/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30050952",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30050952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050952/ws-services-calculation/Penalty.json b/data/as/30050952/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5febdf8109
--- /dev/null
+++ b/data/as/30050952/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30050952",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30050952/ws-services-calculation/WCBillingSlab.json b/data/as/30050952/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d2a81d2376
--- /dev/null
+++ b/data/as/30050952/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30050952",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051014/BillingService/BusinessService.json b/data/as/30051014/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d58c4ea89
--- /dev/null
+++ b/data/as/30051014/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051014",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051014/egov-location/boundary-data.json b/data/as/30051014/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e9467777c
--- /dev/null
+++ b/data/as/30051014/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051014",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOHAIN ALI GAON PWSS",
+                "localname": "GOHAIN ALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051014",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOHAIN ALI GAON PWSS",
+                        "localname": "GOHAIN ALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOHAIN ALI GAON PWSS",
+                "localname": "GOHAIN ALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051014",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOHAIN ALI GAON PWSS",
+                        "localname": "GOHAIN ALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051014/ws-services-calculation/Penalty.json b/data/as/30051014/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b7228f0d3
--- /dev/null
+++ b/data/as/30051014/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051014",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051014/ws-services-calculation/WCBillingSlab.json b/data/as/30051014/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b932cd58f8
--- /dev/null
+++ b/data/as/30051014/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051014",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051018/BillingService/BusinessService.json b/data/as/30051018/BillingService/BusinessService.json
new file mode 100644
index 0000000000..075acc94b6
--- /dev/null
+++ b/data/as/30051018/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051018",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051018/egov-location/boundary-data.json b/data/as/30051018/egov-location/boundary-data.json
new file mode 100644
index 0000000000..65b01e766d
--- /dev/null
+++ b/data/as/30051018/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051018",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARUPAR GAON PWSS",
+                "localname": "GABHARUPAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051018",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARUPAR GAON PWSS",
+                        "localname": "GABHARUPAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARUPAR GAON PWSS",
+                "localname": "GABHARUPAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051018",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARUPAR GAON PWSS",
+                        "localname": "GABHARUPAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051018/ws-services-calculation/Penalty.json b/data/as/30051018/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3924b33b37
--- /dev/null
+++ b/data/as/30051018/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051018",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051018/ws-services-calculation/WCBillingSlab.json b/data/as/30051018/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5332cf12b2
--- /dev/null
+++ b/data/as/30051018/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051018",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051021/BillingService/BusinessService.json b/data/as/30051021/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd469fd7b8
--- /dev/null
+++ b/data/as/30051021/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051021",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051021/egov-location/boundary-data.json b/data/as/30051021/egov-location/boundary-data.json
new file mode 100644
index 0000000000..de90134603
--- /dev/null
+++ b/data/as/30051021/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051021",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI  PWSS",
+                "localname": "SAIKIA CHUBURI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051021",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI  PWSS",
+                        "localname": "SAIKIA CHUBURI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI  PWSS",
+                "localname": "SAIKIA CHUBURI  PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051021",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI  PWSS",
+                        "localname": "SAIKIA CHUBURI  PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051021/ws-services-calculation/Penalty.json b/data/as/30051021/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf78484b85
--- /dev/null
+++ b/data/as/30051021/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051021",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051021/ws-services-calculation/WCBillingSlab.json b/data/as/30051021/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..807b2ad9ca
--- /dev/null
+++ b/data/as/30051021/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051021",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051023/BillingService/BusinessService.json b/data/as/30051023/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d67996eee
--- /dev/null
+++ b/data/as/30051023/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051023",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051023/egov-location/boundary-data.json b/data/as/30051023/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a7a63bf46
--- /dev/null
+++ b/data/as/30051023/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051023",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 MIJIBARI PATHAR PWSS",
+                "localname": "NO.2 MIJIBARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 MIJIBARI PATHAR PWSS",
+                        "localname": "NO.2 MIJIBARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 MIJIBARI PATHAR PWSS",
+                "localname": "NO.2 MIJIBARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 MIJIBARI PATHAR PWSS",
+                        "localname": "NO.2 MIJIBARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051023/ws-services-calculation/Penalty.json b/data/as/30051023/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..274df2dadf
--- /dev/null
+++ b/data/as/30051023/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051023",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051023/ws-services-calculation/WCBillingSlab.json b/data/as/30051023/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..16fd4df73e
--- /dev/null
+++ b/data/as/30051023/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051023",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051099/BillingService/BusinessService.json b/data/as/30051099/BillingService/BusinessService.json
new file mode 100644
index 0000000000..414e046052
--- /dev/null
+++ b/data/as/30051099/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051099",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051099/egov-location/boundary-data.json b/data/as/30051099/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2052c6db17
--- /dev/null
+++ b/data/as/30051099/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051099",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NARAYANPUR BAGAN PWSS",
+                "localname": "NO.2 NARAYANPUR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051099",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NARAYANPUR BAGAN PWSS",
+                        "localname": "NO.2 NARAYANPUR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 NARAYANPUR BAGAN PWSS",
+                "localname": "NO.2 NARAYANPUR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051099",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 NARAYANPUR BAGAN PWSS",
+                        "localname": "NO.2 NARAYANPUR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051099/ws-services-calculation/Penalty.json b/data/as/30051099/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c80661e5f2
--- /dev/null
+++ b/data/as/30051099/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051099",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051099/ws-services-calculation/WCBillingSlab.json b/data/as/30051099/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f9bd7ebfb
--- /dev/null
+++ b/data/as/30051099/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051099",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051263/BillingService/BusinessService.json b/data/as/30051263/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17ca9b7f26
--- /dev/null
+++ b/data/as/30051263/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051263",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051263/egov-location/boundary-data.json b/data/as/30051263/egov-location/boundary-data.json
new file mode 100644
index 0000000000..683d815aa3
--- /dev/null
+++ b/data/as/30051263/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051263",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARPETA GAON PWSS",
+                "localname": "BARPETA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051263",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARPETA GAON PWSS",
+                        "localname": "BARPETA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARPETA GAON PWSS",
+                "localname": "BARPETA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051263",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARPETA GAON PWSS",
+                        "localname": "BARPETA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051263/ws-services-calculation/Penalty.json b/data/as/30051263/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5d82239b4
--- /dev/null
+++ b/data/as/30051263/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051263",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051263/ws-services-calculation/WCBillingSlab.json b/data/as/30051263/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fc0cf30a9
--- /dev/null
+++ b/data/as/30051263/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051263",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051272/BillingService/BusinessService.json b/data/as/30051272/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37ecb56253
--- /dev/null
+++ b/data/as/30051272/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051272",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051272/egov-location/boundary-data.json b/data/as/30051272/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50cddcf131
--- /dev/null
+++ b/data/as/30051272/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051272",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARMARA BENGALI PWSS",
+                "localname": "GARMARA BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051272",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARMARA BENGALI PWSS",
+                        "localname": "GARMARA BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARMARA BENGALI PWSS",
+                "localname": "GARMARA BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051272",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARMARA BENGALI PWSS",
+                        "localname": "GARMARA BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051272/ws-services-calculation/Penalty.json b/data/as/30051272/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78349827f0
--- /dev/null
+++ b/data/as/30051272/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051272",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051272/ws-services-calculation/WCBillingSlab.json b/data/as/30051272/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4426f4c67d
--- /dev/null
+++ b/data/as/30051272/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051272",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051276/BillingService/BusinessService.json b/data/as/30051276/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0c1e88734c
--- /dev/null
+++ b/data/as/30051276/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051276",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051276/egov-location/boundary-data.json b/data/as/30051276/egov-location/boundary-data.json
new file mode 100644
index 0000000000..11c4877ed9
--- /dev/null
+++ b/data/as/30051276/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051276",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 GARMARA GAON PWSS",
+                "localname": "NO.2 GARMARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 GARMARA GAON PWSS",
+                        "localname": "NO.2 GARMARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 GARMARA GAON PWSS",
+                "localname": "NO.2 GARMARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 GARMARA GAON PWSS",
+                        "localname": "NO.2 GARMARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051276/ws-services-calculation/Penalty.json b/data/as/30051276/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5726ecea46
--- /dev/null
+++ b/data/as/30051276/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051276",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051276/ws-services-calculation/WCBillingSlab.json b/data/as/30051276/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb9d9f0d4f
--- /dev/null
+++ b/data/as/30051276/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051276",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051373/BillingService/BusinessService.json b/data/as/30051373/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1873b45754
--- /dev/null
+++ b/data/as/30051373/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051373",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051373/egov-location/boundary-data.json b/data/as/30051373/egov-location/boundary-data.json
new file mode 100644
index 0000000000..75de471000
--- /dev/null
+++ b/data/as/30051373/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051373",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPAR KACHARI PWSS",
+                "localname": "UPAR KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPAR KACHARI PWSS",
+                        "localname": "UPAR KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPAR KACHARI PWSS",
+                "localname": "UPAR KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPAR KACHARI PWSS",
+                        "localname": "UPAR KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051373/ws-services-calculation/Penalty.json b/data/as/30051373/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..52efa2af19
--- /dev/null
+++ b/data/as/30051373/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051373",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051373/ws-services-calculation/WCBillingSlab.json b/data/as/30051373/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..793f62b441
--- /dev/null
+++ b/data/as/30051373/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051373",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051391/BillingService/BusinessService.json b/data/as/30051391/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c91643820
--- /dev/null
+++ b/data/as/30051391/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051391",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051391/egov-location/boundary-data.json b/data/as/30051391/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ef589610e
--- /dev/null
+++ b/data/as/30051391/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051391",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW KACHARIGAON PWSS",
+                "localname": "NEW KACHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW KACHARIGAON PWSS",
+                        "localname": "NEW KACHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW KACHARIGAON PWSS",
+                "localname": "NEW KACHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW KACHARIGAON PWSS",
+                        "localname": "NEW KACHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051391/ws-services-calculation/Penalty.json b/data/as/30051391/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89c29a9484
--- /dev/null
+++ b/data/as/30051391/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051391",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051391/ws-services-calculation/WCBillingSlab.json b/data/as/30051391/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..73c69370f5
--- /dev/null
+++ b/data/as/30051391/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051391",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051400/BillingService/BusinessService.json b/data/as/30051400/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0408fbe57a
--- /dev/null
+++ b/data/as/30051400/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051400",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051400/egov-location/boundary-data.json b/data/as/30051400/egov-location/boundary-data.json
new file mode 100644
index 0000000000..856f359903
--- /dev/null
+++ b/data/as/30051400/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051400",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                "localname": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                "localname": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051400/ws-services-calculation/Penalty.json b/data/as/30051400/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46f4ea3ff6
--- /dev/null
+++ b/data/as/30051400/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051400",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051400/ws-services-calculation/WCBillingSlab.json b/data/as/30051400/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a99c75534
--- /dev/null
+++ b/data/as/30051400/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051400",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051407/BillingService/BusinessService.json b/data/as/30051407/BillingService/BusinessService.json
new file mode 100644
index 0000000000..14d2f418d1
--- /dev/null
+++ b/data/as/30051407/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051407",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051407/egov-location/boundary-data.json b/data/as/30051407/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43e3b6a7d3
--- /dev/null
+++ b/data/as/30051407/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051407",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAT BAINI PT-II PWSS (NEW)",
+                "localname": "SAT BAINI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAT BAINI PT-II PWSS (NEW)",
+                        "localname": "SAT BAINI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAT BAINI PT-II PWSS (NEW)",
+                "localname": "SAT BAINI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAT BAINI PT-II PWSS (NEW)",
+                        "localname": "SAT BAINI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051407/ws-services-calculation/Penalty.json b/data/as/30051407/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6893350866
--- /dev/null
+++ b/data/as/30051407/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051407",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051407/ws-services-calculation/WCBillingSlab.json b/data/as/30051407/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0bae6485e
--- /dev/null
+++ b/data/as/30051407/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051407",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051492/BillingService/BusinessService.json b/data/as/30051492/BillingService/BusinessService.json
new file mode 100644
index 0000000000..25a8b04368
--- /dev/null
+++ b/data/as/30051492/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051492",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051492/egov-location/boundary-data.json b/data/as/30051492/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8318c6f451
--- /dev/null
+++ b/data/as/30051492/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051492",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 BELSIRI BAGAN PWSS",
+                "localname": "NO.3 BELSIRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 BELSIRI BAGAN PWSS",
+                        "localname": "NO.3 BELSIRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 BELSIRI BAGAN PWSS",
+                "localname": "NO.3 BELSIRI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 BELSIRI BAGAN PWSS",
+                        "localname": "NO.3 BELSIRI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051492/ws-services-calculation/Penalty.json b/data/as/30051492/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6b346940e
--- /dev/null
+++ b/data/as/30051492/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051492",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051492/ws-services-calculation/WCBillingSlab.json b/data/as/30051492/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f1ee93845
--- /dev/null
+++ b/data/as/30051492/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051492",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051495/BillingService/BusinessService.json b/data/as/30051495/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dda658c037
--- /dev/null
+++ b/data/as/30051495/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051495",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051495/egov-location/boundary-data.json b/data/as/30051495/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a96312416d
--- /dev/null
+++ b/data/as/30051495/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051495",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 GANGAPUR F.V.PWSS",
+                "localname": "NO.1 GANGAPUR F.V.PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051495",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 GANGAPUR F.V.PWSS",
+                        "localname": "NO.1 GANGAPUR F.V.PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 GANGAPUR F.V.PWSS",
+                "localname": "NO.1 GANGAPUR F.V.PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051495",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 GANGAPUR F.V.PWSS",
+                        "localname": "NO.1 GANGAPUR F.V.PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051495/ws-services-calculation/Penalty.json b/data/as/30051495/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a32c21bd13
--- /dev/null
+++ b/data/as/30051495/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051495",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051495/ws-services-calculation/WCBillingSlab.json b/data/as/30051495/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca80e23525
--- /dev/null
+++ b/data/as/30051495/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051495",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051497/BillingService/BusinessService.json b/data/as/30051497/BillingService/BusinessService.json
new file mode 100644
index 0000000000..000b07bfd5
--- /dev/null
+++ b/data/as/30051497/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051497",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051497/egov-location/boundary-data.json b/data/as/30051497/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b81a578652
--- /dev/null
+++ b/data/as/30051497/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051497",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 GANGAPUR FV PWSS",
+                "localname": "NO.2 GANGAPUR FV PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051497",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 GANGAPUR FV PWSS",
+                        "localname": "NO.2 GANGAPUR FV PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 GANGAPUR FV PWSS",
+                "localname": "NO.2 GANGAPUR FV PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051497",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 GANGAPUR FV PWSS",
+                        "localname": "NO.2 GANGAPUR FV PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051497/ws-services-calculation/Penalty.json b/data/as/30051497/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e337a32056
--- /dev/null
+++ b/data/as/30051497/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051497",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051497/ws-services-calculation/WCBillingSlab.json b/data/as/30051497/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80e41e524e
--- /dev/null
+++ b/data/as/30051497/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051497",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051501/BillingService/BusinessService.json b/data/as/30051501/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6543f66e34
--- /dev/null
+++ b/data/as/30051501/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051501",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051501/egov-location/boundary-data.json b/data/as/30051501/egov-location/boundary-data.json
new file mode 100644
index 0000000000..582a848aaf
--- /dev/null
+++ b/data/as/30051501/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051501",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB NAHARANI PWSS",
+                "localname": "PUB NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051501",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB NAHARANI PWSS",
+                        "localname": "PUB NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB NAHARANI PWSS",
+                "localname": "PUB NAHARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051501",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB NAHARANI PWSS",
+                        "localname": "PUB NAHARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051501/ws-services-calculation/Penalty.json b/data/as/30051501/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b20f35ae2f
--- /dev/null
+++ b/data/as/30051501/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051501",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051501/ws-services-calculation/WCBillingSlab.json b/data/as/30051501/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d2f04640c9
--- /dev/null
+++ b/data/as/30051501/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051501",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051507/BillingService/BusinessService.json b/data/as/30051507/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7ea507884f
--- /dev/null
+++ b/data/as/30051507/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051507",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051507/egov-location/boundary-data.json b/data/as/30051507/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8cdb90cad
--- /dev/null
+++ b/data/as/30051507/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051507",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB TARAJULI PWSS",
+                "localname": "PUB TARAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051507",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB TARAJULI PWSS",
+                        "localname": "PUB TARAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB TARAJULI PWSS",
+                "localname": "PUB TARAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051507",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB TARAJULI PWSS",
+                        "localname": "PUB TARAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051507/ws-services-calculation/Penalty.json b/data/as/30051507/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bcf73b728
--- /dev/null
+++ b/data/as/30051507/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051507",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051507/ws-services-calculation/WCBillingSlab.json b/data/as/30051507/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e79208c91a
--- /dev/null
+++ b/data/as/30051507/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051507",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051529/BillingService/BusinessService.json b/data/as/30051529/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d605dd65b4
--- /dev/null
+++ b/data/as/30051529/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051529",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051529/egov-location/boundary-data.json b/data/as/30051529/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bcb90149ce
--- /dev/null
+++ b/data/as/30051529/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051529",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZGAON PATHAR PWSS",
+                "localname": "MAZGAON PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051529",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZGAON PATHAR PWSS",
+                        "localname": "MAZGAON PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZGAON PATHAR PWSS",
+                "localname": "MAZGAON PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051529",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZGAON PATHAR PWSS",
+                        "localname": "MAZGAON PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051529/ws-services-calculation/Penalty.json b/data/as/30051529/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3700220c6b
--- /dev/null
+++ b/data/as/30051529/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051529",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051529/ws-services-calculation/WCBillingSlab.json b/data/as/30051529/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9774a5835c
--- /dev/null
+++ b/data/as/30051529/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051529",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051562/BillingService/BusinessService.json b/data/as/30051562/BillingService/BusinessService.json
new file mode 100644
index 0000000000..041bd91c6d
--- /dev/null
+++ b/data/as/30051562/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051562",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051562/egov-location/boundary-data.json b/data/as/30051562/egov-location/boundary-data.json
new file mode 100644
index 0000000000..172c00889a
--- /dev/null
+++ b/data/as/30051562/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051562",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                "localname": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                        "localname": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                "localname": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                        "localname": "NO.2 MANMUHINIPUR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051562/ws-services-calculation/Penalty.json b/data/as/30051562/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c0ce95ed0c
--- /dev/null
+++ b/data/as/30051562/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051562",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051562/ws-services-calculation/WCBillingSlab.json b/data/as/30051562/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..71b0510478
--- /dev/null
+++ b/data/as/30051562/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051562",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051569/BillingService/BusinessService.json b/data/as/30051569/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7dffa9aa1
--- /dev/null
+++ b/data/as/30051569/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051569",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051569/egov-location/boundary-data.json b/data/as/30051569/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba368b20d9
--- /dev/null
+++ b/data/as/30051569/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051569",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHUPUR GAON F.V PWSS",
+                "localname": "MADHUPUR GAON F.V PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHUPUR GAON F.V PWSS",
+                        "localname": "MADHUPUR GAON F.V PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHUPUR GAON F.V PWSS",
+                "localname": "MADHUPUR GAON F.V PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHUPUR GAON F.V PWSS",
+                        "localname": "MADHUPUR GAON F.V PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051569/ws-services-calculation/Penalty.json b/data/as/30051569/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11d7f74a82
--- /dev/null
+++ b/data/as/30051569/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051569",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051569/ws-services-calculation/WCBillingSlab.json b/data/as/30051569/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4fa1773739
--- /dev/null
+++ b/data/as/30051569/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051569",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051624/BillingService/BusinessService.json b/data/as/30051624/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0be5ad2ff
--- /dev/null
+++ b/data/as/30051624/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051624",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051624/egov-location/boundary-data.json b/data/as/30051624/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e0e695986e
--- /dev/null
+++ b/data/as/30051624/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051624",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARIDUAR T.E. A",
+                "localname": "CHARIDUAR T.E. A",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051624",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARIDUAR T.E. A",
+                        "localname": "CHARIDUAR T.E. A",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARIDUAR T.E. A",
+                "localname": "CHARIDUAR T.E. A",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051624",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARIDUAR T.E. A",
+                        "localname": "CHARIDUAR T.E. A",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051624/ws-services-calculation/Penalty.json b/data/as/30051624/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..660b80d708
--- /dev/null
+++ b/data/as/30051624/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051624",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051624/ws-services-calculation/WCBillingSlab.json b/data/as/30051624/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13b1f161c6
--- /dev/null
+++ b/data/as/30051624/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051624",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051683/BillingService/BusinessService.json b/data/as/30051683/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c39ba0891
--- /dev/null
+++ b/data/as/30051683/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30051683",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051683/egov-location/boundary-data.json b/data/as/30051683/egov-location/boundary-data.json
new file mode 100644
index 0000000000..310761fe53
--- /dev/null
+++ b/data/as/30051683/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30051683",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATAMARI PWSS (NEW)",
+                "localname": "CHATAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051683",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATAMARI PWSS (NEW)",
+                        "localname": "CHATAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATAMARI PWSS (NEW)",
+                "localname": "CHATAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30051683",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATAMARI PWSS (NEW)",
+                        "localname": "CHATAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051683/ws-services-calculation/Penalty.json b/data/as/30051683/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e0d902461
--- /dev/null
+++ b/data/as/30051683/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30051683",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30051683/ws-services-calculation/WCBillingSlab.json b/data/as/30051683/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fe400dcdbf
--- /dev/null
+++ b/data/as/30051683/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30051683",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052428/BillingService/BusinessService.json b/data/as/30052428/BillingService/BusinessService.json
new file mode 100644
index 0000000000..022a3d826d
--- /dev/null
+++ b/data/as/30052428/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30052428",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052428/egov-location/boundary-data.json b/data/as/30052428/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b76f0a08aa
--- /dev/null
+++ b/data/as/30052428/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30052428",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHUTIA ALI PWSS",
+                "localname": "BHUTIA ALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHUTIA ALI PWSS",
+                        "localname": "BHUTIA ALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHUTIA ALI PWSS",
+                "localname": "BHUTIA ALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHUTIA ALI PWSS",
+                        "localname": "BHUTIA ALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052428/ws-services-calculation/Penalty.json b/data/as/30052428/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a170b1414
--- /dev/null
+++ b/data/as/30052428/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30052428",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052428/ws-services-calculation/WCBillingSlab.json b/data/as/30052428/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b152ec6060
--- /dev/null
+++ b/data/as/30052428/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30052428",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052432/BillingService/BusinessService.json b/data/as/30052432/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c3f5f4783
--- /dev/null
+++ b/data/as/30052432/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30052432",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052432/egov-location/boundary-data.json b/data/as/30052432/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ad4a52caa
--- /dev/null
+++ b/data/as/30052432/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30052432",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 HUGRAJULI BAGAN PWSS",
+                "localname": "NO.3 HUGRAJULI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052432",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 HUGRAJULI BAGAN PWSS",
+                        "localname": "NO.3 HUGRAJULI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 HUGRAJULI BAGAN PWSS",
+                "localname": "NO.3 HUGRAJULI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052432",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 HUGRAJULI BAGAN PWSS",
+                        "localname": "NO.3 HUGRAJULI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052432/ws-services-calculation/Penalty.json b/data/as/30052432/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5718e59f18
--- /dev/null
+++ b/data/as/30052432/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30052432",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052432/ws-services-calculation/WCBillingSlab.json b/data/as/30052432/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7835249bdb
--- /dev/null
+++ b/data/as/30052432/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30052432",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052437/BillingService/BusinessService.json b/data/as/30052437/BillingService/BusinessService.json
new file mode 100644
index 0000000000..628056ce6f
--- /dev/null
+++ b/data/as/30052437/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30052437",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052437/egov-location/boundary-data.json b/data/as/30052437/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bbd692fd95
--- /dev/null
+++ b/data/as/30052437/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30052437",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOLAGURI PWSS",
+                "localname": "BHOLAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOLAGURI PWSS",
+                        "localname": "BHOLAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOLAGURI PWSS",
+                "localname": "BHOLAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOLAGURI PWSS",
+                        "localname": "BHOLAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052437/ws-services-calculation/Penalty.json b/data/as/30052437/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99fc6f7618
--- /dev/null
+++ b/data/as/30052437/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30052437",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052437/ws-services-calculation/WCBillingSlab.json b/data/as/30052437/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7eda7434e8
--- /dev/null
+++ b/data/as/30052437/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30052437",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052518/BillingService/BusinessService.json b/data/as/30052518/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f5bdc94a7
--- /dev/null
+++ b/data/as/30052518/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30052518",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052518/egov-location/boundary-data.json b/data/as/30052518/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e489dddb3e
--- /dev/null
+++ b/data/as/30052518/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30052518",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GEJENGAGURI GAON PWSS",
+                "localname": "GEJENGAGURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GEJENGAGURI GAON PWSS",
+                        "localname": "GEJENGAGURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GEJENGAGURI GAON PWSS",
+                "localname": "GEJENGAGURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GEJENGAGURI GAON PWSS",
+                        "localname": "GEJENGAGURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052518/ws-services-calculation/Penalty.json b/data/as/30052518/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e2a9f36f2
--- /dev/null
+++ b/data/as/30052518/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30052518",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052518/ws-services-calculation/WCBillingSlab.json b/data/as/30052518/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8bd2afbf33
--- /dev/null
+++ b/data/as/30052518/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30052518",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052737/BillingService/BusinessService.json b/data/as/30052737/BillingService/BusinessService.json
new file mode 100644
index 0000000000..59f783fa19
--- /dev/null
+++ b/data/as/30052737/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30052737",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052737/egov-location/boundary-data.json b/data/as/30052737/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e2270033d
--- /dev/null
+++ b/data/as/30052737/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30052737",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLAN GAON KACHARI PWSS",
+                "localname": "MOLAN GAON KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052737",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLAN GAON KACHARI PWSS",
+                        "localname": "MOLAN GAON KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLAN GAON KACHARI PWSS",
+                "localname": "MOLAN GAON KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052737",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLAN GAON KACHARI PWSS",
+                        "localname": "MOLAN GAON KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052737/ws-services-calculation/Penalty.json b/data/as/30052737/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c4b99b4a9b
--- /dev/null
+++ b/data/as/30052737/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30052737",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052737/ws-services-calculation/WCBillingSlab.json b/data/as/30052737/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f60e575c0d
--- /dev/null
+++ b/data/as/30052737/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30052737",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052787/BillingService/BusinessService.json b/data/as/30052787/BillingService/BusinessService.json
new file mode 100644
index 0000000000..173a1d3571
--- /dev/null
+++ b/data/as/30052787/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30052787",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052787/egov-location/boundary-data.json b/data/as/30052787/egov-location/boundary-data.json
new file mode 100644
index 0000000000..57c1bba5f1
--- /dev/null
+++ b/data/as/30052787/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30052787",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINIKHARI MIRI GAON PWSS",
+                "localname": "TINIKHARI MIRI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINIKHARI MIRI GAON PWSS",
+                        "localname": "TINIKHARI MIRI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TINIKHARI MIRI GAON PWSS",
+                "localname": "TINIKHARI MIRI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30052787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TINIKHARI MIRI GAON PWSS",
+                        "localname": "TINIKHARI MIRI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052787/ws-services-calculation/Penalty.json b/data/as/30052787/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e82682e3c0
--- /dev/null
+++ b/data/as/30052787/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30052787",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30052787/ws-services-calculation/WCBillingSlab.json b/data/as/30052787/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f88c281a3
--- /dev/null
+++ b/data/as/30052787/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30052787",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053173/BillingService/BusinessService.json b/data/as/30053173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e73ed94dc
--- /dev/null
+++ b/data/as/30053173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30053173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053173/egov-location/boundary-data.json b/data/as/30053173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b81e768a26
--- /dev/null
+++ b/data/as/30053173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30053173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 MIRI PATHAR PWSS",
+                "localname": "NO. 1 MIRI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30053173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 MIRI PATHAR PWSS",
+                        "localname": "NO. 1 MIRI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 MIRI PATHAR PWSS",
+                "localname": "NO. 1 MIRI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30053173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 MIRI PATHAR PWSS",
+                        "localname": "NO. 1 MIRI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053173/ws-services-calculation/Penalty.json b/data/as/30053173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7da9d098ff
--- /dev/null
+++ b/data/as/30053173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30053173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053173/ws-services-calculation/WCBillingSlab.json b/data/as/30053173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7f55b2fcfb
--- /dev/null
+++ b/data/as/30053173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30053173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053615/BillingService/BusinessService.json b/data/as/30053615/BillingService/BusinessService.json
new file mode 100644
index 0000000000..59967ef805
--- /dev/null
+++ b/data/as/30053615/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30053615",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053615/egov-location/boundary-data.json b/data/as/30053615/egov-location/boundary-data.json
new file mode 100644
index 0000000000..00d8673102
--- /dev/null
+++ b/data/as/30053615/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30053615",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJ ROUMARI GAON PWSS",
+                "localname": "MAJ ROUMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30053615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJ ROUMARI GAON PWSS",
+                        "localname": "MAJ ROUMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJ ROUMARI GAON PWSS",
+                "localname": "MAJ ROUMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30053615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJ ROUMARI GAON PWSS",
+                        "localname": "MAJ ROUMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053615/ws-services-calculation/Penalty.json b/data/as/30053615/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9770a310b0
--- /dev/null
+++ b/data/as/30053615/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30053615",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053615/ws-services-calculation/WCBillingSlab.json b/data/as/30053615/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85c9c2a61d
--- /dev/null
+++ b/data/as/30053615/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30053615",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053688/BillingService/BusinessService.json b/data/as/30053688/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37ba77eac8
--- /dev/null
+++ b/data/as/30053688/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30053688",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053688/egov-location/boundary-data.json b/data/as/30053688/egov-location/boundary-data.json
new file mode 100644
index 0000000000..780ab1818f
--- /dev/null
+++ b/data/as/30053688/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30053688",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUJULI GAON PWSS",
+                "localname": "GERUJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30053688",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUJULI GAON PWSS",
+                        "localname": "GERUJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUJULI GAON PWSS",
+                "localname": "GERUJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30053688",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUJULI GAON PWSS",
+                        "localname": "GERUJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053688/ws-services-calculation/Penalty.json b/data/as/30053688/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f07f6dedcc
--- /dev/null
+++ b/data/as/30053688/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30053688",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30053688/ws-services-calculation/WCBillingSlab.json b/data/as/30053688/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41f21d0da4
--- /dev/null
+++ b/data/as/30053688/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30053688",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054045/BillingService/BusinessService.json b/data/as/30054045/BillingService/BusinessService.json
new file mode 100644
index 0000000000..13b09ecbb2
--- /dev/null
+++ b/data/as/30054045/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054045",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054045/egov-location/boundary-data.json b/data/as/30054045/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1145984360
--- /dev/null
+++ b/data/as/30054045/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054045",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALI GAON MIRI PWSS",
+                "localname": "BALI GAON MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054045",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALI GAON MIRI PWSS",
+                        "localname": "BALI GAON MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALI GAON MIRI PWSS",
+                "localname": "BALI GAON MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054045",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALI GAON MIRI PWSS",
+                        "localname": "BALI GAON MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054045/ws-services-calculation/Penalty.json b/data/as/30054045/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3adc21403e
--- /dev/null
+++ b/data/as/30054045/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054045",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054045/ws-services-calculation/WCBillingSlab.json b/data/as/30054045/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..96b2243c5e
--- /dev/null
+++ b/data/as/30054045/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054045",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054048/BillingService/BusinessService.json b/data/as/30054048/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a4784e6791
--- /dev/null
+++ b/data/as/30054048/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054048",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054048/egov-location/boundary-data.json b/data/as/30054048/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6bd3d40360
--- /dev/null
+++ b/data/as/30054048/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054048",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKA GAON MIRI PWSS",
+                "localname": "BOKA GAON MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKA GAON MIRI PWSS",
+                        "localname": "BOKA GAON MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKA GAON MIRI PWSS",
+                "localname": "BOKA GAON MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKA GAON MIRI PWSS",
+                        "localname": "BOKA GAON MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054048/ws-services-calculation/Penalty.json b/data/as/30054048/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0a7a76f060
--- /dev/null
+++ b/data/as/30054048/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054048",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054048/ws-services-calculation/WCBillingSlab.json b/data/as/30054048/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c3cfd04084
--- /dev/null
+++ b/data/as/30054048/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054048",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054057/BillingService/BusinessService.json b/data/as/30054057/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf9ca3f40a
--- /dev/null
+++ b/data/as/30054057/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054057",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054057/egov-location/boundary-data.json b/data/as/30054057/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26c4acf55f
--- /dev/null
+++ b/data/as/30054057/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054057",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILANIGAON PWSS",
+                "localname": "CHILANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILANIGAON PWSS",
+                        "localname": "CHILANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILANIGAON PWSS",
+                "localname": "CHILANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILANIGAON PWSS",
+                        "localname": "CHILANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054057/ws-services-calculation/Penalty.json b/data/as/30054057/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e11740623b
--- /dev/null
+++ b/data/as/30054057/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054057",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054057/ws-services-calculation/WCBillingSlab.json b/data/as/30054057/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5dd85b4ebd
--- /dev/null
+++ b/data/as/30054057/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054057",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054383/BillingService/BusinessService.json b/data/as/30054383/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c7d960137
--- /dev/null
+++ b/data/as/30054383/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054383",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054383/egov-location/boundary-data.json b/data/as/30054383/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1eb6dd903
--- /dev/null
+++ b/data/as/30054383/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054383",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TATSAL GAON",
+                "localname": "TATSAL GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TATSAL GAON",
+                        "localname": "TATSAL GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TATSAL GAON",
+                "localname": "TATSAL GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TATSAL GAON",
+                        "localname": "TATSAL GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054383/ws-services-calculation/Penalty.json b/data/as/30054383/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d431f688b0
--- /dev/null
+++ b/data/as/30054383/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054383",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054383/ws-services-calculation/WCBillingSlab.json b/data/as/30054383/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6061ab30a0
--- /dev/null
+++ b/data/as/30054383/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054383",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054393/BillingService/BusinessService.json b/data/as/30054393/BillingService/BusinessService.json
new file mode 100644
index 0000000000..392b897c12
--- /dev/null
+++ b/data/as/30054393/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054393",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054393/egov-location/boundary-data.json b/data/as/30054393/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb5ce86abf
--- /dev/null
+++ b/data/as/30054393/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054393",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARASUTI PATHER PWSS",
+                "localname": "ARASUTI PATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARASUTI PATHER PWSS",
+                        "localname": "ARASUTI PATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARASUTI PATHER PWSS",
+                "localname": "ARASUTI PATHER PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARASUTI PATHER PWSS",
+                        "localname": "ARASUTI PATHER PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054393/ws-services-calculation/Penalty.json b/data/as/30054393/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08643bb4c9
--- /dev/null
+++ b/data/as/30054393/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054393",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054393/ws-services-calculation/WCBillingSlab.json b/data/as/30054393/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7e15c5cc5
--- /dev/null
+++ b/data/as/30054393/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054393",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054598/BillingService/BusinessService.json b/data/as/30054598/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce296c620d
--- /dev/null
+++ b/data/as/30054598/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054598",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054598/egov-location/boundary-data.json b/data/as/30054598/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f907124510
--- /dev/null
+++ b/data/as/30054598/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054598",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOHAI BHETI GAON",
+                "localname": "GOHAI BHETI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054598",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOHAI BHETI GAON",
+                        "localname": "GOHAI BHETI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOHAI BHETI GAON",
+                "localname": "GOHAI BHETI GAON",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054598",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOHAI BHETI GAON",
+                        "localname": "GOHAI BHETI GAON",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054598/ws-services-calculation/Penalty.json b/data/as/30054598/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6ed10b472f
--- /dev/null
+++ b/data/as/30054598/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054598",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054598/ws-services-calculation/WCBillingSlab.json b/data/as/30054598/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b498d9ddad
--- /dev/null
+++ b/data/as/30054598/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054598",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054601/BillingService/BusinessService.json b/data/as/30054601/BillingService/BusinessService.json
new file mode 100644
index 0000000000..77a78b9587
--- /dev/null
+++ b/data/as/30054601/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30054601",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054601/egov-location/boundary-data.json b/data/as/30054601/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c88002a263
--- /dev/null
+++ b/data/as/30054601/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30054601",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI NEPALI GAON PWSS",
+                "localname": "SINGRI NEPALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI NEPALI GAON PWSS",
+                        "localname": "SINGRI NEPALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI NEPALI GAON PWSS",
+                "localname": "SINGRI NEPALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30054601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI NEPALI GAON PWSS",
+                        "localname": "SINGRI NEPALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054601/ws-services-calculation/Penalty.json b/data/as/30054601/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fccd41ec4a
--- /dev/null
+++ b/data/as/30054601/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30054601",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30054601/ws-services-calculation/WCBillingSlab.json b/data/as/30054601/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a637b1c1b
--- /dev/null
+++ b/data/as/30054601/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30054601",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055210/BillingService/BusinessService.json b/data/as/30055210/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a548bff98c
--- /dev/null
+++ b/data/as/30055210/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055210",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055210/egov-location/boundary-data.json b/data/as/30055210/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e3c53f47a
--- /dev/null
+++ b/data/as/30055210/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055210",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALGURI GAON PWSS",
+                "localname": "KATHALGURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALGURI GAON PWSS",
+                        "localname": "KATHALGURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALGURI GAON PWSS",
+                "localname": "KATHALGURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALGURI GAON PWSS",
+                        "localname": "KATHALGURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055210/ws-services-calculation/Penalty.json b/data/as/30055210/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd9f9c8505
--- /dev/null
+++ b/data/as/30055210/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055210",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055210/ws-services-calculation/WCBillingSlab.json b/data/as/30055210/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4279d451e5
--- /dev/null
+++ b/data/as/30055210/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055210",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055216/BillingService/BusinessService.json b/data/as/30055216/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8145364d98
--- /dev/null
+++ b/data/as/30055216/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055216",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055216/egov-location/boundary-data.json b/data/as/30055216/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f9dc8d764
--- /dev/null
+++ b/data/as/30055216/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055216",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.6 JURUKHI PWSS",
+                "localname": "NO.6 JURUKHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055216",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.6 JURUKHI PWSS",
+                        "localname": "NO.6 JURUKHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.6 JURUKHI PWSS",
+                "localname": "NO.6 JURUKHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055216",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.6 JURUKHI PWSS",
+                        "localname": "NO.6 JURUKHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055216/ws-services-calculation/Penalty.json b/data/as/30055216/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8c84a51a2c
--- /dev/null
+++ b/data/as/30055216/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055216",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055216/ws-services-calculation/WCBillingSlab.json b/data/as/30055216/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce6dab68a9
--- /dev/null
+++ b/data/as/30055216/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055216",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055275/BillingService/BusinessService.json b/data/as/30055275/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2f708814cd
--- /dev/null
+++ b/data/as/30055275/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055275",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055275/egov-location/boundary-data.json b/data/as/30055275/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3356197c1a
--- /dev/null
+++ b/data/as/30055275/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055275",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055275/ws-services-calculation/Penalty.json b/data/as/30055275/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe1529f81b
--- /dev/null
+++ b/data/as/30055275/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055275",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055275/ws-services-calculation/WCBillingSlab.json b/data/as/30055275/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1235c77dd6
--- /dev/null
+++ b/data/as/30055275/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055275",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055680/BillingService/BusinessService.json b/data/as/30055680/BillingService/BusinessService.json
new file mode 100644
index 0000000000..119f6a57ba
--- /dev/null
+++ b/data/as/30055680/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055680",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055680/egov-location/boundary-data.json b/data/as/30055680/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6e91e5db36
--- /dev/null
+++ b/data/as/30055680/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055680",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJROWMAMARI KACHARI GAON PWSS",
+                "localname": "MAJROWMAMARI KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJROWMAMARI KACHARI GAON PWSS",
+                        "localname": "MAJROWMAMARI KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJROWMAMARI KACHARI GAON PWSS",
+                "localname": "MAJROWMAMARI KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055680",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJROWMAMARI KACHARI GAON PWSS",
+                        "localname": "MAJROWMAMARI KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055680/ws-services-calculation/Penalty.json b/data/as/30055680/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d221a2bc31
--- /dev/null
+++ b/data/as/30055680/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055680",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055680/ws-services-calculation/WCBillingSlab.json b/data/as/30055680/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..763fb4e1b2
--- /dev/null
+++ b/data/as/30055680/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055680",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055696/BillingService/BusinessService.json b/data/as/30055696/BillingService/BusinessService.json
new file mode 100644
index 0000000000..12f3468dc5
--- /dev/null
+++ b/data/as/30055696/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055696",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055696/egov-location/boundary-data.json b/data/as/30055696/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b987ba5e5b
--- /dev/null
+++ b/data/as/30055696/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055696",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKARIGURI PATHAR GAON PWSS",
+                "localname": "PAKARIGURI PATHAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKARIGURI PATHAR GAON PWSS",
+                        "localname": "PAKARIGURI PATHAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKARIGURI PATHAR GAON PWSS",
+                "localname": "PAKARIGURI PATHAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055696",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKARIGURI PATHAR GAON PWSS",
+                        "localname": "PAKARIGURI PATHAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055696/ws-services-calculation/Penalty.json b/data/as/30055696/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a3daeca602
--- /dev/null
+++ b/data/as/30055696/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055696",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055696/ws-services-calculation/WCBillingSlab.json b/data/as/30055696/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b7b579261
--- /dev/null
+++ b/data/as/30055696/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055696",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055718/BillingService/BusinessService.json b/data/as/30055718/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e245d85283
--- /dev/null
+++ b/data/as/30055718/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055718",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055718/egov-location/boundary-data.json b/data/as/30055718/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6192b2099a
--- /dev/null
+++ b/data/as/30055718/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055718",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKEHOWA BORDUBI PWSS",
+                "localname": "BHALUKEHOWA BORDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055718",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKEHOWA BORDUBI PWSS",
+                        "localname": "BHALUKEHOWA BORDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKEHOWA BORDUBI PWSS",
+                "localname": "BHALUKEHOWA BORDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055718",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKEHOWA BORDUBI PWSS",
+                        "localname": "BHALUKEHOWA BORDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055718/ws-services-calculation/Penalty.json b/data/as/30055718/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e337bc1ec
--- /dev/null
+++ b/data/as/30055718/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055718",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055718/ws-services-calculation/WCBillingSlab.json b/data/as/30055718/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..035169b81e
--- /dev/null
+++ b/data/as/30055718/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055718",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055724/BillingService/BusinessService.json b/data/as/30055724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b7d9eea131
--- /dev/null
+++ b/data/as/30055724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055724/egov-location/boundary-data.json b/data/as/30055724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ffdfd1a80
--- /dev/null
+++ b/data/as/30055724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALMARI PWSS",
+                "localname": "SALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALMARI PWSS",
+                        "localname": "SALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALMARI PWSS",
+                "localname": "SALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALMARI PWSS",
+                        "localname": "SALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055724/ws-services-calculation/Penalty.json b/data/as/30055724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b693990d0e
--- /dev/null
+++ b/data/as/30055724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055724/ws-services-calculation/WCBillingSlab.json b/data/as/30055724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bb7437912f
--- /dev/null
+++ b/data/as/30055724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055929/BillingService/BusinessService.json b/data/as/30055929/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f00103e4f6
--- /dev/null
+++ b/data/as/30055929/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055929",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055929/egov-location/boundary-data.json b/data/as/30055929/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb0cb5fb82
--- /dev/null
+++ b/data/as/30055929/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055929",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BURAGAON T.E PWSS",
+                "localname": "NEW BURAGAON T.E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055929",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BURAGAON T.E PWSS",
+                        "localname": "NEW BURAGAON T.E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BURAGAON T.E PWSS",
+                "localname": "NEW BURAGAON T.E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055929",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BURAGAON T.E PWSS",
+                        "localname": "NEW BURAGAON T.E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055929/ws-services-calculation/Penalty.json b/data/as/30055929/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6811a6dfd7
--- /dev/null
+++ b/data/as/30055929/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055929",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055929/ws-services-calculation/WCBillingSlab.json b/data/as/30055929/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4b8c19534
--- /dev/null
+++ b/data/as/30055929/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055929",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055936/BillingService/BusinessService.json b/data/as/30055936/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3945eb7a73
--- /dev/null
+++ b/data/as/30055936/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30055936",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055936/egov-location/boundary-data.json b/data/as/30055936/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a7a7e5ca9
--- /dev/null
+++ b/data/as/30055936/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30055936",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPKURIA NO. 2 PWSS",
+                "localname": "RUPKURIA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055936",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPKURIA NO. 2 PWSS",
+                        "localname": "RUPKURIA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPKURIA NO. 2 PWSS",
+                "localname": "RUPKURIA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30055936",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPKURIA NO. 2 PWSS",
+                        "localname": "RUPKURIA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055936/ws-services-calculation/Penalty.json b/data/as/30055936/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d4bc0ec50
--- /dev/null
+++ b/data/as/30055936/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30055936",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30055936/ws-services-calculation/WCBillingSlab.json b/data/as/30055936/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e5fad97641
--- /dev/null
+++ b/data/as/30055936/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30055936",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056016/BillingService/BusinessService.json b/data/as/30056016/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a2e2fc5b69
--- /dev/null
+++ b/data/as/30056016/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056016",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056016/egov-location/boundary-data.json b/data/as/30056016/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e46200285d
--- /dev/null
+++ b/data/as/30056016/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056016",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANDURA BIL PWSS",
+                "localname": "GANDURA BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANDURA BIL PWSS",
+                        "localname": "GANDURA BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANDURA BIL PWSS",
+                "localname": "GANDURA BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANDURA BIL PWSS",
+                        "localname": "GANDURA BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056016/ws-services-calculation/Penalty.json b/data/as/30056016/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d2ad2a8e2
--- /dev/null
+++ b/data/as/30056016/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056016",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056016/ws-services-calculation/WCBillingSlab.json b/data/as/30056016/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..16107003d2
--- /dev/null
+++ b/data/as/30056016/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056016",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056027/BillingService/BusinessService.json b/data/as/30056027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4cbd1d2841
--- /dev/null
+++ b/data/as/30056027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056027/egov-location/boundary-data.json b/data/as/30056027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7f0488e97
--- /dev/null
+++ b/data/as/30056027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHATUA CHUBURI PWSS",
+                "localname": "GHATUA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHATUA CHUBURI PWSS",
+                        "localname": "GHATUA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHATUA CHUBURI PWSS",
+                "localname": "GHATUA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHATUA CHUBURI PWSS",
+                        "localname": "GHATUA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056027/ws-services-calculation/Penalty.json b/data/as/30056027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5c1722224
--- /dev/null
+++ b/data/as/30056027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056027/ws-services-calculation/WCBillingSlab.json b/data/as/30056027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..566514d62a
--- /dev/null
+++ b/data/as/30056027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056041/BillingService/BusinessService.json b/data/as/30056041/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d5807ad33
--- /dev/null
+++ b/data/as/30056041/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056041",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056041/egov-location/boundary-data.json b/data/as/30056041/egov-location/boundary-data.json
new file mode 100644
index 0000000000..003ac1ddf2
--- /dev/null
+++ b/data/as/30056041/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056041",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUA PATHAR PWSS",
+                "localname": "GERUA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056041",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUA PATHAR PWSS",
+                        "localname": "GERUA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUA PATHAR PWSS",
+                "localname": "GERUA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056041",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUA PATHAR PWSS",
+                        "localname": "GERUA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056041/ws-services-calculation/Penalty.json b/data/as/30056041/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d89e19d499
--- /dev/null
+++ b/data/as/30056041/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056041",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056041/ws-services-calculation/WCBillingSlab.json b/data/as/30056041/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db93cf4336
--- /dev/null
+++ b/data/as/30056041/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056041",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056050/BillingService/BusinessService.json b/data/as/30056050/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dae1f946bc
--- /dev/null
+++ b/data/as/30056050/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056050",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056050/egov-location/boundary-data.json b/data/as/30056050/egov-location/boundary-data.json
new file mode 100644
index 0000000000..021cfa455a
--- /dev/null
+++ b/data/as/30056050/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056050",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALI GAON PWSS",
+                "localname": "BALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALI GAON PWSS",
+                        "localname": "BALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALI GAON PWSS",
+                "localname": "BALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056050",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALI GAON PWSS",
+                        "localname": "BALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056050/ws-services-calculation/Penalty.json b/data/as/30056050/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9c5c2dfd80
--- /dev/null
+++ b/data/as/30056050/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056050",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056050/ws-services-calculation/WCBillingSlab.json b/data/as/30056050/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b5edfa08f
--- /dev/null
+++ b/data/as/30056050/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056050",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056072/BillingService/BusinessService.json b/data/as/30056072/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb949055d1
--- /dev/null
+++ b/data/as/30056072/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056072",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056072/egov-location/boundary-data.json b/data/as/30056072/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b4e6e8fbf7
--- /dev/null
+++ b/data/as/30056072/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056072",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAMATI GAON PWSS",
+                "localname": "RANGAMATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAMATI GAON PWSS",
+                        "localname": "RANGAMATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAMATI GAON PWSS",
+                "localname": "RANGAMATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAMATI GAON PWSS",
+                        "localname": "RANGAMATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056072/ws-services-calculation/Penalty.json b/data/as/30056072/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a3e34684f
--- /dev/null
+++ b/data/as/30056072/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056072",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056072/ws-services-calculation/WCBillingSlab.json b/data/as/30056072/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d20aeea54a
--- /dev/null
+++ b/data/as/30056072/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056072",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056080/BillingService/BusinessService.json b/data/as/30056080/BillingService/BusinessService.json
new file mode 100644
index 0000000000..515f20faa9
--- /dev/null
+++ b/data/as/30056080/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056080",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056080/egov-location/boundary-data.json b/data/as/30056080/egov-location/boundary-data.json
new file mode 100644
index 0000000000..23296a94b8
--- /dev/null
+++ b/data/as/30056080/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056080",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALITA GAON PWSS",
+                "localname": "KALITA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALITA GAON PWSS",
+                        "localname": "KALITA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALITA GAON PWSS",
+                "localname": "KALITA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALITA GAON PWSS",
+                        "localname": "KALITA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056080/ws-services-calculation/Penalty.json b/data/as/30056080/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..06ded93855
--- /dev/null
+++ b/data/as/30056080/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056080",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056080/ws-services-calculation/WCBillingSlab.json b/data/as/30056080/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ec8a37bb9f
--- /dev/null
+++ b/data/as/30056080/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056080",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056087/BillingService/BusinessService.json b/data/as/30056087/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0dc01c2851
--- /dev/null
+++ b/data/as/30056087/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056087",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056087/egov-location/boundary-data.json b/data/as/30056087/egov-location/boundary-data.json
new file mode 100644
index 0000000000..767a5e796c
--- /dev/null
+++ b/data/as/30056087/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056087",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHINGA CHUBURI PWSS",
+                "localname": "CHINGA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056087",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHINGA CHUBURI PWSS",
+                        "localname": "CHINGA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHINGA CHUBURI PWSS",
+                "localname": "CHINGA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056087",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHINGA CHUBURI PWSS",
+                        "localname": "CHINGA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056087/ws-services-calculation/Penalty.json b/data/as/30056087/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2078d0c60
--- /dev/null
+++ b/data/as/30056087/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056087",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056087/ws-services-calculation/WCBillingSlab.json b/data/as/30056087/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21c43096b9
--- /dev/null
+++ b/data/as/30056087/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056087",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056104/BillingService/BusinessService.json b/data/as/30056104/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dceec22677
--- /dev/null
+++ b/data/as/30056104/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056104",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056104/egov-location/boundary-data.json b/data/as/30056104/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bdc3730407
--- /dev/null
+++ b/data/as/30056104/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056104",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARI GAON PWSS",
+                "localname": "PUTHIMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056104",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARI GAON PWSS",
+                        "localname": "PUTHIMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARI GAON PWSS",
+                "localname": "PUTHIMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056104",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARI GAON PWSS",
+                        "localname": "PUTHIMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056104/ws-services-calculation/Penalty.json b/data/as/30056104/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e308747a9
--- /dev/null
+++ b/data/as/30056104/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056104",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056104/ws-services-calculation/WCBillingSlab.json b/data/as/30056104/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc71331371
--- /dev/null
+++ b/data/as/30056104/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056104",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056141/BillingService/BusinessService.json b/data/as/30056141/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5aecef5f6
--- /dev/null
+++ b/data/as/30056141/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056141",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056141/egov-location/boundary-data.json b/data/as/30056141/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b250ac2d90
--- /dev/null
+++ b/data/as/30056141/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056141",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN BENGALI PWSS",
+                "localname": "BALIJAN BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056141",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN BENGALI PWSS",
+                        "localname": "BALIJAN BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN BENGALI PWSS",
+                "localname": "BALIJAN BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056141",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN BENGALI PWSS",
+                        "localname": "BALIJAN BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056141/ws-services-calculation/Penalty.json b/data/as/30056141/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e55555167
--- /dev/null
+++ b/data/as/30056141/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056141",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056141/ws-services-calculation/WCBillingSlab.json b/data/as/30056141/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80bb93a43f
--- /dev/null
+++ b/data/as/30056141/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056141",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056146/BillingService/BusinessService.json b/data/as/30056146/BillingService/BusinessService.json
new file mode 100644
index 0000000000..adf17b0b5e
--- /dev/null
+++ b/data/as/30056146/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056146",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056146/egov-location/boundary-data.json b/data/as/30056146/egov-location/boundary-data.json
new file mode 100644
index 0000000000..500946afd5
--- /dev/null
+++ b/data/as/30056146/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056146",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN GAON PWSS",
+                "localname": "BALIJAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN GAON PWSS",
+                        "localname": "BALIJAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN GAON PWSS",
+                "localname": "BALIJAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN GAON PWSS",
+                        "localname": "BALIJAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056146/ws-services-calculation/Penalty.json b/data/as/30056146/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4fbfc94e6
--- /dev/null
+++ b/data/as/30056146/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056146",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056146/ws-services-calculation/WCBillingSlab.json b/data/as/30056146/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db49957ce5
--- /dev/null
+++ b/data/as/30056146/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056146",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056407/BillingService/BusinessService.json b/data/as/30056407/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f286afcdd
--- /dev/null
+++ b/data/as/30056407/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056407",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056407/egov-location/boundary-data.json b/data/as/30056407/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e49905ed7e
--- /dev/null
+++ b/data/as/30056407/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056407",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI CHAPORI PWSS",
+                "localname": "SITALMARI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI CHAPORI PWSS",
+                        "localname": "SITALMARI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI CHAPORI PWSS",
+                "localname": "SITALMARI CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI CHAPORI PWSS",
+                        "localname": "SITALMARI CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056407/ws-services-calculation/Penalty.json b/data/as/30056407/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a85fb4fb3a
--- /dev/null
+++ b/data/as/30056407/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056407",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056407/ws-services-calculation/WCBillingSlab.json b/data/as/30056407/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..53cf403220
--- /dev/null
+++ b/data/as/30056407/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056407",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056412/BillingService/BusinessService.json b/data/as/30056412/BillingService/BusinessService.json
new file mode 100644
index 0000000000..18b370e0c8
--- /dev/null
+++ b/data/as/30056412/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056412",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056412/egov-location/boundary-data.json b/data/as/30056412/egov-location/boundary-data.json
new file mode 100644
index 0000000000..75864338d9
--- /dev/null
+++ b/data/as/30056412/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056412",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI BANGALI PWSS",
+                "localname": "SINGRI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056412",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI BANGALI PWSS",
+                        "localname": "SINGRI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI BANGALI PWSS",
+                "localname": "SINGRI BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056412",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI BANGALI PWSS",
+                        "localname": "SINGRI BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056412/ws-services-calculation/Penalty.json b/data/as/30056412/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86123e5aff
--- /dev/null
+++ b/data/as/30056412/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056412",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056412/ws-services-calculation/WCBillingSlab.json b/data/as/30056412/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5975dc836c
--- /dev/null
+++ b/data/as/30056412/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056412",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056417/BillingService/BusinessService.json b/data/as/30056417/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f32f50eea7
--- /dev/null
+++ b/data/as/30056417/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056417",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056417/egov-location/boundary-data.json b/data/as/30056417/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a84a437f6
--- /dev/null
+++ b/data/as/30056417/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056417",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI TUTULA PWSS",
+                "localname": "SINGRI TUTULA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056417",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI TUTULA PWSS",
+                        "localname": "SINGRI TUTULA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI TUTULA PWSS",
+                "localname": "SINGRI TUTULA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056417",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI TUTULA PWSS",
+                        "localname": "SINGRI TUTULA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056417/ws-services-calculation/Penalty.json b/data/as/30056417/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f552b2779
--- /dev/null
+++ b/data/as/30056417/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056417",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056417/ws-services-calculation/WCBillingSlab.json b/data/as/30056417/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..683d5be30a
--- /dev/null
+++ b/data/as/30056417/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056417",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056425/BillingService/BusinessService.json b/data/as/30056425/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a182e809a0
--- /dev/null
+++ b/data/as/30056425/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056425",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056425/egov-location/boundary-data.json b/data/as/30056425/egov-location/boundary-data.json
new file mode 100644
index 0000000000..233b9401f5
--- /dev/null
+++ b/data/as/30056425/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056425",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 CHITALMARI PWSS",
+                "localname": "NO.3 CHITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 CHITALMARI PWSS",
+                        "localname": "NO.3 CHITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 CHITALMARI PWSS",
+                "localname": "NO.3 CHITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 CHITALMARI PWSS",
+                        "localname": "NO.3 CHITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056425/ws-services-calculation/Penalty.json b/data/as/30056425/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..902b648bbf
--- /dev/null
+++ b/data/as/30056425/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056425",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056425/ws-services-calculation/WCBillingSlab.json b/data/as/30056425/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b8c60fe10
--- /dev/null
+++ b/data/as/30056425/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056425",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056431/BillingService/BusinessService.json b/data/as/30056431/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85ee501058
--- /dev/null
+++ b/data/as/30056431/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056431",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056431/egov-location/boundary-data.json b/data/as/30056431/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bc79799815
--- /dev/null
+++ b/data/as/30056431/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056431",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HORA MARA PATHAR GAON PWSS",
+                "localname": "HORA MARA PATHAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056431",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HORA MARA PATHAR GAON PWSS",
+                        "localname": "HORA MARA PATHAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HORA MARA PATHAR GAON PWSS",
+                "localname": "HORA MARA PATHAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056431",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HORA MARA PATHAR GAON PWSS",
+                        "localname": "HORA MARA PATHAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056431/ws-services-calculation/Penalty.json b/data/as/30056431/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..654dfea217
--- /dev/null
+++ b/data/as/30056431/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056431",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056431/ws-services-calculation/WCBillingSlab.json b/data/as/30056431/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd02dd269d
--- /dev/null
+++ b/data/as/30056431/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056431",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056433/BillingService/BusinessService.json b/data/as/30056433/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3698357b5f
--- /dev/null
+++ b/data/as/30056433/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056433",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056433/egov-location/boundary-data.json b/data/as/30056433/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cb28dc344c
--- /dev/null
+++ b/data/as/30056433/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056433",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 SINGARI BAGAN PWSS",
+                "localname": "NO.3 SINGARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056433",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 SINGARI BAGAN PWSS",
+                        "localname": "NO.3 SINGARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 SINGARI BAGAN PWSS",
+                "localname": "NO.3 SINGARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056433",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 SINGARI BAGAN PWSS",
+                        "localname": "NO.3 SINGARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056433/ws-services-calculation/Penalty.json b/data/as/30056433/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3677da3d9b
--- /dev/null
+++ b/data/as/30056433/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056433",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056433/ws-services-calculation/WCBillingSlab.json b/data/as/30056433/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31b7c17ef7
--- /dev/null
+++ b/data/as/30056433/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056433",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056435/BillingService/BusinessService.json b/data/as/30056435/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad726fdfa4
--- /dev/null
+++ b/data/as/30056435/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056435",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056435/egov-location/boundary-data.json b/data/as/30056435/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eb5a82f96c
--- /dev/null
+++ b/data/as/30056435/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056435",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORCHOLA BAGAN PWSS",
+                "localname": "BORCHOLA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORCHOLA BAGAN PWSS",
+                        "localname": "BORCHOLA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORCHOLA BAGAN PWSS",
+                "localname": "BORCHOLA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORCHOLA BAGAN PWSS",
+                        "localname": "BORCHOLA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056435/ws-services-calculation/Penalty.json b/data/as/30056435/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd26c05dbc
--- /dev/null
+++ b/data/as/30056435/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056435",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056435/ws-services-calculation/WCBillingSlab.json b/data/as/30056435/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67443480e1
--- /dev/null
+++ b/data/as/30056435/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056435",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056490/BillingService/BusinessService.json b/data/as/30056490/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bebabf7790
--- /dev/null
+++ b/data/as/30056490/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056490",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056490/egov-location/boundary-data.json b/data/as/30056490/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6afc45e7c8
--- /dev/null
+++ b/data/as/30056490/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056490",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": " RAJGORH GAON PWSS",
+                "localname": " RAJGORH GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": " RAJGORH GAON PWSS",
+                        "localname": " RAJGORH GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": " RAJGORH GAON PWSS",
+                "localname": " RAJGORH GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": " RAJGORH GAON PWSS",
+                        "localname": " RAJGORH GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056490/ws-services-calculation/Penalty.json b/data/as/30056490/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1df596350b
--- /dev/null
+++ b/data/as/30056490/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056490",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056490/ws-services-calculation/WCBillingSlab.json b/data/as/30056490/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4593b077a6
--- /dev/null
+++ b/data/as/30056490/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056490",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056609/BillingService/BusinessService.json b/data/as/30056609/BillingService/BusinessService.json
new file mode 100644
index 0000000000..47e80a25c4
--- /dev/null
+++ b/data/as/30056609/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056609",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056609/egov-location/boundary-data.json b/data/as/30056609/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f493eee5f
--- /dev/null
+++ b/data/as/30056609/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056609",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LIKHAKGAON NO.1 PWSS",
+                "localname": "LIKHAKGAON NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LIKHAKGAON NO.1 PWSS",
+                        "localname": "LIKHAKGAON NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LIKHAKGAON NO.1 PWSS",
+                "localname": "LIKHAKGAON NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LIKHAKGAON NO.1 PWSS",
+                        "localname": "LIKHAKGAON NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056609/ws-services-calculation/Penalty.json b/data/as/30056609/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f31bf4a09a
--- /dev/null
+++ b/data/as/30056609/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056609",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056609/ws-services-calculation/WCBillingSlab.json b/data/as/30056609/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85573e7f71
--- /dev/null
+++ b/data/as/30056609/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056609",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056640/BillingService/BusinessService.json b/data/as/30056640/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf1562c042
--- /dev/null
+++ b/data/as/30056640/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056640",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056640/egov-location/boundary-data.json b/data/as/30056640/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6db1a3c7b
--- /dev/null
+++ b/data/as/30056640/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056640",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                "localname": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056640",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                        "localname": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                "localname": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056640",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                        "localname": "BAHBARI NO.3 PWSS - (OLD NAME - ARIMARA PATHAR PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056640/ws-services-calculation/Penalty.json b/data/as/30056640/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6446c258f0
--- /dev/null
+++ b/data/as/30056640/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056640",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056640/ws-services-calculation/WCBillingSlab.json b/data/as/30056640/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c22424d59
--- /dev/null
+++ b/data/as/30056640/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056640",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056810/BillingService/BusinessService.json b/data/as/30056810/BillingService/BusinessService.json
new file mode 100644
index 0000000000..152dc8104d
--- /dev/null
+++ b/data/as/30056810/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056810",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056810/egov-location/boundary-data.json b/data/as/30056810/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ddb04e0b9
--- /dev/null
+++ b/data/as/30056810/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056810",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHOGIA NO.2 PWSS",
+                "localname": "BORBHOGIA NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHOGIA NO.2 PWSS",
+                        "localname": "BORBHOGIA NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHOGIA NO.2 PWSS",
+                "localname": "BORBHOGIA NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHOGIA NO.2 PWSS",
+                        "localname": "BORBHOGIA NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056810/ws-services-calculation/Penalty.json b/data/as/30056810/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7874dbdeff
--- /dev/null
+++ b/data/as/30056810/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056810",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056810/ws-services-calculation/WCBillingSlab.json b/data/as/30056810/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bef8cd9b0b
--- /dev/null
+++ b/data/as/30056810/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056810",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056913/BillingService/BusinessService.json b/data/as/30056913/BillingService/BusinessService.json
new file mode 100644
index 0000000000..511d9c8366
--- /dev/null
+++ b/data/as/30056913/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056913",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056913/egov-location/boundary-data.json b/data/as/30056913/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fbbadb34e3
--- /dev/null
+++ b/data/as/30056913/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056913",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN PATHAR PWSS",
+                "localname": "BALIJAN PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056913",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN PATHAR PWSS",
+                        "localname": "BALIJAN PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIJAN PATHAR PWSS",
+                "localname": "BALIJAN PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056913",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIJAN PATHAR PWSS",
+                        "localname": "BALIJAN PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056913/ws-services-calculation/Penalty.json b/data/as/30056913/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3b494a51a
--- /dev/null
+++ b/data/as/30056913/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056913",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056913/ws-services-calculation/WCBillingSlab.json b/data/as/30056913/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fae85794cb
--- /dev/null
+++ b/data/as/30056913/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056913",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056918/BillingService/BusinessService.json b/data/as/30056918/BillingService/BusinessService.json
new file mode 100644
index 0000000000..623cdc399b
--- /dev/null
+++ b/data/as/30056918/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056918",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056918/egov-location/boundary-data.json b/data/as/30056918/egov-location/boundary-data.json
new file mode 100644
index 0000000000..123fbc133e
--- /dev/null
+++ b/data/as/30056918/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056918",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIMARI KUCH GAON PWSS",
+                "localname": "SINGIMARI KUCH GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056918",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIMARI KUCH GAON PWSS",
+                        "localname": "SINGIMARI KUCH GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIMARI KUCH GAON PWSS",
+                "localname": "SINGIMARI KUCH GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056918",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIMARI KUCH GAON PWSS",
+                        "localname": "SINGIMARI KUCH GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056918/ws-services-calculation/Penalty.json b/data/as/30056918/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c7273f3932
--- /dev/null
+++ b/data/as/30056918/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056918",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056918/ws-services-calculation/WCBillingSlab.json b/data/as/30056918/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e352cbc82
--- /dev/null
+++ b/data/as/30056918/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056918",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056922/BillingService/BusinessService.json b/data/as/30056922/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe1e905da3
--- /dev/null
+++ b/data/as/30056922/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30056922",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056922/egov-location/boundary-data.json b/data/as/30056922/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7418321959
--- /dev/null
+++ b/data/as/30056922/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30056922",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULIP KULLIE LINE PWSS",
+                "localname": "TULIP KULLIE LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULIP KULLIE LINE PWSS",
+                        "localname": "TULIP KULLIE LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULIP KULLIE LINE PWSS",
+                "localname": "TULIP KULLIE LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30056922",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULIP KULLIE LINE PWSS",
+                        "localname": "TULIP KULLIE LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056922/ws-services-calculation/Penalty.json b/data/as/30056922/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6159bc52a
--- /dev/null
+++ b/data/as/30056922/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30056922",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30056922/ws-services-calculation/WCBillingSlab.json b/data/as/30056922/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d04d82b71
--- /dev/null
+++ b/data/as/30056922/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30056922",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057164/BillingService/BusinessService.json b/data/as/30057164/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e8315959a
--- /dev/null
+++ b/data/as/30057164/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057164",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057164/egov-location/boundary-data.json b/data/as/30057164/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1629a61f05
--- /dev/null
+++ b/data/as/30057164/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057164",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULI PWSS (NEW)",
+                "localname": "DEULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057164",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULI PWSS (NEW)",
+                        "localname": "DEULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULI PWSS (NEW)",
+                "localname": "DEULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057164",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULI PWSS (NEW)",
+                        "localname": "DEULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057164/ws-services-calculation/Penalty.json b/data/as/30057164/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..071b387848
--- /dev/null
+++ b/data/as/30057164/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057164",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057164/ws-services-calculation/WCBillingSlab.json b/data/as/30057164/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8952c45c1e
--- /dev/null
+++ b/data/as/30057164/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057164",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057166/BillingService/BusinessService.json b/data/as/30057166/BillingService/BusinessService.json
new file mode 100644
index 0000000000..228ddedf90
--- /dev/null
+++ b/data/as/30057166/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057166",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057166/egov-location/boundary-data.json b/data/as/30057166/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1df8ac554d
--- /dev/null
+++ b/data/as/30057166/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057166",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIDA PT-I PWSS (NEW)",
+                "localname": "BAIDA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIDA PT-I PWSS (NEW)",
+                        "localname": "BAIDA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIDA PT-I PWSS (NEW)",
+                "localname": "BAIDA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIDA PT-I PWSS (NEW)",
+                        "localname": "BAIDA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057166/ws-services-calculation/Penalty.json b/data/as/30057166/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3e9ab0626
--- /dev/null
+++ b/data/as/30057166/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057166",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057166/ws-services-calculation/WCBillingSlab.json b/data/as/30057166/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..78083d89c1
--- /dev/null
+++ b/data/as/30057166/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057166",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057174/BillingService/BusinessService.json b/data/as/30057174/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b526abcfb6
--- /dev/null
+++ b/data/as/30057174/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057174",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057174/egov-location/boundary-data.json b/data/as/30057174/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c96909e266
--- /dev/null
+++ b/data/as/30057174/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057174",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN GHATUA PWSS",
+                "localname": "NATUN GHATUA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057174",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN GHATUA PWSS",
+                        "localname": "NATUN GHATUA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN GHATUA PWSS",
+                "localname": "NATUN GHATUA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057174",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN GHATUA PWSS",
+                        "localname": "NATUN GHATUA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057174/ws-services-calculation/Penalty.json b/data/as/30057174/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..243ff0151d
--- /dev/null
+++ b/data/as/30057174/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057174",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057174/ws-services-calculation/WCBillingSlab.json b/data/as/30057174/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..020ebd0bae
--- /dev/null
+++ b/data/as/30057174/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057174",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057288/BillingService/BusinessService.json b/data/as/30057288/BillingService/BusinessService.json
new file mode 100644
index 0000000000..77f39c35f3
--- /dev/null
+++ b/data/as/30057288/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057288",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057288/egov-location/boundary-data.json b/data/as/30057288/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7420fb65b6
--- /dev/null
+++ b/data/as/30057288/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057288",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIRAJULI PATHAR NO.1 PWSS",
+                "localname": "SIRAJULI PATHAR NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIRAJULI PATHAR NO.1 PWSS",
+                        "localname": "SIRAJULI PATHAR NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIRAJULI PATHAR NO.1 PWSS",
+                "localname": "SIRAJULI PATHAR NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIRAJULI PATHAR NO.1 PWSS",
+                        "localname": "SIRAJULI PATHAR NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057288/ws-services-calculation/Penalty.json b/data/as/30057288/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f73bd0cf6
--- /dev/null
+++ b/data/as/30057288/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057288",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057288/ws-services-calculation/WCBillingSlab.json b/data/as/30057288/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e524a97f1
--- /dev/null
+++ b/data/as/30057288/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057288",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057297/BillingService/BusinessService.json b/data/as/30057297/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc21b956c4
--- /dev/null
+++ b/data/as/30057297/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057297",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057297/egov-location/boundary-data.json b/data/as/30057297/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8746b1aff7
--- /dev/null
+++ b/data/as/30057297/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057297",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEHERU KHANDA PATHER GAON PWSS",
+                "localname": "KEHERU KHANDA PATHER GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEHERU KHANDA PATHER GAON PWSS",
+                        "localname": "KEHERU KHANDA PATHER GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEHERU KHANDA PATHER GAON PWSS",
+                "localname": "KEHERU KHANDA PATHER GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEHERU KHANDA PATHER GAON PWSS",
+                        "localname": "KEHERU KHANDA PATHER GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057297/ws-services-calculation/Penalty.json b/data/as/30057297/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..52507884cb
--- /dev/null
+++ b/data/as/30057297/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057297",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057297/ws-services-calculation/WCBillingSlab.json b/data/as/30057297/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8570038f7d
--- /dev/null
+++ b/data/as/30057297/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057297",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057361/BillingService/BusinessService.json b/data/as/30057361/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8f7d1c16d
--- /dev/null
+++ b/data/as/30057361/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057361",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057361/egov-location/boundary-data.json b/data/as/30057361/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd9d75b492
--- /dev/null
+++ b/data/as/30057361/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057361",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURA GARUDUBA NO 1",
+                "localname": "BURA GARUDUBA NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057361",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURA GARUDUBA NO 1",
+                        "localname": "BURA GARUDUBA NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURA GARUDUBA NO 1",
+                "localname": "BURA GARUDUBA NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057361",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURA GARUDUBA NO 1",
+                        "localname": "BURA GARUDUBA NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057361/ws-services-calculation/Penalty.json b/data/as/30057361/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca05962b86
--- /dev/null
+++ b/data/as/30057361/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057361",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057361/ws-services-calculation/WCBillingSlab.json b/data/as/30057361/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..292c4f2ca6
--- /dev/null
+++ b/data/as/30057361/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057361",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057363/BillingService/BusinessService.json b/data/as/30057363/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27cafe73bf
--- /dev/null
+++ b/data/as/30057363/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057363",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057363/egov-location/boundary-data.json b/data/as/30057363/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1060214935
--- /dev/null
+++ b/data/as/30057363/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057363",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOZAI GAON PWSS",
+                "localname": "HOZAI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057363",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOZAI GAON PWSS",
+                        "localname": "HOZAI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOZAI GAON PWSS",
+                "localname": "HOZAI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057363",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOZAI GAON PWSS",
+                        "localname": "HOZAI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057363/ws-services-calculation/Penalty.json b/data/as/30057363/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eccdec8092
--- /dev/null
+++ b/data/as/30057363/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057363",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057363/ws-services-calculation/WCBillingSlab.json b/data/as/30057363/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a50cf2970b
--- /dev/null
+++ b/data/as/30057363/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057363",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057369/BillingService/BusinessService.json b/data/as/30057369/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45ac9d0db2
--- /dev/null
+++ b/data/as/30057369/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057369",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057369/egov-location/boundary-data.json b/data/as/30057369/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ad5719297
--- /dev/null
+++ b/data/as/30057369/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057369",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIJ BARGAON PWSS",
+                "localname": "NIJ BARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057369",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIJ BARGAON PWSS",
+                        "localname": "NIJ BARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIJ BARGAON PWSS",
+                "localname": "NIJ BARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057369",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIJ BARGAON PWSS",
+                        "localname": "NIJ BARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057369/ws-services-calculation/Penalty.json b/data/as/30057369/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c99ba3ecd
--- /dev/null
+++ b/data/as/30057369/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057369",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057369/ws-services-calculation/WCBillingSlab.json b/data/as/30057369/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f0b83d914a
--- /dev/null
+++ b/data/as/30057369/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057369",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057524/BillingService/BusinessService.json b/data/as/30057524/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46e9459beb
--- /dev/null
+++ b/data/as/30057524/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057524",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057524/egov-location/boundary-data.json b/data/as/30057524/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d67ca5af46
--- /dev/null
+++ b/data/as/30057524/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057524",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 RANGA GARA BIL GAON PWSS",
+                "localname": "NO.3 RANGA GARA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 RANGA GARA BIL GAON PWSS",
+                        "localname": "NO.3 RANGA GARA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 RANGA GARA BIL GAON PWSS",
+                "localname": "NO.3 RANGA GARA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 RANGA GARA BIL GAON PWSS",
+                        "localname": "NO.3 RANGA GARA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057524/ws-services-calculation/Penalty.json b/data/as/30057524/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7880643c91
--- /dev/null
+++ b/data/as/30057524/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057524",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057524/ws-services-calculation/WCBillingSlab.json b/data/as/30057524/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0f090b951e
--- /dev/null
+++ b/data/as/30057524/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057524",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057641/BillingService/BusinessService.json b/data/as/30057641/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1cb5eaa1a8
--- /dev/null
+++ b/data/as/30057641/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057641",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057641/egov-location/boundary-data.json b/data/as/30057641/egov-location/boundary-data.json
new file mode 100644
index 0000000000..05062e1087
--- /dev/null
+++ b/data/as/30057641/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057641",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAPARA NAYAPARA PWSS (NEW)",
+                "localname": "SARAPARA NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057641",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAPARA NAYAPARA PWSS (NEW)",
+                        "localname": "SARAPARA NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAPARA NAYAPARA PWSS (NEW)",
+                "localname": "SARAPARA NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057641",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAPARA NAYAPARA PWSS (NEW)",
+                        "localname": "SARAPARA NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057641/ws-services-calculation/Penalty.json b/data/as/30057641/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6553fe9f61
--- /dev/null
+++ b/data/as/30057641/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057641",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057641/ws-services-calculation/WCBillingSlab.json b/data/as/30057641/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..18227401ec
--- /dev/null
+++ b/data/as/30057641/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057641",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057745/BillingService/BusinessService.json b/data/as/30057745/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8101bdd99e
--- /dev/null
+++ b/data/as/30057745/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057745",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057745/egov-location/boundary-data.json b/data/as/30057745/egov-location/boundary-data.json
new file mode 100644
index 0000000000..da8c10c659
--- /dev/null
+++ b/data/as/30057745/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057745",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASHA KANI GAON PWSS",
+                "localname": "KASHA KANI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASHA KANI GAON PWSS",
+                        "localname": "KASHA KANI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASHA KANI GAON PWSS",
+                "localname": "KASHA KANI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASHA KANI GAON PWSS",
+                        "localname": "KASHA KANI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057745/ws-services-calculation/Penalty.json b/data/as/30057745/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13dc491885
--- /dev/null
+++ b/data/as/30057745/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057745",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057745/ws-services-calculation/WCBillingSlab.json b/data/as/30057745/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c90f67af51
--- /dev/null
+++ b/data/as/30057745/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057745",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057746/BillingService/BusinessService.json b/data/as/30057746/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a03cf5419b
--- /dev/null
+++ b/data/as/30057746/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057746",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057746/egov-location/boundary-data.json b/data/as/30057746/egov-location/boundary-data.json
new file mode 100644
index 0000000000..55855cb799
--- /dev/null
+++ b/data/as/30057746/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057746",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPKURIA PWSS",
+                "localname": "RUPKURIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057746",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPKURIA PWSS",
+                        "localname": "RUPKURIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPKURIA PWSS",
+                "localname": "RUPKURIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057746",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPKURIA PWSS",
+                        "localname": "RUPKURIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057746/ws-services-calculation/Penalty.json b/data/as/30057746/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e69bd1aa45
--- /dev/null
+++ b/data/as/30057746/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057746",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057746/ws-services-calculation/WCBillingSlab.json b/data/as/30057746/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6bea01c0f
--- /dev/null
+++ b/data/as/30057746/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057746",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057748/BillingService/BusinessService.json b/data/as/30057748/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36ffb8f343
--- /dev/null
+++ b/data/as/30057748/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057748",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057748/egov-location/boundary-data.json b/data/as/30057748/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6208a3ffe
--- /dev/null
+++ b/data/as/30057748/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057748",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 DHULAPADUNG TE PWSS",
+                "localname": "NO. 3 DHULAPADUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 DHULAPADUNG TE PWSS",
+                        "localname": "NO. 3 DHULAPADUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 DHULAPADUNG TE PWSS",
+                "localname": "NO. 3 DHULAPADUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 DHULAPADUNG TE PWSS",
+                        "localname": "NO. 3 DHULAPADUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057748/ws-services-calculation/Penalty.json b/data/as/30057748/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13c8eb47f5
--- /dev/null
+++ b/data/as/30057748/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057748",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057748/ws-services-calculation/WCBillingSlab.json b/data/as/30057748/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0d58c5dc78
--- /dev/null
+++ b/data/as/30057748/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057748",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057972/BillingService/BusinessService.json b/data/as/30057972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a86d99db36
--- /dev/null
+++ b/data/as/30057972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057972/egov-location/boundary-data.json b/data/as/30057972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ade1f6db9d
--- /dev/null
+++ b/data/as/30057972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHBARI BAGISA PWSS",
+                "localname": "BAHBARI BAGISA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHBARI BAGISA PWSS",
+                        "localname": "BAHBARI BAGISA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHBARI BAGISA PWSS",
+                "localname": "BAHBARI BAGISA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHBARI BAGISA PWSS",
+                        "localname": "BAHBARI BAGISA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057972/ws-services-calculation/Penalty.json b/data/as/30057972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c529744453
--- /dev/null
+++ b/data/as/30057972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057972/ws-services-calculation/WCBillingSlab.json b/data/as/30057972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..36d4189a91
--- /dev/null
+++ b/data/as/30057972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057974/BillingService/BusinessService.json b/data/as/30057974/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e19c54e8c1
--- /dev/null
+++ b/data/as/30057974/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057974",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057974/egov-location/boundary-data.json b/data/as/30057974/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87d920bfcd
--- /dev/null
+++ b/data/as/30057974/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057974",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARAKHIYA PUKHURI PWSS",
+                "localname": "GARAKHIYA PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARAKHIYA PUKHURI PWSS",
+                        "localname": "GARAKHIYA PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARAKHIYA PUKHURI PWSS",
+                "localname": "GARAKHIYA PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARAKHIYA PUKHURI PWSS",
+                        "localname": "GARAKHIYA PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057974/ws-services-calculation/Penalty.json b/data/as/30057974/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5fa4036b5
--- /dev/null
+++ b/data/as/30057974/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057974",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057974/ws-services-calculation/WCBillingSlab.json b/data/as/30057974/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..914906d06c
--- /dev/null
+++ b/data/as/30057974/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057974",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057979/BillingService/BusinessService.json b/data/as/30057979/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ef1616937b
--- /dev/null
+++ b/data/as/30057979/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057979",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057979/egov-location/boundary-data.json b/data/as/30057979/egov-location/boundary-data.json
new file mode 100644
index 0000000000..680d734dbf
--- /dev/null
+++ b/data/as/30057979/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057979",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZOR HOLA PWSS",
+                "localname": "MAZOR HOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057979",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZOR HOLA PWSS",
+                        "localname": "MAZOR HOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZOR HOLA PWSS",
+                "localname": "MAZOR HOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057979",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZOR HOLA PWSS",
+                        "localname": "MAZOR HOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057979/ws-services-calculation/Penalty.json b/data/as/30057979/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..52802bbe84
--- /dev/null
+++ b/data/as/30057979/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057979",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057979/ws-services-calculation/WCBillingSlab.json b/data/as/30057979/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..38f353525b
--- /dev/null
+++ b/data/as/30057979/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057979",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057983/BillingService/BusinessService.json b/data/as/30057983/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0d24537641
--- /dev/null
+++ b/data/as/30057983/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057983",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057983/egov-location/boundary-data.json b/data/as/30057983/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d4833ce840
--- /dev/null
+++ b/data/as/30057983/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057983",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARU GRANT NO.1 PWSS",
+                "localname": "GABHARU GRANT NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARU GRANT NO.1 PWSS",
+                        "localname": "GABHARU GRANT NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARU GRANT NO.1 PWSS",
+                "localname": "GABHARU GRANT NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARU GRANT NO.1 PWSS",
+                        "localname": "GABHARU GRANT NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057983/ws-services-calculation/Penalty.json b/data/as/30057983/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eb8473c7a7
--- /dev/null
+++ b/data/as/30057983/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057983",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057983/ws-services-calculation/WCBillingSlab.json b/data/as/30057983/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a2bcf1c3a
--- /dev/null
+++ b/data/as/30057983/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057983",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057985/BillingService/BusinessService.json b/data/as/30057985/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2923053027
--- /dev/null
+++ b/data/as/30057985/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057985",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057985/egov-location/boundary-data.json b/data/as/30057985/egov-location/boundary-data.json
new file mode 100644
index 0000000000..37a05bfda0
--- /dev/null
+++ b/data/as/30057985/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057985",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOILA GAON PWSS",
+                "localname": "MOILA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057985",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOILA GAON PWSS",
+                        "localname": "MOILA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOILA GAON PWSS",
+                "localname": "MOILA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057985",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOILA GAON PWSS",
+                        "localname": "MOILA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057985/ws-services-calculation/Penalty.json b/data/as/30057985/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..500407b882
--- /dev/null
+++ b/data/as/30057985/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057985",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057985/ws-services-calculation/WCBillingSlab.json b/data/as/30057985/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..98f53786a0
--- /dev/null
+++ b/data/as/30057985/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057985",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057989/BillingService/BusinessService.json b/data/as/30057989/BillingService/BusinessService.json
new file mode 100644
index 0000000000..af59b9d542
--- /dev/null
+++ b/data/as/30057989/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057989",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057989/egov-location/boundary-data.json b/data/as/30057989/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c679a92988
--- /dev/null
+++ b/data/as/30057989/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057989",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ERASUTI JUNGLE NO.1 PWSS",
+                "localname": "ERASUTI JUNGLE NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ERASUTI JUNGLE NO.1 PWSS",
+                        "localname": "ERASUTI JUNGLE NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ERASUTI JUNGLE NO.1 PWSS",
+                "localname": "ERASUTI JUNGLE NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ERASUTI JUNGLE NO.1 PWSS",
+                        "localname": "ERASUTI JUNGLE NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057989/ws-services-calculation/Penalty.json b/data/as/30057989/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cb778d2fb7
--- /dev/null
+++ b/data/as/30057989/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057989",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057989/ws-services-calculation/WCBillingSlab.json b/data/as/30057989/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b5af9694ea
--- /dev/null
+++ b/data/as/30057989/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057989",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057993/BillingService/BusinessService.json b/data/as/30057993/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f59dc06cf
--- /dev/null
+++ b/data/as/30057993/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30057993",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057993/egov-location/boundary-data.json b/data/as/30057993/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f68735d6d9
--- /dev/null
+++ b/data/as/30057993/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30057993",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIRAIATI GAON PWSS",
+                "localname": "NIRAIATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057993",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIRAIATI GAON PWSS",
+                        "localname": "NIRAIATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIRAIATI GAON PWSS",
+                "localname": "NIRAIATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30057993",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIRAIATI GAON PWSS",
+                        "localname": "NIRAIATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057993/ws-services-calculation/Penalty.json b/data/as/30057993/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68757480c8
--- /dev/null
+++ b/data/as/30057993/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30057993",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30057993/ws-services-calculation/WCBillingSlab.json b/data/as/30057993/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ab919ef9b6
--- /dev/null
+++ b/data/as/30057993/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30057993",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058019/BillingService/BusinessService.json b/data/as/30058019/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94f473c30e
--- /dev/null
+++ b/data/as/30058019/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058019",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058019/egov-location/boundary-data.json b/data/as/30058019/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c1a736efe
--- /dev/null
+++ b/data/as/30058019/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058019",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PRAJABASTI GAON PWSS",
+                "localname": "PRAJABASTI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PRAJABASTI GAON PWSS",
+                        "localname": "PRAJABASTI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PRAJABASTI GAON PWSS",
+                "localname": "PRAJABASTI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058019",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PRAJABASTI GAON PWSS",
+                        "localname": "PRAJABASTI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058019/ws-services-calculation/Penalty.json b/data/as/30058019/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ddda86b009
--- /dev/null
+++ b/data/as/30058019/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058019",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058019/ws-services-calculation/WCBillingSlab.json b/data/as/30058019/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f39be4d59c
--- /dev/null
+++ b/data/as/30058019/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058019",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058023/BillingService/BusinessService.json b/data/as/30058023/BillingService/BusinessService.json
new file mode 100644
index 0000000000..921c9fd0fe
--- /dev/null
+++ b/data/as/30058023/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058023",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058023/egov-location/boundary-data.json b/data/as/30058023/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a1ab7056e
--- /dev/null
+++ b/data/as/30058023/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058023",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZ BALI GAON PWSS",
+                "localname": "MAZ BALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZ BALI GAON PWSS",
+                        "localname": "MAZ BALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZ BALI GAON PWSS",
+                "localname": "MAZ BALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZ BALI GAON PWSS",
+                        "localname": "MAZ BALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058023/ws-services-calculation/Penalty.json b/data/as/30058023/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e901f56e9f
--- /dev/null
+++ b/data/as/30058023/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058023",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058023/ws-services-calculation/WCBillingSlab.json b/data/as/30058023/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93c326a749
--- /dev/null
+++ b/data/as/30058023/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058023",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058044/BillingService/BusinessService.json b/data/as/30058044/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8f661039b0
--- /dev/null
+++ b/data/as/30058044/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058044",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058044/egov-location/boundary-data.json b/data/as/30058044/egov-location/boundary-data.json
new file mode 100644
index 0000000000..69fe6c73de
--- /dev/null
+++ b/data/as/30058044/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058044",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAPAM PATHAR PWSS",
+                "localname": "NAPAM PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAPAM PATHAR PWSS",
+                        "localname": "NAPAM PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAPAM PATHAR PWSS",
+                "localname": "NAPAM PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAPAM PATHAR PWSS",
+                        "localname": "NAPAM PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058044/ws-services-calculation/Penalty.json b/data/as/30058044/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f035504a92
--- /dev/null
+++ b/data/as/30058044/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058044",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058044/ws-services-calculation/WCBillingSlab.json b/data/as/30058044/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cea0a823db
--- /dev/null
+++ b/data/as/30058044/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058044",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058047/BillingService/BusinessService.json b/data/as/30058047/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f75110fe0
--- /dev/null
+++ b/data/as/30058047/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058047",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058047/egov-location/boundary-data.json b/data/as/30058047/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8c6487318
--- /dev/null
+++ b/data/as/30058047/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058047",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMNATHPUR PWSS",
+                "localname": "RAMNATHPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058047",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMNATHPUR PWSS",
+                        "localname": "RAMNATHPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMNATHPUR PWSS",
+                "localname": "RAMNATHPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058047",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMNATHPUR PWSS",
+                        "localname": "RAMNATHPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058047/ws-services-calculation/Penalty.json b/data/as/30058047/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce42cbdcb4
--- /dev/null
+++ b/data/as/30058047/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058047",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058047/ws-services-calculation/WCBillingSlab.json b/data/as/30058047/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..341d4c7c09
--- /dev/null
+++ b/data/as/30058047/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058047",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058052/BillingService/BusinessService.json b/data/as/30058052/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca543402bd
--- /dev/null
+++ b/data/as/30058052/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058052",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058052/egov-location/boundary-data.json b/data/as/30058052/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2370ee6b34
--- /dev/null
+++ b/data/as/30058052/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058052",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANPUKHURI-A PWSS",
+                "localname": "MOLANPUKHURI-A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANPUKHURI-A PWSS",
+                        "localname": "MOLANPUKHURI-A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANPUKHURI-A PWSS",
+                "localname": "MOLANPUKHURI-A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANPUKHURI-A PWSS",
+                        "localname": "MOLANPUKHURI-A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058052/ws-services-calculation/Penalty.json b/data/as/30058052/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..79d05d5657
--- /dev/null
+++ b/data/as/30058052/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058052",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058052/ws-services-calculation/WCBillingSlab.json b/data/as/30058052/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10a0c7d926
--- /dev/null
+++ b/data/as/30058052/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058052",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058057/BillingService/BusinessService.json b/data/as/30058057/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a860985b82
--- /dev/null
+++ b/data/as/30058057/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058057",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058057/egov-location/boundary-data.json b/data/as/30058057/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8843606ba8
--- /dev/null
+++ b/data/as/30058057/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058057",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANPUKHURI-B PWSS",
+                "localname": "MOLANPUKHURI-B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANPUKHURI-B PWSS",
+                        "localname": "MOLANPUKHURI-B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANPUKHURI-B PWSS",
+                "localname": "MOLANPUKHURI-B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANPUKHURI-B PWSS",
+                        "localname": "MOLANPUKHURI-B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058057/ws-services-calculation/Penalty.json b/data/as/30058057/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1e7287eb7
--- /dev/null
+++ b/data/as/30058057/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058057",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058057/ws-services-calculation/WCBillingSlab.json b/data/as/30058057/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1a78c3e68
--- /dev/null
+++ b/data/as/30058057/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058057",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058109/BillingService/BusinessService.json b/data/as/30058109/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8b358ca164
--- /dev/null
+++ b/data/as/30058109/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058109",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058109/egov-location/boundary-data.json b/data/as/30058109/egov-location/boundary-data.json
new file mode 100644
index 0000000000..25751a6c45
--- /dev/null
+++ b/data/as/30058109/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058109",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATISHILA RABHAPARA PWSS (NEW)",
+                "localname": "HATISHILA RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058109",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATISHILA RABHAPARA PWSS (NEW)",
+                        "localname": "HATISHILA RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATISHILA RABHAPARA PWSS (NEW)",
+                "localname": "HATISHILA RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058109",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATISHILA RABHAPARA PWSS (NEW)",
+                        "localname": "HATISHILA RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058109/ws-services-calculation/Penalty.json b/data/as/30058109/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e8fe2d7656
--- /dev/null
+++ b/data/as/30058109/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058109",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058109/ws-services-calculation/WCBillingSlab.json b/data/as/30058109/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..650d33e9c1
--- /dev/null
+++ b/data/as/30058109/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058109",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058320/BillingService/BusinessService.json b/data/as/30058320/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c60ddda4a
--- /dev/null
+++ b/data/as/30058320/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058320",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058320/egov-location/boundary-data.json b/data/as/30058320/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4555373aa5
--- /dev/null
+++ b/data/as/30058320/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058320",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUBARI NO.1 PWSS",
+                "localname": "OUBARI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUBARI NO.1 PWSS",
+                        "localname": "OUBARI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUBARI NO.1 PWSS",
+                "localname": "OUBARI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUBARI NO.1 PWSS",
+                        "localname": "OUBARI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058320/ws-services-calculation/Penalty.json b/data/as/30058320/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b6dddeb4a
--- /dev/null
+++ b/data/as/30058320/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058320",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058320/ws-services-calculation/WCBillingSlab.json b/data/as/30058320/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d777ab7ec
--- /dev/null
+++ b/data/as/30058320/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058320",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058339/BillingService/BusinessService.json b/data/as/30058339/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1eed9cd09d
--- /dev/null
+++ b/data/as/30058339/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058339",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058339/egov-location/boundary-data.json b/data/as/30058339/egov-location/boundary-data.json
new file mode 100644
index 0000000000..159f6850c7
--- /dev/null
+++ b/data/as/30058339/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058339",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKULIPARA PWSS (NEW)",
+                "localname": "KUKULIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058339",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKULIPARA PWSS (NEW)",
+                        "localname": "KUKULIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKULIPARA PWSS (NEW)",
+                "localname": "KUKULIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058339",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKULIPARA PWSS (NEW)",
+                        "localname": "KUKULIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058339/ws-services-calculation/Penalty.json b/data/as/30058339/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e55bb3f67
--- /dev/null
+++ b/data/as/30058339/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058339",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058339/ws-services-calculation/WCBillingSlab.json b/data/as/30058339/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..360fb15c34
--- /dev/null
+++ b/data/as/30058339/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058339",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058545/BillingService/BusinessService.json b/data/as/30058545/BillingService/BusinessService.json
new file mode 100644
index 0000000000..637860ac0f
--- /dev/null
+++ b/data/as/30058545/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30058545",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058545/egov-location/boundary-data.json b/data/as/30058545/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b974f6d96e
--- /dev/null
+++ b/data/as/30058545/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30058545",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                "localname": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                        "localname": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                "localname": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30058545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                        "localname": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058545/ws-services-calculation/Penalty.json b/data/as/30058545/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f4fc4e179
--- /dev/null
+++ b/data/as/30058545/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30058545",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30058545/ws-services-calculation/WCBillingSlab.json b/data/as/30058545/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..846aa00510
--- /dev/null
+++ b/data/as/30058545/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30058545",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059252/BillingService/BusinessService.json b/data/as/30059252/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c932a5762
--- /dev/null
+++ b/data/as/30059252/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059252",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059252/egov-location/boundary-data.json b/data/as/30059252/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6a7fc74553
--- /dev/null
+++ b/data/as/30059252/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059252",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKIABHASA PWSS (NEW)",
+                "localname": "CHAKIABHASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059252",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKIABHASA PWSS (NEW)",
+                        "localname": "CHAKIABHASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKIABHASA PWSS (NEW)",
+                "localname": "CHAKIABHASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059252",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKIABHASA PWSS (NEW)",
+                        "localname": "CHAKIABHASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059252/ws-services-calculation/Penalty.json b/data/as/30059252/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d14156ab4e
--- /dev/null
+++ b/data/as/30059252/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059252",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059252/ws-services-calculation/WCBillingSlab.json b/data/as/30059252/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..446094faa3
--- /dev/null
+++ b/data/as/30059252/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059252",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059318/BillingService/BusinessService.json b/data/as/30059318/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c586ed8c58
--- /dev/null
+++ b/data/as/30059318/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059318",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059318/egov-location/boundary-data.json b/data/as/30059318/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5eabb22974
--- /dev/null
+++ b/data/as/30059318/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059318",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 PIRAKATA BENGALI PWSS",
+                "localname": "NO.1 PIRAKATA BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059318",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 PIRAKATA BENGALI PWSS",
+                        "localname": "NO.1 PIRAKATA BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 PIRAKATA BENGALI PWSS",
+                "localname": "NO.1 PIRAKATA BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059318",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 PIRAKATA BENGALI PWSS",
+                        "localname": "NO.1 PIRAKATA BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059318/ws-services-calculation/Penalty.json b/data/as/30059318/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c04fc7f77
--- /dev/null
+++ b/data/as/30059318/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059318",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059318/ws-services-calculation/WCBillingSlab.json b/data/as/30059318/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2787ce015
--- /dev/null
+++ b/data/as/30059318/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059318",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059391/BillingService/BusinessService.json b/data/as/30059391/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7f7239a146
--- /dev/null
+++ b/data/as/30059391/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059391",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059391/egov-location/boundary-data.json b/data/as/30059391/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48b66281b6
--- /dev/null
+++ b/data/as/30059391/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059391",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROHINIBIL PWSS",
+                "localname": "ROHINIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROHINIBIL PWSS",
+                        "localname": "ROHINIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROHINIBIL PWSS",
+                "localname": "ROHINIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROHINIBIL PWSS",
+                        "localname": "ROHINIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059391/ws-services-calculation/Penalty.json b/data/as/30059391/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb793b8106
--- /dev/null
+++ b/data/as/30059391/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059391",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059391/ws-services-calculation/WCBillingSlab.json b/data/as/30059391/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f184b69915
--- /dev/null
+++ b/data/as/30059391/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059391",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059490/BillingService/BusinessService.json b/data/as/30059490/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f8c6d77384
--- /dev/null
+++ b/data/as/30059490/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059490",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059490/egov-location/boundary-data.json b/data/as/30059490/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3640d655e2
--- /dev/null
+++ b/data/as/30059490/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059490",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAGARIJAN PWSS",
+                "localname": "KHAGARIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAGARIJAN PWSS",
+                        "localname": "KHAGARIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAGARIJAN PWSS",
+                "localname": "KHAGARIJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAGARIJAN PWSS",
+                        "localname": "KHAGARIJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059490/ws-services-calculation/Penalty.json b/data/as/30059490/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..58843eace0
--- /dev/null
+++ b/data/as/30059490/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059490",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059490/ws-services-calculation/WCBillingSlab.json b/data/as/30059490/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4622ac31c8
--- /dev/null
+++ b/data/as/30059490/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059490",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059492/BillingService/BusinessService.json b/data/as/30059492/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ef8e0242c
--- /dev/null
+++ b/data/as/30059492/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059492",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059492/egov-location/boundary-data.json b/data/as/30059492/egov-location/boundary-data.json
new file mode 100644
index 0000000000..507a45a25f
--- /dev/null
+++ b/data/as/30059492/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059492",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THELAMARGHATGAON PWSS",
+                "localname": "THELAMARGHATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THELAMARGHATGAON PWSS",
+                        "localname": "THELAMARGHATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THELAMARGHATGAON PWSS",
+                "localname": "THELAMARGHATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THELAMARGHATGAON PWSS",
+                        "localname": "THELAMARGHATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059492/ws-services-calculation/Penalty.json b/data/as/30059492/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6cba67a54
--- /dev/null
+++ b/data/as/30059492/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059492",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059492/ws-services-calculation/WCBillingSlab.json b/data/as/30059492/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aee98008f2
--- /dev/null
+++ b/data/as/30059492/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059492",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059495/BillingService/BusinessService.json b/data/as/30059495/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4fd400e9e0
--- /dev/null
+++ b/data/as/30059495/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059495",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059495/egov-location/boundary-data.json b/data/as/30059495/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f652f90e8d
--- /dev/null
+++ b/data/as/30059495/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059495",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMARCHUBURI NO.1 ",
+                "localname": "KAMARCHUBURI NO.1 ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059495",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMARCHUBURI NO.1 ",
+                        "localname": "KAMARCHUBURI NO.1 ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMARCHUBURI NO.1 ",
+                "localname": "KAMARCHUBURI NO.1 ",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059495",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMARCHUBURI NO.1 ",
+                        "localname": "KAMARCHUBURI NO.1 ",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059495/ws-services-calculation/Penalty.json b/data/as/30059495/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..088b1c5241
--- /dev/null
+++ b/data/as/30059495/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059495",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059495/ws-services-calculation/WCBillingSlab.json b/data/as/30059495/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4de8eb43a6
--- /dev/null
+++ b/data/as/30059495/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059495",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059497/BillingService/BusinessService.json b/data/as/30059497/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f910353ee
--- /dev/null
+++ b/data/as/30059497/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059497",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059497/egov-location/boundary-data.json b/data/as/30059497/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f4985d437d
--- /dev/null
+++ b/data/as/30059497/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059497",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARASUTI GAON PWSS",
+                "localname": "ARASUTI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059497",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARASUTI GAON PWSS",
+                        "localname": "ARASUTI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARASUTI GAON PWSS",
+                "localname": "ARASUTI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059497",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARASUTI GAON PWSS",
+                        "localname": "ARASUTI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059497/ws-services-calculation/Penalty.json b/data/as/30059497/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81da03d963
--- /dev/null
+++ b/data/as/30059497/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059497",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059497/ws-services-calculation/WCBillingSlab.json b/data/as/30059497/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17165ba9d6
--- /dev/null
+++ b/data/as/30059497/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059497",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059500/BillingService/BusinessService.json b/data/as/30059500/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ff62e6e06
--- /dev/null
+++ b/data/as/30059500/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059500",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059500/egov-location/boundary-data.json b/data/as/30059500/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b41c8d33bd
--- /dev/null
+++ b/data/as/30059500/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059500",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARUPAR PWSS",
+                "localname": "GABHARUPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARUPAR PWSS",
+                        "localname": "GABHARUPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GABHARUPAR PWSS",
+                "localname": "GABHARUPAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GABHARUPAR PWSS",
+                        "localname": "GABHARUPAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059500/ws-services-calculation/Penalty.json b/data/as/30059500/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..205cd57b65
--- /dev/null
+++ b/data/as/30059500/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059500",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059500/ws-services-calculation/WCBillingSlab.json b/data/as/30059500/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0a0af218ad
--- /dev/null
+++ b/data/as/30059500/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059500",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059502/BillingService/BusinessService.json b/data/as/30059502/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0264aa0dba
--- /dev/null
+++ b/data/as/30059502/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059502",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059502/egov-location/boundary-data.json b/data/as/30059502/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db9b07fb59
--- /dev/null
+++ b/data/as/30059502/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059502",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANBARI GAON PWSS",
+                "localname": "PANBARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANBARI GAON PWSS",
+                        "localname": "PANBARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANBARI GAON PWSS",
+                "localname": "PANBARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANBARI GAON PWSS",
+                        "localname": "PANBARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059502/ws-services-calculation/Penalty.json b/data/as/30059502/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f7765e8df6
--- /dev/null
+++ b/data/as/30059502/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059502",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059502/ws-services-calculation/WCBillingSlab.json b/data/as/30059502/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f7ddda0fd0
--- /dev/null
+++ b/data/as/30059502/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059502",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059510/BillingService/BusinessService.json b/data/as/30059510/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df76ec2bf3
--- /dev/null
+++ b/data/as/30059510/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059510",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059510/egov-location/boundary-data.json b/data/as/30059510/egov-location/boundary-data.json
new file mode 100644
index 0000000000..99d5e17fef
--- /dev/null
+++ b/data/as/30059510/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059510",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHOLA GUTI KACHARI GAON PWSS",
+                "localname": "KHOLA GUTI KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHOLA GUTI KACHARI GAON PWSS",
+                        "localname": "KHOLA GUTI KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHOLA GUTI KACHARI GAON PWSS",
+                "localname": "KHOLA GUTI KACHARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHOLA GUTI KACHARI GAON PWSS",
+                        "localname": "KHOLA GUTI KACHARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059510/ws-services-calculation/Penalty.json b/data/as/30059510/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a274c6357e
--- /dev/null
+++ b/data/as/30059510/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059510",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059510/ws-services-calculation/WCBillingSlab.json b/data/as/30059510/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0635b80194
--- /dev/null
+++ b/data/as/30059510/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059510",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059517/BillingService/BusinessService.json b/data/as/30059517/BillingService/BusinessService.json
new file mode 100644
index 0000000000..13394f3d45
--- /dev/null
+++ b/data/as/30059517/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059517",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059517/egov-location/boundary-data.json b/data/as/30059517/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7e01ed927
--- /dev/null
+++ b/data/as/30059517/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059517",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE NO. 5 PWSS",
+                "localname": "BARJULI TE NO. 5 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE NO. 5 PWSS",
+                        "localname": "BARJULI TE NO. 5 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE NO. 5 PWSS",
+                "localname": "BARJULI TE NO. 5 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE NO. 5 PWSS",
+                        "localname": "BARJULI TE NO. 5 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059517/ws-services-calculation/Penalty.json b/data/as/30059517/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd38a07e3a
--- /dev/null
+++ b/data/as/30059517/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059517",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059517/ws-services-calculation/WCBillingSlab.json b/data/as/30059517/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..21dfa7bf6e
--- /dev/null
+++ b/data/as/30059517/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059517",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059589/BillingService/BusinessService.json b/data/as/30059589/BillingService/BusinessService.json
new file mode 100644
index 0000000000..05a428a625
--- /dev/null
+++ b/data/as/30059589/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30059589",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059589/egov-location/boundary-data.json b/data/as/30059589/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6000d09780
--- /dev/null
+++ b/data/as/30059589/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30059589",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SURAJ PWSS",
+                "localname": "SURAJ PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059589",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SURAJ PWSS",
+                        "localname": "SURAJ PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SURAJ PWSS",
+                "localname": "SURAJ PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30059589",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SURAJ PWSS",
+                        "localname": "SURAJ PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059589/ws-services-calculation/Penalty.json b/data/as/30059589/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b55bf4a62
--- /dev/null
+++ b/data/as/30059589/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30059589",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30059589/ws-services-calculation/WCBillingSlab.json b/data/as/30059589/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f894deb381
--- /dev/null
+++ b/data/as/30059589/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30059589",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060114/BillingService/BusinessService.json b/data/as/30060114/BillingService/BusinessService.json
new file mode 100644
index 0000000000..15aed3caa2
--- /dev/null
+++ b/data/as/30060114/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060114",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060114/egov-location/boundary-data.json b/data/as/30060114/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f041b85f5b
--- /dev/null
+++ b/data/as/30060114/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060114",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROJAN NO.3 PWSS (NEW)",
+                "localname": "GAROJAN NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROJAN NO.3 PWSS (NEW)",
+                        "localname": "GAROJAN NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROJAN NO.3 PWSS (NEW)",
+                "localname": "GAROJAN NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROJAN NO.3 PWSS (NEW)",
+                        "localname": "GAROJAN NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060114/ws-services-calculation/Penalty.json b/data/as/30060114/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..49237ac38d
--- /dev/null
+++ b/data/as/30060114/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060114",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060114/ws-services-calculation/WCBillingSlab.json b/data/as/30060114/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5eec2cad95
--- /dev/null
+++ b/data/as/30060114/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060114",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060116/BillingService/BusinessService.json b/data/as/30060116/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42b823ea2a
--- /dev/null
+++ b/data/as/30060116/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060116",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060116/egov-location/boundary-data.json b/data/as/30060116/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b7b399532
--- /dev/null
+++ b/data/as/30060116/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060116",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRI PT-I PWSS (NEW)",
+                "localname": "SIGRI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRI PT-I PWSS (NEW)",
+                        "localname": "SIGRI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRI PT-I PWSS (NEW)",
+                "localname": "SIGRI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRI PT-I PWSS (NEW)",
+                        "localname": "SIGRI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060116/ws-services-calculation/Penalty.json b/data/as/30060116/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..057198d8e2
--- /dev/null
+++ b/data/as/30060116/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060116",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060116/ws-services-calculation/WCBillingSlab.json b/data/as/30060116/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9628f9a65e
--- /dev/null
+++ b/data/as/30060116/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060116",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060146/BillingService/BusinessService.json b/data/as/30060146/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0138f3b93b
--- /dev/null
+++ b/data/as/30060146/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060146",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060146/egov-location/boundary-data.json b/data/as/30060146/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4644011332
--- /dev/null
+++ b/data/as/30060146/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060146",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUNGAON PWSS (NEW)",
+                "localname": "NATUNGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUNGAON PWSS (NEW)",
+                        "localname": "NATUNGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUNGAON PWSS (NEW)",
+                "localname": "NATUNGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUNGAON PWSS (NEW)",
+                        "localname": "NATUNGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060146/ws-services-calculation/Penalty.json b/data/as/30060146/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d6bdfc5073
--- /dev/null
+++ b/data/as/30060146/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060146",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060146/ws-services-calculation/WCBillingSlab.json b/data/as/30060146/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7b54a22255
--- /dev/null
+++ b/data/as/30060146/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060146",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060151/BillingService/BusinessService.json b/data/as/30060151/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6bbbf754b0
--- /dev/null
+++ b/data/as/30060151/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060151",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060151/egov-location/boundary-data.json b/data/as/30060151/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ac2a989e6
--- /dev/null
+++ b/data/as/30060151/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060151",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SATSIAKHAMAR PWSS (NEW)",
+                "localname": "SATSIAKHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060151",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SATSIAKHAMAR PWSS (NEW)",
+                        "localname": "SATSIAKHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SATSIAKHAMAR PWSS (NEW)",
+                "localname": "SATSIAKHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060151",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SATSIAKHAMAR PWSS (NEW)",
+                        "localname": "SATSIAKHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060151/ws-services-calculation/Penalty.json b/data/as/30060151/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5e66f12949
--- /dev/null
+++ b/data/as/30060151/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060151",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060151/ws-services-calculation/WCBillingSlab.json b/data/as/30060151/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f07efb1a8c
--- /dev/null
+++ b/data/as/30060151/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060151",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060155/BillingService/BusinessService.json b/data/as/30060155/BillingService/BusinessService.json
new file mode 100644
index 0000000000..43223372d9
--- /dev/null
+++ b/data/as/30060155/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060155",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060155/egov-location/boundary-data.json b/data/as/30060155/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cdffdddf27
--- /dev/null
+++ b/data/as/30060155/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060155",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHARPARA PWSS (NEW)",
+                "localname": "JHARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060155",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHARPARA PWSS (NEW)",
+                        "localname": "JHARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHARPARA PWSS (NEW)",
+                "localname": "JHARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060155",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHARPARA PWSS (NEW)",
+                        "localname": "JHARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060155/ws-services-calculation/Penalty.json b/data/as/30060155/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32149928f8
--- /dev/null
+++ b/data/as/30060155/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060155",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060155/ws-services-calculation/WCBillingSlab.json b/data/as/30060155/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f967c61ed3
--- /dev/null
+++ b/data/as/30060155/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060155",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060169/BillingService/BusinessService.json b/data/as/30060169/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd7c170714
--- /dev/null
+++ b/data/as/30060169/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060169",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060169/egov-location/boundary-data.json b/data/as/30060169/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f627ce8be4
--- /dev/null
+++ b/data/as/30060169/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060169",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKARBHITA PWSS (NEW)",
+                "localname": "DAKARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060169",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKARBHITA PWSS (NEW)",
+                        "localname": "DAKARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKARBHITA PWSS (NEW)",
+                "localname": "DAKARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060169",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKARBHITA PWSS (NEW)",
+                        "localname": "DAKARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060169/ws-services-calculation/Penalty.json b/data/as/30060169/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ed61e6a54
--- /dev/null
+++ b/data/as/30060169/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060169",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060169/ws-services-calculation/WCBillingSlab.json b/data/as/30060169/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de6da5e54f
--- /dev/null
+++ b/data/as/30060169/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060169",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060173/BillingService/BusinessService.json b/data/as/30060173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..963cb73528
--- /dev/null
+++ b/data/as/30060173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060173/egov-location/boundary-data.json b/data/as/30060173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53a0346b19
--- /dev/null
+++ b/data/as/30060173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURAKATA PWSS (NEW)",
+                "localname": "KUKURAKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURAKATA PWSS (NEW)",
+                        "localname": "KUKURAKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURAKATA PWSS (NEW)",
+                "localname": "KUKURAKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURAKATA PWSS (NEW)",
+                        "localname": "KUKURAKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060173/ws-services-calculation/Penalty.json b/data/as/30060173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1c4287e229
--- /dev/null
+++ b/data/as/30060173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060173/ws-services-calculation/WCBillingSlab.json b/data/as/30060173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..64b46be112
--- /dev/null
+++ b/data/as/30060173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060178/BillingService/BusinessService.json b/data/as/30060178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..873c1fec62
--- /dev/null
+++ b/data/as/30060178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060178/egov-location/boundary-data.json b/data/as/30060178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6d7289c07
--- /dev/null
+++ b/data/as/30060178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANASPARA SALAKURA PWSS (NEW)",
+                "localname": "MANASPARA SALAKURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANASPARA SALAKURA PWSS (NEW)",
+                        "localname": "MANASPARA SALAKURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANASPARA SALAKURA PWSS (NEW)",
+                "localname": "MANASPARA SALAKURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANASPARA SALAKURA PWSS (NEW)",
+                        "localname": "MANASPARA SALAKURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060178/ws-services-calculation/Penalty.json b/data/as/30060178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..865824615e
--- /dev/null
+++ b/data/as/30060178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060178/ws-services-calculation/WCBillingSlab.json b/data/as/30060178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5faff3d5bf
--- /dev/null
+++ b/data/as/30060178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060179/BillingService/BusinessService.json b/data/as/30060179/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfc1cd399b
--- /dev/null
+++ b/data/as/30060179/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060179",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060179/egov-location/boundary-data.json b/data/as/30060179/egov-location/boundary-data.json
new file mode 100644
index 0000000000..349f9bfd49
--- /dev/null
+++ b/data/as/30060179/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060179",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDUCHAR MILANPUR PWSS (NEW)",
+                "localname": "BUDUCHAR MILANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDUCHAR MILANPUR PWSS (NEW)",
+                        "localname": "BUDUCHAR MILANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDUCHAR MILANPUR PWSS (NEW)",
+                "localname": "BUDUCHAR MILANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDUCHAR MILANPUR PWSS (NEW)",
+                        "localname": "BUDUCHAR MILANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060179/ws-services-calculation/Penalty.json b/data/as/30060179/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..81d08a5b32
--- /dev/null
+++ b/data/as/30060179/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060179",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060179/ws-services-calculation/WCBillingSlab.json b/data/as/30060179/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb0138b6e9
--- /dev/null
+++ b/data/as/30060179/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060179",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060206/BillingService/BusinessService.json b/data/as/30060206/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4bdb8703da
--- /dev/null
+++ b/data/as/30060206/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060206",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060206/egov-location/boundary-data.json b/data/as/30060206/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd9126b013
--- /dev/null
+++ b/data/as/30060206/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060206",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                "localname": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                        "localname": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                "localname": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                        "localname": "SAGRADHORA JALUAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060206/ws-services-calculation/Penalty.json b/data/as/30060206/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a318c4d2ea
--- /dev/null
+++ b/data/as/30060206/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060206",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060206/ws-services-calculation/WCBillingSlab.json b/data/as/30060206/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..77503617f0
--- /dev/null
+++ b/data/as/30060206/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060206",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060256/BillingService/BusinessService.json b/data/as/30060256/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a1fc08672
--- /dev/null
+++ b/data/as/30060256/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060256",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060256/egov-location/boundary-data.json b/data/as/30060256/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9fe2d73e3e
--- /dev/null
+++ b/data/as/30060256/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060256",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARHANA PATHAR PWSS",
+                "localname": "KARHANA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARHANA PATHAR PWSS",
+                        "localname": "KARHANA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARHANA PATHAR PWSS",
+                "localname": "KARHANA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARHANA PATHAR PWSS",
+                        "localname": "KARHANA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060256/ws-services-calculation/Penalty.json b/data/as/30060256/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d6c1c50685
--- /dev/null
+++ b/data/as/30060256/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060256",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060256/ws-services-calculation/WCBillingSlab.json b/data/as/30060256/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10d374ac81
--- /dev/null
+++ b/data/as/30060256/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060256",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060309/BillingService/BusinessService.json b/data/as/30060309/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3409b0b899
--- /dev/null
+++ b/data/as/30060309/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060309",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060309/egov-location/boundary-data.json b/data/as/30060309/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8ab00a7980
--- /dev/null
+++ b/data/as/30060309/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060309",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOPATOLA PWSS (NEW)",
+                "localname": "CHOPATOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060309",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOPATOLA PWSS (NEW)",
+                        "localname": "CHOPATOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOPATOLA PWSS (NEW)",
+                "localname": "CHOPATOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060309",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOPATOLA PWSS (NEW)",
+                        "localname": "CHOPATOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060309/ws-services-calculation/Penalty.json b/data/as/30060309/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59fe5ff9c0
--- /dev/null
+++ b/data/as/30060309/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060309",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060309/ws-services-calculation/WCBillingSlab.json b/data/as/30060309/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0a7358e5b4
--- /dev/null
+++ b/data/as/30060309/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060309",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060313/BillingService/BusinessService.json b/data/as/30060313/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e09c63438
--- /dev/null
+++ b/data/as/30060313/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060313",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060313/egov-location/boundary-data.json b/data/as/30060313/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1fa2a3a267
--- /dev/null
+++ b/data/as/30060313/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060313",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHIRAJULI GAON PWSS",
+                "localname": "CHIRAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060313",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHIRAJULI GAON PWSS",
+                        "localname": "CHIRAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHIRAJULI GAON PWSS",
+                "localname": "CHIRAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060313",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHIRAJULI GAON PWSS",
+                        "localname": "CHIRAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060313/ws-services-calculation/Penalty.json b/data/as/30060313/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2cad7d8c96
--- /dev/null
+++ b/data/as/30060313/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060313",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060313/ws-services-calculation/WCBillingSlab.json b/data/as/30060313/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c8f21f316e
--- /dev/null
+++ b/data/as/30060313/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060313",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060518/BillingService/BusinessService.json b/data/as/30060518/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1aa927a8a5
--- /dev/null
+++ b/data/as/30060518/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060518",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060518/egov-location/boundary-data.json b/data/as/30060518/egov-location/boundary-data.json
new file mode 100644
index 0000000000..051005538d
--- /dev/null
+++ b/data/as/30060518/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060518",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                "localname": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                "localname": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060518/ws-services-calculation/Penalty.json b/data/as/30060518/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad8171be9c
--- /dev/null
+++ b/data/as/30060518/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060518",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060518/ws-services-calculation/WCBillingSlab.json b/data/as/30060518/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c954ee8864
--- /dev/null
+++ b/data/as/30060518/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060518",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060621/BillingService/BusinessService.json b/data/as/30060621/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a0c69fe6c
--- /dev/null
+++ b/data/as/30060621/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060621",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060621/egov-location/boundary-data.json b/data/as/30060621/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6504851a49
--- /dev/null
+++ b/data/as/30060621/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060621",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATALAPAM PWSS",
+                "localname": "BATALAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060621",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATALAPAM PWSS",
+                        "localname": "BATALAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATALAPAM PWSS",
+                "localname": "BATALAPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060621",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATALAPAM PWSS",
+                        "localname": "BATALAPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060621/ws-services-calculation/Penalty.json b/data/as/30060621/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee9c16088a
--- /dev/null
+++ b/data/as/30060621/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060621",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060621/ws-services-calculation/WCBillingSlab.json b/data/as/30060621/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5046600575
--- /dev/null
+++ b/data/as/30060621/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060621",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From 425a8cb6d7670f852157d3aeee31d72f972fe0c7 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:40:03 +0530
Subject: [PATCH 05/23] added 400 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060637/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060647/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060667/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060692/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060709/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060718/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060740/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060825/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060872/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060887/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060892/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060893/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060898/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060901/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30060910/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30061011/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30061020/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30061025/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30062203/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30062205/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30062312/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30062320/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30062583/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063118/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063119/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063143/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063149/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063152/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063223/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063228/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063239/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063240/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063285/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063294/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063300/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30063426/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30064069/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30064490/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30064646/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30064830/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30065052/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30065285/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30065673/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30065681/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30065865/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30065876/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30066198/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30066211/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30066318/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30066345/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067036/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067040/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067065/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067067/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067084/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067086/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067101/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067113/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067122/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067179/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067304/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067307/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067308/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067407/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067418/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067441/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067449/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067468/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067475/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067509/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067518/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067536/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067611/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067623/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067699/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067707/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067709/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067714/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067748/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067790/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067803/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067829/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067830/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067861/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067915/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067928/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067938/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067942/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067950/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067958/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067962/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067985/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30067989/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068077/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068088/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068096/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068187/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068194/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068198/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068210/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068218/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068225/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068229/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068331/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068340/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068345/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068356/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068380/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068419/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068422/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068427/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068428/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068533/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068606/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068609/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068614/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068620/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068648/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068650/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068669/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30068672/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069086/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069093/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069124/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069136/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069142/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069148/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069157/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069165/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069183/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069223/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069230/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069261/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069267/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069282/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069283/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069284/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069296/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069733/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069738/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069742/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30069820/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070165/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070166/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070207/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070230/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070236/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070239/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070243/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070267/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070269/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070276/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070288/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070302/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070309/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070314/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070342/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070344/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070346/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070350/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070357/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070365/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070375/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070386/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070406/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070419/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070464/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070470/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070477/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070483/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070590/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070600/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070606/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070609/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070611/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070613/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070620/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30070802/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071063/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071098/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071129/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071139/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071148/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071202/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071208/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071569/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071579/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071722/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071743/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071758/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071787/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071801/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071806/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071827/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071830/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30071861/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072127/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072402/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072569/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072574/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072592/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072599/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072650/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072651/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072655/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072656/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072662/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072834/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072841/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072843/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072845/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072880/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072900/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072901/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30072996/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073350/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073352/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073354/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073356/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073357/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073473/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073477/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073481/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073483/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073485/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073492/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30073521/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074179/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074189/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074675/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074706/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074732/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074827/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074916/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074975/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074989/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30074995/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075002/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075008/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075655/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075682/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075685/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075704/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075708/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075836/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075842/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30075998/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076178/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076404/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076417/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076423/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076442/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076501/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076546/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076588/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076595/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30076911/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077015/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077065/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077169/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077173/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077183/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077189/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077362/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077383/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077387/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077405/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077516/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077531/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077533/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30077538/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30078496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30078499/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30079129/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30079143/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30079150/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30079745/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30079783/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30080314/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30080792/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30080805/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30080812/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30081191/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30081194/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30081197/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30081199/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30081237/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30082029/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30082892/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30083052/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30083450/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30090984/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30091027/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30091086/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30091137/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30091277/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30091350/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30092981/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30093053/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30093085/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30093111/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096216/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096276/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096403/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096485/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096579/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096711/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30096898/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30097297/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30105174/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30105196/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30105223/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30113305/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30113852/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30115191/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30115208/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30115249/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30115981/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30116153/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30116490/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30116536/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30117305/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30117521/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30117549/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30117565/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30117571/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30119702/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30125919/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30125926/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30125970/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30125974/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30125980/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126191/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126197/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126217/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126233/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126239/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126308/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126312/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126316/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126334/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126487/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126500/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126582/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30126590/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30127284/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30127356/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30127370/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30127414/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30128175/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30128194/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30128549/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30128554/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30128895/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30128902/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30129324/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30129329/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30129382/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30129385/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30129475/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30129479/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30130374/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30130381/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30130399/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30130411/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30130420/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30130435/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132498/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132532/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132548/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132559/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132588/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132620/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132648/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132661/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30132799/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30137902/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30137931/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30137946/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30137988/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30138003/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30138012/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30138032/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30139203/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30139213/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140232/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140242/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140254/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140608/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140613/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140620/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30140642/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30141038/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30141193/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30141195/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143283/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143295/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143305/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 1600 files changed, 136800 insertions(+)
 create mode 100644 data/as/30060637/BillingService/BusinessService.json
 create mode 100644 data/as/30060637/egov-location/boundary-data.json
 create mode 100644 data/as/30060637/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060637/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060647/BillingService/BusinessService.json
 create mode 100644 data/as/30060647/egov-location/boundary-data.json
 create mode 100644 data/as/30060647/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060647/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060667/BillingService/BusinessService.json
 create mode 100644 data/as/30060667/egov-location/boundary-data.json
 create mode 100644 data/as/30060667/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060667/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060692/BillingService/BusinessService.json
 create mode 100644 data/as/30060692/egov-location/boundary-data.json
 create mode 100644 data/as/30060692/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060692/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060709/BillingService/BusinessService.json
 create mode 100644 data/as/30060709/egov-location/boundary-data.json
 create mode 100644 data/as/30060709/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060709/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060718/BillingService/BusinessService.json
 create mode 100644 data/as/30060718/egov-location/boundary-data.json
 create mode 100644 data/as/30060718/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060718/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060740/BillingService/BusinessService.json
 create mode 100644 data/as/30060740/egov-location/boundary-data.json
 create mode 100644 data/as/30060740/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060740/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060825/BillingService/BusinessService.json
 create mode 100644 data/as/30060825/egov-location/boundary-data.json
 create mode 100644 data/as/30060825/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060825/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060872/BillingService/BusinessService.json
 create mode 100644 data/as/30060872/egov-location/boundary-data.json
 create mode 100644 data/as/30060872/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060872/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060887/BillingService/BusinessService.json
 create mode 100644 data/as/30060887/egov-location/boundary-data.json
 create mode 100644 data/as/30060887/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060887/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060892/BillingService/BusinessService.json
 create mode 100644 data/as/30060892/egov-location/boundary-data.json
 create mode 100644 data/as/30060892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060892/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060893/BillingService/BusinessService.json
 create mode 100644 data/as/30060893/egov-location/boundary-data.json
 create mode 100644 data/as/30060893/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060893/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060898/BillingService/BusinessService.json
 create mode 100644 data/as/30060898/egov-location/boundary-data.json
 create mode 100644 data/as/30060898/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060898/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060901/BillingService/BusinessService.json
 create mode 100644 data/as/30060901/egov-location/boundary-data.json
 create mode 100644 data/as/30060901/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060901/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30060910/BillingService/BusinessService.json
 create mode 100644 data/as/30060910/egov-location/boundary-data.json
 create mode 100644 data/as/30060910/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30060910/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30061011/BillingService/BusinessService.json
 create mode 100644 data/as/30061011/egov-location/boundary-data.json
 create mode 100644 data/as/30061011/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30061011/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30061020/BillingService/BusinessService.json
 create mode 100644 data/as/30061020/egov-location/boundary-data.json
 create mode 100644 data/as/30061020/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30061020/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30061025/BillingService/BusinessService.json
 create mode 100644 data/as/30061025/egov-location/boundary-data.json
 create mode 100644 data/as/30061025/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30061025/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30062203/BillingService/BusinessService.json
 create mode 100644 data/as/30062203/egov-location/boundary-data.json
 create mode 100644 data/as/30062203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30062203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30062205/BillingService/BusinessService.json
 create mode 100644 data/as/30062205/egov-location/boundary-data.json
 create mode 100644 data/as/30062205/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30062205/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30062312/BillingService/BusinessService.json
 create mode 100644 data/as/30062312/egov-location/boundary-data.json
 create mode 100644 data/as/30062312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30062312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30062320/BillingService/BusinessService.json
 create mode 100644 data/as/30062320/egov-location/boundary-data.json
 create mode 100644 data/as/30062320/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30062320/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30062583/BillingService/BusinessService.json
 create mode 100644 data/as/30062583/egov-location/boundary-data.json
 create mode 100644 data/as/30062583/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30062583/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063118/BillingService/BusinessService.json
 create mode 100644 data/as/30063118/egov-location/boundary-data.json
 create mode 100644 data/as/30063118/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063118/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063119/BillingService/BusinessService.json
 create mode 100644 data/as/30063119/egov-location/boundary-data.json
 create mode 100644 data/as/30063119/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063119/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063143/BillingService/BusinessService.json
 create mode 100644 data/as/30063143/egov-location/boundary-data.json
 create mode 100644 data/as/30063143/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063143/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063149/BillingService/BusinessService.json
 create mode 100644 data/as/30063149/egov-location/boundary-data.json
 create mode 100644 data/as/30063149/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063149/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063152/BillingService/BusinessService.json
 create mode 100644 data/as/30063152/egov-location/boundary-data.json
 create mode 100644 data/as/30063152/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063152/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063223/BillingService/BusinessService.json
 create mode 100644 data/as/30063223/egov-location/boundary-data.json
 create mode 100644 data/as/30063223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063228/BillingService/BusinessService.json
 create mode 100644 data/as/30063228/egov-location/boundary-data.json
 create mode 100644 data/as/30063228/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063228/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063239/BillingService/BusinessService.json
 create mode 100644 data/as/30063239/egov-location/boundary-data.json
 create mode 100644 data/as/30063239/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063239/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063240/BillingService/BusinessService.json
 create mode 100644 data/as/30063240/egov-location/boundary-data.json
 create mode 100644 data/as/30063240/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063240/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063285/BillingService/BusinessService.json
 create mode 100644 data/as/30063285/egov-location/boundary-data.json
 create mode 100644 data/as/30063285/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063285/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063294/BillingService/BusinessService.json
 create mode 100644 data/as/30063294/egov-location/boundary-data.json
 create mode 100644 data/as/30063294/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063294/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063300/BillingService/BusinessService.json
 create mode 100644 data/as/30063300/egov-location/boundary-data.json
 create mode 100644 data/as/30063300/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063300/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30063426/BillingService/BusinessService.json
 create mode 100644 data/as/30063426/egov-location/boundary-data.json
 create mode 100644 data/as/30063426/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30063426/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30064069/BillingService/BusinessService.json
 create mode 100644 data/as/30064069/egov-location/boundary-data.json
 create mode 100644 data/as/30064069/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30064069/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30064490/BillingService/BusinessService.json
 create mode 100644 data/as/30064490/egov-location/boundary-data.json
 create mode 100644 data/as/30064490/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30064490/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30064646/BillingService/BusinessService.json
 create mode 100644 data/as/30064646/egov-location/boundary-data.json
 create mode 100644 data/as/30064646/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30064646/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30064830/BillingService/BusinessService.json
 create mode 100644 data/as/30064830/egov-location/boundary-data.json
 create mode 100644 data/as/30064830/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30064830/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30065052/BillingService/BusinessService.json
 create mode 100644 data/as/30065052/egov-location/boundary-data.json
 create mode 100644 data/as/30065052/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30065052/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30065285/BillingService/BusinessService.json
 create mode 100644 data/as/30065285/egov-location/boundary-data.json
 create mode 100644 data/as/30065285/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30065285/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30065673/BillingService/BusinessService.json
 create mode 100644 data/as/30065673/egov-location/boundary-data.json
 create mode 100644 data/as/30065673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30065673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30065681/BillingService/BusinessService.json
 create mode 100644 data/as/30065681/egov-location/boundary-data.json
 create mode 100644 data/as/30065681/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30065681/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30065865/BillingService/BusinessService.json
 create mode 100644 data/as/30065865/egov-location/boundary-data.json
 create mode 100644 data/as/30065865/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30065865/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30065876/BillingService/BusinessService.json
 create mode 100644 data/as/30065876/egov-location/boundary-data.json
 create mode 100644 data/as/30065876/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30065876/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30066198/BillingService/BusinessService.json
 create mode 100644 data/as/30066198/egov-location/boundary-data.json
 create mode 100644 data/as/30066198/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30066198/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30066211/BillingService/BusinessService.json
 create mode 100644 data/as/30066211/egov-location/boundary-data.json
 create mode 100644 data/as/30066211/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30066211/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30066318/BillingService/BusinessService.json
 create mode 100644 data/as/30066318/egov-location/boundary-data.json
 create mode 100644 data/as/30066318/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30066318/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30066345/BillingService/BusinessService.json
 create mode 100644 data/as/30066345/egov-location/boundary-data.json
 create mode 100644 data/as/30066345/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30066345/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067036/BillingService/BusinessService.json
 create mode 100644 data/as/30067036/egov-location/boundary-data.json
 create mode 100644 data/as/30067036/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067036/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067040/BillingService/BusinessService.json
 create mode 100644 data/as/30067040/egov-location/boundary-data.json
 create mode 100644 data/as/30067040/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067040/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067065/BillingService/BusinessService.json
 create mode 100644 data/as/30067065/egov-location/boundary-data.json
 create mode 100644 data/as/30067065/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067065/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067067/BillingService/BusinessService.json
 create mode 100644 data/as/30067067/egov-location/boundary-data.json
 create mode 100644 data/as/30067067/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067067/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067084/BillingService/BusinessService.json
 create mode 100644 data/as/30067084/egov-location/boundary-data.json
 create mode 100644 data/as/30067084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067086/BillingService/BusinessService.json
 create mode 100644 data/as/30067086/egov-location/boundary-data.json
 create mode 100644 data/as/30067086/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067086/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067101/BillingService/BusinessService.json
 create mode 100644 data/as/30067101/egov-location/boundary-data.json
 create mode 100644 data/as/30067101/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067101/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067113/BillingService/BusinessService.json
 create mode 100644 data/as/30067113/egov-location/boundary-data.json
 create mode 100644 data/as/30067113/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067113/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067122/BillingService/BusinessService.json
 create mode 100644 data/as/30067122/egov-location/boundary-data.json
 create mode 100644 data/as/30067122/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067122/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067179/BillingService/BusinessService.json
 create mode 100644 data/as/30067179/egov-location/boundary-data.json
 create mode 100644 data/as/30067179/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067179/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067304/BillingService/BusinessService.json
 create mode 100644 data/as/30067304/egov-location/boundary-data.json
 create mode 100644 data/as/30067304/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067304/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067307/BillingService/BusinessService.json
 create mode 100644 data/as/30067307/egov-location/boundary-data.json
 create mode 100644 data/as/30067307/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067307/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067308/BillingService/BusinessService.json
 create mode 100644 data/as/30067308/egov-location/boundary-data.json
 create mode 100644 data/as/30067308/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067308/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067407/BillingService/BusinessService.json
 create mode 100644 data/as/30067407/egov-location/boundary-data.json
 create mode 100644 data/as/30067407/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067407/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067418/BillingService/BusinessService.json
 create mode 100644 data/as/30067418/egov-location/boundary-data.json
 create mode 100644 data/as/30067418/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067418/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067441/BillingService/BusinessService.json
 create mode 100644 data/as/30067441/egov-location/boundary-data.json
 create mode 100644 data/as/30067441/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067441/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067449/BillingService/BusinessService.json
 create mode 100644 data/as/30067449/egov-location/boundary-data.json
 create mode 100644 data/as/30067449/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067449/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067468/BillingService/BusinessService.json
 create mode 100644 data/as/30067468/egov-location/boundary-data.json
 create mode 100644 data/as/30067468/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067468/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067475/BillingService/BusinessService.json
 create mode 100644 data/as/30067475/egov-location/boundary-data.json
 create mode 100644 data/as/30067475/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067475/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067509/BillingService/BusinessService.json
 create mode 100644 data/as/30067509/egov-location/boundary-data.json
 create mode 100644 data/as/30067509/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067509/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067518/BillingService/BusinessService.json
 create mode 100644 data/as/30067518/egov-location/boundary-data.json
 create mode 100644 data/as/30067518/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067518/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067536/BillingService/BusinessService.json
 create mode 100644 data/as/30067536/egov-location/boundary-data.json
 create mode 100644 data/as/30067536/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067536/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067611/BillingService/BusinessService.json
 create mode 100644 data/as/30067611/egov-location/boundary-data.json
 create mode 100644 data/as/30067611/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067611/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067623/BillingService/BusinessService.json
 create mode 100644 data/as/30067623/egov-location/boundary-data.json
 create mode 100644 data/as/30067623/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067623/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067699/BillingService/BusinessService.json
 create mode 100644 data/as/30067699/egov-location/boundary-data.json
 create mode 100644 data/as/30067699/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067699/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067707/BillingService/BusinessService.json
 create mode 100644 data/as/30067707/egov-location/boundary-data.json
 create mode 100644 data/as/30067707/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067707/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067709/BillingService/BusinessService.json
 create mode 100644 data/as/30067709/egov-location/boundary-data.json
 create mode 100644 data/as/30067709/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067709/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067714/BillingService/BusinessService.json
 create mode 100644 data/as/30067714/egov-location/boundary-data.json
 create mode 100644 data/as/30067714/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067714/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067748/BillingService/BusinessService.json
 create mode 100644 data/as/30067748/egov-location/boundary-data.json
 create mode 100644 data/as/30067748/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067748/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067790/BillingService/BusinessService.json
 create mode 100644 data/as/30067790/egov-location/boundary-data.json
 create mode 100644 data/as/30067790/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067790/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067803/BillingService/BusinessService.json
 create mode 100644 data/as/30067803/egov-location/boundary-data.json
 create mode 100644 data/as/30067803/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067803/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067829/BillingService/BusinessService.json
 create mode 100644 data/as/30067829/egov-location/boundary-data.json
 create mode 100644 data/as/30067829/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067829/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067830/BillingService/BusinessService.json
 create mode 100644 data/as/30067830/egov-location/boundary-data.json
 create mode 100644 data/as/30067830/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067830/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067861/BillingService/BusinessService.json
 create mode 100644 data/as/30067861/egov-location/boundary-data.json
 create mode 100644 data/as/30067861/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067861/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067915/BillingService/BusinessService.json
 create mode 100644 data/as/30067915/egov-location/boundary-data.json
 create mode 100644 data/as/30067915/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067915/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067928/BillingService/BusinessService.json
 create mode 100644 data/as/30067928/egov-location/boundary-data.json
 create mode 100644 data/as/30067928/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067928/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067938/BillingService/BusinessService.json
 create mode 100644 data/as/30067938/egov-location/boundary-data.json
 create mode 100644 data/as/30067938/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067938/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067942/BillingService/BusinessService.json
 create mode 100644 data/as/30067942/egov-location/boundary-data.json
 create mode 100644 data/as/30067942/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067942/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067950/BillingService/BusinessService.json
 create mode 100644 data/as/30067950/egov-location/boundary-data.json
 create mode 100644 data/as/30067950/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067950/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067958/BillingService/BusinessService.json
 create mode 100644 data/as/30067958/egov-location/boundary-data.json
 create mode 100644 data/as/30067958/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067958/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067962/BillingService/BusinessService.json
 create mode 100644 data/as/30067962/egov-location/boundary-data.json
 create mode 100644 data/as/30067962/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067962/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067985/BillingService/BusinessService.json
 create mode 100644 data/as/30067985/egov-location/boundary-data.json
 create mode 100644 data/as/30067985/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067985/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30067989/BillingService/BusinessService.json
 create mode 100644 data/as/30067989/egov-location/boundary-data.json
 create mode 100644 data/as/30067989/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30067989/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068077/BillingService/BusinessService.json
 create mode 100644 data/as/30068077/egov-location/boundary-data.json
 create mode 100644 data/as/30068077/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068077/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068088/BillingService/BusinessService.json
 create mode 100644 data/as/30068088/egov-location/boundary-data.json
 create mode 100644 data/as/30068088/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068088/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068096/BillingService/BusinessService.json
 create mode 100644 data/as/30068096/egov-location/boundary-data.json
 create mode 100644 data/as/30068096/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068096/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068187/BillingService/BusinessService.json
 create mode 100644 data/as/30068187/egov-location/boundary-data.json
 create mode 100644 data/as/30068187/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068187/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068194/BillingService/BusinessService.json
 create mode 100644 data/as/30068194/egov-location/boundary-data.json
 create mode 100644 data/as/30068194/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068194/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068198/BillingService/BusinessService.json
 create mode 100644 data/as/30068198/egov-location/boundary-data.json
 create mode 100644 data/as/30068198/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068198/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068210/BillingService/BusinessService.json
 create mode 100644 data/as/30068210/egov-location/boundary-data.json
 create mode 100644 data/as/30068210/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068210/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068218/BillingService/BusinessService.json
 create mode 100644 data/as/30068218/egov-location/boundary-data.json
 create mode 100644 data/as/30068218/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068218/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068225/BillingService/BusinessService.json
 create mode 100644 data/as/30068225/egov-location/boundary-data.json
 create mode 100644 data/as/30068225/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068225/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068229/BillingService/BusinessService.json
 create mode 100644 data/as/30068229/egov-location/boundary-data.json
 create mode 100644 data/as/30068229/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068229/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068331/BillingService/BusinessService.json
 create mode 100644 data/as/30068331/egov-location/boundary-data.json
 create mode 100644 data/as/30068331/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068331/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068340/BillingService/BusinessService.json
 create mode 100644 data/as/30068340/egov-location/boundary-data.json
 create mode 100644 data/as/30068340/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068340/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068345/BillingService/BusinessService.json
 create mode 100644 data/as/30068345/egov-location/boundary-data.json
 create mode 100644 data/as/30068345/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068345/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068356/BillingService/BusinessService.json
 create mode 100644 data/as/30068356/egov-location/boundary-data.json
 create mode 100644 data/as/30068356/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068356/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068380/BillingService/BusinessService.json
 create mode 100644 data/as/30068380/egov-location/boundary-data.json
 create mode 100644 data/as/30068380/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068380/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068419/BillingService/BusinessService.json
 create mode 100644 data/as/30068419/egov-location/boundary-data.json
 create mode 100644 data/as/30068419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068422/BillingService/BusinessService.json
 create mode 100644 data/as/30068422/egov-location/boundary-data.json
 create mode 100644 data/as/30068422/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068422/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068427/BillingService/BusinessService.json
 create mode 100644 data/as/30068427/egov-location/boundary-data.json
 create mode 100644 data/as/30068427/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068427/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068428/BillingService/BusinessService.json
 create mode 100644 data/as/30068428/egov-location/boundary-data.json
 create mode 100644 data/as/30068428/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068428/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068533/BillingService/BusinessService.json
 create mode 100644 data/as/30068533/egov-location/boundary-data.json
 create mode 100644 data/as/30068533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068606/BillingService/BusinessService.json
 create mode 100644 data/as/30068606/egov-location/boundary-data.json
 create mode 100644 data/as/30068606/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068606/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068609/BillingService/BusinessService.json
 create mode 100644 data/as/30068609/egov-location/boundary-data.json
 create mode 100644 data/as/30068609/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068609/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068614/BillingService/BusinessService.json
 create mode 100644 data/as/30068614/egov-location/boundary-data.json
 create mode 100644 data/as/30068614/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068614/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068620/BillingService/BusinessService.json
 create mode 100644 data/as/30068620/egov-location/boundary-data.json
 create mode 100644 data/as/30068620/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068620/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068648/BillingService/BusinessService.json
 create mode 100644 data/as/30068648/egov-location/boundary-data.json
 create mode 100644 data/as/30068648/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068648/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068650/BillingService/BusinessService.json
 create mode 100644 data/as/30068650/egov-location/boundary-data.json
 create mode 100644 data/as/30068650/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068650/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068669/BillingService/BusinessService.json
 create mode 100644 data/as/30068669/egov-location/boundary-data.json
 create mode 100644 data/as/30068669/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068669/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30068672/BillingService/BusinessService.json
 create mode 100644 data/as/30068672/egov-location/boundary-data.json
 create mode 100644 data/as/30068672/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30068672/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069086/BillingService/BusinessService.json
 create mode 100644 data/as/30069086/egov-location/boundary-data.json
 create mode 100644 data/as/30069086/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069086/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069093/BillingService/BusinessService.json
 create mode 100644 data/as/30069093/egov-location/boundary-data.json
 create mode 100644 data/as/30069093/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069093/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069124/BillingService/BusinessService.json
 create mode 100644 data/as/30069124/egov-location/boundary-data.json
 create mode 100644 data/as/30069124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069136/BillingService/BusinessService.json
 create mode 100644 data/as/30069136/egov-location/boundary-data.json
 create mode 100644 data/as/30069136/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069136/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069142/BillingService/BusinessService.json
 create mode 100644 data/as/30069142/egov-location/boundary-data.json
 create mode 100644 data/as/30069142/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069142/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069148/BillingService/BusinessService.json
 create mode 100644 data/as/30069148/egov-location/boundary-data.json
 create mode 100644 data/as/30069148/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069148/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069157/BillingService/BusinessService.json
 create mode 100644 data/as/30069157/egov-location/boundary-data.json
 create mode 100644 data/as/30069157/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069157/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069165/BillingService/BusinessService.json
 create mode 100644 data/as/30069165/egov-location/boundary-data.json
 create mode 100644 data/as/30069165/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069165/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069183/BillingService/BusinessService.json
 create mode 100644 data/as/30069183/egov-location/boundary-data.json
 create mode 100644 data/as/30069183/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069183/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069223/BillingService/BusinessService.json
 create mode 100644 data/as/30069223/egov-location/boundary-data.json
 create mode 100644 data/as/30069223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069230/BillingService/BusinessService.json
 create mode 100644 data/as/30069230/egov-location/boundary-data.json
 create mode 100644 data/as/30069230/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069230/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069261/BillingService/BusinessService.json
 create mode 100644 data/as/30069261/egov-location/boundary-data.json
 create mode 100644 data/as/30069261/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069261/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069267/BillingService/BusinessService.json
 create mode 100644 data/as/30069267/egov-location/boundary-data.json
 create mode 100644 data/as/30069267/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069267/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069282/BillingService/BusinessService.json
 create mode 100644 data/as/30069282/egov-location/boundary-data.json
 create mode 100644 data/as/30069282/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069282/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069283/BillingService/BusinessService.json
 create mode 100644 data/as/30069283/egov-location/boundary-data.json
 create mode 100644 data/as/30069283/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069283/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069284/BillingService/BusinessService.json
 create mode 100644 data/as/30069284/egov-location/boundary-data.json
 create mode 100644 data/as/30069284/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069284/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069296/BillingService/BusinessService.json
 create mode 100644 data/as/30069296/egov-location/boundary-data.json
 create mode 100644 data/as/30069296/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069296/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069733/BillingService/BusinessService.json
 create mode 100644 data/as/30069733/egov-location/boundary-data.json
 create mode 100644 data/as/30069733/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069733/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069738/BillingService/BusinessService.json
 create mode 100644 data/as/30069738/egov-location/boundary-data.json
 create mode 100644 data/as/30069738/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069738/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069742/BillingService/BusinessService.json
 create mode 100644 data/as/30069742/egov-location/boundary-data.json
 create mode 100644 data/as/30069742/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069742/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30069820/BillingService/BusinessService.json
 create mode 100644 data/as/30069820/egov-location/boundary-data.json
 create mode 100644 data/as/30069820/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30069820/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070165/BillingService/BusinessService.json
 create mode 100644 data/as/30070165/egov-location/boundary-data.json
 create mode 100644 data/as/30070165/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070165/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070166/BillingService/BusinessService.json
 create mode 100644 data/as/30070166/egov-location/boundary-data.json
 create mode 100644 data/as/30070166/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070166/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070207/BillingService/BusinessService.json
 create mode 100644 data/as/30070207/egov-location/boundary-data.json
 create mode 100644 data/as/30070207/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070207/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070230/BillingService/BusinessService.json
 create mode 100644 data/as/30070230/egov-location/boundary-data.json
 create mode 100644 data/as/30070230/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070230/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070236/BillingService/BusinessService.json
 create mode 100644 data/as/30070236/egov-location/boundary-data.json
 create mode 100644 data/as/30070236/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070236/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070239/BillingService/BusinessService.json
 create mode 100644 data/as/30070239/egov-location/boundary-data.json
 create mode 100644 data/as/30070239/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070239/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070243/BillingService/BusinessService.json
 create mode 100644 data/as/30070243/egov-location/boundary-data.json
 create mode 100644 data/as/30070243/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070243/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070267/BillingService/BusinessService.json
 create mode 100644 data/as/30070267/egov-location/boundary-data.json
 create mode 100644 data/as/30070267/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070267/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070269/BillingService/BusinessService.json
 create mode 100644 data/as/30070269/egov-location/boundary-data.json
 create mode 100644 data/as/30070269/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070269/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070276/BillingService/BusinessService.json
 create mode 100644 data/as/30070276/egov-location/boundary-data.json
 create mode 100644 data/as/30070276/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070276/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070288/BillingService/BusinessService.json
 create mode 100644 data/as/30070288/egov-location/boundary-data.json
 create mode 100644 data/as/30070288/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070288/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070302/BillingService/BusinessService.json
 create mode 100644 data/as/30070302/egov-location/boundary-data.json
 create mode 100644 data/as/30070302/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070302/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070309/BillingService/BusinessService.json
 create mode 100644 data/as/30070309/egov-location/boundary-data.json
 create mode 100644 data/as/30070309/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070309/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070314/BillingService/BusinessService.json
 create mode 100644 data/as/30070314/egov-location/boundary-data.json
 create mode 100644 data/as/30070314/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070314/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070342/BillingService/BusinessService.json
 create mode 100644 data/as/30070342/egov-location/boundary-data.json
 create mode 100644 data/as/30070342/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070342/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070344/BillingService/BusinessService.json
 create mode 100644 data/as/30070344/egov-location/boundary-data.json
 create mode 100644 data/as/30070344/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070344/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070346/BillingService/BusinessService.json
 create mode 100644 data/as/30070346/egov-location/boundary-data.json
 create mode 100644 data/as/30070346/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070346/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070350/BillingService/BusinessService.json
 create mode 100644 data/as/30070350/egov-location/boundary-data.json
 create mode 100644 data/as/30070350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070357/BillingService/BusinessService.json
 create mode 100644 data/as/30070357/egov-location/boundary-data.json
 create mode 100644 data/as/30070357/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070357/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070365/BillingService/BusinessService.json
 create mode 100644 data/as/30070365/egov-location/boundary-data.json
 create mode 100644 data/as/30070365/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070365/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070375/BillingService/BusinessService.json
 create mode 100644 data/as/30070375/egov-location/boundary-data.json
 create mode 100644 data/as/30070375/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070375/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070386/BillingService/BusinessService.json
 create mode 100644 data/as/30070386/egov-location/boundary-data.json
 create mode 100644 data/as/30070386/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070386/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070406/BillingService/BusinessService.json
 create mode 100644 data/as/30070406/egov-location/boundary-data.json
 create mode 100644 data/as/30070406/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070406/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070419/BillingService/BusinessService.json
 create mode 100644 data/as/30070419/egov-location/boundary-data.json
 create mode 100644 data/as/30070419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070464/BillingService/BusinessService.json
 create mode 100644 data/as/30070464/egov-location/boundary-data.json
 create mode 100644 data/as/30070464/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070464/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070470/BillingService/BusinessService.json
 create mode 100644 data/as/30070470/egov-location/boundary-data.json
 create mode 100644 data/as/30070470/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070470/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070477/BillingService/BusinessService.json
 create mode 100644 data/as/30070477/egov-location/boundary-data.json
 create mode 100644 data/as/30070477/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070477/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070483/BillingService/BusinessService.json
 create mode 100644 data/as/30070483/egov-location/boundary-data.json
 create mode 100644 data/as/30070483/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070483/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070590/BillingService/BusinessService.json
 create mode 100644 data/as/30070590/egov-location/boundary-data.json
 create mode 100644 data/as/30070590/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070590/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070600/BillingService/BusinessService.json
 create mode 100644 data/as/30070600/egov-location/boundary-data.json
 create mode 100644 data/as/30070600/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070600/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070606/BillingService/BusinessService.json
 create mode 100644 data/as/30070606/egov-location/boundary-data.json
 create mode 100644 data/as/30070606/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070606/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070609/BillingService/BusinessService.json
 create mode 100644 data/as/30070609/egov-location/boundary-data.json
 create mode 100644 data/as/30070609/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070609/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070611/BillingService/BusinessService.json
 create mode 100644 data/as/30070611/egov-location/boundary-data.json
 create mode 100644 data/as/30070611/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070611/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070613/BillingService/BusinessService.json
 create mode 100644 data/as/30070613/egov-location/boundary-data.json
 create mode 100644 data/as/30070613/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070613/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070620/BillingService/BusinessService.json
 create mode 100644 data/as/30070620/egov-location/boundary-data.json
 create mode 100644 data/as/30070620/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070620/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30070802/BillingService/BusinessService.json
 create mode 100644 data/as/30070802/egov-location/boundary-data.json
 create mode 100644 data/as/30070802/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30070802/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071063/BillingService/BusinessService.json
 create mode 100644 data/as/30071063/egov-location/boundary-data.json
 create mode 100644 data/as/30071063/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071063/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071098/BillingService/BusinessService.json
 create mode 100644 data/as/30071098/egov-location/boundary-data.json
 create mode 100644 data/as/30071098/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071098/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071129/BillingService/BusinessService.json
 create mode 100644 data/as/30071129/egov-location/boundary-data.json
 create mode 100644 data/as/30071129/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071129/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071139/BillingService/BusinessService.json
 create mode 100644 data/as/30071139/egov-location/boundary-data.json
 create mode 100644 data/as/30071139/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071139/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071148/BillingService/BusinessService.json
 create mode 100644 data/as/30071148/egov-location/boundary-data.json
 create mode 100644 data/as/30071148/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071148/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071202/BillingService/BusinessService.json
 create mode 100644 data/as/30071202/egov-location/boundary-data.json
 create mode 100644 data/as/30071202/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071202/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071208/BillingService/BusinessService.json
 create mode 100644 data/as/30071208/egov-location/boundary-data.json
 create mode 100644 data/as/30071208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071569/BillingService/BusinessService.json
 create mode 100644 data/as/30071569/egov-location/boundary-data.json
 create mode 100644 data/as/30071569/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071569/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071579/BillingService/BusinessService.json
 create mode 100644 data/as/30071579/egov-location/boundary-data.json
 create mode 100644 data/as/30071579/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071579/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071722/BillingService/BusinessService.json
 create mode 100644 data/as/30071722/egov-location/boundary-data.json
 create mode 100644 data/as/30071722/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071722/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071743/BillingService/BusinessService.json
 create mode 100644 data/as/30071743/egov-location/boundary-data.json
 create mode 100644 data/as/30071743/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071743/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071758/BillingService/BusinessService.json
 create mode 100644 data/as/30071758/egov-location/boundary-data.json
 create mode 100644 data/as/30071758/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071758/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071787/BillingService/BusinessService.json
 create mode 100644 data/as/30071787/egov-location/boundary-data.json
 create mode 100644 data/as/30071787/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071787/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071801/BillingService/BusinessService.json
 create mode 100644 data/as/30071801/egov-location/boundary-data.json
 create mode 100644 data/as/30071801/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071801/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071806/BillingService/BusinessService.json
 create mode 100644 data/as/30071806/egov-location/boundary-data.json
 create mode 100644 data/as/30071806/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071806/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071827/BillingService/BusinessService.json
 create mode 100644 data/as/30071827/egov-location/boundary-data.json
 create mode 100644 data/as/30071827/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071827/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071830/BillingService/BusinessService.json
 create mode 100644 data/as/30071830/egov-location/boundary-data.json
 create mode 100644 data/as/30071830/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071830/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30071861/BillingService/BusinessService.json
 create mode 100644 data/as/30071861/egov-location/boundary-data.json
 create mode 100644 data/as/30071861/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30071861/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072127/BillingService/BusinessService.json
 create mode 100644 data/as/30072127/egov-location/boundary-data.json
 create mode 100644 data/as/30072127/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072127/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072402/BillingService/BusinessService.json
 create mode 100644 data/as/30072402/egov-location/boundary-data.json
 create mode 100644 data/as/30072402/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072402/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072569/BillingService/BusinessService.json
 create mode 100644 data/as/30072569/egov-location/boundary-data.json
 create mode 100644 data/as/30072569/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072569/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072574/BillingService/BusinessService.json
 create mode 100644 data/as/30072574/egov-location/boundary-data.json
 create mode 100644 data/as/30072574/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072574/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072592/BillingService/BusinessService.json
 create mode 100644 data/as/30072592/egov-location/boundary-data.json
 create mode 100644 data/as/30072592/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072592/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072599/BillingService/BusinessService.json
 create mode 100644 data/as/30072599/egov-location/boundary-data.json
 create mode 100644 data/as/30072599/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072599/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072650/BillingService/BusinessService.json
 create mode 100644 data/as/30072650/egov-location/boundary-data.json
 create mode 100644 data/as/30072650/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072650/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072651/BillingService/BusinessService.json
 create mode 100644 data/as/30072651/egov-location/boundary-data.json
 create mode 100644 data/as/30072651/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072651/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072655/BillingService/BusinessService.json
 create mode 100644 data/as/30072655/egov-location/boundary-data.json
 create mode 100644 data/as/30072655/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072655/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072656/BillingService/BusinessService.json
 create mode 100644 data/as/30072656/egov-location/boundary-data.json
 create mode 100644 data/as/30072656/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072656/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072662/BillingService/BusinessService.json
 create mode 100644 data/as/30072662/egov-location/boundary-data.json
 create mode 100644 data/as/30072662/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072662/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072834/BillingService/BusinessService.json
 create mode 100644 data/as/30072834/egov-location/boundary-data.json
 create mode 100644 data/as/30072834/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072834/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072841/BillingService/BusinessService.json
 create mode 100644 data/as/30072841/egov-location/boundary-data.json
 create mode 100644 data/as/30072841/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072841/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072843/BillingService/BusinessService.json
 create mode 100644 data/as/30072843/egov-location/boundary-data.json
 create mode 100644 data/as/30072843/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072843/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072845/BillingService/BusinessService.json
 create mode 100644 data/as/30072845/egov-location/boundary-data.json
 create mode 100644 data/as/30072845/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072845/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072880/BillingService/BusinessService.json
 create mode 100644 data/as/30072880/egov-location/boundary-data.json
 create mode 100644 data/as/30072880/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072880/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072900/BillingService/BusinessService.json
 create mode 100644 data/as/30072900/egov-location/boundary-data.json
 create mode 100644 data/as/30072900/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072900/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072901/BillingService/BusinessService.json
 create mode 100644 data/as/30072901/egov-location/boundary-data.json
 create mode 100644 data/as/30072901/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072901/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30072996/BillingService/BusinessService.json
 create mode 100644 data/as/30072996/egov-location/boundary-data.json
 create mode 100644 data/as/30072996/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30072996/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073350/BillingService/BusinessService.json
 create mode 100644 data/as/30073350/egov-location/boundary-data.json
 create mode 100644 data/as/30073350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073352/BillingService/BusinessService.json
 create mode 100644 data/as/30073352/egov-location/boundary-data.json
 create mode 100644 data/as/30073352/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073352/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073354/BillingService/BusinessService.json
 create mode 100644 data/as/30073354/egov-location/boundary-data.json
 create mode 100644 data/as/30073354/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073354/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073356/BillingService/BusinessService.json
 create mode 100644 data/as/30073356/egov-location/boundary-data.json
 create mode 100644 data/as/30073356/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073356/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073357/BillingService/BusinessService.json
 create mode 100644 data/as/30073357/egov-location/boundary-data.json
 create mode 100644 data/as/30073357/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073357/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073473/BillingService/BusinessService.json
 create mode 100644 data/as/30073473/egov-location/boundary-data.json
 create mode 100644 data/as/30073473/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073473/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073477/BillingService/BusinessService.json
 create mode 100644 data/as/30073477/egov-location/boundary-data.json
 create mode 100644 data/as/30073477/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073477/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073481/BillingService/BusinessService.json
 create mode 100644 data/as/30073481/egov-location/boundary-data.json
 create mode 100644 data/as/30073481/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073481/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073483/BillingService/BusinessService.json
 create mode 100644 data/as/30073483/egov-location/boundary-data.json
 create mode 100644 data/as/30073483/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073483/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073485/BillingService/BusinessService.json
 create mode 100644 data/as/30073485/egov-location/boundary-data.json
 create mode 100644 data/as/30073485/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073485/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073492/BillingService/BusinessService.json
 create mode 100644 data/as/30073492/egov-location/boundary-data.json
 create mode 100644 data/as/30073492/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073492/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30073521/BillingService/BusinessService.json
 create mode 100644 data/as/30073521/egov-location/boundary-data.json
 create mode 100644 data/as/30073521/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30073521/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074179/BillingService/BusinessService.json
 create mode 100644 data/as/30074179/egov-location/boundary-data.json
 create mode 100644 data/as/30074179/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074179/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074189/BillingService/BusinessService.json
 create mode 100644 data/as/30074189/egov-location/boundary-data.json
 create mode 100644 data/as/30074189/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074189/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074675/BillingService/BusinessService.json
 create mode 100644 data/as/30074675/egov-location/boundary-data.json
 create mode 100644 data/as/30074675/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074675/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074706/BillingService/BusinessService.json
 create mode 100644 data/as/30074706/egov-location/boundary-data.json
 create mode 100644 data/as/30074706/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074706/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074732/BillingService/BusinessService.json
 create mode 100644 data/as/30074732/egov-location/boundary-data.json
 create mode 100644 data/as/30074732/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074732/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074827/BillingService/BusinessService.json
 create mode 100644 data/as/30074827/egov-location/boundary-data.json
 create mode 100644 data/as/30074827/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074827/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074916/BillingService/BusinessService.json
 create mode 100644 data/as/30074916/egov-location/boundary-data.json
 create mode 100644 data/as/30074916/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074916/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074975/BillingService/BusinessService.json
 create mode 100644 data/as/30074975/egov-location/boundary-data.json
 create mode 100644 data/as/30074975/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074975/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074989/BillingService/BusinessService.json
 create mode 100644 data/as/30074989/egov-location/boundary-data.json
 create mode 100644 data/as/30074989/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074989/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30074995/BillingService/BusinessService.json
 create mode 100644 data/as/30074995/egov-location/boundary-data.json
 create mode 100644 data/as/30074995/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30074995/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075002/BillingService/BusinessService.json
 create mode 100644 data/as/30075002/egov-location/boundary-data.json
 create mode 100644 data/as/30075002/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075002/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075008/BillingService/BusinessService.json
 create mode 100644 data/as/30075008/egov-location/boundary-data.json
 create mode 100644 data/as/30075008/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075008/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075655/BillingService/BusinessService.json
 create mode 100644 data/as/30075655/egov-location/boundary-data.json
 create mode 100644 data/as/30075655/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075655/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075682/BillingService/BusinessService.json
 create mode 100644 data/as/30075682/egov-location/boundary-data.json
 create mode 100644 data/as/30075682/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075682/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075685/BillingService/BusinessService.json
 create mode 100644 data/as/30075685/egov-location/boundary-data.json
 create mode 100644 data/as/30075685/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075685/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075704/BillingService/BusinessService.json
 create mode 100644 data/as/30075704/egov-location/boundary-data.json
 create mode 100644 data/as/30075704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075708/BillingService/BusinessService.json
 create mode 100644 data/as/30075708/egov-location/boundary-data.json
 create mode 100644 data/as/30075708/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075708/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075836/BillingService/BusinessService.json
 create mode 100644 data/as/30075836/egov-location/boundary-data.json
 create mode 100644 data/as/30075836/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075836/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075842/BillingService/BusinessService.json
 create mode 100644 data/as/30075842/egov-location/boundary-data.json
 create mode 100644 data/as/30075842/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075842/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30075998/BillingService/BusinessService.json
 create mode 100644 data/as/30075998/egov-location/boundary-data.json
 create mode 100644 data/as/30075998/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30075998/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076178/BillingService/BusinessService.json
 create mode 100644 data/as/30076178/egov-location/boundary-data.json
 create mode 100644 data/as/30076178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076404/BillingService/BusinessService.json
 create mode 100644 data/as/30076404/egov-location/boundary-data.json
 create mode 100644 data/as/30076404/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076404/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076417/BillingService/BusinessService.json
 create mode 100644 data/as/30076417/egov-location/boundary-data.json
 create mode 100644 data/as/30076417/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076417/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076423/BillingService/BusinessService.json
 create mode 100644 data/as/30076423/egov-location/boundary-data.json
 create mode 100644 data/as/30076423/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076423/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076442/BillingService/BusinessService.json
 create mode 100644 data/as/30076442/egov-location/boundary-data.json
 create mode 100644 data/as/30076442/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076442/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076496/BillingService/BusinessService.json
 create mode 100644 data/as/30076496/egov-location/boundary-data.json
 create mode 100644 data/as/30076496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076501/BillingService/BusinessService.json
 create mode 100644 data/as/30076501/egov-location/boundary-data.json
 create mode 100644 data/as/30076501/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076501/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076546/BillingService/BusinessService.json
 create mode 100644 data/as/30076546/egov-location/boundary-data.json
 create mode 100644 data/as/30076546/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076546/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076588/BillingService/BusinessService.json
 create mode 100644 data/as/30076588/egov-location/boundary-data.json
 create mode 100644 data/as/30076588/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076588/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076595/BillingService/BusinessService.json
 create mode 100644 data/as/30076595/egov-location/boundary-data.json
 create mode 100644 data/as/30076595/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076595/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30076911/BillingService/BusinessService.json
 create mode 100644 data/as/30076911/egov-location/boundary-data.json
 create mode 100644 data/as/30076911/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30076911/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077015/BillingService/BusinessService.json
 create mode 100644 data/as/30077015/egov-location/boundary-data.json
 create mode 100644 data/as/30077015/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077015/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077065/BillingService/BusinessService.json
 create mode 100644 data/as/30077065/egov-location/boundary-data.json
 create mode 100644 data/as/30077065/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077065/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077169/BillingService/BusinessService.json
 create mode 100644 data/as/30077169/egov-location/boundary-data.json
 create mode 100644 data/as/30077169/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077169/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077173/BillingService/BusinessService.json
 create mode 100644 data/as/30077173/egov-location/boundary-data.json
 create mode 100644 data/as/30077173/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077173/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077183/BillingService/BusinessService.json
 create mode 100644 data/as/30077183/egov-location/boundary-data.json
 create mode 100644 data/as/30077183/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077183/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077189/BillingService/BusinessService.json
 create mode 100644 data/as/30077189/egov-location/boundary-data.json
 create mode 100644 data/as/30077189/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077189/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077362/BillingService/BusinessService.json
 create mode 100644 data/as/30077362/egov-location/boundary-data.json
 create mode 100644 data/as/30077362/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077362/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077383/BillingService/BusinessService.json
 create mode 100644 data/as/30077383/egov-location/boundary-data.json
 create mode 100644 data/as/30077383/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077383/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077387/BillingService/BusinessService.json
 create mode 100644 data/as/30077387/egov-location/boundary-data.json
 create mode 100644 data/as/30077387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077405/BillingService/BusinessService.json
 create mode 100644 data/as/30077405/egov-location/boundary-data.json
 create mode 100644 data/as/30077405/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077405/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077516/BillingService/BusinessService.json
 create mode 100644 data/as/30077516/egov-location/boundary-data.json
 create mode 100644 data/as/30077516/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077516/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077531/BillingService/BusinessService.json
 create mode 100644 data/as/30077531/egov-location/boundary-data.json
 create mode 100644 data/as/30077531/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077531/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077533/BillingService/BusinessService.json
 create mode 100644 data/as/30077533/egov-location/boundary-data.json
 create mode 100644 data/as/30077533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30077538/BillingService/BusinessService.json
 create mode 100644 data/as/30077538/egov-location/boundary-data.json
 create mode 100644 data/as/30077538/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30077538/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30078496/BillingService/BusinessService.json
 create mode 100644 data/as/30078496/egov-location/boundary-data.json
 create mode 100644 data/as/30078496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30078496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30078499/BillingService/BusinessService.json
 create mode 100644 data/as/30078499/egov-location/boundary-data.json
 create mode 100644 data/as/30078499/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30078499/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30079129/BillingService/BusinessService.json
 create mode 100644 data/as/30079129/egov-location/boundary-data.json
 create mode 100644 data/as/30079129/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30079129/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30079143/BillingService/BusinessService.json
 create mode 100644 data/as/30079143/egov-location/boundary-data.json
 create mode 100644 data/as/30079143/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30079143/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30079150/BillingService/BusinessService.json
 create mode 100644 data/as/30079150/egov-location/boundary-data.json
 create mode 100644 data/as/30079150/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30079150/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30079745/BillingService/BusinessService.json
 create mode 100644 data/as/30079745/egov-location/boundary-data.json
 create mode 100644 data/as/30079745/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30079745/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30079783/BillingService/BusinessService.json
 create mode 100644 data/as/30079783/egov-location/boundary-data.json
 create mode 100644 data/as/30079783/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30079783/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30080314/BillingService/BusinessService.json
 create mode 100644 data/as/30080314/egov-location/boundary-data.json
 create mode 100644 data/as/30080314/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30080314/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30080792/BillingService/BusinessService.json
 create mode 100644 data/as/30080792/egov-location/boundary-data.json
 create mode 100644 data/as/30080792/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30080792/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30080805/BillingService/BusinessService.json
 create mode 100644 data/as/30080805/egov-location/boundary-data.json
 create mode 100644 data/as/30080805/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30080805/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30080812/BillingService/BusinessService.json
 create mode 100644 data/as/30080812/egov-location/boundary-data.json
 create mode 100644 data/as/30080812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30080812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30081191/BillingService/BusinessService.json
 create mode 100644 data/as/30081191/egov-location/boundary-data.json
 create mode 100644 data/as/30081191/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30081191/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30081194/BillingService/BusinessService.json
 create mode 100644 data/as/30081194/egov-location/boundary-data.json
 create mode 100644 data/as/30081194/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30081194/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30081197/BillingService/BusinessService.json
 create mode 100644 data/as/30081197/egov-location/boundary-data.json
 create mode 100644 data/as/30081197/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30081197/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30081199/BillingService/BusinessService.json
 create mode 100644 data/as/30081199/egov-location/boundary-data.json
 create mode 100644 data/as/30081199/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30081199/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30081237/BillingService/BusinessService.json
 create mode 100644 data/as/30081237/egov-location/boundary-data.json
 create mode 100644 data/as/30081237/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30081237/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30082029/BillingService/BusinessService.json
 create mode 100644 data/as/30082029/egov-location/boundary-data.json
 create mode 100644 data/as/30082029/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30082029/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30082892/BillingService/BusinessService.json
 create mode 100644 data/as/30082892/egov-location/boundary-data.json
 create mode 100644 data/as/30082892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30082892/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30083052/BillingService/BusinessService.json
 create mode 100644 data/as/30083052/egov-location/boundary-data.json
 create mode 100644 data/as/30083052/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30083052/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30083450/BillingService/BusinessService.json
 create mode 100644 data/as/30083450/egov-location/boundary-data.json
 create mode 100644 data/as/30083450/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30083450/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30090984/BillingService/BusinessService.json
 create mode 100644 data/as/30090984/egov-location/boundary-data.json
 create mode 100644 data/as/30090984/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30090984/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30091027/BillingService/BusinessService.json
 create mode 100644 data/as/30091027/egov-location/boundary-data.json
 create mode 100644 data/as/30091027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30091027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30091086/BillingService/BusinessService.json
 create mode 100644 data/as/30091086/egov-location/boundary-data.json
 create mode 100644 data/as/30091086/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30091086/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30091137/BillingService/BusinessService.json
 create mode 100644 data/as/30091137/egov-location/boundary-data.json
 create mode 100644 data/as/30091137/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30091137/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30091277/BillingService/BusinessService.json
 create mode 100644 data/as/30091277/egov-location/boundary-data.json
 create mode 100644 data/as/30091277/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30091277/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30091350/BillingService/BusinessService.json
 create mode 100644 data/as/30091350/egov-location/boundary-data.json
 create mode 100644 data/as/30091350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30091350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30092981/BillingService/BusinessService.json
 create mode 100644 data/as/30092981/egov-location/boundary-data.json
 create mode 100644 data/as/30092981/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30092981/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30093053/BillingService/BusinessService.json
 create mode 100644 data/as/30093053/egov-location/boundary-data.json
 create mode 100644 data/as/30093053/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30093053/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30093085/BillingService/BusinessService.json
 create mode 100644 data/as/30093085/egov-location/boundary-data.json
 create mode 100644 data/as/30093085/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30093085/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30093111/BillingService/BusinessService.json
 create mode 100644 data/as/30093111/egov-location/boundary-data.json
 create mode 100644 data/as/30093111/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30093111/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096216/BillingService/BusinessService.json
 create mode 100644 data/as/30096216/egov-location/boundary-data.json
 create mode 100644 data/as/30096216/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096216/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096276/BillingService/BusinessService.json
 create mode 100644 data/as/30096276/egov-location/boundary-data.json
 create mode 100644 data/as/30096276/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096276/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096403/BillingService/BusinessService.json
 create mode 100644 data/as/30096403/egov-location/boundary-data.json
 create mode 100644 data/as/30096403/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096403/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096485/BillingService/BusinessService.json
 create mode 100644 data/as/30096485/egov-location/boundary-data.json
 create mode 100644 data/as/30096485/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096485/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096579/BillingService/BusinessService.json
 create mode 100644 data/as/30096579/egov-location/boundary-data.json
 create mode 100644 data/as/30096579/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096579/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096711/BillingService/BusinessService.json
 create mode 100644 data/as/30096711/egov-location/boundary-data.json
 create mode 100644 data/as/30096711/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096711/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30096898/BillingService/BusinessService.json
 create mode 100644 data/as/30096898/egov-location/boundary-data.json
 create mode 100644 data/as/30096898/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30096898/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30097297/BillingService/BusinessService.json
 create mode 100644 data/as/30097297/egov-location/boundary-data.json
 create mode 100644 data/as/30097297/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30097297/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30105174/BillingService/BusinessService.json
 create mode 100644 data/as/30105174/egov-location/boundary-data.json
 create mode 100644 data/as/30105174/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30105174/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30105196/BillingService/BusinessService.json
 create mode 100644 data/as/30105196/egov-location/boundary-data.json
 create mode 100644 data/as/30105196/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30105196/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30105223/BillingService/BusinessService.json
 create mode 100644 data/as/30105223/egov-location/boundary-data.json
 create mode 100644 data/as/30105223/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30105223/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30113305/BillingService/BusinessService.json
 create mode 100644 data/as/30113305/egov-location/boundary-data.json
 create mode 100644 data/as/30113305/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30113305/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30113852/BillingService/BusinessService.json
 create mode 100644 data/as/30113852/egov-location/boundary-data.json
 create mode 100644 data/as/30113852/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30113852/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30115191/BillingService/BusinessService.json
 create mode 100644 data/as/30115191/egov-location/boundary-data.json
 create mode 100644 data/as/30115191/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30115191/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30115208/BillingService/BusinessService.json
 create mode 100644 data/as/30115208/egov-location/boundary-data.json
 create mode 100644 data/as/30115208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30115208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30115249/BillingService/BusinessService.json
 create mode 100644 data/as/30115249/egov-location/boundary-data.json
 create mode 100644 data/as/30115249/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30115249/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30115981/BillingService/BusinessService.json
 create mode 100644 data/as/30115981/egov-location/boundary-data.json
 create mode 100644 data/as/30115981/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30115981/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30116153/BillingService/BusinessService.json
 create mode 100644 data/as/30116153/egov-location/boundary-data.json
 create mode 100644 data/as/30116153/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30116153/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30116490/BillingService/BusinessService.json
 create mode 100644 data/as/30116490/egov-location/boundary-data.json
 create mode 100644 data/as/30116490/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30116490/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30116536/BillingService/BusinessService.json
 create mode 100644 data/as/30116536/egov-location/boundary-data.json
 create mode 100644 data/as/30116536/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30116536/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30117305/BillingService/BusinessService.json
 create mode 100644 data/as/30117305/egov-location/boundary-data.json
 create mode 100644 data/as/30117305/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30117305/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30117521/BillingService/BusinessService.json
 create mode 100644 data/as/30117521/egov-location/boundary-data.json
 create mode 100644 data/as/30117521/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30117521/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30117549/BillingService/BusinessService.json
 create mode 100644 data/as/30117549/egov-location/boundary-data.json
 create mode 100644 data/as/30117549/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30117549/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30117565/BillingService/BusinessService.json
 create mode 100644 data/as/30117565/egov-location/boundary-data.json
 create mode 100644 data/as/30117565/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30117565/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30117571/BillingService/BusinessService.json
 create mode 100644 data/as/30117571/egov-location/boundary-data.json
 create mode 100644 data/as/30117571/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30117571/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30119702/BillingService/BusinessService.json
 create mode 100644 data/as/30119702/egov-location/boundary-data.json
 create mode 100644 data/as/30119702/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30119702/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30125919/BillingService/BusinessService.json
 create mode 100644 data/as/30125919/egov-location/boundary-data.json
 create mode 100644 data/as/30125919/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30125919/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30125926/BillingService/BusinessService.json
 create mode 100644 data/as/30125926/egov-location/boundary-data.json
 create mode 100644 data/as/30125926/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30125926/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30125970/BillingService/BusinessService.json
 create mode 100644 data/as/30125970/egov-location/boundary-data.json
 create mode 100644 data/as/30125970/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30125970/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30125974/BillingService/BusinessService.json
 create mode 100644 data/as/30125974/egov-location/boundary-data.json
 create mode 100644 data/as/30125974/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30125974/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30125980/BillingService/BusinessService.json
 create mode 100644 data/as/30125980/egov-location/boundary-data.json
 create mode 100644 data/as/30125980/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30125980/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126191/BillingService/BusinessService.json
 create mode 100644 data/as/30126191/egov-location/boundary-data.json
 create mode 100644 data/as/30126191/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126191/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126197/BillingService/BusinessService.json
 create mode 100644 data/as/30126197/egov-location/boundary-data.json
 create mode 100644 data/as/30126197/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126197/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126217/BillingService/BusinessService.json
 create mode 100644 data/as/30126217/egov-location/boundary-data.json
 create mode 100644 data/as/30126217/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126217/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126233/BillingService/BusinessService.json
 create mode 100644 data/as/30126233/egov-location/boundary-data.json
 create mode 100644 data/as/30126233/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126233/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126239/BillingService/BusinessService.json
 create mode 100644 data/as/30126239/egov-location/boundary-data.json
 create mode 100644 data/as/30126239/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126239/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126308/BillingService/BusinessService.json
 create mode 100644 data/as/30126308/egov-location/boundary-data.json
 create mode 100644 data/as/30126308/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126308/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126312/BillingService/BusinessService.json
 create mode 100644 data/as/30126312/egov-location/boundary-data.json
 create mode 100644 data/as/30126312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126316/BillingService/BusinessService.json
 create mode 100644 data/as/30126316/egov-location/boundary-data.json
 create mode 100644 data/as/30126316/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126316/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126334/BillingService/BusinessService.json
 create mode 100644 data/as/30126334/egov-location/boundary-data.json
 create mode 100644 data/as/30126334/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126334/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126487/BillingService/BusinessService.json
 create mode 100644 data/as/30126487/egov-location/boundary-data.json
 create mode 100644 data/as/30126487/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126487/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126496/BillingService/BusinessService.json
 create mode 100644 data/as/30126496/egov-location/boundary-data.json
 create mode 100644 data/as/30126496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126500/BillingService/BusinessService.json
 create mode 100644 data/as/30126500/egov-location/boundary-data.json
 create mode 100644 data/as/30126500/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126500/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126582/BillingService/BusinessService.json
 create mode 100644 data/as/30126582/egov-location/boundary-data.json
 create mode 100644 data/as/30126582/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126582/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30126590/BillingService/BusinessService.json
 create mode 100644 data/as/30126590/egov-location/boundary-data.json
 create mode 100644 data/as/30126590/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30126590/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30127284/BillingService/BusinessService.json
 create mode 100644 data/as/30127284/egov-location/boundary-data.json
 create mode 100644 data/as/30127284/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30127284/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30127356/BillingService/BusinessService.json
 create mode 100644 data/as/30127356/egov-location/boundary-data.json
 create mode 100644 data/as/30127356/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30127356/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30127370/BillingService/BusinessService.json
 create mode 100644 data/as/30127370/egov-location/boundary-data.json
 create mode 100644 data/as/30127370/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30127370/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30127414/BillingService/BusinessService.json
 create mode 100644 data/as/30127414/egov-location/boundary-data.json
 create mode 100644 data/as/30127414/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30127414/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30128175/BillingService/BusinessService.json
 create mode 100644 data/as/30128175/egov-location/boundary-data.json
 create mode 100644 data/as/30128175/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30128175/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30128194/BillingService/BusinessService.json
 create mode 100644 data/as/30128194/egov-location/boundary-data.json
 create mode 100644 data/as/30128194/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30128194/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30128549/BillingService/BusinessService.json
 create mode 100644 data/as/30128549/egov-location/boundary-data.json
 create mode 100644 data/as/30128549/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30128549/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30128554/BillingService/BusinessService.json
 create mode 100644 data/as/30128554/egov-location/boundary-data.json
 create mode 100644 data/as/30128554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30128554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30128895/BillingService/BusinessService.json
 create mode 100644 data/as/30128895/egov-location/boundary-data.json
 create mode 100644 data/as/30128895/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30128895/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30128902/BillingService/BusinessService.json
 create mode 100644 data/as/30128902/egov-location/boundary-data.json
 create mode 100644 data/as/30128902/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30128902/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30129324/BillingService/BusinessService.json
 create mode 100644 data/as/30129324/egov-location/boundary-data.json
 create mode 100644 data/as/30129324/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30129324/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30129329/BillingService/BusinessService.json
 create mode 100644 data/as/30129329/egov-location/boundary-data.json
 create mode 100644 data/as/30129329/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30129329/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30129382/BillingService/BusinessService.json
 create mode 100644 data/as/30129382/egov-location/boundary-data.json
 create mode 100644 data/as/30129382/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30129382/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30129385/BillingService/BusinessService.json
 create mode 100644 data/as/30129385/egov-location/boundary-data.json
 create mode 100644 data/as/30129385/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30129385/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30129475/BillingService/BusinessService.json
 create mode 100644 data/as/30129475/egov-location/boundary-data.json
 create mode 100644 data/as/30129475/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30129475/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30129479/BillingService/BusinessService.json
 create mode 100644 data/as/30129479/egov-location/boundary-data.json
 create mode 100644 data/as/30129479/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30129479/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30130374/BillingService/BusinessService.json
 create mode 100644 data/as/30130374/egov-location/boundary-data.json
 create mode 100644 data/as/30130374/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30130374/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30130381/BillingService/BusinessService.json
 create mode 100644 data/as/30130381/egov-location/boundary-data.json
 create mode 100644 data/as/30130381/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30130381/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30130399/BillingService/BusinessService.json
 create mode 100644 data/as/30130399/egov-location/boundary-data.json
 create mode 100644 data/as/30130399/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30130399/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30130411/BillingService/BusinessService.json
 create mode 100644 data/as/30130411/egov-location/boundary-data.json
 create mode 100644 data/as/30130411/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30130411/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30130420/BillingService/BusinessService.json
 create mode 100644 data/as/30130420/egov-location/boundary-data.json
 create mode 100644 data/as/30130420/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30130420/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30130435/BillingService/BusinessService.json
 create mode 100644 data/as/30130435/egov-location/boundary-data.json
 create mode 100644 data/as/30130435/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30130435/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132498/BillingService/BusinessService.json
 create mode 100644 data/as/30132498/egov-location/boundary-data.json
 create mode 100644 data/as/30132498/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132498/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132532/BillingService/BusinessService.json
 create mode 100644 data/as/30132532/egov-location/boundary-data.json
 create mode 100644 data/as/30132532/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132532/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132548/BillingService/BusinessService.json
 create mode 100644 data/as/30132548/egov-location/boundary-data.json
 create mode 100644 data/as/30132548/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132548/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132559/BillingService/BusinessService.json
 create mode 100644 data/as/30132559/egov-location/boundary-data.json
 create mode 100644 data/as/30132559/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132559/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132588/BillingService/BusinessService.json
 create mode 100644 data/as/30132588/egov-location/boundary-data.json
 create mode 100644 data/as/30132588/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132588/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132620/BillingService/BusinessService.json
 create mode 100644 data/as/30132620/egov-location/boundary-data.json
 create mode 100644 data/as/30132620/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132620/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132648/BillingService/BusinessService.json
 create mode 100644 data/as/30132648/egov-location/boundary-data.json
 create mode 100644 data/as/30132648/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132648/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132661/BillingService/BusinessService.json
 create mode 100644 data/as/30132661/egov-location/boundary-data.json
 create mode 100644 data/as/30132661/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132661/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30132799/BillingService/BusinessService.json
 create mode 100644 data/as/30132799/egov-location/boundary-data.json
 create mode 100644 data/as/30132799/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30132799/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30137902/BillingService/BusinessService.json
 create mode 100644 data/as/30137902/egov-location/boundary-data.json
 create mode 100644 data/as/30137902/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30137902/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30137931/BillingService/BusinessService.json
 create mode 100644 data/as/30137931/egov-location/boundary-data.json
 create mode 100644 data/as/30137931/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30137931/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30137946/BillingService/BusinessService.json
 create mode 100644 data/as/30137946/egov-location/boundary-data.json
 create mode 100644 data/as/30137946/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30137946/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30137988/BillingService/BusinessService.json
 create mode 100644 data/as/30137988/egov-location/boundary-data.json
 create mode 100644 data/as/30137988/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30137988/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30138003/BillingService/BusinessService.json
 create mode 100644 data/as/30138003/egov-location/boundary-data.json
 create mode 100644 data/as/30138003/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30138003/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30138012/BillingService/BusinessService.json
 create mode 100644 data/as/30138012/egov-location/boundary-data.json
 create mode 100644 data/as/30138012/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30138012/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30138032/BillingService/BusinessService.json
 create mode 100644 data/as/30138032/egov-location/boundary-data.json
 create mode 100644 data/as/30138032/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30138032/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30139203/BillingService/BusinessService.json
 create mode 100644 data/as/30139203/egov-location/boundary-data.json
 create mode 100644 data/as/30139203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30139203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30139213/BillingService/BusinessService.json
 create mode 100644 data/as/30139213/egov-location/boundary-data.json
 create mode 100644 data/as/30139213/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30139213/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140232/BillingService/BusinessService.json
 create mode 100644 data/as/30140232/egov-location/boundary-data.json
 create mode 100644 data/as/30140232/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140232/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140242/BillingService/BusinessService.json
 create mode 100644 data/as/30140242/egov-location/boundary-data.json
 create mode 100644 data/as/30140242/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140242/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140254/BillingService/BusinessService.json
 create mode 100644 data/as/30140254/egov-location/boundary-data.json
 create mode 100644 data/as/30140254/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140254/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140608/BillingService/BusinessService.json
 create mode 100644 data/as/30140608/egov-location/boundary-data.json
 create mode 100644 data/as/30140608/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140608/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140613/BillingService/BusinessService.json
 create mode 100644 data/as/30140613/egov-location/boundary-data.json
 create mode 100644 data/as/30140613/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140613/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140620/BillingService/BusinessService.json
 create mode 100644 data/as/30140620/egov-location/boundary-data.json
 create mode 100644 data/as/30140620/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140620/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30140642/BillingService/BusinessService.json
 create mode 100644 data/as/30140642/egov-location/boundary-data.json
 create mode 100644 data/as/30140642/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30140642/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30141038/BillingService/BusinessService.json
 create mode 100644 data/as/30141038/egov-location/boundary-data.json
 create mode 100644 data/as/30141038/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30141038/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30141193/BillingService/BusinessService.json
 create mode 100644 data/as/30141193/egov-location/boundary-data.json
 create mode 100644 data/as/30141193/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30141193/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30141195/BillingService/BusinessService.json
 create mode 100644 data/as/30141195/egov-location/boundary-data.json
 create mode 100644 data/as/30141195/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30141195/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143283/BillingService/BusinessService.json
 create mode 100644 data/as/30143283/egov-location/boundary-data.json
 create mode 100644 data/as/30143283/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143283/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143295/BillingService/BusinessService.json
 create mode 100644 data/as/30143295/egov-location/boundary-data.json
 create mode 100644 data/as/30143295/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143295/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143305/BillingService/BusinessService.json
 create mode 100644 data/as/30143305/egov-location/boundary-data.json
 create mode 100644 data/as/30143305/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143305/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/30060637/BillingService/BusinessService.json b/data/as/30060637/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5bb97b5a0
--- /dev/null
+++ b/data/as/30060637/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060637",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060637/egov-location/boundary-data.json b/data/as/30060637/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95693d7137
--- /dev/null
+++ b/data/as/30060637/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060637",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BORCHALA 1 PWSS",
+                "localname": "NIZ-BORCHALA 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060637",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BORCHALA 1 PWSS",
+                        "localname": "NIZ-BORCHALA 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ-BORCHALA 1 PWSS",
+                "localname": "NIZ-BORCHALA 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060637",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ-BORCHALA 1 PWSS",
+                        "localname": "NIZ-BORCHALA 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060637/ws-services-calculation/Penalty.json b/data/as/30060637/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65932abfe3
--- /dev/null
+++ b/data/as/30060637/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060637",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060637/ws-services-calculation/WCBillingSlab.json b/data/as/30060637/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db42095934
--- /dev/null
+++ b/data/as/30060637/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060637",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060647/BillingService/BusinessService.json b/data/as/30060647/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f88b2e6b28
--- /dev/null
+++ b/data/as/30060647/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060647",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060647/egov-location/boundary-data.json b/data/as/30060647/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f31bb0301
--- /dev/null
+++ b/data/as/30060647/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060647",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 CHITALMARI PWSS",
+                "localname": "NO.2 CHITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060647",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 CHITALMARI PWSS",
+                        "localname": "NO.2 CHITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 CHITALMARI PWSS",
+                "localname": "NO.2 CHITALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060647",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 CHITALMARI PWSS",
+                        "localname": "NO.2 CHITALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060647/ws-services-calculation/Penalty.json b/data/as/30060647/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a9d562cb19
--- /dev/null
+++ b/data/as/30060647/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060647",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060647/ws-services-calculation/WCBillingSlab.json b/data/as/30060647/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fcd2e00735
--- /dev/null
+++ b/data/as/30060647/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060647",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060667/BillingService/BusinessService.json b/data/as/30060667/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85a32cabaa
--- /dev/null
+++ b/data/as/30060667/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060667",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060667/egov-location/boundary-data.json b/data/as/30060667/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6313ae6d60
--- /dev/null
+++ b/data/as/30060667/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060667",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHICHUBURI NO 1 PWSS",
+                "localname": "MEDHICHUBURI NO 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060667",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHICHUBURI NO 1 PWSS",
+                        "localname": "MEDHICHUBURI NO 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHICHUBURI NO 1 PWSS",
+                "localname": "MEDHICHUBURI NO 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060667",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHICHUBURI NO 1 PWSS",
+                        "localname": "MEDHICHUBURI NO 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060667/ws-services-calculation/Penalty.json b/data/as/30060667/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ebc7b8ec51
--- /dev/null
+++ b/data/as/30060667/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060667",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060667/ws-services-calculation/WCBillingSlab.json b/data/as/30060667/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c23e39b28
--- /dev/null
+++ b/data/as/30060667/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060667",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060692/BillingService/BusinessService.json b/data/as/30060692/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa5de1e13d
--- /dev/null
+++ b/data/as/30060692/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060692",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060692/egov-location/boundary-data.json b/data/as/30060692/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d71191f09
--- /dev/null
+++ b/data/as/30060692/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060692",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 BOCHASIMALU GAON PWSS",
+                "localname": "NO.2 BOCHASIMALU GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060692",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 BOCHASIMALU GAON PWSS",
+                        "localname": "NO.2 BOCHASIMALU GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 BOCHASIMALU GAON PWSS",
+                "localname": "NO.2 BOCHASIMALU GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060692",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 BOCHASIMALU GAON PWSS",
+                        "localname": "NO.2 BOCHASIMALU GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060692/ws-services-calculation/Penalty.json b/data/as/30060692/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e392769451
--- /dev/null
+++ b/data/as/30060692/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060692",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060692/ws-services-calculation/WCBillingSlab.json b/data/as/30060692/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13f6430e70
--- /dev/null
+++ b/data/as/30060692/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060692",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060709/BillingService/BusinessService.json b/data/as/30060709/BillingService/BusinessService.json
new file mode 100644
index 0000000000..334bb35d78
--- /dev/null
+++ b/data/as/30060709/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060709",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060709/egov-location/boundary-data.json b/data/as/30060709/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5705ab5a1b
--- /dev/null
+++ b/data/as/30060709/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060709",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BOGIBIL PWSS",
+                "localname": "NEW BOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060709",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BOGIBIL PWSS",
+                        "localname": "NEW BOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BOGIBIL PWSS",
+                "localname": "NEW BOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060709",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BOGIBIL PWSS",
+                        "localname": "NEW BOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060709/ws-services-calculation/Penalty.json b/data/as/30060709/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5cbecd4871
--- /dev/null
+++ b/data/as/30060709/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060709",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060709/ws-services-calculation/WCBillingSlab.json b/data/as/30060709/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..11224630f8
--- /dev/null
+++ b/data/as/30060709/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060709",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060718/BillingService/BusinessService.json b/data/as/30060718/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fadee7a276
--- /dev/null
+++ b/data/as/30060718/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060718",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060718/egov-location/boundary-data.json b/data/as/30060718/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ec5230e9f
--- /dev/null
+++ b/data/as/30060718/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060718",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPARA PWSS",
+                "localname": "SANTIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060718",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPARA PWSS",
+                        "localname": "SANTIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPARA PWSS",
+                "localname": "SANTIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060718",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPARA PWSS",
+                        "localname": "SANTIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060718/ws-services-calculation/Penalty.json b/data/as/30060718/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15df854121
--- /dev/null
+++ b/data/as/30060718/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060718",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060718/ws-services-calculation/WCBillingSlab.json b/data/as/30060718/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d3927fbfc
--- /dev/null
+++ b/data/as/30060718/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060718",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060740/BillingService/BusinessService.json b/data/as/30060740/BillingService/BusinessService.json
new file mode 100644
index 0000000000..34b9cee35b
--- /dev/null
+++ b/data/as/30060740/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060740",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060740/egov-location/boundary-data.json b/data/as/30060740/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e0f876362e
--- /dev/null
+++ b/data/as/30060740/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060740",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KENDUGURI PWSS",
+                "localname": "KENDUGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KENDUGURI PWSS",
+                        "localname": "KENDUGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KENDUGURI PWSS",
+                "localname": "KENDUGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KENDUGURI PWSS",
+                        "localname": "KENDUGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060740/ws-services-calculation/Penalty.json b/data/as/30060740/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b40a84ce64
--- /dev/null
+++ b/data/as/30060740/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060740",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060740/ws-services-calculation/WCBillingSlab.json b/data/as/30060740/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..310232edfd
--- /dev/null
+++ b/data/as/30060740/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060740",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060825/BillingService/BusinessService.json b/data/as/30060825/BillingService/BusinessService.json
new file mode 100644
index 0000000000..23ea72cc2f
--- /dev/null
+++ b/data/as/30060825/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060825",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060825/egov-location/boundary-data.json b/data/as/30060825/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47027ddf33
--- /dev/null
+++ b/data/as/30060825/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060825",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORALI PWSS",
+                "localname": "GORALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060825",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORALI PWSS",
+                        "localname": "GORALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORALI PWSS",
+                "localname": "GORALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060825",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORALI PWSS",
+                        "localname": "GORALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060825/ws-services-calculation/Penalty.json b/data/as/30060825/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9c6f6bb293
--- /dev/null
+++ b/data/as/30060825/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060825",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060825/ws-services-calculation/WCBillingSlab.json b/data/as/30060825/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4601416822
--- /dev/null
+++ b/data/as/30060825/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060825",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060872/BillingService/BusinessService.json b/data/as/30060872/BillingService/BusinessService.json
new file mode 100644
index 0000000000..39ef3410f5
--- /dev/null
+++ b/data/as/30060872/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060872",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060872/egov-location/boundary-data.json b/data/as/30060872/egov-location/boundary-data.json
new file mode 100644
index 0000000000..73b2203a0c
--- /dev/null
+++ b/data/as/30060872/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060872",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHICHUBURI GADAHAJULI PWSS",
+                "localname": "MEDHICHUBURI GADAHAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060872",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHICHUBURI GADAHAJULI PWSS",
+                        "localname": "MEDHICHUBURI GADAHAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHICHUBURI GADAHAJULI PWSS",
+                "localname": "MEDHICHUBURI GADAHAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060872",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHICHUBURI GADAHAJULI PWSS",
+                        "localname": "MEDHICHUBURI GADAHAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060872/ws-services-calculation/Penalty.json b/data/as/30060872/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4eba0d6d59
--- /dev/null
+++ b/data/as/30060872/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060872",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060872/ws-services-calculation/WCBillingSlab.json b/data/as/30060872/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..356fce7f88
--- /dev/null
+++ b/data/as/30060872/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060872",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060887/BillingService/BusinessService.json b/data/as/30060887/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d3daef4ed1
--- /dev/null
+++ b/data/as/30060887/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060887",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060887/egov-location/boundary-data.json b/data/as/30060887/egov-location/boundary-data.json
new file mode 100644
index 0000000000..07e8135962
--- /dev/null
+++ b/data/as/30060887/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060887",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGARI ATI GAON PWSS",
+                "localname": "SINGARI ATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060887",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGARI ATI GAON PWSS",
+                        "localname": "SINGARI ATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGARI ATI GAON PWSS",
+                "localname": "SINGARI ATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060887",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGARI ATI GAON PWSS",
+                        "localname": "SINGARI ATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060887/ws-services-calculation/Penalty.json b/data/as/30060887/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a15a6f7d24
--- /dev/null
+++ b/data/as/30060887/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060887",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060887/ws-services-calculation/WCBillingSlab.json b/data/as/30060887/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f2ec717dfd
--- /dev/null
+++ b/data/as/30060887/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060887",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060892/BillingService/BusinessService.json b/data/as/30060892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ea9d079fb
--- /dev/null
+++ b/data/as/30060892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060892/egov-location/boundary-data.json b/data/as/30060892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19b7ddace3
--- /dev/null
+++ b/data/as/30060892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUA PWSS (NEW)",
+                "localname": "GERUA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUA PWSS (NEW)",
+                        "localname": "GERUA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUA PWSS (NEW)",
+                "localname": "GERUA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUA PWSS (NEW)",
+                        "localname": "GERUA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060892/ws-services-calculation/Penalty.json b/data/as/30060892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e67c27e05
--- /dev/null
+++ b/data/as/30060892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060892/ws-services-calculation/WCBillingSlab.json b/data/as/30060892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10f0ae47b3
--- /dev/null
+++ b/data/as/30060892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060893/BillingService/BusinessService.json b/data/as/30060893/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37f3389465
--- /dev/null
+++ b/data/as/30060893/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060893",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060893/egov-location/boundary-data.json b/data/as/30060893/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47b8ac0e0f
--- /dev/null
+++ b/data/as/30060893/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060893",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDHARA PWSS",
+                "localname": "BHALUKDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDHARA PWSS",
+                        "localname": "BHALUKDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDHARA PWSS",
+                "localname": "BHALUKDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060893",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDHARA PWSS",
+                        "localname": "BHALUKDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060893/ws-services-calculation/Penalty.json b/data/as/30060893/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7eef7bb960
--- /dev/null
+++ b/data/as/30060893/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060893",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060893/ws-services-calculation/WCBillingSlab.json b/data/as/30060893/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..db16579938
--- /dev/null
+++ b/data/as/30060893/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060893",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060898/BillingService/BusinessService.json b/data/as/30060898/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ea5daacd5a
--- /dev/null
+++ b/data/as/30060898/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060898",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060898/egov-location/boundary-data.json b/data/as/30060898/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d629010dab
--- /dev/null
+++ b/data/as/30060898/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060898",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUA NO.2 PWSS (NEW)",
+                "localname": "GERUA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUA NO.2 PWSS (NEW)",
+                        "localname": "GERUA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERUA NO.2 PWSS (NEW)",
+                "localname": "GERUA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERUA NO.2 PWSS (NEW)",
+                        "localname": "GERUA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060898/ws-services-calculation/Penalty.json b/data/as/30060898/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c222106c40
--- /dev/null
+++ b/data/as/30060898/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060898",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060898/ws-services-calculation/WCBillingSlab.json b/data/as/30060898/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30497b7752
--- /dev/null
+++ b/data/as/30060898/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060898",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060901/BillingService/BusinessService.json b/data/as/30060901/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2e104fee37
--- /dev/null
+++ b/data/as/30060901/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060901",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060901/egov-location/boundary-data.json b/data/as/30060901/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3fa5b228f2
--- /dev/null
+++ b/data/as/30060901/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060901",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER BALISIHA PWSS",
+                "localname": "UPPER BALISIHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER BALISIHA PWSS",
+                        "localname": "UPPER BALISIHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER BALISIHA PWSS",
+                "localname": "UPPER BALISIHA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER BALISIHA PWSS",
+                        "localname": "UPPER BALISIHA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060901/ws-services-calculation/Penalty.json b/data/as/30060901/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f304f7ea4a
--- /dev/null
+++ b/data/as/30060901/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060901",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060901/ws-services-calculation/WCBillingSlab.json b/data/as/30060901/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5da4ad22dc
--- /dev/null
+++ b/data/as/30060901/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060901",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060910/BillingService/BusinessService.json b/data/as/30060910/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e321c264e
--- /dev/null
+++ b/data/as/30060910/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30060910",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060910/egov-location/boundary-data.json b/data/as/30060910/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4164e8edc
--- /dev/null
+++ b/data/as/30060910/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30060910",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BONDAI JARANI PWSS",
+                "localname": "BONDAI JARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BONDAI JARANI PWSS",
+                        "localname": "BONDAI JARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BONDAI JARANI PWSS",
+                "localname": "BONDAI JARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30060910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BONDAI JARANI PWSS",
+                        "localname": "BONDAI JARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060910/ws-services-calculation/Penalty.json b/data/as/30060910/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..729be307ca
--- /dev/null
+++ b/data/as/30060910/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30060910",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30060910/ws-services-calculation/WCBillingSlab.json b/data/as/30060910/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a0299f1b6
--- /dev/null
+++ b/data/as/30060910/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30060910",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061011/BillingService/BusinessService.json b/data/as/30061011/BillingService/BusinessService.json
new file mode 100644
index 0000000000..65a723b93b
--- /dev/null
+++ b/data/as/30061011/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30061011",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061011/egov-location/boundary-data.json b/data/as/30061011/egov-location/boundary-data.json
new file mode 100644
index 0000000000..912598a3bb
--- /dev/null
+++ b/data/as/30061011/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30061011",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RABHAPARA PWSS (NEW)",
+                "localname": "RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30061011",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RABHAPARA PWSS (NEW)",
+                        "localname": "RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RABHAPARA PWSS (NEW)",
+                "localname": "RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30061011",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RABHAPARA PWSS (NEW)",
+                        "localname": "RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061011/ws-services-calculation/Penalty.json b/data/as/30061011/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..424aa0b450
--- /dev/null
+++ b/data/as/30061011/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30061011",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061011/ws-services-calculation/WCBillingSlab.json b/data/as/30061011/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d35c8b810b
--- /dev/null
+++ b/data/as/30061011/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30061011",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061020/BillingService/BusinessService.json b/data/as/30061020/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb253f64e2
--- /dev/null
+++ b/data/as/30061020/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30061020",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061020/egov-location/boundary-data.json b/data/as/30061020/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3e4e23514a
--- /dev/null
+++ b/data/as/30061020/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30061020",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASPARA SILAPANI PWSS (NEW)",
+                "localname": "DASPARA SILAPANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30061020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASPARA SILAPANI PWSS (NEW)",
+                        "localname": "DASPARA SILAPANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASPARA SILAPANI PWSS (NEW)",
+                "localname": "DASPARA SILAPANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30061020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASPARA SILAPANI PWSS (NEW)",
+                        "localname": "DASPARA SILAPANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061020/ws-services-calculation/Penalty.json b/data/as/30061020/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5c8111b867
--- /dev/null
+++ b/data/as/30061020/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30061020",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061020/ws-services-calculation/WCBillingSlab.json b/data/as/30061020/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f42eda8b71
--- /dev/null
+++ b/data/as/30061020/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30061020",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061025/BillingService/BusinessService.json b/data/as/30061025/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1efbeb373f
--- /dev/null
+++ b/data/as/30061025/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30061025",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061025/egov-location/boundary-data.json b/data/as/30061025/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dc61da93d2
--- /dev/null
+++ b/data/as/30061025/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30061025",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOWKATOLA PWSS (NEW)",
+                "localname": "CHOWKATOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30061025",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOWKATOLA PWSS (NEW)",
+                        "localname": "CHOWKATOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOWKATOLA PWSS (NEW)",
+                "localname": "CHOWKATOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30061025",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOWKATOLA PWSS (NEW)",
+                        "localname": "CHOWKATOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061025/ws-services-calculation/Penalty.json b/data/as/30061025/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ac56ea108
--- /dev/null
+++ b/data/as/30061025/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30061025",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30061025/ws-services-calculation/WCBillingSlab.json b/data/as/30061025/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eb08247f55
--- /dev/null
+++ b/data/as/30061025/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30061025",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062203/BillingService/BusinessService.json b/data/as/30062203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d7c34cfb9d
--- /dev/null
+++ b/data/as/30062203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30062203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062203/egov-location/boundary-data.json b/data/as/30062203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6320da24ce
--- /dev/null
+++ b/data/as/30062203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30062203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNPUKHURI NO.1",
+                "localname": "BAMUNPUKHURI NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNPUKHURI NO.1",
+                        "localname": "BAMUNPUKHURI NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNPUKHURI NO.1",
+                "localname": "BAMUNPUKHURI NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNPUKHURI NO.1",
+                        "localname": "BAMUNPUKHURI NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062203/ws-services-calculation/Penalty.json b/data/as/30062203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..921eec6798
--- /dev/null
+++ b/data/as/30062203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30062203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062203/ws-services-calculation/WCBillingSlab.json b/data/as/30062203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..573fbf5951
--- /dev/null
+++ b/data/as/30062203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30062203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062205/BillingService/BusinessService.json b/data/as/30062205/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45d28a8f6b
--- /dev/null
+++ b/data/as/30062205/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30062205",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062205/egov-location/boundary-data.json b/data/as/30062205/egov-location/boundary-data.json
new file mode 100644
index 0000000000..347d8038b3
--- /dev/null
+++ b/data/as/30062205/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30062205",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALAHU BARI PWSS",
+                "localname": "KHALAHU BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALAHU BARI PWSS",
+                        "localname": "KHALAHU BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALAHU BARI PWSS",
+                "localname": "KHALAHU BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALAHU BARI PWSS",
+                        "localname": "KHALAHU BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062205/ws-services-calculation/Penalty.json b/data/as/30062205/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..564be8661b
--- /dev/null
+++ b/data/as/30062205/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30062205",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062205/ws-services-calculation/WCBillingSlab.json b/data/as/30062205/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..712eaade76
--- /dev/null
+++ b/data/as/30062205/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30062205",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062312/BillingService/BusinessService.json b/data/as/30062312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2de543eba7
--- /dev/null
+++ b/data/as/30062312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30062312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062312/egov-location/boundary-data.json b/data/as/30062312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e27229ed6
--- /dev/null
+++ b/data/as/30062312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30062312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUDAMGHAT KACHARI PWSS",
+                "localname": "GUDAMGHAT KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUDAMGHAT KACHARI PWSS",
+                        "localname": "GUDAMGHAT KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUDAMGHAT KACHARI PWSS",
+                "localname": "GUDAMGHAT KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUDAMGHAT KACHARI PWSS",
+                        "localname": "GUDAMGHAT KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062312/ws-services-calculation/Penalty.json b/data/as/30062312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d3ef7a0c9
--- /dev/null
+++ b/data/as/30062312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30062312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062312/ws-services-calculation/WCBillingSlab.json b/data/as/30062312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aa146b68d5
--- /dev/null
+++ b/data/as/30062312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30062312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062320/BillingService/BusinessService.json b/data/as/30062320/BillingService/BusinessService.json
new file mode 100644
index 0000000000..322aa1a924
--- /dev/null
+++ b/data/as/30062320/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30062320",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062320/egov-location/boundary-data.json b/data/as/30062320/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9c9dca61a8
--- /dev/null
+++ b/data/as/30062320/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30062320",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIHINGIA GAON PWSS",
+                "localname": "DIHINGIA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIHINGIA GAON PWSS",
+                        "localname": "DIHINGIA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIHINGIA GAON PWSS",
+                "localname": "DIHINGIA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062320",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIHINGIA GAON PWSS",
+                        "localname": "DIHINGIA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062320/ws-services-calculation/Penalty.json b/data/as/30062320/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c11d65499
--- /dev/null
+++ b/data/as/30062320/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30062320",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062320/ws-services-calculation/WCBillingSlab.json b/data/as/30062320/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a898778b58
--- /dev/null
+++ b/data/as/30062320/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30062320",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062583/BillingService/BusinessService.json b/data/as/30062583/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c60c2bf008
--- /dev/null
+++ b/data/as/30062583/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30062583",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062583/egov-location/boundary-data.json b/data/as/30062583/egov-location/boundary-data.json
new file mode 100644
index 0000000000..392522251d
--- /dev/null
+++ b/data/as/30062583/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30062583",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 HATIBARI TE PWSS",
+                "localname": "NO. 1 HATIBARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 HATIBARI TE PWSS",
+                        "localname": "NO. 1 HATIBARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 HATIBARI TE PWSS",
+                "localname": "NO. 1 HATIBARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30062583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 HATIBARI TE PWSS",
+                        "localname": "NO. 1 HATIBARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062583/ws-services-calculation/Penalty.json b/data/as/30062583/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1ad0806b4f
--- /dev/null
+++ b/data/as/30062583/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30062583",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30062583/ws-services-calculation/WCBillingSlab.json b/data/as/30062583/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7699adeb3b
--- /dev/null
+++ b/data/as/30062583/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30062583",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063118/BillingService/BusinessService.json b/data/as/30063118/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5db96650ec
--- /dev/null
+++ b/data/as/30063118/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063118",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063118/egov-location/boundary-data.json b/data/as/30063118/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34fdd25823
--- /dev/null
+++ b/data/as/30063118/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063118",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEOTPARA PWSS (NEW)",
+                "localname": "KEOTPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063118",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEOTPARA PWSS (NEW)",
+                        "localname": "KEOTPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEOTPARA PWSS (NEW)",
+                "localname": "KEOTPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063118",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEOTPARA PWSS (NEW)",
+                        "localname": "KEOTPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063118/ws-services-calculation/Penalty.json b/data/as/30063118/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b391e18fe7
--- /dev/null
+++ b/data/as/30063118/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063118",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063118/ws-services-calculation/WCBillingSlab.json b/data/as/30063118/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5290dffa93
--- /dev/null
+++ b/data/as/30063118/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063118",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063119/BillingService/BusinessService.json b/data/as/30063119/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90d289da33
--- /dev/null
+++ b/data/as/30063119/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063119",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063119/egov-location/boundary-data.json b/data/as/30063119/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f48019c63
--- /dev/null
+++ b/data/as/30063119/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063119",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I PWSS (NEW)",
+                "localname": "KANKATA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063119",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I PWSS (NEW)",
+                        "localname": "KANKATA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I PWSS (NEW)",
+                "localname": "KANKATA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063119",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I PWSS (NEW)",
+                        "localname": "KANKATA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063119/ws-services-calculation/Penalty.json b/data/as/30063119/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d552a98d14
--- /dev/null
+++ b/data/as/30063119/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063119",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063119/ws-services-calculation/WCBillingSlab.json b/data/as/30063119/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e2922307d
--- /dev/null
+++ b/data/as/30063119/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063119",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063143/BillingService/BusinessService.json b/data/as/30063143/BillingService/BusinessService.json
new file mode 100644
index 0000000000..23e665081f
--- /dev/null
+++ b/data/as/30063143/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063143",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063143/egov-location/boundary-data.json b/data/as/30063143/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19844b0883
--- /dev/null
+++ b/data/as/30063143/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063143",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHORAGOAN PWSS (NEW)",
+                "localname": "KHORAGOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHORAGOAN PWSS (NEW)",
+                        "localname": "KHORAGOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHORAGOAN PWSS (NEW)",
+                "localname": "KHORAGOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHORAGOAN PWSS (NEW)",
+                        "localname": "KHORAGOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063143/ws-services-calculation/Penalty.json b/data/as/30063143/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..873dd09de5
--- /dev/null
+++ b/data/as/30063143/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063143",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063143/ws-services-calculation/WCBillingSlab.json b/data/as/30063143/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3ffd894b0e
--- /dev/null
+++ b/data/as/30063143/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063143",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063149/BillingService/BusinessService.json b/data/as/30063149/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f4ea288a8c
--- /dev/null
+++ b/data/as/30063149/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063149",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063149/egov-location/boundary-data.json b/data/as/30063149/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2d51fd270e
--- /dev/null
+++ b/data/as/30063149/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063149",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOBOLAGAON BANGALI PWSS",
+                "localname": "BHOBOLAGAON BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063149",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOBOLAGAON BANGALI PWSS",
+                        "localname": "BHOBOLAGAON BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOBOLAGAON BANGALI PWSS",
+                "localname": "BHOBOLAGAON BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063149",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOBOLAGAON BANGALI PWSS",
+                        "localname": "BHOBOLAGAON BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063149/ws-services-calculation/Penalty.json b/data/as/30063149/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26bedfc9ce
--- /dev/null
+++ b/data/as/30063149/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063149",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063149/ws-services-calculation/WCBillingSlab.json b/data/as/30063149/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41e9adb889
--- /dev/null
+++ b/data/as/30063149/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063149",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063152/BillingService/BusinessService.json b/data/as/30063152/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27c978a26f
--- /dev/null
+++ b/data/as/30063152/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063152",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063152/egov-location/boundary-data.json b/data/as/30063152/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d61f3af67
--- /dev/null
+++ b/data/as/30063152/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063152",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM PAROWA PWSS",
+                "localname": "BAM PAROWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063152",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM PAROWA PWSS",
+                        "localname": "BAM PAROWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM PAROWA PWSS",
+                "localname": "BAM PAROWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063152",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM PAROWA PWSS",
+                        "localname": "BAM PAROWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063152/ws-services-calculation/Penalty.json b/data/as/30063152/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..53d8082d3d
--- /dev/null
+++ b/data/as/30063152/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063152",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063152/ws-services-calculation/WCBillingSlab.json b/data/as/30063152/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37867b0051
--- /dev/null
+++ b/data/as/30063152/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063152",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063223/BillingService/BusinessService.json b/data/as/30063223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ed3191313
--- /dev/null
+++ b/data/as/30063223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063223/egov-location/boundary-data.json b/data/as/30063223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9debd3c93a
--- /dev/null
+++ b/data/as/30063223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LASKARPARA PWSS (NEW)",
+                "localname": "LASKARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LASKARPARA PWSS (NEW)",
+                        "localname": "LASKARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LASKARPARA PWSS (NEW)",
+                "localname": "LASKARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LASKARPARA PWSS (NEW)",
+                        "localname": "LASKARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063223/ws-services-calculation/Penalty.json b/data/as/30063223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb75b7ec3a
--- /dev/null
+++ b/data/as/30063223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063223/ws-services-calculation/WCBillingSlab.json b/data/as/30063223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b8719599c2
--- /dev/null
+++ b/data/as/30063223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063228/BillingService/BusinessService.json b/data/as/30063228/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b3f228fbc
--- /dev/null
+++ b/data/as/30063228/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063228",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063228/egov-location/boundary-data.json b/data/as/30063228/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce3d710e5d
--- /dev/null
+++ b/data/as/30063228/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063228",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                "localname": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                        "localname": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                "localname": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                        "localname": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063228/ws-services-calculation/Penalty.json b/data/as/30063228/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d3ae467f8
--- /dev/null
+++ b/data/as/30063228/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063228",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063228/ws-services-calculation/WCBillingSlab.json b/data/as/30063228/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0c0740c14e
--- /dev/null
+++ b/data/as/30063228/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063228",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063239/BillingService/BusinessService.json b/data/as/30063239/BillingService/BusinessService.json
new file mode 100644
index 0000000000..12ce9ee074
--- /dev/null
+++ b/data/as/30063239/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063239",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063239/egov-location/boundary-data.json b/data/as/30063239/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7c4962ecf
--- /dev/null
+++ b/data/as/30063239/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063239",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHOLBHANGA PWSS (NEW)",
+                "localname": "KHOLBHANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHOLBHANGA PWSS (NEW)",
+                        "localname": "KHOLBHANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHOLBHANGA PWSS (NEW)",
+                "localname": "KHOLBHANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHOLBHANGA PWSS (NEW)",
+                        "localname": "KHOLBHANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063239/ws-services-calculation/Penalty.json b/data/as/30063239/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..92836c317d
--- /dev/null
+++ b/data/as/30063239/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063239",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063239/ws-services-calculation/WCBillingSlab.json b/data/as/30063239/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e2cda96c7
--- /dev/null
+++ b/data/as/30063239/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063239",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063240/BillingService/BusinessService.json b/data/as/30063240/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f328e7ec7
--- /dev/null
+++ b/data/as/30063240/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063240",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063240/egov-location/boundary-data.json b/data/as/30063240/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bbcd8f1580
--- /dev/null
+++ b/data/as/30063240/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063240",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KULAMUWA PWSS (NEW)",
+                "localname": "KULAMUWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063240",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KULAMUWA PWSS (NEW)",
+                        "localname": "KULAMUWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KULAMUWA PWSS (NEW)",
+                "localname": "KULAMUWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063240",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KULAMUWA PWSS (NEW)",
+                        "localname": "KULAMUWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063240/ws-services-calculation/Penalty.json b/data/as/30063240/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..720c36de6b
--- /dev/null
+++ b/data/as/30063240/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063240",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063240/ws-services-calculation/WCBillingSlab.json b/data/as/30063240/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a6bc80b49
--- /dev/null
+++ b/data/as/30063240/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063240",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063285/BillingService/BusinessService.json b/data/as/30063285/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df3b70ee37
--- /dev/null
+++ b/data/as/30063285/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063285",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063285/egov-location/boundary-data.json b/data/as/30063285/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c1daff3750
--- /dev/null
+++ b/data/as/30063285/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063285",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRUPARA PWSS (NEW)",
+                "localname": "DHIRUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063285",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRUPARA PWSS (NEW)",
+                        "localname": "DHIRUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRUPARA PWSS (NEW)",
+                "localname": "DHIRUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063285",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRUPARA PWSS (NEW)",
+                        "localname": "DHIRUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063285/ws-services-calculation/Penalty.json b/data/as/30063285/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4cae28049b
--- /dev/null
+++ b/data/as/30063285/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063285",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063285/ws-services-calculation/WCBillingSlab.json b/data/as/30063285/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..38bf15459a
--- /dev/null
+++ b/data/as/30063285/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063285",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063294/BillingService/BusinessService.json b/data/as/30063294/BillingService/BusinessService.json
new file mode 100644
index 0000000000..93f8634fcd
--- /dev/null
+++ b/data/as/30063294/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063294",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063294/egov-location/boundary-data.json b/data/as/30063294/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b553aa70b8
--- /dev/null
+++ b/data/as/30063294/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063294",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILARBHITA PWSS (NEW)",
+                "localname": "CHILARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063294",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILARBHITA PWSS (NEW)",
+                        "localname": "CHILARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILARBHITA PWSS (NEW)",
+                "localname": "CHILARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063294",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILARBHITA PWSS (NEW)",
+                        "localname": "CHILARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063294/ws-services-calculation/Penalty.json b/data/as/30063294/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f049f5ff00
--- /dev/null
+++ b/data/as/30063294/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063294",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063294/ws-services-calculation/WCBillingSlab.json b/data/as/30063294/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32e03398b1
--- /dev/null
+++ b/data/as/30063294/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063294",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063300/BillingService/BusinessService.json b/data/as/30063300/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0937573d3d
--- /dev/null
+++ b/data/as/30063300/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063300",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063300/egov-location/boundary-data.json b/data/as/30063300/egov-location/boundary-data.json
new file mode 100644
index 0000000000..83c66ef7fc
--- /dev/null
+++ b/data/as/30063300/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063300",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPKAI PT-II PWSS (NEW)",
+                "localname": "DIPKAI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPKAI PT-II PWSS (NEW)",
+                        "localname": "DIPKAI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPKAI PT-II PWSS (NEW)",
+                "localname": "DIPKAI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063300",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPKAI PT-II PWSS (NEW)",
+                        "localname": "DIPKAI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063300/ws-services-calculation/Penalty.json b/data/as/30063300/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b2bc0a0114
--- /dev/null
+++ b/data/as/30063300/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063300",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063300/ws-services-calculation/WCBillingSlab.json b/data/as/30063300/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2c33284b4c
--- /dev/null
+++ b/data/as/30063300/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063300",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063426/BillingService/BusinessService.json b/data/as/30063426/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5fa04f7769
--- /dev/null
+++ b/data/as/30063426/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30063426",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063426/egov-location/boundary-data.json b/data/as/30063426/egov-location/boundary-data.json
new file mode 100644
index 0000000000..efed1c82c9
--- /dev/null
+++ b/data/as/30063426/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30063426",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDAL PWSS (NEW)",
+                "localname": "BORDAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063426",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDAL PWSS (NEW)",
+                        "localname": "BORDAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDAL PWSS (NEW)",
+                "localname": "BORDAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30063426",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDAL PWSS (NEW)",
+                        "localname": "BORDAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063426/ws-services-calculation/Penalty.json b/data/as/30063426/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e308a8cbf
--- /dev/null
+++ b/data/as/30063426/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30063426",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30063426/ws-services-calculation/WCBillingSlab.json b/data/as/30063426/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9e5a3d3f3f
--- /dev/null
+++ b/data/as/30063426/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30063426",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064069/BillingService/BusinessService.json b/data/as/30064069/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fd0d5d1d79
--- /dev/null
+++ b/data/as/30064069/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30064069",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064069/egov-location/boundary-data.json b/data/as/30064069/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4cc792601a
--- /dev/null
+++ b/data/as/30064069/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30064069",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALLO BASTI PWSS",
+                "localname": "MALLO BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064069",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALLO BASTI PWSS",
+                        "localname": "MALLO BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALLO BASTI PWSS",
+                "localname": "MALLO BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064069",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALLO BASTI PWSS",
+                        "localname": "MALLO BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064069/ws-services-calculation/Penalty.json b/data/as/30064069/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca3fab8027
--- /dev/null
+++ b/data/as/30064069/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30064069",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064069/ws-services-calculation/WCBillingSlab.json b/data/as/30064069/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9f47b194a
--- /dev/null
+++ b/data/as/30064069/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30064069",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064490/BillingService/BusinessService.json b/data/as/30064490/BillingService/BusinessService.json
new file mode 100644
index 0000000000..698602fb9d
--- /dev/null
+++ b/data/as/30064490/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30064490",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064490/egov-location/boundary-data.json b/data/as/30064490/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b169e8838
--- /dev/null
+++ b/data/as/30064490/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30064490",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASERGAON PWSS (NEW)",
+                "localname": "PASERGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASERGAON PWSS (NEW)",
+                        "localname": "PASERGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASERGAON PWSS (NEW)",
+                "localname": "PASERGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASERGAON PWSS (NEW)",
+                        "localname": "PASERGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064490/ws-services-calculation/Penalty.json b/data/as/30064490/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2345b26b1
--- /dev/null
+++ b/data/as/30064490/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30064490",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064490/ws-services-calculation/WCBillingSlab.json b/data/as/30064490/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f7b407f098
--- /dev/null
+++ b/data/as/30064490/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30064490",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064646/BillingService/BusinessService.json b/data/as/30064646/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4c8ad0683
--- /dev/null
+++ b/data/as/30064646/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30064646",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064646/egov-location/boundary-data.json b/data/as/30064646/egov-location/boundary-data.json
new file mode 100644
index 0000000000..607d5ede20
--- /dev/null
+++ b/data/as/30064646/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30064646",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAWAIRARPARA PWSS (NEW)",
+                "localname": "BAWAIRARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064646",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAWAIRARPARA PWSS (NEW)",
+                        "localname": "BAWAIRARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAWAIRARPARA PWSS (NEW)",
+                "localname": "BAWAIRARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064646",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAWAIRARPARA PWSS (NEW)",
+                        "localname": "BAWAIRARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064646/ws-services-calculation/Penalty.json b/data/as/30064646/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9a7de959d
--- /dev/null
+++ b/data/as/30064646/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30064646",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064646/ws-services-calculation/WCBillingSlab.json b/data/as/30064646/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e25a643b3a
--- /dev/null
+++ b/data/as/30064646/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30064646",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064830/BillingService/BusinessService.json b/data/as/30064830/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0b164bbd8b
--- /dev/null
+++ b/data/as/30064830/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30064830",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064830/egov-location/boundary-data.json b/data/as/30064830/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0d7365905
--- /dev/null
+++ b/data/as/30064830/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30064830",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAGRABARI PT-I PWSS (NEW)",
+                "localname": "KHAGRABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAGRABARI PT-I PWSS (NEW)",
+                        "localname": "KHAGRABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAGRABARI PT-I PWSS (NEW)",
+                "localname": "KHAGRABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30064830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAGRABARI PT-I PWSS (NEW)",
+                        "localname": "KHAGRABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064830/ws-services-calculation/Penalty.json b/data/as/30064830/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..75c4af7e77
--- /dev/null
+++ b/data/as/30064830/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30064830",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30064830/ws-services-calculation/WCBillingSlab.json b/data/as/30064830/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9d856db16b
--- /dev/null
+++ b/data/as/30064830/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30064830",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065052/BillingService/BusinessService.json b/data/as/30065052/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70480f102c
--- /dev/null
+++ b/data/as/30065052/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30065052",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065052/egov-location/boundary-data.json b/data/as/30065052/egov-location/boundary-data.json
new file mode 100644
index 0000000000..110ae8cd83
--- /dev/null
+++ b/data/as/30065052/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30065052",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065052/ws-services-calculation/Penalty.json b/data/as/30065052/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7c3acb8a38
--- /dev/null
+++ b/data/as/30065052/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30065052",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065052/ws-services-calculation/WCBillingSlab.json b/data/as/30065052/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..05dc0bceb6
--- /dev/null
+++ b/data/as/30065052/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30065052",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065285/BillingService/BusinessService.json b/data/as/30065285/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1d7b8bd4a3
--- /dev/null
+++ b/data/as/30065285/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30065285",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065285/egov-location/boundary-data.json b/data/as/30065285/egov-location/boundary-data.json
new file mode 100644
index 0000000000..21b0688c60
--- /dev/null
+++ b/data/as/30065285/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30065285",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 CHAMAGURI BAGAN PWSS",
+                "localname": "NO.1 CHAMAGURI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065285",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 CHAMAGURI BAGAN PWSS",
+                        "localname": "NO.1 CHAMAGURI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 CHAMAGURI BAGAN PWSS",
+                "localname": "NO.1 CHAMAGURI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065285",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 CHAMAGURI BAGAN PWSS",
+                        "localname": "NO.1 CHAMAGURI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065285/ws-services-calculation/Penalty.json b/data/as/30065285/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f962d47403
--- /dev/null
+++ b/data/as/30065285/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30065285",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065285/ws-services-calculation/WCBillingSlab.json b/data/as/30065285/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fea5e330bd
--- /dev/null
+++ b/data/as/30065285/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30065285",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065673/BillingService/BusinessService.json b/data/as/30065673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5746a0405
--- /dev/null
+++ b/data/as/30065673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30065673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065673/egov-location/boundary-data.json b/data/as/30065673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1d99de5443
--- /dev/null
+++ b/data/as/30065673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30065673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOUTH BAHBERA PWSS",
+                "localname": "SOUTH BAHBERA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOUTH BAHBERA PWSS",
+                        "localname": "SOUTH BAHBERA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOUTH BAHBERA PWSS",
+                "localname": "SOUTH BAHBERA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOUTH BAHBERA PWSS",
+                        "localname": "SOUTH BAHBERA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065673/ws-services-calculation/Penalty.json b/data/as/30065673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..21e5873e13
--- /dev/null
+++ b/data/as/30065673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30065673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065673/ws-services-calculation/WCBillingSlab.json b/data/as/30065673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c8a02c0c0
--- /dev/null
+++ b/data/as/30065673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30065673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065681/BillingService/BusinessService.json b/data/as/30065681/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ccb0ec13cd
--- /dev/null
+++ b/data/as/30065681/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30065681",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065681/egov-location/boundary-data.json b/data/as/30065681/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3e6f0ea097
--- /dev/null
+++ b/data/as/30065681/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30065681",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGA PARHAR GAON PWSS",
+                "localname": "NAGA PARHAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGA PARHAR GAON PWSS",
+                        "localname": "NAGA PARHAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGA PARHAR GAON PWSS",
+                "localname": "NAGA PARHAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGA PARHAR GAON PWSS",
+                        "localname": "NAGA PARHAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065681/ws-services-calculation/Penalty.json b/data/as/30065681/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82fa7fa2e6
--- /dev/null
+++ b/data/as/30065681/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30065681",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065681/ws-services-calculation/WCBillingSlab.json b/data/as/30065681/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a95e771f34
--- /dev/null
+++ b/data/as/30065681/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30065681",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065865/BillingService/BusinessService.json b/data/as/30065865/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9789665099
--- /dev/null
+++ b/data/as/30065865/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30065865",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065865/egov-location/boundary-data.json b/data/as/30065865/egov-location/boundary-data.json
new file mode 100644
index 0000000000..90e903d7d1
--- /dev/null
+++ b/data/as/30065865/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30065865",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARPARA PATHAR PWSS",
+                "localname": "GARPARA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065865",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARPARA PATHAR PWSS",
+                        "localname": "GARPARA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARPARA PATHAR PWSS",
+                "localname": "GARPARA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065865",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARPARA PATHAR PWSS",
+                        "localname": "GARPARA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065865/ws-services-calculation/Penalty.json b/data/as/30065865/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0028ec4f08
--- /dev/null
+++ b/data/as/30065865/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30065865",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065865/ws-services-calculation/WCBillingSlab.json b/data/as/30065865/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..63f1f75313
--- /dev/null
+++ b/data/as/30065865/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30065865",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065876/BillingService/BusinessService.json b/data/as/30065876/BillingService/BusinessService.json
new file mode 100644
index 0000000000..16eb65cffe
--- /dev/null
+++ b/data/as/30065876/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30065876",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065876/egov-location/boundary-data.json b/data/as/30065876/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ecde4caf79
--- /dev/null
+++ b/data/as/30065876/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30065876",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIYALMARI GAON PWSS",
+                "localname": "SIYALMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065876",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIYALMARI GAON PWSS",
+                        "localname": "SIYALMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIYALMARI GAON PWSS",
+                "localname": "SIYALMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30065876",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIYALMARI GAON PWSS",
+                        "localname": "SIYALMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065876/ws-services-calculation/Penalty.json b/data/as/30065876/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a969237ae7
--- /dev/null
+++ b/data/as/30065876/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30065876",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30065876/ws-services-calculation/WCBillingSlab.json b/data/as/30065876/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ceceadda4
--- /dev/null
+++ b/data/as/30065876/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30065876",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066198/BillingService/BusinessService.json b/data/as/30066198/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55bcd05124
--- /dev/null
+++ b/data/as/30066198/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30066198",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066198/egov-location/boundary-data.json b/data/as/30066198/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54ea1da609
--- /dev/null
+++ b/data/as/30066198/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30066198",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KESARAPARA PWSS (NEW)",
+                "localname": "KESARAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KESARAPARA PWSS (NEW)",
+                        "localname": "KESARAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KESARAPARA PWSS (NEW)",
+                "localname": "KESARAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KESARAPARA PWSS (NEW)",
+                        "localname": "KESARAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066198/ws-services-calculation/Penalty.json b/data/as/30066198/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fa094ed4d8
--- /dev/null
+++ b/data/as/30066198/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30066198",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066198/ws-services-calculation/WCBillingSlab.json b/data/as/30066198/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22f6cce22b
--- /dev/null
+++ b/data/as/30066198/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30066198",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066211/BillingService/BusinessService.json b/data/as/30066211/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35a2619187
--- /dev/null
+++ b/data/as/30066211/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30066211",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066211/egov-location/boundary-data.json b/data/as/30066211/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f0e0fb4142
--- /dev/null
+++ b/data/as/30066211/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30066211",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                "localname": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066211",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                        "localname": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                "localname": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066211",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                        "localname": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066211/ws-services-calculation/Penalty.json b/data/as/30066211/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6ec4aaf696
--- /dev/null
+++ b/data/as/30066211/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30066211",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066211/ws-services-calculation/WCBillingSlab.json b/data/as/30066211/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5af2e93e85
--- /dev/null
+++ b/data/as/30066211/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30066211",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066318/BillingService/BusinessService.json b/data/as/30066318/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3bf0eab8ea
--- /dev/null
+++ b/data/as/30066318/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30066318",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066318/egov-location/boundary-data.json b/data/as/30066318/egov-location/boundary-data.json
new file mode 100644
index 0000000000..525bb7f23f
--- /dev/null
+++ b/data/as/30066318/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30066318",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHYAMGURI NO.1 PWSS",
+                "localname": "SHYAMGURI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066318",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHYAMGURI NO.1 PWSS",
+                        "localname": "SHYAMGURI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHYAMGURI NO.1 PWSS",
+                "localname": "SHYAMGURI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066318",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHYAMGURI NO.1 PWSS",
+                        "localname": "SHYAMGURI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066318/ws-services-calculation/Penalty.json b/data/as/30066318/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e55e2a40d9
--- /dev/null
+++ b/data/as/30066318/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30066318",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066318/ws-services-calculation/WCBillingSlab.json b/data/as/30066318/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f088ade41b
--- /dev/null
+++ b/data/as/30066318/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30066318",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066345/BillingService/BusinessService.json b/data/as/30066345/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9faff52b4
--- /dev/null
+++ b/data/as/30066345/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30066345",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066345/egov-location/boundary-data.json b/data/as/30066345/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7505fbc859
--- /dev/null
+++ b/data/as/30066345/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30066345",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MADAPI TE PWSS",
+                "localname": "NO. 2 MADAPI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066345",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MADAPI TE PWSS",
+                        "localname": "NO. 2 MADAPI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MADAPI TE PWSS",
+                "localname": "NO. 2 MADAPI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30066345",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MADAPI TE PWSS",
+                        "localname": "NO. 2 MADAPI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066345/ws-services-calculation/Penalty.json b/data/as/30066345/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..251a574f53
--- /dev/null
+++ b/data/as/30066345/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30066345",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30066345/ws-services-calculation/WCBillingSlab.json b/data/as/30066345/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf59cd764f
--- /dev/null
+++ b/data/as/30066345/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30066345",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067036/BillingService/BusinessService.json b/data/as/30067036/BillingService/BusinessService.json
new file mode 100644
index 0000000000..48fd750b6c
--- /dev/null
+++ b/data/as/30067036/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067036",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067036/egov-location/boundary-data.json b/data/as/30067036/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a00cdd3d11
--- /dev/null
+++ b/data/as/30067036/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067036",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASUMARI PWSS (NEW)",
+                "localname": "KASUMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067036",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASUMARI PWSS (NEW)",
+                        "localname": "KASUMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASUMARI PWSS (NEW)",
+                "localname": "KASUMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067036",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASUMARI PWSS (NEW)",
+                        "localname": "KASUMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067036/ws-services-calculation/Penalty.json b/data/as/30067036/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6dc24c35f4
--- /dev/null
+++ b/data/as/30067036/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067036",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067036/ws-services-calculation/WCBillingSlab.json b/data/as/30067036/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed29d675d4
--- /dev/null
+++ b/data/as/30067036/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067036",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067040/BillingService/BusinessService.json b/data/as/30067040/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a1d352c155
--- /dev/null
+++ b/data/as/30067040/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067040",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067040/egov-location/boundary-data.json b/data/as/30067040/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b1c776c455
--- /dev/null
+++ b/data/as/30067040/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067040",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAJONGPARA PWSS (NEW)",
+                "localname": "HAJONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067040",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAJONGPARA PWSS (NEW)",
+                        "localname": "HAJONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAJONGPARA PWSS (NEW)",
+                "localname": "HAJONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067040",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAJONGPARA PWSS (NEW)",
+                        "localname": "HAJONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067040/ws-services-calculation/Penalty.json b/data/as/30067040/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2499b0c743
--- /dev/null
+++ b/data/as/30067040/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067040",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067040/ws-services-calculation/WCBillingSlab.json b/data/as/30067040/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd080c5d70
--- /dev/null
+++ b/data/as/30067040/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067040",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067065/BillingService/BusinessService.json b/data/as/30067065/BillingService/BusinessService.json
new file mode 100644
index 0000000000..63d3396762
--- /dev/null
+++ b/data/as/30067065/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067065",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067065/egov-location/boundary-data.json b/data/as/30067065/egov-location/boundary-data.json
new file mode 100644
index 0000000000..abeda9eadb
--- /dev/null
+++ b/data/as/30067065/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067065",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 ARUN TE PWSS",
+                "localname": "NO.4 ARUN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 ARUN TE PWSS",
+                        "localname": "NO.4 ARUN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 ARUN TE PWSS",
+                "localname": "NO.4 ARUN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 ARUN TE PWSS",
+                        "localname": "NO.4 ARUN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067065/ws-services-calculation/Penalty.json b/data/as/30067065/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d1d80bbfee
--- /dev/null
+++ b/data/as/30067065/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067065",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067065/ws-services-calculation/WCBillingSlab.json b/data/as/30067065/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d33328378
--- /dev/null
+++ b/data/as/30067065/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067065",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067067/BillingService/BusinessService.json b/data/as/30067067/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94c06742f3
--- /dev/null
+++ b/data/as/30067067/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067067",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067067/egov-location/boundary-data.json b/data/as/30067067/egov-location/boundary-data.json
new file mode 100644
index 0000000000..093a7a46f9
--- /dev/null
+++ b/data/as/30067067/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067067",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NICHINTA PWSS (NEW)",
+                "localname": "NICHINTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067067",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NICHINTA PWSS (NEW)",
+                        "localname": "NICHINTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NICHINTA PWSS (NEW)",
+                "localname": "NICHINTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067067",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NICHINTA PWSS (NEW)",
+                        "localname": "NICHINTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067067/ws-services-calculation/Penalty.json b/data/as/30067067/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69cf7b4ccd
--- /dev/null
+++ b/data/as/30067067/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067067",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067067/ws-services-calculation/WCBillingSlab.json b/data/as/30067067/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5942f67331
--- /dev/null
+++ b/data/as/30067067/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067067",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067084/BillingService/BusinessService.json b/data/as/30067084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1d671cd94e
--- /dev/null
+++ b/data/as/30067084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067084/egov-location/boundary-data.json b/data/as/30067084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50aedf791c
--- /dev/null
+++ b/data/as/30067084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIAGAON NO.1 PWSS",
+                "localname": "TELIAGAON NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIAGAON NO.1 PWSS",
+                        "localname": "TELIAGAON NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIAGAON NO.1 PWSS",
+                "localname": "TELIAGAON NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIAGAON NO.1 PWSS",
+                        "localname": "TELIAGAON NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067084/ws-services-calculation/Penalty.json b/data/as/30067084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0c7fcf985d
--- /dev/null
+++ b/data/as/30067084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067084/ws-services-calculation/WCBillingSlab.json b/data/as/30067084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60f09c1b42
--- /dev/null
+++ b/data/as/30067084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067086/BillingService/BusinessService.json b/data/as/30067086/BillingService/BusinessService.json
new file mode 100644
index 0000000000..06333d053b
--- /dev/null
+++ b/data/as/30067086/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067086",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067086/egov-location/boundary-data.json b/data/as/30067086/egov-location/boundary-data.json
new file mode 100644
index 0000000000..41c1a973cc
--- /dev/null
+++ b/data/as/30067086/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067086",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHIARTARY PWSS (NEW)",
+                "localname": "KACHIARTARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHIARTARY PWSS (NEW)",
+                        "localname": "KACHIARTARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHIARTARY PWSS (NEW)",
+                "localname": "KACHIARTARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHIARTARY PWSS (NEW)",
+                        "localname": "KACHIARTARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067086/ws-services-calculation/Penalty.json b/data/as/30067086/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..121582965d
--- /dev/null
+++ b/data/as/30067086/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067086",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067086/ws-services-calculation/WCBillingSlab.json b/data/as/30067086/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d4b9c36e64
--- /dev/null
+++ b/data/as/30067086/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067086",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067101/BillingService/BusinessService.json b/data/as/30067101/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d44fce3ae9
--- /dev/null
+++ b/data/as/30067101/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067101",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067101/egov-location/boundary-data.json b/data/as/30067101/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8ce6ebfbe4
--- /dev/null
+++ b/data/as/30067101/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067101",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TAKIMARI RESERVE PWSS (NEW)",
+                "localname": "TAKIMARI RESERVE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067101",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TAKIMARI RESERVE PWSS (NEW)",
+                        "localname": "TAKIMARI RESERVE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TAKIMARI RESERVE PWSS (NEW)",
+                "localname": "TAKIMARI RESERVE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067101",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TAKIMARI RESERVE PWSS (NEW)",
+                        "localname": "TAKIMARI RESERVE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067101/ws-services-calculation/Penalty.json b/data/as/30067101/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3d47cfeda0
--- /dev/null
+++ b/data/as/30067101/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067101",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067101/ws-services-calculation/WCBillingSlab.json b/data/as/30067101/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb8bcec408
--- /dev/null
+++ b/data/as/30067101/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067101",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067113/BillingService/BusinessService.json b/data/as/30067113/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c750e17a8
--- /dev/null
+++ b/data/as/30067113/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067113",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067113/egov-location/boundary-data.json b/data/as/30067113/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2352f76f4
--- /dev/null
+++ b/data/as/30067113/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067113",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAR HANGA  GAON PWSS",
+                "localname": "KAR HANGA  GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067113",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAR HANGA  GAON PWSS",
+                        "localname": "KAR HANGA  GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAR HANGA  GAON PWSS",
+                "localname": "KAR HANGA  GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067113",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAR HANGA  GAON PWSS",
+                        "localname": "KAR HANGA  GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067113/ws-services-calculation/Penalty.json b/data/as/30067113/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ce0c35647
--- /dev/null
+++ b/data/as/30067113/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067113",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067113/ws-services-calculation/WCBillingSlab.json b/data/as/30067113/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..161cb733e7
--- /dev/null
+++ b/data/as/30067113/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067113",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067122/BillingService/BusinessService.json b/data/as/30067122/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7ed55c3f1f
--- /dev/null
+++ b/data/as/30067122/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067122",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067122/egov-location/boundary-data.json b/data/as/30067122/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a5074adce
--- /dev/null
+++ b/data/as/30067122/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067122",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAI MAJULI PWSS",
+                "localname": "DHIRAI MAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067122",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAI MAJULI PWSS",
+                        "localname": "DHIRAI MAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAI MAJULI PWSS",
+                "localname": "DHIRAI MAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067122",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAI MAJULI PWSS",
+                        "localname": "DHIRAI MAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067122/ws-services-calculation/Penalty.json b/data/as/30067122/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d3982d81a
--- /dev/null
+++ b/data/as/30067122/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067122",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067122/ws-services-calculation/WCBillingSlab.json b/data/as/30067122/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..abcb174f15
--- /dev/null
+++ b/data/as/30067122/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067122",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067179/BillingService/BusinessService.json b/data/as/30067179/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cca75eceee
--- /dev/null
+++ b/data/as/30067179/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067179",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067179/egov-location/boundary-data.json b/data/as/30067179/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43df76f19e
--- /dev/null
+++ b/data/as/30067179/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067179",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI BAGAN NO.1 PWSS",
+                "localname": "DHEKIAJULI BAGAN NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI BAGAN NO.1 PWSS",
+                        "localname": "DHEKIAJULI BAGAN NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHEKIAJULI BAGAN NO.1 PWSS",
+                "localname": "DHEKIAJULI BAGAN NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHEKIAJULI BAGAN NO.1 PWSS",
+                        "localname": "DHEKIAJULI BAGAN NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067179/ws-services-calculation/Penalty.json b/data/as/30067179/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6e01fb124f
--- /dev/null
+++ b/data/as/30067179/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067179",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067179/ws-services-calculation/WCBillingSlab.json b/data/as/30067179/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d870d7dd07
--- /dev/null
+++ b/data/as/30067179/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067179",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067304/BillingService/BusinessService.json b/data/as/30067304/BillingService/BusinessService.json
new file mode 100644
index 0000000000..243dd7315e
--- /dev/null
+++ b/data/as/30067304/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067304",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067304/egov-location/boundary-data.json b/data/as/30067304/egov-location/boundary-data.json
new file mode 100644
index 0000000000..809c549f7f
--- /dev/null
+++ b/data/as/30067304/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067304",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALANG PWSS",
+                "localname": "PALANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067304",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALANG PWSS",
+                        "localname": "PALANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALANG PWSS",
+                "localname": "PALANG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067304",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALANG PWSS",
+                        "localname": "PALANG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067304/ws-services-calculation/Penalty.json b/data/as/30067304/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..49de40e314
--- /dev/null
+++ b/data/as/30067304/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067304",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067304/ws-services-calculation/WCBillingSlab.json b/data/as/30067304/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb5334bf62
--- /dev/null
+++ b/data/as/30067304/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067304",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067307/BillingService/BusinessService.json b/data/as/30067307/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45362dc90a
--- /dev/null
+++ b/data/as/30067307/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067307",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067307/egov-location/boundary-data.json b/data/as/30067307/egov-location/boundary-data.json
new file mode 100644
index 0000000000..067eee9d6a
--- /dev/null
+++ b/data/as/30067307/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067307",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAHAJDOBA PWSS",
+                "localname": "JAHAJDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAHAJDOBA PWSS",
+                        "localname": "JAHAJDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAHAJDOBA PWSS",
+                "localname": "JAHAJDOBA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAHAJDOBA PWSS",
+                        "localname": "JAHAJDOBA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067307/ws-services-calculation/Penalty.json b/data/as/30067307/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0f2432206b
--- /dev/null
+++ b/data/as/30067307/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067307",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067307/ws-services-calculation/WCBillingSlab.json b/data/as/30067307/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a0d539885a
--- /dev/null
+++ b/data/as/30067307/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067307",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067308/BillingService/BusinessService.json b/data/as/30067308/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8015c9385a
--- /dev/null
+++ b/data/as/30067308/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067308",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067308/egov-location/boundary-data.json b/data/as/30067308/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50522e3b92
--- /dev/null
+++ b/data/as/30067308/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067308",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHANAMUKH NEW PWSS",
+                "localname": "KHANAMUKH NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067308",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHANAMUKH NEW PWSS",
+                        "localname": "KHANAMUKH NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHANAMUKH NEW PWSS",
+                "localname": "KHANAMUKH NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067308",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHANAMUKH NEW PWSS",
+                        "localname": "KHANAMUKH NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067308/ws-services-calculation/Penalty.json b/data/as/30067308/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5e1c192d5b
--- /dev/null
+++ b/data/as/30067308/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067308",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067308/ws-services-calculation/WCBillingSlab.json b/data/as/30067308/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dda43abe72
--- /dev/null
+++ b/data/as/30067308/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067308",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067407/BillingService/BusinessService.json b/data/as/30067407/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8db9838321
--- /dev/null
+++ b/data/as/30067407/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067407",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067407/egov-location/boundary-data.json b/data/as/30067407/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b4e7d3902f
--- /dev/null
+++ b/data/as/30067407/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067407",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOJKHOWA GAON PWSS",
+                "localname": "BHOJKHOWA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOJKHOWA GAON PWSS",
+                        "localname": "BHOJKHOWA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOJKHOWA GAON PWSS",
+                "localname": "BHOJKHOWA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOJKHOWA GAON PWSS",
+                        "localname": "BHOJKHOWA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067407/ws-services-calculation/Penalty.json b/data/as/30067407/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7295d32bb3
--- /dev/null
+++ b/data/as/30067407/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067407",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067407/ws-services-calculation/WCBillingSlab.json b/data/as/30067407/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c01830a373
--- /dev/null
+++ b/data/as/30067407/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067407",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067418/BillingService/BusinessService.json b/data/as/30067418/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d67c55816c
--- /dev/null
+++ b/data/as/30067418/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067418",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067418/egov-location/boundary-data.json b/data/as/30067418/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a8d57dedfd
--- /dev/null
+++ b/data/as/30067418/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067418",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW GATANGA KAHDOL PWSS",
+                "localname": "NEW GATANGA KAHDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067418",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW GATANGA KAHDOL PWSS",
+                        "localname": "NEW GATANGA KAHDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW GATANGA KAHDOL PWSS",
+                "localname": "NEW GATANGA KAHDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067418",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW GATANGA KAHDOL PWSS",
+                        "localname": "NEW GATANGA KAHDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067418/ws-services-calculation/Penalty.json b/data/as/30067418/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..16ae2a16c8
--- /dev/null
+++ b/data/as/30067418/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067418",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067418/ws-services-calculation/WCBillingSlab.json b/data/as/30067418/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b760c63cbe
--- /dev/null
+++ b/data/as/30067418/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067418",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067441/BillingService/BusinessService.json b/data/as/30067441/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8ed07ce58
--- /dev/null
+++ b/data/as/30067441/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067441",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067441/egov-location/boundary-data.json b/data/as/30067441/egov-location/boundary-data.json
new file mode 100644
index 0000000000..31c9f04e9b
--- /dev/null
+++ b/data/as/30067441/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067441",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARDUBI PWSS",
+                "localname": "BARDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARDUBI PWSS",
+                        "localname": "BARDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARDUBI PWSS",
+                "localname": "BARDUBI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067441",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARDUBI PWSS",
+                        "localname": "BARDUBI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067441/ws-services-calculation/Penalty.json b/data/as/30067441/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..733475b7a1
--- /dev/null
+++ b/data/as/30067441/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067441",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067441/ws-services-calculation/WCBillingSlab.json b/data/as/30067441/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9792baf252
--- /dev/null
+++ b/data/as/30067441/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067441",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067449/BillingService/BusinessService.json b/data/as/30067449/BillingService/BusinessService.json
new file mode 100644
index 0000000000..009924242b
--- /dev/null
+++ b/data/as/30067449/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067449",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067449/egov-location/boundary-data.json b/data/as/30067449/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a4db68a362
--- /dev/null
+++ b/data/as/30067449/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067449",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAHIKUCHI GAON PWSS",
+                "localname": "KAHIKUCHI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067449",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAHIKUCHI GAON PWSS",
+                        "localname": "KAHIKUCHI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAHIKUCHI GAON PWSS",
+                "localname": "KAHIKUCHI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067449",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAHIKUCHI GAON PWSS",
+                        "localname": "KAHIKUCHI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067449/ws-services-calculation/Penalty.json b/data/as/30067449/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7bc65fba29
--- /dev/null
+++ b/data/as/30067449/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067449",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067449/ws-services-calculation/WCBillingSlab.json b/data/as/30067449/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e6c5cb24d8
--- /dev/null
+++ b/data/as/30067449/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067449",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067468/BillingService/BusinessService.json b/data/as/30067468/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ed08af60c
--- /dev/null
+++ b/data/as/30067468/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067468",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067468/egov-location/boundary-data.json b/data/as/30067468/egov-location/boundary-data.json
new file mode 100644
index 0000000000..393fa64b8a
--- /dev/null
+++ b/data/as/30067468/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067468",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOINAJULI GAON PWSS",
+                "localname": "MOINAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067468",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOINAJULI GAON PWSS",
+                        "localname": "MOINAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOINAJULI GAON PWSS",
+                "localname": "MOINAJULI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067468",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOINAJULI GAON PWSS",
+                        "localname": "MOINAJULI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067468/ws-services-calculation/Penalty.json b/data/as/30067468/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d393151df
--- /dev/null
+++ b/data/as/30067468/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067468",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067468/ws-services-calculation/WCBillingSlab.json b/data/as/30067468/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ecc29a1784
--- /dev/null
+++ b/data/as/30067468/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067468",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067475/BillingService/BusinessService.json b/data/as/30067475/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99a3667a3e
--- /dev/null
+++ b/data/as/30067475/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067475",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067475/egov-location/boundary-data.json b/data/as/30067475/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a5939ac526
--- /dev/null
+++ b/data/as/30067475/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067475",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 SURJYAPUR PWSS",
+                "localname": "NO.2 SURJYAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 SURJYAPUR PWSS",
+                        "localname": "NO.2 SURJYAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 SURJYAPUR PWSS",
+                "localname": "NO.2 SURJYAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 SURJYAPUR PWSS",
+                        "localname": "NO.2 SURJYAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067475/ws-services-calculation/Penalty.json b/data/as/30067475/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..17693f9daa
--- /dev/null
+++ b/data/as/30067475/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067475",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067475/ws-services-calculation/WCBillingSlab.json b/data/as/30067475/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02a0f20a53
--- /dev/null
+++ b/data/as/30067475/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067475",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067509/BillingService/BusinessService.json b/data/as/30067509/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f613a58ec6
--- /dev/null
+++ b/data/as/30067509/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067509",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067509/egov-location/boundary-data.json b/data/as/30067509/egov-location/boundary-data.json
new file mode 100644
index 0000000000..07504c0e23
--- /dev/null
+++ b/data/as/30067509/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067509",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZBAT GAON PWSS",
+                "localname": "MAZBAT GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZBAT GAON PWSS",
+                        "localname": "MAZBAT GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZBAT GAON PWSS",
+                "localname": "MAZBAT GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZBAT GAON PWSS",
+                        "localname": "MAZBAT GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067509/ws-services-calculation/Penalty.json b/data/as/30067509/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df171ee253
--- /dev/null
+++ b/data/as/30067509/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067509",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067509/ws-services-calculation/WCBillingSlab.json b/data/as/30067509/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..844de8f6e2
--- /dev/null
+++ b/data/as/30067509/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067509",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067518/BillingService/BusinessService.json b/data/as/30067518/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3780a0ed34
--- /dev/null
+++ b/data/as/30067518/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067518",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067518/egov-location/boundary-data.json b/data/as/30067518/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d2aa67520
--- /dev/null
+++ b/data/as/30067518/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067518",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHAR BARI BANGALI GAON PWSS",
+                "localname": "NAHAR BARI BANGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHAR BARI BANGALI GAON PWSS",
+                        "localname": "NAHAR BARI BANGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHAR BARI BANGALI GAON PWSS",
+                "localname": "NAHAR BARI BANGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067518",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHAR BARI BANGALI GAON PWSS",
+                        "localname": "NAHAR BARI BANGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067518/ws-services-calculation/Penalty.json b/data/as/30067518/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83db7f1420
--- /dev/null
+++ b/data/as/30067518/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067518",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067518/ws-services-calculation/WCBillingSlab.json b/data/as/30067518/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2ff565619
--- /dev/null
+++ b/data/as/30067518/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067518",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067536/BillingService/BusinessService.json b/data/as/30067536/BillingService/BusinessService.json
new file mode 100644
index 0000000000..18c970a6fa
--- /dev/null
+++ b/data/as/30067536/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067536",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067536/egov-location/boundary-data.json b/data/as/30067536/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8dcf7f6c12
--- /dev/null
+++ b/data/as/30067536/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067536",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 SINGIMARI GAON PWSS",
+                "localname": "NO.2 SINGIMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 SINGIMARI GAON PWSS",
+                        "localname": "NO.2 SINGIMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 SINGIMARI GAON PWSS",
+                "localname": "NO.2 SINGIMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 SINGIMARI GAON PWSS",
+                        "localname": "NO.2 SINGIMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067536/ws-services-calculation/Penalty.json b/data/as/30067536/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab36c75530
--- /dev/null
+++ b/data/as/30067536/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067536",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067536/ws-services-calculation/WCBillingSlab.json b/data/as/30067536/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ad2a3612b
--- /dev/null
+++ b/data/as/30067536/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067536",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067611/BillingService/BusinessService.json b/data/as/30067611/BillingService/BusinessService.json
new file mode 100644
index 0000000000..82c03ac5e4
--- /dev/null
+++ b/data/as/30067611/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067611",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067611/egov-location/boundary-data.json b/data/as/30067611/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8683073afd
--- /dev/null
+++ b/data/as/30067611/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067611",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HOLDIBARI PWSS (NEW)",
+                "localname": "NEW HOLDIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HOLDIBARI PWSS (NEW)",
+                        "localname": "NEW HOLDIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HOLDIBARI PWSS (NEW)",
+                "localname": "NEW HOLDIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HOLDIBARI PWSS (NEW)",
+                        "localname": "NEW HOLDIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067611/ws-services-calculation/Penalty.json b/data/as/30067611/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d826534012
--- /dev/null
+++ b/data/as/30067611/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067611",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067611/ws-services-calculation/WCBillingSlab.json b/data/as/30067611/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3773b06537
--- /dev/null
+++ b/data/as/30067611/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067611",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067623/BillingService/BusinessService.json b/data/as/30067623/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3e331d9f84
--- /dev/null
+++ b/data/as/30067623/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067623",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067623/egov-location/boundary-data.json b/data/as/30067623/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a2007367c2
--- /dev/null
+++ b/data/as/30067623/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067623",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALBARI PT-I PWSS (NEW)",
+                "localname": "SALBARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067623",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALBARI PT-I PWSS (NEW)",
+                        "localname": "SALBARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALBARI PT-I PWSS (NEW)",
+                "localname": "SALBARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067623",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALBARI PT-I PWSS (NEW)",
+                        "localname": "SALBARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067623/ws-services-calculation/Penalty.json b/data/as/30067623/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eaf7f5ef55
--- /dev/null
+++ b/data/as/30067623/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067623",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067623/ws-services-calculation/WCBillingSlab.json b/data/as/30067623/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8621fe529a
--- /dev/null
+++ b/data/as/30067623/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067623",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067699/BillingService/BusinessService.json b/data/as/30067699/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a20aa3ab39
--- /dev/null
+++ b/data/as/30067699/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067699",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067699/egov-location/boundary-data.json b/data/as/30067699/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5d105b6990
--- /dev/null
+++ b/data/as/30067699/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067699",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA (DAMRA) PWSS (NEW)",
+                "localname": "GAROPARA (DAMRA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067699",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA (DAMRA) PWSS (NEW)",
+                        "localname": "GAROPARA (DAMRA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA (DAMRA) PWSS (NEW)",
+                "localname": "GAROPARA (DAMRA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067699",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA (DAMRA) PWSS (NEW)",
+                        "localname": "GAROPARA (DAMRA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067699/ws-services-calculation/Penalty.json b/data/as/30067699/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4c71bb168f
--- /dev/null
+++ b/data/as/30067699/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067699",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067699/ws-services-calculation/WCBillingSlab.json b/data/as/30067699/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8e6b9b8832
--- /dev/null
+++ b/data/as/30067699/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067699",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067707/BillingService/BusinessService.json b/data/as/30067707/BillingService/BusinessService.json
new file mode 100644
index 0000000000..40c0dc1072
--- /dev/null
+++ b/data/as/30067707/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067707",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067707/egov-location/boundary-data.json b/data/as/30067707/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0d56c3844
--- /dev/null
+++ b/data/as/30067707/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067707",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB KATARIHARA PWSS (NEW)",
+                "localname": "PUB KATARIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067707",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB KATARIHARA PWSS (NEW)",
+                        "localname": "PUB KATARIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB KATARIHARA PWSS (NEW)",
+                "localname": "PUB KATARIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067707",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB KATARIHARA PWSS (NEW)",
+                        "localname": "PUB KATARIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067707/ws-services-calculation/Penalty.json b/data/as/30067707/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ef71b63ec
--- /dev/null
+++ b/data/as/30067707/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067707",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067707/ws-services-calculation/WCBillingSlab.json b/data/as/30067707/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..34e0971a1f
--- /dev/null
+++ b/data/as/30067707/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067707",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067709/BillingService/BusinessService.json b/data/as/30067709/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d8aa570d8
--- /dev/null
+++ b/data/as/30067709/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067709",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067709/egov-location/boundary-data.json b/data/as/30067709/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cee6590368
--- /dev/null
+++ b/data/as/30067709/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067709",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAPARA PWSS (NEW)",
+                "localname": "BATAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067709",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAPARA PWSS (NEW)",
+                        "localname": "BATAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAPARA PWSS (NEW)",
+                "localname": "BATAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067709",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAPARA PWSS (NEW)",
+                        "localname": "BATAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067709/ws-services-calculation/Penalty.json b/data/as/30067709/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b134d5bb2
--- /dev/null
+++ b/data/as/30067709/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067709",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067709/ws-services-calculation/WCBillingSlab.json b/data/as/30067709/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4aac7aa36
--- /dev/null
+++ b/data/as/30067709/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067709",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067714/BillingService/BusinessService.json b/data/as/30067714/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5001d97c94
--- /dev/null
+++ b/data/as/30067714/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067714",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067714/egov-location/boundary-data.json b/data/as/30067714/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5c9d78e8b
--- /dev/null
+++ b/data/as/30067714/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067714",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRIBHASA PT-I PWSS (NEW)",
+                "localname": "DAMRIBHASA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067714",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRIBHASA PT-I PWSS (NEW)",
+                        "localname": "DAMRIBHASA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRIBHASA PT-I PWSS (NEW)",
+                "localname": "DAMRIBHASA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067714",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRIBHASA PT-I PWSS (NEW)",
+                        "localname": "DAMRIBHASA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067714/ws-services-calculation/Penalty.json b/data/as/30067714/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59f24ac4ea
--- /dev/null
+++ b/data/as/30067714/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067714",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067714/ws-services-calculation/WCBillingSlab.json b/data/as/30067714/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cb0b1e2710
--- /dev/null
+++ b/data/as/30067714/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067714",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067748/BillingService/BusinessService.json b/data/as/30067748/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ff754f1ff
--- /dev/null
+++ b/data/as/30067748/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067748",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067748/egov-location/boundary-data.json b/data/as/30067748/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eae82ef211
--- /dev/null
+++ b/data/as/30067748/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067748",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTARPARA CHAR PWSS (NEW)",
+                "localname": "SUTARPARA CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTARPARA CHAR PWSS (NEW)",
+                        "localname": "SUTARPARA CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTARPARA CHAR PWSS (NEW)",
+                "localname": "SUTARPARA CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067748",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTARPARA CHAR PWSS (NEW)",
+                        "localname": "SUTARPARA CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067748/ws-services-calculation/Penalty.json b/data/as/30067748/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1cbf46a728
--- /dev/null
+++ b/data/as/30067748/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067748",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067748/ws-services-calculation/WCBillingSlab.json b/data/as/30067748/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56d7508ae0
--- /dev/null
+++ b/data/as/30067748/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067748",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067790/BillingService/BusinessService.json b/data/as/30067790/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2cbd002d31
--- /dev/null
+++ b/data/as/30067790/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067790",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067790/egov-location/boundary-data.json b/data/as/30067790/egov-location/boundary-data.json
new file mode 100644
index 0000000000..66a5eb26da
--- /dev/null
+++ b/data/as/30067790/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067790",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUILIP NO.3 PWSS",
+                "localname": "TUILIP NO.3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067790",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUILIP NO.3 PWSS",
+                        "localname": "TUILIP NO.3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUILIP NO.3 PWSS",
+                "localname": "TUILIP NO.3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067790",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUILIP NO.3 PWSS",
+                        "localname": "TUILIP NO.3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067790/ws-services-calculation/Penalty.json b/data/as/30067790/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc5532e539
--- /dev/null
+++ b/data/as/30067790/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067790",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067790/ws-services-calculation/WCBillingSlab.json b/data/as/30067790/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f34143fdcc
--- /dev/null
+++ b/data/as/30067790/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067790",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067803/BillingService/BusinessService.json b/data/as/30067803/BillingService/BusinessService.json
new file mode 100644
index 0000000000..58976cfcdc
--- /dev/null
+++ b/data/as/30067803/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067803",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067803/egov-location/boundary-data.json b/data/as/30067803/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e564aecf1
--- /dev/null
+++ b/data/as/30067803/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067803",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM KATARIHARA PWSS (NEW)",
+                "localname": "PACHIM KATARIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM KATARIHARA PWSS (NEW)",
+                        "localname": "PACHIM KATARIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM KATARIHARA PWSS (NEW)",
+                "localname": "PACHIM KATARIHARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM KATARIHARA PWSS (NEW)",
+                        "localname": "PACHIM KATARIHARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067803/ws-services-calculation/Penalty.json b/data/as/30067803/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6db1e45dad
--- /dev/null
+++ b/data/as/30067803/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067803",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067803/ws-services-calculation/WCBillingSlab.json b/data/as/30067803/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dd3d87d523
--- /dev/null
+++ b/data/as/30067803/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067803",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067829/BillingService/BusinessService.json b/data/as/30067829/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b01e0a2e64
--- /dev/null
+++ b/data/as/30067829/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067829",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067829/egov-location/boundary-data.json b/data/as/30067829/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2e5628023
--- /dev/null
+++ b/data/as/30067829/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067829",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 ARUN TE PWSS",
+                "localname": "NO.3 ARUN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067829",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 ARUN TE PWSS",
+                        "localname": "NO.3 ARUN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 ARUN TE PWSS",
+                "localname": "NO.3 ARUN TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067829",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 ARUN TE PWSS",
+                        "localname": "NO.3 ARUN TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067829/ws-services-calculation/Penalty.json b/data/as/30067829/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4056a24a83
--- /dev/null
+++ b/data/as/30067829/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067829",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067829/ws-services-calculation/WCBillingSlab.json b/data/as/30067829/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a07c021212
--- /dev/null
+++ b/data/as/30067829/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067829",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067830/BillingService/BusinessService.json b/data/as/30067830/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4534b5bd5b
--- /dev/null
+++ b/data/as/30067830/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067830",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067830/egov-location/boundary-data.json b/data/as/30067830/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea26b02962
--- /dev/null
+++ b/data/as/30067830/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067830",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                "localname": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                        "localname": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                "localname": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                        "localname": "BANYAGURI BEPARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067830/ws-services-calculation/Penalty.json b/data/as/30067830/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ac4cfe0a58
--- /dev/null
+++ b/data/as/30067830/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067830",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067830/ws-services-calculation/WCBillingSlab.json b/data/as/30067830/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49bbfcf423
--- /dev/null
+++ b/data/as/30067830/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067830",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067861/BillingService/BusinessService.json b/data/as/30067861/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e3fdd24e4
--- /dev/null
+++ b/data/as/30067861/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067861",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067861/egov-location/boundary-data.json b/data/as/30067861/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54df7910bd
--- /dev/null
+++ b/data/as/30067861/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067861",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                "localname": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                        "localname": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                "localname": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                        "localname": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067861/ws-services-calculation/Penalty.json b/data/as/30067861/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94fd235260
--- /dev/null
+++ b/data/as/30067861/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067861",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067861/ws-services-calculation/WCBillingSlab.json b/data/as/30067861/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..24d9a0a5f3
--- /dev/null
+++ b/data/as/30067861/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067861",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067915/BillingService/BusinessService.json b/data/as/30067915/BillingService/BusinessService.json
new file mode 100644
index 0000000000..442f2a8062
--- /dev/null
+++ b/data/as/30067915/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067915",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067915/egov-location/boundary-data.json b/data/as/30067915/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c6367ae46e
--- /dev/null
+++ b/data/as/30067915/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067915",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                "localname": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                        "localname": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                "localname": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067915",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                        "localname": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067915/ws-services-calculation/Penalty.json b/data/as/30067915/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e51bec824f
--- /dev/null
+++ b/data/as/30067915/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067915",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067915/ws-services-calculation/WCBillingSlab.json b/data/as/30067915/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..62d538f2d6
--- /dev/null
+++ b/data/as/30067915/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067915",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067928/BillingService/BusinessService.json b/data/as/30067928/BillingService/BusinessService.json
new file mode 100644
index 0000000000..821c6fca0e
--- /dev/null
+++ b/data/as/30067928/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067928",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067928/egov-location/boundary-data.json b/data/as/30067928/egov-location/boundary-data.json
new file mode 100644
index 0000000000..77983594fb
--- /dev/null
+++ b/data/as/30067928/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067928",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASHIKATA PWSS (NEW)",
+                "localname": "KASHIKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067928",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASHIKATA PWSS (NEW)",
+                        "localname": "KASHIKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASHIKATA PWSS (NEW)",
+                "localname": "KASHIKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067928",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASHIKATA PWSS (NEW)",
+                        "localname": "KASHIKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067928/ws-services-calculation/Penalty.json b/data/as/30067928/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d93fc964da
--- /dev/null
+++ b/data/as/30067928/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067928",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067928/ws-services-calculation/WCBillingSlab.json b/data/as/30067928/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c46621eb67
--- /dev/null
+++ b/data/as/30067928/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067928",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067938/BillingService/BusinessService.json b/data/as/30067938/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5cc1c87869
--- /dev/null
+++ b/data/as/30067938/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067938",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067938/egov-location/boundary-data.json b/data/as/30067938/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2b56539e28
--- /dev/null
+++ b/data/as/30067938/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067938",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHIN TARANGAPUR PWSS (NEW)",
+                "localname": "DAKHIN TARANGAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067938",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHIN TARANGAPUR PWSS (NEW)",
+                        "localname": "DAKHIN TARANGAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHIN TARANGAPUR PWSS (NEW)",
+                "localname": "DAKHIN TARANGAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067938",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHIN TARANGAPUR PWSS (NEW)",
+                        "localname": "DAKHIN TARANGAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067938/ws-services-calculation/Penalty.json b/data/as/30067938/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c4e7f66114
--- /dev/null
+++ b/data/as/30067938/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067938",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067938/ws-services-calculation/WCBillingSlab.json b/data/as/30067938/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f90460853
--- /dev/null
+++ b/data/as/30067938/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067938",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067942/BillingService/BusinessService.json b/data/as/30067942/BillingService/BusinessService.json
new file mode 100644
index 0000000000..387bbab5a6
--- /dev/null
+++ b/data/as/30067942/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067942",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067942/egov-location/boundary-data.json b/data/as/30067942/egov-location/boundary-data.json
new file mode 100644
index 0000000000..63d2bd0db9
--- /dev/null
+++ b/data/as/30067942/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067942",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 TINISARIA BAGAN PWSS",
+                "localname": "NO.3 TINISARIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 TINISARIA BAGAN PWSS",
+                        "localname": "NO.3 TINISARIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 TINISARIA BAGAN PWSS",
+                "localname": "NO.3 TINISARIA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 TINISARIA BAGAN PWSS",
+                        "localname": "NO.3 TINISARIA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067942/ws-services-calculation/Penalty.json b/data/as/30067942/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b67282efb
--- /dev/null
+++ b/data/as/30067942/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067942",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067942/ws-services-calculation/WCBillingSlab.json b/data/as/30067942/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d7ab6d5129
--- /dev/null
+++ b/data/as/30067942/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067942",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067950/BillingService/BusinessService.json b/data/as/30067950/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce085e3ab8
--- /dev/null
+++ b/data/as/30067950/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067950",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067950/egov-location/boundary-data.json b/data/as/30067950/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87d2ed6c3b
--- /dev/null
+++ b/data/as/30067950/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067950",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                "localname": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067950",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                        "localname": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                "localname": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067950",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                        "localname": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067950/ws-services-calculation/Penalty.json b/data/as/30067950/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec49ec65d3
--- /dev/null
+++ b/data/as/30067950/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067950",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067950/ws-services-calculation/WCBillingSlab.json b/data/as/30067950/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ae23e23f6
--- /dev/null
+++ b/data/as/30067950/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067950",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067958/BillingService/BusinessService.json b/data/as/30067958/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3217154b8d
--- /dev/null
+++ b/data/as/30067958/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067958",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067958/egov-location/boundary-data.json b/data/as/30067958/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19cd0eb552
--- /dev/null
+++ b/data/as/30067958/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067958",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARVITA PWSS (NEW)",
+                "localname": "BARVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067958",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARVITA PWSS (NEW)",
+                        "localname": "BARVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARVITA PWSS (NEW)",
+                "localname": "BARVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067958",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARVITA PWSS (NEW)",
+                        "localname": "BARVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067958/ws-services-calculation/Penalty.json b/data/as/30067958/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..36381d2cad
--- /dev/null
+++ b/data/as/30067958/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067958",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067958/ws-services-calculation/WCBillingSlab.json b/data/as/30067958/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b0180c4757
--- /dev/null
+++ b/data/as/30067958/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067958",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067962/BillingService/BusinessService.json b/data/as/30067962/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94dd1b1d1b
--- /dev/null
+++ b/data/as/30067962/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067962",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067962/egov-location/boundary-data.json b/data/as/30067962/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e9f84fcc88
--- /dev/null
+++ b/data/as/30067962/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067962",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHARATNA NC PWSS (NEW)",
+                "localname": "PANCHARATNA NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067962",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHARATNA NC PWSS (NEW)",
+                        "localname": "PANCHARATNA NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHARATNA NC PWSS (NEW)",
+                "localname": "PANCHARATNA NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067962",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHARATNA NC PWSS (NEW)",
+                        "localname": "PANCHARATNA NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067962/ws-services-calculation/Penalty.json b/data/as/30067962/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f60ba00903
--- /dev/null
+++ b/data/as/30067962/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067962",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067962/ws-services-calculation/WCBillingSlab.json b/data/as/30067962/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b22ba7f5b9
--- /dev/null
+++ b/data/as/30067962/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067962",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067985/BillingService/BusinessService.json b/data/as/30067985/BillingService/BusinessService.json
new file mode 100644
index 0000000000..91fc32b1f8
--- /dev/null
+++ b/data/as/30067985/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067985",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067985/egov-location/boundary-data.json b/data/as/30067985/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a94d94767
--- /dev/null
+++ b/data/as/30067985/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067985",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ATHIABARI PWSS",
+                "localname": "ATHIABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067985",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ATHIABARI PWSS",
+                        "localname": "ATHIABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ATHIABARI PWSS",
+                "localname": "ATHIABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067985",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ATHIABARI PWSS",
+                        "localname": "ATHIABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067985/ws-services-calculation/Penalty.json b/data/as/30067985/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c1cb4072f
--- /dev/null
+++ b/data/as/30067985/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067985",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067985/ws-services-calculation/WCBillingSlab.json b/data/as/30067985/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..12fd73cf66
--- /dev/null
+++ b/data/as/30067985/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067985",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067989/BillingService/BusinessService.json b/data/as/30067989/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0ca24d5693
--- /dev/null
+++ b/data/as/30067989/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30067989",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067989/egov-location/boundary-data.json b/data/as/30067989/egov-location/boundary-data.json
new file mode 100644
index 0000000000..654ec68a46
--- /dev/null
+++ b/data/as/30067989/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30067989",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                "localname": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                        "localname": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                "localname": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30067989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                        "localname": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067989/ws-services-calculation/Penalty.json b/data/as/30067989/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..794ec3adc1
--- /dev/null
+++ b/data/as/30067989/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30067989",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30067989/ws-services-calculation/WCBillingSlab.json b/data/as/30067989/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d7675b6e5f
--- /dev/null
+++ b/data/as/30067989/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30067989",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068077/BillingService/BusinessService.json b/data/as/30068077/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b5e7803f2
--- /dev/null
+++ b/data/as/30068077/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068077",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068077/egov-location/boundary-data.json b/data/as/30068077/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bf55c604d4
--- /dev/null
+++ b/data/as/30068077/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068077",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA PT-II PWSS (NEW)",
+                "localname": "TUKURA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA PT-II PWSS (NEW)",
+                        "localname": "TUKURA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA PT-II PWSS (NEW)",
+                "localname": "TUKURA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA PT-II PWSS (NEW)",
+                        "localname": "TUKURA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068077/ws-services-calculation/Penalty.json b/data/as/30068077/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef805bdbd2
--- /dev/null
+++ b/data/as/30068077/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068077",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068077/ws-services-calculation/WCBillingSlab.json b/data/as/30068077/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b0afce9550
--- /dev/null
+++ b/data/as/30068077/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068077",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068088/BillingService/BusinessService.json b/data/as/30068088/BillingService/BusinessService.json
new file mode 100644
index 0000000000..853e961833
--- /dev/null
+++ b/data/as/30068088/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068088",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068088/egov-location/boundary-data.json b/data/as/30068088/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d141330ea
--- /dev/null
+++ b/data/as/30068088/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068088",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORSIMLA PWSS (NEW)",
+                "localname": "BORSIMLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORSIMLA PWSS (NEW)",
+                        "localname": "BORSIMLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORSIMLA PWSS (NEW)",
+                "localname": "BORSIMLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORSIMLA PWSS (NEW)",
+                        "localname": "BORSIMLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068088/ws-services-calculation/Penalty.json b/data/as/30068088/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d2dea5183
--- /dev/null
+++ b/data/as/30068088/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068088",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068088/ws-services-calculation/WCBillingSlab.json b/data/as/30068088/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b9b77cc668
--- /dev/null
+++ b/data/as/30068088/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068088",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068096/BillingService/BusinessService.json b/data/as/30068096/BillingService/BusinessService.json
new file mode 100644
index 0000000000..20cd029876
--- /dev/null
+++ b/data/as/30068096/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068096",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068096/egov-location/boundary-data.json b/data/as/30068096/egov-location/boundary-data.json
new file mode 100644
index 0000000000..823b5805a0
--- /dev/null
+++ b/data/as/30068096/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068096",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONGAIR PACHIMPAR PWSS (NEW)",
+                "localname": "KONGAIR PACHIMPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONGAIR PACHIMPAR PWSS (NEW)",
+                        "localname": "KONGAIR PACHIMPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONGAIR PACHIMPAR PWSS (NEW)",
+                "localname": "KONGAIR PACHIMPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONGAIR PACHIMPAR PWSS (NEW)",
+                        "localname": "KONGAIR PACHIMPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068096/ws-services-calculation/Penalty.json b/data/as/30068096/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..58a0685d3f
--- /dev/null
+++ b/data/as/30068096/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068096",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068096/ws-services-calculation/WCBillingSlab.json b/data/as/30068096/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9894fe092
--- /dev/null
+++ b/data/as/30068096/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068096",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068187/BillingService/BusinessService.json b/data/as/30068187/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc97a7f63a
--- /dev/null
+++ b/data/as/30068187/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068187",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068187/egov-location/boundary-data.json b/data/as/30068187/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b5e177a626
--- /dev/null
+++ b/data/as/30068187/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068187",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAMPARA PWSS (NEW)",
+                "localname": "LAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068187",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAMPARA PWSS (NEW)",
+                        "localname": "LAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAMPARA PWSS (NEW)",
+                "localname": "LAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068187",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAMPARA PWSS (NEW)",
+                        "localname": "LAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068187/ws-services-calculation/Penalty.json b/data/as/30068187/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..447384ddfb
--- /dev/null
+++ b/data/as/30068187/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068187",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068187/ws-services-calculation/WCBillingSlab.json b/data/as/30068187/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d033346a9d
--- /dev/null
+++ b/data/as/30068187/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068187",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068194/BillingService/BusinessService.json b/data/as/30068194/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca219c6f7b
--- /dev/null
+++ b/data/as/30068194/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068194",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068194/egov-location/boundary-data.json b/data/as/30068194/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a4405a939
--- /dev/null
+++ b/data/as/30068194/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068194",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHENGAMARI PWSS (NEW)",
+                "localname": "GHENGAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHENGAMARI PWSS (NEW)",
+                        "localname": "GHENGAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHENGAMARI PWSS (NEW)",
+                "localname": "GHENGAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHENGAMARI PWSS (NEW)",
+                        "localname": "GHENGAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068194/ws-services-calculation/Penalty.json b/data/as/30068194/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95a3cc4667
--- /dev/null
+++ b/data/as/30068194/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068194",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068194/ws-services-calculation/WCBillingSlab.json b/data/as/30068194/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aaf13521c0
--- /dev/null
+++ b/data/as/30068194/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068194",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068198/BillingService/BusinessService.json b/data/as/30068198/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6847919da3
--- /dev/null
+++ b/data/as/30068198/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068198",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068198/egov-location/boundary-data.json b/data/as/30068198/egov-location/boundary-data.json
new file mode 100644
index 0000000000..73c17ebd26
--- /dev/null
+++ b/data/as/30068198/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068198",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURUABHASHA PT-II PWSS (NEW)",
+                "localname": "KURUABHASHA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURUABHASHA PT-II PWSS (NEW)",
+                        "localname": "KURUABHASHA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURUABHASHA PT-II PWSS (NEW)",
+                "localname": "KURUABHASHA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068198",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURUABHASHA PT-II PWSS (NEW)",
+                        "localname": "KURUABHASHA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068198/ws-services-calculation/Penalty.json b/data/as/30068198/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..234873e658
--- /dev/null
+++ b/data/as/30068198/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068198",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068198/ws-services-calculation/WCBillingSlab.json b/data/as/30068198/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ab962abb9e
--- /dev/null
+++ b/data/as/30068198/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068198",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068210/BillingService/BusinessService.json b/data/as/30068210/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dea8b9b23b
--- /dev/null
+++ b/data/as/30068210/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068210",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068210/egov-location/boundary-data.json b/data/as/30068210/egov-location/boundary-data.json
new file mode 100644
index 0000000000..80327a22b9
--- /dev/null
+++ b/data/as/30068210/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068210",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDRABARI PWSS (NEW)",
+                "localname": "GENDRABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDRABARI PWSS (NEW)",
+                        "localname": "GENDRABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDRABARI PWSS (NEW)",
+                "localname": "GENDRABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDRABARI PWSS (NEW)",
+                        "localname": "GENDRABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068210/ws-services-calculation/Penalty.json b/data/as/30068210/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3cafd72509
--- /dev/null
+++ b/data/as/30068210/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068210",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068210/ws-services-calculation/WCBillingSlab.json b/data/as/30068210/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..62f0d45bc2
--- /dev/null
+++ b/data/as/30068210/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068210",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068218/BillingService/BusinessService.json b/data/as/30068218/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b46bc53fb1
--- /dev/null
+++ b/data/as/30068218/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068218",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068218/egov-location/boundary-data.json b/data/as/30068218/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9a6ef5c4bf
--- /dev/null
+++ b/data/as/30068218/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068218",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHURI PWSS (NEW)",
+                "localname": "KATHURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068218",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHURI PWSS (NEW)",
+                        "localname": "KATHURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHURI PWSS (NEW)",
+                "localname": "KATHURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068218",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHURI PWSS (NEW)",
+                        "localname": "KATHURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068218/ws-services-calculation/Penalty.json b/data/as/30068218/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d11c02ec81
--- /dev/null
+++ b/data/as/30068218/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068218",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068218/ws-services-calculation/WCBillingSlab.json b/data/as/30068218/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68090229fd
--- /dev/null
+++ b/data/as/30068218/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068218",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068225/BillingService/BusinessService.json b/data/as/30068225/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57addce1ac
--- /dev/null
+++ b/data/as/30068225/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068225",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068225/egov-location/boundary-data.json b/data/as/30068225/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3d9f355d2c
--- /dev/null
+++ b/data/as/30068225/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068225",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI PT-II PWSS (NEW)",
+                "localname": "BHALUKDUBI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068225",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI PT-II PWSS (NEW)",
+                        "localname": "BHALUKDUBI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI PT-II PWSS (NEW)",
+                "localname": "BHALUKDUBI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068225",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI PT-II PWSS (NEW)",
+                        "localname": "BHALUKDUBI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068225/ws-services-calculation/Penalty.json b/data/as/30068225/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6ab770c42
--- /dev/null
+++ b/data/as/30068225/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068225",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068225/ws-services-calculation/WCBillingSlab.json b/data/as/30068225/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54367d6549
--- /dev/null
+++ b/data/as/30068225/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068225",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068229/BillingService/BusinessService.json b/data/as/30068229/BillingService/BusinessService.json
new file mode 100644
index 0000000000..405f98ec7f
--- /dev/null
+++ b/data/as/30068229/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068229",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068229/egov-location/boundary-data.json b/data/as/30068229/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6e432a00d4
--- /dev/null
+++ b/data/as/30068229/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068229",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA [ B ] PWSS (NEW)",
+                "localname": "SAKTOLA [ B ] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068229",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA [ B ] PWSS (NEW)",
+                        "localname": "SAKTOLA [ B ] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA [ B ] PWSS (NEW)",
+                "localname": "SAKTOLA [ B ] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068229",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA [ B ] PWSS (NEW)",
+                        "localname": "SAKTOLA [ B ] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068229/ws-services-calculation/Penalty.json b/data/as/30068229/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b0e1cd71e9
--- /dev/null
+++ b/data/as/30068229/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068229",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068229/ws-services-calculation/WCBillingSlab.json b/data/as/30068229/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b77f73648a
--- /dev/null
+++ b/data/as/30068229/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068229",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068331/BillingService/BusinessService.json b/data/as/30068331/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a4fb4b11bb
--- /dev/null
+++ b/data/as/30068331/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068331",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068331/egov-location/boundary-data.json b/data/as/30068331/egov-location/boundary-data.json
new file mode 100644
index 0000000000..67a67f0e86
--- /dev/null
+++ b/data/as/30068331/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068331",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGAPATHAR PWSS",
+                "localname": "NAGAPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068331",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGAPATHAR PWSS",
+                        "localname": "NAGAPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGAPATHAR PWSS",
+                "localname": "NAGAPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068331",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGAPATHAR PWSS",
+                        "localname": "NAGAPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068331/ws-services-calculation/Penalty.json b/data/as/30068331/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f51226a2b
--- /dev/null
+++ b/data/as/30068331/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068331",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068331/ws-services-calculation/WCBillingSlab.json b/data/as/30068331/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f52cfa682c
--- /dev/null
+++ b/data/as/30068331/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068331",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068340/BillingService/BusinessService.json b/data/as/30068340/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b131ebbf6f
--- /dev/null
+++ b/data/as/30068340/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068340",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068340/egov-location/boundary-data.json b/data/as/30068340/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2411de128
--- /dev/null
+++ b/data/as/30068340/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068340",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAKUA CHAPARI PWSS",
+                "localname": "MAKUA CHAPARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068340",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAKUA CHAPARI PWSS",
+                        "localname": "MAKUA CHAPARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAKUA CHAPARI PWSS",
+                "localname": "MAKUA CHAPARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068340",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAKUA CHAPARI PWSS",
+                        "localname": "MAKUA CHAPARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068340/ws-services-calculation/Penalty.json b/data/as/30068340/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5d4188b2f6
--- /dev/null
+++ b/data/as/30068340/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068340",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068340/ws-services-calculation/WCBillingSlab.json b/data/as/30068340/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d6f712024
--- /dev/null
+++ b/data/as/30068340/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068340",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068345/BillingService/BusinessService.json b/data/as/30068345/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7f46c3a60b
--- /dev/null
+++ b/data/as/30068345/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068345",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068345/egov-location/boundary-data.json b/data/as/30068345/egov-location/boundary-data.json
new file mode 100644
index 0000000000..209faf9afd
--- /dev/null
+++ b/data/as/30068345/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068345",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                "localname": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068345",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                        "localname": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                "localname": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068345",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                        "localname": "SAIKIA CHUBURI DEKAR GAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068345/ws-services-calculation/Penalty.json b/data/as/30068345/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1ce59e241
--- /dev/null
+++ b/data/as/30068345/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068345",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068345/ws-services-calculation/WCBillingSlab.json b/data/as/30068345/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2778038ef
--- /dev/null
+++ b/data/as/30068345/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068345",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068356/BillingService/BusinessService.json b/data/as/30068356/BillingService/BusinessService.json
new file mode 100644
index 0000000000..25a5192a7e
--- /dev/null
+++ b/data/as/30068356/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068356",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068356/egov-location/boundary-data.json b/data/as/30068356/egov-location/boundary-data.json
new file mode 100644
index 0000000000..caad316cd1
--- /dev/null
+++ b/data/as/30068356/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068356",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAHAMARI PWSS",
+                "localname": "JAHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAHAMARI PWSS",
+                        "localname": "JAHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAHAMARI PWSS",
+                "localname": "JAHAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAHAMARI PWSS",
+                        "localname": "JAHAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068356/ws-services-calculation/Penalty.json b/data/as/30068356/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e720eefb43
--- /dev/null
+++ b/data/as/30068356/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068356",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068356/ws-services-calculation/WCBillingSlab.json b/data/as/30068356/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d52eebf8e
--- /dev/null
+++ b/data/as/30068356/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068356",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068380/BillingService/BusinessService.json b/data/as/30068380/BillingService/BusinessService.json
new file mode 100644
index 0000000000..343b803f48
--- /dev/null
+++ b/data/as/30068380/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068380",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068380/egov-location/boundary-data.json b/data/as/30068380/egov-location/boundary-data.json
new file mode 100644
index 0000000000..669a3ba028
--- /dev/null
+++ b/data/as/30068380/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068380",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARENKATI BENGALI PWSS",
+                "localname": "NARENKATI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068380",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARENKATI BENGALI PWSS",
+                        "localname": "NARENKATI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARENKATI BENGALI PWSS",
+                "localname": "NARENKATI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068380",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARENKATI BENGALI PWSS",
+                        "localname": "NARENKATI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068380/ws-services-calculation/Penalty.json b/data/as/30068380/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f96a1d1066
--- /dev/null
+++ b/data/as/30068380/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068380",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068380/ws-services-calculation/WCBillingSlab.json b/data/as/30068380/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd246f8926
--- /dev/null
+++ b/data/as/30068380/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068380",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068419/BillingService/BusinessService.json b/data/as/30068419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c081e7af59
--- /dev/null
+++ b/data/as/30068419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068419/egov-location/boundary-data.json b/data/as/30068419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c035d8f8d1
--- /dev/null
+++ b/data/as/30068419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHATUA PWSS",
+                "localname": "GHATUA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHATUA PWSS",
+                        "localname": "GHATUA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHATUA PWSS",
+                "localname": "GHATUA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHATUA PWSS",
+                        "localname": "GHATUA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068419/ws-services-calculation/Penalty.json b/data/as/30068419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ddd81ff84
--- /dev/null
+++ b/data/as/30068419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068419/ws-services-calculation/WCBillingSlab.json b/data/as/30068419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd8a638ca2
--- /dev/null
+++ b/data/as/30068419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068422/BillingService/BusinessService.json b/data/as/30068422/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cc447bf23
--- /dev/null
+++ b/data/as/30068422/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068422",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068422/egov-location/boundary-data.json b/data/as/30068422/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c80a0c2fa
--- /dev/null
+++ b/data/as/30068422/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068422",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANTAPUR NAMAPARA PWSS (NEW)",
+                "localname": "KANTAPUR NAMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068422",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANTAPUR NAMAPARA PWSS (NEW)",
+                        "localname": "KANTAPUR NAMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANTAPUR NAMAPARA PWSS (NEW)",
+                "localname": "KANTAPUR NAMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068422",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANTAPUR NAMAPARA PWSS (NEW)",
+                        "localname": "KANTAPUR NAMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068422/ws-services-calculation/Penalty.json b/data/as/30068422/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f89d003536
--- /dev/null
+++ b/data/as/30068422/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068422",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068422/ws-services-calculation/WCBillingSlab.json b/data/as/30068422/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c3890b5a3e
--- /dev/null
+++ b/data/as/30068422/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068422",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068427/BillingService/BusinessService.json b/data/as/30068427/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0a61a6188e
--- /dev/null
+++ b/data/as/30068427/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068427",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068427/egov-location/boundary-data.json b/data/as/30068427/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97f82978c0
--- /dev/null
+++ b/data/as/30068427/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068427",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI I PWSS (NEW)",
+                "localname": "DIGHALI I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI I PWSS (NEW)",
+                        "localname": "DIGHALI I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI I PWSS (NEW)",
+                "localname": "DIGHALI I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI I PWSS (NEW)",
+                        "localname": "DIGHALI I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068427/ws-services-calculation/Penalty.json b/data/as/30068427/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c218a2190e
--- /dev/null
+++ b/data/as/30068427/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068427",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068427/ws-services-calculation/WCBillingSlab.json b/data/as/30068427/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d471e192b5
--- /dev/null
+++ b/data/as/30068427/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068427",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068428/BillingService/BusinessService.json b/data/as/30068428/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5a11bcbb53
--- /dev/null
+++ b/data/as/30068428/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068428",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068428/egov-location/boundary-data.json b/data/as/30068428/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60b653b4ba
--- /dev/null
+++ b/data/as/30068428/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068428",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                "localname": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                        "localname": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                "localname": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068428",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                        "localname": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068428/ws-services-calculation/Penalty.json b/data/as/30068428/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..351dc4f1b8
--- /dev/null
+++ b/data/as/30068428/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068428",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068428/ws-services-calculation/WCBillingSlab.json b/data/as/30068428/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..95a2e6c3ba
--- /dev/null
+++ b/data/as/30068428/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068428",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068533/BillingService/BusinessService.json b/data/as/30068533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a97e937421
--- /dev/null
+++ b/data/as/30068533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068533/egov-location/boundary-data.json b/data/as/30068533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4a9ce9e140
--- /dev/null
+++ b/data/as/30068533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOWANG BARI DAFALA PWSS",
+                "localname": "DOWANG BARI DAFALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOWANG BARI DAFALA PWSS",
+                        "localname": "DOWANG BARI DAFALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOWANG BARI DAFALA PWSS",
+                "localname": "DOWANG BARI DAFALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOWANG BARI DAFALA PWSS",
+                        "localname": "DOWANG BARI DAFALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068533/ws-services-calculation/Penalty.json b/data/as/30068533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..668120547b
--- /dev/null
+++ b/data/as/30068533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068533/ws-services-calculation/WCBillingSlab.json b/data/as/30068533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a4c5fc5ae2
--- /dev/null
+++ b/data/as/30068533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068606/BillingService/BusinessService.json b/data/as/30068606/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d07d2c54e5
--- /dev/null
+++ b/data/as/30068606/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068606",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068606/egov-location/boundary-data.json b/data/as/30068606/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e67cd64682
--- /dev/null
+++ b/data/as/30068606/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068606",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA 1 PWSS (NEW)",
+                "localname": "MANUPARA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA 1 PWSS (NEW)",
+                        "localname": "MANUPARA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA 1 PWSS (NEW)",
+                "localname": "MANUPARA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA 1 PWSS (NEW)",
+                        "localname": "MANUPARA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068606/ws-services-calculation/Penalty.json b/data/as/30068606/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..670ce788ba
--- /dev/null
+++ b/data/as/30068606/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068606",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068606/ws-services-calculation/WCBillingSlab.json b/data/as/30068606/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bb3c552306
--- /dev/null
+++ b/data/as/30068606/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068606",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068609/BillingService/BusinessService.json b/data/as/30068609/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f0138e816
--- /dev/null
+++ b/data/as/30068609/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068609",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068609/egov-location/boundary-data.json b/data/as/30068609/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a01daf279e
--- /dev/null
+++ b/data/as/30068609/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068609",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PENCHIMARI PWSS (NEW)",
+                "localname": "PENCHIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PENCHIMARI PWSS (NEW)",
+                        "localname": "PENCHIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PENCHIMARI PWSS (NEW)",
+                "localname": "PENCHIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PENCHIMARI PWSS (NEW)",
+                        "localname": "PENCHIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068609/ws-services-calculation/Penalty.json b/data/as/30068609/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..61506e4f94
--- /dev/null
+++ b/data/as/30068609/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068609",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068609/ws-services-calculation/WCBillingSlab.json b/data/as/30068609/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2075f4de2f
--- /dev/null
+++ b/data/as/30068609/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068609",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068614/BillingService/BusinessService.json b/data/as/30068614/BillingService/BusinessService.json
new file mode 100644
index 0000000000..657062f8e0
--- /dev/null
+++ b/data/as/30068614/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068614",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068614/egov-location/boundary-data.json b/data/as/30068614/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7687ea33a3
--- /dev/null
+++ b/data/as/30068614/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068614",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOWKAKATA PWSS (NEW)",
+                "localname": "CHOWKAKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068614",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOWKAKATA PWSS (NEW)",
+                        "localname": "CHOWKAKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOWKAKATA PWSS (NEW)",
+                "localname": "CHOWKAKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068614",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOWKAKATA PWSS (NEW)",
+                        "localname": "CHOWKAKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068614/ws-services-calculation/Penalty.json b/data/as/30068614/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..004acb6881
--- /dev/null
+++ b/data/as/30068614/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068614",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068614/ws-services-calculation/WCBillingSlab.json b/data/as/30068614/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bfa7da7814
--- /dev/null
+++ b/data/as/30068614/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068614",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068620/BillingService/BusinessService.json b/data/as/30068620/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ca0212df3
--- /dev/null
+++ b/data/as/30068620/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068620",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068620/egov-location/boundary-data.json b/data/as/30068620/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b5e395aee0
--- /dev/null
+++ b/data/as/30068620/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068620",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANSIR CHAR PWSS (NEW)",
+                "localname": "BANSIR CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANSIR CHAR PWSS (NEW)",
+                        "localname": "BANSIR CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANSIR CHAR PWSS (NEW)",
+                "localname": "BANSIR CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANSIR CHAR PWSS (NEW)",
+                        "localname": "BANSIR CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068620/ws-services-calculation/Penalty.json b/data/as/30068620/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08d3367766
--- /dev/null
+++ b/data/as/30068620/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068620",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068620/ws-services-calculation/WCBillingSlab.json b/data/as/30068620/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b5daf1a02c
--- /dev/null
+++ b/data/as/30068620/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068620",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068648/BillingService/BusinessService.json b/data/as/30068648/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db874cdac3
--- /dev/null
+++ b/data/as/30068648/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068648",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068648/egov-location/boundary-data.json b/data/as/30068648/egov-location/boundary-data.json
new file mode 100644
index 0000000000..05d5410348
--- /dev/null
+++ b/data/as/30068648/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068648",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAI MIRI GAON PWSS",
+                "localname": "SONAI MIRI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAI MIRI GAON PWSS",
+                        "localname": "SONAI MIRI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAI MIRI GAON PWSS",
+                "localname": "SONAI MIRI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAI MIRI GAON PWSS",
+                        "localname": "SONAI MIRI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068648/ws-services-calculation/Penalty.json b/data/as/30068648/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5256cec1f1
--- /dev/null
+++ b/data/as/30068648/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068648",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068648/ws-services-calculation/WCBillingSlab.json b/data/as/30068648/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93359c1b9f
--- /dev/null
+++ b/data/as/30068648/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068648",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068650/BillingService/BusinessService.json b/data/as/30068650/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b313c1907
--- /dev/null
+++ b/data/as/30068650/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068650",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068650/egov-location/boundary-data.json b/data/as/30068650/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c9200e8109
--- /dev/null
+++ b/data/as/30068650/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068650",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                "localname": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                        "localname": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                "localname": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                        "localname": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068650/ws-services-calculation/Penalty.json b/data/as/30068650/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d2440070a4
--- /dev/null
+++ b/data/as/30068650/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068650",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068650/ws-services-calculation/WCBillingSlab.json b/data/as/30068650/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5483a62ef8
--- /dev/null
+++ b/data/as/30068650/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068650",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068669/BillingService/BusinessService.json b/data/as/30068669/BillingService/BusinessService.json
new file mode 100644
index 0000000000..48a7d5066c
--- /dev/null
+++ b/data/as/30068669/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068669",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068669/egov-location/boundary-data.json b/data/as/30068669/egov-location/boundary-data.json
new file mode 100644
index 0000000000..481eb8affd
--- /dev/null
+++ b/data/as/30068669/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068669",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARIAM NAGAR PWSS (NEW)",
+                "localname": "MARIAM NAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068669",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARIAM NAGAR PWSS (NEW)",
+                        "localname": "MARIAM NAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARIAM NAGAR PWSS (NEW)",
+                "localname": "MARIAM NAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068669",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARIAM NAGAR PWSS (NEW)",
+                        "localname": "MARIAM NAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068669/ws-services-calculation/Penalty.json b/data/as/30068669/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..93a63b59ad
--- /dev/null
+++ b/data/as/30068669/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068669",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068669/ws-services-calculation/WCBillingSlab.json b/data/as/30068669/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6db2816216
--- /dev/null
+++ b/data/as/30068669/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068669",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068672/BillingService/BusinessService.json b/data/as/30068672/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f80f10c326
--- /dev/null
+++ b/data/as/30068672/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30068672",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068672/egov-location/boundary-data.json b/data/as/30068672/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ff5b20e38
--- /dev/null
+++ b/data/as/30068672/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30068672",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTKI PWSS (NEW)",
+                "localname": "SUTKI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068672",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTKI PWSS (NEW)",
+                        "localname": "SUTKI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTKI PWSS (NEW)",
+                "localname": "SUTKI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30068672",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTKI PWSS (NEW)",
+                        "localname": "SUTKI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068672/ws-services-calculation/Penalty.json b/data/as/30068672/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbaa4dcdfa
--- /dev/null
+++ b/data/as/30068672/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30068672",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30068672/ws-services-calculation/WCBillingSlab.json b/data/as/30068672/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..627072b1ac
--- /dev/null
+++ b/data/as/30068672/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30068672",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069086/BillingService/BusinessService.json b/data/as/30069086/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d0c3cce179
--- /dev/null
+++ b/data/as/30069086/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069086",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069086/egov-location/boundary-data.json b/data/as/30069086/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f452488565
--- /dev/null
+++ b/data/as/30069086/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069086",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUCHDHOWAPARA PWSS (NEW)",
+                "localname": "KUCHDHOWAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUCHDHOWAPARA PWSS (NEW)",
+                        "localname": "KUCHDHOWAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUCHDHOWAPARA PWSS (NEW)",
+                "localname": "KUCHDHOWAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUCHDHOWAPARA PWSS (NEW)",
+                        "localname": "KUCHDHOWAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069086/ws-services-calculation/Penalty.json b/data/as/30069086/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1c71a1043c
--- /dev/null
+++ b/data/as/30069086/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069086",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069086/ws-services-calculation/WCBillingSlab.json b/data/as/30069086/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2eec82ea70
--- /dev/null
+++ b/data/as/30069086/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069086",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069093/BillingService/BusinessService.json b/data/as/30069093/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07ed306417
--- /dev/null
+++ b/data/as/30069093/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069093",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069093/egov-location/boundary-data.json b/data/as/30069093/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03ebe80d97
--- /dev/null
+++ b/data/as/30069093/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069093",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMJONGA PWSS (NEW)",
+                "localname": "AMJONGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069093",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMJONGA PWSS (NEW)",
+                        "localname": "AMJONGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMJONGA PWSS (NEW)",
+                "localname": "AMJONGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069093",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMJONGA PWSS (NEW)",
+                        "localname": "AMJONGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069093/ws-services-calculation/Penalty.json b/data/as/30069093/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd316439ce
--- /dev/null
+++ b/data/as/30069093/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069093",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069093/ws-services-calculation/WCBillingSlab.json b/data/as/30069093/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fa59d7a10f
--- /dev/null
+++ b/data/as/30069093/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069093",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069124/BillingService/BusinessService.json b/data/as/30069124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dba05cd08
--- /dev/null
+++ b/data/as/30069124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069124/egov-location/boundary-data.json b/data/as/30069124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0a3e6e4c35
--- /dev/null
+++ b/data/as/30069124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKURBHITA NC PWSS (NEW)",
+                "localname": "DAKURBHITA NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKURBHITA NC PWSS (NEW)",
+                        "localname": "DAKURBHITA NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKURBHITA NC PWSS (NEW)",
+                "localname": "DAKURBHITA NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKURBHITA NC PWSS (NEW)",
+                        "localname": "DAKURBHITA NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069124/ws-services-calculation/Penalty.json b/data/as/30069124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27d5fe5517
--- /dev/null
+++ b/data/as/30069124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069124/ws-services-calculation/WCBillingSlab.json b/data/as/30069124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6230f74ea
--- /dev/null
+++ b/data/as/30069124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069136/BillingService/BusinessService.json b/data/as/30069136/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19721b802e
--- /dev/null
+++ b/data/as/30069136/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069136",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069136/egov-location/boundary-data.json b/data/as/30069136/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a93777e886
--- /dev/null
+++ b/data/as/30069136/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069136",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLABARI-A PWSS (NEW)",
+                "localname": "SIMLABARI-A PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLABARI-A PWSS (NEW)",
+                        "localname": "SIMLABARI-A PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLABARI-A PWSS (NEW)",
+                "localname": "SIMLABARI-A PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLABARI-A PWSS (NEW)",
+                        "localname": "SIMLABARI-A PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069136/ws-services-calculation/Penalty.json b/data/as/30069136/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..143c793af7
--- /dev/null
+++ b/data/as/30069136/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069136",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069136/ws-services-calculation/WCBillingSlab.json b/data/as/30069136/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fdea228aeb
--- /dev/null
+++ b/data/as/30069136/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069136",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069142/BillingService/BusinessService.json b/data/as/30069142/BillingService/BusinessService.json
new file mode 100644
index 0000000000..04b413f2a3
--- /dev/null
+++ b/data/as/30069142/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069142",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069142/egov-location/boundary-data.json b/data/as/30069142/egov-location/boundary-data.json
new file mode 100644
index 0000000000..38b6ce5835
--- /dev/null
+++ b/data/as/30069142/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069142",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEPKAI PAHARTOLI PWSS (NEW)",
+                "localname": "THEPKAI PAHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069142",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEPKAI PAHARTOLI PWSS (NEW)",
+                        "localname": "THEPKAI PAHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEPKAI PAHARTOLI PWSS (NEW)",
+                "localname": "THEPKAI PAHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069142",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEPKAI PAHARTOLI PWSS (NEW)",
+                        "localname": "THEPKAI PAHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069142/ws-services-calculation/Penalty.json b/data/as/30069142/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b81775b8a4
--- /dev/null
+++ b/data/as/30069142/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069142",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069142/ws-services-calculation/WCBillingSlab.json b/data/as/30069142/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31f0a108eb
--- /dev/null
+++ b/data/as/30069142/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069142",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069148/BillingService/BusinessService.json b/data/as/30069148/BillingService/BusinessService.json
new file mode 100644
index 0000000000..afda7468d7
--- /dev/null
+++ b/data/as/30069148/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069148",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069148/egov-location/boundary-data.json b/data/as/30069148/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9471b9cb8
--- /dev/null
+++ b/data/as/30069148/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069148",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANDOBA GAROPARA PWSS (NEW)",
+                "localname": "PANDOBA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANDOBA GAROPARA PWSS (NEW)",
+                        "localname": "PANDOBA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANDOBA GAROPARA PWSS (NEW)",
+                "localname": "PANDOBA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANDOBA GAROPARA PWSS (NEW)",
+                        "localname": "PANDOBA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069148/ws-services-calculation/Penalty.json b/data/as/30069148/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99bed71b99
--- /dev/null
+++ b/data/as/30069148/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069148",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069148/ws-services-calculation/WCBillingSlab.json b/data/as/30069148/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d159841763
--- /dev/null
+++ b/data/as/30069148/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069148",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069157/BillingService/BusinessService.json b/data/as/30069157/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87f15f127f
--- /dev/null
+++ b/data/as/30069157/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069157",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069157/egov-location/boundary-data.json b/data/as/30069157/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c3c284417
--- /dev/null
+++ b/data/as/30069157/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069157",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM PANDOBA PWSS (NEW)",
+                "localname": "PACHIM PANDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM PANDOBA PWSS (NEW)",
+                        "localname": "PACHIM PANDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM PANDOBA PWSS (NEW)",
+                "localname": "PACHIM PANDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM PANDOBA PWSS (NEW)",
+                        "localname": "PACHIM PANDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069157/ws-services-calculation/Penalty.json b/data/as/30069157/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b726fa3f9d
--- /dev/null
+++ b/data/as/30069157/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069157",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069157/ws-services-calculation/WCBillingSlab.json b/data/as/30069157/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58767efe00
--- /dev/null
+++ b/data/as/30069157/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069157",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069165/BillingService/BusinessService.json b/data/as/30069165/BillingService/BusinessService.json
new file mode 100644
index 0000000000..716683b43e
--- /dev/null
+++ b/data/as/30069165/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069165",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069165/egov-location/boundary-data.json b/data/as/30069165/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fcd0c426fa
--- /dev/null
+++ b/data/as/30069165/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069165",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARKULA PAHARTOLI PWSS (NEW)",
+                "localname": "MARKULA PAHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARKULA PAHARTOLI PWSS (NEW)",
+                        "localname": "MARKULA PAHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARKULA PAHARTOLI PWSS (NEW)",
+                "localname": "MARKULA PAHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARKULA PAHARTOLI PWSS (NEW)",
+                        "localname": "MARKULA PAHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069165/ws-services-calculation/Penalty.json b/data/as/30069165/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eddd112646
--- /dev/null
+++ b/data/as/30069165/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069165",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069165/ws-services-calculation/WCBillingSlab.json b/data/as/30069165/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..644d4b81ae
--- /dev/null
+++ b/data/as/30069165/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069165",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069183/BillingService/BusinessService.json b/data/as/30069183/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd6bb058a1
--- /dev/null
+++ b/data/as/30069183/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069183",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069183/egov-location/boundary-data.json b/data/as/30069183/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f44702e3c
--- /dev/null
+++ b/data/as/30069183/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069183",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUJA UJANPARA PWSS (NEW)",
+                "localname": "KHARMUJA UJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069183",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUJA UJANPARA PWSS (NEW)",
+                        "localname": "KHARMUJA UJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUJA UJANPARA PWSS (NEW)",
+                "localname": "KHARMUJA UJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069183",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUJA UJANPARA PWSS (NEW)",
+                        "localname": "KHARMUJA UJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069183/ws-services-calculation/Penalty.json b/data/as/30069183/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00f5916e67
--- /dev/null
+++ b/data/as/30069183/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069183",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069183/ws-services-calculation/WCBillingSlab.json b/data/as/30069183/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fdcd23bdb3
--- /dev/null
+++ b/data/as/30069183/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069183",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069223/BillingService/BusinessService.json b/data/as/30069223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e6d15fe3f0
--- /dev/null
+++ b/data/as/30069223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069223/egov-location/boundary-data.json b/data/as/30069223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29daecea0a
--- /dev/null
+++ b/data/as/30069223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                "localname": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                        "localname": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                "localname": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                        "localname": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069223/ws-services-calculation/Penalty.json b/data/as/30069223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9012754c91
--- /dev/null
+++ b/data/as/30069223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069223/ws-services-calculation/WCBillingSlab.json b/data/as/30069223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..220eefd857
--- /dev/null
+++ b/data/as/30069223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069230/BillingService/BusinessService.json b/data/as/30069230/BillingService/BusinessService.json
new file mode 100644
index 0000000000..494e1a3f72
--- /dev/null
+++ b/data/as/30069230/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069230",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069230/egov-location/boundary-data.json b/data/as/30069230/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b5dc9bd1f3
--- /dev/null
+++ b/data/as/30069230/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069230",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                "localname": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                        "localname": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                "localname": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                        "localname": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069230/ws-services-calculation/Penalty.json b/data/as/30069230/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15141582d9
--- /dev/null
+++ b/data/as/30069230/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069230",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069230/ws-services-calculation/WCBillingSlab.json b/data/as/30069230/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4758eab2e6
--- /dev/null
+++ b/data/as/30069230/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069230",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069261/BillingService/BusinessService.json b/data/as/30069261/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4d3c45703a
--- /dev/null
+++ b/data/as/30069261/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069261",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069261/egov-location/boundary-data.json b/data/as/30069261/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a90f727321
--- /dev/null
+++ b/data/as/30069261/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069261",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOTHKUTHI PT-III PWSS (NEW)",
+                "localname": "KOTHKUTHI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069261",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOTHKUTHI PT-III PWSS (NEW)",
+                        "localname": "KOTHKUTHI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOTHKUTHI PT-III PWSS (NEW)",
+                "localname": "KOTHKUTHI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069261",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOTHKUTHI PT-III PWSS (NEW)",
+                        "localname": "KOTHKUTHI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069261/ws-services-calculation/Penalty.json b/data/as/30069261/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a4d351d45
--- /dev/null
+++ b/data/as/30069261/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069261",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069261/ws-services-calculation/WCBillingSlab.json b/data/as/30069261/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a5fef15c2
--- /dev/null
+++ b/data/as/30069261/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069261",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069267/BillingService/BusinessService.json b/data/as/30069267/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2838707927
--- /dev/null
+++ b/data/as/30069267/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069267",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069267/egov-location/boundary-data.json b/data/as/30069267/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cdf40e6f6d
--- /dev/null
+++ b/data/as/30069267/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069267",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASARIBORI PWSS (NEW)",
+                "localname": "HASARIBORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASARIBORI PWSS (NEW)",
+                        "localname": "HASARIBORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASARIBORI PWSS (NEW)",
+                "localname": "HASARIBORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASARIBORI PWSS (NEW)",
+                        "localname": "HASARIBORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069267/ws-services-calculation/Penalty.json b/data/as/30069267/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0e604b3770
--- /dev/null
+++ b/data/as/30069267/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069267",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069267/ws-services-calculation/WCBillingSlab.json b/data/as/30069267/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd784043fa
--- /dev/null
+++ b/data/as/30069267/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069267",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069282/BillingService/BusinessService.json b/data/as/30069282/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0db13f9fe7
--- /dev/null
+++ b/data/as/30069282/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069282",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069282/egov-location/boundary-data.json b/data/as/30069282/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c953ebea5
--- /dev/null
+++ b/data/as/30069282/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069282",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIPARA III PWSS (NEW)",
+                "localname": "JOGIPARA III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIPARA III PWSS (NEW)",
+                        "localname": "JOGIPARA III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIPARA III PWSS (NEW)",
+                "localname": "JOGIPARA III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069282",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIPARA III PWSS (NEW)",
+                        "localname": "JOGIPARA III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069282/ws-services-calculation/Penalty.json b/data/as/30069282/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04d3cd40e2
--- /dev/null
+++ b/data/as/30069282/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069282",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069282/ws-services-calculation/WCBillingSlab.json b/data/as/30069282/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d542637a58
--- /dev/null
+++ b/data/as/30069282/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069282",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069283/BillingService/BusinessService.json b/data/as/30069283/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec1683b3f3
--- /dev/null
+++ b/data/as/30069283/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069283",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069283/egov-location/boundary-data.json b/data/as/30069283/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a19b2362e5
--- /dev/null
+++ b/data/as/30069283/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069283",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIJOYPUR BONGAON PWSS",
+                "localname": "BIJOYPUR BONGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIJOYPUR BONGAON PWSS",
+                        "localname": "BIJOYPUR BONGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIJOYPUR BONGAON PWSS",
+                "localname": "BIJOYPUR BONGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIJOYPUR BONGAON PWSS",
+                        "localname": "BIJOYPUR BONGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069283/ws-services-calculation/Penalty.json b/data/as/30069283/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6392f7124b
--- /dev/null
+++ b/data/as/30069283/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069283",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069283/ws-services-calculation/WCBillingSlab.json b/data/as/30069283/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5916bc6ed6
--- /dev/null
+++ b/data/as/30069283/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069283",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069284/BillingService/BusinessService.json b/data/as/30069284/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01eab846aa
--- /dev/null
+++ b/data/as/30069284/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069284",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069284/egov-location/boundary-data.json b/data/as/30069284/egov-location/boundary-data.json
new file mode 100644
index 0000000000..620b930085
--- /dev/null
+++ b/data/as/30069284/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069284",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHEKAPARA PWSS (NEW)",
+                "localname": "KHEKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHEKAPARA PWSS (NEW)",
+                        "localname": "KHEKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHEKAPARA PWSS (NEW)",
+                "localname": "KHEKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHEKAPARA PWSS (NEW)",
+                        "localname": "KHEKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069284/ws-services-calculation/Penalty.json b/data/as/30069284/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b25e9eed86
--- /dev/null
+++ b/data/as/30069284/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069284",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069284/ws-services-calculation/WCBillingSlab.json b/data/as/30069284/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9691e8309a
--- /dev/null
+++ b/data/as/30069284/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069284",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069296/BillingService/BusinessService.json b/data/as/30069296/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11ba954473
--- /dev/null
+++ b/data/as/30069296/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069296",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069296/egov-location/boundary-data.json b/data/as/30069296/egov-location/boundary-data.json
new file mode 100644
index 0000000000..61c3c20ce8
--- /dev/null
+++ b/data/as/30069296/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069296",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARBALUPARA PWSS (NEW)",
+                "localname": "BARBALUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069296",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARBALUPARA PWSS (NEW)",
+                        "localname": "BARBALUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARBALUPARA PWSS (NEW)",
+                "localname": "BARBALUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069296",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARBALUPARA PWSS (NEW)",
+                        "localname": "BARBALUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069296/ws-services-calculation/Penalty.json b/data/as/30069296/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2bd340b033
--- /dev/null
+++ b/data/as/30069296/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069296",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069296/ws-services-calculation/WCBillingSlab.json b/data/as/30069296/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eaa3743bef
--- /dev/null
+++ b/data/as/30069296/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069296",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069733/BillingService/BusinessService.json b/data/as/30069733/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92fabc37f6
--- /dev/null
+++ b/data/as/30069733/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069733",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069733/egov-location/boundary-data.json b/data/as/30069733/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3907b351a7
--- /dev/null
+++ b/data/as/30069733/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069733",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLA GAON PWSS (NEW)",
+                "localname": "CHAKLA GAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069733",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLA GAON PWSS (NEW)",
+                        "localname": "CHAKLA GAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLA GAON PWSS (NEW)",
+                "localname": "CHAKLA GAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069733",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLA GAON PWSS (NEW)",
+                        "localname": "CHAKLA GAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069733/ws-services-calculation/Penalty.json b/data/as/30069733/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ebdeedbc3
--- /dev/null
+++ b/data/as/30069733/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069733",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069733/ws-services-calculation/WCBillingSlab.json b/data/as/30069733/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b5d1c72b5
--- /dev/null
+++ b/data/as/30069733/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069733",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069738/BillingService/BusinessService.json b/data/as/30069738/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5a248afce1
--- /dev/null
+++ b/data/as/30069738/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069738",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069738/egov-location/boundary-data.json b/data/as/30069738/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e955a0d71
--- /dev/null
+++ b/data/as/30069738/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069738",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA GAROPARA PWSS (NEW)",
+                "localname": "MATIA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA GAROPARA PWSS (NEW)",
+                        "localname": "MATIA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA GAROPARA PWSS (NEW)",
+                "localname": "MATIA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA GAROPARA PWSS (NEW)",
+                        "localname": "MATIA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069738/ws-services-calculation/Penalty.json b/data/as/30069738/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8af18efe88
--- /dev/null
+++ b/data/as/30069738/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069738",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069738/ws-services-calculation/WCBillingSlab.json b/data/as/30069738/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7da1e7e506
--- /dev/null
+++ b/data/as/30069738/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069738",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069742/BillingService/BusinessService.json b/data/as/30069742/BillingService/BusinessService.json
new file mode 100644
index 0000000000..52368fce8e
--- /dev/null
+++ b/data/as/30069742/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069742",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069742/egov-location/boundary-data.json b/data/as/30069742/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c4e859bea0
--- /dev/null
+++ b/data/as/30069742/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069742",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIPARA I PWSS (NEW)",
+                "localname": "JOGIPARA I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069742",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIPARA I PWSS (NEW)",
+                        "localname": "JOGIPARA I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIPARA I PWSS (NEW)",
+                "localname": "JOGIPARA I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069742",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIPARA I PWSS (NEW)",
+                        "localname": "JOGIPARA I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069742/ws-services-calculation/Penalty.json b/data/as/30069742/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f0a271e2ec
--- /dev/null
+++ b/data/as/30069742/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069742",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069742/ws-services-calculation/WCBillingSlab.json b/data/as/30069742/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d42ebf82d6
--- /dev/null
+++ b/data/as/30069742/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069742",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069820/BillingService/BusinessService.json b/data/as/30069820/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4a709ee027
--- /dev/null
+++ b/data/as/30069820/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30069820",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069820/egov-location/boundary-data.json b/data/as/30069820/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f8f2756cc8
--- /dev/null
+++ b/data/as/30069820/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30069820",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYRAMKUCHI PWSS (NEW)",
+                "localname": "JAYRAMKUCHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYRAMKUCHI PWSS (NEW)",
+                        "localname": "JAYRAMKUCHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYRAMKUCHI PWSS (NEW)",
+                "localname": "JAYRAMKUCHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30069820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYRAMKUCHI PWSS (NEW)",
+                        "localname": "JAYRAMKUCHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069820/ws-services-calculation/Penalty.json b/data/as/30069820/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94d4c8d075
--- /dev/null
+++ b/data/as/30069820/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30069820",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30069820/ws-services-calculation/WCBillingSlab.json b/data/as/30069820/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f1f9eea7d
--- /dev/null
+++ b/data/as/30069820/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30069820",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070165/BillingService/BusinessService.json b/data/as/30070165/BillingService/BusinessService.json
new file mode 100644
index 0000000000..890f00a5c1
--- /dev/null
+++ b/data/as/30070165/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070165",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070165/egov-location/boundary-data.json b/data/as/30070165/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ad9abed50
--- /dev/null
+++ b/data/as/30070165/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070165",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAUCHERTARI PWSS (NEW)",
+                "localname": "BAUCHERTARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAUCHERTARI PWSS (NEW)",
+                        "localname": "BAUCHERTARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAUCHERTARI PWSS (NEW)",
+                "localname": "BAUCHERTARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAUCHERTARI PWSS (NEW)",
+                        "localname": "BAUCHERTARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070165/ws-services-calculation/Penalty.json b/data/as/30070165/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fa642a111f
--- /dev/null
+++ b/data/as/30070165/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070165",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070165/ws-services-calculation/WCBillingSlab.json b/data/as/30070165/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..17acd6dc21
--- /dev/null
+++ b/data/as/30070165/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070165",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070166/BillingService/BusinessService.json b/data/as/30070166/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ff1c023636
--- /dev/null
+++ b/data/as/30070166/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070166",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070166/egov-location/boundary-data.json b/data/as/30070166/egov-location/boundary-data.json
new file mode 100644
index 0000000000..67bcb09eb8
--- /dev/null
+++ b/data/as/30070166/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070166",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARMAKARPARA PWSS (NEW)",
+                "localname": "KARMAKARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARMAKARPARA PWSS (NEW)",
+                        "localname": "KARMAKARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARMAKARPARA PWSS (NEW)",
+                "localname": "KARMAKARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070166",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARMAKARPARA PWSS (NEW)",
+                        "localname": "KARMAKARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070166/ws-services-calculation/Penalty.json b/data/as/30070166/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a2420b5e1
--- /dev/null
+++ b/data/as/30070166/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070166",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070166/ws-services-calculation/WCBillingSlab.json b/data/as/30070166/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b329f2beee
--- /dev/null
+++ b/data/as/30070166/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070166",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070207/BillingService/BusinessService.json b/data/as/30070207/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4aec41689
--- /dev/null
+++ b/data/as/30070207/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070207",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070207/egov-location/boundary-data.json b/data/as/30070207/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50f77225a8
--- /dev/null
+++ b/data/as/30070207/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070207",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATABARI PT-II PWSS (NEW)",
+                "localname": "CHATABARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070207",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATABARI PT-II PWSS (NEW)",
+                        "localname": "CHATABARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATABARI PT-II PWSS (NEW)",
+                "localname": "CHATABARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070207",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATABARI PT-II PWSS (NEW)",
+                        "localname": "CHATABARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070207/ws-services-calculation/Penalty.json b/data/as/30070207/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5de50d457a
--- /dev/null
+++ b/data/as/30070207/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070207",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070207/ws-services-calculation/WCBillingSlab.json b/data/as/30070207/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ce0940071f
--- /dev/null
+++ b/data/as/30070207/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070207",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070230/BillingService/BusinessService.json b/data/as/30070230/BillingService/BusinessService.json
new file mode 100644
index 0000000000..feb793ada1
--- /dev/null
+++ b/data/as/30070230/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070230",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070230/egov-location/boundary-data.json b/data/as/30070230/egov-location/boundary-data.json
new file mode 100644
index 0000000000..01bafdaf32
--- /dev/null
+++ b/data/as/30070230/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070230",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 NATUN SIRAJULI PWSS",
+                "localname": "NO. 1 NATUN SIRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 NATUN SIRAJULI PWSS",
+                        "localname": "NO. 1 NATUN SIRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 NATUN SIRAJULI PWSS",
+                "localname": "NO. 1 NATUN SIRAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070230",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 NATUN SIRAJULI PWSS",
+                        "localname": "NO. 1 NATUN SIRAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070230/ws-services-calculation/Penalty.json b/data/as/30070230/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..50e5c378ef
--- /dev/null
+++ b/data/as/30070230/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070230",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070230/ws-services-calculation/WCBillingSlab.json b/data/as/30070230/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68cd2f634e
--- /dev/null
+++ b/data/as/30070230/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070230",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070236/BillingService/BusinessService.json b/data/as/30070236/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42b32241a6
--- /dev/null
+++ b/data/as/30070236/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070236",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070236/egov-location/boundary-data.json b/data/as/30070236/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a711ea581a
--- /dev/null
+++ b/data/as/30070236/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070236",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070236",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070236",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070236/ws-services-calculation/Penalty.json b/data/as/30070236/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bae13435fc
--- /dev/null
+++ b/data/as/30070236/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070236",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070236/ws-services-calculation/WCBillingSlab.json b/data/as/30070236/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e2ec737348
--- /dev/null
+++ b/data/as/30070236/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070236",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070239/BillingService/BusinessService.json b/data/as/30070239/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cfbc16c820
--- /dev/null
+++ b/data/as/30070239/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070239",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070239/egov-location/boundary-data.json b/data/as/30070239/egov-location/boundary-data.json
new file mode 100644
index 0000000000..56571e496e
--- /dev/null
+++ b/data/as/30070239/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070239",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.III PWSS (NEW)",
+                "localname": "THEKASHU PT.III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.III PWSS (NEW)",
+                        "localname": "THEKASHU PT.III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.III PWSS (NEW)",
+                "localname": "THEKASHU PT.III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.III PWSS (NEW)",
+                        "localname": "THEKASHU PT.III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070239/ws-services-calculation/Penalty.json b/data/as/30070239/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9dc223326b
--- /dev/null
+++ b/data/as/30070239/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070239",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070239/ws-services-calculation/WCBillingSlab.json b/data/as/30070239/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a764c5488
--- /dev/null
+++ b/data/as/30070239/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070239",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070243/BillingService/BusinessService.json b/data/as/30070243/BillingService/BusinessService.json
new file mode 100644
index 0000000000..784a6fcec7
--- /dev/null
+++ b/data/as/30070243/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070243",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070243/egov-location/boundary-data.json b/data/as/30070243/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5acc2fedaa
--- /dev/null
+++ b/data/as/30070243/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070243",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                "localname": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070243",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                        "localname": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                "localname": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070243",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                        "localname": "BAGUAN PT-III NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070243/ws-services-calculation/Penalty.json b/data/as/30070243/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5434390c18
--- /dev/null
+++ b/data/as/30070243/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070243",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070243/ws-services-calculation/WCBillingSlab.json b/data/as/30070243/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2bfd39448b
--- /dev/null
+++ b/data/as/30070243/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070243",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070267/BillingService/BusinessService.json b/data/as/30070267/BillingService/BusinessService.json
new file mode 100644
index 0000000000..956d8e6df2
--- /dev/null
+++ b/data/as/30070267/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070267",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070267/egov-location/boundary-data.json b/data/as/30070267/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d764269a0f
--- /dev/null
+++ b/data/as/30070267/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070267",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                "localname": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                        "localname": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                "localname": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070267",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                        "localname": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070267/ws-services-calculation/Penalty.json b/data/as/30070267/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b8a93f004
--- /dev/null
+++ b/data/as/30070267/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070267",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070267/ws-services-calculation/WCBillingSlab.json b/data/as/30070267/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba907b2859
--- /dev/null
+++ b/data/as/30070267/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070267",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070269/BillingService/BusinessService.json b/data/as/30070269/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e4f952510
--- /dev/null
+++ b/data/as/30070269/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070269",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070269/egov-location/boundary-data.json b/data/as/30070269/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cfe14095ba
--- /dev/null
+++ b/data/as/30070269/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070269",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI PWSS (NEW)",
+                "localname": "DIGHALI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070269",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI PWSS (NEW)",
+                        "localname": "DIGHALI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI PWSS (NEW)",
+                "localname": "DIGHALI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070269",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI PWSS (NEW)",
+                        "localname": "DIGHALI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070269/ws-services-calculation/Penalty.json b/data/as/30070269/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6a7ae6513c
--- /dev/null
+++ b/data/as/30070269/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070269",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070269/ws-services-calculation/WCBillingSlab.json b/data/as/30070269/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15a3d4d568
--- /dev/null
+++ b/data/as/30070269/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070269",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070276/BillingService/BusinessService.json b/data/as/30070276/BillingService/BusinessService.json
new file mode 100644
index 0000000000..868c554798
--- /dev/null
+++ b/data/as/30070276/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070276",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070276/egov-location/boundary-data.json b/data/as/30070276/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b83c1d577
--- /dev/null
+++ b/data/as/30070276/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070276",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HABANGGIRI NO.3 PWSS",
+                "localname": "HABANGGIRI NO.3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HABANGGIRI NO.3 PWSS",
+                        "localname": "HABANGGIRI NO.3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HABANGGIRI NO.3 PWSS",
+                "localname": "HABANGGIRI NO.3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HABANGGIRI NO.3 PWSS",
+                        "localname": "HABANGGIRI NO.3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070276/ws-services-calculation/Penalty.json b/data/as/30070276/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c5e836ec0
--- /dev/null
+++ b/data/as/30070276/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070276",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070276/ws-services-calculation/WCBillingSlab.json b/data/as/30070276/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..981837dc45
--- /dev/null
+++ b/data/as/30070276/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070276",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070288/BillingService/BusinessService.json b/data/as/30070288/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ebd17089f3
--- /dev/null
+++ b/data/as/30070288/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070288",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070288/egov-location/boundary-data.json b/data/as/30070288/egov-location/boundary-data.json
new file mode 100644
index 0000000000..785c670ee7
--- /dev/null
+++ b/data/as/30070288/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070288",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA (BALIJANA) PWSS (NEW)",
+                "localname": "TILAPARA (BALIJANA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA (BALIJANA) PWSS (NEW)",
+                        "localname": "TILAPARA (BALIJANA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA (BALIJANA) PWSS (NEW)",
+                "localname": "TILAPARA (BALIJANA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA (BALIJANA) PWSS (NEW)",
+                        "localname": "TILAPARA (BALIJANA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070288/ws-services-calculation/Penalty.json b/data/as/30070288/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..88b0270578
--- /dev/null
+++ b/data/as/30070288/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070288",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070288/ws-services-calculation/WCBillingSlab.json b/data/as/30070288/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b135231afd
--- /dev/null
+++ b/data/as/30070288/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070288",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070302/BillingService/BusinessService.json b/data/as/30070302/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a7481b6cb
--- /dev/null
+++ b/data/as/30070302/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070302",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070302/egov-location/boundary-data.json b/data/as/30070302/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2acd05c71f
--- /dev/null
+++ b/data/as/30070302/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070302",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARDARBHITA PWSS (NEW)",
+                "localname": "SARDARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARDARBHITA PWSS (NEW)",
+                        "localname": "SARDARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARDARBHITA PWSS (NEW)",
+                "localname": "SARDARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARDARBHITA PWSS (NEW)",
+                        "localname": "SARDARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070302/ws-services-calculation/Penalty.json b/data/as/30070302/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d063971c5
--- /dev/null
+++ b/data/as/30070302/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070302",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070302/ws-services-calculation/WCBillingSlab.json b/data/as/30070302/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dfb52cba5f
--- /dev/null
+++ b/data/as/30070302/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070302",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070309/BillingService/BusinessService.json b/data/as/30070309/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8bceb0394
--- /dev/null
+++ b/data/as/30070309/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070309",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070309/egov-location/boundary-data.json b/data/as/30070309/egov-location/boundary-data.json
new file mode 100644
index 0000000000..692dd6a221
--- /dev/null
+++ b/data/as/30070309/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070309",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-III PWSS (NEW)",
+                "localname": "BAGUAN PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070309",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-III PWSS (NEW)",
+                        "localname": "BAGUAN PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-III PWSS (NEW)",
+                "localname": "BAGUAN PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070309",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-III PWSS (NEW)",
+                        "localname": "BAGUAN PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070309/ws-services-calculation/Penalty.json b/data/as/30070309/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5ab2f88828
--- /dev/null
+++ b/data/as/30070309/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070309",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070309/ws-services-calculation/WCBillingSlab.json b/data/as/30070309/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f31a20542a
--- /dev/null
+++ b/data/as/30070309/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070309",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070314/BillingService/BusinessService.json b/data/as/30070314/BillingService/BusinessService.json
new file mode 100644
index 0000000000..08dc1ab704
--- /dev/null
+++ b/data/as/30070314/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070314",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070314/egov-location/boundary-data.json b/data/as/30070314/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f17d1254a
--- /dev/null
+++ b/data/as/30070314/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070314",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGPATHAR PWSS (NEW)",
+                "localname": "RANGPATHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGPATHAR PWSS (NEW)",
+                        "localname": "RANGPATHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGPATHAR PWSS (NEW)",
+                "localname": "RANGPATHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGPATHAR PWSS (NEW)",
+                        "localname": "RANGPATHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070314/ws-services-calculation/Penalty.json b/data/as/30070314/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db18644a95
--- /dev/null
+++ b/data/as/30070314/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070314",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070314/ws-services-calculation/WCBillingSlab.json b/data/as/30070314/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9acc2dd713
--- /dev/null
+++ b/data/as/30070314/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070314",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070342/BillingService/BusinessService.json b/data/as/30070342/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f3a4c51ddf
--- /dev/null
+++ b/data/as/30070342/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070342",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070342/egov-location/boundary-data.json b/data/as/30070342/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e33797b661
--- /dev/null
+++ b/data/as/30070342/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070342",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULGURI PT-I PWSS (NEW)",
+                "localname": "DEULGURI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULGURI PT-I PWSS (NEW)",
+                        "localname": "DEULGURI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULGURI PT-I PWSS (NEW)",
+                "localname": "DEULGURI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070342",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULGURI PT-I PWSS (NEW)",
+                        "localname": "DEULGURI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070342/ws-services-calculation/Penalty.json b/data/as/30070342/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db5fe3e9ba
--- /dev/null
+++ b/data/as/30070342/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070342",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070342/ws-services-calculation/WCBillingSlab.json b/data/as/30070342/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8700b51cbd
--- /dev/null
+++ b/data/as/30070342/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070342",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070344/BillingService/BusinessService.json b/data/as/30070344/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b4bf21eea5
--- /dev/null
+++ b/data/as/30070344/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070344",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070344/egov-location/boundary-data.json b/data/as/30070344/egov-location/boundary-data.json
new file mode 100644
index 0000000000..efce5a5889
--- /dev/null
+++ b/data/as/30070344/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070344",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070344/ws-services-calculation/Penalty.json b/data/as/30070344/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32c37621ca
--- /dev/null
+++ b/data/as/30070344/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070344",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070344/ws-services-calculation/WCBillingSlab.json b/data/as/30070344/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0ff1e9841c
--- /dev/null
+++ b/data/as/30070344/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070344",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070346/BillingService/BusinessService.json b/data/as/30070346/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f1d2418198
--- /dev/null
+++ b/data/as/30070346/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070346",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070346/egov-location/boundary-data.json b/data/as/30070346/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e9d1f4c3ca
--- /dev/null
+++ b/data/as/30070346/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070346",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070346/ws-services-calculation/Penalty.json b/data/as/30070346/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c2512b881
--- /dev/null
+++ b/data/as/30070346/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070346",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070346/ws-services-calculation/WCBillingSlab.json b/data/as/30070346/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5a519fb3e
--- /dev/null
+++ b/data/as/30070346/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070346",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070350/BillingService/BusinessService.json b/data/as/30070350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a633539160
--- /dev/null
+++ b/data/as/30070350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070350/egov-location/boundary-data.json b/data/as/30070350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6b90ad838
--- /dev/null
+++ b/data/as/30070350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                "localname": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070350/ws-services-calculation/Penalty.json b/data/as/30070350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d0ee5bd0b0
--- /dev/null
+++ b/data/as/30070350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070350/ws-services-calculation/WCBillingSlab.json b/data/as/30070350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f954283d3f
--- /dev/null
+++ b/data/as/30070350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070357/BillingService/BusinessService.json b/data/as/30070357/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b9dba4681
--- /dev/null
+++ b/data/as/30070357/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070357",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070357/egov-location/boundary-data.json b/data/as/30070357/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a8dfdf88da
--- /dev/null
+++ b/data/as/30070357/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070357",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA KAMARPARA PWSS (NEW)",
+                "localname": "TILAPARA KAMARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA KAMARPARA PWSS (NEW)",
+                        "localname": "TILAPARA KAMARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA KAMARPARA PWSS (NEW)",
+                "localname": "TILAPARA KAMARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA KAMARPARA PWSS (NEW)",
+                        "localname": "TILAPARA KAMARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070357/ws-services-calculation/Penalty.json b/data/as/30070357/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c20f16954d
--- /dev/null
+++ b/data/as/30070357/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070357",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070357/ws-services-calculation/WCBillingSlab.json b/data/as/30070357/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..254b571b2e
--- /dev/null
+++ b/data/as/30070357/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070357",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070365/BillingService/BusinessService.json b/data/as/30070365/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f734f9a196
--- /dev/null
+++ b/data/as/30070365/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070365",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070365/egov-location/boundary-data.json b/data/as/30070365/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19f239aca6
--- /dev/null
+++ b/data/as/30070365/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070365",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                "localname": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070365",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                        "localname": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                "localname": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070365",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                        "localname": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070365/ws-services-calculation/Penalty.json b/data/as/30070365/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2106d37e8c
--- /dev/null
+++ b/data/as/30070365/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070365",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070365/ws-services-calculation/WCBillingSlab.json b/data/as/30070365/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dfd55a9bce
--- /dev/null
+++ b/data/as/30070365/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070365",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070375/BillingService/BusinessService.json b/data/as/30070375/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a06cb5c2e0
--- /dev/null
+++ b/data/as/30070375/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070375",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070375/egov-location/boundary-data.json b/data/as/30070375/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3adfd0cfc1
--- /dev/null
+++ b/data/as/30070375/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070375",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PACHIM PWSS (NEW)",
+                "localname": "AMBARI PACHIM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PACHIM PWSS (NEW)",
+                        "localname": "AMBARI PACHIM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PACHIM PWSS (NEW)",
+                "localname": "AMBARI PACHIM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PACHIM PWSS (NEW)",
+                        "localname": "AMBARI PACHIM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070375/ws-services-calculation/Penalty.json b/data/as/30070375/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..74759aafdd
--- /dev/null
+++ b/data/as/30070375/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070375",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070375/ws-services-calculation/WCBillingSlab.json b/data/as/30070375/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..768afd0189
--- /dev/null
+++ b/data/as/30070375/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070375",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070386/BillingService/BusinessService.json b/data/as/30070386/BillingService/BusinessService.json
new file mode 100644
index 0000000000..958bd314c1
--- /dev/null
+++ b/data/as/30070386/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070386",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070386/egov-location/boundary-data.json b/data/as/30070386/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b679407c6
--- /dev/null
+++ b/data/as/30070386/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070386",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                "localname": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                        "localname": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                "localname": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                        "localname": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070386/ws-services-calculation/Penalty.json b/data/as/30070386/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..718b284e80
--- /dev/null
+++ b/data/as/30070386/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070386",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070386/ws-services-calculation/WCBillingSlab.json b/data/as/30070386/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9fbf61a54
--- /dev/null
+++ b/data/as/30070386/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070386",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070406/BillingService/BusinessService.json b/data/as/30070406/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aab92e4c21
--- /dev/null
+++ b/data/as/30070406/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070406",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070406/egov-location/boundary-data.json b/data/as/30070406/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6f73d5f97
--- /dev/null
+++ b/data/as/30070406/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070406",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUJA GHANAPARA PWSS (NEW)",
+                "localname": "KHARMUJA GHANAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070406",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUJA GHANAPARA PWSS (NEW)",
+                        "localname": "KHARMUJA GHANAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUJA GHANAPARA PWSS (NEW)",
+                "localname": "KHARMUJA GHANAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070406",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUJA GHANAPARA PWSS (NEW)",
+                        "localname": "KHARMUJA GHANAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070406/ws-services-calculation/Penalty.json b/data/as/30070406/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4707232949
--- /dev/null
+++ b/data/as/30070406/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070406",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070406/ws-services-calculation/WCBillingSlab.json b/data/as/30070406/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f5769ea9c
--- /dev/null
+++ b/data/as/30070406/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070406",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070419/BillingService/BusinessService.json b/data/as/30070419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e2315ca56
--- /dev/null
+++ b/data/as/30070419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070419/egov-location/boundary-data.json b/data/as/30070419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b1fe3c8794
--- /dev/null
+++ b/data/as/30070419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTILAL PWSS (NEW)",
+                "localname": "MOTILAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTILAL PWSS (NEW)",
+                        "localname": "MOTILAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTILAL PWSS (NEW)",
+                "localname": "MOTILAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTILAL PWSS (NEW)",
+                        "localname": "MOTILAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070419/ws-services-calculation/Penalty.json b/data/as/30070419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3162800dc6
--- /dev/null
+++ b/data/as/30070419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070419/ws-services-calculation/WCBillingSlab.json b/data/as/30070419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df4bbd35e7
--- /dev/null
+++ b/data/as/30070419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070464/BillingService/BusinessService.json b/data/as/30070464/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b99771d60b
--- /dev/null
+++ b/data/as/30070464/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070464",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070464/egov-location/boundary-data.json b/data/as/30070464/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35b40a55dc
--- /dev/null
+++ b/data/as/30070464/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070464",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM SIMLABARI PWSS (NEW)",
+                "localname": "PACHIM SIMLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070464",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM SIMLABARI PWSS (NEW)",
+                        "localname": "PACHIM SIMLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM SIMLABARI PWSS (NEW)",
+                "localname": "PACHIM SIMLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070464",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM SIMLABARI PWSS (NEW)",
+                        "localname": "PACHIM SIMLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070464/ws-services-calculation/Penalty.json b/data/as/30070464/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..715693693e
--- /dev/null
+++ b/data/as/30070464/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070464",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070464/ws-services-calculation/WCBillingSlab.json b/data/as/30070464/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30fb8309aa
--- /dev/null
+++ b/data/as/30070464/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070464",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070470/BillingService/BusinessService.json b/data/as/30070470/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a59001847d
--- /dev/null
+++ b/data/as/30070470/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070470",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070470/egov-location/boundary-data.json b/data/as/30070470/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2270d98fa5
--- /dev/null
+++ b/data/as/30070470/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070470",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                "localname": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070470",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                        "localname": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                "localname": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070470",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                        "localname": "PALASHBARI MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070470/ws-services-calculation/Penalty.json b/data/as/30070470/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3aef634a2d
--- /dev/null
+++ b/data/as/30070470/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070470",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070470/ws-services-calculation/WCBillingSlab.json b/data/as/30070470/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4835174545
--- /dev/null
+++ b/data/as/30070470/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070470",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070477/BillingService/BusinessService.json b/data/as/30070477/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bba872eae9
--- /dev/null
+++ b/data/as/30070477/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070477",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070477/egov-location/boundary-data.json b/data/as/30070477/egov-location/boundary-data.json
new file mode 100644
index 0000000000..27a1c5503b
--- /dev/null
+++ b/data/as/30070477/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070477",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBARI PWSS (NEW)",
+                "localname": "PALASHBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBARI PWSS (NEW)",
+                        "localname": "PALASHBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBARI PWSS (NEW)",
+                "localname": "PALASHBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBARI PWSS (NEW)",
+                        "localname": "PALASHBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070477/ws-services-calculation/Penalty.json b/data/as/30070477/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..273b808a2b
--- /dev/null
+++ b/data/as/30070477/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070477",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070477/ws-services-calculation/WCBillingSlab.json b/data/as/30070477/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d43fb8abbb
--- /dev/null
+++ b/data/as/30070477/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070477",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070483/BillingService/BusinessService.json b/data/as/30070483/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e8dd66ff83
--- /dev/null
+++ b/data/as/30070483/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070483",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070483/egov-location/boundary-data.json b/data/as/30070483/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae8671d704
--- /dev/null
+++ b/data/as/30070483/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070483",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                "localname": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070483",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                        "localname": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                "localname": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070483",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                        "localname": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070483/ws-services-calculation/Penalty.json b/data/as/30070483/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b71573762c
--- /dev/null
+++ b/data/as/30070483/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070483",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070483/ws-services-calculation/WCBillingSlab.json b/data/as/30070483/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6a398218c8
--- /dev/null
+++ b/data/as/30070483/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070483",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070590/BillingService/BusinessService.json b/data/as/30070590/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f00f5cf521
--- /dev/null
+++ b/data/as/30070590/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070590",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070590/egov-location/boundary-data.json b/data/as/30070590/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12a88d80b6
--- /dev/null
+++ b/data/as/30070590/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070590",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TAPARBHITA PWSS (NEW)",
+                "localname": "TAPARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070590",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TAPARBHITA PWSS (NEW)",
+                        "localname": "TAPARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TAPARBHITA PWSS (NEW)",
+                "localname": "TAPARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070590",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TAPARBHITA PWSS (NEW)",
+                        "localname": "TAPARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070590/ws-services-calculation/Penalty.json b/data/as/30070590/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e645edef3
--- /dev/null
+++ b/data/as/30070590/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070590",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070590/ws-services-calculation/WCBillingSlab.json b/data/as/30070590/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..949ea05cae
--- /dev/null
+++ b/data/as/30070590/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070590",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070600/BillingService/BusinessService.json b/data/as/30070600/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e5b7fa6d77
--- /dev/null
+++ b/data/as/30070600/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070600",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070600/egov-location/boundary-data.json b/data/as/30070600/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e58391b91
--- /dev/null
+++ b/data/as/30070600/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070600",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 PANBARI BAGAN PWSS",
+                "localname": "NO.2 PANBARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 PANBARI BAGAN PWSS",
+                        "localname": "NO.2 PANBARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 PANBARI BAGAN PWSS",
+                "localname": "NO.2 PANBARI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 PANBARI BAGAN PWSS",
+                        "localname": "NO.2 PANBARI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070600/ws-services-calculation/Penalty.json b/data/as/30070600/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..475cfcc23b
--- /dev/null
+++ b/data/as/30070600/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070600",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070600/ws-services-calculation/WCBillingSlab.json b/data/as/30070600/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4384655390
--- /dev/null
+++ b/data/as/30070600/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070600",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070606/BillingService/BusinessService.json b/data/as/30070606/BillingService/BusinessService.json
new file mode 100644
index 0000000000..38b65aad3b
--- /dev/null
+++ b/data/as/30070606/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070606",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070606/egov-location/boundary-data.json b/data/as/30070606/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe21e89a01
--- /dev/null
+++ b/data/as/30070606/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070606",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELAPURI PWSS (NEW)",
+                "localname": "BELAPURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELAPURI PWSS (NEW)",
+                        "localname": "BELAPURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELAPURI PWSS (NEW)",
+                "localname": "BELAPURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070606",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELAPURI PWSS (NEW)",
+                        "localname": "BELAPURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070606/ws-services-calculation/Penalty.json b/data/as/30070606/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a20a845719
--- /dev/null
+++ b/data/as/30070606/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070606",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070606/ws-services-calculation/WCBillingSlab.json b/data/as/30070606/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f475bc9d5
--- /dev/null
+++ b/data/as/30070606/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070606",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070609/BillingService/BusinessService.json b/data/as/30070609/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e63ab9d1d3
--- /dev/null
+++ b/data/as/30070609/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070609",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070609/egov-location/boundary-data.json b/data/as/30070609/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc440b8cd6
--- /dev/null
+++ b/data/as/30070609/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070609",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 SANMILANI PWSS",
+                "localname": "NO.1 SANMILANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 SANMILANI PWSS",
+                        "localname": "NO.1 SANMILANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 SANMILANI PWSS",
+                "localname": "NO.1 SANMILANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 SANMILANI PWSS",
+                        "localname": "NO.1 SANMILANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070609/ws-services-calculation/Penalty.json b/data/as/30070609/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..51200f74c2
--- /dev/null
+++ b/data/as/30070609/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070609",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070609/ws-services-calculation/WCBillingSlab.json b/data/as/30070609/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46f4e02444
--- /dev/null
+++ b/data/as/30070609/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070609",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070611/BillingService/BusinessService.json b/data/as/30070611/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6944aecc36
--- /dev/null
+++ b/data/as/30070611/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070611",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070611/egov-location/boundary-data.json b/data/as/30070611/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b8997d539
--- /dev/null
+++ b/data/as/30070611/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070611",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 ULUBARI PWSS",
+                "localname": "NO.2 ULUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 ULUBARI PWSS",
+                        "localname": "NO.2 ULUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 ULUBARI PWSS",
+                "localname": "NO.2 ULUBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 ULUBARI PWSS",
+                        "localname": "NO.2 ULUBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070611/ws-services-calculation/Penalty.json b/data/as/30070611/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a68d0dbb41
--- /dev/null
+++ b/data/as/30070611/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070611",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070611/ws-services-calculation/WCBillingSlab.json b/data/as/30070611/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca927187a0
--- /dev/null
+++ b/data/as/30070611/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070611",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070613/BillingService/BusinessService.json b/data/as/30070613/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec48cd5709
--- /dev/null
+++ b/data/as/30070613/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070613",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070613/egov-location/boundary-data.json b/data/as/30070613/egov-location/boundary-data.json
new file mode 100644
index 0000000000..852d108acf
--- /dev/null
+++ b/data/as/30070613/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070613",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALI PUKHURI PWSS",
+                "localname": "BALI PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070613",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALI PUKHURI PWSS",
+                        "localname": "BALI PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALI PUKHURI PWSS",
+                "localname": "BALI PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070613",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALI PUKHURI PWSS",
+                        "localname": "BALI PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070613/ws-services-calculation/Penalty.json b/data/as/30070613/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6ddcddfa72
--- /dev/null
+++ b/data/as/30070613/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070613",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070613/ws-services-calculation/WCBillingSlab.json b/data/as/30070613/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..38fb21a37b
--- /dev/null
+++ b/data/as/30070613/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070613",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070620/BillingService/BusinessService.json b/data/as/30070620/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9b17ccd89f
--- /dev/null
+++ b/data/as/30070620/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070620",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070620/egov-location/boundary-data.json b/data/as/30070620/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8d78623892
--- /dev/null
+++ b/data/as/30070620/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070620",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJROUMARI BANGALI GAON PWSS",
+                "localname": "MAJROUMARI BANGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJROUMARI BANGALI GAON PWSS",
+                        "localname": "MAJROUMARI BANGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJROUMARI BANGALI GAON PWSS",
+                "localname": "MAJROUMARI BANGALI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJROUMARI BANGALI GAON PWSS",
+                        "localname": "MAJROUMARI BANGALI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070620/ws-services-calculation/Penalty.json b/data/as/30070620/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5c32e204e
--- /dev/null
+++ b/data/as/30070620/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070620",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070620/ws-services-calculation/WCBillingSlab.json b/data/as/30070620/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4304b5a366
--- /dev/null
+++ b/data/as/30070620/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070620",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070802/BillingService/BusinessService.json b/data/as/30070802/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e041ea17ab
--- /dev/null
+++ b/data/as/30070802/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30070802",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070802/egov-location/boundary-data.json b/data/as/30070802/egov-location/boundary-data.json
new file mode 100644
index 0000000000..22b62ca4fe
--- /dev/null
+++ b/data/as/30070802/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30070802",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 RANGA GARA BIL GAON PWSS",
+                "localname": "NO.1 RANGA GARA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 RANGA GARA BIL GAON PWSS",
+                        "localname": "NO.1 RANGA GARA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 RANGA GARA BIL GAON PWSS",
+                "localname": "NO.1 RANGA GARA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30070802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 RANGA GARA BIL GAON PWSS",
+                        "localname": "NO.1 RANGA GARA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070802/ws-services-calculation/Penalty.json b/data/as/30070802/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ae0d9b17ca
--- /dev/null
+++ b/data/as/30070802/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30070802",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30070802/ws-services-calculation/WCBillingSlab.json b/data/as/30070802/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54fee6421c
--- /dev/null
+++ b/data/as/30070802/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30070802",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071063/BillingService/BusinessService.json b/data/as/30071063/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a801e2db6d
--- /dev/null
+++ b/data/as/30071063/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071063",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071063/egov-location/boundary-data.json b/data/as/30071063/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d6062bf4e5
--- /dev/null
+++ b/data/as/30071063/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071063",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLLA PWSS (NEW)",
+                "localname": "BOLLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071063",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLLA PWSS (NEW)",
+                        "localname": "BOLLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLLA PWSS (NEW)",
+                "localname": "BOLLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071063",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLLA PWSS (NEW)",
+                        "localname": "BOLLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071063/ws-services-calculation/Penalty.json b/data/as/30071063/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64fac9adca
--- /dev/null
+++ b/data/as/30071063/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071063",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071063/ws-services-calculation/WCBillingSlab.json b/data/as/30071063/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27179f2bb1
--- /dev/null
+++ b/data/as/30071063/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071063",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071098/BillingService/BusinessService.json b/data/as/30071098/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bc7ca6b358
--- /dev/null
+++ b/data/as/30071098/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071098",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071098/egov-location/boundary-data.json b/data/as/30071098/egov-location/boundary-data.json
new file mode 100644
index 0000000000..924a0cb6ba
--- /dev/null
+++ b/data/as/30071098/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071098",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHOGRA NEW PWSS",
+                "localname": "GHOGRA NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071098",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHOGRA NEW PWSS",
+                        "localname": "GHOGRA NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHOGRA NEW PWSS",
+                "localname": "GHOGRA NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071098",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHOGRA NEW PWSS",
+                        "localname": "GHOGRA NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071098/ws-services-calculation/Penalty.json b/data/as/30071098/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d95eb2380c
--- /dev/null
+++ b/data/as/30071098/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071098",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071098/ws-services-calculation/WCBillingSlab.json b/data/as/30071098/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..23ff71f881
--- /dev/null
+++ b/data/as/30071098/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071098",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071129/BillingService/BusinessService.json b/data/as/30071129/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4acfb41ddf
--- /dev/null
+++ b/data/as/30071129/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071129",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071129/egov-location/boundary-data.json b/data/as/30071129/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c487a0a2d
--- /dev/null
+++ b/data/as/30071129/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071129",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALPANI GHILAJANI PWSS (NEW)",
+                "localname": "KALPANI GHILAJANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALPANI GHILAJANI PWSS (NEW)",
+                        "localname": "KALPANI GHILAJANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALPANI GHILAJANI PWSS (NEW)",
+                "localname": "KALPANI GHILAJANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALPANI GHILAJANI PWSS (NEW)",
+                        "localname": "KALPANI GHILAJANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071129/ws-services-calculation/Penalty.json b/data/as/30071129/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f00a13bcfe
--- /dev/null
+++ b/data/as/30071129/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071129",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071129/ws-services-calculation/WCBillingSlab.json b/data/as/30071129/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a7940f5c9
--- /dev/null
+++ b/data/as/30071129/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071129",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071139/BillingService/BusinessService.json b/data/as/30071139/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e0af08c078
--- /dev/null
+++ b/data/as/30071139/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071139",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071139/egov-location/boundary-data.json b/data/as/30071139/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a16fdc4c5f
--- /dev/null
+++ b/data/as/30071139/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071139",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARIARBHITA PWSS (NEW)",
+                "localname": "TARIARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071139",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARIARBHITA PWSS (NEW)",
+                        "localname": "TARIARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARIARBHITA PWSS (NEW)",
+                "localname": "TARIARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071139",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARIARBHITA PWSS (NEW)",
+                        "localname": "TARIARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071139/ws-services-calculation/Penalty.json b/data/as/30071139/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc1fc5e49b
--- /dev/null
+++ b/data/as/30071139/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071139",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071139/ws-services-calculation/WCBillingSlab.json b/data/as/30071139/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..90a3a21af5
--- /dev/null
+++ b/data/as/30071139/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071139",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071148/BillingService/BusinessService.json b/data/as/30071148/BillingService/BusinessService.json
new file mode 100644
index 0000000000..40295622a1
--- /dev/null
+++ b/data/as/30071148/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071148",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071148/egov-location/boundary-data.json b/data/as/30071148/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74fb5c0029
--- /dev/null
+++ b/data/as/30071148/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071148",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILDUBI PT-II PWSS (NEW)",
+                "localname": "SILDUBI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILDUBI PT-II PWSS (NEW)",
+                        "localname": "SILDUBI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILDUBI PT-II PWSS (NEW)",
+                "localname": "SILDUBI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILDUBI PT-II PWSS (NEW)",
+                        "localname": "SILDUBI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071148/ws-services-calculation/Penalty.json b/data/as/30071148/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73d9882ba3
--- /dev/null
+++ b/data/as/30071148/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071148",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071148/ws-services-calculation/WCBillingSlab.json b/data/as/30071148/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fe432cf8d
--- /dev/null
+++ b/data/as/30071148/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071148",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071202/BillingService/BusinessService.json b/data/as/30071202/BillingService/BusinessService.json
new file mode 100644
index 0000000000..be460f254c
--- /dev/null
+++ b/data/as/30071202/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071202",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071202/egov-location/boundary-data.json b/data/as/30071202/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dbf3e0832a
--- /dev/null
+++ b/data/as/30071202/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071202",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIAL KANDA PWSS (NEW)",
+                "localname": "SIAL KANDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIAL KANDA PWSS (NEW)",
+                        "localname": "SIAL KANDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIAL KANDA PWSS (NEW)",
+                "localname": "SIAL KANDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIAL KANDA PWSS (NEW)",
+                        "localname": "SIAL KANDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071202/ws-services-calculation/Penalty.json b/data/as/30071202/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e7cf60d66
--- /dev/null
+++ b/data/as/30071202/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071202",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071202/ws-services-calculation/WCBillingSlab.json b/data/as/30071202/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b9f7dd48c
--- /dev/null
+++ b/data/as/30071202/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071202",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071208/BillingService/BusinessService.json b/data/as/30071208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ebe2edf860
--- /dev/null
+++ b/data/as/30071208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071208/egov-location/boundary-data.json b/data/as/30071208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dc777d2018
--- /dev/null
+++ b/data/as/30071208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNER BHITA PWSS (NEW)",
+                "localname": "BAMUNER BHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNER BHITA PWSS (NEW)",
+                        "localname": "BAMUNER BHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNER BHITA PWSS (NEW)",
+                "localname": "BAMUNER BHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNER BHITA PWSS (NEW)",
+                        "localname": "BAMUNER BHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071208/ws-services-calculation/Penalty.json b/data/as/30071208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1c4358a9af
--- /dev/null
+++ b/data/as/30071208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071208/ws-services-calculation/WCBillingSlab.json b/data/as/30071208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b9b7c4212
--- /dev/null
+++ b/data/as/30071208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071569/BillingService/BusinessService.json b/data/as/30071569/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98ed177701
--- /dev/null
+++ b/data/as/30071569/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071569",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071569/egov-location/boundary-data.json b/data/as/30071569/egov-location/boundary-data.json
new file mode 100644
index 0000000000..28daeafea1
--- /dev/null
+++ b/data/as/30071569/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071569",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAKPARA PWSS (NEW)",
+                "localname": "CHARAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAKPARA PWSS (NEW)",
+                        "localname": "CHARAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAKPARA PWSS (NEW)",
+                "localname": "CHARAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAKPARA PWSS (NEW)",
+                        "localname": "CHARAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071569/ws-services-calculation/Penalty.json b/data/as/30071569/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb096d803a
--- /dev/null
+++ b/data/as/30071569/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071569",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071569/ws-services-calculation/WCBillingSlab.json b/data/as/30071569/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c84a210010
--- /dev/null
+++ b/data/as/30071569/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071569",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071579/BillingService/BusinessService.json b/data/as/30071579/BillingService/BusinessService.json
new file mode 100644
index 0000000000..901c6466dc
--- /dev/null
+++ b/data/as/30071579/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071579",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071579/egov-location/boundary-data.json b/data/as/30071579/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7115e5103b
--- /dev/null
+++ b/data/as/30071579/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071579",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FEISHERTARY PWSS (NEW)",
+                "localname": "FEISHERTARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FEISHERTARY PWSS (NEW)",
+                        "localname": "FEISHERTARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FEISHERTARY PWSS (NEW)",
+                "localname": "FEISHERTARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FEISHERTARY PWSS (NEW)",
+                        "localname": "FEISHERTARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071579/ws-services-calculation/Penalty.json b/data/as/30071579/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bf84b8c96
--- /dev/null
+++ b/data/as/30071579/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071579",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071579/ws-services-calculation/WCBillingSlab.json b/data/as/30071579/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b35cf2c7bd
--- /dev/null
+++ b/data/as/30071579/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071579",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071722/BillingService/BusinessService.json b/data/as/30071722/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dbd352dcda
--- /dev/null
+++ b/data/as/30071722/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071722",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071722/egov-location/boundary-data.json b/data/as/30071722/egov-location/boundary-data.json
new file mode 100644
index 0000000000..75fffd2263
--- /dev/null
+++ b/data/as/30071722/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071722",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR NO. 1 PWSS",
+                "localname": "MILANPUR NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071722",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR NO. 1 PWSS",
+                        "localname": "MILANPUR NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR NO. 1 PWSS",
+                "localname": "MILANPUR NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071722",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR NO. 1 PWSS",
+                        "localname": "MILANPUR NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071722/ws-services-calculation/Penalty.json b/data/as/30071722/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a3c89af30a
--- /dev/null
+++ b/data/as/30071722/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071722",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071722/ws-services-calculation/WCBillingSlab.json b/data/as/30071722/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f955fb651
--- /dev/null
+++ b/data/as/30071722/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071722",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071743/BillingService/BusinessService.json b/data/as/30071743/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b89ac469d
--- /dev/null
+++ b/data/as/30071743/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071743",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071743/egov-location/boundary-data.json b/data/as/30071743/egov-location/boundary-data.json
new file mode 100644
index 0000000000..85a75f8fc1
--- /dev/null
+++ b/data/as/30071743/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071743",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAI NEPALI PWSS",
+                "localname": "SONAI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAI NEPALI PWSS",
+                        "localname": "SONAI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAI NEPALI PWSS",
+                "localname": "SONAI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAI NEPALI PWSS",
+                        "localname": "SONAI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071743/ws-services-calculation/Penalty.json b/data/as/30071743/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f738c62ce
--- /dev/null
+++ b/data/as/30071743/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071743",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071743/ws-services-calculation/WCBillingSlab.json b/data/as/30071743/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0e67573d10
--- /dev/null
+++ b/data/as/30071743/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071743",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071758/BillingService/BusinessService.json b/data/as/30071758/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8880bed7f0
--- /dev/null
+++ b/data/as/30071758/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071758",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071758/egov-location/boundary-data.json b/data/as/30071758/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d8f4d1826d
--- /dev/null
+++ b/data/as/30071758/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071758",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJGOR PWSS",
+                "localname": "RAJGOR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJGOR PWSS",
+                        "localname": "RAJGOR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJGOR PWSS",
+                "localname": "RAJGOR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJGOR PWSS",
+                        "localname": "RAJGOR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071758/ws-services-calculation/Penalty.json b/data/as/30071758/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73e8301b60
--- /dev/null
+++ b/data/as/30071758/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071758",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071758/ws-services-calculation/WCBillingSlab.json b/data/as/30071758/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..837ca6f5f8
--- /dev/null
+++ b/data/as/30071758/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071758",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071787/BillingService/BusinessService.json b/data/as/30071787/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c1cfd5a83
--- /dev/null
+++ b/data/as/30071787/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071787",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071787/egov-location/boundary-data.json b/data/as/30071787/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52e220ca65
--- /dev/null
+++ b/data/as/30071787/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071787",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UDMARI BARJHAR PWSS",
+                "localname": "UDMARI BARJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UDMARI BARJHAR PWSS",
+                        "localname": "UDMARI BARJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UDMARI BARJHAR PWSS",
+                "localname": "UDMARI BARJHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071787",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UDMARI BARJHAR PWSS",
+                        "localname": "UDMARI BARJHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071787/ws-services-calculation/Penalty.json b/data/as/30071787/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fec0136634
--- /dev/null
+++ b/data/as/30071787/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071787",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071787/ws-services-calculation/WCBillingSlab.json b/data/as/30071787/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46253a1a8c
--- /dev/null
+++ b/data/as/30071787/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071787",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071801/BillingService/BusinessService.json b/data/as/30071801/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae64dd7588
--- /dev/null
+++ b/data/as/30071801/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071801",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071801/egov-location/boundary-data.json b/data/as/30071801/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ea212c4c2
--- /dev/null
+++ b/data/as/30071801/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071801",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARBARI NO.2 PWSS (NEW)",
+                "localname": "BHARBARI NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071801",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARBARI NO.2 PWSS (NEW)",
+                        "localname": "BHARBARI NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARBARI NO.2 PWSS (NEW)",
+                "localname": "BHARBARI NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071801",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARBARI NO.2 PWSS (NEW)",
+                        "localname": "BHARBARI NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071801/ws-services-calculation/Penalty.json b/data/as/30071801/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..faae4be299
--- /dev/null
+++ b/data/as/30071801/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071801",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071801/ws-services-calculation/WCBillingSlab.json b/data/as/30071801/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4842028056
--- /dev/null
+++ b/data/as/30071801/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071801",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071806/BillingService/BusinessService.json b/data/as/30071806/BillingService/BusinessService.json
new file mode 100644
index 0000000000..984646842f
--- /dev/null
+++ b/data/as/30071806/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071806",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071806/egov-location/boundary-data.json b/data/as/30071806/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6e980b527
--- /dev/null
+++ b/data/as/30071806/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071806",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARBARI NO.3 PWSS (NEW)",
+                "localname": "BHARBARI NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARBARI NO.3 PWSS (NEW)",
+                        "localname": "BHARBARI NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARBARI NO.3 PWSS (NEW)",
+                "localname": "BHARBARI NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARBARI NO.3 PWSS (NEW)",
+                        "localname": "BHARBARI NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071806/ws-services-calculation/Penalty.json b/data/as/30071806/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0de3f29d19
--- /dev/null
+++ b/data/as/30071806/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071806",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071806/ws-services-calculation/WCBillingSlab.json b/data/as/30071806/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..546bef48bf
--- /dev/null
+++ b/data/as/30071806/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071806",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071827/BillingService/BusinessService.json b/data/as/30071827/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5bbac471f7
--- /dev/null
+++ b/data/as/30071827/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071827",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071827/egov-location/boundary-data.json b/data/as/30071827/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a3d4bc582d
--- /dev/null
+++ b/data/as/30071827/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071827",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN DUBAPARA PWSS (NEW)",
+                "localname": "NATUN DUBAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN DUBAPARA PWSS (NEW)",
+                        "localname": "NATUN DUBAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN DUBAPARA PWSS (NEW)",
+                "localname": "NATUN DUBAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN DUBAPARA PWSS (NEW)",
+                        "localname": "NATUN DUBAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071827/ws-services-calculation/Penalty.json b/data/as/30071827/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..97cdb5d233
--- /dev/null
+++ b/data/as/30071827/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071827",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071827/ws-services-calculation/WCBillingSlab.json b/data/as/30071827/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8868290ca2
--- /dev/null
+++ b/data/as/30071827/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071827",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071830/BillingService/BusinessService.json b/data/as/30071830/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed07e27b4f
--- /dev/null
+++ b/data/as/30071830/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071830",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071830/egov-location/boundary-data.json b/data/as/30071830/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f51a0860e0
--- /dev/null
+++ b/data/as/30071830/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071830",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAPUR NAYAPARA PWSS (NEW)",
+                "localname": "SONAPUR NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAPUR NAYAPARA PWSS (NEW)",
+                        "localname": "SONAPUR NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAPUR NAYAPARA PWSS (NEW)",
+                "localname": "SONAPUR NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAPUR NAYAPARA PWSS (NEW)",
+                        "localname": "SONAPUR NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071830/ws-services-calculation/Penalty.json b/data/as/30071830/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44b9ffd61b
--- /dev/null
+++ b/data/as/30071830/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071830",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071830/ws-services-calculation/WCBillingSlab.json b/data/as/30071830/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e6f9a5b024
--- /dev/null
+++ b/data/as/30071830/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071830",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071861/BillingService/BusinessService.json b/data/as/30071861/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2deba9671d
--- /dev/null
+++ b/data/as/30071861/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30071861",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071861/egov-location/boundary-data.json b/data/as/30071861/egov-location/boundary-data.json
new file mode 100644
index 0000000000..886b9e8d3b
--- /dev/null
+++ b/data/as/30071861/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30071861",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                "localname": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                        "localname": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                "localname": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30071861",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                        "localname": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071861/ws-services-calculation/Penalty.json b/data/as/30071861/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..176c8f465e
--- /dev/null
+++ b/data/as/30071861/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30071861",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30071861/ws-services-calculation/WCBillingSlab.json b/data/as/30071861/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee0d865cb9
--- /dev/null
+++ b/data/as/30071861/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30071861",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072127/BillingService/BusinessService.json b/data/as/30072127/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17f199d147
--- /dev/null
+++ b/data/as/30072127/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072127",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072127/egov-location/boundary-data.json b/data/as/30072127/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0f9c4205d5
--- /dev/null
+++ b/data/as/30072127/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072127",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON BARMANPARA PWSS (NEW)",
+                "localname": "JURIGAON BARMANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072127",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON BARMANPARA PWSS (NEW)",
+                        "localname": "JURIGAON BARMANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON BARMANPARA PWSS (NEW)",
+                "localname": "JURIGAON BARMANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072127",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON BARMANPARA PWSS (NEW)",
+                        "localname": "JURIGAON BARMANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072127/ws-services-calculation/Penalty.json b/data/as/30072127/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d34a54ab94
--- /dev/null
+++ b/data/as/30072127/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072127",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072127/ws-services-calculation/WCBillingSlab.json b/data/as/30072127/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5d64f08eee
--- /dev/null
+++ b/data/as/30072127/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072127",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072402/BillingService/BusinessService.json b/data/as/30072402/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7f8515670
--- /dev/null
+++ b/data/as/30072402/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072402",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072402/egov-location/boundary-data.json b/data/as/30072402/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5140a8b66b
--- /dev/null
+++ b/data/as/30072402/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072402",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARMATHA PWSS (NEW)",
+                "localname": "BANDARMATHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072402",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARMATHA PWSS (NEW)",
+                        "localname": "BANDARMATHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARMATHA PWSS (NEW)",
+                "localname": "BANDARMATHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072402",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARMATHA PWSS (NEW)",
+                        "localname": "BANDARMATHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072402/ws-services-calculation/Penalty.json b/data/as/30072402/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab77b16933
--- /dev/null
+++ b/data/as/30072402/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072402",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072402/ws-services-calculation/WCBillingSlab.json b/data/as/30072402/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..140fa3dfe3
--- /dev/null
+++ b/data/as/30072402/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072402",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072569/BillingService/BusinessService.json b/data/as/30072569/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b2e9efe74
--- /dev/null
+++ b/data/as/30072569/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072569",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072569/egov-location/boundary-data.json b/data/as/30072569/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cfeda268a0
--- /dev/null
+++ b/data/as/30072569/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072569",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARIPARA PWSS (NEW)",
+                "localname": "TARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARIPARA PWSS (NEW)",
+                        "localname": "TARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARIPARA PWSS (NEW)",
+                "localname": "TARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARIPARA PWSS (NEW)",
+                        "localname": "TARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072569/ws-services-calculation/Penalty.json b/data/as/30072569/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3fede220bf
--- /dev/null
+++ b/data/as/30072569/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072569",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072569/ws-services-calculation/WCBillingSlab.json b/data/as/30072569/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5d3420246
--- /dev/null
+++ b/data/as/30072569/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072569",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072574/BillingService/BusinessService.json b/data/as/30072574/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f135cc18b
--- /dev/null
+++ b/data/as/30072574/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072574",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072574/egov-location/boundary-data.json b/data/as/30072574/egov-location/boundary-data.json
new file mode 100644
index 0000000000..934ebaca11
--- /dev/null
+++ b/data/as/30072574/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072574",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                "localname": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                        "localname": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                "localname": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                        "localname": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072574/ws-services-calculation/Penalty.json b/data/as/30072574/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fa5f337538
--- /dev/null
+++ b/data/as/30072574/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072574",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072574/ws-services-calculation/WCBillingSlab.json b/data/as/30072574/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..06c7d4fdfc
--- /dev/null
+++ b/data/as/30072574/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072574",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072592/BillingService/BusinessService.json b/data/as/30072592/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f36af1e32b
--- /dev/null
+++ b/data/as/30072592/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072592",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072592/egov-location/boundary-data.json b/data/as/30072592/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b2eb315356
--- /dev/null
+++ b/data/as/30072592/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072592",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                "localname": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072592",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                        "localname": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                "localname": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072592",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                        "localname": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072592/ws-services-calculation/Penalty.json b/data/as/30072592/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a0799ab28
--- /dev/null
+++ b/data/as/30072592/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072592",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072592/ws-services-calculation/WCBillingSlab.json b/data/as/30072592/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..39832dde1e
--- /dev/null
+++ b/data/as/30072592/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072592",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072599/BillingService/BusinessService.json b/data/as/30072599/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b5397dae0
--- /dev/null
+++ b/data/as/30072599/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072599",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072599/egov-location/boundary-data.json b/data/as/30072599/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3bd074af52
--- /dev/null
+++ b/data/as/30072599/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072599",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LELA PWSS (NEW)",
+                "localname": "LELA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072599",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LELA PWSS (NEW)",
+                        "localname": "LELA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LELA PWSS (NEW)",
+                "localname": "LELA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072599",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LELA PWSS (NEW)",
+                        "localname": "LELA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072599/ws-services-calculation/Penalty.json b/data/as/30072599/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13ee49c333
--- /dev/null
+++ b/data/as/30072599/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072599",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072599/ws-services-calculation/WCBillingSlab.json b/data/as/30072599/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a51373d295
--- /dev/null
+++ b/data/as/30072599/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072599",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072650/BillingService/BusinessService.json b/data/as/30072650/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa6b08d87b
--- /dev/null
+++ b/data/as/30072650/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072650",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072650/egov-location/boundary-data.json b/data/as/30072650/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e30387a52
--- /dev/null
+++ b/data/as/30072650/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072650",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATABARI PT-I PWSS (NEW)",
+                "localname": "CHATABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATABARI PT-I PWSS (NEW)",
+                        "localname": "CHATABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATABARI PT-I PWSS (NEW)",
+                "localname": "CHATABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072650",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATABARI PT-I PWSS (NEW)",
+                        "localname": "CHATABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072650/ws-services-calculation/Penalty.json b/data/as/30072650/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41e13116ec
--- /dev/null
+++ b/data/as/30072650/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072650",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072650/ws-services-calculation/WCBillingSlab.json b/data/as/30072650/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f023dac6a
--- /dev/null
+++ b/data/as/30072650/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072650",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072651/BillingService/BusinessService.json b/data/as/30072651/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8e3ce54af
--- /dev/null
+++ b/data/as/30072651/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072651",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072651/egov-location/boundary-data.json b/data/as/30072651/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b991c16d88
--- /dev/null
+++ b/data/as/30072651/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072651",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FARINGAPARA TALTOLA PWSS (NEW)",
+                "localname": "FARINGAPARA TALTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FARINGAPARA TALTOLA PWSS (NEW)",
+                        "localname": "FARINGAPARA TALTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FARINGAPARA TALTOLA PWSS (NEW)",
+                "localname": "FARINGAPARA TALTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FARINGAPARA TALTOLA PWSS (NEW)",
+                        "localname": "FARINGAPARA TALTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072651/ws-services-calculation/Penalty.json b/data/as/30072651/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe41ef9a70
--- /dev/null
+++ b/data/as/30072651/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072651",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072651/ws-services-calculation/WCBillingSlab.json b/data/as/30072651/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4059585649
--- /dev/null
+++ b/data/as/30072651/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072651",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072655/BillingService/BusinessService.json b/data/as/30072655/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad48aa8526
--- /dev/null
+++ b/data/as/30072655/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072655",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072655/egov-location/boundary-data.json b/data/as/30072655/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3d0ebd645
--- /dev/null
+++ b/data/as/30072655/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072655",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DONGERPAR PWSS (NEW)",
+                "localname": "DONGERPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DONGERPAR PWSS (NEW)",
+                        "localname": "DONGERPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DONGERPAR PWSS (NEW)",
+                "localname": "DONGERPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DONGERPAR PWSS (NEW)",
+                        "localname": "DONGERPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072655/ws-services-calculation/Penalty.json b/data/as/30072655/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..54271d4119
--- /dev/null
+++ b/data/as/30072655/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072655",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072655/ws-services-calculation/WCBillingSlab.json b/data/as/30072655/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..490da37c8a
--- /dev/null
+++ b/data/as/30072655/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072655",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072656/BillingService/BusinessService.json b/data/as/30072656/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90ba3c367a
--- /dev/null
+++ b/data/as/30072656/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072656",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072656/egov-location/boundary-data.json b/data/as/30072656/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f90692777
--- /dev/null
+++ b/data/as/30072656/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072656",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASPARA PWSS (NEW)",
+                "localname": "DASPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072656",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASPARA PWSS (NEW)",
+                        "localname": "DASPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASPARA PWSS (NEW)",
+                "localname": "DASPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072656",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASPARA PWSS (NEW)",
+                        "localname": "DASPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072656/ws-services-calculation/Penalty.json b/data/as/30072656/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..29052486cb
--- /dev/null
+++ b/data/as/30072656/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072656",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072656/ws-services-calculation/WCBillingSlab.json b/data/as/30072656/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ec8accf1dd
--- /dev/null
+++ b/data/as/30072656/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072656",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072662/BillingService/BusinessService.json b/data/as/30072662/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f39061589
--- /dev/null
+++ b/data/as/30072662/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072662",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072662/egov-location/boundary-data.json b/data/as/30072662/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8af0a81073
--- /dev/null
+++ b/data/as/30072662/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072662",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHASING 1 PWSS (NEW)",
+                "localname": "PAHASING 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHASING 1 PWSS (NEW)",
+                        "localname": "PAHASING 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHASING 1 PWSS (NEW)",
+                "localname": "PAHASING 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHASING 1 PWSS (NEW)",
+                        "localname": "PAHASING 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072662/ws-services-calculation/Penalty.json b/data/as/30072662/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..58427f7251
--- /dev/null
+++ b/data/as/30072662/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072662",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072662/ws-services-calculation/WCBillingSlab.json b/data/as/30072662/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3c6f9321e6
--- /dev/null
+++ b/data/as/30072662/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072662",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072834/BillingService/BusinessService.json b/data/as/30072834/BillingService/BusinessService.json
new file mode 100644
index 0000000000..881aa65e3c
--- /dev/null
+++ b/data/as/30072834/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072834",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072834/egov-location/boundary-data.json b/data/as/30072834/egov-location/boundary-data.json
new file mode 100644
index 0000000000..25b3594c98
--- /dev/null
+++ b/data/as/30072834/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072834",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIN LINE PWSS",
+                "localname": "TIN LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIN LINE PWSS",
+                        "localname": "TIN LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIN LINE PWSS",
+                "localname": "TIN LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIN LINE PWSS",
+                        "localname": "TIN LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072834/ws-services-calculation/Penalty.json b/data/as/30072834/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c241572193
--- /dev/null
+++ b/data/as/30072834/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072834",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072834/ws-services-calculation/WCBillingSlab.json b/data/as/30072834/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..212a45d3a5
--- /dev/null
+++ b/data/as/30072834/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072834",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072841/BillingService/BusinessService.json b/data/as/30072841/BillingService/BusinessService.json
new file mode 100644
index 0000000000..528bf21d32
--- /dev/null
+++ b/data/as/30072841/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072841",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072841/egov-location/boundary-data.json b/data/as/30072841/egov-location/boundary-data.json
new file mode 100644
index 0000000000..195e1da952
--- /dev/null
+++ b/data/as/30072841/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072841",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALIBORI PWSS (NEW)",
+                "localname": "DIGHALIBORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072841",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALIBORI PWSS (NEW)",
+                        "localname": "DIGHALIBORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALIBORI PWSS (NEW)",
+                "localname": "DIGHALIBORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072841",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALIBORI PWSS (NEW)",
+                        "localname": "DIGHALIBORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072841/ws-services-calculation/Penalty.json b/data/as/30072841/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48f7d1a91b
--- /dev/null
+++ b/data/as/30072841/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072841",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072841/ws-services-calculation/WCBillingSlab.json b/data/as/30072841/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a9b0df8ca
--- /dev/null
+++ b/data/as/30072841/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072841",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072843/BillingService/BusinessService.json b/data/as/30072843/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9078d8957a
--- /dev/null
+++ b/data/as/30072843/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072843",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072843/egov-location/boundary-data.json b/data/as/30072843/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a85ed770f2
--- /dev/null
+++ b/data/as/30072843/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072843",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PT-I PWSS (NEW)",
+                "localname": "FAFANGA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072843",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PT-I PWSS (NEW)",
+                        "localname": "FAFANGA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PT-I PWSS (NEW)",
+                "localname": "FAFANGA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072843",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PT-I PWSS (NEW)",
+                        "localname": "FAFANGA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072843/ws-services-calculation/Penalty.json b/data/as/30072843/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..387781babf
--- /dev/null
+++ b/data/as/30072843/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072843",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072843/ws-services-calculation/WCBillingSlab.json b/data/as/30072843/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e47c451d18
--- /dev/null
+++ b/data/as/30072843/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072843",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072845/BillingService/BusinessService.json b/data/as/30072845/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01bf8f043d
--- /dev/null
+++ b/data/as/30072845/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072845",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072845/egov-location/boundary-data.json b/data/as/30072845/egov-location/boundary-data.json
new file mode 100644
index 0000000000..af2002e6ff
--- /dev/null
+++ b/data/as/30072845/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072845",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANAKGREY PWSS (NEW)",
+                "localname": "GANAKGREY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANAKGREY PWSS (NEW)",
+                        "localname": "GANAKGREY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANAKGREY PWSS (NEW)",
+                "localname": "GANAKGREY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANAKGREY PWSS (NEW)",
+                        "localname": "GANAKGREY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072845/ws-services-calculation/Penalty.json b/data/as/30072845/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1f262101f0
--- /dev/null
+++ b/data/as/30072845/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072845",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072845/ws-services-calculation/WCBillingSlab.json b/data/as/30072845/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..55a3880f16
--- /dev/null
+++ b/data/as/30072845/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072845",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072880/BillingService/BusinessService.json b/data/as/30072880/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b088e517e
--- /dev/null
+++ b/data/as/30072880/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072880",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072880/egov-location/boundary-data.json b/data/as/30072880/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d480e96e47
--- /dev/null
+++ b/data/as/30072880/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072880",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HINDPARA PWSS (NEW)",
+                "localname": "HINDPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072880",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HINDPARA PWSS (NEW)",
+                        "localname": "HINDPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HINDPARA PWSS (NEW)",
+                "localname": "HINDPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072880",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HINDPARA PWSS (NEW)",
+                        "localname": "HINDPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072880/ws-services-calculation/Penalty.json b/data/as/30072880/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e25e4f99a7
--- /dev/null
+++ b/data/as/30072880/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072880",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072880/ws-services-calculation/WCBillingSlab.json b/data/as/30072880/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10e3a26ee3
--- /dev/null
+++ b/data/as/30072880/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072880",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072900/BillingService/BusinessService.json b/data/as/30072900/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa95a92b31
--- /dev/null
+++ b/data/as/30072900/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072900",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072900/egov-location/boundary-data.json b/data/as/30072900/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f6251da464
--- /dev/null
+++ b/data/as/30072900/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072900",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ SATRAPUR PWSS (NEW)",
+                "localname": "NIZ SATRAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072900",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ SATRAPUR PWSS (NEW)",
+                        "localname": "NIZ SATRAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ SATRAPUR PWSS (NEW)",
+                "localname": "NIZ SATRAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072900",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ SATRAPUR PWSS (NEW)",
+                        "localname": "NIZ SATRAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072900/ws-services-calculation/Penalty.json b/data/as/30072900/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5fe5e2494
--- /dev/null
+++ b/data/as/30072900/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072900",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072900/ws-services-calculation/WCBillingSlab.json b/data/as/30072900/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d4790fc272
--- /dev/null
+++ b/data/as/30072900/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072900",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072901/BillingService/BusinessService.json b/data/as/30072901/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce3df0da42
--- /dev/null
+++ b/data/as/30072901/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072901",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072901/egov-location/boundary-data.json b/data/as/30072901/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac3e0f3d55
--- /dev/null
+++ b/data/as/30072901/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072901",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHORABORI PWSS (NEW)",
+                "localname": "JHORABORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHORABORI PWSS (NEW)",
+                        "localname": "JHORABORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHORABORI PWSS (NEW)",
+                "localname": "JHORABORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072901",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHORABORI PWSS (NEW)",
+                        "localname": "JHORABORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072901/ws-services-calculation/Penalty.json b/data/as/30072901/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e89ddaf71c
--- /dev/null
+++ b/data/as/30072901/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072901",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072901/ws-services-calculation/WCBillingSlab.json b/data/as/30072901/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f607ede9c
--- /dev/null
+++ b/data/as/30072901/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072901",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072996/BillingService/BusinessService.json b/data/as/30072996/BillingService/BusinessService.json
new file mode 100644
index 0000000000..08c1df98a3
--- /dev/null
+++ b/data/as/30072996/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30072996",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072996/egov-location/boundary-data.json b/data/as/30072996/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2370f1445c
--- /dev/null
+++ b/data/as/30072996/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30072996",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PWSS (NEW)",
+                "localname": "NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PWSS (NEW)",
+                        "localname": "NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PWSS (NEW)",
+                "localname": "NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30072996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PWSS (NEW)",
+                        "localname": "NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072996/ws-services-calculation/Penalty.json b/data/as/30072996/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4daca10ce8
--- /dev/null
+++ b/data/as/30072996/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30072996",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30072996/ws-services-calculation/WCBillingSlab.json b/data/as/30072996/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b908492eb0
--- /dev/null
+++ b/data/as/30072996/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30072996",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073350/BillingService/BusinessService.json b/data/as/30073350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c6b2c9cb6
--- /dev/null
+++ b/data/as/30073350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073350/egov-location/boundary-data.json b/data/as/30073350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26feba087e
--- /dev/null
+++ b/data/as/30073350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                "localname": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                        "localname": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                "localname": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                        "localname": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073350/ws-services-calculation/Penalty.json b/data/as/30073350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7580bb888f
--- /dev/null
+++ b/data/as/30073350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073350/ws-services-calculation/WCBillingSlab.json b/data/as/30073350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ff824895f
--- /dev/null
+++ b/data/as/30073350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073352/BillingService/BusinessService.json b/data/as/30073352/BillingService/BusinessService.json
new file mode 100644
index 0000000000..03ac18665f
--- /dev/null
+++ b/data/as/30073352/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073352",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073352/egov-location/boundary-data.json b/data/as/30073352/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7d56752b4a
--- /dev/null
+++ b/data/as/30073352/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073352",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FUTURIPARA 1 PWSS (NEW)",
+                "localname": "FUTURIPARA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FUTURIPARA 1 PWSS (NEW)",
+                        "localname": "FUTURIPARA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FUTURIPARA 1 PWSS (NEW)",
+                "localname": "FUTURIPARA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FUTURIPARA 1 PWSS (NEW)",
+                        "localname": "FUTURIPARA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073352/ws-services-calculation/Penalty.json b/data/as/30073352/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..29c5e27fc8
--- /dev/null
+++ b/data/as/30073352/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073352",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073352/ws-services-calculation/WCBillingSlab.json b/data/as/30073352/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..513b701feb
--- /dev/null
+++ b/data/as/30073352/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073352",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073354/BillingService/BusinessService.json b/data/as/30073354/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8631aa7537
--- /dev/null
+++ b/data/as/30073354/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073354",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073354/egov-location/boundary-data.json b/data/as/30073354/egov-location/boundary-data.json
new file mode 100644
index 0000000000..63308e6b89
--- /dev/null
+++ b/data/as/30073354/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073354",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                "localname": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073354",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                        "localname": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                "localname": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073354",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                        "localname": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073354/ws-services-calculation/Penalty.json b/data/as/30073354/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a57b7e6da9
--- /dev/null
+++ b/data/as/30073354/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073354",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073354/ws-services-calculation/WCBillingSlab.json b/data/as/30073354/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..11bfa4acff
--- /dev/null
+++ b/data/as/30073354/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073354",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073356/BillingService/BusinessService.json b/data/as/30073356/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b6758e7830
--- /dev/null
+++ b/data/as/30073356/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073356",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073356/egov-location/boundary-data.json b/data/as/30073356/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47e50968e5
--- /dev/null
+++ b/data/as/30073356/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073356",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "INDIBARI PWSS (NEW)",
+                "localname": "INDIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "INDIBARI PWSS (NEW)",
+                        "localname": "INDIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "INDIBARI PWSS (NEW)",
+                "localname": "INDIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "INDIBARI PWSS (NEW)",
+                        "localname": "INDIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073356/ws-services-calculation/Penalty.json b/data/as/30073356/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fadb0c7958
--- /dev/null
+++ b/data/as/30073356/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073356",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073356/ws-services-calculation/WCBillingSlab.json b/data/as/30073356/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca6690e099
--- /dev/null
+++ b/data/as/30073356/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073356",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073357/BillingService/BusinessService.json b/data/as/30073357/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e189ced824
--- /dev/null
+++ b/data/as/30073357/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073357",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073357/egov-location/boundary-data.json b/data/as/30073357/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06ea76e9cb
--- /dev/null
+++ b/data/as/30073357/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073357",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM LEMAKONA PWSS (NEW)",
+                "localname": "PACHIM LEMAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM LEMAKONA PWSS (NEW)",
+                        "localname": "PACHIM LEMAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM LEMAKONA PWSS (NEW)",
+                "localname": "PACHIM LEMAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM LEMAKONA PWSS (NEW)",
+                        "localname": "PACHIM LEMAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073357/ws-services-calculation/Penalty.json b/data/as/30073357/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e2267b519c
--- /dev/null
+++ b/data/as/30073357/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073357",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073357/ws-services-calculation/WCBillingSlab.json b/data/as/30073357/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6ec592f066
--- /dev/null
+++ b/data/as/30073357/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073357",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073473/BillingService/BusinessService.json b/data/as/30073473/BillingService/BusinessService.json
new file mode 100644
index 0000000000..112f3b29ea
--- /dev/null
+++ b/data/as/30073473/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073473",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073473/egov-location/boundary-data.json b/data/as/30073473/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a4738c276
--- /dev/null
+++ b/data/as/30073473/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073473",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATHIAPARA PWSS (NEW)",
+                "localname": "GATHIAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATHIAPARA PWSS (NEW)",
+                        "localname": "GATHIAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATHIAPARA PWSS (NEW)",
+                "localname": "GATHIAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATHIAPARA PWSS (NEW)",
+                        "localname": "GATHIAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073473/ws-services-calculation/Penalty.json b/data/as/30073473/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..004722a0ce
--- /dev/null
+++ b/data/as/30073473/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073473",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073473/ws-services-calculation/WCBillingSlab.json b/data/as/30073473/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c1fc53d7e
--- /dev/null
+++ b/data/as/30073473/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073473",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073477/BillingService/BusinessService.json b/data/as/30073477/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8232791f6
--- /dev/null
+++ b/data/as/30073477/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073477",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073477/egov-location/boundary-data.json b/data/as/30073477/egov-location/boundary-data.json
new file mode 100644
index 0000000000..142a43ae32
--- /dev/null
+++ b/data/as/30073477/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073477",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA PWSS (NEW)",
+                "localname": "SIMLITOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA PWSS (NEW)",
+                        "localname": "SIMLITOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA PWSS (NEW)",
+                "localname": "SIMLITOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA PWSS (NEW)",
+                        "localname": "SIMLITOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073477/ws-services-calculation/Penalty.json b/data/as/30073477/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a0c6f34fc
--- /dev/null
+++ b/data/as/30073477/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073477",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073477/ws-services-calculation/WCBillingSlab.json b/data/as/30073477/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2aa6086522
--- /dev/null
+++ b/data/as/30073477/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073477",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073481/BillingService/BusinessService.json b/data/as/30073481/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3fef660f3a
--- /dev/null
+++ b/data/as/30073481/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073481",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073481/egov-location/boundary-data.json b/data/as/30073481/egov-location/boundary-data.json
new file mode 100644
index 0000000000..df4dddece4
--- /dev/null
+++ b/data/as/30073481/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073481",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                "localname": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073481",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                        "localname": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                "localname": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073481",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                        "localname": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073481/ws-services-calculation/Penalty.json b/data/as/30073481/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..07a752bf52
--- /dev/null
+++ b/data/as/30073481/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073481",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073481/ws-services-calculation/WCBillingSlab.json b/data/as/30073481/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6409591914
--- /dev/null
+++ b/data/as/30073481/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073481",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073483/BillingService/BusinessService.json b/data/as/30073483/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ebc2e440d7
--- /dev/null
+++ b/data/as/30073483/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073483",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073483/egov-location/boundary-data.json b/data/as/30073483/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e93771afef
--- /dev/null
+++ b/data/as/30073483/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073483",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA MEDHIPARA PWSS (NEW)",
+                "localname": "KARIPARA MEDHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073483",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA MEDHIPARA PWSS (NEW)",
+                        "localname": "KARIPARA MEDHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA MEDHIPARA PWSS (NEW)",
+                "localname": "KARIPARA MEDHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073483",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA MEDHIPARA PWSS (NEW)",
+                        "localname": "KARIPARA MEDHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073483/ws-services-calculation/Penalty.json b/data/as/30073483/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56d6ae944d
--- /dev/null
+++ b/data/as/30073483/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073483",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073483/ws-services-calculation/WCBillingSlab.json b/data/as/30073483/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2405f2d32f
--- /dev/null
+++ b/data/as/30073483/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073483",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073485/BillingService/BusinessService.json b/data/as/30073485/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7511aa2c3
--- /dev/null
+++ b/data/as/30073485/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073485",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073485/egov-location/boundary-data.json b/data/as/30073485/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2b9983c5ca
--- /dev/null
+++ b/data/as/30073485/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073485",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAWRA PWSS (NEW)",
+                "localname": "KAWRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073485",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAWRA PWSS (NEW)",
+                        "localname": "KAWRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAWRA PWSS (NEW)",
+                "localname": "KAWRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073485",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAWRA PWSS (NEW)",
+                        "localname": "KAWRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073485/ws-services-calculation/Penalty.json b/data/as/30073485/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42ea749cfe
--- /dev/null
+++ b/data/as/30073485/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073485",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073485/ws-services-calculation/WCBillingSlab.json b/data/as/30073485/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7a7be793ad
--- /dev/null
+++ b/data/as/30073485/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073485",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073492/BillingService/BusinessService.json b/data/as/30073492/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb3bfc9c60
--- /dev/null
+++ b/data/as/30073492/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073492",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073492/egov-location/boundary-data.json b/data/as/30073492/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4af963441a
--- /dev/null
+++ b/data/as/30073492/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073492",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI (KRISHNAI) PWSS (NEW)",
+                "localname": "AMBARI (KRISHNAI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI (KRISHNAI) PWSS (NEW)",
+                        "localname": "AMBARI (KRISHNAI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI (KRISHNAI) PWSS (NEW)",
+                "localname": "AMBARI (KRISHNAI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI (KRISHNAI) PWSS (NEW)",
+                        "localname": "AMBARI (KRISHNAI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073492/ws-services-calculation/Penalty.json b/data/as/30073492/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf4b87ee95
--- /dev/null
+++ b/data/as/30073492/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073492",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073492/ws-services-calculation/WCBillingSlab.json b/data/as/30073492/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0f6061ad38
--- /dev/null
+++ b/data/as/30073492/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073492",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073521/BillingService/BusinessService.json b/data/as/30073521/BillingService/BusinessService.json
new file mode 100644
index 0000000000..027bafdc5a
--- /dev/null
+++ b/data/as/30073521/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30073521",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073521/egov-location/boundary-data.json b/data/as/30073521/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9ab3649067
--- /dev/null
+++ b/data/as/30073521/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30073521",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS (NEW)",
+                "localname": "SALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073521",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS (NEW)",
+                        "localname": "SALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS (NEW)",
+                "localname": "SALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30073521",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS (NEW)",
+                        "localname": "SALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073521/ws-services-calculation/Penalty.json b/data/as/30073521/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bc4c700c0c
--- /dev/null
+++ b/data/as/30073521/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30073521",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30073521/ws-services-calculation/WCBillingSlab.json b/data/as/30073521/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94024bafb0
--- /dev/null
+++ b/data/as/30073521/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30073521",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074179/BillingService/BusinessService.json b/data/as/30074179/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b04bfc19d0
--- /dev/null
+++ b/data/as/30074179/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074179",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074179/egov-location/boundary-data.json b/data/as/30074179/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef67705dcc
--- /dev/null
+++ b/data/as/30074179/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074179",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOSORA MATIA PWSS (NEW)",
+                "localname": "DOSORA MATIA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOSORA MATIA PWSS (NEW)",
+                        "localname": "DOSORA MATIA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOSORA MATIA PWSS (NEW)",
+                "localname": "DOSORA MATIA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074179",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOSORA MATIA PWSS (NEW)",
+                        "localname": "DOSORA MATIA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074179/ws-services-calculation/Penalty.json b/data/as/30074179/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d512fd874
--- /dev/null
+++ b/data/as/30074179/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074179",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074179/ws-services-calculation/WCBillingSlab.json b/data/as/30074179/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a3bffff02
--- /dev/null
+++ b/data/as/30074179/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074179",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074189/BillingService/BusinessService.json b/data/as/30074189/BillingService/BusinessService.json
new file mode 100644
index 0000000000..708fcf39f6
--- /dev/null
+++ b/data/as/30074189/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074189",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074189/egov-location/boundary-data.json b/data/as/30074189/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1f691eb67
--- /dev/null
+++ b/data/as/30074189/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074189",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDRA NC PWSS (NEW)",
+                "localname": "GENDRA NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDRA NC PWSS (NEW)",
+                        "localname": "GENDRA NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDRA NC PWSS (NEW)",
+                "localname": "GENDRA NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDRA NC PWSS (NEW)",
+                        "localname": "GENDRA NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074189/ws-services-calculation/Penalty.json b/data/as/30074189/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37d1912603
--- /dev/null
+++ b/data/as/30074189/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074189",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074189/ws-services-calculation/WCBillingSlab.json b/data/as/30074189/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb65f948e1
--- /dev/null
+++ b/data/as/30074189/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074189",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074675/BillingService/BusinessService.json b/data/as/30074675/BillingService/BusinessService.json
new file mode 100644
index 0000000000..528e5116bf
--- /dev/null
+++ b/data/as/30074675/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074675",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074675/egov-location/boundary-data.json b/data/as/30074675/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba4f623dd4
--- /dev/null
+++ b/data/as/30074675/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074675",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                "localname": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074675",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                        "localname": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                "localname": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074675",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                        "localname": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074675/ws-services-calculation/Penalty.json b/data/as/30074675/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a49e24d808
--- /dev/null
+++ b/data/as/30074675/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074675",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074675/ws-services-calculation/WCBillingSlab.json b/data/as/30074675/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..24f16e618e
--- /dev/null
+++ b/data/as/30074675/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074675",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074706/BillingService/BusinessService.json b/data/as/30074706/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90ba80d825
--- /dev/null
+++ b/data/as/30074706/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074706",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074706/egov-location/boundary-data.json b/data/as/30074706/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f2bc4cfe2
--- /dev/null
+++ b/data/as/30074706/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074706",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADAPARA PWSS (NEW)",
+                "localname": "MADAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADAPARA PWSS (NEW)",
+                        "localname": "MADAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADAPARA PWSS (NEW)",
+                "localname": "MADAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074706",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADAPARA PWSS (NEW)",
+                        "localname": "MADAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074706/ws-services-calculation/Penalty.json b/data/as/30074706/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8368393a75
--- /dev/null
+++ b/data/as/30074706/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074706",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074706/ws-services-calculation/WCBillingSlab.json b/data/as/30074706/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..44d2a17063
--- /dev/null
+++ b/data/as/30074706/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074706",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074732/BillingService/BusinessService.json b/data/as/30074732/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ff3de407c1
--- /dev/null
+++ b/data/as/30074732/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074732",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074732/egov-location/boundary-data.json b/data/as/30074732/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c3222eeb43
--- /dev/null
+++ b/data/as/30074732/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074732",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PT-III PWSS (NEW)",
+                "localname": "CHEKOWARI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PT-III PWSS (NEW)",
+                        "localname": "CHEKOWARI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PT-III PWSS (NEW)",
+                "localname": "CHEKOWARI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PT-III PWSS (NEW)",
+                        "localname": "CHEKOWARI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074732/ws-services-calculation/Penalty.json b/data/as/30074732/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dd3204d38c
--- /dev/null
+++ b/data/as/30074732/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074732",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074732/ws-services-calculation/WCBillingSlab.json b/data/as/30074732/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bba689ea49
--- /dev/null
+++ b/data/as/30074732/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074732",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074827/BillingService/BusinessService.json b/data/as/30074827/BillingService/BusinessService.json
new file mode 100644
index 0000000000..525604fa63
--- /dev/null
+++ b/data/as/30074827/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074827",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074827/egov-location/boundary-data.json b/data/as/30074827/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed89c8d53b
--- /dev/null
+++ b/data/as/30074827/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074827",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON GAROPARA PWSS (NEW)",
+                "localname": "JURIGAON GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON GAROPARA PWSS (NEW)",
+                        "localname": "JURIGAON GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON GAROPARA PWSS (NEW)",
+                "localname": "JURIGAON GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON GAROPARA PWSS (NEW)",
+                        "localname": "JURIGAON GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074827/ws-services-calculation/Penalty.json b/data/as/30074827/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd64658669
--- /dev/null
+++ b/data/as/30074827/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074827",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074827/ws-services-calculation/WCBillingSlab.json b/data/as/30074827/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1b636e54c
--- /dev/null
+++ b/data/as/30074827/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074827",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074916/BillingService/BusinessService.json b/data/as/30074916/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c9c8da8647
--- /dev/null
+++ b/data/as/30074916/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074916",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074916/egov-location/boundary-data.json b/data/as/30074916/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b21037843e
--- /dev/null
+++ b/data/as/30074916/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074916",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.5 SINGRI BAGAN PART-B PWSS",
+                "localname": "NO.5 SINGRI BAGAN PART-B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074916",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.5 SINGRI BAGAN PART-B PWSS",
+                        "localname": "NO.5 SINGRI BAGAN PART-B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.5 SINGRI BAGAN PART-B PWSS",
+                "localname": "NO.5 SINGRI BAGAN PART-B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074916",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.5 SINGRI BAGAN PART-B PWSS",
+                        "localname": "NO.5 SINGRI BAGAN PART-B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074916/ws-services-calculation/Penalty.json b/data/as/30074916/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e0477a3b5c
--- /dev/null
+++ b/data/as/30074916/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074916",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074916/ws-services-calculation/WCBillingSlab.json b/data/as/30074916/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3cf411d4e0
--- /dev/null
+++ b/data/as/30074916/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074916",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074975/BillingService/BusinessService.json b/data/as/30074975/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5722eb1ce2
--- /dev/null
+++ b/data/as/30074975/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074975",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074975/egov-location/boundary-data.json b/data/as/30074975/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a870a74d9a
--- /dev/null
+++ b/data/as/30074975/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074975",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAPANI PT-II PWSS (NEW)",
+                "localname": "KALAPANI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAPANI PT-II PWSS (NEW)",
+                        "localname": "KALAPANI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAPANI PT-II PWSS (NEW)",
+                "localname": "KALAPANI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAPANI PT-II PWSS (NEW)",
+                        "localname": "KALAPANI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074975/ws-services-calculation/Penalty.json b/data/as/30074975/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82374f7877
--- /dev/null
+++ b/data/as/30074975/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074975",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074975/ws-services-calculation/WCBillingSlab.json b/data/as/30074975/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03f3eb96f5
--- /dev/null
+++ b/data/as/30074975/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074975",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074989/BillingService/BusinessService.json b/data/as/30074989/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01ccc1d668
--- /dev/null
+++ b/data/as/30074989/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074989",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074989/egov-location/boundary-data.json b/data/as/30074989/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2857360372
--- /dev/null
+++ b/data/as/30074989/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074989",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAPANI PT-I PWSS (NEW)",
+                "localname": "KALAPANI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAPANI PT-I PWSS (NEW)",
+                        "localname": "KALAPANI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAPANI PT-I PWSS (NEW)",
+                "localname": "KALAPANI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074989",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAPANI PT-I PWSS (NEW)",
+                        "localname": "KALAPANI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074989/ws-services-calculation/Penalty.json b/data/as/30074989/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..570c86ec5c
--- /dev/null
+++ b/data/as/30074989/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074989",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074989/ws-services-calculation/WCBillingSlab.json b/data/as/30074989/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fd4f696e5a
--- /dev/null
+++ b/data/as/30074989/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074989",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074995/BillingService/BusinessService.json b/data/as/30074995/BillingService/BusinessService.json
new file mode 100644
index 0000000000..702381aa2a
--- /dev/null
+++ b/data/as/30074995/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30074995",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074995/egov-location/boundary-data.json b/data/as/30074995/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1c873b9b5e
--- /dev/null
+++ b/data/as/30074995/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30074995",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALDHOWA PWSS (NEW)",
+                "localname": "SALDHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074995",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALDHOWA PWSS (NEW)",
+                        "localname": "SALDHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALDHOWA PWSS (NEW)",
+                "localname": "SALDHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30074995",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALDHOWA PWSS (NEW)",
+                        "localname": "SALDHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074995/ws-services-calculation/Penalty.json b/data/as/30074995/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f95da0abd
--- /dev/null
+++ b/data/as/30074995/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30074995",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30074995/ws-services-calculation/WCBillingSlab.json b/data/as/30074995/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..84729ec984
--- /dev/null
+++ b/data/as/30074995/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30074995",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075002/BillingService/BusinessService.json b/data/as/30075002/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cd5bca9c1
--- /dev/null
+++ b/data/as/30075002/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075002",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075002/egov-location/boundary-data.json b/data/as/30075002/egov-location/boundary-data.json
new file mode 100644
index 0000000000..96b0e70ff6
--- /dev/null
+++ b/data/as/30075002/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075002",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASPARA (JALESWAR) PWSS (NEW)",
+                "localname": "DASPARA (JALESWAR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075002",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASPARA (JALESWAR) PWSS (NEW)",
+                        "localname": "DASPARA (JALESWAR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DASPARA (JALESWAR) PWSS (NEW)",
+                "localname": "DASPARA (JALESWAR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075002",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DASPARA (JALESWAR) PWSS (NEW)",
+                        "localname": "DASPARA (JALESWAR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075002/ws-services-calculation/Penalty.json b/data/as/30075002/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c339a1e223
--- /dev/null
+++ b/data/as/30075002/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075002",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075002/ws-services-calculation/WCBillingSlab.json b/data/as/30075002/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37b576ca94
--- /dev/null
+++ b/data/as/30075002/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075002",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075008/BillingService/BusinessService.json b/data/as/30075008/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32250c0151
--- /dev/null
+++ b/data/as/30075008/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075008",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075008/egov-location/boundary-data.json b/data/as/30075008/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c04990cde3
--- /dev/null
+++ b/data/as/30075008/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075008",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                "localname": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075008",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                        "localname": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                "localname": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075008",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                        "localname": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075008/ws-services-calculation/Penalty.json b/data/as/30075008/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3906102542
--- /dev/null
+++ b/data/as/30075008/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075008",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075008/ws-services-calculation/WCBillingSlab.json b/data/as/30075008/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..62cce56564
--- /dev/null
+++ b/data/as/30075008/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075008",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075655/BillingService/BusinessService.json b/data/as/30075655/BillingService/BusinessService.json
new file mode 100644
index 0000000000..082d680f38
--- /dev/null
+++ b/data/as/30075655/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075655",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075655/egov-location/boundary-data.json b/data/as/30075655/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9ee8f8d2ae
--- /dev/null
+++ b/data/as/30075655/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075655",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTARPARA PWSS (NEW)",
+                "localname": "UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTARPARA PWSS (NEW)",
+                        "localname": "UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTARPARA PWSS (NEW)",
+                "localname": "UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075655",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTARPARA PWSS (NEW)",
+                        "localname": "UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075655/ws-services-calculation/Penalty.json b/data/as/30075655/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ebdb36914e
--- /dev/null
+++ b/data/as/30075655/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075655",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075655/ws-services-calculation/WCBillingSlab.json b/data/as/30075655/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02c2f684e2
--- /dev/null
+++ b/data/as/30075655/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075655",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075682/BillingService/BusinessService.json b/data/as/30075682/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5369e7c544
--- /dev/null
+++ b/data/as/30075682/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075682",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075682/egov-location/boundary-data.json b/data/as/30075682/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eb9a0feddf
--- /dev/null
+++ b/data/as/30075682/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075682",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMANPARA PWSS (NEW)",
+                "localname": "BARMANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075682",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMANPARA PWSS (NEW)",
+                        "localname": "BARMANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMANPARA PWSS (NEW)",
+                "localname": "BARMANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075682",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMANPARA PWSS (NEW)",
+                        "localname": "BARMANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075682/ws-services-calculation/Penalty.json b/data/as/30075682/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2ea5cbde4c
--- /dev/null
+++ b/data/as/30075682/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075682",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075682/ws-services-calculation/WCBillingSlab.json b/data/as/30075682/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5150591523
--- /dev/null
+++ b/data/as/30075682/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075682",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075685/BillingService/BusinessService.json b/data/as/30075685/BillingService/BusinessService.json
new file mode 100644
index 0000000000..76b0236b6e
--- /dev/null
+++ b/data/as/30075685/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075685",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075685/egov-location/boundary-data.json b/data/as/30075685/egov-location/boundary-data.json
new file mode 100644
index 0000000000..83c7ab37e0
--- /dev/null
+++ b/data/as/30075685/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075685",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA NO.4 PWSS (NEW)",
+                "localname": "SIMLITOLA NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA NO.4 PWSS (NEW)",
+                        "localname": "SIMLITOLA NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA NO.4 PWSS (NEW)",
+                "localname": "SIMLITOLA NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075685",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA NO.4 PWSS (NEW)",
+                        "localname": "SIMLITOLA NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075685/ws-services-calculation/Penalty.json b/data/as/30075685/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..06f3e80565
--- /dev/null
+++ b/data/as/30075685/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075685",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075685/ws-services-calculation/WCBillingSlab.json b/data/as/30075685/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30add7e50a
--- /dev/null
+++ b/data/as/30075685/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075685",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075704/BillingService/BusinessService.json b/data/as/30075704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31a2022fa7
--- /dev/null
+++ b/data/as/30075704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075704/egov-location/boundary-data.json b/data/as/30075704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4828a793c8
--- /dev/null
+++ b/data/as/30075704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA 2 PWSS (NEW)",
+                "localname": "MANUPARA 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA 2 PWSS (NEW)",
+                        "localname": "MANUPARA 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA 2 PWSS (NEW)",
+                "localname": "MANUPARA 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA 2 PWSS (NEW)",
+                        "localname": "MANUPARA 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075704/ws-services-calculation/Penalty.json b/data/as/30075704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5fbc1582a1
--- /dev/null
+++ b/data/as/30075704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075704/ws-services-calculation/WCBillingSlab.json b/data/as/30075704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6aaa94f51e
--- /dev/null
+++ b/data/as/30075704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075708/BillingService/BusinessService.json b/data/as/30075708/BillingService/BusinessService.json
new file mode 100644
index 0000000000..51c755db51
--- /dev/null
+++ b/data/as/30075708/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075708",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075708/egov-location/boundary-data.json b/data/as/30075708/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f84367d9cf
--- /dev/null
+++ b/data/as/30075708/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075708",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO BOGUAN PWSS (NEW)",
+                "localname": "BORO BOGUAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO BOGUAN PWSS (NEW)",
+                        "localname": "BORO BOGUAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO BOGUAN PWSS (NEW)",
+                "localname": "BORO BOGUAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO BOGUAN PWSS (NEW)",
+                        "localname": "BORO BOGUAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075708/ws-services-calculation/Penalty.json b/data/as/30075708/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0f29960e69
--- /dev/null
+++ b/data/as/30075708/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075708",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075708/ws-services-calculation/WCBillingSlab.json b/data/as/30075708/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94c71324b8
--- /dev/null
+++ b/data/as/30075708/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075708",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075836/BillingService/BusinessService.json b/data/as/30075836/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ed4fcb39b
--- /dev/null
+++ b/data/as/30075836/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075836",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075836/egov-location/boundary-data.json b/data/as/30075836/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f14d2f144
--- /dev/null
+++ b/data/as/30075836/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075836",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARDAMAL PT-II PWSS (NEW)",
+                "localname": "BARDAMAL PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075836",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARDAMAL PT-II PWSS (NEW)",
+                        "localname": "BARDAMAL PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARDAMAL PT-II PWSS (NEW)",
+                "localname": "BARDAMAL PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075836",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARDAMAL PT-II PWSS (NEW)",
+                        "localname": "BARDAMAL PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075836/ws-services-calculation/Penalty.json b/data/as/30075836/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a3a0cedbbc
--- /dev/null
+++ b/data/as/30075836/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075836",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075836/ws-services-calculation/WCBillingSlab.json b/data/as/30075836/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9d5673e5c
--- /dev/null
+++ b/data/as/30075836/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075836",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075842/BillingService/BusinessService.json b/data/as/30075842/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d210734318
--- /dev/null
+++ b/data/as/30075842/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075842",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075842/egov-location/boundary-data.json b/data/as/30075842/egov-location/boundary-data.json
new file mode 100644
index 0000000000..647d2c8c53
--- /dev/null
+++ b/data/as/30075842/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075842",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUTARABORI PWSS (NEW)",
+                "localname": "CHOUTARABORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075842",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUTARABORI PWSS (NEW)",
+                        "localname": "CHOUTARABORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUTARABORI PWSS (NEW)",
+                "localname": "CHOUTARABORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075842",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUTARABORI PWSS (NEW)",
+                        "localname": "CHOUTARABORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075842/ws-services-calculation/Penalty.json b/data/as/30075842/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f2a2338e89
--- /dev/null
+++ b/data/as/30075842/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075842",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075842/ws-services-calculation/WCBillingSlab.json b/data/as/30075842/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fdcc599a4b
--- /dev/null
+++ b/data/as/30075842/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075842",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075998/BillingService/BusinessService.json b/data/as/30075998/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b26a70e7d
--- /dev/null
+++ b/data/as/30075998/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30075998",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075998/egov-location/boundary-data.json b/data/as/30075998/egov-location/boundary-data.json
new file mode 100644
index 0000000000..008d299bed
--- /dev/null
+++ b/data/as/30075998/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30075998",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA TE PWSS",
+                "localname": "DIPLONGA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA TE PWSS",
+                        "localname": "DIPLONGA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA TE PWSS",
+                "localname": "DIPLONGA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30075998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA TE PWSS",
+                        "localname": "DIPLONGA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075998/ws-services-calculation/Penalty.json b/data/as/30075998/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5034aa542
--- /dev/null
+++ b/data/as/30075998/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30075998",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30075998/ws-services-calculation/WCBillingSlab.json b/data/as/30075998/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..528895bd6f
--- /dev/null
+++ b/data/as/30075998/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30075998",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076178/BillingService/BusinessService.json b/data/as/30076178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..14bfc35ed1
--- /dev/null
+++ b/data/as/30076178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076178/egov-location/boundary-data.json b/data/as/30076178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..36ee9d4a7a
--- /dev/null
+++ b/data/as/30076178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW ARAGAON PWSS",
+                "localname": "NEW ARAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW ARAGAON PWSS",
+                        "localname": "NEW ARAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW ARAGAON PWSS",
+                "localname": "NEW ARAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW ARAGAON PWSS",
+                        "localname": "NEW ARAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076178/ws-services-calculation/Penalty.json b/data/as/30076178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..038194efbf
--- /dev/null
+++ b/data/as/30076178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076178/ws-services-calculation/WCBillingSlab.json b/data/as/30076178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fdbefaf18
--- /dev/null
+++ b/data/as/30076178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076404/BillingService/BusinessService.json b/data/as/30076404/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f7fac7e966
--- /dev/null
+++ b/data/as/30076404/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076404",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076404/egov-location/boundary-data.json b/data/as/30076404/egov-location/boundary-data.json
new file mode 100644
index 0000000000..69e1cf7070
--- /dev/null
+++ b/data/as/30076404/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076404",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOLOKERPAM PWSS (NEW)",
+                "localname": "GOLOKERPAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076404",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOLOKERPAM PWSS (NEW)",
+                        "localname": "GOLOKERPAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOLOKERPAM PWSS (NEW)",
+                "localname": "GOLOKERPAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076404",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOLOKERPAM PWSS (NEW)",
+                        "localname": "GOLOKERPAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076404/ws-services-calculation/Penalty.json b/data/as/30076404/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ed9be71fa7
--- /dev/null
+++ b/data/as/30076404/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076404",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076404/ws-services-calculation/WCBillingSlab.json b/data/as/30076404/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f36a641a56
--- /dev/null
+++ b/data/as/30076404/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076404",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076417/BillingService/BusinessService.json b/data/as/30076417/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d3938fe71
--- /dev/null
+++ b/data/as/30076417/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076417",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076417/egov-location/boundary-data.json b/data/as/30076417/egov-location/boundary-data.json
new file mode 100644
index 0000000000..047f2b43ec
--- /dev/null
+++ b/data/as/30076417/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076417",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALISAVITA PT-I PWSS (NEW)",
+                "localname": "KHALISAVITA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076417",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALISAVITA PT-I PWSS (NEW)",
+                        "localname": "KHALISAVITA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALISAVITA PT-I PWSS (NEW)",
+                "localname": "KHALISAVITA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076417",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALISAVITA PT-I PWSS (NEW)",
+                        "localname": "KHALISAVITA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076417/ws-services-calculation/Penalty.json b/data/as/30076417/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..92c4654856
--- /dev/null
+++ b/data/as/30076417/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076417",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076417/ws-services-calculation/WCBillingSlab.json b/data/as/30076417/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91c0fcf9e5
--- /dev/null
+++ b/data/as/30076417/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076417",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076423/BillingService/BusinessService.json b/data/as/30076423/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d8d4b6d0e
--- /dev/null
+++ b/data/as/30076423/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076423",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076423/egov-location/boundary-data.json b/data/as/30076423/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5933824ae3
--- /dev/null
+++ b/data/as/30076423/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076423",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                "localname": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                        "localname": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                "localname": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                        "localname": "BHERBHERI PACHIM GAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076423/ws-services-calculation/Penalty.json b/data/as/30076423/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d63243cef
--- /dev/null
+++ b/data/as/30076423/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076423",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076423/ws-services-calculation/WCBillingSlab.json b/data/as/30076423/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd75a308bd
--- /dev/null
+++ b/data/as/30076423/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076423",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076442/BillingService/BusinessService.json b/data/as/30076442/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3fc1390516
--- /dev/null
+++ b/data/as/30076442/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076442",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076442/egov-location/boundary-data.json b/data/as/30076442/egov-location/boundary-data.json
new file mode 100644
index 0000000000..057266f216
--- /dev/null
+++ b/data/as/30076442/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076442",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAIATI GAON PWSS",
+                "localname": "DHIRAIATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAIATI GAON PWSS",
+                        "localname": "DHIRAIATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAIATI GAON PWSS",
+                "localname": "DHIRAIATI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAIATI GAON PWSS",
+                        "localname": "DHIRAIATI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076442/ws-services-calculation/Penalty.json b/data/as/30076442/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..57bd61ab6e
--- /dev/null
+++ b/data/as/30076442/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076442",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076442/ws-services-calculation/WCBillingSlab.json b/data/as/30076442/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..19bf60aa5d
--- /dev/null
+++ b/data/as/30076442/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076442",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076496/BillingService/BusinessService.json b/data/as/30076496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6469daae8
--- /dev/null
+++ b/data/as/30076496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076496/egov-location/boundary-data.json b/data/as/30076496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..712c344109
--- /dev/null
+++ b/data/as/30076496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEKOKOLI NEPALI PWSS",
+                "localname": "KEKOKOLI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEKOKOLI NEPALI PWSS",
+                        "localname": "KEKOKOLI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KEKOKOLI NEPALI PWSS",
+                "localname": "KEKOKOLI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KEKOKOLI NEPALI PWSS",
+                        "localname": "KEKOKOLI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076496/ws-services-calculation/Penalty.json b/data/as/30076496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cb4c1dbed5
--- /dev/null
+++ b/data/as/30076496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076496/ws-services-calculation/WCBillingSlab.json b/data/as/30076496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f39ffeadc8
--- /dev/null
+++ b/data/as/30076496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076501/BillingService/BusinessService.json b/data/as/30076501/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7da0eaa455
--- /dev/null
+++ b/data/as/30076501/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076501",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076501/egov-location/boundary-data.json b/data/as/30076501/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5c8a502178
--- /dev/null
+++ b/data/as/30076501/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076501",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHUYAN GAON PWSS",
+                "localname": "BHUYAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076501",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHUYAN GAON PWSS",
+                        "localname": "BHUYAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHUYAN GAON PWSS",
+                "localname": "BHUYAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076501",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHUYAN GAON PWSS",
+                        "localname": "BHUYAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076501/ws-services-calculation/Penalty.json b/data/as/30076501/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f5e69e0af
--- /dev/null
+++ b/data/as/30076501/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076501",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076501/ws-services-calculation/WCBillingSlab.json b/data/as/30076501/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..174afea182
--- /dev/null
+++ b/data/as/30076501/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076501",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076546/BillingService/BusinessService.json b/data/as/30076546/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb5abdc746
--- /dev/null
+++ b/data/as/30076546/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076546",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076546/egov-location/boundary-data.json b/data/as/30076546/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0833b8f71a
--- /dev/null
+++ b/data/as/30076546/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076546",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                "localname": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076546",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                        "localname": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                "localname": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076546",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                        "localname": "UHANI PATHAR BATABARI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076546/ws-services-calculation/Penalty.json b/data/as/30076546/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad8ec74485
--- /dev/null
+++ b/data/as/30076546/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076546",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076546/ws-services-calculation/WCBillingSlab.json b/data/as/30076546/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1824e005e2
--- /dev/null
+++ b/data/as/30076546/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076546",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076588/BillingService/BusinessService.json b/data/as/30076588/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f15918e4b
--- /dev/null
+++ b/data/as/30076588/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076588",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076588/egov-location/boundary-data.json b/data/as/30076588/egov-location/boundary-data.json
new file mode 100644
index 0000000000..625d4d27f0
--- /dev/null
+++ b/data/as/30076588/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076588",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076588/ws-services-calculation/Penalty.json b/data/as/30076588/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a0df54e493
--- /dev/null
+++ b/data/as/30076588/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076588",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076588/ws-services-calculation/WCBillingSlab.json b/data/as/30076588/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31ef041879
--- /dev/null
+++ b/data/as/30076588/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076588",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076595/BillingService/BusinessService.json b/data/as/30076595/BillingService/BusinessService.json
new file mode 100644
index 0000000000..af52bbc02a
--- /dev/null
+++ b/data/as/30076595/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076595",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076595/egov-location/boundary-data.json b/data/as/30076595/egov-location/boundary-data.json
new file mode 100644
index 0000000000..874afc59db
--- /dev/null
+++ b/data/as/30076595/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076595",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOISKHULIPARA PWSS (NEW)",
+                "localname": "MOISKHULIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOISKHULIPARA PWSS (NEW)",
+                        "localname": "MOISKHULIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOISKHULIPARA PWSS (NEW)",
+                "localname": "MOISKHULIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOISKHULIPARA PWSS (NEW)",
+                        "localname": "MOISKHULIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076595/ws-services-calculation/Penalty.json b/data/as/30076595/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6b8c640a69
--- /dev/null
+++ b/data/as/30076595/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076595",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076595/ws-services-calculation/WCBillingSlab.json b/data/as/30076595/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..396c77c525
--- /dev/null
+++ b/data/as/30076595/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076595",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076911/BillingService/BusinessService.json b/data/as/30076911/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f4b26e03d
--- /dev/null
+++ b/data/as/30076911/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30076911",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076911/egov-location/boundary-data.json b/data/as/30076911/egov-location/boundary-data.json
new file mode 100644
index 0000000000..33c105d402
--- /dev/null
+++ b/data/as/30076911/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30076911",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA PT-IV RABHAPARA (NEW)",
+                "localname": "KARIPARA PT-IV RABHAPARA (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076911",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA PT-IV RABHAPARA (NEW)",
+                        "localname": "KARIPARA PT-IV RABHAPARA (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA PT-IV RABHAPARA (NEW)",
+                "localname": "KARIPARA PT-IV RABHAPARA (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30076911",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA PT-IV RABHAPARA (NEW)",
+                        "localname": "KARIPARA PT-IV RABHAPARA (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076911/ws-services-calculation/Penalty.json b/data/as/30076911/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc761903e9
--- /dev/null
+++ b/data/as/30076911/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30076911",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30076911/ws-services-calculation/WCBillingSlab.json b/data/as/30076911/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d5eb91afb
--- /dev/null
+++ b/data/as/30076911/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30076911",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077015/BillingService/BusinessService.json b/data/as/30077015/BillingService/BusinessService.json
new file mode 100644
index 0000000000..327d67838d
--- /dev/null
+++ b/data/as/30077015/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077015",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077015/egov-location/boundary-data.json b/data/as/30077015/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b87fdeda23
--- /dev/null
+++ b/data/as/30077015/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077015",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANYAGHAT PWSS",
+                "localname": "KANYAGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077015",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANYAGHAT PWSS",
+                        "localname": "KANYAGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANYAGHAT PWSS",
+                "localname": "KANYAGHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077015",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANYAGHAT PWSS",
+                        "localname": "KANYAGHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077015/ws-services-calculation/Penalty.json b/data/as/30077015/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e558ccc05a
--- /dev/null
+++ b/data/as/30077015/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077015",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077015/ws-services-calculation/WCBillingSlab.json b/data/as/30077015/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1da051a4de
--- /dev/null
+++ b/data/as/30077015/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077015",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077065/BillingService/BusinessService.json b/data/as/30077065/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c3a64d63d9
--- /dev/null
+++ b/data/as/30077065/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077065",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077065/egov-location/boundary-data.json b/data/as/30077065/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae5b57e2be
--- /dev/null
+++ b/data/as/30077065/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077065",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGPATA PWSS (NEW)",
+                "localname": "CHENGPATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGPATA PWSS (NEW)",
+                        "localname": "CHENGPATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGPATA PWSS (NEW)",
+                "localname": "CHENGPATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGPATA PWSS (NEW)",
+                        "localname": "CHENGPATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077065/ws-services-calculation/Penalty.json b/data/as/30077065/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8db1a33d94
--- /dev/null
+++ b/data/as/30077065/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077065",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077065/ws-services-calculation/WCBillingSlab.json b/data/as/30077065/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fd4d08d071
--- /dev/null
+++ b/data/as/30077065/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077065",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077169/BillingService/BusinessService.json b/data/as/30077169/BillingService/BusinessService.json
new file mode 100644
index 0000000000..303b2589a8
--- /dev/null
+++ b/data/as/30077169/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077169",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077169/egov-location/boundary-data.json b/data/as/30077169/egov-location/boundary-data.json
new file mode 100644
index 0000000000..107da8bf19
--- /dev/null
+++ b/data/as/30077169/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077169",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARCHURA REO GRANT PWSS",
+                "localname": "HARCHURA REO GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077169",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARCHURA REO GRANT PWSS",
+                        "localname": "HARCHURA REO GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARCHURA REO GRANT PWSS",
+                "localname": "HARCHURA REO GRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077169",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARCHURA REO GRANT PWSS",
+                        "localname": "HARCHURA REO GRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077169/ws-services-calculation/Penalty.json b/data/as/30077169/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5939e1f0dc
--- /dev/null
+++ b/data/as/30077169/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077169",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077169/ws-services-calculation/WCBillingSlab.json b/data/as/30077169/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7f2866ae94
--- /dev/null
+++ b/data/as/30077169/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077169",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077173/BillingService/BusinessService.json b/data/as/30077173/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dd2f488cd1
--- /dev/null
+++ b/data/as/30077173/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077173",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077173/egov-location/boundary-data.json b/data/as/30077173/egov-location/boundary-data.json
new file mode 100644
index 0000000000..869d36e7e4
--- /dev/null
+++ b/data/as/30077173/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077173",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLAN PUKHURI PWSS",
+                "localname": "MOLAN PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLAN PUKHURI PWSS",
+                        "localname": "MOLAN PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLAN PUKHURI PWSS",
+                "localname": "MOLAN PUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077173",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLAN PUKHURI PWSS",
+                        "localname": "MOLAN PUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077173/ws-services-calculation/Penalty.json b/data/as/30077173/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..59990fa859
--- /dev/null
+++ b/data/as/30077173/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077173",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077173/ws-services-calculation/WCBillingSlab.json b/data/as/30077173/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f137a96643
--- /dev/null
+++ b/data/as/30077173/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077173",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077183/BillingService/BusinessService.json b/data/as/30077183/BillingService/BusinessService.json
new file mode 100644
index 0000000000..43e2183cc8
--- /dev/null
+++ b/data/as/30077183/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077183",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077183/egov-location/boundary-data.json b/data/as/30077183/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a3c0f7dc3e
--- /dev/null
+++ b/data/as/30077183/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077183",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARCHURA PATGAON PWSS",
+                "localname": "HARCHURA PATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077183",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARCHURA PATGAON PWSS",
+                        "localname": "HARCHURA PATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARCHURA PATGAON PWSS",
+                "localname": "HARCHURA PATGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077183",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARCHURA PATGAON PWSS",
+                        "localname": "HARCHURA PATGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077183/ws-services-calculation/Penalty.json b/data/as/30077183/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83547db351
--- /dev/null
+++ b/data/as/30077183/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077183",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077183/ws-services-calculation/WCBillingSlab.json b/data/as/30077183/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5f0f7ac19
--- /dev/null
+++ b/data/as/30077183/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077183",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077189/BillingService/BusinessService.json b/data/as/30077189/BillingService/BusinessService.json
new file mode 100644
index 0000000000..551a9f46cb
--- /dev/null
+++ b/data/as/30077189/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077189",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077189/egov-location/boundary-data.json b/data/as/30077189/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7824c9b592
--- /dev/null
+++ b/data/as/30077189/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077189",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALIHA MARI PWSS",
+                "localname": "KHALIHA MARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALIHA MARI PWSS",
+                        "localname": "KHALIHA MARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALIHA MARI PWSS",
+                "localname": "KHALIHA MARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALIHA MARI PWSS",
+                        "localname": "KHALIHA MARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077189/ws-services-calculation/Penalty.json b/data/as/30077189/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..823558ffcd
--- /dev/null
+++ b/data/as/30077189/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077189",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077189/ws-services-calculation/WCBillingSlab.json b/data/as/30077189/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7bb4bbc56d
--- /dev/null
+++ b/data/as/30077189/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077189",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077362/BillingService/BusinessService.json b/data/as/30077362/BillingService/BusinessService.json
new file mode 100644
index 0000000000..81f7d1f6ee
--- /dev/null
+++ b/data/as/30077362/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077362",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077362/egov-location/boundary-data.json b/data/as/30077362/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb9f8c26c6
--- /dev/null
+++ b/data/as/30077362/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077362",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHINPARA PWSS (NEW)",
+                "localname": "DAKHINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077362",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHINPARA PWSS (NEW)",
+                        "localname": "DAKHINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHINPARA PWSS (NEW)",
+                "localname": "DAKHINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077362",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHINPARA PWSS (NEW)",
+                        "localname": "DAKHINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077362/ws-services-calculation/Penalty.json b/data/as/30077362/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83b377bd62
--- /dev/null
+++ b/data/as/30077362/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077362",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077362/ws-services-calculation/WCBillingSlab.json b/data/as/30077362/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b7db16fac
--- /dev/null
+++ b/data/as/30077362/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077362",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077383/BillingService/BusinessService.json b/data/as/30077383/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b0c0cce90
--- /dev/null
+++ b/data/as/30077383/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077383",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077383/egov-location/boundary-data.json b/data/as/30077383/egov-location/boundary-data.json
new file mode 100644
index 0000000000..809b089214
--- /dev/null
+++ b/data/as/30077383/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077383",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                "localname": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                        "localname": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                "localname": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                        "localname": "HATKHOLA (BALADMARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077383/ws-services-calculation/Penalty.json b/data/as/30077383/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b1451d852
--- /dev/null
+++ b/data/as/30077383/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077383",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077383/ws-services-calculation/WCBillingSlab.json b/data/as/30077383/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a26acbf051
--- /dev/null
+++ b/data/as/30077383/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077383",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077387/BillingService/BusinessService.json b/data/as/30077387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..43ed683d67
--- /dev/null
+++ b/data/as/30077387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077387/egov-location/boundary-data.json b/data/as/30077387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48f037fe74
--- /dev/null
+++ b/data/as/30077387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELBORI NAYAPARA PWSS (NEW)",
+                "localname": "BELBORI NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELBORI NAYAPARA PWSS (NEW)",
+                        "localname": "BELBORI NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELBORI NAYAPARA PWSS (NEW)",
+                "localname": "BELBORI NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELBORI NAYAPARA PWSS (NEW)",
+                        "localname": "BELBORI NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077387/ws-services-calculation/Penalty.json b/data/as/30077387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..47b4dcab7d
--- /dev/null
+++ b/data/as/30077387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077387/ws-services-calculation/WCBillingSlab.json b/data/as/30077387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..071df312d0
--- /dev/null
+++ b/data/as/30077387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077405/BillingService/BusinessService.json b/data/as/30077405/BillingService/BusinessService.json
new file mode 100644
index 0000000000..669b0d197a
--- /dev/null
+++ b/data/as/30077405/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077405",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077405/egov-location/boundary-data.json b/data/as/30077405/egov-location/boundary-data.json
new file mode 100644
index 0000000000..be5dd7c985
--- /dev/null
+++ b/data/as/30077405/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077405",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DANAPARA PWSS (NEW)",
+                "localname": "DANAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077405",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DANAPARA PWSS (NEW)",
+                        "localname": "DANAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DANAPARA PWSS (NEW)",
+                "localname": "DANAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077405",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DANAPARA PWSS (NEW)",
+                        "localname": "DANAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077405/ws-services-calculation/Penalty.json b/data/as/30077405/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..736ee39228
--- /dev/null
+++ b/data/as/30077405/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077405",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077405/ws-services-calculation/WCBillingSlab.json b/data/as/30077405/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22c405a71f
--- /dev/null
+++ b/data/as/30077405/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077405",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077516/BillingService/BusinessService.json b/data/as/30077516/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d47ec1611
--- /dev/null
+++ b/data/as/30077516/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077516",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077516/egov-location/boundary-data.json b/data/as/30077516/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e18e93314
--- /dev/null
+++ b/data/as/30077516/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077516",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARBARI PWSS",
+                "localname": "KHARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARBARI PWSS",
+                        "localname": "KHARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARBARI PWSS",
+                "localname": "KHARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARBARI PWSS",
+                        "localname": "KHARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077516/ws-services-calculation/Penalty.json b/data/as/30077516/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46406a9123
--- /dev/null
+++ b/data/as/30077516/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077516",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077516/ws-services-calculation/WCBillingSlab.json b/data/as/30077516/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..99c521f88f
--- /dev/null
+++ b/data/as/30077516/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077516",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077531/BillingService/BusinessService.json b/data/as/30077531/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f210e82d16
--- /dev/null
+++ b/data/as/30077531/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077531",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077531/egov-location/boundary-data.json b/data/as/30077531/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34d8fc9d77
--- /dev/null
+++ b/data/as/30077531/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077531",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LALABORI KODOMTOLA PWSS (NEW)",
+                "localname": "LALABORI KODOMTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LALABORI KODOMTOLA PWSS (NEW)",
+                        "localname": "LALABORI KODOMTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LALABORI KODOMTOLA PWSS (NEW)",
+                "localname": "LALABORI KODOMTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077531",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LALABORI KODOMTOLA PWSS (NEW)",
+                        "localname": "LALABORI KODOMTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077531/ws-services-calculation/Penalty.json b/data/as/30077531/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f312745d29
--- /dev/null
+++ b/data/as/30077531/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077531",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077531/ws-services-calculation/WCBillingSlab.json b/data/as/30077531/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3aaa1db647
--- /dev/null
+++ b/data/as/30077531/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077531",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077533/BillingService/BusinessService.json b/data/as/30077533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8ca92f7d2
--- /dev/null
+++ b/data/as/30077533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077533/egov-location/boundary-data.json b/data/as/30077533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7c0b7d0959
--- /dev/null
+++ b/data/as/30077533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                "localname": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                        "localname": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                "localname": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                        "localname": "KOCHPARA REFUJIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077533/ws-services-calculation/Penalty.json b/data/as/30077533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..751387dff4
--- /dev/null
+++ b/data/as/30077533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077533/ws-services-calculation/WCBillingSlab.json b/data/as/30077533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a4d0c70485
--- /dev/null
+++ b/data/as/30077533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077538/BillingService/BusinessService.json b/data/as/30077538/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec179ad52f
--- /dev/null
+++ b/data/as/30077538/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30077538",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077538/egov-location/boundary-data.json b/data/as/30077538/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d400b5fd3e
--- /dev/null
+++ b/data/as/30077538/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30077538",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHYASINI MVS PWSS (NEW)",
+                "localname": "RAKHYASINI MVS PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHYASINI MVS PWSS (NEW)",
+                        "localname": "RAKHYASINI MVS PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHYASINI MVS PWSS (NEW)",
+                "localname": "RAKHYASINI MVS PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30077538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHYASINI MVS PWSS (NEW)",
+                        "localname": "RAKHYASINI MVS PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077538/ws-services-calculation/Penalty.json b/data/as/30077538/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e7d3894457
--- /dev/null
+++ b/data/as/30077538/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30077538",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30077538/ws-services-calculation/WCBillingSlab.json b/data/as/30077538/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..149d8e25a3
--- /dev/null
+++ b/data/as/30077538/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30077538",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078496/BillingService/BusinessService.json b/data/as/30078496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..181847248f
--- /dev/null
+++ b/data/as/30078496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30078496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078496/egov-location/boundary-data.json b/data/as/30078496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c8590dfb3a
--- /dev/null
+++ b/data/as/30078496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30078496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONUJULI NO.1 PWSS",
+                "localname": "MONUJULI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30078496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONUJULI NO.1 PWSS",
+                        "localname": "MONUJULI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONUJULI NO.1 PWSS",
+                "localname": "MONUJULI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30078496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONUJULI NO.1 PWSS",
+                        "localname": "MONUJULI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078496/ws-services-calculation/Penalty.json b/data/as/30078496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc90a4923c
--- /dev/null
+++ b/data/as/30078496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30078496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078496/ws-services-calculation/WCBillingSlab.json b/data/as/30078496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca48848618
--- /dev/null
+++ b/data/as/30078496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30078496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078499/BillingService/BusinessService.json b/data/as/30078499/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a8f8dc081
--- /dev/null
+++ b/data/as/30078499/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30078499",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078499/egov-location/boundary-data.json b/data/as/30078499/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5808d8baa0
--- /dev/null
+++ b/data/as/30078499/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30078499",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONUJULI NO.2 PWSS",
+                "localname": "MONUJULI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30078499",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONUJULI NO.2 PWSS",
+                        "localname": "MONUJULI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONUJULI NO.2 PWSS",
+                "localname": "MONUJULI NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30078499",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONUJULI NO.2 PWSS",
+                        "localname": "MONUJULI NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078499/ws-services-calculation/Penalty.json b/data/as/30078499/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7bb831b97e
--- /dev/null
+++ b/data/as/30078499/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30078499",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30078499/ws-services-calculation/WCBillingSlab.json b/data/as/30078499/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9cbbfdc34
--- /dev/null
+++ b/data/as/30078499/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30078499",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079129/BillingService/BusinessService.json b/data/as/30079129/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0b90500f30
--- /dev/null
+++ b/data/as/30079129/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30079129",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079129/egov-location/boundary-data.json b/data/as/30079129/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f954560b47
--- /dev/null
+++ b/data/as/30079129/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30079129",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORPAHAR PWSS (NEW)",
+                "localname": "BORPAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORPAHAR PWSS (NEW)",
+                        "localname": "BORPAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORPAHAR PWSS (NEW)",
+                "localname": "BORPAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORPAHAR PWSS (NEW)",
+                        "localname": "BORPAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079129/ws-services-calculation/Penalty.json b/data/as/30079129/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15803e568f
--- /dev/null
+++ b/data/as/30079129/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30079129",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079129/ws-services-calculation/WCBillingSlab.json b/data/as/30079129/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..44470bf1fb
--- /dev/null
+++ b/data/as/30079129/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30079129",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079143/BillingService/BusinessService.json b/data/as/30079143/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c2c8942591
--- /dev/null
+++ b/data/as/30079143/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30079143",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079143/egov-location/boundary-data.json b/data/as/30079143/egov-location/boundary-data.json
new file mode 100644
index 0000000000..10993f6324
--- /dev/null
+++ b/data/as/30079143/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30079143",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "COLLEGEPARA PWSS (NEW)",
+                "localname": "COLLEGEPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "COLLEGEPARA PWSS (NEW)",
+                        "localname": "COLLEGEPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "COLLEGEPARA PWSS (NEW)",
+                "localname": "COLLEGEPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "COLLEGEPARA PWSS (NEW)",
+                        "localname": "COLLEGEPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079143/ws-services-calculation/Penalty.json b/data/as/30079143/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4994fd1d50
--- /dev/null
+++ b/data/as/30079143/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30079143",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079143/ws-services-calculation/WCBillingSlab.json b/data/as/30079143/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dcecf02c80
--- /dev/null
+++ b/data/as/30079143/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30079143",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079150/BillingService/BusinessService.json b/data/as/30079150/BillingService/BusinessService.json
new file mode 100644
index 0000000000..22ba2bd19c
--- /dev/null
+++ b/data/as/30079150/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30079150",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079150/egov-location/boundary-data.json b/data/as/30079150/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3e8b2816c2
--- /dev/null
+++ b/data/as/30079150/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30079150",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNGHOPA PWSS (NEW)",
+                "localname": "BAMUNGHOPA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNGHOPA PWSS (NEW)",
+                        "localname": "BAMUNGHOPA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNGHOPA PWSS (NEW)",
+                "localname": "BAMUNGHOPA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNGHOPA PWSS (NEW)",
+                        "localname": "BAMUNGHOPA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079150/ws-services-calculation/Penalty.json b/data/as/30079150/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d834f40936
--- /dev/null
+++ b/data/as/30079150/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30079150",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079150/ws-services-calculation/WCBillingSlab.json b/data/as/30079150/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7f91d875ad
--- /dev/null
+++ b/data/as/30079150/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30079150",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079745/BillingService/BusinessService.json b/data/as/30079745/BillingService/BusinessService.json
new file mode 100644
index 0000000000..465cc59451
--- /dev/null
+++ b/data/as/30079745/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30079745",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079745/egov-location/boundary-data.json b/data/as/30079745/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f211f3a5cb
--- /dev/null
+++ b/data/as/30079745/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30079745",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORCHALLA BAGICHA A PWSS",
+                "localname": "BORCHALLA BAGICHA A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORCHALLA BAGICHA A PWSS",
+                        "localname": "BORCHALLA BAGICHA A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORCHALLA BAGICHA A PWSS",
+                "localname": "BORCHALLA BAGICHA A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORCHALLA BAGICHA A PWSS",
+                        "localname": "BORCHALLA BAGICHA A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079745/ws-services-calculation/Penalty.json b/data/as/30079745/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6b5979f90a
--- /dev/null
+++ b/data/as/30079745/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30079745",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079745/ws-services-calculation/WCBillingSlab.json b/data/as/30079745/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cdb1ccdb65
--- /dev/null
+++ b/data/as/30079745/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30079745",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079783/BillingService/BusinessService.json b/data/as/30079783/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0deeff420
--- /dev/null
+++ b/data/as/30079783/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30079783",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079783/egov-location/boundary-data.json b/data/as/30079783/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8f8aeddde
--- /dev/null
+++ b/data/as/30079783/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30079783",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGELIMARI PATHAR PWSS",
+                "localname": "CHENGELIMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGELIMARI PATHAR PWSS",
+                        "localname": "CHENGELIMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGELIMARI PATHAR PWSS",
+                "localname": "CHENGELIMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30079783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGELIMARI PATHAR PWSS",
+                        "localname": "CHENGELIMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079783/ws-services-calculation/Penalty.json b/data/as/30079783/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..068467d143
--- /dev/null
+++ b/data/as/30079783/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30079783",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30079783/ws-services-calculation/WCBillingSlab.json b/data/as/30079783/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3f12388f1
--- /dev/null
+++ b/data/as/30079783/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30079783",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080314/BillingService/BusinessService.json b/data/as/30080314/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f11d8d1895
--- /dev/null
+++ b/data/as/30080314/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30080314",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080314/egov-location/boundary-data.json b/data/as/30080314/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e37c1b3c1
--- /dev/null
+++ b/data/as/30080314/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30080314",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOWARI POITARY PWSS (NEW)",
+                "localname": "SOWARI POITARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOWARI POITARY PWSS (NEW)",
+                        "localname": "SOWARI POITARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOWARI POITARY PWSS (NEW)",
+                "localname": "SOWARI POITARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOWARI POITARY PWSS (NEW)",
+                        "localname": "SOWARI POITARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080314/ws-services-calculation/Penalty.json b/data/as/30080314/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b0c18de49f
--- /dev/null
+++ b/data/as/30080314/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30080314",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080314/ws-services-calculation/WCBillingSlab.json b/data/as/30080314/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..179b7dafe7
--- /dev/null
+++ b/data/as/30080314/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30080314",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080792/BillingService/BusinessService.json b/data/as/30080792/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfd60af6d2
--- /dev/null
+++ b/data/as/30080792/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30080792",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080792/egov-location/boundary-data.json b/data/as/30080792/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70784b78bf
--- /dev/null
+++ b/data/as/30080792/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30080792",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 NAHARANI T.E. PWSS",
+                "localname": "NO. 2 NAHARANI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080792",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 NAHARANI T.E. PWSS",
+                        "localname": "NO. 2 NAHARANI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 NAHARANI T.E. PWSS",
+                "localname": "NO. 2 NAHARANI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080792",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 NAHARANI T.E. PWSS",
+                        "localname": "NO. 2 NAHARANI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080792/ws-services-calculation/Penalty.json b/data/as/30080792/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48242c065e
--- /dev/null
+++ b/data/as/30080792/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30080792",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080792/ws-services-calculation/WCBillingSlab.json b/data/as/30080792/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2b3e917092
--- /dev/null
+++ b/data/as/30080792/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30080792",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080805/BillingService/BusinessService.json b/data/as/30080805/BillingService/BusinessService.json
new file mode 100644
index 0000000000..256f63ee6f
--- /dev/null
+++ b/data/as/30080805/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30080805",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080805/egov-location/boundary-data.json b/data/as/30080805/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a737ab13c4
--- /dev/null
+++ b/data/as/30080805/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30080805",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR NAHARANI T.E. PWSS",
+                "localname": "UTTAR NAHARANI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR NAHARANI T.E. PWSS",
+                        "localname": "UTTAR NAHARANI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR NAHARANI T.E. PWSS",
+                "localname": "UTTAR NAHARANI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080805",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR NAHARANI T.E. PWSS",
+                        "localname": "UTTAR NAHARANI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080805/ws-services-calculation/Penalty.json b/data/as/30080805/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9e3bd138ee
--- /dev/null
+++ b/data/as/30080805/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30080805",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080805/ws-services-calculation/WCBillingSlab.json b/data/as/30080805/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9d7b7b5186
--- /dev/null
+++ b/data/as/30080805/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30080805",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080812/BillingService/BusinessService.json b/data/as/30080812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..917d566966
--- /dev/null
+++ b/data/as/30080812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30080812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080812/egov-location/boundary-data.json b/data/as/30080812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53ade49fbf
--- /dev/null
+++ b/data/as/30080812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30080812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DURABARI GAON PWSS",
+                "localname": "DURABARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DURABARI GAON PWSS",
+                        "localname": "DURABARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DURABARI GAON PWSS",
+                "localname": "DURABARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30080812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DURABARI GAON PWSS",
+                        "localname": "DURABARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080812/ws-services-calculation/Penalty.json b/data/as/30080812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48d21da08d
--- /dev/null
+++ b/data/as/30080812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30080812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30080812/ws-services-calculation/WCBillingSlab.json b/data/as/30080812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..091c74baeb
--- /dev/null
+++ b/data/as/30080812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30080812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081191/BillingService/BusinessService.json b/data/as/30081191/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6e7effa3f4
--- /dev/null
+++ b/data/as/30081191/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30081191",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081191/egov-location/boundary-data.json b/data/as/30081191/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f07bc5d504
--- /dev/null
+++ b/data/as/30081191/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30081191",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGAON T.E PWSS",
+                "localname": "BURAGAON T.E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081191",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGAON T.E PWSS",
+                        "localname": "BURAGAON T.E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGAON T.E PWSS",
+                "localname": "BURAGAON T.E PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081191",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGAON T.E PWSS",
+                        "localname": "BURAGAON T.E PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081191/ws-services-calculation/Penalty.json b/data/as/30081191/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..450f466505
--- /dev/null
+++ b/data/as/30081191/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30081191",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081191/ws-services-calculation/WCBillingSlab.json b/data/as/30081191/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..be83f47cd1
--- /dev/null
+++ b/data/as/30081191/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30081191",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081194/BillingService/BusinessService.json b/data/as/30081194/BillingService/BusinessService.json
new file mode 100644
index 0000000000..11d154726f
--- /dev/null
+++ b/data/as/30081194/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30081194",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081194/egov-location/boundary-data.json b/data/as/30081194/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f95a8d6746
--- /dev/null
+++ b/data/as/30081194/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30081194",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGAON NO. 2 PWSS",
+                "localname": "BURAGAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGAON NO. 2 PWSS",
+                        "localname": "BURAGAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURAGAON NO. 2 PWSS",
+                "localname": "BURAGAON NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURAGAON NO. 2 PWSS",
+                        "localname": "BURAGAON NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081194/ws-services-calculation/Penalty.json b/data/as/30081194/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f38e2e566d
--- /dev/null
+++ b/data/as/30081194/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30081194",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081194/ws-services-calculation/WCBillingSlab.json b/data/as/30081194/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad4993353f
--- /dev/null
+++ b/data/as/30081194/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30081194",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081197/BillingService/BusinessService.json b/data/as/30081197/BillingService/BusinessService.json
new file mode 100644
index 0000000000..157fdc3bf9
--- /dev/null
+++ b/data/as/30081197/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30081197",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081197/egov-location/boundary-data.json b/data/as/30081197/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44520f13a8
--- /dev/null
+++ b/data/as/30081197/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30081197",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLKOBA LINE NO. 1 PWSS",
+                "localname": "DHOLKOBA LINE NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLKOBA LINE NO. 1 PWSS",
+                        "localname": "DHOLKOBA LINE NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLKOBA LINE NO. 1 PWSS",
+                "localname": "DHOLKOBA LINE NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLKOBA LINE NO. 1 PWSS",
+                        "localname": "DHOLKOBA LINE NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081197/ws-services-calculation/Penalty.json b/data/as/30081197/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ac797d4632
--- /dev/null
+++ b/data/as/30081197/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30081197",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081197/ws-services-calculation/WCBillingSlab.json b/data/as/30081197/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5fceeecdc4
--- /dev/null
+++ b/data/as/30081197/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30081197",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081199/BillingService/BusinessService.json b/data/as/30081199/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9782724476
--- /dev/null
+++ b/data/as/30081199/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30081199",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081199/egov-location/boundary-data.json b/data/as/30081199/egov-location/boundary-data.json
new file mode 100644
index 0000000000..04201a3f68
--- /dev/null
+++ b/data/as/30081199/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30081199",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLKOBA LINE 9 MPWS",
+                "localname": "DHOLKOBA LINE 9 MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081199",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLKOBA LINE 9 MPWS",
+                        "localname": "DHOLKOBA LINE 9 MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOLKOBA LINE 9 MPWS",
+                "localname": "DHOLKOBA LINE 9 MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081199",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOLKOBA LINE 9 MPWS",
+                        "localname": "DHOLKOBA LINE 9 MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081199/ws-services-calculation/Penalty.json b/data/as/30081199/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb201d98b4
--- /dev/null
+++ b/data/as/30081199/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30081199",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081199/ws-services-calculation/WCBillingSlab.json b/data/as/30081199/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4c81a362f0
--- /dev/null
+++ b/data/as/30081199/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30081199",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081237/BillingService/BusinessService.json b/data/as/30081237/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f0615dcfa0
--- /dev/null
+++ b/data/as/30081237/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30081237",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081237/egov-location/boundary-data.json b/data/as/30081237/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e154505e0e
--- /dev/null
+++ b/data/as/30081237/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30081237",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 TARAJULI T.E. PWSS",
+                "localname": "NO. 1 TARAJULI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081237",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 TARAJULI T.E. PWSS",
+                        "localname": "NO. 1 TARAJULI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 TARAJULI T.E. PWSS",
+                "localname": "NO. 1 TARAJULI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30081237",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 TARAJULI T.E. PWSS",
+                        "localname": "NO. 1 TARAJULI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081237/ws-services-calculation/Penalty.json b/data/as/30081237/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f886c2be86
--- /dev/null
+++ b/data/as/30081237/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30081237",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30081237/ws-services-calculation/WCBillingSlab.json b/data/as/30081237/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7be546f7a3
--- /dev/null
+++ b/data/as/30081237/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30081237",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082029/BillingService/BusinessService.json b/data/as/30082029/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a1543cb72
--- /dev/null
+++ b/data/as/30082029/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30082029",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082029/egov-location/boundary-data.json b/data/as/30082029/egov-location/boundary-data.json
new file mode 100644
index 0000000000..10dc8a4670
--- /dev/null
+++ b/data/as/30082029/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30082029",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JARGAON PWSS",
+                "localname": "JARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30082029",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JARGAON PWSS",
+                        "localname": "JARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JARGAON PWSS",
+                "localname": "JARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30082029",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JARGAON PWSS",
+                        "localname": "JARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082029/ws-services-calculation/Penalty.json b/data/as/30082029/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..782e725a9e
--- /dev/null
+++ b/data/as/30082029/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30082029",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082029/ws-services-calculation/WCBillingSlab.json b/data/as/30082029/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..609abb8536
--- /dev/null
+++ b/data/as/30082029/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30082029",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082892/BillingService/BusinessService.json b/data/as/30082892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2947f48069
--- /dev/null
+++ b/data/as/30082892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30082892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082892/egov-location/boundary-data.json b/data/as/30082892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..32fc38a042
--- /dev/null
+++ b/data/as/30082892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30082892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO 1 PWSS",
+                "localname": "SESSA TE NO 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30082892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO 1 PWSS",
+                        "localname": "SESSA TE NO 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO 1 PWSS",
+                "localname": "SESSA TE NO 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30082892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO 1 PWSS",
+                        "localname": "SESSA TE NO 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082892/ws-services-calculation/Penalty.json b/data/as/30082892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c864937c4b
--- /dev/null
+++ b/data/as/30082892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30082892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30082892/ws-services-calculation/WCBillingSlab.json b/data/as/30082892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..689a4e3cfb
--- /dev/null
+++ b/data/as/30082892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30082892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083052/BillingService/BusinessService.json b/data/as/30083052/BillingService/BusinessService.json
new file mode 100644
index 0000000000..abfbb6ad29
--- /dev/null
+++ b/data/as/30083052/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30083052",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083052/egov-location/boundary-data.json b/data/as/30083052/egov-location/boundary-data.json
new file mode 100644
index 0000000000..891ee2c571
--- /dev/null
+++ b/data/as/30083052/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30083052",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO 3 PWSS",
+                "localname": "SESSA TE NO 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30083052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO 3 PWSS",
+                        "localname": "SESSA TE NO 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SESSA TE NO 3 PWSS",
+                "localname": "SESSA TE NO 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30083052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SESSA TE NO 3 PWSS",
+                        "localname": "SESSA TE NO 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083052/ws-services-calculation/Penalty.json b/data/as/30083052/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b940742e9d
--- /dev/null
+++ b/data/as/30083052/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30083052",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083052/ws-services-calculation/WCBillingSlab.json b/data/as/30083052/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a02a525acd
--- /dev/null
+++ b/data/as/30083052/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30083052",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083450/BillingService/BusinessService.json b/data/as/30083450/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e8c34ca76d
--- /dev/null
+++ b/data/as/30083450/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30083450",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083450/egov-location/boundary-data.json b/data/as/30083450/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5fa99d1a74
--- /dev/null
+++ b/data/as/30083450/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30083450",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHIN KHANAMUKH PWSS",
+                "localname": "DAKHIN KHANAMUKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30083450",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHIN KHANAMUKH PWSS",
+                        "localname": "DAKHIN KHANAMUKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHIN KHANAMUKH PWSS",
+                "localname": "DAKHIN KHANAMUKH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30083450",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHIN KHANAMUKH PWSS",
+                        "localname": "DAKHIN KHANAMUKH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083450/ws-services-calculation/Penalty.json b/data/as/30083450/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..75a9278e24
--- /dev/null
+++ b/data/as/30083450/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30083450",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30083450/ws-services-calculation/WCBillingSlab.json b/data/as/30083450/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8ed561cf0
--- /dev/null
+++ b/data/as/30083450/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30083450",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30090984/BillingService/BusinessService.json b/data/as/30090984/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec30b0f652
--- /dev/null
+++ b/data/as/30090984/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30090984",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30090984/egov-location/boundary-data.json b/data/as/30090984/egov-location/boundary-data.json
new file mode 100644
index 0000000000..17091929ce
--- /dev/null
+++ b/data/as/30090984/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30090984",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAKIRMARA PWSS (NEW)",
+                "localname": "FAKIRMARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30090984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAKIRMARA PWSS (NEW)",
+                        "localname": "FAKIRMARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAKIRMARA PWSS (NEW)",
+                "localname": "FAKIRMARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30090984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAKIRMARA PWSS (NEW)",
+                        "localname": "FAKIRMARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30090984/ws-services-calculation/Penalty.json b/data/as/30090984/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26d18ae4f3
--- /dev/null
+++ b/data/as/30090984/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30090984",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30090984/ws-services-calculation/WCBillingSlab.json b/data/as/30090984/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1dabd4c573
--- /dev/null
+++ b/data/as/30090984/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30090984",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091027/BillingService/BusinessService.json b/data/as/30091027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00845dbd24
--- /dev/null
+++ b/data/as/30091027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30091027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091027/egov-location/boundary-data.json b/data/as/30091027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d96919b758
--- /dev/null
+++ b/data/as/30091027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30091027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEONAPARA PT-II PWSS (NEW)",
+                "localname": "DEONAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEONAPARA PT-II PWSS (NEW)",
+                        "localname": "DEONAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEONAPARA PT-II PWSS (NEW)",
+                "localname": "DEONAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEONAPARA PT-II PWSS (NEW)",
+                        "localname": "DEONAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091027/ws-services-calculation/Penalty.json b/data/as/30091027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe42095619
--- /dev/null
+++ b/data/as/30091027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30091027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091027/ws-services-calculation/WCBillingSlab.json b/data/as/30091027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b7344f01a4
--- /dev/null
+++ b/data/as/30091027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30091027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091086/BillingService/BusinessService.json b/data/as/30091086/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c87b847c96
--- /dev/null
+++ b/data/as/30091086/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30091086",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091086/egov-location/boundary-data.json b/data/as/30091086/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c0e5748c70
--- /dev/null
+++ b/data/as/30091086/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30091086",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADORSOPARA PWSS (NEW)",
+                "localname": "ADORSOPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADORSOPARA PWSS (NEW)",
+                        "localname": "ADORSOPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADORSOPARA PWSS (NEW)",
+                "localname": "ADORSOPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091086",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADORSOPARA PWSS (NEW)",
+                        "localname": "ADORSOPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091086/ws-services-calculation/Penalty.json b/data/as/30091086/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a7671e0b6
--- /dev/null
+++ b/data/as/30091086/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30091086",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091086/ws-services-calculation/WCBillingSlab.json b/data/as/30091086/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..64b18a9f37
--- /dev/null
+++ b/data/as/30091086/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30091086",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091137/BillingService/BusinessService.json b/data/as/30091137/BillingService/BusinessService.json
new file mode 100644
index 0000000000..028590f0d2
--- /dev/null
+++ b/data/as/30091137/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30091137",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091137/egov-location/boundary-data.json b/data/as/30091137/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29cf8ca51f
--- /dev/null
+++ b/data/as/30091137/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30091137",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                "localname": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091137",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                        "localname": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                "localname": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091137",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                        "localname": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091137/ws-services-calculation/Penalty.json b/data/as/30091137/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..61f65f9db1
--- /dev/null
+++ b/data/as/30091137/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30091137",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091137/ws-services-calculation/WCBillingSlab.json b/data/as/30091137/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d4f3d5c88a
--- /dev/null
+++ b/data/as/30091137/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30091137",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091277/BillingService/BusinessService.json b/data/as/30091277/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a5f284c59
--- /dev/null
+++ b/data/as/30091277/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30091277",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091277/egov-location/boundary-data.json b/data/as/30091277/egov-location/boundary-data.json
new file mode 100644
index 0000000000..367247b742
--- /dev/null
+++ b/data/as/30091277/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30091277",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOKRAPARA PWSS (NEW)",
+                "localname": "TOKRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOKRAPARA PWSS (NEW)",
+                        "localname": "TOKRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOKRAPARA PWSS (NEW)",
+                "localname": "TOKRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOKRAPARA PWSS (NEW)",
+                        "localname": "TOKRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091277/ws-services-calculation/Penalty.json b/data/as/30091277/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a2f82c3a9
--- /dev/null
+++ b/data/as/30091277/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30091277",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091277/ws-services-calculation/WCBillingSlab.json b/data/as/30091277/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d71210c3ef
--- /dev/null
+++ b/data/as/30091277/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30091277",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091350/BillingService/BusinessService.json b/data/as/30091350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8b0dfd82d
--- /dev/null
+++ b/data/as/30091350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30091350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091350/egov-location/boundary-data.json b/data/as/30091350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..771eb91efb
--- /dev/null
+++ b/data/as/30091350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30091350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANIPARA PWSS (NEW)",
+                "localname": "MANIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANIPARA PWSS (NEW)",
+                        "localname": "MANIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANIPARA PWSS (NEW)",
+                "localname": "MANIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30091350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANIPARA PWSS (NEW)",
+                        "localname": "MANIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091350/ws-services-calculation/Penalty.json b/data/as/30091350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..34a7ff5f7b
--- /dev/null
+++ b/data/as/30091350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30091350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30091350/ws-services-calculation/WCBillingSlab.json b/data/as/30091350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3bc5ac816f
--- /dev/null
+++ b/data/as/30091350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30091350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30092981/BillingService/BusinessService.json b/data/as/30092981/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ccf2c25859
--- /dev/null
+++ b/data/as/30092981/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30092981",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30092981/egov-location/boundary-data.json b/data/as/30092981/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab472fc87f
--- /dev/null
+++ b/data/as/30092981/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30092981",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJPARA KHAMAR PWSS (NEW)",
+                "localname": "MAJPARA KHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30092981",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJPARA KHAMAR PWSS (NEW)",
+                        "localname": "MAJPARA KHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJPARA KHAMAR PWSS (NEW)",
+                "localname": "MAJPARA KHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30092981",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJPARA KHAMAR PWSS (NEW)",
+                        "localname": "MAJPARA KHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30092981/ws-services-calculation/Penalty.json b/data/as/30092981/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a83611b8a
--- /dev/null
+++ b/data/as/30092981/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30092981",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30092981/ws-services-calculation/WCBillingSlab.json b/data/as/30092981/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8eceef914c
--- /dev/null
+++ b/data/as/30092981/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30092981",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093053/BillingService/BusinessService.json b/data/as/30093053/BillingService/BusinessService.json
new file mode 100644
index 0000000000..436908d3ac
--- /dev/null
+++ b/data/as/30093053/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30093053",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093053/egov-location/boundary-data.json b/data/as/30093053/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f216f5dfc9
--- /dev/null
+++ b/data/as/30093053/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30093053",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANISALI PWSS (NEW)",
+                "localname": "PANISALI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30093053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANISALI PWSS (NEW)",
+                        "localname": "PANISALI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANISALI PWSS (NEW)",
+                "localname": "PANISALI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30093053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANISALI PWSS (NEW)",
+                        "localname": "PANISALI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093053/ws-services-calculation/Penalty.json b/data/as/30093053/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7abb1bb82f
--- /dev/null
+++ b/data/as/30093053/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30093053",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093053/ws-services-calculation/WCBillingSlab.json b/data/as/30093053/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..18b2aeef90
--- /dev/null
+++ b/data/as/30093053/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30093053",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093085/BillingService/BusinessService.json b/data/as/30093085/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fecb2446de
--- /dev/null
+++ b/data/as/30093085/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30093085",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093085/egov-location/boundary-data.json b/data/as/30093085/egov-location/boundary-data.json
new file mode 100644
index 0000000000..28f339b281
--- /dev/null
+++ b/data/as/30093085/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30093085",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UDAYPUR PWSS (NEW)",
+                "localname": "UDAYPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30093085",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UDAYPUR PWSS (NEW)",
+                        "localname": "UDAYPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UDAYPUR PWSS (NEW)",
+                "localname": "UDAYPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30093085",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UDAYPUR PWSS (NEW)",
+                        "localname": "UDAYPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093085/ws-services-calculation/Penalty.json b/data/as/30093085/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6dcc15da17
--- /dev/null
+++ b/data/as/30093085/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30093085",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093085/ws-services-calculation/WCBillingSlab.json b/data/as/30093085/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6236ba46ba
--- /dev/null
+++ b/data/as/30093085/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30093085",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093111/BillingService/BusinessService.json b/data/as/30093111/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f9cea296bd
--- /dev/null
+++ b/data/as/30093111/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30093111",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093111/egov-location/boundary-data.json b/data/as/30093111/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d236be151
--- /dev/null
+++ b/data/as/30093111/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30093111",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                "localname": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30093111",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                        "localname": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                "localname": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30093111",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                        "localname": "KANTAPUR CHAKADOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093111/ws-services-calculation/Penalty.json b/data/as/30093111/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4da186148e
--- /dev/null
+++ b/data/as/30093111/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30093111",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30093111/ws-services-calculation/WCBillingSlab.json b/data/as/30093111/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b7d324a625
--- /dev/null
+++ b/data/as/30093111/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30093111",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096216/BillingService/BusinessService.json b/data/as/30096216/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d01dad988e
--- /dev/null
+++ b/data/as/30096216/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096216",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096216/egov-location/boundary-data.json b/data/as/30096216/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ee2d8712e8
--- /dev/null
+++ b/data/as/30096216/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096216",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILSAK DOMAL PWSS (NEW)",
+                "localname": "SILSAK DOMAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096216",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILSAK DOMAL PWSS (NEW)",
+                        "localname": "SILSAK DOMAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILSAK DOMAL PWSS (NEW)",
+                "localname": "SILSAK DOMAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096216",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILSAK DOMAL PWSS (NEW)",
+                        "localname": "SILSAK DOMAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096216/ws-services-calculation/Penalty.json b/data/as/30096216/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a82ef4537
--- /dev/null
+++ b/data/as/30096216/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096216",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096216/ws-services-calculation/WCBillingSlab.json b/data/as/30096216/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1605b38b55
--- /dev/null
+++ b/data/as/30096216/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096216",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096276/BillingService/BusinessService.json b/data/as/30096276/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a906a37c9
--- /dev/null
+++ b/data/as/30096276/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096276",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096276/egov-location/boundary-data.json b/data/as/30096276/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f38c39368
--- /dev/null
+++ b/data/as/30096276/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096276",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOLMARI TILAPARA M PWSS (NEW)",
+                "localname": "SOLMARI TILAPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOLMARI TILAPARA M PWSS (NEW)",
+                        "localname": "SOLMARI TILAPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOLMARI TILAPARA M PWSS (NEW)",
+                "localname": "SOLMARI TILAPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096276",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOLMARI TILAPARA M PWSS (NEW)",
+                        "localname": "SOLMARI TILAPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096276/ws-services-calculation/Penalty.json b/data/as/30096276/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce264cd02c
--- /dev/null
+++ b/data/as/30096276/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096276",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096276/ws-services-calculation/WCBillingSlab.json b/data/as/30096276/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69a1ee9b83
--- /dev/null
+++ b/data/as/30096276/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096276",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096403/BillingService/BusinessService.json b/data/as/30096403/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a081a83f89
--- /dev/null
+++ b/data/as/30096403/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096403",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096403/egov-location/boundary-data.json b/data/as/30096403/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ddf2677234
--- /dev/null
+++ b/data/as/30096403/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096403",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PT II PWSS (NEW)",
+                "localname": "BAPURBHITA PT II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096403",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PT II PWSS (NEW)",
+                        "localname": "BAPURBHITA PT II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURBHITA PT II PWSS (NEW)",
+                "localname": "BAPURBHITA PT II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096403",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURBHITA PT II PWSS (NEW)",
+                        "localname": "BAPURBHITA PT II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096403/ws-services-calculation/Penalty.json b/data/as/30096403/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5d4b918b3f
--- /dev/null
+++ b/data/as/30096403/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096403",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096403/ws-services-calculation/WCBillingSlab.json b/data/as/30096403/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e173aa7718
--- /dev/null
+++ b/data/as/30096403/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096403",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096485/BillingService/BusinessService.json b/data/as/30096485/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b56cae377d
--- /dev/null
+++ b/data/as/30096485/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096485",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096485/egov-location/boundary-data.json b/data/as/30096485/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f139f07ce5
--- /dev/null
+++ b/data/as/30096485/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096485",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NANDESWAR GAROPARA PWSS (NEW)",
+                "localname": "NANDESWAR GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096485",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NANDESWAR GAROPARA PWSS (NEW)",
+                        "localname": "NANDESWAR GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NANDESWAR GAROPARA PWSS (NEW)",
+                "localname": "NANDESWAR GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096485",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NANDESWAR GAROPARA PWSS (NEW)",
+                        "localname": "NANDESWAR GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096485/ws-services-calculation/Penalty.json b/data/as/30096485/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7398d76fe6
--- /dev/null
+++ b/data/as/30096485/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096485",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096485/ws-services-calculation/WCBillingSlab.json b/data/as/30096485/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..51d9935078
--- /dev/null
+++ b/data/as/30096485/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096485",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096579/BillingService/BusinessService.json b/data/as/30096579/BillingService/BusinessService.json
new file mode 100644
index 0000000000..02d788043b
--- /dev/null
+++ b/data/as/30096579/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096579",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096579/egov-location/boundary-data.json b/data/as/30096579/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3677fcf545
--- /dev/null
+++ b/data/as/30096579/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096579",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGDARA PWSS (NEW)",
+                "localname": "RANGDARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGDARA PWSS (NEW)",
+                        "localname": "RANGDARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGDARA PWSS (NEW)",
+                "localname": "RANGDARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGDARA PWSS (NEW)",
+                        "localname": "RANGDARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096579/ws-services-calculation/Penalty.json b/data/as/30096579/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d219f628fd
--- /dev/null
+++ b/data/as/30096579/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096579",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096579/ws-services-calculation/WCBillingSlab.json b/data/as/30096579/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..348ceac825
--- /dev/null
+++ b/data/as/30096579/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096579",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096711/BillingService/BusinessService.json b/data/as/30096711/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d2c5bbc79
--- /dev/null
+++ b/data/as/30096711/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096711",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096711/egov-location/boundary-data.json b/data/as/30096711/egov-location/boundary-data.json
new file mode 100644
index 0000000000..25bc77021d
--- /dev/null
+++ b/data/as/30096711/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096711",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHIRIGURI PWSS (NEW)",
+                "localname": "PAKHIRIGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHIRIGURI PWSS (NEW)",
+                        "localname": "PAKHIRIGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHIRIGURI PWSS (NEW)",
+                "localname": "PAKHIRIGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHIRIGURI PWSS (NEW)",
+                        "localname": "PAKHIRIGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096711/ws-services-calculation/Penalty.json b/data/as/30096711/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b73ea8c91
--- /dev/null
+++ b/data/as/30096711/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096711",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096711/ws-services-calculation/WCBillingSlab.json b/data/as/30096711/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b89f0fc28f
--- /dev/null
+++ b/data/as/30096711/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096711",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096898/BillingService/BusinessService.json b/data/as/30096898/BillingService/BusinessService.json
new file mode 100644
index 0000000000..155f8cc90c
--- /dev/null
+++ b/data/as/30096898/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30096898",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096898/egov-location/boundary-data.json b/data/as/30096898/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8f3dc652de
--- /dev/null
+++ b/data/as/30096898/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30096898",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESERVE UTTARPARA PWSS (NEW)",
+                "localname": "RESERVE UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESERVE UTTARPARA PWSS (NEW)",
+                        "localname": "RESERVE UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RESERVE UTTARPARA PWSS (NEW)",
+                "localname": "RESERVE UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30096898",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RESERVE UTTARPARA PWSS (NEW)",
+                        "localname": "RESERVE UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096898/ws-services-calculation/Penalty.json b/data/as/30096898/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d1b7c5cab3
--- /dev/null
+++ b/data/as/30096898/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30096898",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30096898/ws-services-calculation/WCBillingSlab.json b/data/as/30096898/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bbf9f220c7
--- /dev/null
+++ b/data/as/30096898/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30096898",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30097297/BillingService/BusinessService.json b/data/as/30097297/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ef72605c53
--- /dev/null
+++ b/data/as/30097297/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30097297",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30097297/egov-location/boundary-data.json b/data/as/30097297/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43b187c094
--- /dev/null
+++ b/data/as/30097297/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30097297",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINI PAHAR PWSS (NEW)",
+                "localname": "RAKSHASINI PAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30097297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINI PAHAR PWSS (NEW)",
+                        "localname": "RAKSHASINI PAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINI PAHAR PWSS (NEW)",
+                "localname": "RAKSHASINI PAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30097297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINI PAHAR PWSS (NEW)",
+                        "localname": "RAKSHASINI PAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30097297/ws-services-calculation/Penalty.json b/data/as/30097297/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9784d7093
--- /dev/null
+++ b/data/as/30097297/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30097297",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30097297/ws-services-calculation/WCBillingSlab.json b/data/as/30097297/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0be74ad343
--- /dev/null
+++ b/data/as/30097297/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30097297",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105174/BillingService/BusinessService.json b/data/as/30105174/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c13c9e4603
--- /dev/null
+++ b/data/as/30105174/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30105174",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105174/egov-location/boundary-data.json b/data/as/30105174/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4d4c22b69a
--- /dev/null
+++ b/data/as/30105174/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30105174",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORNOI MAJORPARA PWSS (NEW)",
+                "localname": "MORNOI MAJORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30105174",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORNOI MAJORPARA PWSS (NEW)",
+                        "localname": "MORNOI MAJORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORNOI MAJORPARA PWSS (NEW)",
+                "localname": "MORNOI MAJORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30105174",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORNOI MAJORPARA PWSS (NEW)",
+                        "localname": "MORNOI MAJORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105174/ws-services-calculation/Penalty.json b/data/as/30105174/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69c1b8155f
--- /dev/null
+++ b/data/as/30105174/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30105174",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105174/ws-services-calculation/WCBillingSlab.json b/data/as/30105174/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e60e50766e
--- /dev/null
+++ b/data/as/30105174/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30105174",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105196/BillingService/BusinessService.json b/data/as/30105196/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a067a8202e
--- /dev/null
+++ b/data/as/30105196/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30105196",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105196/egov-location/boundary-data.json b/data/as/30105196/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3fd825b6f9
--- /dev/null
+++ b/data/as/30105196/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30105196",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PT-III PWSS (NEW)",
+                "localname": "FAFANGA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30105196",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PT-III PWSS (NEW)",
+                        "localname": "FAFANGA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PT-III PWSS (NEW)",
+                "localname": "FAFANGA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30105196",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PT-III PWSS (NEW)",
+                        "localname": "FAFANGA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105196/ws-services-calculation/Penalty.json b/data/as/30105196/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ffdc69b901
--- /dev/null
+++ b/data/as/30105196/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30105196",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105196/ws-services-calculation/WCBillingSlab.json b/data/as/30105196/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3fd181523a
--- /dev/null
+++ b/data/as/30105196/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30105196",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105223/BillingService/BusinessService.json b/data/as/30105223/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4cded79634
--- /dev/null
+++ b/data/as/30105223/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30105223",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105223/egov-location/boundary-data.json b/data/as/30105223/egov-location/boundary-data.json
new file mode 100644
index 0000000000..63bb58eb62
--- /dev/null
+++ b/data/as/30105223/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30105223",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ENGLISH BAZAR PWSS (NEW)",
+                "localname": "ENGLISH BAZAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30105223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ENGLISH BAZAR PWSS (NEW)",
+                        "localname": "ENGLISH BAZAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ENGLISH BAZAR PWSS (NEW)",
+                "localname": "ENGLISH BAZAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30105223",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ENGLISH BAZAR PWSS (NEW)",
+                        "localname": "ENGLISH BAZAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105223/ws-services-calculation/Penalty.json b/data/as/30105223/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b44ba1eba8
--- /dev/null
+++ b/data/as/30105223/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30105223",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30105223/ws-services-calculation/WCBillingSlab.json b/data/as/30105223/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d223e4c539
--- /dev/null
+++ b/data/as/30105223/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30105223",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113305/BillingService/BusinessService.json b/data/as/30113305/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17dc92729c
--- /dev/null
+++ b/data/as/30113305/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30113305",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113305/egov-location/boundary-data.json b/data/as/30113305/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6a6b5b8f57
--- /dev/null
+++ b/data/as/30113305/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30113305",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 DHULAPADUNG TE PWSS",
+                "localname": "NO. 1 DHULAPADUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30113305",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 DHULAPADUNG TE PWSS",
+                        "localname": "NO. 1 DHULAPADUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 DHULAPADUNG TE PWSS",
+                "localname": "NO. 1 DHULAPADUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30113305",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 DHULAPADUNG TE PWSS",
+                        "localname": "NO. 1 DHULAPADUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113305/ws-services-calculation/Penalty.json b/data/as/30113305/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..812ed922ee
--- /dev/null
+++ b/data/as/30113305/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30113305",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113305/ws-services-calculation/WCBillingSlab.json b/data/as/30113305/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..051dd13f2f
--- /dev/null
+++ b/data/as/30113305/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30113305",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113852/BillingService/BusinessService.json b/data/as/30113852/BillingService/BusinessService.json
new file mode 100644
index 0000000000..84a9380269
--- /dev/null
+++ b/data/as/30113852/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30113852",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113852/egov-location/boundary-data.json b/data/as/30113852/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6575e86fd2
--- /dev/null
+++ b/data/as/30113852/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30113852",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIMPARA-III PWSS (NEW)",
+                "localname": "MUSLIMPARA-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30113852",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIMPARA-III PWSS (NEW)",
+                        "localname": "MUSLIMPARA-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIMPARA-III PWSS (NEW)",
+                "localname": "MUSLIMPARA-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30113852",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIMPARA-III PWSS (NEW)",
+                        "localname": "MUSLIMPARA-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113852/ws-services-calculation/Penalty.json b/data/as/30113852/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a875588c5
--- /dev/null
+++ b/data/as/30113852/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30113852",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30113852/ws-services-calculation/WCBillingSlab.json b/data/as/30113852/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac57640689
--- /dev/null
+++ b/data/as/30113852/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30113852",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115191/BillingService/BusinessService.json b/data/as/30115191/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e9b0daf48d
--- /dev/null
+++ b/data/as/30115191/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30115191",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115191/egov-location/boundary-data.json b/data/as/30115191/egov-location/boundary-data.json
new file mode 100644
index 0000000000..896d9d28ed
--- /dev/null
+++ b/data/as/30115191/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30115191",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROKHAPARA PWSS (NEW)",
+                "localname": "ROKHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115191",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROKHAPARA PWSS (NEW)",
+                        "localname": "ROKHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROKHAPARA PWSS (NEW)",
+                "localname": "ROKHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115191",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROKHAPARA PWSS (NEW)",
+                        "localname": "ROKHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115191/ws-services-calculation/Penalty.json b/data/as/30115191/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2447dae410
--- /dev/null
+++ b/data/as/30115191/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30115191",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115191/ws-services-calculation/WCBillingSlab.json b/data/as/30115191/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e63f71412c
--- /dev/null
+++ b/data/as/30115191/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30115191",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115208/BillingService/BusinessService.json b/data/as/30115208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f79cedcc73
--- /dev/null
+++ b/data/as/30115208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30115208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115208/egov-location/boundary-data.json b/data/as/30115208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f8bad1e286
--- /dev/null
+++ b/data/as/30115208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30115208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIBHANGA PWSS (NEW)",
+                "localname": "HARIBHANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIBHANGA PWSS (NEW)",
+                        "localname": "HARIBHANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIBHANGA PWSS (NEW)",
+                "localname": "HARIBHANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIBHANGA PWSS (NEW)",
+                        "localname": "HARIBHANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115208/ws-services-calculation/Penalty.json b/data/as/30115208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0787ef30b3
--- /dev/null
+++ b/data/as/30115208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30115208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115208/ws-services-calculation/WCBillingSlab.json b/data/as/30115208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7320bfc1a7
--- /dev/null
+++ b/data/as/30115208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30115208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115249/BillingService/BusinessService.json b/data/as/30115249/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1883e4530f
--- /dev/null
+++ b/data/as/30115249/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30115249",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115249/egov-location/boundary-data.json b/data/as/30115249/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ee3c1625b
--- /dev/null
+++ b/data/as/30115249/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30115249",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MASLOM PT-I PWSS (NEW)",
+                "localname": "MASLOM PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MASLOM PT-I PWSS (NEW)",
+                        "localname": "MASLOM PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MASLOM PT-I PWSS (NEW)",
+                "localname": "MASLOM PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MASLOM PT-I PWSS (NEW)",
+                        "localname": "MASLOM PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115249/ws-services-calculation/Penalty.json b/data/as/30115249/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..740f0cb036
--- /dev/null
+++ b/data/as/30115249/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30115249",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115249/ws-services-calculation/WCBillingSlab.json b/data/as/30115249/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5ff0398d95
--- /dev/null
+++ b/data/as/30115249/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30115249",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115981/BillingService/BusinessService.json b/data/as/30115981/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aaa3654ec5
--- /dev/null
+++ b/data/as/30115981/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30115981",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115981/egov-location/boundary-data.json b/data/as/30115981/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a4b5141046
--- /dev/null
+++ b/data/as/30115981/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30115981",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI TELERIA PWSS",
+                "localname": "SAIKIA CHUBURI TELERIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115981",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI TELERIA PWSS",
+                        "localname": "SAIKIA CHUBURI TELERIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI TELERIA PWSS",
+                "localname": "SAIKIA CHUBURI TELERIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30115981",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI TELERIA PWSS",
+                        "localname": "SAIKIA CHUBURI TELERIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115981/ws-services-calculation/Penalty.json b/data/as/30115981/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99f8b9df00
--- /dev/null
+++ b/data/as/30115981/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30115981",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30115981/ws-services-calculation/WCBillingSlab.json b/data/as/30115981/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf766c6a87
--- /dev/null
+++ b/data/as/30115981/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30115981",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116153/BillingService/BusinessService.json b/data/as/30116153/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e53832f943
--- /dev/null
+++ b/data/as/30116153/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30116153",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116153/egov-location/boundary-data.json b/data/as/30116153/egov-location/boundary-data.json
new file mode 100644
index 0000000000..537a66aaf6
--- /dev/null
+++ b/data/as/30116153/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30116153",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PT-II PWSS (NEW)",
+                "localname": "FAFANGA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30116153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PT-II PWSS (NEW)",
+                        "localname": "FAFANGA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAFANGA PT-II PWSS (NEW)",
+                "localname": "FAFANGA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30116153",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAFANGA PT-II PWSS (NEW)",
+                        "localname": "FAFANGA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116153/ws-services-calculation/Penalty.json b/data/as/30116153/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..217a852f69
--- /dev/null
+++ b/data/as/30116153/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30116153",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116153/ws-services-calculation/WCBillingSlab.json b/data/as/30116153/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f3944d2df
--- /dev/null
+++ b/data/as/30116153/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30116153",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116490/BillingService/BusinessService.json b/data/as/30116490/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00068c465e
--- /dev/null
+++ b/data/as/30116490/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30116490",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116490/egov-location/boundary-data.json b/data/as/30116490/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8504a428f6
--- /dev/null
+++ b/data/as/30116490/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30116490",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAGURMARI M PWSS (NEW)",
+                "localname": "MAGURMARI M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30116490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAGURMARI M PWSS (NEW)",
+                        "localname": "MAGURMARI M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAGURMARI M PWSS (NEW)",
+                "localname": "MAGURMARI M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30116490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAGURMARI M PWSS (NEW)",
+                        "localname": "MAGURMARI M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116490/ws-services-calculation/Penalty.json b/data/as/30116490/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb80be6a7c
--- /dev/null
+++ b/data/as/30116490/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30116490",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116490/ws-services-calculation/WCBillingSlab.json b/data/as/30116490/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..189b92dc0f
--- /dev/null
+++ b/data/as/30116490/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30116490",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116536/BillingService/BusinessService.json b/data/as/30116536/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70d50eeef9
--- /dev/null
+++ b/data/as/30116536/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30116536",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116536/egov-location/boundary-data.json b/data/as/30116536/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f298a0d7dd
--- /dev/null
+++ b/data/as/30116536/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30116536",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORNOI PACHIMAPARA PWSS (NEW)",
+                "localname": "MORNOI PACHIMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30116536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORNOI PACHIMAPARA PWSS (NEW)",
+                        "localname": "MORNOI PACHIMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORNOI PACHIMAPARA PWSS (NEW)",
+                "localname": "MORNOI PACHIMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30116536",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORNOI PACHIMAPARA PWSS (NEW)",
+                        "localname": "MORNOI PACHIMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116536/ws-services-calculation/Penalty.json b/data/as/30116536/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1131374eb3
--- /dev/null
+++ b/data/as/30116536/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30116536",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30116536/ws-services-calculation/WCBillingSlab.json b/data/as/30116536/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aacf4f4f74
--- /dev/null
+++ b/data/as/30116536/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30116536",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117305/BillingService/BusinessService.json b/data/as/30117305/BillingService/BusinessService.json
new file mode 100644
index 0000000000..30739b2876
--- /dev/null
+++ b/data/as/30117305/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30117305",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117305/egov-location/boundary-data.json b/data/as/30117305/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dbce94e09f
--- /dev/null
+++ b/data/as/30117305/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30117305",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJGAON PWSS (NEW)",
+                "localname": "MAJGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117305",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJGAON PWSS (NEW)",
+                        "localname": "MAJGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJGAON PWSS (NEW)",
+                "localname": "MAJGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117305",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJGAON PWSS (NEW)",
+                        "localname": "MAJGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117305/ws-services-calculation/Penalty.json b/data/as/30117305/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b59198cb7c
--- /dev/null
+++ b/data/as/30117305/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30117305",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117305/ws-services-calculation/WCBillingSlab.json b/data/as/30117305/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..44266a5363
--- /dev/null
+++ b/data/as/30117305/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30117305",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117521/BillingService/BusinessService.json b/data/as/30117521/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a41459ae5f
--- /dev/null
+++ b/data/as/30117521/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30117521",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117521/egov-location/boundary-data.json b/data/as/30117521/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9b9031f5e2
--- /dev/null
+++ b/data/as/30117521/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30117521",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BABUPARA UJANPARA PWSS (NEW)",
+                "localname": "BABUPARA UJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117521",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BABUPARA UJANPARA PWSS (NEW)",
+                        "localname": "BABUPARA UJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BABUPARA UJANPARA PWSS (NEW)",
+                "localname": "BABUPARA UJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117521",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BABUPARA UJANPARA PWSS (NEW)",
+                        "localname": "BABUPARA UJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117521/ws-services-calculation/Penalty.json b/data/as/30117521/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e760749a03
--- /dev/null
+++ b/data/as/30117521/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30117521",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117521/ws-services-calculation/WCBillingSlab.json b/data/as/30117521/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4e5410291b
--- /dev/null
+++ b/data/as/30117521/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30117521",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117549/BillingService/BusinessService.json b/data/as/30117549/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e840edb76
--- /dev/null
+++ b/data/as/30117549/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30117549",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117549/egov-location/boundary-data.json b/data/as/30117549/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f4070e2a13
--- /dev/null
+++ b/data/as/30117549/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30117549",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA NAMABASTI PWSS (NEW)",
+                "localname": "DUBAPARA NAMABASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA NAMABASTI PWSS (NEW)",
+                        "localname": "DUBAPARA NAMABASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA NAMABASTI PWSS (NEW)",
+                "localname": "DUBAPARA NAMABASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA NAMABASTI PWSS (NEW)",
+                        "localname": "DUBAPARA NAMABASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117549/ws-services-calculation/Penalty.json b/data/as/30117549/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3001767c05
--- /dev/null
+++ b/data/as/30117549/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30117549",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117549/ws-services-calculation/WCBillingSlab.json b/data/as/30117549/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a965b9097c
--- /dev/null
+++ b/data/as/30117549/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30117549",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117565/BillingService/BusinessService.json b/data/as/30117565/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8cab1257a4
--- /dev/null
+++ b/data/as/30117565/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30117565",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117565/egov-location/boundary-data.json b/data/as/30117565/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d9457347c2
--- /dev/null
+++ b/data/as/30117565/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30117565",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA KALITA PARA PWSS (NEW)",
+                "localname": "DUBAPARA KALITA PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117565",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA KALITA PARA PWSS (NEW)",
+                        "localname": "DUBAPARA KALITA PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DUBAPARA KALITA PARA PWSS (NEW)",
+                "localname": "DUBAPARA KALITA PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117565",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DUBAPARA KALITA PARA PWSS (NEW)",
+                        "localname": "DUBAPARA KALITA PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117565/ws-services-calculation/Penalty.json b/data/as/30117565/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c0d41fc98d
--- /dev/null
+++ b/data/as/30117565/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30117565",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117565/ws-services-calculation/WCBillingSlab.json b/data/as/30117565/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..99ca9c4364
--- /dev/null
+++ b/data/as/30117565/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30117565",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117571/BillingService/BusinessService.json b/data/as/30117571/BillingService/BusinessService.json
new file mode 100644
index 0000000000..072b6a1402
--- /dev/null
+++ b/data/as/30117571/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30117571",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117571/egov-location/boundary-data.json b/data/as/30117571/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9de6d7b4ed
--- /dev/null
+++ b/data/as/30117571/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30117571",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAIDALPARA PWSS (NEW)",
+                "localname": "NAIDALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAIDALPARA PWSS (NEW)",
+                        "localname": "NAIDALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAIDALPARA PWSS (NEW)",
+                "localname": "NAIDALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30117571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAIDALPARA PWSS (NEW)",
+                        "localname": "NAIDALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117571/ws-services-calculation/Penalty.json b/data/as/30117571/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..821066684f
--- /dev/null
+++ b/data/as/30117571/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30117571",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30117571/ws-services-calculation/WCBillingSlab.json b/data/as/30117571/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a7e13255ab
--- /dev/null
+++ b/data/as/30117571/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30117571",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30119702/BillingService/BusinessService.json b/data/as/30119702/BillingService/BusinessService.json
new file mode 100644
index 0000000000..baf5cec68f
--- /dev/null
+++ b/data/as/30119702/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30119702",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30119702/egov-location/boundary-data.json b/data/as/30119702/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ec4bceaea
--- /dev/null
+++ b/data/as/30119702/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30119702",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 NAMGAON TE PWSS",
+                "localname": "NO. 1 NAMGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30119702",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 NAMGAON TE PWSS",
+                        "localname": "NO. 1 NAMGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 NAMGAON TE PWSS",
+                "localname": "NO. 1 NAMGAON TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30119702",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 NAMGAON TE PWSS",
+                        "localname": "NO. 1 NAMGAON TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30119702/ws-services-calculation/Penalty.json b/data/as/30119702/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5d96a246b
--- /dev/null
+++ b/data/as/30119702/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30119702",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30119702/ws-services-calculation/WCBillingSlab.json b/data/as/30119702/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ac50c6b1a
--- /dev/null
+++ b/data/as/30119702/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30119702",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125919/BillingService/BusinessService.json b/data/as/30125919/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07f5f02266
--- /dev/null
+++ b/data/as/30125919/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30125919",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125919/egov-location/boundary-data.json b/data/as/30125919/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95ea84e4c6
--- /dev/null
+++ b/data/as/30125919/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30125919",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAHARIA A PWSS (NEW)",
+                "localname": "SAHARIA A PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125919",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAHARIA A PWSS (NEW)",
+                        "localname": "SAHARIA A PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAHARIA A PWSS (NEW)",
+                "localname": "SAHARIA A PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125919",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAHARIA A PWSS (NEW)",
+                        "localname": "SAHARIA A PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125919/ws-services-calculation/Penalty.json b/data/as/30125919/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..194be6cba9
--- /dev/null
+++ b/data/as/30125919/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30125919",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125919/ws-services-calculation/WCBillingSlab.json b/data/as/30125919/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d967d5acb1
--- /dev/null
+++ b/data/as/30125919/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30125919",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125926/BillingService/BusinessService.json b/data/as/30125926/BillingService/BusinessService.json
new file mode 100644
index 0000000000..73315641dd
--- /dev/null
+++ b/data/as/30125926/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30125926",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125926/egov-location/boundary-data.json b/data/as/30125926/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89621c74d1
--- /dev/null
+++ b/data/as/30125926/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30125926",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIPARA PT-I PWSS (NEW)",
+                "localname": "TELIPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125926",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIPARA PT-I PWSS (NEW)",
+                        "localname": "TELIPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TELIPARA PT-I PWSS (NEW)",
+                "localname": "TELIPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125926",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TELIPARA PT-I PWSS (NEW)",
+                        "localname": "TELIPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125926/ws-services-calculation/Penalty.json b/data/as/30125926/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..734b8e4f04
--- /dev/null
+++ b/data/as/30125926/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30125926",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125926/ws-services-calculation/WCBillingSlab.json b/data/as/30125926/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd36f33bfb
--- /dev/null
+++ b/data/as/30125926/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30125926",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125970/BillingService/BusinessService.json b/data/as/30125970/BillingService/BusinessService.json
new file mode 100644
index 0000000000..142fc5421b
--- /dev/null
+++ b/data/as/30125970/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30125970",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125970/egov-location/boundary-data.json b/data/as/30125970/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9a276d721
--- /dev/null
+++ b/data/as/30125970/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30125970",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                "localname": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125970",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                        "localname": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                "localname": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125970",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                        "localname": "BHOISKHULI KALYANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125970/ws-services-calculation/Penalty.json b/data/as/30125970/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..743352b082
--- /dev/null
+++ b/data/as/30125970/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30125970",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125970/ws-services-calculation/WCBillingSlab.json b/data/as/30125970/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6bd9f00e2a
--- /dev/null
+++ b/data/as/30125970/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30125970",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125974/BillingService/BusinessService.json b/data/as/30125974/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1cc597728e
--- /dev/null
+++ b/data/as/30125974/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30125974",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125974/egov-location/boundary-data.json b/data/as/30125974/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eb8b9d8694
--- /dev/null
+++ b/data/as/30125974/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30125974",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI EAST PWSS (NEW)",
+                "localname": "BHALUKDUBI EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI EAST PWSS (NEW)",
+                        "localname": "BHALUKDUBI EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI EAST PWSS (NEW)",
+                "localname": "BHALUKDUBI EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI EAST PWSS (NEW)",
+                        "localname": "BHALUKDUBI EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125974/ws-services-calculation/Penalty.json b/data/as/30125974/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f38ef823a8
--- /dev/null
+++ b/data/as/30125974/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30125974",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125974/ws-services-calculation/WCBillingSlab.json b/data/as/30125974/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eaf8ba8e76
--- /dev/null
+++ b/data/as/30125974/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30125974",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125980/BillingService/BusinessService.json b/data/as/30125980/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3901816e72
--- /dev/null
+++ b/data/as/30125980/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30125980",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125980/egov-location/boundary-data.json b/data/as/30125980/egov-location/boundary-data.json
new file mode 100644
index 0000000000..113b5a4ac8
--- /dev/null
+++ b/data/as/30125980/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30125980",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                "localname": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125980",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                        "localname": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                "localname": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30125980",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                        "localname": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125980/ws-services-calculation/Penalty.json b/data/as/30125980/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c3df7a285f
--- /dev/null
+++ b/data/as/30125980/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30125980",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30125980/ws-services-calculation/WCBillingSlab.json b/data/as/30125980/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b98948033a
--- /dev/null
+++ b/data/as/30125980/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30125980",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126191/BillingService/BusinessService.json b/data/as/30126191/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae17327c15
--- /dev/null
+++ b/data/as/30126191/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126191",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126191/egov-location/boundary-data.json b/data/as/30126191/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e08868e39
--- /dev/null
+++ b/data/as/30126191/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126191",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAI GA DHAWA PWSS (NEW)",
+                "localname": "GOSAI GA DHAWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126191",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAI GA DHAWA PWSS (NEW)",
+                        "localname": "GOSAI GA DHAWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAI GA DHAWA PWSS (NEW)",
+                "localname": "GOSAI GA DHAWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126191",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAI GA DHAWA PWSS (NEW)",
+                        "localname": "GOSAI GA DHAWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126191/ws-services-calculation/Penalty.json b/data/as/30126191/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86396b393e
--- /dev/null
+++ b/data/as/30126191/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126191",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126191/ws-services-calculation/WCBillingSlab.json b/data/as/30126191/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d8944ac423
--- /dev/null
+++ b/data/as/30126191/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126191",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126197/BillingService/BusinessService.json b/data/as/30126197/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb8a9bd06e
--- /dev/null
+++ b/data/as/30126197/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126197",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126197/egov-location/boundary-data.json b/data/as/30126197/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8cbd3ac90c
--- /dev/null
+++ b/data/as/30126197/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126197",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDAMARI PWSS (NEW)",
+                "localname": "CHANDAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDAMARI PWSS (NEW)",
+                        "localname": "CHANDAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDAMARI PWSS (NEW)",
+                "localname": "CHANDAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126197",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDAMARI PWSS (NEW)",
+                        "localname": "CHANDAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126197/ws-services-calculation/Penalty.json b/data/as/30126197/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04c745789d
--- /dev/null
+++ b/data/as/30126197/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126197",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126197/ws-services-calculation/WCBillingSlab.json b/data/as/30126197/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74495a466e
--- /dev/null
+++ b/data/as/30126197/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126197",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126217/BillingService/BusinessService.json b/data/as/30126217/BillingService/BusinessService.json
new file mode 100644
index 0000000000..26f7e48a59
--- /dev/null
+++ b/data/as/30126217/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126217",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126217/egov-location/boundary-data.json b/data/as/30126217/egov-location/boundary-data.json
new file mode 100644
index 0000000000..45a52ff366
--- /dev/null
+++ b/data/as/30126217/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126217",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADLAPARA PWSS (NEW)",
+                "localname": "HADLAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126217",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADLAPARA PWSS (NEW)",
+                        "localname": "HADLAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADLAPARA PWSS (NEW)",
+                "localname": "HADLAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126217",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADLAPARA PWSS (NEW)",
+                        "localname": "HADLAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126217/ws-services-calculation/Penalty.json b/data/as/30126217/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..183ce23171
--- /dev/null
+++ b/data/as/30126217/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126217",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126217/ws-services-calculation/WCBillingSlab.json b/data/as/30126217/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a34d5817a4
--- /dev/null
+++ b/data/as/30126217/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126217",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126233/BillingService/BusinessService.json b/data/as/30126233/BillingService/BusinessService.json
new file mode 100644
index 0000000000..760ed6d90c
--- /dev/null
+++ b/data/as/30126233/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126233",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126233/egov-location/boundary-data.json b/data/as/30126233/egov-location/boundary-data.json
new file mode 100644
index 0000000000..83379f8d3f
--- /dev/null
+++ b/data/as/30126233/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126233",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                "localname": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126233",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                        "localname": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                "localname": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126233",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                        "localname": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126233/ws-services-calculation/Penalty.json b/data/as/30126233/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..073ff285e9
--- /dev/null
+++ b/data/as/30126233/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126233",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126233/ws-services-calculation/WCBillingSlab.json b/data/as/30126233/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2dc386a877
--- /dev/null
+++ b/data/as/30126233/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126233",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126239/BillingService/BusinessService.json b/data/as/30126239/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7ced87ac4d
--- /dev/null
+++ b/data/as/30126239/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126239",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126239/egov-location/boundary-data.json b/data/as/30126239/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2f1bb211ab
--- /dev/null
+++ b/data/as/30126239/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126239",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOLDIBARI PT-II PWSS (NEW)",
+                "localname": "HOLDIBARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOLDIBARI PT-II PWSS (NEW)",
+                        "localname": "HOLDIBARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOLDIBARI PT-II PWSS (NEW)",
+                "localname": "HOLDIBARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOLDIBARI PT-II PWSS (NEW)",
+                        "localname": "HOLDIBARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126239/ws-services-calculation/Penalty.json b/data/as/30126239/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62c6bd58fd
--- /dev/null
+++ b/data/as/30126239/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126239",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126239/ws-services-calculation/WCBillingSlab.json b/data/as/30126239/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4e92fadc9e
--- /dev/null
+++ b/data/as/30126239/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126239",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126308/BillingService/BusinessService.json b/data/as/30126308/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b31a37463
--- /dev/null
+++ b/data/as/30126308/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126308",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126308/egov-location/boundary-data.json b/data/as/30126308/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f133affba
--- /dev/null
+++ b/data/as/30126308/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126308",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                "localname": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126308",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                        "localname": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                "localname": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126308",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                        "localname": "KANKATA PT-I (NO 4) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126308/ws-services-calculation/Penalty.json b/data/as/30126308/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ea07e34e7
--- /dev/null
+++ b/data/as/30126308/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126308",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126308/ws-services-calculation/WCBillingSlab.json b/data/as/30126308/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..280c1cf1fb
--- /dev/null
+++ b/data/as/30126308/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126308",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126312/BillingService/BusinessService.json b/data/as/30126312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d590fcb2f8
--- /dev/null
+++ b/data/as/30126312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126312/egov-location/boundary-data.json b/data/as/30126312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..faa0e0770a
--- /dev/null
+++ b/data/as/30126312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAR POTA PWSS (NEW)",
+                "localname": "KAMAR POTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAR POTA PWSS (NEW)",
+                        "localname": "KAMAR POTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAR POTA PWSS (NEW)",
+                "localname": "KAMAR POTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAR POTA PWSS (NEW)",
+                        "localname": "KAMAR POTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126312/ws-services-calculation/Penalty.json b/data/as/30126312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c207651f4d
--- /dev/null
+++ b/data/as/30126312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126312/ws-services-calculation/WCBillingSlab.json b/data/as/30126312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd92cb4212
--- /dev/null
+++ b/data/as/30126312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126316/BillingService/BusinessService.json b/data/as/30126316/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa33e5db33
--- /dev/null
+++ b/data/as/30126316/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126316",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126316/egov-location/boundary-data.json b/data/as/30126316/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a75eb8a048
--- /dev/null
+++ b/data/as/30126316/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126316",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAR POTA NO.2 PWSS (NEW)",
+                "localname": "KAMAR POTA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAR POTA NO.2 PWSS (NEW)",
+                        "localname": "KAMAR POTA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAMAR POTA NO.2 PWSS (NEW)",
+                "localname": "KAMAR POTA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126316",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAMAR POTA NO.2 PWSS (NEW)",
+                        "localname": "KAMAR POTA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126316/ws-services-calculation/Penalty.json b/data/as/30126316/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05e98dec2a
--- /dev/null
+++ b/data/as/30126316/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126316",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126316/ws-services-calculation/WCBillingSlab.json b/data/as/30126316/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8213c1decd
--- /dev/null
+++ b/data/as/30126316/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126316",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126334/BillingService/BusinessService.json b/data/as/30126334/BillingService/BusinessService.json
new file mode 100644
index 0000000000..576121d9e5
--- /dev/null
+++ b/data/as/30126334/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126334",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126334/egov-location/boundary-data.json b/data/as/30126334/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a8924f20c1
--- /dev/null
+++ b/data/as/30126334/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126334",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HARCHURA PWSS",
+                "localname": "NEW HARCHURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HARCHURA PWSS",
+                        "localname": "NEW HARCHURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HARCHURA PWSS",
+                "localname": "NEW HARCHURA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HARCHURA PWSS",
+                        "localname": "NEW HARCHURA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126334/ws-services-calculation/Penalty.json b/data/as/30126334/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..85251d18b9
--- /dev/null
+++ b/data/as/30126334/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126334",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126334/ws-services-calculation/WCBillingSlab.json b/data/as/30126334/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eb5c14921a
--- /dev/null
+++ b/data/as/30126334/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126334",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126487/BillingService/BusinessService.json b/data/as/30126487/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7517554fa5
--- /dev/null
+++ b/data/as/30126487/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126487",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126487/egov-location/boundary-data.json b/data/as/30126487/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e5230ffba2
--- /dev/null
+++ b/data/as/30126487/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126487",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPUPARA PT-I PWSS (NEW)",
+                "localname": "BAPUPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126487",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPUPARA PT-I PWSS (NEW)",
+                        "localname": "BAPUPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPUPARA PT-I PWSS (NEW)",
+                "localname": "BAPUPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126487",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPUPARA PT-I PWSS (NEW)",
+                        "localname": "BAPUPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126487/ws-services-calculation/Penalty.json b/data/as/30126487/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ba035e5b58
--- /dev/null
+++ b/data/as/30126487/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126487",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126487/ws-services-calculation/WCBillingSlab.json b/data/as/30126487/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3ddab7e83c
--- /dev/null
+++ b/data/as/30126487/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126487",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126496/BillingService/BusinessService.json b/data/as/30126496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31f78e413c
--- /dev/null
+++ b/data/as/30126496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126496/egov-location/boundary-data.json b/data/as/30126496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..911d94968c
--- /dev/null
+++ b/data/as/30126496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYANTIPUR PWSS (NEW)",
+                "localname": "JAYANTIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYANTIPUR PWSS (NEW)",
+                        "localname": "JAYANTIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYANTIPUR PWSS (NEW)",
+                "localname": "JAYANTIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYANTIPUR PWSS (NEW)",
+                        "localname": "JAYANTIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126496/ws-services-calculation/Penalty.json b/data/as/30126496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e5cfa03967
--- /dev/null
+++ b/data/as/30126496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126496/ws-services-calculation/WCBillingSlab.json b/data/as/30126496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..adf41acb5a
--- /dev/null
+++ b/data/as/30126496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126500/BillingService/BusinessService.json b/data/as/30126500/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e6238805ee
--- /dev/null
+++ b/data/as/30126500/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126500",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126500/egov-location/boundary-data.json b/data/as/30126500/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ceb0ad101b
--- /dev/null
+++ b/data/as/30126500/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126500",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMA FALIMARI PWSS (NEW)",
+                "localname": "NAMA FALIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMA FALIMARI PWSS (NEW)",
+                        "localname": "NAMA FALIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMA FALIMARI PWSS (NEW)",
+                "localname": "NAMA FALIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126500",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMA FALIMARI PWSS (NEW)",
+                        "localname": "NAMA FALIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126500/ws-services-calculation/Penalty.json b/data/as/30126500/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..23e9010a6b
--- /dev/null
+++ b/data/as/30126500/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126500",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126500/ws-services-calculation/WCBillingSlab.json b/data/as/30126500/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a586a5d0aa
--- /dev/null
+++ b/data/as/30126500/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126500",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126582/BillingService/BusinessService.json b/data/as/30126582/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ff7b964d3
--- /dev/null
+++ b/data/as/30126582/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126582",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126582/egov-location/boundary-data.json b/data/as/30126582/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d648ce384
--- /dev/null
+++ b/data/as/30126582/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126582",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAPARA (BALIJANA) PWSS (NEW)",
+                "localname": "SARAPARA (BALIJANA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126582",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAPARA (BALIJANA) PWSS (NEW)",
+                        "localname": "SARAPARA (BALIJANA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAPARA (BALIJANA) PWSS (NEW)",
+                "localname": "SARAPARA (BALIJANA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126582",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAPARA (BALIJANA) PWSS (NEW)",
+                        "localname": "SARAPARA (BALIJANA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126582/ws-services-calculation/Penalty.json b/data/as/30126582/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ebde62cc8c
--- /dev/null
+++ b/data/as/30126582/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126582",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126582/ws-services-calculation/WCBillingSlab.json b/data/as/30126582/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..890ba62881
--- /dev/null
+++ b/data/as/30126582/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126582",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126590/BillingService/BusinessService.json b/data/as/30126590/BillingService/BusinessService.json
new file mode 100644
index 0000000000..25d40192f0
--- /dev/null
+++ b/data/as/30126590/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30126590",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126590/egov-location/boundary-data.json b/data/as/30126590/egov-location/boundary-data.json
new file mode 100644
index 0000000000..740eef4d10
--- /dev/null
+++ b/data/as/30126590/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30126590",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTAMARI WEST PWSS (NEW)",
+                "localname": "KHUTAMARI WEST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126590",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTAMARI WEST PWSS (NEW)",
+                        "localname": "KHUTAMARI WEST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTAMARI WEST PWSS (NEW)",
+                "localname": "KHUTAMARI WEST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30126590",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTAMARI WEST PWSS (NEW)",
+                        "localname": "KHUTAMARI WEST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126590/ws-services-calculation/Penalty.json b/data/as/30126590/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..56bca7efec
--- /dev/null
+++ b/data/as/30126590/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30126590",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30126590/ws-services-calculation/WCBillingSlab.json b/data/as/30126590/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..87b832076d
--- /dev/null
+++ b/data/as/30126590/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30126590",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127284/BillingService/BusinessService.json b/data/as/30127284/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f05961cb7b
--- /dev/null
+++ b/data/as/30127284/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30127284",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127284/egov-location/boundary-data.json b/data/as/30127284/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97c265bf91
--- /dev/null
+++ b/data/as/30127284/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30127284",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 DHULAPADUNG TE PWSS",
+                "localname": "NO. 2 DHULAPADUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 DHULAPADUNG TE PWSS",
+                        "localname": "NO. 2 DHULAPADUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 DHULAPADUNG TE PWSS",
+                "localname": "NO. 2 DHULAPADUNG TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 DHULAPADUNG TE PWSS",
+                        "localname": "NO. 2 DHULAPADUNG TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127284/ws-services-calculation/Penalty.json b/data/as/30127284/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..06c1ebada6
--- /dev/null
+++ b/data/as/30127284/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30127284",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127284/ws-services-calculation/WCBillingSlab.json b/data/as/30127284/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aa28ed29f5
--- /dev/null
+++ b/data/as/30127284/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30127284",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127356/BillingService/BusinessService.json b/data/as/30127356/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92a03b5b4f
--- /dev/null
+++ b/data/as/30127356/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30127356",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127356/egov-location/boundary-data.json b/data/as/30127356/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a6f67e0f19
--- /dev/null
+++ b/data/as/30127356/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30127356",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW THAKURBARI PWSS",
+                "localname": "NEW THAKURBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW THAKURBARI PWSS",
+                        "localname": "NEW THAKURBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW THAKURBARI PWSS",
+                "localname": "NEW THAKURBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127356",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW THAKURBARI PWSS",
+                        "localname": "NEW THAKURBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127356/ws-services-calculation/Penalty.json b/data/as/30127356/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e3ed17c1a8
--- /dev/null
+++ b/data/as/30127356/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30127356",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127356/ws-services-calculation/WCBillingSlab.json b/data/as/30127356/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b9fd8ef167
--- /dev/null
+++ b/data/as/30127356/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30127356",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127370/BillingService/BusinessService.json b/data/as/30127370/BillingService/BusinessService.json
new file mode 100644
index 0000000000..951e5aa5f7
--- /dev/null
+++ b/data/as/30127370/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30127370",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127370/egov-location/boundary-data.json b/data/as/30127370/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d73f2bf5f8
--- /dev/null
+++ b/data/as/30127370/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30127370",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE DHIPA LINE PWSS",
+                "localname": "BARJULI TE DHIPA LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127370",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE DHIPA LINE PWSS",
+                        "localname": "BARJULI TE DHIPA LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI TE DHIPA LINE PWSS",
+                "localname": "BARJULI TE DHIPA LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127370",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI TE DHIPA LINE PWSS",
+                        "localname": "BARJULI TE DHIPA LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127370/ws-services-calculation/Penalty.json b/data/as/30127370/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..869d698724
--- /dev/null
+++ b/data/as/30127370/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30127370",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127370/ws-services-calculation/WCBillingSlab.json b/data/as/30127370/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9959c30e3b
--- /dev/null
+++ b/data/as/30127370/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30127370",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127414/BillingService/BusinessService.json b/data/as/30127414/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee9e7d25f7
--- /dev/null
+++ b/data/as/30127414/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30127414",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127414/egov-location/boundary-data.json b/data/as/30127414/egov-location/boundary-data.json
new file mode 100644
index 0000000000..837c518892
--- /dev/null
+++ b/data/as/30127414/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30127414",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALMARA GAON PWSS",
+                "localname": "SALMARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127414",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALMARA GAON PWSS",
+                        "localname": "SALMARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALMARA GAON PWSS",
+                "localname": "SALMARA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30127414",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALMARA GAON PWSS",
+                        "localname": "SALMARA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127414/ws-services-calculation/Penalty.json b/data/as/30127414/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3330907404
--- /dev/null
+++ b/data/as/30127414/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30127414",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30127414/ws-services-calculation/WCBillingSlab.json b/data/as/30127414/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..990519643d
--- /dev/null
+++ b/data/as/30127414/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30127414",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128175/BillingService/BusinessService.json b/data/as/30128175/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fd46945bcf
--- /dev/null
+++ b/data/as/30128175/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30128175",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128175/egov-location/boundary-data.json b/data/as/30128175/egov-location/boundary-data.json
new file mode 100644
index 0000000000..498cef98fe
--- /dev/null
+++ b/data/as/30128175/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30128175",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEPALCHANG PWSS (NEW)",
+                "localname": "DEPALCHANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEPALCHANG PWSS (NEW)",
+                        "localname": "DEPALCHANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEPALCHANG PWSS (NEW)",
+                "localname": "DEPALCHANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEPALCHANG PWSS (NEW)",
+                        "localname": "DEPALCHANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128175/ws-services-calculation/Penalty.json b/data/as/30128175/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b53cbb84b
--- /dev/null
+++ b/data/as/30128175/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30128175",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128175/ws-services-calculation/WCBillingSlab.json b/data/as/30128175/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..23bceda46d
--- /dev/null
+++ b/data/as/30128175/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30128175",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128194/BillingService/BusinessService.json b/data/as/30128194/BillingService/BusinessService.json
new file mode 100644
index 0000000000..95c5d4e947
--- /dev/null
+++ b/data/as/30128194/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30128194",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128194/egov-location/boundary-data.json b/data/as/30128194/egov-location/boundary-data.json
new file mode 100644
index 0000000000..446800279d
--- /dev/null
+++ b/data/as/30128194/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30128194",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAI BHANI PWSS (NEW)",
+                "localname": "BHAI BHANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAI BHANI PWSS (NEW)",
+                        "localname": "BHAI BHANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAI BHANI PWSS (NEW)",
+                "localname": "BHAI BHANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128194",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAI BHANI PWSS (NEW)",
+                        "localname": "BHAI BHANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128194/ws-services-calculation/Penalty.json b/data/as/30128194/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64ef61a503
--- /dev/null
+++ b/data/as/30128194/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30128194",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128194/ws-services-calculation/WCBillingSlab.json b/data/as/30128194/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..23598bfd32
--- /dev/null
+++ b/data/as/30128194/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30128194",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128549/BillingService/BusinessService.json b/data/as/30128549/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3473da239
--- /dev/null
+++ b/data/as/30128549/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30128549",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128549/egov-location/boundary-data.json b/data/as/30128549/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35d2cb176d
--- /dev/null
+++ b/data/as/30128549/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30128549",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA NO.3 PWSS (NEW)",
+                "localname": "SIMLITOLA NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA NO.3 PWSS (NEW)",
+                        "localname": "SIMLITOLA NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA NO.3 PWSS (NEW)",
+                "localname": "SIMLITOLA NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128549",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA NO.3 PWSS (NEW)",
+                        "localname": "SIMLITOLA NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128549/ws-services-calculation/Penalty.json b/data/as/30128549/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..faca6addbd
--- /dev/null
+++ b/data/as/30128549/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30128549",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128549/ws-services-calculation/WCBillingSlab.json b/data/as/30128549/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c1896d473
--- /dev/null
+++ b/data/as/30128549/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30128549",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128554/BillingService/BusinessService.json b/data/as/30128554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d75eed2864
--- /dev/null
+++ b/data/as/30128554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30128554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128554/egov-location/boundary-data.json b/data/as/30128554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd8c0f655a
--- /dev/null
+++ b/data/as/30128554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30128554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                "localname": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                        "localname": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                "localname": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                        "localname": "BHALUKJULI BUDLUNG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128554/ws-services-calculation/Penalty.json b/data/as/30128554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..89331e1c20
--- /dev/null
+++ b/data/as/30128554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30128554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128554/ws-services-calculation/WCBillingSlab.json b/data/as/30128554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..63e9f03df9
--- /dev/null
+++ b/data/as/30128554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30128554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128895/BillingService/BusinessService.json b/data/as/30128895/BillingService/BusinessService.json
new file mode 100644
index 0000000000..777daf5f7c
--- /dev/null
+++ b/data/as/30128895/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30128895",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128895/egov-location/boundary-data.json b/data/as/30128895/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4704ea2fe5
--- /dev/null
+++ b/data/as/30128895/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30128895",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAMUDPUR PT-I PWSS (NEW)",
+                "localname": "MAMUDPUR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAMUDPUR PT-I PWSS (NEW)",
+                        "localname": "MAMUDPUR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAMUDPUR PT-I PWSS (NEW)",
+                "localname": "MAMUDPUR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128895",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAMUDPUR PT-I PWSS (NEW)",
+                        "localname": "MAMUDPUR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128895/ws-services-calculation/Penalty.json b/data/as/30128895/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad5fc012f7
--- /dev/null
+++ b/data/as/30128895/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30128895",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128895/ws-services-calculation/WCBillingSlab.json b/data/as/30128895/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eb2754a1fe
--- /dev/null
+++ b/data/as/30128895/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30128895",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128902/BillingService/BusinessService.json b/data/as/30128902/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5fd3a5a4e
--- /dev/null
+++ b/data/as/30128902/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30128902",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128902/egov-location/boundary-data.json b/data/as/30128902/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f958011003
--- /dev/null
+++ b/data/as/30128902/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30128902",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANAKPARA PWSS (NEW)",
+                "localname": "GANAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128902",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANAKPARA PWSS (NEW)",
+                        "localname": "GANAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANAKPARA PWSS (NEW)",
+                "localname": "GANAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30128902",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANAKPARA PWSS (NEW)",
+                        "localname": "GANAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128902/ws-services-calculation/Penalty.json b/data/as/30128902/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..091e516181
--- /dev/null
+++ b/data/as/30128902/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30128902",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30128902/ws-services-calculation/WCBillingSlab.json b/data/as/30128902/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aac94084e9
--- /dev/null
+++ b/data/as/30128902/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30128902",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129324/BillingService/BusinessService.json b/data/as/30129324/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7d5ea234a
--- /dev/null
+++ b/data/as/30129324/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30129324",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129324/egov-location/boundary-data.json b/data/as/30129324/egov-location/boundary-data.json
new file mode 100644
index 0000000000..63bc07a565
--- /dev/null
+++ b/data/as/30129324/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30129324",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMANI PWSS (NEW)",
+                "localname": "DAMANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMANI PWSS (NEW)",
+                        "localname": "DAMANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMANI PWSS (NEW)",
+                "localname": "DAMANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMANI PWSS (NEW)",
+                        "localname": "DAMANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129324/ws-services-calculation/Penalty.json b/data/as/30129324/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..466898c875
--- /dev/null
+++ b/data/as/30129324/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30129324",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129324/ws-services-calculation/WCBillingSlab.json b/data/as/30129324/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9e013b68ba
--- /dev/null
+++ b/data/as/30129324/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30129324",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129329/BillingService/BusinessService.json b/data/as/30129329/BillingService/BusinessService.json
new file mode 100644
index 0000000000..415663c43d
--- /dev/null
+++ b/data/as/30129329/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30129329",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129329/egov-location/boundary-data.json b/data/as/30129329/egov-location/boundary-data.json
new file mode 100644
index 0000000000..043397e93e
--- /dev/null
+++ b/data/as/30129329/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30129329",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAMOYEE PWSS (NEW)",
+                "localname": "SONAMOYEE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129329",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAMOYEE PWSS (NEW)",
+                        "localname": "SONAMOYEE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAMOYEE PWSS (NEW)",
+                "localname": "SONAMOYEE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129329",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAMOYEE PWSS (NEW)",
+                        "localname": "SONAMOYEE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129329/ws-services-calculation/Penalty.json b/data/as/30129329/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62dc0b2219
--- /dev/null
+++ b/data/as/30129329/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30129329",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129329/ws-services-calculation/WCBillingSlab.json b/data/as/30129329/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9d22617099
--- /dev/null
+++ b/data/as/30129329/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30129329",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129382/BillingService/BusinessService.json b/data/as/30129382/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2872199f60
--- /dev/null
+++ b/data/as/30129382/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30129382",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129382/egov-location/boundary-data.json b/data/as/30129382/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a22653e3b
--- /dev/null
+++ b/data/as/30129382/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30129382",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAISA PWSS (NEW)",
+                "localname": "BAISA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAISA PWSS (NEW)",
+                        "localname": "BAISA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAISA PWSS (NEW)",
+                "localname": "BAISA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAISA PWSS (NEW)",
+                        "localname": "BAISA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129382/ws-services-calculation/Penalty.json b/data/as/30129382/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..535bf738ae
--- /dev/null
+++ b/data/as/30129382/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30129382",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129382/ws-services-calculation/WCBillingSlab.json b/data/as/30129382/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6972e8811
--- /dev/null
+++ b/data/as/30129382/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30129382",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129385/BillingService/BusinessService.json b/data/as/30129385/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66960fb8e4
--- /dev/null
+++ b/data/as/30129385/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30129385",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129385/egov-location/boundary-data.json b/data/as/30129385/egov-location/boundary-data.json
new file mode 100644
index 0000000000..73e72691c1
--- /dev/null
+++ b/data/as/30129385/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30129385",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOULMARI PWSS  (NEW)",
+                "localname": "SOULMARI PWSS  (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129385",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOULMARI PWSS  (NEW)",
+                        "localname": "SOULMARI PWSS  (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOULMARI PWSS  (NEW)",
+                "localname": "SOULMARI PWSS  (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129385",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOULMARI PWSS  (NEW)",
+                        "localname": "SOULMARI PWSS  (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129385/ws-services-calculation/Penalty.json b/data/as/30129385/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a5abef84fa
--- /dev/null
+++ b/data/as/30129385/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30129385",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129385/ws-services-calculation/WCBillingSlab.json b/data/as/30129385/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10bedb0b7a
--- /dev/null
+++ b/data/as/30129385/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30129385",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129475/BillingService/BusinessService.json b/data/as/30129475/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4c4643cb6c
--- /dev/null
+++ b/data/as/30129475/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30129475",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129475/egov-location/boundary-data.json b/data/as/30129475/egov-location/boundary-data.json
new file mode 100644
index 0000000000..706c39b98d
--- /dev/null
+++ b/data/as/30129475/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30129475",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARBARI PWSS (NEW)",
+                "localname": "BHARBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARBARI PWSS (NEW)",
+                        "localname": "BHARBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHARBARI PWSS (NEW)",
+                "localname": "BHARBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129475",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHARBARI PWSS (NEW)",
+                        "localname": "BHARBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129475/ws-services-calculation/Penalty.json b/data/as/30129475/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65af461f74
--- /dev/null
+++ b/data/as/30129475/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30129475",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129475/ws-services-calculation/WCBillingSlab.json b/data/as/30129475/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46e8a6bc60
--- /dev/null
+++ b/data/as/30129475/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30129475",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129479/BillingService/BusinessService.json b/data/as/30129479/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3c1b0150a
--- /dev/null
+++ b/data/as/30129479/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30129479",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129479/egov-location/boundary-data.json b/data/as/30129479/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d703683b01
--- /dev/null
+++ b/data/as/30129479/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30129479",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                "localname": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129479",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                        "localname": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                "localname": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30129479",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                        "localname": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129479/ws-services-calculation/Penalty.json b/data/as/30129479/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe60a39eb0
--- /dev/null
+++ b/data/as/30129479/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30129479",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30129479/ws-services-calculation/WCBillingSlab.json b/data/as/30129479/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bed27fa85d
--- /dev/null
+++ b/data/as/30129479/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30129479",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130374/BillingService/BusinessService.json b/data/as/30130374/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ef82220ab
--- /dev/null
+++ b/data/as/30130374/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30130374",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130374/egov-location/boundary-data.json b/data/as/30130374/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a04e274d52
--- /dev/null
+++ b/data/as/30130374/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30130374",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THULETIKA PWSS",
+                "localname": "THULETIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130374",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THULETIKA PWSS",
+                        "localname": "THULETIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THULETIKA PWSS",
+                "localname": "THULETIKA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130374",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THULETIKA PWSS",
+                        "localname": "THULETIKA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130374/ws-services-calculation/Penalty.json b/data/as/30130374/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..32f5c2f0ca
--- /dev/null
+++ b/data/as/30130374/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30130374",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130374/ws-services-calculation/WCBillingSlab.json b/data/as/30130374/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2118949587
--- /dev/null
+++ b/data/as/30130374/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30130374",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130381/BillingService/BusinessService.json b/data/as/30130381/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7e3f5a6f0
--- /dev/null
+++ b/data/as/30130381/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30130381",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130381/egov-location/boundary-data.json b/data/as/30130381/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f0c3a971b
--- /dev/null
+++ b/data/as/30130381/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30130381",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOKOMA PWSS",
+                "localname": "HOKOMA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOKOMA PWSS",
+                        "localname": "HOKOMA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOKOMA PWSS",
+                "localname": "HOKOMA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOKOMA PWSS",
+                        "localname": "HOKOMA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130381/ws-services-calculation/Penalty.json b/data/as/30130381/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e525071daa
--- /dev/null
+++ b/data/as/30130381/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30130381",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130381/ws-services-calculation/WCBillingSlab.json b/data/as/30130381/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02e405275a
--- /dev/null
+++ b/data/as/30130381/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30130381",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130399/BillingService/BusinessService.json b/data/as/30130399/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32a91fc6bb
--- /dev/null
+++ b/data/as/30130399/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30130399",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130399/egov-location/boundary-data.json b/data/as/30130399/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aff4f9fdcb
--- /dev/null
+++ b/data/as/30130399/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30130399",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATBOR PWSS",
+                "localname": "HATBOR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130399",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATBOR PWSS",
+                        "localname": "HATBOR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATBOR PWSS",
+                "localname": "HATBOR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130399",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATBOR PWSS",
+                        "localname": "HATBOR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130399/ws-services-calculation/Penalty.json b/data/as/30130399/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c8370e3cd9
--- /dev/null
+++ b/data/as/30130399/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30130399",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130399/ws-services-calculation/WCBillingSlab.json b/data/as/30130399/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e7a7f42679
--- /dev/null
+++ b/data/as/30130399/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30130399",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130411/BillingService/BusinessService.json b/data/as/30130411/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c19df0d2f
--- /dev/null
+++ b/data/as/30130411/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30130411",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130411/egov-location/boundary-data.json b/data/as/30130411/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54e789256c
--- /dev/null
+++ b/data/as/30130411/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30130411",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKI GHAT PWSS",
+                "localname": "CHAKI GHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKI GHAT PWSS",
+                        "localname": "CHAKI GHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKI GHAT PWSS",
+                "localname": "CHAKI GHAT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKI GHAT PWSS",
+                        "localname": "CHAKI GHAT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130411/ws-services-calculation/Penalty.json b/data/as/30130411/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3136a1d7a4
--- /dev/null
+++ b/data/as/30130411/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30130411",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130411/ws-services-calculation/WCBillingSlab.json b/data/as/30130411/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..587dc26439
--- /dev/null
+++ b/data/as/30130411/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30130411",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130420/BillingService/BusinessService.json b/data/as/30130420/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd1fd8f83e
--- /dev/null
+++ b/data/as/30130420/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30130420",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130420/egov-location/boundary-data.json b/data/as/30130420/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d78a5cb1c
--- /dev/null
+++ b/data/as/30130420/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30130420",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUPIA GAON WEST PWSS",
+                "localname": "TUPIA GAON WEST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUPIA GAON WEST PWSS",
+                        "localname": "TUPIA GAON WEST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUPIA GAON WEST PWSS",
+                "localname": "TUPIA GAON WEST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUPIA GAON WEST PWSS",
+                        "localname": "TUPIA GAON WEST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130420/ws-services-calculation/Penalty.json b/data/as/30130420/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1f0b848c89
--- /dev/null
+++ b/data/as/30130420/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30130420",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130420/ws-services-calculation/WCBillingSlab.json b/data/as/30130420/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2536e8a12d
--- /dev/null
+++ b/data/as/30130420/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30130420",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130435/BillingService/BusinessService.json b/data/as/30130435/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ef19057e8
--- /dev/null
+++ b/data/as/30130435/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30130435",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130435/egov-location/boundary-data.json b/data/as/30130435/egov-location/boundary-data.json
new file mode 100644
index 0000000000..918aacd9ce
--- /dev/null
+++ b/data/as/30130435/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30130435",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATGURI PWSS",
+                "localname": "BATGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATGURI PWSS",
+                        "localname": "BATGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATGURI PWSS",
+                "localname": "BATGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30130435",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATGURI PWSS",
+                        "localname": "BATGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130435/ws-services-calculation/Penalty.json b/data/as/30130435/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..021b6c11ca
--- /dev/null
+++ b/data/as/30130435/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30130435",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30130435/ws-services-calculation/WCBillingSlab.json b/data/as/30130435/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1a2777d446
--- /dev/null
+++ b/data/as/30130435/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30130435",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132498/BillingService/BusinessService.json b/data/as/30132498/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2cc24efe1e
--- /dev/null
+++ b/data/as/30132498/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132498",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132498/egov-location/boundary-data.json b/data/as/30132498/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d6d352868b
--- /dev/null
+++ b/data/as/30132498/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132498",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                "localname": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132498",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                        "localname": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                "localname": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132498",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                        "localname": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132498/ws-services-calculation/Penalty.json b/data/as/30132498/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dea30d4a82
--- /dev/null
+++ b/data/as/30132498/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132498",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132498/ws-services-calculation/WCBillingSlab.json b/data/as/30132498/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1cdf3f098
--- /dev/null
+++ b/data/as/30132498/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132498",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132532/BillingService/BusinessService.json b/data/as/30132532/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0a565bddf0
--- /dev/null
+++ b/data/as/30132532/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132532",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132532/egov-location/boundary-data.json b/data/as/30132532/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c032c1e1e9
--- /dev/null
+++ b/data/as/30132532/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132532",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONUA NO 3 PWSS (NEW)",
+                "localname": "RONUA NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132532",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONUA NO 3 PWSS (NEW)",
+                        "localname": "RONUA NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONUA NO 3 PWSS (NEW)",
+                "localname": "RONUA NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132532",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONUA NO 3 PWSS (NEW)",
+                        "localname": "RONUA NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132532/ws-services-calculation/Penalty.json b/data/as/30132532/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dcf2a2c5fc
--- /dev/null
+++ b/data/as/30132532/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132532",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132532/ws-services-calculation/WCBillingSlab.json b/data/as/30132532/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32fa6d2015
--- /dev/null
+++ b/data/as/30132532/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132532",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132548/BillingService/BusinessService.json b/data/as/30132548/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd7063fa11
--- /dev/null
+++ b/data/as/30132548/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132548",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132548/egov-location/boundary-data.json b/data/as/30132548/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2fd6f3ed9b
--- /dev/null
+++ b/data/as/30132548/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132548",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-1 PWSS (NEW)",
+                "localname": "BAHATI PT-1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132548",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-1 PWSS (NEW)",
+                        "localname": "BAHATI PT-1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-1 PWSS (NEW)",
+                "localname": "BAHATI PT-1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132548",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-1 PWSS (NEW)",
+                        "localname": "BAHATI PT-1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132548/ws-services-calculation/Penalty.json b/data/as/30132548/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2389c56b00
--- /dev/null
+++ b/data/as/30132548/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132548",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132548/ws-services-calculation/WCBillingSlab.json b/data/as/30132548/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fcabb7d0f8
--- /dev/null
+++ b/data/as/30132548/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132548",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132559/BillingService/BusinessService.json b/data/as/30132559/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6a57ba97c
--- /dev/null
+++ b/data/as/30132559/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132559",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132559/egov-location/boundary-data.json b/data/as/30132559/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1ed780a1c
--- /dev/null
+++ b/data/as/30132559/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132559",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                "localname": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132559",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                "localname": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132559",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132559/ws-services-calculation/Penalty.json b/data/as/30132559/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d169a9c24b
--- /dev/null
+++ b/data/as/30132559/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132559",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132559/ws-services-calculation/WCBillingSlab.json b/data/as/30132559/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60c2fde82b
--- /dev/null
+++ b/data/as/30132559/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132559",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132588/BillingService/BusinessService.json b/data/as/30132588/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fd4ff1780a
--- /dev/null
+++ b/data/as/30132588/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132588",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132588/egov-location/boundary-data.json b/data/as/30132588/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bfb661be58
--- /dev/null
+++ b/data/as/30132588/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132588",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONUA NO 2 PWSS (NEW)",
+                "localname": "RONUA NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONUA NO 2 PWSS (NEW)",
+                        "localname": "RONUA NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONUA NO 2 PWSS (NEW)",
+                "localname": "RONUA NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132588",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONUA NO 2 PWSS (NEW)",
+                        "localname": "RONUA NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132588/ws-services-calculation/Penalty.json b/data/as/30132588/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2659ccec45
--- /dev/null
+++ b/data/as/30132588/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132588",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132588/ws-services-calculation/WCBillingSlab.json b/data/as/30132588/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..92bdf0e1ca
--- /dev/null
+++ b/data/as/30132588/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132588",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132620/BillingService/BusinessService.json b/data/as/30132620/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6d29bdb58e
--- /dev/null
+++ b/data/as/30132620/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132620",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132620/egov-location/boundary-data.json b/data/as/30132620/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe788d1708
--- /dev/null
+++ b/data/as/30132620/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132620",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-II NO.2 PWSS (NEW)",
+                "localname": "BAHATI PT-II NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-II NO.2 PWSS (NEW)",
+                        "localname": "BAHATI PT-II NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-II NO.2 PWSS (NEW)",
+                "localname": "BAHATI PT-II NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-II NO.2 PWSS (NEW)",
+                        "localname": "BAHATI PT-II NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132620/ws-services-calculation/Penalty.json b/data/as/30132620/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e30b42133c
--- /dev/null
+++ b/data/as/30132620/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132620",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132620/ws-services-calculation/WCBillingSlab.json b/data/as/30132620/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b58bcc99c
--- /dev/null
+++ b/data/as/30132620/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132620",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132648/BillingService/BusinessService.json b/data/as/30132648/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f93f47d734
--- /dev/null
+++ b/data/as/30132648/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132648",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132648/egov-location/boundary-data.json b/data/as/30132648/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d7139603ad
--- /dev/null
+++ b/data/as/30132648/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132648",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                "localname": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                "localname": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132648/ws-services-calculation/Penalty.json b/data/as/30132648/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4263e973a5
--- /dev/null
+++ b/data/as/30132648/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132648",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132648/ws-services-calculation/WCBillingSlab.json b/data/as/30132648/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bce8cb68b0
--- /dev/null
+++ b/data/as/30132648/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132648",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132661/BillingService/BusinessService.json b/data/as/30132661/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1c14015fd8
--- /dev/null
+++ b/data/as/30132661/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132661",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132661/egov-location/boundary-data.json b/data/as/30132661/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c7a826b420
--- /dev/null
+++ b/data/as/30132661/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132661",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-II PWSS (NEW)",
+                "localname": "SIDHABARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132661",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-II PWSS (NEW)",
+                        "localname": "SIDHABARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-II PWSS (NEW)",
+                "localname": "SIDHABARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132661",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-II PWSS (NEW)",
+                        "localname": "SIDHABARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132661/ws-services-calculation/Penalty.json b/data/as/30132661/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..49a6eab744
--- /dev/null
+++ b/data/as/30132661/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132661",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132661/ws-services-calculation/WCBillingSlab.json b/data/as/30132661/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6be67c594b
--- /dev/null
+++ b/data/as/30132661/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132661",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132799/BillingService/BusinessService.json b/data/as/30132799/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de1f551002
--- /dev/null
+++ b/data/as/30132799/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30132799",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132799/egov-location/boundary-data.json b/data/as/30132799/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5ef90f0489
--- /dev/null
+++ b/data/as/30132799/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30132799",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "10 NO LINE PWSS",
+                "localname": "10 NO LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "10 NO LINE PWSS",
+                        "localname": "10 NO LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "10 NO LINE PWSS",
+                "localname": "10 NO LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30132799",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "10 NO LINE PWSS",
+                        "localname": "10 NO LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132799/ws-services-calculation/Penalty.json b/data/as/30132799/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f99baf5eea
--- /dev/null
+++ b/data/as/30132799/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30132799",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30132799/ws-services-calculation/WCBillingSlab.json b/data/as/30132799/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e149113227
--- /dev/null
+++ b/data/as/30132799/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30132799",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137902/BillingService/BusinessService.json b/data/as/30137902/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b1d3820b35
--- /dev/null
+++ b/data/as/30137902/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30137902",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137902/egov-location/boundary-data.json b/data/as/30137902/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7d89954a79
--- /dev/null
+++ b/data/as/30137902/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30137902",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA [ A ] PWSS",
+                "localname": "SAKTOLA [ A ] PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137902",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA [ A ] PWSS",
+                        "localname": "SAKTOLA [ A ] PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKTOLA [ A ] PWSS",
+                "localname": "SAKTOLA [ A ] PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137902",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKTOLA [ A ] PWSS",
+                        "localname": "SAKTOLA [ A ] PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137902/ws-services-calculation/Penalty.json b/data/as/30137902/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ef3058aa7
--- /dev/null
+++ b/data/as/30137902/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30137902",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137902/ws-services-calculation/WCBillingSlab.json b/data/as/30137902/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..af7364efdc
--- /dev/null
+++ b/data/as/30137902/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30137902",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137931/BillingService/BusinessService.json b/data/as/30137931/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a16bb0d5b
--- /dev/null
+++ b/data/as/30137931/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30137931",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137931/egov-location/boundary-data.json b/data/as/30137931/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b71bcd31af
--- /dev/null
+++ b/data/as/30137931/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30137931",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISMARI PWSS (NEW)",
+                "localname": "BHOISMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137931",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISMARI PWSS (NEW)",
+                        "localname": "BHOISMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISMARI PWSS (NEW)",
+                "localname": "BHOISMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137931",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISMARI PWSS (NEW)",
+                        "localname": "BHOISMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137931/ws-services-calculation/Penalty.json b/data/as/30137931/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8fdd868653
--- /dev/null
+++ b/data/as/30137931/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30137931",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137931/ws-services-calculation/WCBillingSlab.json b/data/as/30137931/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4e34988f80
--- /dev/null
+++ b/data/as/30137931/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30137931",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137946/BillingService/BusinessService.json b/data/as/30137946/BillingService/BusinessService.json
new file mode 100644
index 0000000000..406abb065d
--- /dev/null
+++ b/data/as/30137946/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30137946",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137946/egov-location/boundary-data.json b/data/as/30137946/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fde9947ea8
--- /dev/null
+++ b/data/as/30137946/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30137946",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ KURSAKATI PWSS (NEW)",
+                "localname": "NIZ KURSAKATI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137946",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ KURSAKATI PWSS (NEW)",
+                        "localname": "NIZ KURSAKATI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ KURSAKATI PWSS (NEW)",
+                "localname": "NIZ KURSAKATI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137946",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ KURSAKATI PWSS (NEW)",
+                        "localname": "NIZ KURSAKATI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137946/ws-services-calculation/Penalty.json b/data/as/30137946/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..16744f6554
--- /dev/null
+++ b/data/as/30137946/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30137946",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137946/ws-services-calculation/WCBillingSlab.json b/data/as/30137946/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b39bec3603
--- /dev/null
+++ b/data/as/30137946/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30137946",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137988/BillingService/BusinessService.json b/data/as/30137988/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d3963e3d4d
--- /dev/null
+++ b/data/as/30137988/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30137988",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137988/egov-location/boundary-data.json b/data/as/30137988/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9eeabb0bd
--- /dev/null
+++ b/data/as/30137988/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30137988",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIULEAPARA PWSS (NEW)",
+                "localname": "CHOIULEAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIULEAPARA PWSS (NEW)",
+                        "localname": "CHOIULEAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIULEAPARA PWSS (NEW)",
+                "localname": "CHOIULEAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30137988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIULEAPARA PWSS (NEW)",
+                        "localname": "CHOIULEAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137988/ws-services-calculation/Penalty.json b/data/as/30137988/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5ea19ab7f2
--- /dev/null
+++ b/data/as/30137988/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30137988",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30137988/ws-services-calculation/WCBillingSlab.json b/data/as/30137988/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df1532b5a1
--- /dev/null
+++ b/data/as/30137988/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30137988",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138003/BillingService/BusinessService.json b/data/as/30138003/BillingService/BusinessService.json
new file mode 100644
index 0000000000..490dbefa94
--- /dev/null
+++ b/data/as/30138003/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30138003",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138003/egov-location/boundary-data.json b/data/as/30138003/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4f73f0d8a
--- /dev/null
+++ b/data/as/30138003/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30138003",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASIMA PWSS (NEW)",
+                "localname": "KASIMA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30138003",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASIMA PWSS (NEW)",
+                        "localname": "KASIMA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASIMA PWSS (NEW)",
+                "localname": "KASIMA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30138003",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASIMA PWSS (NEW)",
+                        "localname": "KASIMA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138003/ws-services-calculation/Penalty.json b/data/as/30138003/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46f5d13c57
--- /dev/null
+++ b/data/as/30138003/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30138003",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138003/ws-services-calculation/WCBillingSlab.json b/data/as/30138003/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a682e3a5ef
--- /dev/null
+++ b/data/as/30138003/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30138003",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138012/BillingService/BusinessService.json b/data/as/30138012/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9a665aedee
--- /dev/null
+++ b/data/as/30138012/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30138012",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138012/egov-location/boundary-data.json b/data/as/30138012/egov-location/boundary-data.json
new file mode 100644
index 0000000000..65a5ace879
--- /dev/null
+++ b/data/as/30138012/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30138012",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                "localname": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30138012",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                        "localname": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                "localname": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30138012",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                        "localname": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138012/ws-services-calculation/Penalty.json b/data/as/30138012/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..419a10c884
--- /dev/null
+++ b/data/as/30138012/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30138012",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138012/ws-services-calculation/WCBillingSlab.json b/data/as/30138012/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ecbee17dd6
--- /dev/null
+++ b/data/as/30138012/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30138012",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138032/BillingService/BusinessService.json b/data/as/30138032/BillingService/BusinessService.json
new file mode 100644
index 0000000000..727c053187
--- /dev/null
+++ b/data/as/30138032/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30138032",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138032/egov-location/boundary-data.json b/data/as/30138032/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b424db8d55
--- /dev/null
+++ b/data/as/30138032/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30138032",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURSAKATI PWSS (NEW)",
+                "localname": "KURSAKATI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30138032",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURSAKATI PWSS (NEW)",
+                        "localname": "KURSAKATI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURSAKATI PWSS (NEW)",
+                "localname": "KURSAKATI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30138032",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURSAKATI PWSS (NEW)",
+                        "localname": "KURSAKATI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138032/ws-services-calculation/Penalty.json b/data/as/30138032/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b3663873e
--- /dev/null
+++ b/data/as/30138032/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30138032",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30138032/ws-services-calculation/WCBillingSlab.json b/data/as/30138032/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1641827e1f
--- /dev/null
+++ b/data/as/30138032/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30138032",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139203/BillingService/BusinessService.json b/data/as/30139203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2847423c83
--- /dev/null
+++ b/data/as/30139203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30139203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139203/egov-location/boundary-data.json b/data/as/30139203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f30c779cf
--- /dev/null
+++ b/data/as/30139203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30139203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOTAI BONGAON PWSS",
+                "localname": "SOTAI BONGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30139203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOTAI BONGAON PWSS",
+                        "localname": "SOTAI BONGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOTAI BONGAON PWSS",
+                "localname": "SOTAI BONGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30139203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOTAI BONGAON PWSS",
+                        "localname": "SOTAI BONGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139203/ws-services-calculation/Penalty.json b/data/as/30139203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..612965d459
--- /dev/null
+++ b/data/as/30139203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30139203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139203/ws-services-calculation/WCBillingSlab.json b/data/as/30139203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5f28bdfd94
--- /dev/null
+++ b/data/as/30139203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30139203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139213/BillingService/BusinessService.json b/data/as/30139213/BillingService/BusinessService.json
new file mode 100644
index 0000000000..733ec0ad61
--- /dev/null
+++ b/data/as/30139213/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30139213",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139213/egov-location/boundary-data.json b/data/as/30139213/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c013b4c6a6
--- /dev/null
+++ b/data/as/30139213/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30139213",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHAMARI MADAPI PWSS",
+                "localname": "KACHAMARI MADAPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30139213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHAMARI MADAPI PWSS",
+                        "localname": "KACHAMARI MADAPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHAMARI MADAPI PWSS",
+                "localname": "KACHAMARI MADAPI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30139213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHAMARI MADAPI PWSS",
+                        "localname": "KACHAMARI MADAPI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139213/ws-services-calculation/Penalty.json b/data/as/30139213/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69c6e01344
--- /dev/null
+++ b/data/as/30139213/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30139213",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30139213/ws-services-calculation/WCBillingSlab.json b/data/as/30139213/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fdbc2fd1df
--- /dev/null
+++ b/data/as/30139213/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30139213",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140232/BillingService/BusinessService.json b/data/as/30140232/BillingService/BusinessService.json
new file mode 100644
index 0000000000..60a6c1a2ee
--- /dev/null
+++ b/data/as/30140232/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140232",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140232/egov-location/boundary-data.json b/data/as/30140232/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fefd623e95
--- /dev/null
+++ b/data/as/30140232/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140232",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM TARANGAPUR PWSS (NEW)",
+                "localname": "PACHIM TARANGAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140232",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM TARANGAPUR PWSS (NEW)",
+                        "localname": "PACHIM TARANGAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM TARANGAPUR PWSS (NEW)",
+                "localname": "PACHIM TARANGAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140232",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM TARANGAPUR PWSS (NEW)",
+                        "localname": "PACHIM TARANGAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140232/ws-services-calculation/Penalty.json b/data/as/30140232/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d95aa65e3
--- /dev/null
+++ b/data/as/30140232/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140232",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140232/ws-services-calculation/WCBillingSlab.json b/data/as/30140232/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3ce8e4f024
--- /dev/null
+++ b/data/as/30140232/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140232",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140242/BillingService/BusinessService.json b/data/as/30140242/BillingService/BusinessService.json
new file mode 100644
index 0000000000..792b707796
--- /dev/null
+++ b/data/as/30140242/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140242",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140242/egov-location/boundary-data.json b/data/as/30140242/egov-location/boundary-data.json
new file mode 100644
index 0000000000..65104de3e5
--- /dev/null
+++ b/data/as/30140242/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140242",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEPALIKHUTI PWSS (NEW)",
+                "localname": "NEPALIKHUTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEPALIKHUTI PWSS (NEW)",
+                        "localname": "NEPALIKHUTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEPALIKHUTI PWSS (NEW)",
+                "localname": "NEPALIKHUTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEPALIKHUTI PWSS (NEW)",
+                        "localname": "NEPALIKHUTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140242/ws-services-calculation/Penalty.json b/data/as/30140242/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2b0c8bdfd2
--- /dev/null
+++ b/data/as/30140242/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140242",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140242/ws-services-calculation/WCBillingSlab.json b/data/as/30140242/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..29f9ef38e7
--- /dev/null
+++ b/data/as/30140242/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140242",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140254/BillingService/BusinessService.json b/data/as/30140254/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86fbe0c0c4
--- /dev/null
+++ b/data/as/30140254/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140254",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140254/egov-location/boundary-data.json b/data/as/30140254/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ccb3a0519d
--- /dev/null
+++ b/data/as/30140254/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140254",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAHIKATA KODOMTALA PWSS (NEW)",
+                "localname": "DAHIKATA KODOMTALA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140254",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAHIKATA KODOMTALA PWSS (NEW)",
+                        "localname": "DAHIKATA KODOMTALA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAHIKATA KODOMTALA PWSS (NEW)",
+                "localname": "DAHIKATA KODOMTALA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140254",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAHIKATA KODOMTALA PWSS (NEW)",
+                        "localname": "DAHIKATA KODOMTALA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140254/ws-services-calculation/Penalty.json b/data/as/30140254/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27a845dc89
--- /dev/null
+++ b/data/as/30140254/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140254",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140254/ws-services-calculation/WCBillingSlab.json b/data/as/30140254/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4af49de8de
--- /dev/null
+++ b/data/as/30140254/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140254",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140608/BillingService/BusinessService.json b/data/as/30140608/BillingService/BusinessService.json
new file mode 100644
index 0000000000..24648e5ac6
--- /dev/null
+++ b/data/as/30140608/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140608",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140608/egov-location/boundary-data.json b/data/as/30140608/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c808319b36
--- /dev/null
+++ b/data/as/30140608/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140608",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MISSING CHUBURI PWSS",
+                "localname": "MISSING CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140608",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MISSING CHUBURI PWSS",
+                        "localname": "MISSING CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MISSING CHUBURI PWSS",
+                "localname": "MISSING CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140608",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MISSING CHUBURI PWSS",
+                        "localname": "MISSING CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140608/ws-services-calculation/Penalty.json b/data/as/30140608/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cfd533fc0d
--- /dev/null
+++ b/data/as/30140608/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140608",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140608/ws-services-calculation/WCBillingSlab.json b/data/as/30140608/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc593bfdd7
--- /dev/null
+++ b/data/as/30140608/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140608",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140613/BillingService/BusinessService.json b/data/as/30140613/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0589066906
--- /dev/null
+++ b/data/as/30140613/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140613",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140613/egov-location/boundary-data.json b/data/as/30140613/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5761ac1375
--- /dev/null
+++ b/data/as/30140613/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140613",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAI TE PWSS",
+                "localname": "MONAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140613",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAI TE PWSS",
+                        "localname": "MONAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAI TE PWSS",
+                "localname": "MONAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140613",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAI TE PWSS",
+                        "localname": "MONAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140613/ws-services-calculation/Penalty.json b/data/as/30140613/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5bb278dab0
--- /dev/null
+++ b/data/as/30140613/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140613",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140613/ws-services-calculation/WCBillingSlab.json b/data/as/30140613/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..744c2f8559
--- /dev/null
+++ b/data/as/30140613/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140613",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140620/BillingService/BusinessService.json b/data/as/30140620/BillingService/BusinessService.json
new file mode 100644
index 0000000000..241308e5ab
--- /dev/null
+++ b/data/as/30140620/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140620",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140620/egov-location/boundary-data.json b/data/as/30140620/egov-location/boundary-data.json
new file mode 100644
index 0000000000..979d55e01d
--- /dev/null
+++ b/data/as/30140620/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140620",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEZALPATTY TE PWSS",
+                "localname": "TEZALPATTY TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEZALPATTY TE PWSS",
+                        "localname": "TEZALPATTY TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEZALPATTY TE PWSS",
+                "localname": "TEZALPATTY TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140620",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEZALPATTY TE PWSS",
+                        "localname": "TEZALPATTY TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140620/ws-services-calculation/Penalty.json b/data/as/30140620/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dfd440df6b
--- /dev/null
+++ b/data/as/30140620/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140620",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140620/ws-services-calculation/WCBillingSlab.json b/data/as/30140620/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2cd28789ce
--- /dev/null
+++ b/data/as/30140620/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140620",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140642/BillingService/BusinessService.json b/data/as/30140642/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dc488bae43
--- /dev/null
+++ b/data/as/30140642/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30140642",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140642/egov-location/boundary-data.json b/data/as/30140642/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1133f2193a
--- /dev/null
+++ b/data/as/30140642/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30140642",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAI TE PWSS",
+                "localname": "DIKORAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140642",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAI TE PWSS",
+                        "localname": "DIKORAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIKORAI TE PWSS",
+                "localname": "DIKORAI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30140642",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIKORAI TE PWSS",
+                        "localname": "DIKORAI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140642/ws-services-calculation/Penalty.json b/data/as/30140642/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3aec22dadc
--- /dev/null
+++ b/data/as/30140642/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30140642",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30140642/ws-services-calculation/WCBillingSlab.json b/data/as/30140642/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..25e38a7a37
--- /dev/null
+++ b/data/as/30140642/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30140642",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141038/BillingService/BusinessService.json b/data/as/30141038/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6da6bcde76
--- /dev/null
+++ b/data/as/30141038/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30141038",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141038/egov-location/boundary-data.json b/data/as/30141038/egov-location/boundary-data.json
new file mode 100644
index 0000000000..64e0b96d62
--- /dev/null
+++ b/data/as/30141038/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30141038",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                "localname": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30141038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                        "localname": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                "localname": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30141038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                        "localname": "HIRAPARA (DALGOMA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141038/ws-services-calculation/Penalty.json b/data/as/30141038/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4c01891c21
--- /dev/null
+++ b/data/as/30141038/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30141038",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141038/ws-services-calculation/WCBillingSlab.json b/data/as/30141038/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b3f54a016
--- /dev/null
+++ b/data/as/30141038/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30141038",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141193/BillingService/BusinessService.json b/data/as/30141193/BillingService/BusinessService.json
new file mode 100644
index 0000000000..acc5458ac0
--- /dev/null
+++ b/data/as/30141193/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30141193",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141193/egov-location/boundary-data.json b/data/as/30141193/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e39d6844a
--- /dev/null
+++ b/data/as/30141193/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30141193",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHENDERA PWSS (NEW)",
+                "localname": "BHENDERA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30141193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHENDERA PWSS (NEW)",
+                        "localname": "BHENDERA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHENDERA PWSS (NEW)",
+                "localname": "BHENDERA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30141193",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHENDERA PWSS (NEW)",
+                        "localname": "BHENDERA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141193/ws-services-calculation/Penalty.json b/data/as/30141193/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db29becbad
--- /dev/null
+++ b/data/as/30141193/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30141193",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141193/ws-services-calculation/WCBillingSlab.json b/data/as/30141193/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac79e8b9b9
--- /dev/null
+++ b/data/as/30141193/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30141193",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141195/BillingService/BusinessService.json b/data/as/30141195/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2c9d2da5ed
--- /dev/null
+++ b/data/as/30141195/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30141195",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141195/egov-location/boundary-data.json b/data/as/30141195/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dce863eaae
--- /dev/null
+++ b/data/as/30141195/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30141195",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNAPARA DEREK PWSS (NEW)",
+                "localname": "JOGNAPARA DEREK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30141195",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNAPARA DEREK PWSS (NEW)",
+                        "localname": "JOGNAPARA DEREK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNAPARA DEREK PWSS (NEW)",
+                "localname": "JOGNAPARA DEREK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30141195",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNAPARA DEREK PWSS (NEW)",
+                        "localname": "JOGNAPARA DEREK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141195/ws-services-calculation/Penalty.json b/data/as/30141195/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f16f988567
--- /dev/null
+++ b/data/as/30141195/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30141195",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30141195/ws-services-calculation/WCBillingSlab.json b/data/as/30141195/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a624770a05
--- /dev/null
+++ b/data/as/30141195/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30141195",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143283/BillingService/BusinessService.json b/data/as/30143283/BillingService/BusinessService.json
new file mode 100644
index 0000000000..700e68f6ec
--- /dev/null
+++ b/data/as/30143283/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143283",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143283/egov-location/boundary-data.json b/data/as/30143283/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1630601588
--- /dev/null
+++ b/data/as/30143283/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143283",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONARURTAL PWSS (NEW)",
+                "localname": "SONARURTAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONARURTAL PWSS (NEW)",
+                        "localname": "SONARURTAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONARURTAL PWSS (NEW)",
+                "localname": "SONARURTAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143283",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONARURTAL PWSS (NEW)",
+                        "localname": "SONARURTAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143283/ws-services-calculation/Penalty.json b/data/as/30143283/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c5921a52f7
--- /dev/null
+++ b/data/as/30143283/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143283",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143283/ws-services-calculation/WCBillingSlab.json b/data/as/30143283/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..09050d4f5b
--- /dev/null
+++ b/data/as/30143283/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143283",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143295/BillingService/BusinessService.json b/data/as/30143295/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d7b114430e
--- /dev/null
+++ b/data/as/30143295/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143295",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143295/egov-location/boundary-data.json b/data/as/30143295/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9356131cb
--- /dev/null
+++ b/data/as/30143295/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143295",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOROPOITARY PWSS (NEW)",
+                "localname": "BOROPOITARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOROPOITARY PWSS (NEW)",
+                        "localname": "BOROPOITARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOROPOITARY PWSS (NEW)",
+                "localname": "BOROPOITARY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOROPOITARY PWSS (NEW)",
+                        "localname": "BOROPOITARY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143295/ws-services-calculation/Penalty.json b/data/as/30143295/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd2fa0f34c
--- /dev/null
+++ b/data/as/30143295/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143295",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143295/ws-services-calculation/WCBillingSlab.json b/data/as/30143295/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..78ca326ca8
--- /dev/null
+++ b/data/as/30143295/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143295",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143305/BillingService/BusinessService.json b/data/as/30143305/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07d84fc23b
--- /dev/null
+++ b/data/as/30143305/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143305",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143305/egov-location/boundary-data.json b/data/as/30143305/egov-location/boundary-data.json
new file mode 100644
index 0000000000..021d966189
--- /dev/null
+++ b/data/as/30143305/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143305",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULTULIAPARA PWSS (NEW)",
+                "localname": "TULTULIAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143305",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULTULIAPARA PWSS (NEW)",
+                        "localname": "TULTULIAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TULTULIAPARA PWSS (NEW)",
+                "localname": "TULTULIAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143305",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TULTULIAPARA PWSS (NEW)",
+                        "localname": "TULTULIAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143305/ws-services-calculation/Penalty.json b/data/as/30143305/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..648cfd897a
--- /dev/null
+++ b/data/as/30143305/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143305",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143305/ws-services-calculation/WCBillingSlab.json b/data/as/30143305/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..83d99ea12e
--- /dev/null
+++ b/data/as/30143305/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143305",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From bc218b9e301c4370f5d4ccb13ba0f46dd0f55380 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:42:37 +0530
Subject: [PATCH 06/23] added 400 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143323/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143328/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143504/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143512/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30143523/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30144955/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30145080/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30146239/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30146477/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30146517/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30146665/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30148255/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30148279/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30148838/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30148938/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30148954/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30149001/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30149016/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30149044/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30149093/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30149113/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150209/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150213/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150234/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150700/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150737/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150785/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150803/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30150834/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158066/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158126/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158312/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158662/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158694/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158752/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30158825/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30159298/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30159329/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30163627/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30163652/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30163717/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166511/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166533/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166583/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166670/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166739/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166762/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30166822/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167065/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167107/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167121/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167130/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167292/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167319/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167381/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167391/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167408/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167439/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167463/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167486/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30167823/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169470/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169472/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169516/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169525/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169537/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169560/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169583/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169600/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169629/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169643/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169657/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169665/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169790/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169802/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169825/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30169988/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170226/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170237/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170249/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170262/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170419/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170429/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170784/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170810/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30170948/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30171030/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172407/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172409/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172412/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172420/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172437/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172442/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172452/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172456/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172473/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172482/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172498/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172503/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172507/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172509/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172538/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172543/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30172573/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173072/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173084/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173097/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173162/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173172/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173251/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173284/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173317/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173387/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173395/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173400/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173409/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173419/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173427/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173442/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173455/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173471/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173509/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173535/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173679/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173688/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173698/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173710/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173740/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173753/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173770/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173782/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173794/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173812/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173814/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173816/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173961/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173962/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173963/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173965/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173967/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173972/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173973/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173975/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173977/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173978/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173979/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173980/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173981/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173982/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173983/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30173984/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174052/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174053/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174055/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174058/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174059/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174062/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174064/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174065/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174068/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174070/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174072/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174082/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174084/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174085/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174088/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174094/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174097/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174123/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174125/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174133/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174139/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174143/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174150/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174158/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174165/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174178/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174186/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174190/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174199/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174210/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174211/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174222/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174241/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174244/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174286/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174291/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174314/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174344/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174357/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174375/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174407/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174416/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174419/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174439/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174442/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174454/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174538/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174541/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174546/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174562/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174577/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174593/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174610/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174622/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174633/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174651/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174677/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174688/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174694/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174699/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174700/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174721/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174729/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174732/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174740/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174745/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174747/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174796/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174826/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174847/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174854/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174863/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174870/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174887/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174894/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174961/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30174977/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175021/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175053/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175075/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175155/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175169/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175190/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175203/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175204/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175213/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175228/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175239/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175264/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175272/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175295/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175334/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175367/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175392/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175425/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175446/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175464/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175466/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175474/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175490/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175493/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175539/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175554/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175635/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175648/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175668/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175691/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175708/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175727/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175767/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175783/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175784/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175795/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175807/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175812/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175821/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175827/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175831/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175853/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175854/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175867/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175876/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175883/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175888/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175891/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175904/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175917/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30175983/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176038/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176114/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176117/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176156/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176170/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176178/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176209/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176222/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176252/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176279/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176310/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176350/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176394/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176403/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176503/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176512/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176517/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176525/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../30176539/egov-location/boundary-data.json |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176552/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176563/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176575/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176589/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176605/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176670/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176673/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176676/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176679/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176683/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176709/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176714/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176720/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30176756/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177227/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177242/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177275/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177297/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177314/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177334/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177375/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../30177874/egov-location/boundary-data.json |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177929/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177971/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30177999/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178023/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178056/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178092/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178124/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178175/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178287/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178310/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178331/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178371/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178397/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178423/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178440/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178942/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30178977/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179000/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179124/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179165/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179209/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179232/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179397/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179439/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179473/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179510/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179533/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179578/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179689/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179724/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179739/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179767/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179793/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179802/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179808/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179812/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179815/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30179821/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180631/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180654/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180663/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180675/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180698/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180724/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180855/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180870/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180952/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30180965/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181077/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181091/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181099/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181126/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181144/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181145/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181168/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181188/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181246/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181257/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181268/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181293/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181327/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181400/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181411/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181434/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181444/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181457/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181562/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181575/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181597/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181604/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181615/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181621/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181628/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181639/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181769/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181824/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181850/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181892/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 1596 files changed, 136140 insertions(+), 24 deletions(-)
 create mode 100644 data/as/30143323/BillingService/BusinessService.json
 create mode 100644 data/as/30143323/egov-location/boundary-data.json
 create mode 100644 data/as/30143323/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143323/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143328/BillingService/BusinessService.json
 create mode 100644 data/as/30143328/egov-location/boundary-data.json
 create mode 100644 data/as/30143328/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143328/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143496/BillingService/BusinessService.json
 create mode 100644 data/as/30143496/egov-location/boundary-data.json
 create mode 100644 data/as/30143496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143504/BillingService/BusinessService.json
 create mode 100644 data/as/30143504/egov-location/boundary-data.json
 create mode 100644 data/as/30143504/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143504/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143512/BillingService/BusinessService.json
 create mode 100644 data/as/30143512/egov-location/boundary-data.json
 create mode 100644 data/as/30143512/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143512/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30143523/BillingService/BusinessService.json
 create mode 100644 data/as/30143523/egov-location/boundary-data.json
 create mode 100644 data/as/30143523/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30143523/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30144955/BillingService/BusinessService.json
 create mode 100644 data/as/30144955/egov-location/boundary-data.json
 create mode 100644 data/as/30144955/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30144955/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30145080/BillingService/BusinessService.json
 create mode 100644 data/as/30145080/egov-location/boundary-data.json
 create mode 100644 data/as/30145080/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30145080/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30146239/BillingService/BusinessService.json
 create mode 100644 data/as/30146239/egov-location/boundary-data.json
 create mode 100644 data/as/30146239/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30146239/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30146477/BillingService/BusinessService.json
 create mode 100644 data/as/30146477/egov-location/boundary-data.json
 create mode 100644 data/as/30146477/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30146477/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30146517/BillingService/BusinessService.json
 create mode 100644 data/as/30146517/egov-location/boundary-data.json
 create mode 100644 data/as/30146517/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30146517/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30146665/BillingService/BusinessService.json
 create mode 100644 data/as/30146665/egov-location/boundary-data.json
 create mode 100644 data/as/30146665/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30146665/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30148255/BillingService/BusinessService.json
 create mode 100644 data/as/30148255/egov-location/boundary-data.json
 create mode 100644 data/as/30148255/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30148255/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30148279/BillingService/BusinessService.json
 create mode 100644 data/as/30148279/egov-location/boundary-data.json
 create mode 100644 data/as/30148279/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30148279/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30148838/BillingService/BusinessService.json
 create mode 100644 data/as/30148838/egov-location/boundary-data.json
 create mode 100644 data/as/30148838/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30148838/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30148938/BillingService/BusinessService.json
 create mode 100644 data/as/30148938/egov-location/boundary-data.json
 create mode 100644 data/as/30148938/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30148938/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30148954/BillingService/BusinessService.json
 create mode 100644 data/as/30148954/egov-location/boundary-data.json
 create mode 100644 data/as/30148954/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30148954/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30149001/BillingService/BusinessService.json
 create mode 100644 data/as/30149001/egov-location/boundary-data.json
 create mode 100644 data/as/30149001/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30149001/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30149016/BillingService/BusinessService.json
 create mode 100644 data/as/30149016/egov-location/boundary-data.json
 create mode 100644 data/as/30149016/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30149016/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30149044/BillingService/BusinessService.json
 create mode 100644 data/as/30149044/egov-location/boundary-data.json
 create mode 100644 data/as/30149044/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30149044/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30149093/BillingService/BusinessService.json
 create mode 100644 data/as/30149093/egov-location/boundary-data.json
 create mode 100644 data/as/30149093/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30149093/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30149113/BillingService/BusinessService.json
 create mode 100644 data/as/30149113/egov-location/boundary-data.json
 create mode 100644 data/as/30149113/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30149113/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150209/BillingService/BusinessService.json
 create mode 100644 data/as/30150209/egov-location/boundary-data.json
 create mode 100644 data/as/30150209/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150209/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150213/BillingService/BusinessService.json
 create mode 100644 data/as/30150213/egov-location/boundary-data.json
 create mode 100644 data/as/30150213/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150213/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150234/BillingService/BusinessService.json
 create mode 100644 data/as/30150234/egov-location/boundary-data.json
 create mode 100644 data/as/30150234/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150234/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150700/BillingService/BusinessService.json
 create mode 100644 data/as/30150700/egov-location/boundary-data.json
 create mode 100644 data/as/30150700/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150700/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150737/BillingService/BusinessService.json
 create mode 100644 data/as/30150737/egov-location/boundary-data.json
 create mode 100644 data/as/30150737/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150737/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150785/BillingService/BusinessService.json
 create mode 100644 data/as/30150785/egov-location/boundary-data.json
 create mode 100644 data/as/30150785/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150785/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150803/BillingService/BusinessService.json
 create mode 100644 data/as/30150803/egov-location/boundary-data.json
 create mode 100644 data/as/30150803/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150803/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30150834/BillingService/BusinessService.json
 create mode 100644 data/as/30150834/egov-location/boundary-data.json
 create mode 100644 data/as/30150834/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30150834/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158066/BillingService/BusinessService.json
 create mode 100644 data/as/30158066/egov-location/boundary-data.json
 create mode 100644 data/as/30158066/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158066/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158126/BillingService/BusinessService.json
 create mode 100644 data/as/30158126/egov-location/boundary-data.json
 create mode 100644 data/as/30158126/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158126/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158312/BillingService/BusinessService.json
 create mode 100644 data/as/30158312/egov-location/boundary-data.json
 create mode 100644 data/as/30158312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158662/BillingService/BusinessService.json
 create mode 100644 data/as/30158662/egov-location/boundary-data.json
 create mode 100644 data/as/30158662/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158662/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158694/BillingService/BusinessService.json
 create mode 100644 data/as/30158694/egov-location/boundary-data.json
 create mode 100644 data/as/30158694/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158694/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158752/BillingService/BusinessService.json
 create mode 100644 data/as/30158752/egov-location/boundary-data.json
 create mode 100644 data/as/30158752/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158752/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30158825/BillingService/BusinessService.json
 create mode 100644 data/as/30158825/egov-location/boundary-data.json
 create mode 100644 data/as/30158825/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30158825/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30159298/BillingService/BusinessService.json
 create mode 100644 data/as/30159298/egov-location/boundary-data.json
 create mode 100644 data/as/30159298/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30159298/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30159329/BillingService/BusinessService.json
 create mode 100644 data/as/30159329/egov-location/boundary-data.json
 create mode 100644 data/as/30159329/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30159329/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30163627/BillingService/BusinessService.json
 create mode 100644 data/as/30163627/egov-location/boundary-data.json
 create mode 100644 data/as/30163627/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30163627/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30163652/BillingService/BusinessService.json
 create mode 100644 data/as/30163652/egov-location/boundary-data.json
 create mode 100644 data/as/30163652/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30163652/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30163717/BillingService/BusinessService.json
 create mode 100644 data/as/30163717/egov-location/boundary-data.json
 create mode 100644 data/as/30163717/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30163717/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166511/BillingService/BusinessService.json
 create mode 100644 data/as/30166511/egov-location/boundary-data.json
 create mode 100644 data/as/30166511/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166511/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166533/BillingService/BusinessService.json
 create mode 100644 data/as/30166533/egov-location/boundary-data.json
 create mode 100644 data/as/30166533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166583/BillingService/BusinessService.json
 create mode 100644 data/as/30166583/egov-location/boundary-data.json
 create mode 100644 data/as/30166583/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166583/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166670/BillingService/BusinessService.json
 create mode 100644 data/as/30166670/egov-location/boundary-data.json
 create mode 100644 data/as/30166670/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166670/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166739/BillingService/BusinessService.json
 create mode 100644 data/as/30166739/egov-location/boundary-data.json
 create mode 100644 data/as/30166739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166762/BillingService/BusinessService.json
 create mode 100644 data/as/30166762/egov-location/boundary-data.json
 create mode 100644 data/as/30166762/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166762/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30166822/BillingService/BusinessService.json
 create mode 100644 data/as/30166822/egov-location/boundary-data.json
 create mode 100644 data/as/30166822/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30166822/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167065/BillingService/BusinessService.json
 create mode 100644 data/as/30167065/egov-location/boundary-data.json
 create mode 100644 data/as/30167065/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167065/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167107/BillingService/BusinessService.json
 create mode 100644 data/as/30167107/egov-location/boundary-data.json
 create mode 100644 data/as/30167107/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167107/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167121/BillingService/BusinessService.json
 create mode 100644 data/as/30167121/egov-location/boundary-data.json
 create mode 100644 data/as/30167121/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167121/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167130/BillingService/BusinessService.json
 create mode 100644 data/as/30167130/egov-location/boundary-data.json
 create mode 100644 data/as/30167130/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167130/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167292/BillingService/BusinessService.json
 create mode 100644 data/as/30167292/egov-location/boundary-data.json
 create mode 100644 data/as/30167292/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167292/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167319/BillingService/BusinessService.json
 create mode 100644 data/as/30167319/egov-location/boundary-data.json
 create mode 100644 data/as/30167319/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167319/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167381/BillingService/BusinessService.json
 create mode 100644 data/as/30167381/egov-location/boundary-data.json
 create mode 100644 data/as/30167381/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167381/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167391/BillingService/BusinessService.json
 create mode 100644 data/as/30167391/egov-location/boundary-data.json
 create mode 100644 data/as/30167391/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167391/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167408/BillingService/BusinessService.json
 create mode 100644 data/as/30167408/egov-location/boundary-data.json
 create mode 100644 data/as/30167408/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167408/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167439/BillingService/BusinessService.json
 create mode 100644 data/as/30167439/egov-location/boundary-data.json
 create mode 100644 data/as/30167439/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167439/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167463/BillingService/BusinessService.json
 create mode 100644 data/as/30167463/egov-location/boundary-data.json
 create mode 100644 data/as/30167463/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167463/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167486/BillingService/BusinessService.json
 create mode 100644 data/as/30167486/egov-location/boundary-data.json
 create mode 100644 data/as/30167486/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167486/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30167823/BillingService/BusinessService.json
 create mode 100644 data/as/30167823/egov-location/boundary-data.json
 create mode 100644 data/as/30167823/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30167823/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169470/BillingService/BusinessService.json
 create mode 100644 data/as/30169470/egov-location/boundary-data.json
 create mode 100644 data/as/30169470/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169470/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169472/BillingService/BusinessService.json
 create mode 100644 data/as/30169472/egov-location/boundary-data.json
 create mode 100644 data/as/30169472/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169472/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169516/BillingService/BusinessService.json
 create mode 100644 data/as/30169516/egov-location/boundary-data.json
 create mode 100644 data/as/30169516/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169516/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169525/BillingService/BusinessService.json
 create mode 100644 data/as/30169525/egov-location/boundary-data.json
 create mode 100644 data/as/30169525/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169525/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169537/BillingService/BusinessService.json
 create mode 100644 data/as/30169537/egov-location/boundary-data.json
 create mode 100644 data/as/30169537/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169537/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169560/BillingService/BusinessService.json
 create mode 100644 data/as/30169560/egov-location/boundary-data.json
 create mode 100644 data/as/30169560/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169560/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169583/BillingService/BusinessService.json
 create mode 100644 data/as/30169583/egov-location/boundary-data.json
 create mode 100644 data/as/30169583/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169583/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169600/BillingService/BusinessService.json
 create mode 100644 data/as/30169600/egov-location/boundary-data.json
 create mode 100644 data/as/30169600/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169600/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169629/BillingService/BusinessService.json
 create mode 100644 data/as/30169629/egov-location/boundary-data.json
 create mode 100644 data/as/30169629/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169629/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169643/BillingService/BusinessService.json
 create mode 100644 data/as/30169643/egov-location/boundary-data.json
 create mode 100644 data/as/30169643/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169643/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169657/BillingService/BusinessService.json
 create mode 100644 data/as/30169657/egov-location/boundary-data.json
 create mode 100644 data/as/30169657/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169657/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169665/BillingService/BusinessService.json
 create mode 100644 data/as/30169665/egov-location/boundary-data.json
 create mode 100644 data/as/30169665/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169665/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169790/BillingService/BusinessService.json
 create mode 100644 data/as/30169790/egov-location/boundary-data.json
 create mode 100644 data/as/30169790/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169790/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169802/BillingService/BusinessService.json
 create mode 100644 data/as/30169802/egov-location/boundary-data.json
 create mode 100644 data/as/30169802/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169802/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169825/BillingService/BusinessService.json
 create mode 100644 data/as/30169825/egov-location/boundary-data.json
 create mode 100644 data/as/30169825/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169825/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30169988/BillingService/BusinessService.json
 create mode 100644 data/as/30169988/egov-location/boundary-data.json
 create mode 100644 data/as/30169988/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30169988/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170226/BillingService/BusinessService.json
 create mode 100644 data/as/30170226/egov-location/boundary-data.json
 create mode 100644 data/as/30170226/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170226/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170237/BillingService/BusinessService.json
 create mode 100644 data/as/30170237/egov-location/boundary-data.json
 create mode 100644 data/as/30170237/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170237/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170249/BillingService/BusinessService.json
 create mode 100644 data/as/30170249/egov-location/boundary-data.json
 create mode 100644 data/as/30170249/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170249/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170262/BillingService/BusinessService.json
 create mode 100644 data/as/30170262/egov-location/boundary-data.json
 create mode 100644 data/as/30170262/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170262/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170419/BillingService/BusinessService.json
 create mode 100644 data/as/30170419/egov-location/boundary-data.json
 create mode 100644 data/as/30170419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170429/BillingService/BusinessService.json
 create mode 100644 data/as/30170429/egov-location/boundary-data.json
 create mode 100644 data/as/30170429/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170429/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170784/BillingService/BusinessService.json
 create mode 100644 data/as/30170784/egov-location/boundary-data.json
 create mode 100644 data/as/30170784/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170784/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170810/BillingService/BusinessService.json
 create mode 100644 data/as/30170810/egov-location/boundary-data.json
 create mode 100644 data/as/30170810/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170810/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30170948/BillingService/BusinessService.json
 create mode 100644 data/as/30170948/egov-location/boundary-data.json
 create mode 100644 data/as/30170948/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30170948/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30171030/BillingService/BusinessService.json
 create mode 100644 data/as/30171030/egov-location/boundary-data.json
 create mode 100644 data/as/30171030/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30171030/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172407/BillingService/BusinessService.json
 create mode 100644 data/as/30172407/egov-location/boundary-data.json
 create mode 100644 data/as/30172407/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172407/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172409/BillingService/BusinessService.json
 create mode 100644 data/as/30172409/egov-location/boundary-data.json
 create mode 100644 data/as/30172409/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172409/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172412/BillingService/BusinessService.json
 create mode 100644 data/as/30172412/egov-location/boundary-data.json
 create mode 100644 data/as/30172412/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172412/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172420/BillingService/BusinessService.json
 create mode 100644 data/as/30172420/egov-location/boundary-data.json
 create mode 100644 data/as/30172420/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172420/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172437/BillingService/BusinessService.json
 create mode 100644 data/as/30172437/egov-location/boundary-data.json
 create mode 100644 data/as/30172437/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172437/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172442/BillingService/BusinessService.json
 create mode 100644 data/as/30172442/egov-location/boundary-data.json
 create mode 100644 data/as/30172442/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172442/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172452/BillingService/BusinessService.json
 create mode 100644 data/as/30172452/egov-location/boundary-data.json
 create mode 100644 data/as/30172452/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172452/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172456/BillingService/BusinessService.json
 create mode 100644 data/as/30172456/egov-location/boundary-data.json
 create mode 100644 data/as/30172456/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172456/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172473/BillingService/BusinessService.json
 create mode 100644 data/as/30172473/egov-location/boundary-data.json
 create mode 100644 data/as/30172473/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172473/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172482/BillingService/BusinessService.json
 create mode 100644 data/as/30172482/egov-location/boundary-data.json
 create mode 100644 data/as/30172482/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172482/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172498/BillingService/BusinessService.json
 create mode 100644 data/as/30172498/egov-location/boundary-data.json
 create mode 100644 data/as/30172498/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172498/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172503/BillingService/BusinessService.json
 create mode 100644 data/as/30172503/egov-location/boundary-data.json
 create mode 100644 data/as/30172503/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172503/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172507/BillingService/BusinessService.json
 create mode 100644 data/as/30172507/egov-location/boundary-data.json
 create mode 100644 data/as/30172507/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172507/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172509/BillingService/BusinessService.json
 create mode 100644 data/as/30172509/egov-location/boundary-data.json
 create mode 100644 data/as/30172509/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172509/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172538/BillingService/BusinessService.json
 create mode 100644 data/as/30172538/egov-location/boundary-data.json
 create mode 100644 data/as/30172538/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172538/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172543/BillingService/BusinessService.json
 create mode 100644 data/as/30172543/egov-location/boundary-data.json
 create mode 100644 data/as/30172543/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172543/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30172573/BillingService/BusinessService.json
 create mode 100644 data/as/30172573/egov-location/boundary-data.json
 create mode 100644 data/as/30172573/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30172573/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173072/BillingService/BusinessService.json
 create mode 100644 data/as/30173072/egov-location/boundary-data.json
 create mode 100644 data/as/30173072/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173072/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173084/BillingService/BusinessService.json
 create mode 100644 data/as/30173084/egov-location/boundary-data.json
 create mode 100644 data/as/30173084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173097/BillingService/BusinessService.json
 create mode 100644 data/as/30173097/egov-location/boundary-data.json
 create mode 100644 data/as/30173097/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173097/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173162/BillingService/BusinessService.json
 create mode 100644 data/as/30173162/egov-location/boundary-data.json
 create mode 100644 data/as/30173162/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173162/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173172/BillingService/BusinessService.json
 create mode 100644 data/as/30173172/egov-location/boundary-data.json
 create mode 100644 data/as/30173172/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173172/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173251/BillingService/BusinessService.json
 create mode 100644 data/as/30173251/egov-location/boundary-data.json
 create mode 100644 data/as/30173251/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173251/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173284/BillingService/BusinessService.json
 create mode 100644 data/as/30173284/egov-location/boundary-data.json
 create mode 100644 data/as/30173284/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173284/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173317/BillingService/BusinessService.json
 create mode 100644 data/as/30173317/egov-location/boundary-data.json
 create mode 100644 data/as/30173317/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173317/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173387/BillingService/BusinessService.json
 create mode 100644 data/as/30173387/egov-location/boundary-data.json
 create mode 100644 data/as/30173387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173395/BillingService/BusinessService.json
 create mode 100644 data/as/30173395/egov-location/boundary-data.json
 create mode 100644 data/as/30173395/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173395/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173400/BillingService/BusinessService.json
 create mode 100644 data/as/30173400/egov-location/boundary-data.json
 create mode 100644 data/as/30173400/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173400/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173409/BillingService/BusinessService.json
 create mode 100644 data/as/30173409/egov-location/boundary-data.json
 create mode 100644 data/as/30173409/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173409/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173419/BillingService/BusinessService.json
 create mode 100644 data/as/30173419/egov-location/boundary-data.json
 create mode 100644 data/as/30173419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173427/BillingService/BusinessService.json
 create mode 100644 data/as/30173427/egov-location/boundary-data.json
 create mode 100644 data/as/30173427/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173427/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173442/BillingService/BusinessService.json
 create mode 100644 data/as/30173442/egov-location/boundary-data.json
 create mode 100644 data/as/30173442/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173442/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173455/BillingService/BusinessService.json
 create mode 100644 data/as/30173455/egov-location/boundary-data.json
 create mode 100644 data/as/30173455/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173455/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173471/BillingService/BusinessService.json
 create mode 100644 data/as/30173471/egov-location/boundary-data.json
 create mode 100644 data/as/30173471/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173471/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173496/BillingService/BusinessService.json
 create mode 100644 data/as/30173496/egov-location/boundary-data.json
 create mode 100644 data/as/30173496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173509/BillingService/BusinessService.json
 create mode 100644 data/as/30173509/egov-location/boundary-data.json
 create mode 100644 data/as/30173509/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173509/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173535/BillingService/BusinessService.json
 create mode 100644 data/as/30173535/egov-location/boundary-data.json
 create mode 100644 data/as/30173535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173679/BillingService/BusinessService.json
 create mode 100644 data/as/30173679/egov-location/boundary-data.json
 create mode 100644 data/as/30173679/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173679/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173688/BillingService/BusinessService.json
 create mode 100644 data/as/30173688/egov-location/boundary-data.json
 create mode 100644 data/as/30173688/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173688/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173698/BillingService/BusinessService.json
 create mode 100644 data/as/30173698/egov-location/boundary-data.json
 create mode 100644 data/as/30173698/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173698/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173710/BillingService/BusinessService.json
 create mode 100644 data/as/30173710/egov-location/boundary-data.json
 create mode 100644 data/as/30173710/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173710/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173740/BillingService/BusinessService.json
 create mode 100644 data/as/30173740/egov-location/boundary-data.json
 create mode 100644 data/as/30173740/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173740/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173753/BillingService/BusinessService.json
 create mode 100644 data/as/30173753/egov-location/boundary-data.json
 create mode 100644 data/as/30173753/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173753/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173770/BillingService/BusinessService.json
 create mode 100644 data/as/30173770/egov-location/boundary-data.json
 create mode 100644 data/as/30173770/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173770/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173782/BillingService/BusinessService.json
 create mode 100644 data/as/30173782/egov-location/boundary-data.json
 create mode 100644 data/as/30173782/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173782/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173794/BillingService/BusinessService.json
 create mode 100644 data/as/30173794/egov-location/boundary-data.json
 create mode 100644 data/as/30173794/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173794/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173812/BillingService/BusinessService.json
 create mode 100644 data/as/30173812/egov-location/boundary-data.json
 create mode 100644 data/as/30173812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173814/BillingService/BusinessService.json
 create mode 100644 data/as/30173814/egov-location/boundary-data.json
 create mode 100644 data/as/30173814/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173814/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173816/BillingService/BusinessService.json
 create mode 100644 data/as/30173816/egov-location/boundary-data.json
 create mode 100644 data/as/30173816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173961/BillingService/BusinessService.json
 create mode 100644 data/as/30173961/egov-location/boundary-data.json
 create mode 100644 data/as/30173961/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173961/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173962/BillingService/BusinessService.json
 create mode 100644 data/as/30173962/egov-location/boundary-data.json
 create mode 100644 data/as/30173962/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173962/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173963/BillingService/BusinessService.json
 create mode 100644 data/as/30173963/egov-location/boundary-data.json
 create mode 100644 data/as/30173963/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173963/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173965/BillingService/BusinessService.json
 create mode 100644 data/as/30173965/egov-location/boundary-data.json
 create mode 100644 data/as/30173965/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173965/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173967/BillingService/BusinessService.json
 create mode 100644 data/as/30173967/egov-location/boundary-data.json
 create mode 100644 data/as/30173967/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173967/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173972/BillingService/BusinessService.json
 create mode 100644 data/as/30173972/egov-location/boundary-data.json
 create mode 100644 data/as/30173972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173973/BillingService/BusinessService.json
 create mode 100644 data/as/30173973/egov-location/boundary-data.json
 create mode 100644 data/as/30173973/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173973/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173975/BillingService/BusinessService.json
 create mode 100644 data/as/30173975/egov-location/boundary-data.json
 create mode 100644 data/as/30173975/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173975/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173977/BillingService/BusinessService.json
 create mode 100644 data/as/30173977/egov-location/boundary-data.json
 create mode 100644 data/as/30173977/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173977/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173978/BillingService/BusinessService.json
 create mode 100644 data/as/30173978/egov-location/boundary-data.json
 create mode 100644 data/as/30173978/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173978/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173979/BillingService/BusinessService.json
 create mode 100644 data/as/30173979/egov-location/boundary-data.json
 create mode 100644 data/as/30173979/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173979/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173980/BillingService/BusinessService.json
 create mode 100644 data/as/30173980/egov-location/boundary-data.json
 create mode 100644 data/as/30173980/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173980/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173981/BillingService/BusinessService.json
 create mode 100644 data/as/30173981/egov-location/boundary-data.json
 create mode 100644 data/as/30173981/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173981/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173982/BillingService/BusinessService.json
 create mode 100644 data/as/30173982/egov-location/boundary-data.json
 create mode 100644 data/as/30173982/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173982/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173983/BillingService/BusinessService.json
 create mode 100644 data/as/30173983/egov-location/boundary-data.json
 create mode 100644 data/as/30173983/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173983/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30173984/BillingService/BusinessService.json
 create mode 100644 data/as/30173984/egov-location/boundary-data.json
 create mode 100644 data/as/30173984/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30173984/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174052/BillingService/BusinessService.json
 create mode 100644 data/as/30174052/egov-location/boundary-data.json
 create mode 100644 data/as/30174052/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174052/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174053/BillingService/BusinessService.json
 create mode 100644 data/as/30174053/egov-location/boundary-data.json
 create mode 100644 data/as/30174053/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174053/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174055/BillingService/BusinessService.json
 create mode 100644 data/as/30174055/egov-location/boundary-data.json
 create mode 100644 data/as/30174055/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174055/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174058/BillingService/BusinessService.json
 create mode 100644 data/as/30174058/egov-location/boundary-data.json
 create mode 100644 data/as/30174058/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174058/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174059/BillingService/BusinessService.json
 create mode 100644 data/as/30174059/egov-location/boundary-data.json
 create mode 100644 data/as/30174059/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174059/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174062/BillingService/BusinessService.json
 create mode 100644 data/as/30174062/egov-location/boundary-data.json
 create mode 100644 data/as/30174062/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174062/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174064/BillingService/BusinessService.json
 create mode 100644 data/as/30174064/egov-location/boundary-data.json
 create mode 100644 data/as/30174064/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174064/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174065/BillingService/BusinessService.json
 create mode 100644 data/as/30174065/egov-location/boundary-data.json
 create mode 100644 data/as/30174065/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174065/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174068/BillingService/BusinessService.json
 create mode 100644 data/as/30174068/egov-location/boundary-data.json
 create mode 100644 data/as/30174068/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174068/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174070/BillingService/BusinessService.json
 create mode 100644 data/as/30174070/egov-location/boundary-data.json
 create mode 100644 data/as/30174070/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174070/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174072/BillingService/BusinessService.json
 create mode 100644 data/as/30174072/egov-location/boundary-data.json
 create mode 100644 data/as/30174072/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174072/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174082/BillingService/BusinessService.json
 create mode 100644 data/as/30174082/egov-location/boundary-data.json
 create mode 100644 data/as/30174082/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174082/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174084/BillingService/BusinessService.json
 create mode 100644 data/as/30174084/egov-location/boundary-data.json
 create mode 100644 data/as/30174084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174085/BillingService/BusinessService.json
 create mode 100644 data/as/30174085/egov-location/boundary-data.json
 create mode 100644 data/as/30174085/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174085/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174088/BillingService/BusinessService.json
 create mode 100644 data/as/30174088/egov-location/boundary-data.json
 create mode 100644 data/as/30174088/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174088/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174094/BillingService/BusinessService.json
 create mode 100644 data/as/30174094/egov-location/boundary-data.json
 create mode 100644 data/as/30174094/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174094/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174097/BillingService/BusinessService.json
 create mode 100644 data/as/30174097/egov-location/boundary-data.json
 create mode 100644 data/as/30174097/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174097/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174123/BillingService/BusinessService.json
 create mode 100644 data/as/30174123/egov-location/boundary-data.json
 create mode 100644 data/as/30174123/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174123/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174125/BillingService/BusinessService.json
 create mode 100644 data/as/30174125/egov-location/boundary-data.json
 create mode 100644 data/as/30174125/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174125/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174133/BillingService/BusinessService.json
 create mode 100644 data/as/30174133/egov-location/boundary-data.json
 create mode 100644 data/as/30174133/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174133/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174139/BillingService/BusinessService.json
 create mode 100644 data/as/30174139/egov-location/boundary-data.json
 create mode 100644 data/as/30174139/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174139/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174143/BillingService/BusinessService.json
 create mode 100644 data/as/30174143/egov-location/boundary-data.json
 create mode 100644 data/as/30174143/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174143/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174150/BillingService/BusinessService.json
 create mode 100644 data/as/30174150/egov-location/boundary-data.json
 create mode 100644 data/as/30174150/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174150/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174158/BillingService/BusinessService.json
 create mode 100644 data/as/30174158/egov-location/boundary-data.json
 create mode 100644 data/as/30174158/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174158/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174165/BillingService/BusinessService.json
 create mode 100644 data/as/30174165/egov-location/boundary-data.json
 create mode 100644 data/as/30174165/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174165/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174178/BillingService/BusinessService.json
 create mode 100644 data/as/30174178/egov-location/boundary-data.json
 create mode 100644 data/as/30174178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174186/BillingService/BusinessService.json
 create mode 100644 data/as/30174186/egov-location/boundary-data.json
 create mode 100644 data/as/30174186/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174186/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174190/BillingService/BusinessService.json
 create mode 100644 data/as/30174190/egov-location/boundary-data.json
 create mode 100644 data/as/30174190/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174190/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174199/BillingService/BusinessService.json
 create mode 100644 data/as/30174199/egov-location/boundary-data.json
 create mode 100644 data/as/30174199/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174199/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174210/BillingService/BusinessService.json
 create mode 100644 data/as/30174210/egov-location/boundary-data.json
 create mode 100644 data/as/30174210/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174210/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174211/BillingService/BusinessService.json
 create mode 100644 data/as/30174211/egov-location/boundary-data.json
 create mode 100644 data/as/30174211/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174211/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174222/BillingService/BusinessService.json
 create mode 100644 data/as/30174222/egov-location/boundary-data.json
 create mode 100644 data/as/30174222/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174222/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174241/BillingService/BusinessService.json
 create mode 100644 data/as/30174241/egov-location/boundary-data.json
 create mode 100644 data/as/30174241/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174241/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174244/BillingService/BusinessService.json
 create mode 100644 data/as/30174244/egov-location/boundary-data.json
 create mode 100644 data/as/30174244/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174244/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174286/BillingService/BusinessService.json
 create mode 100644 data/as/30174286/egov-location/boundary-data.json
 create mode 100644 data/as/30174286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174291/BillingService/BusinessService.json
 create mode 100644 data/as/30174291/egov-location/boundary-data.json
 create mode 100644 data/as/30174291/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174291/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174314/BillingService/BusinessService.json
 create mode 100644 data/as/30174314/egov-location/boundary-data.json
 create mode 100644 data/as/30174314/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174314/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174344/BillingService/BusinessService.json
 create mode 100644 data/as/30174344/egov-location/boundary-data.json
 create mode 100644 data/as/30174344/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174344/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174357/BillingService/BusinessService.json
 create mode 100644 data/as/30174357/egov-location/boundary-data.json
 create mode 100644 data/as/30174357/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174357/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174375/BillingService/BusinessService.json
 create mode 100644 data/as/30174375/egov-location/boundary-data.json
 create mode 100644 data/as/30174375/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174375/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174407/BillingService/BusinessService.json
 create mode 100644 data/as/30174407/egov-location/boundary-data.json
 create mode 100644 data/as/30174407/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174407/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174416/BillingService/BusinessService.json
 create mode 100644 data/as/30174416/egov-location/boundary-data.json
 create mode 100644 data/as/30174416/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174416/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174419/BillingService/BusinessService.json
 create mode 100644 data/as/30174419/egov-location/boundary-data.json
 create mode 100644 data/as/30174419/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174419/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174439/BillingService/BusinessService.json
 create mode 100644 data/as/30174439/egov-location/boundary-data.json
 create mode 100644 data/as/30174439/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174439/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174442/BillingService/BusinessService.json
 create mode 100644 data/as/30174442/egov-location/boundary-data.json
 create mode 100644 data/as/30174442/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174442/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174454/BillingService/BusinessService.json
 create mode 100644 data/as/30174454/egov-location/boundary-data.json
 create mode 100644 data/as/30174454/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174454/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174538/BillingService/BusinessService.json
 create mode 100644 data/as/30174538/egov-location/boundary-data.json
 create mode 100644 data/as/30174538/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174538/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174541/BillingService/BusinessService.json
 create mode 100644 data/as/30174541/egov-location/boundary-data.json
 create mode 100644 data/as/30174541/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174541/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174546/BillingService/BusinessService.json
 create mode 100644 data/as/30174546/egov-location/boundary-data.json
 create mode 100644 data/as/30174546/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174546/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174562/BillingService/BusinessService.json
 create mode 100644 data/as/30174562/egov-location/boundary-data.json
 create mode 100644 data/as/30174562/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174562/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174577/BillingService/BusinessService.json
 create mode 100644 data/as/30174577/egov-location/boundary-data.json
 create mode 100644 data/as/30174577/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174577/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174593/BillingService/BusinessService.json
 create mode 100644 data/as/30174593/egov-location/boundary-data.json
 create mode 100644 data/as/30174593/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174593/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174610/BillingService/BusinessService.json
 create mode 100644 data/as/30174610/egov-location/boundary-data.json
 create mode 100644 data/as/30174610/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174610/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174622/BillingService/BusinessService.json
 create mode 100644 data/as/30174622/egov-location/boundary-data.json
 create mode 100644 data/as/30174622/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174622/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174633/BillingService/BusinessService.json
 create mode 100644 data/as/30174633/egov-location/boundary-data.json
 create mode 100644 data/as/30174633/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174633/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174651/BillingService/BusinessService.json
 create mode 100644 data/as/30174651/egov-location/boundary-data.json
 create mode 100644 data/as/30174651/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174651/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174677/BillingService/BusinessService.json
 create mode 100644 data/as/30174677/egov-location/boundary-data.json
 create mode 100644 data/as/30174677/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174677/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174688/BillingService/BusinessService.json
 create mode 100644 data/as/30174688/egov-location/boundary-data.json
 create mode 100644 data/as/30174688/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174688/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174694/BillingService/BusinessService.json
 create mode 100644 data/as/30174694/egov-location/boundary-data.json
 create mode 100644 data/as/30174694/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174694/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174699/BillingService/BusinessService.json
 create mode 100644 data/as/30174699/egov-location/boundary-data.json
 create mode 100644 data/as/30174699/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174699/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174700/BillingService/BusinessService.json
 create mode 100644 data/as/30174700/egov-location/boundary-data.json
 create mode 100644 data/as/30174700/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174700/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174721/BillingService/BusinessService.json
 create mode 100644 data/as/30174721/egov-location/boundary-data.json
 create mode 100644 data/as/30174721/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174721/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174729/BillingService/BusinessService.json
 create mode 100644 data/as/30174729/egov-location/boundary-data.json
 create mode 100644 data/as/30174729/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174729/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174732/BillingService/BusinessService.json
 create mode 100644 data/as/30174732/egov-location/boundary-data.json
 create mode 100644 data/as/30174732/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174732/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174740/BillingService/BusinessService.json
 create mode 100644 data/as/30174740/egov-location/boundary-data.json
 create mode 100644 data/as/30174740/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174740/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174745/BillingService/BusinessService.json
 create mode 100644 data/as/30174745/egov-location/boundary-data.json
 create mode 100644 data/as/30174745/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174745/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174747/BillingService/BusinessService.json
 create mode 100644 data/as/30174747/egov-location/boundary-data.json
 create mode 100644 data/as/30174747/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174747/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174796/BillingService/BusinessService.json
 create mode 100644 data/as/30174796/egov-location/boundary-data.json
 create mode 100644 data/as/30174796/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174796/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174826/BillingService/BusinessService.json
 create mode 100644 data/as/30174826/egov-location/boundary-data.json
 create mode 100644 data/as/30174826/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174826/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174847/BillingService/BusinessService.json
 create mode 100644 data/as/30174847/egov-location/boundary-data.json
 create mode 100644 data/as/30174847/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174847/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174854/BillingService/BusinessService.json
 create mode 100644 data/as/30174854/egov-location/boundary-data.json
 create mode 100644 data/as/30174854/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174854/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174863/BillingService/BusinessService.json
 create mode 100644 data/as/30174863/egov-location/boundary-data.json
 create mode 100644 data/as/30174863/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174863/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174870/BillingService/BusinessService.json
 create mode 100644 data/as/30174870/egov-location/boundary-data.json
 create mode 100644 data/as/30174870/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174870/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174887/BillingService/BusinessService.json
 create mode 100644 data/as/30174887/egov-location/boundary-data.json
 create mode 100644 data/as/30174887/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174887/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174894/BillingService/BusinessService.json
 create mode 100644 data/as/30174894/egov-location/boundary-data.json
 create mode 100644 data/as/30174894/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174894/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174961/BillingService/BusinessService.json
 create mode 100644 data/as/30174961/egov-location/boundary-data.json
 create mode 100644 data/as/30174961/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174961/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30174977/BillingService/BusinessService.json
 create mode 100644 data/as/30174977/egov-location/boundary-data.json
 create mode 100644 data/as/30174977/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30174977/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175021/BillingService/BusinessService.json
 create mode 100644 data/as/30175021/egov-location/boundary-data.json
 create mode 100644 data/as/30175021/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175021/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175053/BillingService/BusinessService.json
 create mode 100644 data/as/30175053/egov-location/boundary-data.json
 create mode 100644 data/as/30175053/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175053/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175075/BillingService/BusinessService.json
 create mode 100644 data/as/30175075/egov-location/boundary-data.json
 create mode 100644 data/as/30175075/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175075/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175155/BillingService/BusinessService.json
 create mode 100644 data/as/30175155/egov-location/boundary-data.json
 create mode 100644 data/as/30175155/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175155/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175169/BillingService/BusinessService.json
 create mode 100644 data/as/30175169/egov-location/boundary-data.json
 create mode 100644 data/as/30175169/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175169/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175190/BillingService/BusinessService.json
 create mode 100644 data/as/30175190/egov-location/boundary-data.json
 create mode 100644 data/as/30175190/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175190/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175203/BillingService/BusinessService.json
 create mode 100644 data/as/30175203/egov-location/boundary-data.json
 create mode 100644 data/as/30175203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175204/BillingService/BusinessService.json
 create mode 100644 data/as/30175204/egov-location/boundary-data.json
 create mode 100644 data/as/30175204/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175204/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175213/BillingService/BusinessService.json
 create mode 100644 data/as/30175213/egov-location/boundary-data.json
 create mode 100644 data/as/30175213/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175213/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175228/BillingService/BusinessService.json
 create mode 100644 data/as/30175228/egov-location/boundary-data.json
 create mode 100644 data/as/30175228/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175228/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175239/BillingService/BusinessService.json
 create mode 100644 data/as/30175239/egov-location/boundary-data.json
 create mode 100644 data/as/30175239/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175239/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175264/BillingService/BusinessService.json
 create mode 100644 data/as/30175264/egov-location/boundary-data.json
 create mode 100644 data/as/30175264/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175264/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175272/BillingService/BusinessService.json
 create mode 100644 data/as/30175272/egov-location/boundary-data.json
 create mode 100644 data/as/30175272/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175272/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175295/BillingService/BusinessService.json
 create mode 100644 data/as/30175295/egov-location/boundary-data.json
 create mode 100644 data/as/30175295/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175295/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175334/BillingService/BusinessService.json
 create mode 100644 data/as/30175334/egov-location/boundary-data.json
 create mode 100644 data/as/30175334/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175334/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175367/BillingService/BusinessService.json
 create mode 100644 data/as/30175367/egov-location/boundary-data.json
 create mode 100644 data/as/30175367/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175367/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175392/BillingService/BusinessService.json
 create mode 100644 data/as/30175392/egov-location/boundary-data.json
 create mode 100644 data/as/30175392/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175392/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175425/BillingService/BusinessService.json
 create mode 100644 data/as/30175425/egov-location/boundary-data.json
 create mode 100644 data/as/30175425/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175425/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175446/BillingService/BusinessService.json
 create mode 100644 data/as/30175446/egov-location/boundary-data.json
 create mode 100644 data/as/30175446/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175446/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175464/BillingService/BusinessService.json
 create mode 100644 data/as/30175464/egov-location/boundary-data.json
 create mode 100644 data/as/30175464/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175464/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175466/BillingService/BusinessService.json
 create mode 100644 data/as/30175466/egov-location/boundary-data.json
 create mode 100644 data/as/30175466/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175466/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175474/BillingService/BusinessService.json
 create mode 100644 data/as/30175474/egov-location/boundary-data.json
 create mode 100644 data/as/30175474/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175474/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175490/BillingService/BusinessService.json
 create mode 100644 data/as/30175490/egov-location/boundary-data.json
 create mode 100644 data/as/30175490/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175490/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175493/BillingService/BusinessService.json
 create mode 100644 data/as/30175493/egov-location/boundary-data.json
 create mode 100644 data/as/30175493/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175493/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175539/BillingService/BusinessService.json
 create mode 100644 data/as/30175539/egov-location/boundary-data.json
 create mode 100644 data/as/30175539/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175539/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175554/BillingService/BusinessService.json
 create mode 100644 data/as/30175554/egov-location/boundary-data.json
 create mode 100644 data/as/30175554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175635/BillingService/BusinessService.json
 create mode 100644 data/as/30175635/egov-location/boundary-data.json
 create mode 100644 data/as/30175635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175648/BillingService/BusinessService.json
 create mode 100644 data/as/30175648/egov-location/boundary-data.json
 create mode 100644 data/as/30175648/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175648/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175668/BillingService/BusinessService.json
 create mode 100644 data/as/30175668/egov-location/boundary-data.json
 create mode 100644 data/as/30175668/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175668/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175691/BillingService/BusinessService.json
 create mode 100644 data/as/30175691/egov-location/boundary-data.json
 create mode 100644 data/as/30175691/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175691/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175708/BillingService/BusinessService.json
 create mode 100644 data/as/30175708/egov-location/boundary-data.json
 create mode 100644 data/as/30175708/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175708/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175727/BillingService/BusinessService.json
 create mode 100644 data/as/30175727/egov-location/boundary-data.json
 create mode 100644 data/as/30175727/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175727/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175767/BillingService/BusinessService.json
 create mode 100644 data/as/30175767/egov-location/boundary-data.json
 create mode 100644 data/as/30175767/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175767/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175783/BillingService/BusinessService.json
 create mode 100644 data/as/30175783/egov-location/boundary-data.json
 create mode 100644 data/as/30175783/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175783/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175784/BillingService/BusinessService.json
 create mode 100644 data/as/30175784/egov-location/boundary-data.json
 create mode 100644 data/as/30175784/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175784/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175795/BillingService/BusinessService.json
 create mode 100644 data/as/30175795/egov-location/boundary-data.json
 create mode 100644 data/as/30175795/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175795/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175807/BillingService/BusinessService.json
 create mode 100644 data/as/30175807/egov-location/boundary-data.json
 create mode 100644 data/as/30175807/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175807/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175812/BillingService/BusinessService.json
 create mode 100644 data/as/30175812/egov-location/boundary-data.json
 create mode 100644 data/as/30175812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175821/BillingService/BusinessService.json
 create mode 100644 data/as/30175821/egov-location/boundary-data.json
 create mode 100644 data/as/30175821/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175821/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175827/BillingService/BusinessService.json
 create mode 100644 data/as/30175827/egov-location/boundary-data.json
 create mode 100644 data/as/30175827/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175827/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175831/BillingService/BusinessService.json
 create mode 100644 data/as/30175831/egov-location/boundary-data.json
 create mode 100644 data/as/30175831/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175831/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175853/BillingService/BusinessService.json
 create mode 100644 data/as/30175853/egov-location/boundary-data.json
 create mode 100644 data/as/30175853/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175853/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175854/BillingService/BusinessService.json
 create mode 100644 data/as/30175854/egov-location/boundary-data.json
 create mode 100644 data/as/30175854/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175854/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175867/BillingService/BusinessService.json
 create mode 100644 data/as/30175867/egov-location/boundary-data.json
 create mode 100644 data/as/30175867/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175867/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175876/BillingService/BusinessService.json
 create mode 100644 data/as/30175876/egov-location/boundary-data.json
 create mode 100644 data/as/30175876/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175876/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175883/BillingService/BusinessService.json
 create mode 100644 data/as/30175883/egov-location/boundary-data.json
 create mode 100644 data/as/30175883/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175883/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175888/BillingService/BusinessService.json
 create mode 100644 data/as/30175888/egov-location/boundary-data.json
 create mode 100644 data/as/30175888/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175888/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175891/BillingService/BusinessService.json
 create mode 100644 data/as/30175891/egov-location/boundary-data.json
 create mode 100644 data/as/30175891/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175891/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175904/BillingService/BusinessService.json
 create mode 100644 data/as/30175904/egov-location/boundary-data.json
 create mode 100644 data/as/30175904/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175904/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175917/BillingService/BusinessService.json
 create mode 100644 data/as/30175917/egov-location/boundary-data.json
 create mode 100644 data/as/30175917/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175917/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30175983/BillingService/BusinessService.json
 create mode 100644 data/as/30175983/egov-location/boundary-data.json
 create mode 100644 data/as/30175983/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30175983/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176038/BillingService/BusinessService.json
 create mode 100644 data/as/30176038/egov-location/boundary-data.json
 create mode 100644 data/as/30176038/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176038/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176114/BillingService/BusinessService.json
 create mode 100644 data/as/30176114/egov-location/boundary-data.json
 create mode 100644 data/as/30176114/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176114/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176117/BillingService/BusinessService.json
 create mode 100644 data/as/30176117/egov-location/boundary-data.json
 create mode 100644 data/as/30176117/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176117/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176156/BillingService/BusinessService.json
 create mode 100644 data/as/30176156/egov-location/boundary-data.json
 create mode 100644 data/as/30176156/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176156/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176170/BillingService/BusinessService.json
 create mode 100644 data/as/30176170/egov-location/boundary-data.json
 create mode 100644 data/as/30176170/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176170/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176178/BillingService/BusinessService.json
 create mode 100644 data/as/30176178/egov-location/boundary-data.json
 create mode 100644 data/as/30176178/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176178/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176209/BillingService/BusinessService.json
 create mode 100644 data/as/30176209/egov-location/boundary-data.json
 create mode 100644 data/as/30176209/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176209/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176222/BillingService/BusinessService.json
 create mode 100644 data/as/30176222/egov-location/boundary-data.json
 create mode 100644 data/as/30176222/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176222/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176252/BillingService/BusinessService.json
 create mode 100644 data/as/30176252/egov-location/boundary-data.json
 create mode 100644 data/as/30176252/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176252/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176279/BillingService/BusinessService.json
 create mode 100644 data/as/30176279/egov-location/boundary-data.json
 create mode 100644 data/as/30176279/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176279/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176310/BillingService/BusinessService.json
 create mode 100644 data/as/30176310/egov-location/boundary-data.json
 create mode 100644 data/as/30176310/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176310/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176350/BillingService/BusinessService.json
 create mode 100644 data/as/30176350/egov-location/boundary-data.json
 create mode 100644 data/as/30176350/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176350/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176394/BillingService/BusinessService.json
 create mode 100644 data/as/30176394/egov-location/boundary-data.json
 create mode 100644 data/as/30176394/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176394/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176403/BillingService/BusinessService.json
 create mode 100644 data/as/30176403/egov-location/boundary-data.json
 create mode 100644 data/as/30176403/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176403/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176503/BillingService/BusinessService.json
 create mode 100644 data/as/30176503/egov-location/boundary-data.json
 create mode 100644 data/as/30176503/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176503/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176512/BillingService/BusinessService.json
 create mode 100644 data/as/30176512/egov-location/boundary-data.json
 create mode 100644 data/as/30176512/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176512/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176517/BillingService/BusinessService.json
 create mode 100644 data/as/30176517/egov-location/boundary-data.json
 create mode 100644 data/as/30176517/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176517/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176525/BillingService/BusinessService.json
 create mode 100644 data/as/30176525/egov-location/boundary-data.json
 create mode 100644 data/as/30176525/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176525/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176552/BillingService/BusinessService.json
 create mode 100644 data/as/30176552/egov-location/boundary-data.json
 create mode 100644 data/as/30176552/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176552/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176563/BillingService/BusinessService.json
 create mode 100644 data/as/30176563/egov-location/boundary-data.json
 create mode 100644 data/as/30176563/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176563/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176575/BillingService/BusinessService.json
 create mode 100644 data/as/30176575/egov-location/boundary-data.json
 create mode 100644 data/as/30176575/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176575/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176589/BillingService/BusinessService.json
 create mode 100644 data/as/30176589/egov-location/boundary-data.json
 create mode 100644 data/as/30176589/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176589/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176605/BillingService/BusinessService.json
 create mode 100644 data/as/30176605/egov-location/boundary-data.json
 create mode 100644 data/as/30176605/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176605/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176670/BillingService/BusinessService.json
 create mode 100644 data/as/30176670/egov-location/boundary-data.json
 create mode 100644 data/as/30176670/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176670/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176673/BillingService/BusinessService.json
 create mode 100644 data/as/30176673/egov-location/boundary-data.json
 create mode 100644 data/as/30176673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176676/BillingService/BusinessService.json
 create mode 100644 data/as/30176676/egov-location/boundary-data.json
 create mode 100644 data/as/30176676/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176676/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176679/BillingService/BusinessService.json
 create mode 100644 data/as/30176679/egov-location/boundary-data.json
 create mode 100644 data/as/30176679/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176679/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176683/BillingService/BusinessService.json
 create mode 100644 data/as/30176683/egov-location/boundary-data.json
 create mode 100644 data/as/30176683/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176683/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176709/BillingService/BusinessService.json
 create mode 100644 data/as/30176709/egov-location/boundary-data.json
 create mode 100644 data/as/30176709/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176709/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176714/BillingService/BusinessService.json
 create mode 100644 data/as/30176714/egov-location/boundary-data.json
 create mode 100644 data/as/30176714/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176714/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176720/BillingService/BusinessService.json
 create mode 100644 data/as/30176720/egov-location/boundary-data.json
 create mode 100644 data/as/30176720/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176720/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30176756/BillingService/BusinessService.json
 create mode 100644 data/as/30176756/egov-location/boundary-data.json
 create mode 100644 data/as/30176756/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30176756/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177227/BillingService/BusinessService.json
 create mode 100644 data/as/30177227/egov-location/boundary-data.json
 create mode 100644 data/as/30177227/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177227/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177242/BillingService/BusinessService.json
 create mode 100644 data/as/30177242/egov-location/boundary-data.json
 create mode 100644 data/as/30177242/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177242/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177275/BillingService/BusinessService.json
 create mode 100644 data/as/30177275/egov-location/boundary-data.json
 create mode 100644 data/as/30177275/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177275/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177297/BillingService/BusinessService.json
 create mode 100644 data/as/30177297/egov-location/boundary-data.json
 create mode 100644 data/as/30177297/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177297/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177314/BillingService/BusinessService.json
 create mode 100644 data/as/30177314/egov-location/boundary-data.json
 create mode 100644 data/as/30177314/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177314/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177334/BillingService/BusinessService.json
 create mode 100644 data/as/30177334/egov-location/boundary-data.json
 create mode 100644 data/as/30177334/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177334/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177375/BillingService/BusinessService.json
 create mode 100644 data/as/30177375/egov-location/boundary-data.json
 create mode 100644 data/as/30177375/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177375/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177929/BillingService/BusinessService.json
 create mode 100644 data/as/30177929/egov-location/boundary-data.json
 create mode 100644 data/as/30177929/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177929/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177971/BillingService/BusinessService.json
 create mode 100644 data/as/30177971/egov-location/boundary-data.json
 create mode 100644 data/as/30177971/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177971/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30177999/BillingService/BusinessService.json
 create mode 100644 data/as/30177999/egov-location/boundary-data.json
 create mode 100644 data/as/30177999/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30177999/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178023/BillingService/BusinessService.json
 create mode 100644 data/as/30178023/egov-location/boundary-data.json
 create mode 100644 data/as/30178023/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178023/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178056/BillingService/BusinessService.json
 create mode 100644 data/as/30178056/egov-location/boundary-data.json
 create mode 100644 data/as/30178056/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178056/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178092/BillingService/BusinessService.json
 create mode 100644 data/as/30178092/egov-location/boundary-data.json
 create mode 100644 data/as/30178092/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178092/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178124/BillingService/BusinessService.json
 create mode 100644 data/as/30178124/egov-location/boundary-data.json
 create mode 100644 data/as/30178124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178175/BillingService/BusinessService.json
 create mode 100644 data/as/30178175/egov-location/boundary-data.json
 create mode 100644 data/as/30178175/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178175/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178287/BillingService/BusinessService.json
 create mode 100644 data/as/30178287/egov-location/boundary-data.json
 create mode 100644 data/as/30178287/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178287/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178310/BillingService/BusinessService.json
 create mode 100644 data/as/30178310/egov-location/boundary-data.json
 create mode 100644 data/as/30178310/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178310/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178331/BillingService/BusinessService.json
 create mode 100644 data/as/30178331/egov-location/boundary-data.json
 create mode 100644 data/as/30178331/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178331/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178371/BillingService/BusinessService.json
 create mode 100644 data/as/30178371/egov-location/boundary-data.json
 create mode 100644 data/as/30178371/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178371/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178397/BillingService/BusinessService.json
 create mode 100644 data/as/30178397/egov-location/boundary-data.json
 create mode 100644 data/as/30178397/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178397/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178423/BillingService/BusinessService.json
 create mode 100644 data/as/30178423/egov-location/boundary-data.json
 create mode 100644 data/as/30178423/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178423/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178440/BillingService/BusinessService.json
 create mode 100644 data/as/30178440/egov-location/boundary-data.json
 create mode 100644 data/as/30178440/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178440/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178942/BillingService/BusinessService.json
 create mode 100644 data/as/30178942/egov-location/boundary-data.json
 create mode 100644 data/as/30178942/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178942/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30178977/BillingService/BusinessService.json
 create mode 100644 data/as/30178977/egov-location/boundary-data.json
 create mode 100644 data/as/30178977/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30178977/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179000/BillingService/BusinessService.json
 create mode 100644 data/as/30179000/egov-location/boundary-data.json
 create mode 100644 data/as/30179000/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179000/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179124/BillingService/BusinessService.json
 create mode 100644 data/as/30179124/egov-location/boundary-data.json
 create mode 100644 data/as/30179124/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179124/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179165/BillingService/BusinessService.json
 create mode 100644 data/as/30179165/egov-location/boundary-data.json
 create mode 100644 data/as/30179165/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179165/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179209/BillingService/BusinessService.json
 create mode 100644 data/as/30179209/egov-location/boundary-data.json
 create mode 100644 data/as/30179209/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179209/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179232/BillingService/BusinessService.json
 create mode 100644 data/as/30179232/egov-location/boundary-data.json
 create mode 100644 data/as/30179232/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179232/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179397/BillingService/BusinessService.json
 create mode 100644 data/as/30179397/egov-location/boundary-data.json
 create mode 100644 data/as/30179397/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179397/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179439/BillingService/BusinessService.json
 create mode 100644 data/as/30179439/egov-location/boundary-data.json
 create mode 100644 data/as/30179439/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179439/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179473/BillingService/BusinessService.json
 create mode 100644 data/as/30179473/egov-location/boundary-data.json
 create mode 100644 data/as/30179473/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179473/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179510/BillingService/BusinessService.json
 create mode 100644 data/as/30179510/egov-location/boundary-data.json
 create mode 100644 data/as/30179510/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179510/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179533/BillingService/BusinessService.json
 create mode 100644 data/as/30179533/egov-location/boundary-data.json
 create mode 100644 data/as/30179533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179578/BillingService/BusinessService.json
 create mode 100644 data/as/30179578/egov-location/boundary-data.json
 create mode 100644 data/as/30179578/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179578/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179689/BillingService/BusinessService.json
 create mode 100644 data/as/30179689/egov-location/boundary-data.json
 create mode 100644 data/as/30179689/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179689/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179724/BillingService/BusinessService.json
 create mode 100644 data/as/30179724/egov-location/boundary-data.json
 create mode 100644 data/as/30179724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179739/BillingService/BusinessService.json
 create mode 100644 data/as/30179739/egov-location/boundary-data.json
 create mode 100644 data/as/30179739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179767/BillingService/BusinessService.json
 create mode 100644 data/as/30179767/egov-location/boundary-data.json
 create mode 100644 data/as/30179767/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179767/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179793/BillingService/BusinessService.json
 create mode 100644 data/as/30179793/egov-location/boundary-data.json
 create mode 100644 data/as/30179793/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179793/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179802/BillingService/BusinessService.json
 create mode 100644 data/as/30179802/egov-location/boundary-data.json
 create mode 100644 data/as/30179802/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179802/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179808/BillingService/BusinessService.json
 create mode 100644 data/as/30179808/egov-location/boundary-data.json
 create mode 100644 data/as/30179808/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179808/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179812/BillingService/BusinessService.json
 create mode 100644 data/as/30179812/egov-location/boundary-data.json
 create mode 100644 data/as/30179812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179815/BillingService/BusinessService.json
 create mode 100644 data/as/30179815/egov-location/boundary-data.json
 create mode 100644 data/as/30179815/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179815/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30179821/BillingService/BusinessService.json
 create mode 100644 data/as/30179821/egov-location/boundary-data.json
 create mode 100644 data/as/30179821/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30179821/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180631/BillingService/BusinessService.json
 create mode 100644 data/as/30180631/egov-location/boundary-data.json
 create mode 100644 data/as/30180631/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180631/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180654/BillingService/BusinessService.json
 create mode 100644 data/as/30180654/egov-location/boundary-data.json
 create mode 100644 data/as/30180654/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180654/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180663/BillingService/BusinessService.json
 create mode 100644 data/as/30180663/egov-location/boundary-data.json
 create mode 100644 data/as/30180663/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180663/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180675/BillingService/BusinessService.json
 create mode 100644 data/as/30180675/egov-location/boundary-data.json
 create mode 100644 data/as/30180675/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180675/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180698/BillingService/BusinessService.json
 create mode 100644 data/as/30180698/egov-location/boundary-data.json
 create mode 100644 data/as/30180698/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180698/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180724/BillingService/BusinessService.json
 create mode 100644 data/as/30180724/egov-location/boundary-data.json
 create mode 100644 data/as/30180724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180855/BillingService/BusinessService.json
 create mode 100644 data/as/30180855/egov-location/boundary-data.json
 create mode 100644 data/as/30180855/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180855/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180870/BillingService/BusinessService.json
 create mode 100644 data/as/30180870/egov-location/boundary-data.json
 create mode 100644 data/as/30180870/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180870/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180952/BillingService/BusinessService.json
 create mode 100644 data/as/30180952/egov-location/boundary-data.json
 create mode 100644 data/as/30180952/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180952/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30180965/BillingService/BusinessService.json
 create mode 100644 data/as/30180965/egov-location/boundary-data.json
 create mode 100644 data/as/30180965/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30180965/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181077/BillingService/BusinessService.json
 create mode 100644 data/as/30181077/egov-location/boundary-data.json
 create mode 100644 data/as/30181077/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181077/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181091/BillingService/BusinessService.json
 create mode 100644 data/as/30181091/egov-location/boundary-data.json
 create mode 100644 data/as/30181091/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181091/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181099/BillingService/BusinessService.json
 create mode 100644 data/as/30181099/egov-location/boundary-data.json
 create mode 100644 data/as/30181099/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181099/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181126/BillingService/BusinessService.json
 create mode 100644 data/as/30181126/egov-location/boundary-data.json
 create mode 100644 data/as/30181126/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181126/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181144/BillingService/BusinessService.json
 create mode 100644 data/as/30181144/egov-location/boundary-data.json
 create mode 100644 data/as/30181144/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181144/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181145/BillingService/BusinessService.json
 create mode 100644 data/as/30181145/egov-location/boundary-data.json
 create mode 100644 data/as/30181145/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181145/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181168/BillingService/BusinessService.json
 create mode 100644 data/as/30181168/egov-location/boundary-data.json
 create mode 100644 data/as/30181168/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181168/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181188/BillingService/BusinessService.json
 create mode 100644 data/as/30181188/egov-location/boundary-data.json
 create mode 100644 data/as/30181188/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181188/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181246/BillingService/BusinessService.json
 create mode 100644 data/as/30181246/egov-location/boundary-data.json
 create mode 100644 data/as/30181246/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181246/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181257/BillingService/BusinessService.json
 create mode 100644 data/as/30181257/egov-location/boundary-data.json
 create mode 100644 data/as/30181257/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181257/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181268/BillingService/BusinessService.json
 create mode 100644 data/as/30181268/egov-location/boundary-data.json
 create mode 100644 data/as/30181268/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181268/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181293/BillingService/BusinessService.json
 create mode 100644 data/as/30181293/egov-location/boundary-data.json
 create mode 100644 data/as/30181293/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181293/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181327/BillingService/BusinessService.json
 create mode 100644 data/as/30181327/egov-location/boundary-data.json
 create mode 100644 data/as/30181327/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181327/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181400/BillingService/BusinessService.json
 create mode 100644 data/as/30181400/egov-location/boundary-data.json
 create mode 100644 data/as/30181400/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181400/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181411/BillingService/BusinessService.json
 create mode 100644 data/as/30181411/egov-location/boundary-data.json
 create mode 100644 data/as/30181411/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181411/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181434/BillingService/BusinessService.json
 create mode 100644 data/as/30181434/egov-location/boundary-data.json
 create mode 100644 data/as/30181434/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181434/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181444/BillingService/BusinessService.json
 create mode 100644 data/as/30181444/egov-location/boundary-data.json
 create mode 100644 data/as/30181444/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181444/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181457/BillingService/BusinessService.json
 create mode 100644 data/as/30181457/egov-location/boundary-data.json
 create mode 100644 data/as/30181457/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181457/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181562/BillingService/BusinessService.json
 create mode 100644 data/as/30181562/egov-location/boundary-data.json
 create mode 100644 data/as/30181562/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181562/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181575/BillingService/BusinessService.json
 create mode 100644 data/as/30181575/egov-location/boundary-data.json
 create mode 100644 data/as/30181575/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181575/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181597/BillingService/BusinessService.json
 create mode 100644 data/as/30181597/egov-location/boundary-data.json
 create mode 100644 data/as/30181597/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181597/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181604/BillingService/BusinessService.json
 create mode 100644 data/as/30181604/egov-location/boundary-data.json
 create mode 100644 data/as/30181604/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181604/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181615/BillingService/BusinessService.json
 create mode 100644 data/as/30181615/egov-location/boundary-data.json
 create mode 100644 data/as/30181615/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181615/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181621/BillingService/BusinessService.json
 create mode 100644 data/as/30181621/egov-location/boundary-data.json
 create mode 100644 data/as/30181621/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181621/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181628/BillingService/BusinessService.json
 create mode 100644 data/as/30181628/egov-location/boundary-data.json
 create mode 100644 data/as/30181628/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181628/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181639/BillingService/BusinessService.json
 create mode 100644 data/as/30181639/egov-location/boundary-data.json
 create mode 100644 data/as/30181639/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181639/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181769/BillingService/BusinessService.json
 create mode 100644 data/as/30181769/egov-location/boundary-data.json
 create mode 100644 data/as/30181769/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181769/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181824/BillingService/BusinessService.json
 create mode 100644 data/as/30181824/egov-location/boundary-data.json
 create mode 100644 data/as/30181824/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181824/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181850/BillingService/BusinessService.json
 create mode 100644 data/as/30181850/egov-location/boundary-data.json
 create mode 100644 data/as/30181850/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181850/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181892/BillingService/BusinessService.json
 create mode 100644 data/as/30181892/egov-location/boundary-data.json
 create mode 100644 data/as/30181892/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181892/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/30143323/BillingService/BusinessService.json b/data/as/30143323/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a3c4bc7c10
--- /dev/null
+++ b/data/as/30143323/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143323",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143323/egov-location/boundary-data.json b/data/as/30143323/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ab0e5b2293
--- /dev/null
+++ b/data/as/30143323/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143323",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JYOTINAGAR PWSS (NEW)",
+                "localname": "JYOTINAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143323",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JYOTINAGAR PWSS (NEW)",
+                        "localname": "JYOTINAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JYOTINAGAR PWSS (NEW)",
+                "localname": "JYOTINAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143323",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JYOTINAGAR PWSS (NEW)",
+                        "localname": "JYOTINAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143323/ws-services-calculation/Penalty.json b/data/as/30143323/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..31be140926
--- /dev/null
+++ b/data/as/30143323/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143323",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143323/ws-services-calculation/WCBillingSlab.json b/data/as/30143323/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fba3fba0ce
--- /dev/null
+++ b/data/as/30143323/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143323",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143328/BillingService/BusinessService.json b/data/as/30143328/BillingService/BusinessService.json
new file mode 100644
index 0000000000..daf20c9426
--- /dev/null
+++ b/data/as/30143328/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143328",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143328/egov-location/boundary-data.json b/data/as/30143328/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dbff9cb693
--- /dev/null
+++ b/data/as/30143328/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143328",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATI CAMP PWSS (NEW)",
+                "localname": "HATI CAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143328",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATI CAMP PWSS (NEW)",
+                        "localname": "HATI CAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATI CAMP PWSS (NEW)",
+                "localname": "HATI CAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143328",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATI CAMP PWSS (NEW)",
+                        "localname": "HATI CAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143328/ws-services-calculation/Penalty.json b/data/as/30143328/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc35cf89cc
--- /dev/null
+++ b/data/as/30143328/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143328",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143328/ws-services-calculation/WCBillingSlab.json b/data/as/30143328/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c7689a6702
--- /dev/null
+++ b/data/as/30143328/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143328",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143496/BillingService/BusinessService.json b/data/as/30143496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..230a0fb08c
--- /dev/null
+++ b/data/as/30143496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143496/egov-location/boundary-data.json b/data/as/30143496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4050bd7de7
--- /dev/null
+++ b/data/as/30143496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARIJA MANIKPUR PWSS (NEW)",
+                "localname": "KHARIJA MANIKPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARIJA MANIKPUR PWSS (NEW)",
+                        "localname": "KHARIJA MANIKPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARIJA MANIKPUR PWSS (NEW)",
+                "localname": "KHARIJA MANIKPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARIJA MANIKPUR PWSS (NEW)",
+                        "localname": "KHARIJA MANIKPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143496/ws-services-calculation/Penalty.json b/data/as/30143496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d8aa2d4f4e
--- /dev/null
+++ b/data/as/30143496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143496/ws-services-calculation/WCBillingSlab.json b/data/as/30143496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bbeda3a5d0
--- /dev/null
+++ b/data/as/30143496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143504/BillingService/BusinessService.json b/data/as/30143504/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d557af2010
--- /dev/null
+++ b/data/as/30143504/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143504",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143504/egov-location/boundary-data.json b/data/as/30143504/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e16225ba29
--- /dev/null
+++ b/data/as/30143504/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143504",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA PWSS (NEW)",
+                "localname": "TUKURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143504",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA PWSS (NEW)",
+                        "localname": "TUKURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TUKURA PWSS (NEW)",
+                "localname": "TUKURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143504",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TUKURA PWSS (NEW)",
+                        "localname": "TUKURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143504/ws-services-calculation/Penalty.json b/data/as/30143504/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5f324db9e5
--- /dev/null
+++ b/data/as/30143504/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143504",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143504/ws-services-calculation/WCBillingSlab.json b/data/as/30143504/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13baee1daa
--- /dev/null
+++ b/data/as/30143504/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143504",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143512/BillingService/BusinessService.json b/data/as/30143512/BillingService/BusinessService.json
new file mode 100644
index 0000000000..725ef56272
--- /dev/null
+++ b/data/as/30143512/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143512",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143512/egov-location/boundary-data.json b/data/as/30143512/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1d21ab0f61
--- /dev/null
+++ b/data/as/30143512/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143512",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI II PWSS (NEW)",
+                "localname": "DIGHALI II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143512",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI II PWSS (NEW)",
+                        "localname": "DIGHALI II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI II PWSS (NEW)",
+                "localname": "DIGHALI II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143512",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI II PWSS (NEW)",
+                        "localname": "DIGHALI II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143512/ws-services-calculation/Penalty.json b/data/as/30143512/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d5be471c6
--- /dev/null
+++ b/data/as/30143512/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143512",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143512/ws-services-calculation/WCBillingSlab.json b/data/as/30143512/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e3ddc215b0
--- /dev/null
+++ b/data/as/30143512/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143512",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143523/BillingService/BusinessService.json b/data/as/30143523/BillingService/BusinessService.json
new file mode 100644
index 0000000000..999e0710ad
--- /dev/null
+++ b/data/as/30143523/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30143523",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143523/egov-location/boundary-data.json b/data/as/30143523/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0a7d69a2b9
--- /dev/null
+++ b/data/as/30143523/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30143523",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANIYAPARA PWSS (NEW)",
+                "localname": "BANIYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143523",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANIYAPARA PWSS (NEW)",
+                        "localname": "BANIYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANIYAPARA PWSS (NEW)",
+                "localname": "BANIYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30143523",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANIYAPARA PWSS (NEW)",
+                        "localname": "BANIYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143523/ws-services-calculation/Penalty.json b/data/as/30143523/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8eb1a2e20f
--- /dev/null
+++ b/data/as/30143523/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30143523",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30143523/ws-services-calculation/WCBillingSlab.json b/data/as/30143523/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..daed467edf
--- /dev/null
+++ b/data/as/30143523/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30143523",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30144955/BillingService/BusinessService.json b/data/as/30144955/BillingService/BusinessService.json
new file mode 100644
index 0000000000..caf10556c1
--- /dev/null
+++ b/data/as/30144955/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30144955",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30144955/egov-location/boundary-data.json b/data/as/30144955/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d8ce0dd320
--- /dev/null
+++ b/data/as/30144955/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30144955",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BINDUKURI NO. 2 PWSS",
+                "localname": "BINDUKURI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30144955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BINDUKURI NO. 2 PWSS",
+                        "localname": "BINDUKURI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BINDUKURI NO. 2 PWSS",
+                "localname": "BINDUKURI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30144955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BINDUKURI NO. 2 PWSS",
+                        "localname": "BINDUKURI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30144955/ws-services-calculation/Penalty.json b/data/as/30144955/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc4f9a075d
--- /dev/null
+++ b/data/as/30144955/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30144955",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30144955/ws-services-calculation/WCBillingSlab.json b/data/as/30144955/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f35b425b0d
--- /dev/null
+++ b/data/as/30144955/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30144955",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30145080/BillingService/BusinessService.json b/data/as/30145080/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ff7648a34
--- /dev/null
+++ b/data/as/30145080/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30145080",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30145080/egov-location/boundary-data.json b/data/as/30145080/egov-location/boundary-data.json
new file mode 100644
index 0000000000..656e255b60
--- /dev/null
+++ b/data/as/30145080/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30145080",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR DHEKIDAL PWSS",
+                "localname": "UHANI PATHAR DHEKIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30145080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR DHEKIDAL PWSS",
+                        "localname": "UHANI PATHAR DHEKIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR DHEKIDAL PWSS",
+                "localname": "UHANI PATHAR DHEKIDAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30145080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR DHEKIDAL PWSS",
+                        "localname": "UHANI PATHAR DHEKIDAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30145080/ws-services-calculation/Penalty.json b/data/as/30145080/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d42e5a7b7
--- /dev/null
+++ b/data/as/30145080/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30145080",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30145080/ws-services-calculation/WCBillingSlab.json b/data/as/30145080/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c0184c9fbe
--- /dev/null
+++ b/data/as/30145080/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30145080",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146239/BillingService/BusinessService.json b/data/as/30146239/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd2d029d47
--- /dev/null
+++ b/data/as/30146239/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30146239",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146239/egov-location/boundary-data.json b/data/as/30146239/egov-location/boundary-data.json
new file mode 100644
index 0000000000..076abd91f3
--- /dev/null
+++ b/data/as/30146239/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30146239",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                "localname": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                        "localname": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                "localname": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                        "localname": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146239/ws-services-calculation/Penalty.json b/data/as/30146239/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2805a0e56
--- /dev/null
+++ b/data/as/30146239/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30146239",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146239/ws-services-calculation/WCBillingSlab.json b/data/as/30146239/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c043695e4
--- /dev/null
+++ b/data/as/30146239/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30146239",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146477/BillingService/BusinessService.json b/data/as/30146477/BillingService/BusinessService.json
new file mode 100644
index 0000000000..665bf0e55f
--- /dev/null
+++ b/data/as/30146477/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30146477",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146477/egov-location/boundary-data.json b/data/as/30146477/egov-location/boundary-data.json
new file mode 100644
index 0000000000..298257383d
--- /dev/null
+++ b/data/as/30146477/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30146477",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                "localname": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                        "localname": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                "localname": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146477",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                        "localname": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146477/ws-services-calculation/Penalty.json b/data/as/30146477/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f86a5b317
--- /dev/null
+++ b/data/as/30146477/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30146477",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146477/ws-services-calculation/WCBillingSlab.json b/data/as/30146477/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1d309791e8
--- /dev/null
+++ b/data/as/30146477/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30146477",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146517/BillingService/BusinessService.json b/data/as/30146517/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4b7ea9f06f
--- /dev/null
+++ b/data/as/30146517/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30146517",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146517/egov-location/boundary-data.json b/data/as/30146517/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2457f47906
--- /dev/null
+++ b/data/as/30146517/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30146517",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGADOBA PWSS (NEW)",
+                "localname": "RONGADOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGADOBA PWSS (NEW)",
+                        "localname": "RONGADOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGADOBA PWSS (NEW)",
+                "localname": "RONGADOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGADOBA PWSS (NEW)",
+                        "localname": "RONGADOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146517/ws-services-calculation/Penalty.json b/data/as/30146517/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b46d9e9a1c
--- /dev/null
+++ b/data/as/30146517/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30146517",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146517/ws-services-calculation/WCBillingSlab.json b/data/as/30146517/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54075fcdca
--- /dev/null
+++ b/data/as/30146517/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30146517",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146665/BillingService/BusinessService.json b/data/as/30146665/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5416e87858
--- /dev/null
+++ b/data/as/30146665/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30146665",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146665/egov-location/boundary-data.json b/data/as/30146665/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6903d6e5f7
--- /dev/null
+++ b/data/as/30146665/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30146665",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHBARI GAON PWSS",
+                "localname": "BAHBARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHBARI GAON PWSS",
+                        "localname": "BAHBARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHBARI GAON PWSS",
+                "localname": "BAHBARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30146665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHBARI GAON PWSS",
+                        "localname": "BAHBARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146665/ws-services-calculation/Penalty.json b/data/as/30146665/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c247e97ba9
--- /dev/null
+++ b/data/as/30146665/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30146665",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30146665/ws-services-calculation/WCBillingSlab.json b/data/as/30146665/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..88df3a5dba
--- /dev/null
+++ b/data/as/30146665/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30146665",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148255/BillingService/BusinessService.json b/data/as/30148255/BillingService/BusinessService.json
new file mode 100644
index 0000000000..718b422475
--- /dev/null
+++ b/data/as/30148255/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30148255",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148255/egov-location/boundary-data.json b/data/as/30148255/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd748d3b04
--- /dev/null
+++ b/data/as/30148255/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30148255",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOILAALI NO.1",
+                "localname": "MOILAALI NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148255",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOILAALI NO.1",
+                        "localname": "MOILAALI NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOILAALI NO.1",
+                "localname": "MOILAALI NO.1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148255",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOILAALI NO.1",
+                        "localname": "MOILAALI NO.1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148255/ws-services-calculation/Penalty.json b/data/as/30148255/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d11250a67e
--- /dev/null
+++ b/data/as/30148255/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30148255",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148255/ws-services-calculation/WCBillingSlab.json b/data/as/30148255/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..263efa92d8
--- /dev/null
+++ b/data/as/30148255/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30148255",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148279/BillingService/BusinessService.json b/data/as/30148279/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9339d1d1a0
--- /dev/null
+++ b/data/as/30148279/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30148279",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148279/egov-location/boundary-data.json b/data/as/30148279/egov-location/boundary-data.json
new file mode 100644
index 0000000000..302926a5ab
--- /dev/null
+++ b/data/as/30148279/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30148279",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DURABARI PWSS",
+                "localname": "DURABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148279",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DURABARI PWSS",
+                        "localname": "DURABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DURABARI PWSS",
+                "localname": "DURABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148279",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DURABARI PWSS",
+                        "localname": "DURABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148279/ws-services-calculation/Penalty.json b/data/as/30148279/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b214fb620
--- /dev/null
+++ b/data/as/30148279/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30148279",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148279/ws-services-calculation/WCBillingSlab.json b/data/as/30148279/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7dfb4e1535
--- /dev/null
+++ b/data/as/30148279/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30148279",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148838/BillingService/BusinessService.json b/data/as/30148838/BillingService/BusinessService.json
new file mode 100644
index 0000000000..05c15b7812
--- /dev/null
+++ b/data/as/30148838/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30148838",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148838/egov-location/boundary-data.json b/data/as/30148838/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae0753bd08
--- /dev/null
+++ b/data/as/30148838/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30148838",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                "localname": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148838",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                        "localname": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                "localname": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148838",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                        "localname": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148838/ws-services-calculation/Penalty.json b/data/as/30148838/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbce67ae5b
--- /dev/null
+++ b/data/as/30148838/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30148838",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148838/ws-services-calculation/WCBillingSlab.json b/data/as/30148838/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0fbd034a75
--- /dev/null
+++ b/data/as/30148838/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30148838",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148938/BillingService/BusinessService.json b/data/as/30148938/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad242a223b
--- /dev/null
+++ b/data/as/30148938/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30148938",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148938/egov-location/boundary-data.json b/data/as/30148938/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3d4a67b1f4
--- /dev/null
+++ b/data/as/30148938/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30148938",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                "localname": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148938",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                        "localname": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                "localname": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148938",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                        "localname": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148938/ws-services-calculation/Penalty.json b/data/as/30148938/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd628cbea5
--- /dev/null
+++ b/data/as/30148938/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30148938",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148938/ws-services-calculation/WCBillingSlab.json b/data/as/30148938/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..119b69b69b
--- /dev/null
+++ b/data/as/30148938/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30148938",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148954/BillingService/BusinessService.json b/data/as/30148954/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bfa6501b3b
--- /dev/null
+++ b/data/as/30148954/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30148954",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148954/egov-location/boundary-data.json b/data/as/30148954/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34f8dc6f4f
--- /dev/null
+++ b/data/as/30148954/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30148954",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AOIMARI PWSS (NEW)",
+                "localname": "AOIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AOIMARI PWSS (NEW)",
+                        "localname": "AOIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AOIMARI PWSS (NEW)",
+                "localname": "AOIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30148954",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AOIMARI PWSS (NEW)",
+                        "localname": "AOIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148954/ws-services-calculation/Penalty.json b/data/as/30148954/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f10be9ed20
--- /dev/null
+++ b/data/as/30148954/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30148954",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30148954/ws-services-calculation/WCBillingSlab.json b/data/as/30148954/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bece3fdd68
--- /dev/null
+++ b/data/as/30148954/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30148954",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149001/BillingService/BusinessService.json b/data/as/30149001/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8d780d365d
--- /dev/null
+++ b/data/as/30149001/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30149001",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149001/egov-location/boundary-data.json b/data/as/30149001/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02347ce7d4
--- /dev/null
+++ b/data/as/30149001/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30149001",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADANG PT-I PWSS (NEW)",
+                "localname": "MADANG PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149001",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADANG PT-I PWSS (NEW)",
+                        "localname": "MADANG PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADANG PT-I PWSS (NEW)",
+                "localname": "MADANG PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149001",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADANG PT-I PWSS (NEW)",
+                        "localname": "MADANG PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149001/ws-services-calculation/Penalty.json b/data/as/30149001/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11f818d939
--- /dev/null
+++ b/data/as/30149001/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30149001",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149001/ws-services-calculation/WCBillingSlab.json b/data/as/30149001/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6db828d0db
--- /dev/null
+++ b/data/as/30149001/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30149001",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149016/BillingService/BusinessService.json b/data/as/30149016/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d323209c8f
--- /dev/null
+++ b/data/as/30149016/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30149016",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149016/egov-location/boundary-data.json b/data/as/30149016/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d106a2b296
--- /dev/null
+++ b/data/as/30149016/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30149016",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                "localname": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                        "localname": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                "localname": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149016",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                        "localname": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149016/ws-services-calculation/Penalty.json b/data/as/30149016/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..322e020ee2
--- /dev/null
+++ b/data/as/30149016/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30149016",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149016/ws-services-calculation/WCBillingSlab.json b/data/as/30149016/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22ada8195e
--- /dev/null
+++ b/data/as/30149016/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30149016",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149044/BillingService/BusinessService.json b/data/as/30149044/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5403440ebb
--- /dev/null
+++ b/data/as/30149044/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30149044",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149044/egov-location/boundary-data.json b/data/as/30149044/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e0ca72745a
--- /dev/null
+++ b/data/as/30149044/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30149044",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAKATPARA PWSS (NEW)",
+                "localname": "BHAKATPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAKATPARA PWSS (NEW)",
+                        "localname": "BHAKATPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAKATPARA PWSS (NEW)",
+                "localname": "BHAKATPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAKATPARA PWSS (NEW)",
+                        "localname": "BHAKATPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149044/ws-services-calculation/Penalty.json b/data/as/30149044/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dd9538eede
--- /dev/null
+++ b/data/as/30149044/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30149044",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149044/ws-services-calculation/WCBillingSlab.json b/data/as/30149044/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..825294ea62
--- /dev/null
+++ b/data/as/30149044/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30149044",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149093/BillingService/BusinessService.json b/data/as/30149093/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8cbe845d74
--- /dev/null
+++ b/data/as/30149093/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30149093",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149093/egov-location/boundary-data.json b/data/as/30149093/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2d0249f0fe
--- /dev/null
+++ b/data/as/30149093/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30149093",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALADMARI PWSS (NEW)",
+                "localname": "BALADMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149093",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALADMARI PWSS (NEW)",
+                        "localname": "BALADMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALADMARI PWSS (NEW)",
+                "localname": "BALADMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149093",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALADMARI PWSS (NEW)",
+                        "localname": "BALADMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149093/ws-services-calculation/Penalty.json b/data/as/30149093/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c87727412c
--- /dev/null
+++ b/data/as/30149093/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30149093",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149093/ws-services-calculation/WCBillingSlab.json b/data/as/30149093/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bfc7174f0f
--- /dev/null
+++ b/data/as/30149093/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30149093",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149113/BillingService/BusinessService.json b/data/as/30149113/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79f5811d36
--- /dev/null
+++ b/data/as/30149113/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30149113",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149113/egov-location/boundary-data.json b/data/as/30149113/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5b8fe4a0a
--- /dev/null
+++ b/data/as/30149113/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30149113",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA NOLDOBA PWSS (NEW)",
+                "localname": "TILAPARA NOLDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149113",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA NOLDOBA PWSS (NEW)",
+                        "localname": "TILAPARA NOLDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA NOLDOBA PWSS (NEW)",
+                "localname": "TILAPARA NOLDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30149113",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA NOLDOBA PWSS (NEW)",
+                        "localname": "TILAPARA NOLDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149113/ws-services-calculation/Penalty.json b/data/as/30149113/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..655f25c4e3
--- /dev/null
+++ b/data/as/30149113/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30149113",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30149113/ws-services-calculation/WCBillingSlab.json b/data/as/30149113/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7dba4a1f4b
--- /dev/null
+++ b/data/as/30149113/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30149113",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150209/BillingService/BusinessService.json b/data/as/30150209/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c0870c5091
--- /dev/null
+++ b/data/as/30150209/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150209",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150209/egov-location/boundary-data.json b/data/as/30150209/egov-location/boundary-data.json
new file mode 100644
index 0000000000..07dcab884d
--- /dev/null
+++ b/data/as/30150209/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150209",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KESHORIDOBI PT-II PWSS (NEW)",
+                "localname": "KESHORIDOBI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KESHORIDOBI PT-II PWSS (NEW)",
+                        "localname": "KESHORIDOBI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KESHORIDOBI PT-II PWSS (NEW)",
+                "localname": "KESHORIDOBI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KESHORIDOBI PT-II PWSS (NEW)",
+                        "localname": "KESHORIDOBI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150209/ws-services-calculation/Penalty.json b/data/as/30150209/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..257b174f8c
--- /dev/null
+++ b/data/as/30150209/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150209",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150209/ws-services-calculation/WCBillingSlab.json b/data/as/30150209/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1d679e816f
--- /dev/null
+++ b/data/as/30150209/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150209",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150213/BillingService/BusinessService.json b/data/as/30150213/BillingService/BusinessService.json
new file mode 100644
index 0000000000..84496d9bfb
--- /dev/null
+++ b/data/as/30150213/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150213",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150213/egov-location/boundary-data.json b/data/as/30150213/egov-location/boundary-data.json
new file mode 100644
index 0000000000..91dfb252b1
--- /dev/null
+++ b/data/as/30150213/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150213",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                "localname": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                        "localname": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150213/ws-services-calculation/Penalty.json b/data/as/30150213/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df422f7288
--- /dev/null
+++ b/data/as/30150213/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150213",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150213/ws-services-calculation/WCBillingSlab.json b/data/as/30150213/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3c58222dab
--- /dev/null
+++ b/data/as/30150213/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150213",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150234/BillingService/BusinessService.json b/data/as/30150234/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe4a5539dd
--- /dev/null
+++ b/data/as/30150234/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150234",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150234/egov-location/boundary-data.json b/data/as/30150234/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95b29cba1a
--- /dev/null
+++ b/data/as/30150234/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150234",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HALOWAPARA PWSS (NEW)",
+                "localname": "HALOWAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150234",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HALOWAPARA PWSS (NEW)",
+                        "localname": "HALOWAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HALOWAPARA PWSS (NEW)",
+                "localname": "HALOWAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150234",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HALOWAPARA PWSS (NEW)",
+                        "localname": "HALOWAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150234/ws-services-calculation/Penalty.json b/data/as/30150234/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..589a36ccdb
--- /dev/null
+++ b/data/as/30150234/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150234",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150234/ws-services-calculation/WCBillingSlab.json b/data/as/30150234/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85c8492f2b
--- /dev/null
+++ b/data/as/30150234/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150234",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150700/BillingService/BusinessService.json b/data/as/30150700/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8b9a7ce1c9
--- /dev/null
+++ b/data/as/30150700/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150700",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150700/egov-location/boundary-data.json b/data/as/30150700/egov-location/boundary-data.json
new file mode 100644
index 0000000000..82f11f9c0e
--- /dev/null
+++ b/data/as/30150700/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150700",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB SIMLABARI PWSS (NEW)",
+                "localname": "PUB SIMLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150700",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB SIMLABARI PWSS (NEW)",
+                        "localname": "PUB SIMLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB SIMLABARI PWSS (NEW)",
+                "localname": "PUB SIMLABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150700",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB SIMLABARI PWSS (NEW)",
+                        "localname": "PUB SIMLABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150700/ws-services-calculation/Penalty.json b/data/as/30150700/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5e417d0f9
--- /dev/null
+++ b/data/as/30150700/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150700",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150700/ws-services-calculation/WCBillingSlab.json b/data/as/30150700/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91d2156cee
--- /dev/null
+++ b/data/as/30150700/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150700",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150737/BillingService/BusinessService.json b/data/as/30150737/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c8320da597
--- /dev/null
+++ b/data/as/30150737/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150737",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150737/egov-location/boundary-data.json b/data/as/30150737/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7d3c219702
--- /dev/null
+++ b/data/as/30150737/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150737",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIDAR BOGUAN PWSS (NEW)",
+                "localname": "HARIDAR BOGUAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150737",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIDAR BOGUAN PWSS (NEW)",
+                        "localname": "HARIDAR BOGUAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HARIDAR BOGUAN PWSS (NEW)",
+                "localname": "HARIDAR BOGUAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150737",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HARIDAR BOGUAN PWSS (NEW)",
+                        "localname": "HARIDAR BOGUAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150737/ws-services-calculation/Penalty.json b/data/as/30150737/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb78fa36f6
--- /dev/null
+++ b/data/as/30150737/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150737",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150737/ws-services-calculation/WCBillingSlab.json b/data/as/30150737/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ea8aea7683
--- /dev/null
+++ b/data/as/30150737/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150737",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150785/BillingService/BusinessService.json b/data/as/30150785/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c3316ff27
--- /dev/null
+++ b/data/as/30150785/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150785",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150785/egov-location/boundary-data.json b/data/as/30150785/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e5356790d2
--- /dev/null
+++ b/data/as/30150785/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150785",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                "localname": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150785",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                        "localname": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                "localname": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150785",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                        "localname": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150785/ws-services-calculation/Penalty.json b/data/as/30150785/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2784198171
--- /dev/null
+++ b/data/as/30150785/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150785",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150785/ws-services-calculation/WCBillingSlab.json b/data/as/30150785/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..501731ec52
--- /dev/null
+++ b/data/as/30150785/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150785",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150803/BillingService/BusinessService.json b/data/as/30150803/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f5747340fc
--- /dev/null
+++ b/data/as/30150803/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150803",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150803/egov-location/boundary-data.json b/data/as/30150803/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6fea529637
--- /dev/null
+++ b/data/as/30150803/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150803",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO UDMARI PWSS (NEW)",
+                "localname": "BORO UDMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO UDMARI PWSS (NEW)",
+                        "localname": "BORO UDMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO UDMARI PWSS (NEW)",
+                "localname": "BORO UDMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO UDMARI PWSS (NEW)",
+                        "localname": "BORO UDMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150803/ws-services-calculation/Penalty.json b/data/as/30150803/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0521c39232
--- /dev/null
+++ b/data/as/30150803/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150803",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150803/ws-services-calculation/WCBillingSlab.json b/data/as/30150803/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2779aaa789
--- /dev/null
+++ b/data/as/30150803/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150803",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150834/BillingService/BusinessService.json b/data/as/30150834/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0602119cf6
--- /dev/null
+++ b/data/as/30150834/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30150834",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150834/egov-location/boundary-data.json b/data/as/30150834/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a9bbfdee6
--- /dev/null
+++ b/data/as/30150834/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30150834",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOTO TANGBHITA PWSS (NEW)",
+                "localname": "CHOTO TANGBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOTO TANGBHITA PWSS (NEW)",
+                        "localname": "CHOTO TANGBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOTO TANGBHITA PWSS (NEW)",
+                "localname": "CHOTO TANGBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30150834",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOTO TANGBHITA PWSS (NEW)",
+                        "localname": "CHOTO TANGBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150834/ws-services-calculation/Penalty.json b/data/as/30150834/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f363af1eaa
--- /dev/null
+++ b/data/as/30150834/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30150834",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30150834/ws-services-calculation/WCBillingSlab.json b/data/as/30150834/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04d9e72b7c
--- /dev/null
+++ b/data/as/30150834/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30150834",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158066/BillingService/BusinessService.json b/data/as/30158066/BillingService/BusinessService.json
new file mode 100644
index 0000000000..59e2d5f049
--- /dev/null
+++ b/data/as/30158066/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158066",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158066/egov-location/boundary-data.json b/data/as/30158066/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc009b0150
--- /dev/null
+++ b/data/as/30158066/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158066",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.6 SINGRI BAGAN",
+                "localname": "NO.6 SINGRI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158066",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.6 SINGRI BAGAN",
+                        "localname": "NO.6 SINGRI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.6 SINGRI BAGAN",
+                "localname": "NO.6 SINGRI BAGAN",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158066",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.6 SINGRI BAGAN",
+                        "localname": "NO.6 SINGRI BAGAN",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158066/ws-services-calculation/Penalty.json b/data/as/30158066/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2967404240
--- /dev/null
+++ b/data/as/30158066/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158066",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158066/ws-services-calculation/WCBillingSlab.json b/data/as/30158066/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b2e9bcbf6c
--- /dev/null
+++ b/data/as/30158066/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158066",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158126/BillingService/BusinessService.json b/data/as/30158126/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b7490679d9
--- /dev/null
+++ b/data/as/30158126/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158126",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158126/egov-location/boundary-data.json b/data/as/30158126/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3c6bbd3446
--- /dev/null
+++ b/data/as/30158126/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158126",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANDUPAM PWSS",
+                "localname": "RANDUPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANDUPAM PWSS",
+                        "localname": "RANDUPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANDUPAM PWSS",
+                "localname": "RANDUPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANDUPAM PWSS",
+                        "localname": "RANDUPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158126/ws-services-calculation/Penalty.json b/data/as/30158126/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..baa025e2d1
--- /dev/null
+++ b/data/as/30158126/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158126",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158126/ws-services-calculation/WCBillingSlab.json b/data/as/30158126/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9280ee672b
--- /dev/null
+++ b/data/as/30158126/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158126",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158312/BillingService/BusinessService.json b/data/as/30158312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..915d1fc7f5
--- /dev/null
+++ b/data/as/30158312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158312/egov-location/boundary-data.json b/data/as/30158312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c03b4adad
--- /dev/null
+++ b/data/as/30158312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEURI CHUK PWSS",
+                "localname": "DEURI CHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEURI CHUK PWSS",
+                        "localname": "DEURI CHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEURI CHUK PWSS",
+                "localname": "DEURI CHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEURI CHUK PWSS",
+                        "localname": "DEURI CHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158312/ws-services-calculation/Penalty.json b/data/as/30158312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e85e4cce96
--- /dev/null
+++ b/data/as/30158312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158312/ws-services-calculation/WCBillingSlab.json b/data/as/30158312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3288635e81
--- /dev/null
+++ b/data/as/30158312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158662/BillingService/BusinessService.json b/data/as/30158662/BillingService/BusinessService.json
new file mode 100644
index 0000000000..223dbed6d5
--- /dev/null
+++ b/data/as/30158662/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158662",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158662/egov-location/boundary-data.json b/data/as/30158662/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c6a5c7bd3
--- /dev/null
+++ b/data/as/30158662/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158662",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GELAHATINGA TE PWSS",
+                "localname": "GELAHATINGA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GELAHATINGA TE PWSS",
+                        "localname": "GELAHATINGA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GELAHATINGA TE PWSS",
+                "localname": "GELAHATINGA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GELAHATINGA TE PWSS",
+                        "localname": "GELAHATINGA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158662/ws-services-calculation/Penalty.json b/data/as/30158662/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e31c6f8a9
--- /dev/null
+++ b/data/as/30158662/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158662",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158662/ws-services-calculation/WCBillingSlab.json b/data/as/30158662/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d2a3ac035
--- /dev/null
+++ b/data/as/30158662/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158662",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158694/BillingService/BusinessService.json b/data/as/30158694/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eb528e41b2
--- /dev/null
+++ b/data/as/30158694/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158694",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158694/egov-location/boundary-data.json b/data/as/30158694/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eacc0dccce
--- /dev/null
+++ b/data/as/30158694/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158694",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMANPARA DASPARA PWSS (NEW)",
+                "localname": "BARMANPARA DASPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158694",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMANPARA DASPARA PWSS (NEW)",
+                        "localname": "BARMANPARA DASPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMANPARA DASPARA PWSS (NEW)",
+                "localname": "BARMANPARA DASPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158694",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMANPARA DASPARA PWSS (NEW)",
+                        "localname": "BARMANPARA DASPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158694/ws-services-calculation/Penalty.json b/data/as/30158694/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a953b54b23
--- /dev/null
+++ b/data/as/30158694/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158694",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158694/ws-services-calculation/WCBillingSlab.json b/data/as/30158694/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8c50e21b68
--- /dev/null
+++ b/data/as/30158694/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158694",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158752/BillingService/BusinessService.json b/data/as/30158752/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d311de9827
--- /dev/null
+++ b/data/as/30158752/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158752",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158752/egov-location/boundary-data.json b/data/as/30158752/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ce764f2ff
--- /dev/null
+++ b/data/as/30158752/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158752",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANASPARA SIMULKANDI PWSS (NEW)",
+                "localname": "MANASPARA SIMULKANDI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158752",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANASPARA SIMULKANDI PWSS (NEW)",
+                        "localname": "MANASPARA SIMULKANDI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANASPARA SIMULKANDI PWSS (NEW)",
+                "localname": "MANASPARA SIMULKANDI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158752",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANASPARA SIMULKANDI PWSS (NEW)",
+                        "localname": "MANASPARA SIMULKANDI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158752/ws-services-calculation/Penalty.json b/data/as/30158752/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3b94d6072
--- /dev/null
+++ b/data/as/30158752/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158752",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158752/ws-services-calculation/WCBillingSlab.json b/data/as/30158752/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0e0c427815
--- /dev/null
+++ b/data/as/30158752/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158752",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158825/BillingService/BusinessService.json b/data/as/30158825/BillingService/BusinessService.json
new file mode 100644
index 0000000000..266c4fd1f6
--- /dev/null
+++ b/data/as/30158825/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30158825",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158825/egov-location/boundary-data.json b/data/as/30158825/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ea05fe6479
--- /dev/null
+++ b/data/as/30158825/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30158825",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMTAL BENAGALI PWSS",
+                "localname": "AMTAL BENAGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158825",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMTAL BENAGALI PWSS",
+                        "localname": "AMTAL BENAGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMTAL BENAGALI PWSS",
+                "localname": "AMTAL BENAGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30158825",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMTAL BENAGALI PWSS",
+                        "localname": "AMTAL BENAGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158825/ws-services-calculation/Penalty.json b/data/as/30158825/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19715a2ace
--- /dev/null
+++ b/data/as/30158825/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30158825",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30158825/ws-services-calculation/WCBillingSlab.json b/data/as/30158825/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c9f6e8a89
--- /dev/null
+++ b/data/as/30158825/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30158825",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159298/BillingService/BusinessService.json b/data/as/30159298/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d706ef3e75
--- /dev/null
+++ b/data/as/30159298/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30159298",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159298/egov-location/boundary-data.json b/data/as/30159298/egov-location/boundary-data.json
new file mode 100644
index 0000000000..98afd16464
--- /dev/null
+++ b/data/as/30159298/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30159298",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                "localname": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30159298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                        "localname": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                "localname": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30159298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                        "localname": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159298/ws-services-calculation/Penalty.json b/data/as/30159298/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4965e4ff3e
--- /dev/null
+++ b/data/as/30159298/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30159298",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159298/ws-services-calculation/WCBillingSlab.json b/data/as/30159298/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cea6810187
--- /dev/null
+++ b/data/as/30159298/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30159298",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159329/BillingService/BusinessService.json b/data/as/30159329/BillingService/BusinessService.json
new file mode 100644
index 0000000000..803d5e7bd6
--- /dev/null
+++ b/data/as/30159329/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30159329",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159329/egov-location/boundary-data.json b/data/as/30159329/egov-location/boundary-data.json
new file mode 100644
index 0000000000..936e8ebd3b
--- /dev/null
+++ b/data/as/30159329/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30159329",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHARAI PWSS (NEW)",
+                "localname": "DHARAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30159329",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHARAI PWSS (NEW)",
+                        "localname": "DHARAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHARAI PWSS (NEW)",
+                "localname": "DHARAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30159329",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHARAI PWSS (NEW)",
+                        "localname": "DHARAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159329/ws-services-calculation/Penalty.json b/data/as/30159329/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d12153a776
--- /dev/null
+++ b/data/as/30159329/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30159329",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30159329/ws-services-calculation/WCBillingSlab.json b/data/as/30159329/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..290abb7521
--- /dev/null
+++ b/data/as/30159329/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30159329",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163627/BillingService/BusinessService.json b/data/as/30163627/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eab6865778
--- /dev/null
+++ b/data/as/30163627/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30163627",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163627/egov-location/boundary-data.json b/data/as/30163627/egov-location/boundary-data.json
new file mode 100644
index 0000000000..46194c9ab7
--- /dev/null
+++ b/data/as/30163627/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30163627",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DEKARGAON PWSS",
+                "localname": "NEW DEKARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30163627",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DEKARGAON PWSS",
+                        "localname": "NEW DEKARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DEKARGAON PWSS",
+                "localname": "NEW DEKARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30163627",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DEKARGAON PWSS",
+                        "localname": "NEW DEKARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163627/ws-services-calculation/Penalty.json b/data/as/30163627/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e710e2379a
--- /dev/null
+++ b/data/as/30163627/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30163627",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163627/ws-services-calculation/WCBillingSlab.json b/data/as/30163627/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7579fb5ced
--- /dev/null
+++ b/data/as/30163627/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30163627",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163652/BillingService/BusinessService.json b/data/as/30163652/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7749fab67c
--- /dev/null
+++ b/data/as/30163652/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30163652",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163652/egov-location/boundary-data.json b/data/as/30163652/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a71e48ae93
--- /dev/null
+++ b/data/as/30163652/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30163652",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAGAON CHAPORI PWSS",
+                "localname": "BOKAGAON CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30163652",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAGAON CHAPORI PWSS",
+                        "localname": "BOKAGAON CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAGAON CHAPORI PWSS",
+                "localname": "BOKAGAON CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30163652",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAGAON CHAPORI PWSS",
+                        "localname": "BOKAGAON CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163652/ws-services-calculation/Penalty.json b/data/as/30163652/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d6d6d89b0
--- /dev/null
+++ b/data/as/30163652/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30163652",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163652/ws-services-calculation/WCBillingSlab.json b/data/as/30163652/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f2cf525697
--- /dev/null
+++ b/data/as/30163652/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30163652",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163717/BillingService/BusinessService.json b/data/as/30163717/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2fe2820954
--- /dev/null
+++ b/data/as/30163717/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30163717",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163717/egov-location/boundary-data.json b/data/as/30163717/egov-location/boundary-data.json
new file mode 100644
index 0000000000..23fb4ef55b
--- /dev/null
+++ b/data/as/30163717/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30163717",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                "localname": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30163717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                        "localname": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                "localname": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30163717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                        "localname": "SAIKIA CHUBURI DEKAR GAON NO. 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163717/ws-services-calculation/Penalty.json b/data/as/30163717/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..066239eaa0
--- /dev/null
+++ b/data/as/30163717/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30163717",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30163717/ws-services-calculation/WCBillingSlab.json b/data/as/30163717/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8cfab4aca1
--- /dev/null
+++ b/data/as/30163717/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30163717",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166511/BillingService/BusinessService.json b/data/as/30166511/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c22edf797
--- /dev/null
+++ b/data/as/30166511/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166511",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166511/egov-location/boundary-data.json b/data/as/30166511/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f0cbf2964
--- /dev/null
+++ b/data/as/30166511/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166511",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTAMARI PWSS (NEW)",
+                "localname": "KHUTAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166511",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTAMARI PWSS (NEW)",
+                        "localname": "KHUTAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUTAMARI PWSS (NEW)",
+                "localname": "KHUTAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166511",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUTAMARI PWSS (NEW)",
+                        "localname": "KHUTAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166511/ws-services-calculation/Penalty.json b/data/as/30166511/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a34c5e8984
--- /dev/null
+++ b/data/as/30166511/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166511",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166511/ws-services-calculation/WCBillingSlab.json b/data/as/30166511/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..50ba5a5f1e
--- /dev/null
+++ b/data/as/30166511/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166511",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166533/BillingService/BusinessService.json b/data/as/30166533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a015ab49e
--- /dev/null
+++ b/data/as/30166533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166533/egov-location/boundary-data.json b/data/as/30166533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..611489dcb6
--- /dev/null
+++ b/data/as/30166533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "URPAD BEEL PWSS (NEW)",
+                "localname": "URPAD BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "URPAD BEEL PWSS (NEW)",
+                        "localname": "URPAD BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "URPAD BEEL PWSS (NEW)",
+                "localname": "URPAD BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "URPAD BEEL PWSS (NEW)",
+                        "localname": "URPAD BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166533/ws-services-calculation/Penalty.json b/data/as/30166533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..70586a6b08
--- /dev/null
+++ b/data/as/30166533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166533/ws-services-calculation/WCBillingSlab.json b/data/as/30166533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d91d23e04
--- /dev/null
+++ b/data/as/30166533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166583/BillingService/BusinessService.json b/data/as/30166583/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d3f1912933
--- /dev/null
+++ b/data/as/30166583/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166583",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166583/egov-location/boundary-data.json b/data/as/30166583/egov-location/boundary-data.json
new file mode 100644
index 0000000000..eede4760d1
--- /dev/null
+++ b/data/as/30166583/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166583",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALINAGAR PWSS (NEW)",
+                "localname": "ALINAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALINAGAR PWSS (NEW)",
+                        "localname": "ALINAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALINAGAR PWSS (NEW)",
+                "localname": "ALINAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALINAGAR PWSS (NEW)",
+                        "localname": "ALINAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166583/ws-services-calculation/Penalty.json b/data/as/30166583/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee6365dc28
--- /dev/null
+++ b/data/as/30166583/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166583",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166583/ws-services-calculation/WCBillingSlab.json b/data/as/30166583/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74a64ba50d
--- /dev/null
+++ b/data/as/30166583/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166583",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166670/BillingService/BusinessService.json b/data/as/30166670/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b46cb7ab51
--- /dev/null
+++ b/data/as/30166670/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166670",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166670/egov-location/boundary-data.json b/data/as/30166670/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7731c1392f
--- /dev/null
+++ b/data/as/30166670/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166670",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANYAGURI BAZAR PWSS (NEW)",
+                "localname": "BANYAGURI BAZAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANYAGURI BAZAR PWSS (NEW)",
+                        "localname": "BANYAGURI BAZAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANYAGURI BAZAR PWSS (NEW)",
+                "localname": "BANYAGURI BAZAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANYAGURI BAZAR PWSS (NEW)",
+                        "localname": "BANYAGURI BAZAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166670/ws-services-calculation/Penalty.json b/data/as/30166670/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db928d7fd1
--- /dev/null
+++ b/data/as/30166670/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166670",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166670/ws-services-calculation/WCBillingSlab.json b/data/as/30166670/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6db821ecb
--- /dev/null
+++ b/data/as/30166670/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166670",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166739/BillingService/BusinessService.json b/data/as/30166739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b3c9cad33
--- /dev/null
+++ b/data/as/30166739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166739/egov-location/boundary-data.json b/data/as/30166739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..abaa67ad06
--- /dev/null
+++ b/data/as/30166739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAMAR RESERVE 2 PWSS (NEW)",
+                "localname": "DHAMAR RESERVE 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAMAR RESERVE 2 PWSS (NEW)",
+                        "localname": "DHAMAR RESERVE 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAMAR RESERVE 2 PWSS (NEW)",
+                "localname": "DHAMAR RESERVE 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAMAR RESERVE 2 PWSS (NEW)",
+                        "localname": "DHAMAR RESERVE 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166739/ws-services-calculation/Penalty.json b/data/as/30166739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..affc56b5b6
--- /dev/null
+++ b/data/as/30166739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166739/ws-services-calculation/WCBillingSlab.json b/data/as/30166739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d7823cfd2
--- /dev/null
+++ b/data/as/30166739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166762/BillingService/BusinessService.json b/data/as/30166762/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e45356535d
--- /dev/null
+++ b/data/as/30166762/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166762",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166762/egov-location/boundary-data.json b/data/as/30166762/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9bd0b77678
--- /dev/null
+++ b/data/as/30166762/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166762",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORAIMARI PWSS (NEW)",
+                "localname": "GORAIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166762",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORAIMARI PWSS (NEW)",
+                        "localname": "GORAIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORAIMARI PWSS (NEW)",
+                "localname": "GORAIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166762",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORAIMARI PWSS (NEW)",
+                        "localname": "GORAIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166762/ws-services-calculation/Penalty.json b/data/as/30166762/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00a7214634
--- /dev/null
+++ b/data/as/30166762/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166762",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166762/ws-services-calculation/WCBillingSlab.json b/data/as/30166762/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc7248c175
--- /dev/null
+++ b/data/as/30166762/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166762",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166822/BillingService/BusinessService.json b/data/as/30166822/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98ff273b01
--- /dev/null
+++ b/data/as/30166822/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30166822",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166822/egov-location/boundary-data.json b/data/as/30166822/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3f67387bf
--- /dev/null
+++ b/data/as/30166822/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30166822",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HURKAKUCHI PWSS (NEW)",
+                "localname": "HURKAKUCHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166822",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HURKAKUCHI PWSS (NEW)",
+                        "localname": "HURKAKUCHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HURKAKUCHI PWSS (NEW)",
+                "localname": "HURKAKUCHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30166822",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HURKAKUCHI PWSS (NEW)",
+                        "localname": "HURKAKUCHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166822/ws-services-calculation/Penalty.json b/data/as/30166822/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8c43d49b31
--- /dev/null
+++ b/data/as/30166822/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30166822",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30166822/ws-services-calculation/WCBillingSlab.json b/data/as/30166822/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..61d2e448cb
--- /dev/null
+++ b/data/as/30166822/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30166822",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167065/BillingService/BusinessService.json b/data/as/30167065/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad932e3486
--- /dev/null
+++ b/data/as/30167065/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167065",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167065/egov-location/boundary-data.json b/data/as/30167065/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e0ebe4762
--- /dev/null
+++ b/data/as/30167065/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167065",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR BEEL PWSS (NEW)",
+                "localname": "JALESWAR BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR BEEL PWSS (NEW)",
+                        "localname": "JALESWAR BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR BEEL PWSS (NEW)",
+                "localname": "JALESWAR BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR BEEL PWSS (NEW)",
+                        "localname": "JALESWAR BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167065/ws-services-calculation/Penalty.json b/data/as/30167065/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf5e6c478a
--- /dev/null
+++ b/data/as/30167065/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167065",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167065/ws-services-calculation/WCBillingSlab.json b/data/as/30167065/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fce1ca959a
--- /dev/null
+++ b/data/as/30167065/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167065",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167107/BillingService/BusinessService.json b/data/as/30167107/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4cfffe1d9b
--- /dev/null
+++ b/data/as/30167107/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167107",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167107/egov-location/boundary-data.json b/data/as/30167107/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fda5f018e9
--- /dev/null
+++ b/data/as/30167107/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167107",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR TAKIMARI PWSS (NEW)",
+                "localname": "JALESWAR TAKIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167107",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR TAKIMARI PWSS (NEW)",
+                        "localname": "JALESWAR TAKIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALESWAR TAKIMARI PWSS (NEW)",
+                "localname": "JALESWAR TAKIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167107",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALESWAR TAKIMARI PWSS (NEW)",
+                        "localname": "JALESWAR TAKIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167107/ws-services-calculation/Penalty.json b/data/as/30167107/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6fbe1673e
--- /dev/null
+++ b/data/as/30167107/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167107",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167107/ws-services-calculation/WCBillingSlab.json b/data/as/30167107/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..36e17fd05c
--- /dev/null
+++ b/data/as/30167107/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167107",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167121/BillingService/BusinessService.json b/data/as/30167121/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d71e51ce13
--- /dev/null
+++ b/data/as/30167121/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167121",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167121/egov-location/boundary-data.json b/data/as/30167121/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9e3151cfa
--- /dev/null
+++ b/data/as/30167121/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167121",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                "localname": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167121",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                        "localname": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                "localname": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167121",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                        "localname": "KOLABORI PWSS (SIMLABARI) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167121/ws-services-calculation/Penalty.json b/data/as/30167121/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..70c8522fd2
--- /dev/null
+++ b/data/as/30167121/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167121",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167121/ws-services-calculation/WCBillingSlab.json b/data/as/30167121/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..61066bdaa4
--- /dev/null
+++ b/data/as/30167121/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167121",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167130/BillingService/BusinessService.json b/data/as/30167130/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e7e83f6a6a
--- /dev/null
+++ b/data/as/30167130/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167130",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167130/egov-location/boundary-data.json b/data/as/30167130/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc2c2aeb1e
--- /dev/null
+++ b/data/as/30167130/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167130",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB TARANGAPUR PWSS (NEW)",
+                "localname": "PUB TARANGAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB TARANGAPUR PWSS (NEW)",
+                        "localname": "PUB TARANGAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB TARANGAPUR PWSS (NEW)",
+                "localname": "PUB TARANGAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB TARANGAPUR PWSS (NEW)",
+                        "localname": "PUB TARANGAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167130/ws-services-calculation/Penalty.json b/data/as/30167130/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c351ab210f
--- /dev/null
+++ b/data/as/30167130/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167130",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167130/ws-services-calculation/WCBillingSlab.json b/data/as/30167130/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60ab156a40
--- /dev/null
+++ b/data/as/30167130/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167130",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167292/BillingService/BusinessService.json b/data/as/30167292/BillingService/BusinessService.json
new file mode 100644
index 0000000000..82b8364376
--- /dev/null
+++ b/data/as/30167292/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167292",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167292/egov-location/boundary-data.json b/data/as/30167292/egov-location/boundary-data.json
new file mode 100644
index 0000000000..396121003c
--- /dev/null
+++ b/data/as/30167292/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167292",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWKHOWA PT-II PWSS (NEW)",
+                "localname": "ROWKHOWA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167292",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWKHOWA PT-II PWSS (NEW)",
+                        "localname": "ROWKHOWA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWKHOWA PT-II PWSS (NEW)",
+                "localname": "ROWKHOWA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167292",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWKHOWA PT-II PWSS (NEW)",
+                        "localname": "ROWKHOWA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167292/ws-services-calculation/Penalty.json b/data/as/30167292/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69ecb9edd7
--- /dev/null
+++ b/data/as/30167292/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167292",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167292/ws-services-calculation/WCBillingSlab.json b/data/as/30167292/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80b5ee2850
--- /dev/null
+++ b/data/as/30167292/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167292",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167319/BillingService/BusinessService.json b/data/as/30167319/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09ec166883
--- /dev/null
+++ b/data/as/30167319/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167319",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167319/egov-location/boundary-data.json b/data/as/30167319/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1f62c144a0
--- /dev/null
+++ b/data/as/30167319/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167319",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNER ALGA PT-III PWSS (NEW)",
+                "localname": "BAMUNER ALGA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167319",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNER ALGA PT-III PWSS (NEW)",
+                        "localname": "BAMUNER ALGA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNER ALGA PT-III PWSS (NEW)",
+                "localname": "BAMUNER ALGA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167319",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNER ALGA PT-III PWSS (NEW)",
+                        "localname": "BAMUNER ALGA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167319/ws-services-calculation/Penalty.json b/data/as/30167319/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3ce3e8266
--- /dev/null
+++ b/data/as/30167319/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167319",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167319/ws-services-calculation/WCBillingSlab.json b/data/as/30167319/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0e07de5ee2
--- /dev/null
+++ b/data/as/30167319/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167319",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167381/BillingService/BusinessService.json b/data/as/30167381/BillingService/BusinessService.json
new file mode 100644
index 0000000000..306c3aa16a
--- /dev/null
+++ b/data/as/30167381/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167381",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167381/egov-location/boundary-data.json b/data/as/30167381/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d13e8d08a
--- /dev/null
+++ b/data/as/30167381/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167381",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                "localname": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                        "localname": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                "localname": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                        "localname": "BAHATI PT-I (NO.3)( FAITAPARA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167381/ws-services-calculation/Penalty.json b/data/as/30167381/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0c6e33be38
--- /dev/null
+++ b/data/as/30167381/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167381",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167381/ws-services-calculation/WCBillingSlab.json b/data/as/30167381/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee9fa96c9c
--- /dev/null
+++ b/data/as/30167381/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167381",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167391/BillingService/BusinessService.json b/data/as/30167391/BillingService/BusinessService.json
new file mode 100644
index 0000000000..838a5186f6
--- /dev/null
+++ b/data/as/30167391/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167391",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167391/egov-location/boundary-data.json b/data/as/30167391/egov-location/boundary-data.json
new file mode 100644
index 0000000000..df44f7786d
--- /dev/null
+++ b/data/as/30167391/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167391",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                "localname": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                        "localname": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                "localname": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                        "localname": "BAMUNER ALGA PT- IV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167391/ws-services-calculation/Penalty.json b/data/as/30167391/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5318e8fb5
--- /dev/null
+++ b/data/as/30167391/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167391",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167391/ws-services-calculation/WCBillingSlab.json b/data/as/30167391/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9d4785c1f6
--- /dev/null
+++ b/data/as/30167391/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167391",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167408/BillingService/BusinessService.json b/data/as/30167408/BillingService/BusinessService.json
new file mode 100644
index 0000000000..74bbdbc425
--- /dev/null
+++ b/data/as/30167408/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167408",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167408/egov-location/boundary-data.json b/data/as/30167408/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cb777f9275
--- /dev/null
+++ b/data/as/30167408/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167408",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORARCHAR PT-I PWSS (NEW)",
+                "localname": "BORARCHAR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167408",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORARCHAR PT-I PWSS (NEW)",
+                        "localname": "BORARCHAR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORARCHAR PT-I PWSS (NEW)",
+                "localname": "BORARCHAR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167408",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORARCHAR PT-I PWSS (NEW)",
+                        "localname": "BORARCHAR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167408/ws-services-calculation/Penalty.json b/data/as/30167408/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4dc8665a16
--- /dev/null
+++ b/data/as/30167408/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167408",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167408/ws-services-calculation/WCBillingSlab.json b/data/as/30167408/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d1e5038745
--- /dev/null
+++ b/data/as/30167408/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167408",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167439/BillingService/BusinessService.json b/data/as/30167439/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c25bf933bb
--- /dev/null
+++ b/data/as/30167439/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167439",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167439/egov-location/boundary-data.json b/data/as/30167439/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5b35bc13d
--- /dev/null
+++ b/data/as/30167439/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167439",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLAKURA PT-III PWSS (NEW)",
+                "localname": "CHOLAKURA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLAKURA PT-III PWSS (NEW)",
+                        "localname": "CHOLAKURA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLAKURA PT-III PWSS (NEW)",
+                "localname": "CHOLAKURA PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLAKURA PT-III PWSS (NEW)",
+                        "localname": "CHOLAKURA PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167439/ws-services-calculation/Penalty.json b/data/as/30167439/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27f8451155
--- /dev/null
+++ b/data/as/30167439/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167439",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167439/ws-services-calculation/WCBillingSlab.json b/data/as/30167439/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..097fbdbf30
--- /dev/null
+++ b/data/as/30167439/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167439",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167463/BillingService/BusinessService.json b/data/as/30167463/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2dc9e722b9
--- /dev/null
+++ b/data/as/30167463/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167463",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167463/egov-location/boundary-data.json b/data/as/30167463/egov-location/boundary-data.json
new file mode 100644
index 0000000000..85430c9f55
--- /dev/null
+++ b/data/as/30167463/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167463",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALMARA PWSS (NEW)",
+                "localname": "SALMARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167463",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALMARA PWSS (NEW)",
+                        "localname": "SALMARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALMARA PWSS (NEW)",
+                "localname": "SALMARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167463",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALMARA PWSS (NEW)",
+                        "localname": "SALMARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167463/ws-services-calculation/Penalty.json b/data/as/30167463/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1cc624dbdc
--- /dev/null
+++ b/data/as/30167463/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167463",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167463/ws-services-calculation/WCBillingSlab.json b/data/as/30167463/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9d971214f7
--- /dev/null
+++ b/data/as/30167463/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167463",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167486/BillingService/BusinessService.json b/data/as/30167486/BillingService/BusinessService.json
new file mode 100644
index 0000000000..044b1d5921
--- /dev/null
+++ b/data/as/30167486/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167486",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167486/egov-location/boundary-data.json b/data/as/30167486/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9c122570aa
--- /dev/null
+++ b/data/as/30167486/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167486",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                "localname": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167486",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                        "localname": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                "localname": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167486",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                        "localname": "KOCHPARA PWSS (LAKHIPUR) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167486/ws-services-calculation/Penalty.json b/data/as/30167486/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c93a77193d
--- /dev/null
+++ b/data/as/30167486/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167486",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167486/ws-services-calculation/WCBillingSlab.json b/data/as/30167486/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..30923dc609
--- /dev/null
+++ b/data/as/30167486/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167486",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167823/BillingService/BusinessService.json b/data/as/30167823/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6356a0713
--- /dev/null
+++ b/data/as/30167823/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30167823",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167823/egov-location/boundary-data.json b/data/as/30167823/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d4d695c9a
--- /dev/null
+++ b/data/as/30167823/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30167823",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABARI TE NO. 1 PWSS",
+                "localname": "ADABARI TE NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167823",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABARI TE NO. 1 PWSS",
+                        "localname": "ADABARI TE NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABARI TE NO. 1 PWSS",
+                "localname": "ADABARI TE NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30167823",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABARI TE NO. 1 PWSS",
+                        "localname": "ADABARI TE NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167823/ws-services-calculation/Penalty.json b/data/as/30167823/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..deab02bc0d
--- /dev/null
+++ b/data/as/30167823/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30167823",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30167823/ws-services-calculation/WCBillingSlab.json b/data/as/30167823/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b979ad8998
--- /dev/null
+++ b/data/as/30167823/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30167823",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169470/BillingService/BusinessService.json b/data/as/30169470/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa0ea07688
--- /dev/null
+++ b/data/as/30169470/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169470",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169470/egov-location/boundary-data.json b/data/as/30169470/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aa43b9e3cf
--- /dev/null
+++ b/data/as/30169470/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169470",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKOLA GAON PWSS",
+                "localname": "BAKOLA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169470",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKOLA GAON PWSS",
+                        "localname": "BAKOLA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKOLA GAON PWSS",
+                "localname": "BAKOLA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169470",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKOLA GAON PWSS",
+                        "localname": "BAKOLA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169470/ws-services-calculation/Penalty.json b/data/as/30169470/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d739a0a267
--- /dev/null
+++ b/data/as/30169470/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169470",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169470/ws-services-calculation/WCBillingSlab.json b/data/as/30169470/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3cbd919dcd
--- /dev/null
+++ b/data/as/30169470/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169470",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169472/BillingService/BusinessService.json b/data/as/30169472/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5271c56105
--- /dev/null
+++ b/data/as/30169472/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169472",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169472/egov-location/boundary-data.json b/data/as/30169472/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e8498916c
--- /dev/null
+++ b/data/as/30169472/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169472",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMGAON NO. 1 PWSS",
+                "localname": "BAMGAON NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMGAON NO. 1 PWSS",
+                        "localname": "BAMGAON NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMGAON NO. 1 PWSS",
+                "localname": "BAMGAON NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMGAON NO. 1 PWSS",
+                        "localname": "BAMGAON NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169472/ws-services-calculation/Penalty.json b/data/as/30169472/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71eee88fa0
--- /dev/null
+++ b/data/as/30169472/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169472",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169472/ws-services-calculation/WCBillingSlab.json b/data/as/30169472/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd03b19175
--- /dev/null
+++ b/data/as/30169472/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169472",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169516/BillingService/BusinessService.json b/data/as/30169516/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eb0a95fcae
--- /dev/null
+++ b/data/as/30169516/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169516",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169516/egov-location/boundary-data.json b/data/as/30169516/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03e593d223
--- /dev/null
+++ b/data/as/30169516/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169516",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOBOLAGAON PWSS",
+                "localname": "BHOBOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOBOLAGAON PWSS",
+                        "localname": "BHOBOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOBOLAGAON PWSS",
+                "localname": "BHOBOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169516",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOBOLAGAON PWSS",
+                        "localname": "BHOBOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169516/ws-services-calculation/Penalty.json b/data/as/30169516/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a8e7edfae
--- /dev/null
+++ b/data/as/30169516/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169516",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169516/ws-services-calculation/WCBillingSlab.json b/data/as/30169516/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7dee19b323
--- /dev/null
+++ b/data/as/30169516/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169516",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169525/BillingService/BusinessService.json b/data/as/30169525/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b1f60be035
--- /dev/null
+++ b/data/as/30169525/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169525",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169525/egov-location/boundary-data.json b/data/as/30169525/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b08395577a
--- /dev/null
+++ b/data/as/30169525/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169525",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIHIA GAON PWSS",
+                "localname": "BIHIA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169525",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIHIA GAON PWSS",
+                        "localname": "BIHIA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIHIA GAON PWSS",
+                "localname": "BIHIA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169525",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIHIA GAON PWSS",
+                        "localname": "BIHIA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169525/ws-services-calculation/Penalty.json b/data/as/30169525/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40caadc450
--- /dev/null
+++ b/data/as/30169525/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169525",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169525/ws-services-calculation/WCBillingSlab.json b/data/as/30169525/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d59fbd4ef5
--- /dev/null
+++ b/data/as/30169525/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169525",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169537/BillingService/BusinessService.json b/data/as/30169537/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b26515fed3
--- /dev/null
+++ b/data/as/30169537/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169537",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169537/egov-location/boundary-data.json b/data/as/30169537/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cb54bb9700
--- /dev/null
+++ b/data/as/30169537/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169537",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALABASTI GAON PWSS",
+                "localname": "CHALABASTI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALABASTI GAON PWSS",
+                        "localname": "CHALABASTI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHALABASTI GAON PWSS",
+                "localname": "CHALABASTI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHALABASTI GAON PWSS",
+                        "localname": "CHALABASTI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169537/ws-services-calculation/Penalty.json b/data/as/30169537/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab2c81efe0
--- /dev/null
+++ b/data/as/30169537/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169537",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169537/ws-services-calculation/WCBillingSlab.json b/data/as/30169537/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69906eb9ae
--- /dev/null
+++ b/data/as/30169537/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169537",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169560/BillingService/BusinessService.json b/data/as/30169560/BillingService/BusinessService.json
new file mode 100644
index 0000000000..adda8e48c4
--- /dev/null
+++ b/data/as/30169560/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169560",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169560/egov-location/boundary-data.json b/data/as/30169560/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2f8230e80a
--- /dev/null
+++ b/data/as/30169560/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169560",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILONI BENGALI PWSS",
+                "localname": "CHILONI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169560",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILONI BENGALI PWSS",
+                        "localname": "CHILONI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILONI BENGALI PWSS",
+                "localname": "CHILONI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169560",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILONI BENGALI PWSS",
+                        "localname": "CHILONI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169560/ws-services-calculation/Penalty.json b/data/as/30169560/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..36209b16dd
--- /dev/null
+++ b/data/as/30169560/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169560",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169560/ws-services-calculation/WCBillingSlab.json b/data/as/30169560/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e7178abc58
--- /dev/null
+++ b/data/as/30169560/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169560",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169583/BillingService/BusinessService.json b/data/as/30169583/BillingService/BusinessService.json
new file mode 100644
index 0000000000..829c495ae0
--- /dev/null
+++ b/data/as/30169583/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169583",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169583/egov-location/boundary-data.json b/data/as/30169583/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2cf5ad1d4
--- /dev/null
+++ b/data/as/30169583/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169583",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLA GAON PWSS",
+                "localname": "CHOLA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLA GAON PWSS",
+                        "localname": "CHOLA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLA GAON PWSS",
+                "localname": "CHOLA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLA GAON PWSS",
+                        "localname": "CHOLA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169583/ws-services-calculation/Penalty.json b/data/as/30169583/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e317693344
--- /dev/null
+++ b/data/as/30169583/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169583",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169583/ws-services-calculation/WCBillingSlab.json b/data/as/30169583/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7cf24cfc4c
--- /dev/null
+++ b/data/as/30169583/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169583",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169600/BillingService/BusinessService.json b/data/as/30169600/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c791b17838
--- /dev/null
+++ b/data/as/30169600/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169600",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169600/egov-location/boundary-data.json b/data/as/30169600/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e574527476
--- /dev/null
+++ b/data/as/30169600/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169600",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEKA CHUBURI PWSS",
+                "localname": "DEKA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEKA CHUBURI PWSS",
+                        "localname": "DEKA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEKA CHUBURI PWSS",
+                "localname": "DEKA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169600",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEKA CHUBURI PWSS",
+                        "localname": "DEKA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169600/ws-services-calculation/Penalty.json b/data/as/30169600/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b26379131d
--- /dev/null
+++ b/data/as/30169600/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169600",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169600/ws-services-calculation/WCBillingSlab.json b/data/as/30169600/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..821f0419fb
--- /dev/null
+++ b/data/as/30169600/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169600",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169629/BillingService/BusinessService.json b/data/as/30169629/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9e3900e899
--- /dev/null
+++ b/data/as/30169629/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169629",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169629/egov-location/boundary-data.json b/data/as/30169629/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e35a8f985c
--- /dev/null
+++ b/data/as/30169629/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169629",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPOTA PWSS",
+                "localname": "DIPOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPOTA PWSS",
+                        "localname": "DIPOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPOTA PWSS",
+                "localname": "DIPOTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPOTA PWSS",
+                        "localname": "DIPOTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169629/ws-services-calculation/Penalty.json b/data/as/30169629/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6e559147b
--- /dev/null
+++ b/data/as/30169629/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169629",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169629/ws-services-calculation/WCBillingSlab.json b/data/as/30169629/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..76f8071e4f
--- /dev/null
+++ b/data/as/30169629/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169629",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169643/BillingService/BusinessService.json b/data/as/30169643/BillingService/BusinessService.json
new file mode 100644
index 0000000000..26930a5134
--- /dev/null
+++ b/data/as/30169643/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169643",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169643/egov-location/boundary-data.json b/data/as/30169643/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cdeea35364
--- /dev/null
+++ b/data/as/30169643/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169643",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAMANI BAN GAON PWSS",
+                "localname": "GAMANI BAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169643",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAMANI BAN GAON PWSS",
+                        "localname": "GAMANI BAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAMANI BAN GAON PWSS",
+                "localname": "GAMANI BAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169643",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAMANI BAN GAON PWSS",
+                        "localname": "GAMANI BAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169643/ws-services-calculation/Penalty.json b/data/as/30169643/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c95156726b
--- /dev/null
+++ b/data/as/30169643/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169643",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169643/ws-services-calculation/WCBillingSlab.json b/data/as/30169643/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..95cc3959f9
--- /dev/null
+++ b/data/as/30169643/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169643",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169657/BillingService/BusinessService.json b/data/as/30169657/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ee464244c
--- /dev/null
+++ b/data/as/30169657/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169657",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169657/egov-location/boundary-data.json b/data/as/30169657/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5bd0902720
--- /dev/null
+++ b/data/as/30169657/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169657",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM JIRA PWSS (NEW)",
+                "localname": "PACHIM JIRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169657",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM JIRA PWSS (NEW)",
+                        "localname": "PACHIM JIRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM JIRA PWSS (NEW)",
+                "localname": "PACHIM JIRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169657",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM JIRA PWSS (NEW)",
+                        "localname": "PACHIM JIRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169657/ws-services-calculation/Penalty.json b/data/as/30169657/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3b277d87d9
--- /dev/null
+++ b/data/as/30169657/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169657",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169657/ws-services-calculation/WCBillingSlab.json b/data/as/30169657/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf4f9b0e7d
--- /dev/null
+++ b/data/as/30169657/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169657",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169665/BillingService/BusinessService.json b/data/as/30169665/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c211ef6742
--- /dev/null
+++ b/data/as/30169665/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169665",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169665/egov-location/boundary-data.json b/data/as/30169665/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3cab367f8a
--- /dev/null
+++ b/data/as/30169665/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169665",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANDHINAGAR PWSS",
+                "localname": "GANDHINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANDHINAGAR PWSS",
+                        "localname": "GANDHINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANDHINAGAR PWSS",
+                "localname": "GANDHINAGAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169665",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANDHINAGAR PWSS",
+                        "localname": "GANDHINAGAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169665/ws-services-calculation/Penalty.json b/data/as/30169665/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f90a67a7c
--- /dev/null
+++ b/data/as/30169665/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169665",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169665/ws-services-calculation/WCBillingSlab.json b/data/as/30169665/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a671cb56fd
--- /dev/null
+++ b/data/as/30169665/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169665",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169790/BillingService/BusinessService.json b/data/as/30169790/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7f31ccc00b
--- /dev/null
+++ b/data/as/30169790/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169790",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169790/egov-location/boundary-data.json b/data/as/30169790/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d52915f970
--- /dev/null
+++ b/data/as/30169790/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169790",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGABARI (DARRANGIRI) PWSS",
+                "localname": "TENGABARI (DARRANGIRI) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169790",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGABARI (DARRANGIRI) PWSS",
+                        "localname": "TENGABARI (DARRANGIRI) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGABARI (DARRANGIRI) PWSS",
+                "localname": "TENGABARI (DARRANGIRI) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169790",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGABARI (DARRANGIRI) PWSS",
+                        "localname": "TENGABARI (DARRANGIRI) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169790/ws-services-calculation/Penalty.json b/data/as/30169790/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..196f394cea
--- /dev/null
+++ b/data/as/30169790/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169790",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169790/ws-services-calculation/WCBillingSlab.json b/data/as/30169790/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a33f5bc13f
--- /dev/null
+++ b/data/as/30169790/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169790",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169802/BillingService/BusinessService.json b/data/as/30169802/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3296c58c54
--- /dev/null
+++ b/data/as/30169802/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169802",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169802/egov-location/boundary-data.json b/data/as/30169802/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0f42519b1
--- /dev/null
+++ b/data/as/30169802/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169802",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAMAGADIM PWSS (NEW)",
+                "localname": "KHAMAGADIM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAMAGADIM PWSS (NEW)",
+                        "localname": "KHAMAGADIM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAMAGADIM PWSS (NEW)",
+                "localname": "KHAMAGADIM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAMAGADIM PWSS (NEW)",
+                        "localname": "KHAMAGADIM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169802/ws-services-calculation/Penalty.json b/data/as/30169802/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..43f4ffa6a3
--- /dev/null
+++ b/data/as/30169802/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169802",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169802/ws-services-calculation/WCBillingSlab.json b/data/as/30169802/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1dde82ed1
--- /dev/null
+++ b/data/as/30169802/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169802",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169825/BillingService/BusinessService.json b/data/as/30169825/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed5297f48c
--- /dev/null
+++ b/data/as/30169825/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169825",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169825/egov-location/boundary-data.json b/data/as/30169825/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2858f1ee08
--- /dev/null
+++ b/data/as/30169825/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169825",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHUPUR PWSS",
+                "localname": "MADHUPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169825",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHUPUR PWSS",
+                        "localname": "MADHUPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MADHUPUR PWSS",
+                "localname": "MADHUPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169825",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MADHUPUR PWSS",
+                        "localname": "MADHUPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169825/ws-services-calculation/Penalty.json b/data/as/30169825/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a3e3c9678d
--- /dev/null
+++ b/data/as/30169825/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169825",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169825/ws-services-calculation/WCBillingSlab.json b/data/as/30169825/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..210d7cea73
--- /dev/null
+++ b/data/as/30169825/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169825",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169988/BillingService/BusinessService.json b/data/as/30169988/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e3d56b6d08
--- /dev/null
+++ b/data/as/30169988/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30169988",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169988/egov-location/boundary-data.json b/data/as/30169988/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5a2186fc3
--- /dev/null
+++ b/data/as/30169988/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30169988",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAWMARI PT-II PWSS (NEW)",
+                "localname": "RAWMARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAWMARI PT-II PWSS (NEW)",
+                        "localname": "RAWMARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAWMARI PT-II PWSS (NEW)",
+                "localname": "RAWMARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30169988",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAWMARI PT-II PWSS (NEW)",
+                        "localname": "RAWMARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169988/ws-services-calculation/Penalty.json b/data/as/30169988/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..232d16a58d
--- /dev/null
+++ b/data/as/30169988/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30169988",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30169988/ws-services-calculation/WCBillingSlab.json b/data/as/30169988/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f94d3ec7d
--- /dev/null
+++ b/data/as/30169988/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30169988",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170226/BillingService/BusinessService.json b/data/as/30170226/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87965da16b
--- /dev/null
+++ b/data/as/30170226/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170226",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170226/egov-location/boundary-data.json b/data/as/30170226/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d32e825c79
--- /dev/null
+++ b/data/as/30170226/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170226",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHRI PT-I M PWSS (NEW)",
+                "localname": "BANDARSHRI PT-I M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170226",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHRI PT-I M PWSS (NEW)",
+                        "localname": "BANDARSHRI PT-I M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHRI PT-I M PWSS (NEW)",
+                "localname": "BANDARSHRI PT-I M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170226",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHRI PT-I M PWSS (NEW)",
+                        "localname": "BANDARSHRI PT-I M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170226/ws-services-calculation/Penalty.json b/data/as/30170226/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1ed309fb8
--- /dev/null
+++ b/data/as/30170226/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170226",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170226/ws-services-calculation/WCBillingSlab.json b/data/as/30170226/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..029f1f334b
--- /dev/null
+++ b/data/as/30170226/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170226",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170237/BillingService/BusinessService.json b/data/as/30170237/BillingService/BusinessService.json
new file mode 100644
index 0000000000..68908f7944
--- /dev/null
+++ b/data/as/30170237/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170237",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170237/egov-location/boundary-data.json b/data/as/30170237/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b7227285d
--- /dev/null
+++ b/data/as/30170237/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170237",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARTOLI PWSS (NEW)",
+                "localname": "PAHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170237",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARTOLI PWSS (NEW)",
+                        "localname": "PAHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARTOLI PWSS (NEW)",
+                "localname": "PAHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170237",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARTOLI PWSS (NEW)",
+                        "localname": "PAHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170237/ws-services-calculation/Penalty.json b/data/as/30170237/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6e4826f36f
--- /dev/null
+++ b/data/as/30170237/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170237",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170237/ws-services-calculation/WCBillingSlab.json b/data/as/30170237/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c4e7354b6
--- /dev/null
+++ b/data/as/30170237/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170237",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170249/BillingService/BusinessService.json b/data/as/30170249/BillingService/BusinessService.json
new file mode 100644
index 0000000000..360b2fffa2
--- /dev/null
+++ b/data/as/30170249/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170249",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170249/egov-location/boundary-data.json b/data/as/30170249/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac63229613
--- /dev/null
+++ b/data/as/30170249/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170249",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALUPARA PWSS (NEW)",
+                "localname": "DALUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALUPARA PWSS (NEW)",
+                        "localname": "DALUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALUPARA PWSS (NEW)",
+                "localname": "DALUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALUPARA PWSS (NEW)",
+                        "localname": "DALUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170249/ws-services-calculation/Penalty.json b/data/as/30170249/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbf46ba855
--- /dev/null
+++ b/data/as/30170249/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170249",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170249/ws-services-calculation/WCBillingSlab.json b/data/as/30170249/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e0f19969c2
--- /dev/null
+++ b/data/as/30170249/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170249",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170262/BillingService/BusinessService.json b/data/as/30170262/BillingService/BusinessService.json
new file mode 100644
index 0000000000..94d7b361c6
--- /dev/null
+++ b/data/as/30170262/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170262",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170262/egov-location/boundary-data.json b/data/as/30170262/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4862c73204
--- /dev/null
+++ b/data/as/30170262/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170262",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                "localname": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170262",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                        "localname": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                "localname": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170262",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                        "localname": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170262/ws-services-calculation/Penalty.json b/data/as/30170262/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b553a7eaec
--- /dev/null
+++ b/data/as/30170262/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170262",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170262/ws-services-calculation/WCBillingSlab.json b/data/as/30170262/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5e2c4553e4
--- /dev/null
+++ b/data/as/30170262/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170262",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170419/BillingService/BusinessService.json b/data/as/30170419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0f30f9d5d3
--- /dev/null
+++ b/data/as/30170419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170419/egov-location/boundary-data.json b/data/as/30170419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c794e7dae7
--- /dev/null
+++ b/data/as/30170419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIARPARA PT-I PWSS (NEW)",
+                "localname": "PATIARPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIARPARA PT-I PWSS (NEW)",
+                        "localname": "PATIARPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATIARPARA PT-I PWSS (NEW)",
+                "localname": "PATIARPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATIARPARA PT-I PWSS (NEW)",
+                        "localname": "PATIARPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170419/ws-services-calculation/Penalty.json b/data/as/30170419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0e5bdc4744
--- /dev/null
+++ b/data/as/30170419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170419/ws-services-calculation/WCBillingSlab.json b/data/as/30170419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6919ed2511
--- /dev/null
+++ b/data/as/30170419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170429/BillingService/BusinessService.json b/data/as/30170429/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a647632af0
--- /dev/null
+++ b/data/as/30170429/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170429",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170429/egov-location/boundary-data.json b/data/as/30170429/egov-location/boundary-data.json
new file mode 100644
index 0000000000..faa8e567a2
--- /dev/null
+++ b/data/as/30170429/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170429",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATABARI PWSS (NEW)",
+                "localname": "CHATABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170429",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATABARI PWSS (NEW)",
+                        "localname": "CHATABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATABARI PWSS (NEW)",
+                "localname": "CHATABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170429",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATABARI PWSS (NEW)",
+                        "localname": "CHATABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170429/ws-services-calculation/Penalty.json b/data/as/30170429/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..904d9240d3
--- /dev/null
+++ b/data/as/30170429/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170429",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170429/ws-services-calculation/WCBillingSlab.json b/data/as/30170429/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7b00f83ddb
--- /dev/null
+++ b/data/as/30170429/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170429",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170784/BillingService/BusinessService.json b/data/as/30170784/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5649eb9b87
--- /dev/null
+++ b/data/as/30170784/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170784",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170784/egov-location/boundary-data.json b/data/as/30170784/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20e705d0f9
--- /dev/null
+++ b/data/as/30170784/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170784",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPUKONA PWSS (NEW)",
+                "localname": "BAPUKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170784",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPUKONA PWSS (NEW)",
+                        "localname": "BAPUKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPUKONA PWSS (NEW)",
+                "localname": "BAPUKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170784",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPUKONA PWSS (NEW)",
+                        "localname": "BAPUKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170784/ws-services-calculation/Penalty.json b/data/as/30170784/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..430af36cc6
--- /dev/null
+++ b/data/as/30170784/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170784",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170784/ws-services-calculation/WCBillingSlab.json b/data/as/30170784/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7eb39ed255
--- /dev/null
+++ b/data/as/30170784/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170784",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170810/BillingService/BusinessService.json b/data/as/30170810/BillingService/BusinessService.json
new file mode 100644
index 0000000000..13f7904245
--- /dev/null
+++ b/data/as/30170810/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170810",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170810/egov-location/boundary-data.json b/data/as/30170810/egov-location/boundary-data.json
new file mode 100644
index 0000000000..42734a78e7
--- /dev/null
+++ b/data/as/30170810/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170810",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                "localname": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                        "localname": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                "localname": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170810",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                        "localname": "SUCHIA PAHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170810/ws-services-calculation/Penalty.json b/data/as/30170810/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6eb81584cf
--- /dev/null
+++ b/data/as/30170810/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170810",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170810/ws-services-calculation/WCBillingSlab.json b/data/as/30170810/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..32adcf743f
--- /dev/null
+++ b/data/as/30170810/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170810",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170948/BillingService/BusinessService.json b/data/as/30170948/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f96dfffdc
--- /dev/null
+++ b/data/as/30170948/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30170948",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170948/egov-location/boundary-data.json b/data/as/30170948/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bb2f278973
--- /dev/null
+++ b/data/as/30170948/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30170948",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELGURI PWSS (NEW)",
+                "localname": "BELGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELGURI PWSS (NEW)",
+                        "localname": "BELGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELGURI PWSS (NEW)",
+                "localname": "BELGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30170948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELGURI PWSS (NEW)",
+                        "localname": "BELGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170948/ws-services-calculation/Penalty.json b/data/as/30170948/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e47a6d560d
--- /dev/null
+++ b/data/as/30170948/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30170948",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30170948/ws-services-calculation/WCBillingSlab.json b/data/as/30170948/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ecf946c8fb
--- /dev/null
+++ b/data/as/30170948/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30170948",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30171030/BillingService/BusinessService.json b/data/as/30171030/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5bf47f820
--- /dev/null
+++ b/data/as/30171030/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30171030",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30171030/egov-location/boundary-data.json b/data/as/30171030/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c08f9548e4
--- /dev/null
+++ b/data/as/30171030/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30171030",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                "localname": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30171030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                        "localname": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                "localname": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30171030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                        "localname": "BARMATIA PT-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30171030/ws-services-calculation/Penalty.json b/data/as/30171030/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..83f6a74248
--- /dev/null
+++ b/data/as/30171030/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30171030",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30171030/ws-services-calculation/WCBillingSlab.json b/data/as/30171030/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3785920c1d
--- /dev/null
+++ b/data/as/30171030/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30171030",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172407/BillingService/BusinessService.json b/data/as/30172407/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e821ec664
--- /dev/null
+++ b/data/as/30172407/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172407",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172407/egov-location/boundary-data.json b/data/as/30172407/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74bbbc800f
--- /dev/null
+++ b/data/as/30172407/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172407",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI PATHAR PWSS",
+                "localname": "SITALMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI PATHAR PWSS",
+                        "localname": "SITALMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SITALMARI PATHAR PWSS",
+                "localname": "SITALMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SITALMARI PATHAR PWSS",
+                        "localname": "SITALMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172407/ws-services-calculation/Penalty.json b/data/as/30172407/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..47bbf56540
--- /dev/null
+++ b/data/as/30172407/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172407",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172407/ws-services-calculation/WCBillingSlab.json b/data/as/30172407/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0d1b7d711b
--- /dev/null
+++ b/data/as/30172407/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172407",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172409/BillingService/BusinessService.json b/data/as/30172409/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7921ce722f
--- /dev/null
+++ b/data/as/30172409/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172409",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172409/egov-location/boundary-data.json b/data/as/30172409/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1ef3b1cf08
--- /dev/null
+++ b/data/as/30172409/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172409",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                "localname": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                        "localname": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                "localname": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                        "localname": "NIZ BIHAGURI NO.2 PWSS - (OLD NAME - DUI DEPOTA MAZ PATHAR PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172409/ws-services-calculation/Penalty.json b/data/as/30172409/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1791e82e5d
--- /dev/null
+++ b/data/as/30172409/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172409",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172409/ws-services-calculation/WCBillingSlab.json b/data/as/30172409/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e89d3a07e3
--- /dev/null
+++ b/data/as/30172409/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172409",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172412/BillingService/BusinessService.json b/data/as/30172412/BillingService/BusinessService.json
new file mode 100644
index 0000000000..33049aa028
--- /dev/null
+++ b/data/as/30172412/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172412",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172412/egov-location/boundary-data.json b/data/as/30172412/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2db22f051
--- /dev/null
+++ b/data/as/30172412/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172412",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                "localname": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172412",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                        "localname": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                "localname": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172412",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                        "localname": "NIZ BIHAGURI NO.3 PWSS - (OLD NAME - LATIAMARI PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172412/ws-services-calculation/Penalty.json b/data/as/30172412/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2db9bc0120
--- /dev/null
+++ b/data/as/30172412/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172412",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172412/ws-services-calculation/WCBillingSlab.json b/data/as/30172412/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee480c964f
--- /dev/null
+++ b/data/as/30172412/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172412",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172420/BillingService/BusinessService.json b/data/as/30172420/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3494339ba7
--- /dev/null
+++ b/data/as/30172420/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172420",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172420/egov-location/boundary-data.json b/data/as/30172420/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f697293986
--- /dev/null
+++ b/data/as/30172420/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172420",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBASTI PATHAR-A PWSS",
+                "localname": "PALASHBASTI PATHAR-A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBASTI PATHAR-A PWSS",
+                        "localname": "PALASHBASTI PATHAR-A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASHBASTI PATHAR-A PWSS",
+                "localname": "PALASHBASTI PATHAR-A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172420",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASHBASTI PATHAR-A PWSS",
+                        "localname": "PALASHBASTI PATHAR-A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172420/ws-services-calculation/Penalty.json b/data/as/30172420/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99510706de
--- /dev/null
+++ b/data/as/30172420/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172420",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172420/ws-services-calculation/WCBillingSlab.json b/data/as/30172420/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df637b31d7
--- /dev/null
+++ b/data/as/30172420/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172420",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172437/BillingService/BusinessService.json b/data/as/30172437/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87d743c39d
--- /dev/null
+++ b/data/as/30172437/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172437",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172437/egov-location/boundary-data.json b/data/as/30172437/egov-location/boundary-data.json
new file mode 100644
index 0000000000..225c45d7ca
--- /dev/null
+++ b/data/as/30172437/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172437",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI-2 PART-1 PWSS",
+                "localname": "SINGRI-2 PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI-2 PART-1 PWSS",
+                        "localname": "SINGRI-2 PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI-2 PART-1 PWSS",
+                "localname": "SINGRI-2 PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI-2 PART-1 PWSS",
+                        "localname": "SINGRI-2 PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172437/ws-services-calculation/Penalty.json b/data/as/30172437/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e82f8737e2
--- /dev/null
+++ b/data/as/30172437/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172437",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172437/ws-services-calculation/WCBillingSlab.json b/data/as/30172437/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1d8eeecb3c
--- /dev/null
+++ b/data/as/30172437/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172437",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172442/BillingService/BusinessService.json b/data/as/30172442/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d4b7afd08
--- /dev/null
+++ b/data/as/30172442/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172442",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172442/egov-location/boundary-data.json b/data/as/30172442/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0714732582
--- /dev/null
+++ b/data/as/30172442/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172442",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI-2 PART-2 PWSS",
+                "localname": "SINGRI-2 PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI-2 PART-2 PWSS",
+                        "localname": "SINGRI-2 PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRI-2 PART-2 PWSS",
+                "localname": "SINGRI-2 PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRI-2 PART-2 PWSS",
+                        "localname": "SINGRI-2 PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172442/ws-services-calculation/Penalty.json b/data/as/30172442/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0a312ed4db
--- /dev/null
+++ b/data/as/30172442/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172442",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172442/ws-services-calculation/WCBillingSlab.json b/data/as/30172442/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60c88db174
--- /dev/null
+++ b/data/as/30172442/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172442",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172452/BillingService/BusinessService.json b/data/as/30172452/BillingService/BusinessService.json
new file mode 100644
index 0000000000..397a91240e
--- /dev/null
+++ b/data/as/30172452/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172452",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172452/egov-location/boundary-data.json b/data/as/30172452/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7199ee3783
--- /dev/null
+++ b/data/as/30172452/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172452",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATACHIPUR NO.1 PWSS",
+                "localname": "BATACHIPUR NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172452",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATACHIPUR NO.1 PWSS",
+                        "localname": "BATACHIPUR NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATACHIPUR NO.1 PWSS",
+                "localname": "BATACHIPUR NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172452",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATACHIPUR NO.1 PWSS",
+                        "localname": "BATACHIPUR NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172452/ws-services-calculation/Penalty.json b/data/as/30172452/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fbbd5c8f79
--- /dev/null
+++ b/data/as/30172452/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172452",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172452/ws-services-calculation/WCBillingSlab.json b/data/as/30172452/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d2ea452ad3
--- /dev/null
+++ b/data/as/30172452/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172452",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172456/BillingService/BusinessService.json b/data/as/30172456/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d0f105cd88
--- /dev/null
+++ b/data/as/30172456/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172456",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172456/egov-location/boundary-data.json b/data/as/30172456/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b2d6266264
--- /dev/null
+++ b/data/as/30172456/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172456",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOTPARA PWSS",
+                "localname": "BHOTPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172456",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOTPARA PWSS",
+                        "localname": "BHOTPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOTPARA PWSS",
+                "localname": "BHOTPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172456",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOTPARA PWSS",
+                        "localname": "BHOTPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172456/ws-services-calculation/Penalty.json b/data/as/30172456/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..206933a019
--- /dev/null
+++ b/data/as/30172456/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172456",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172456/ws-services-calculation/WCBillingSlab.json b/data/as/30172456/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..00b2e6b771
--- /dev/null
+++ b/data/as/30172456/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172456",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172473/BillingService/BusinessService.json b/data/as/30172473/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0243b11538
--- /dev/null
+++ b/data/as/30172473/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172473",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172473/egov-location/boundary-data.json b/data/as/30172473/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a33b6c4d9
--- /dev/null
+++ b/data/as/30172473/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172473",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                "localname": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                        "localname": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                "localname": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                        "localname": "MAZROWMARI BANGALI (PART-A) PWSS - (OLD NAME - MAZROWMARI BANGALLIGAON PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172473/ws-services-calculation/Penalty.json b/data/as/30172473/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a7e25748ee
--- /dev/null
+++ b/data/as/30172473/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172473",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172473/ws-services-calculation/WCBillingSlab.json b/data/as/30172473/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5c7a0747e
--- /dev/null
+++ b/data/as/30172473/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172473",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172482/BillingService/BusinessService.json b/data/as/30172482/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0ca2c8625a
--- /dev/null
+++ b/data/as/30172482/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172482",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172482/egov-location/boundary-data.json b/data/as/30172482/egov-location/boundary-data.json
new file mode 100644
index 0000000000..78b6084a7d
--- /dev/null
+++ b/data/as/30172482/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172482",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIGAON BANGALI PWSS",
+                "localname": "BALIGAON BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIGAON BANGALI PWSS",
+                        "localname": "BALIGAON BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIGAON BANGALI PWSS",
+                "localname": "BALIGAON BANGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIGAON BANGALI PWSS",
+                        "localname": "BALIGAON BANGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172482/ws-services-calculation/Penalty.json b/data/as/30172482/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ff089cd3da
--- /dev/null
+++ b/data/as/30172482/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172482",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172482/ws-services-calculation/WCBillingSlab.json b/data/as/30172482/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a70900f847
--- /dev/null
+++ b/data/as/30172482/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172482",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172498/BillingService/BusinessService.json b/data/as/30172498/BillingService/BusinessService.json
new file mode 100644
index 0000000000..951d7664f1
--- /dev/null
+++ b/data/as/30172498/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172498",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172498/egov-location/boundary-data.json b/data/as/30172498/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02bd86f3c8
--- /dev/null
+++ b/data/as/30172498/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172498",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOIRAGURI GAON PWSS",
+                "localname": "BHOIRAGURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172498",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOIRAGURI GAON PWSS",
+                        "localname": "BHOIRAGURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOIRAGURI GAON PWSS",
+                "localname": "BHOIRAGURI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172498",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOIRAGURI GAON PWSS",
+                        "localname": "BHOIRAGURI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172498/ws-services-calculation/Penalty.json b/data/as/30172498/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..530077f2e1
--- /dev/null
+++ b/data/as/30172498/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172498",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172498/ws-services-calculation/WCBillingSlab.json b/data/as/30172498/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f3e647ff06
--- /dev/null
+++ b/data/as/30172498/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172498",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172503/BillingService/BusinessService.json b/data/as/30172503/BillingService/BusinessService.json
new file mode 100644
index 0000000000..49728fe382
--- /dev/null
+++ b/data/as/30172503/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172503",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172503/egov-location/boundary-data.json b/data/as/30172503/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06b648089d
--- /dev/null
+++ b/data/as/30172503/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172503",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 NURPURJUTE PART A PWSS",
+                "localname": "NO.1 NURPURJUTE PART A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172503",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 NURPURJUTE PART A PWSS",
+                        "localname": "NO.1 NURPURJUTE PART A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 NURPURJUTE PART A PWSS",
+                "localname": "NO.1 NURPURJUTE PART A PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172503",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 NURPURJUTE PART A PWSS",
+                        "localname": "NO.1 NURPURJUTE PART A PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172503/ws-services-calculation/Penalty.json b/data/as/30172503/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..971c32b0cc
--- /dev/null
+++ b/data/as/30172503/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172503",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172503/ws-services-calculation/WCBillingSlab.json b/data/as/30172503/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a2fc5bfae0
--- /dev/null
+++ b/data/as/30172503/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172503",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172507/BillingService/BusinessService.json b/data/as/30172507/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8a1f513dd3
--- /dev/null
+++ b/data/as/30172507/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172507",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172507/egov-location/boundary-data.json b/data/as/30172507/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b4ab6a0659
--- /dev/null
+++ b/data/as/30172507/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172507",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW GHOGRA PWSS",
+                "localname": "NEW GHOGRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172507",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW GHOGRA PWSS",
+                        "localname": "NEW GHOGRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW GHOGRA PWSS",
+                "localname": "NEW GHOGRA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172507",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW GHOGRA PWSS",
+                        "localname": "NEW GHOGRA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172507/ws-services-calculation/Penalty.json b/data/as/30172507/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b981b37580
--- /dev/null
+++ b/data/as/30172507/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172507",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172507/ws-services-calculation/WCBillingSlab.json b/data/as/30172507/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..75673001c4
--- /dev/null
+++ b/data/as/30172507/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172507",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172509/BillingService/BusinessService.json b/data/as/30172509/BillingService/BusinessService.json
new file mode 100644
index 0000000000..65155eb571
--- /dev/null
+++ b/data/as/30172509/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172509",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172509/egov-location/boundary-data.json b/data/as/30172509/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c7858cdf7d
--- /dev/null
+++ b/data/as/30172509/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172509",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURA GARUDUBA NO.2 PWSS",
+                "localname": "BURA GARUDUBA NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURA GARUDUBA NO.2 PWSS",
+                        "localname": "BURA GARUDUBA NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURA GARUDUBA NO.2 PWSS",
+                "localname": "BURA GARUDUBA NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURA GARUDUBA NO.2 PWSS",
+                        "localname": "BURA GARUDUBA NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172509/ws-services-calculation/Penalty.json b/data/as/30172509/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46c6c1194b
--- /dev/null
+++ b/data/as/30172509/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172509",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172509/ws-services-calculation/WCBillingSlab.json b/data/as/30172509/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4c0296d26e
--- /dev/null
+++ b/data/as/30172509/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172509",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172538/BillingService/BusinessService.json b/data/as/30172538/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed258947d4
--- /dev/null
+++ b/data/as/30172538/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172538",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172538/egov-location/boundary-data.json b/data/as/30172538/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26e66009e4
--- /dev/null
+++ b/data/as/30172538/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172538",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKERAJULI NO.1 PWSS",
+                "localname": "THEKERAJULI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKERAJULI NO.1 PWSS",
+                        "localname": "THEKERAJULI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKERAJULI NO.1 PWSS",
+                "localname": "THEKERAJULI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKERAJULI NO.1 PWSS",
+                        "localname": "THEKERAJULI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172538/ws-services-calculation/Penalty.json b/data/as/30172538/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1482c4b06e
--- /dev/null
+++ b/data/as/30172538/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172538",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172538/ws-services-calculation/WCBillingSlab.json b/data/as/30172538/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..722eb18694
--- /dev/null
+++ b/data/as/30172538/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172538",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172543/BillingService/BusinessService.json b/data/as/30172543/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6de865cdc7
--- /dev/null
+++ b/data/as/30172543/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172543",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172543/egov-location/boundary-data.json b/data/as/30172543/egov-location/boundary-data.json
new file mode 100644
index 0000000000..467665ee56
--- /dev/null
+++ b/data/as/30172543/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172543",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABIL KISAN PWSS",
+                "localname": "NABIL KISAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABIL KISAN PWSS",
+                        "localname": "NABIL KISAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABIL KISAN PWSS",
+                "localname": "NABIL KISAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABIL KISAN PWSS",
+                        "localname": "NABIL KISAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172543/ws-services-calculation/Penalty.json b/data/as/30172543/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86a31cc646
--- /dev/null
+++ b/data/as/30172543/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172543",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172543/ws-services-calculation/WCBillingSlab.json b/data/as/30172543/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..008fab0a16
--- /dev/null
+++ b/data/as/30172543/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172543",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172573/BillingService/BusinessService.json b/data/as/30172573/BillingService/BusinessService.json
new file mode 100644
index 0000000000..58cc9b9d1c
--- /dev/null
+++ b/data/as/30172573/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30172573",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172573/egov-location/boundary-data.json b/data/as/30172573/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0a096a68a
--- /dev/null
+++ b/data/as/30172573/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30172573",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAIRAGURI PATHAR PWSS",
+                "localname": "BHAIRAGURI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172573",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAIRAGURI PATHAR PWSS",
+                        "localname": "BHAIRAGURI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHAIRAGURI PATHAR PWSS",
+                "localname": "BHAIRAGURI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30172573",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHAIRAGURI PATHAR PWSS",
+                        "localname": "BHAIRAGURI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172573/ws-services-calculation/Penalty.json b/data/as/30172573/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9108f82868
--- /dev/null
+++ b/data/as/30172573/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30172573",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30172573/ws-services-calculation/WCBillingSlab.json b/data/as/30172573/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1621496c89
--- /dev/null
+++ b/data/as/30172573/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30172573",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173072/BillingService/BusinessService.json b/data/as/30173072/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b2d8ed64c0
--- /dev/null
+++ b/data/as/30173072/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173072",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173072/egov-location/boundary-data.json b/data/as/30173072/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60a4d24f57
--- /dev/null
+++ b/data/as/30173072/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173072",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELUGIRI HANUPAM PWSS",
+                "localname": "BHELUGIRI HANUPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELUGIRI HANUPAM PWSS",
+                        "localname": "BHELUGIRI HANUPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELUGIRI HANUPAM PWSS",
+                "localname": "BHELUGIRI HANUPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELUGIRI HANUPAM PWSS",
+                        "localname": "BHELUGIRI HANUPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173072/ws-services-calculation/Penalty.json b/data/as/30173072/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c32e2f33e
--- /dev/null
+++ b/data/as/30173072/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173072",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173072/ws-services-calculation/WCBillingSlab.json b/data/as/30173072/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0378460e87
--- /dev/null
+++ b/data/as/30173072/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173072",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173084/BillingService/BusinessService.json b/data/as/30173084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3894b2a85c
--- /dev/null
+++ b/data/as/30173084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173084/egov-location/boundary-data.json b/data/as/30173084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..298abb4f31
--- /dev/null
+++ b/data/as/30173084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARI 6 NO LINE PWSS",
+                "localname": "GHILADHARI 6 NO LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARI 6 NO LINE PWSS",
+                        "localname": "GHILADHARI 6 NO LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARI 6 NO LINE PWSS",
+                "localname": "GHILADHARI 6 NO LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARI 6 NO LINE PWSS",
+                        "localname": "GHILADHARI 6 NO LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173084/ws-services-calculation/Penalty.json b/data/as/30173084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..02de27e3ff
--- /dev/null
+++ b/data/as/30173084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173084/ws-services-calculation/WCBillingSlab.json b/data/as/30173084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33fb0615c1
--- /dev/null
+++ b/data/as/30173084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173097/BillingService/BusinessService.json b/data/as/30173097/BillingService/BusinessService.json
new file mode 100644
index 0000000000..203e963a24
--- /dev/null
+++ b/data/as/30173097/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173097",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173097/egov-location/boundary-data.json b/data/as/30173097/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fd5f84e4b7
--- /dev/null
+++ b/data/as/30173097/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173097",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NC GHILADHARI PWSS",
+                "localname": "NC GHILADHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173097",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NC GHILADHARI PWSS",
+                        "localname": "NC GHILADHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NC GHILADHARI PWSS",
+                "localname": "NC GHILADHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173097",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NC GHILADHARI PWSS",
+                        "localname": "NC GHILADHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173097/ws-services-calculation/Penalty.json b/data/as/30173097/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9dc1d945f5
--- /dev/null
+++ b/data/as/30173097/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173097",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173097/ws-services-calculation/WCBillingSlab.json b/data/as/30173097/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7ab4b11873
--- /dev/null
+++ b/data/as/30173097/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173097",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173162/BillingService/BusinessService.json b/data/as/30173162/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db907f70d3
--- /dev/null
+++ b/data/as/30173162/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173162",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173162/egov-location/boundary-data.json b/data/as/30173162/egov-location/boundary-data.json
new file mode 100644
index 0000000000..95780d86ce
--- /dev/null
+++ b/data/as/30173162/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173162",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RIHALJULI KOCH GAON PWSS",
+                "localname": "RIHALJULI KOCH GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173162",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RIHALJULI KOCH GAON PWSS",
+                        "localname": "RIHALJULI KOCH GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RIHALJULI KOCH GAON PWSS",
+                "localname": "RIHALJULI KOCH GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173162",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RIHALJULI KOCH GAON PWSS",
+                        "localname": "RIHALJULI KOCH GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173162/ws-services-calculation/Penalty.json b/data/as/30173162/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2cb625de0
--- /dev/null
+++ b/data/as/30173162/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173162",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173162/ws-services-calculation/WCBillingSlab.json b/data/as/30173162/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6932b15c8
--- /dev/null
+++ b/data/as/30173162/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173162",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173172/BillingService/BusinessService.json b/data/as/30173172/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5d315ffad7
--- /dev/null
+++ b/data/as/30173172/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173172",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173172/egov-location/boundary-data.json b/data/as/30173172/egov-location/boundary-data.json
new file mode 100644
index 0000000000..13a1ee5c6e
--- /dev/null
+++ b/data/as/30173172/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173172",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MERENA BORABHUYAN PART 2 PWSS",
+                "localname": "MERENA BORABHUYAN PART 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173172",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MERENA BORABHUYAN PART 2 PWSS",
+                        "localname": "MERENA BORABHUYAN PART 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MERENA BORABHUYAN PART 2 PWSS",
+                "localname": "MERENA BORABHUYAN PART 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173172",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MERENA BORABHUYAN PART 2 PWSS",
+                        "localname": "MERENA BORABHUYAN PART 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173172/ws-services-calculation/Penalty.json b/data/as/30173172/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c3e40fc794
--- /dev/null
+++ b/data/as/30173172/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173172",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173172/ws-services-calculation/WCBillingSlab.json b/data/as/30173172/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b9daaed08
--- /dev/null
+++ b/data/as/30173172/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173172",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173251/BillingService/BusinessService.json b/data/as/30173251/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2217a8faf1
--- /dev/null
+++ b/data/as/30173251/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173251",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173251/egov-location/boundary-data.json b/data/as/30173251/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5bda1c1ad6
--- /dev/null
+++ b/data/as/30173251/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173251",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELOGURI HANUPAM 2 PWSS",
+                "localname": "BHELOGURI HANUPAM 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173251",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELOGURI HANUPAM 2 PWSS",
+                        "localname": "BHELOGURI HANUPAM 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELOGURI HANUPAM 2 PWSS",
+                "localname": "BHELOGURI HANUPAM 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173251",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELOGURI HANUPAM 2 PWSS",
+                        "localname": "BHELOGURI HANUPAM 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173251/ws-services-calculation/Penalty.json b/data/as/30173251/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f81e73f54a
--- /dev/null
+++ b/data/as/30173251/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173251",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173251/ws-services-calculation/WCBillingSlab.json b/data/as/30173251/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..84bc3f04fa
--- /dev/null
+++ b/data/as/30173251/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173251",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173284/BillingService/BusinessService.json b/data/as/30173284/BillingService/BusinessService.json
new file mode 100644
index 0000000000..120409660b
--- /dev/null
+++ b/data/as/30173284/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173284",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173284/egov-location/boundary-data.json b/data/as/30173284/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3cd95cba6e
--- /dev/null
+++ b/data/as/30173284/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173284",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAPUR PWSS",
+                "localname": "MONAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAPUR PWSS",
+                        "localname": "MONAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAPUR PWSS",
+                "localname": "MONAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173284",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAPUR PWSS",
+                        "localname": "MONAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173284/ws-services-calculation/Penalty.json b/data/as/30173284/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c07931313d
--- /dev/null
+++ b/data/as/30173284/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173284",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173284/ws-services-calculation/WCBillingSlab.json b/data/as/30173284/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d3550e7607
--- /dev/null
+++ b/data/as/30173284/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173284",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173317/BillingService/BusinessService.json b/data/as/30173317/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7753c09647
--- /dev/null
+++ b/data/as/30173317/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173317",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173317/egov-location/boundary-data.json b/data/as/30173317/egov-location/boundary-data.json
new file mode 100644
index 0000000000..211e43d7b6
--- /dev/null
+++ b/data/as/30173317/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173317",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGPUR PWSS",
+                "localname": "NAGPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGPUR PWSS",
+                        "localname": "NAGPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAGPUR PWSS",
+                "localname": "NAGPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173317",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAGPUR PWSS",
+                        "localname": "NAGPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173317/ws-services-calculation/Penalty.json b/data/as/30173317/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..31d6f719a3
--- /dev/null
+++ b/data/as/30173317/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173317",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173317/ws-services-calculation/WCBillingSlab.json b/data/as/30173317/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..019159210f
--- /dev/null
+++ b/data/as/30173317/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173317",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173387/BillingService/BusinessService.json b/data/as/30173387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d25a77b714
--- /dev/null
+++ b/data/as/30173387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173387/egov-location/boundary-data.json b/data/as/30173387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dfb0f5ea81
--- /dev/null
+++ b/data/as/30173387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO KACHUMARI PWSS",
+                "localname": "BORO KACHUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO KACHUMARI PWSS",
+                        "localname": "BORO KACHUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO KACHUMARI PWSS",
+                "localname": "BORO KACHUMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO KACHUMARI PWSS",
+                        "localname": "BORO KACHUMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173387/ws-services-calculation/Penalty.json b/data/as/30173387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..486be44613
--- /dev/null
+++ b/data/as/30173387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173387/ws-services-calculation/WCBillingSlab.json b/data/as/30173387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1f327a07d
--- /dev/null
+++ b/data/as/30173387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173395/BillingService/BusinessService.json b/data/as/30173395/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0a3d790be1
--- /dev/null
+++ b/data/as/30173395/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173395",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173395/egov-location/boundary-data.json b/data/as/30173395/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b287a62f3a
--- /dev/null
+++ b/data/as/30173395/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173395",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARI NEW LINE PWSS",
+                "localname": "GHILADHARI NEW LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARI NEW LINE PWSS",
+                        "localname": "GHILADHARI NEW LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARI NEW LINE PWSS",
+                "localname": "GHILADHARI NEW LINE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARI NEW LINE PWSS",
+                        "localname": "GHILADHARI NEW LINE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173395/ws-services-calculation/Penalty.json b/data/as/30173395/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4c7da2af92
--- /dev/null
+++ b/data/as/30173395/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173395",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173395/ws-services-calculation/WCBillingSlab.json b/data/as/30173395/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..315847f2f6
--- /dev/null
+++ b/data/as/30173395/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173395",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173400/BillingService/BusinessService.json b/data/as/30173400/BillingService/BusinessService.json
new file mode 100644
index 0000000000..144b309bfc
--- /dev/null
+++ b/data/as/30173400/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173400",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173400/egov-location/boundary-data.json b/data/as/30173400/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8ab2a8fa4b
--- /dev/null
+++ b/data/as/30173400/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173400",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJGAON PWSS",
+                "localname": "MAJGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJGAON PWSS",
+                        "localname": "MAJGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJGAON PWSS",
+                "localname": "MAJGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJGAON PWSS",
+                        "localname": "MAJGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173400/ws-services-calculation/Penalty.json b/data/as/30173400/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9515f6c88e
--- /dev/null
+++ b/data/as/30173400/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173400",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173400/ws-services-calculation/WCBillingSlab.json b/data/as/30173400/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c420212d90
--- /dev/null
+++ b/data/as/30173400/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173400",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173409/BillingService/BusinessService.json b/data/as/30173409/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f2f754fce5
--- /dev/null
+++ b/data/as/30173409/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173409",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173409/egov-location/boundary-data.json b/data/as/30173409/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49e6b86645
--- /dev/null
+++ b/data/as/30173409/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173409",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO BEJARHOLA PWSS",
+                "localname": "2 NO BEJARHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO BEJARHOLA PWSS",
+                        "localname": "2 NO BEJARHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO BEJARHOLA PWSS",
+                "localname": "2 NO BEJARHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO BEJARHOLA PWSS",
+                        "localname": "2 NO BEJARHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173409/ws-services-calculation/Penalty.json b/data/as/30173409/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b396e42dda
--- /dev/null
+++ b/data/as/30173409/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173409",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173409/ws-services-calculation/WCBillingSlab.json b/data/as/30173409/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3d11d16718
--- /dev/null
+++ b/data/as/30173409/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173409",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173419/BillingService/BusinessService.json b/data/as/30173419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae8c3d46c9
--- /dev/null
+++ b/data/as/30173419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173419/egov-location/boundary-data.json b/data/as/30173419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..930105613b
--- /dev/null
+++ b/data/as/30173419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAGURMARA PWSS",
+                "localname": "MAGURMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAGURMARA PWSS",
+                        "localname": "MAGURMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAGURMARA PWSS",
+                "localname": "MAGURMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAGURMARA PWSS",
+                        "localname": "MAGURMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173419/ws-services-calculation/Penalty.json b/data/as/30173419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c35d44acc5
--- /dev/null
+++ b/data/as/30173419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173419/ws-services-calculation/WCBillingSlab.json b/data/as/30173419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ce14a3b72
--- /dev/null
+++ b/data/as/30173419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173427/BillingService/BusinessService.json b/data/as/30173427/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f8e6b409a
--- /dev/null
+++ b/data/as/30173427/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173427",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173427/egov-location/boundary-data.json b/data/as/30173427/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c7ad1251e
--- /dev/null
+++ b/data/as/30173427/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173427",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALIGURI KURMIGAON PWSS",
+                "localname": "ALIGURI KURMIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALIGURI KURMIGAON PWSS",
+                        "localname": "ALIGURI KURMIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ALIGURI KURMIGAON PWSS",
+                "localname": "ALIGURI KURMIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ALIGURI KURMIGAON PWSS",
+                        "localname": "ALIGURI KURMIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173427/ws-services-calculation/Penalty.json b/data/as/30173427/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc4cbcb97b
--- /dev/null
+++ b/data/as/30173427/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173427",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173427/ws-services-calculation/WCBillingSlab.json b/data/as/30173427/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b34ca41803
--- /dev/null
+++ b/data/as/30173427/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173427",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173442/BillingService/BusinessService.json b/data/as/30173442/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a745a7a61b
--- /dev/null
+++ b/data/as/30173442/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173442",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173442/egov-location/boundary-data.json b/data/as/30173442/egov-location/boundary-data.json
new file mode 100644
index 0000000000..642acb8c08
--- /dev/null
+++ b/data/as/30173442/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173442",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARIANIA PWSS",
+                "localname": "CHARIANIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARIANIA PWSS",
+                        "localname": "CHARIANIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARIANIA PWSS",
+                "localname": "CHARIANIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARIANIA PWSS",
+                        "localname": "CHARIANIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173442/ws-services-calculation/Penalty.json b/data/as/30173442/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86699bf1ff
--- /dev/null
+++ b/data/as/30173442/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173442",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173442/ws-services-calculation/WCBillingSlab.json b/data/as/30173442/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..899ef3fa8d
--- /dev/null
+++ b/data/as/30173442/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173442",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173455/BillingService/BusinessService.json b/data/as/30173455/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b50d75af20
--- /dev/null
+++ b/data/as/30173455/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173455",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173455/egov-location/boundary-data.json b/data/as/30173455/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7961bfaa8a
--- /dev/null
+++ b/data/as/30173455/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173455",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POCHOWA GAON PWSS",
+                "localname": "POCHOWA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POCHOWA GAON PWSS",
+                        "localname": "POCHOWA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "POCHOWA GAON PWSS",
+                "localname": "POCHOWA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "POCHOWA GAON PWSS",
+                        "localname": "POCHOWA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173455/ws-services-calculation/Penalty.json b/data/as/30173455/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..792ab31f72
--- /dev/null
+++ b/data/as/30173455/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173455",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173455/ws-services-calculation/WCBillingSlab.json b/data/as/30173455/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..803c355406
--- /dev/null
+++ b/data/as/30173455/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173455",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173471/BillingService/BusinessService.json b/data/as/30173471/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9ad2e5112e
--- /dev/null
+++ b/data/as/30173471/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173471",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173471/egov-location/boundary-data.json b/data/as/30173471/egov-location/boundary-data.json
new file mode 100644
index 0000000000..86a39c3f9f
--- /dev/null
+++ b/data/as/30173471/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173471",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARTIGAON PWSS",
+                "localname": "KARTIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173471",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARTIGAON PWSS",
+                        "localname": "KARTIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARTIGAON PWSS",
+                "localname": "KARTIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173471",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARTIGAON PWSS",
+                        "localname": "KARTIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173471/ws-services-calculation/Penalty.json b/data/as/30173471/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c070625150
--- /dev/null
+++ b/data/as/30173471/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173471",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173471/ws-services-calculation/WCBillingSlab.json b/data/as/30173471/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e085ca6e34
--- /dev/null
+++ b/data/as/30173471/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173471",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173496/BillingService/BusinessService.json b/data/as/30173496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c9e4a7737c
--- /dev/null
+++ b/data/as/30173496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173496/egov-location/boundary-data.json b/data/as/30173496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c500bcd9a9
--- /dev/null
+++ b/data/as/30173496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATIAL BAHUABARI PWSS",
+                "localname": "CHATIAL BAHUABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATIAL BAHUABARI PWSS",
+                        "localname": "CHATIAL BAHUABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHATIAL BAHUABARI PWSS",
+                "localname": "CHATIAL BAHUABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHATIAL BAHUABARI PWSS",
+                        "localname": "CHATIAL BAHUABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173496/ws-services-calculation/Penalty.json b/data/as/30173496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..14c516eb53
--- /dev/null
+++ b/data/as/30173496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173496/ws-services-calculation/WCBillingSlab.json b/data/as/30173496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60a4112c55
--- /dev/null
+++ b/data/as/30173496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173509/BillingService/BusinessService.json b/data/as/30173509/BillingService/BusinessService.json
new file mode 100644
index 0000000000..818b709c01
--- /dev/null
+++ b/data/as/30173509/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173509",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173509/egov-location/boundary-data.json b/data/as/30173509/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ccfe979822
--- /dev/null
+++ b/data/as/30173509/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173509",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMIOKHIATI MALOR GAON PWSS",
+                "localname": "AMIOKHIATI MALOR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMIOKHIATI MALOR GAON PWSS",
+                        "localname": "AMIOKHIATI MALOR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMIOKHIATI MALOR GAON PWSS",
+                "localname": "AMIOKHIATI MALOR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173509",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMIOKHIATI MALOR GAON PWSS",
+                        "localname": "AMIOKHIATI MALOR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173509/ws-services-calculation/Penalty.json b/data/as/30173509/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ec6f2079d8
--- /dev/null
+++ b/data/as/30173509/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173509",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173509/ws-services-calculation/WCBillingSlab.json b/data/as/30173509/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..902dc17072
--- /dev/null
+++ b/data/as/30173509/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173509",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173535/BillingService/BusinessService.json b/data/as/30173535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..190def3fc6
--- /dev/null
+++ b/data/as/30173535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173535/egov-location/boundary-data.json b/data/as/30173535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..918c56e7dc
--- /dev/null
+++ b/data/as/30173535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON BAGALIBARI PWSS",
+                "localname": "KACHARIGAON BAGALIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON BAGALIBARI PWSS",
+                        "localname": "KACHARIGAON BAGALIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON BAGALIBARI PWSS",
+                "localname": "KACHARIGAON BAGALIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON BAGALIBARI PWSS",
+                        "localname": "KACHARIGAON BAGALIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173535/ws-services-calculation/Penalty.json b/data/as/30173535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e7c0f78456
--- /dev/null
+++ b/data/as/30173535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173535/ws-services-calculation/WCBillingSlab.json b/data/as/30173535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f6e98d5e0f
--- /dev/null
+++ b/data/as/30173535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173679/BillingService/BusinessService.json b/data/as/30173679/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4d18efa7f
--- /dev/null
+++ b/data/as/30173679/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173679",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173679/egov-location/boundary-data.json b/data/as/30173679/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3dfdb10f2
--- /dev/null
+++ b/data/as/30173679/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173679",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROKETKONA PWSS (NEW)",
+                "localname": "ROKETKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173679",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROKETKONA PWSS (NEW)",
+                        "localname": "ROKETKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROKETKONA PWSS (NEW)",
+                "localname": "ROKETKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173679",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROKETKONA PWSS (NEW)",
+                        "localname": "ROKETKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173679/ws-services-calculation/Penalty.json b/data/as/30173679/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5cc5f5f9ad
--- /dev/null
+++ b/data/as/30173679/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173679",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173679/ws-services-calculation/WCBillingSlab.json b/data/as/30173679/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27b12ed908
--- /dev/null
+++ b/data/as/30173679/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173679",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173688/BillingService/BusinessService.json b/data/as/30173688/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e3b160aa1a
--- /dev/null
+++ b/data/as/30173688/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173688",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173688/egov-location/boundary-data.json b/data/as/30173688/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f56b9cae53
--- /dev/null
+++ b/data/as/30173688/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173688",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DANGAPARA PWSS (NEW)",
+                "localname": "DANGAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173688",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DANGAPARA PWSS (NEW)",
+                        "localname": "DANGAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DANGAPARA PWSS (NEW)",
+                "localname": "DANGAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173688",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DANGAPARA PWSS (NEW)",
+                        "localname": "DANGAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173688/ws-services-calculation/Penalty.json b/data/as/30173688/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b001604ee9
--- /dev/null
+++ b/data/as/30173688/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173688",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173688/ws-services-calculation/WCBillingSlab.json b/data/as/30173688/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e7bb44ce8f
--- /dev/null
+++ b/data/as/30173688/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173688",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173698/BillingService/BusinessService.json b/data/as/30173698/BillingService/BusinessService.json
new file mode 100644
index 0000000000..29843e6c0b
--- /dev/null
+++ b/data/as/30173698/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173698",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173698/egov-location/boundary-data.json b/data/as/30173698/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bc0bc82963
--- /dev/null
+++ b/data/as/30173698/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173698",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PWSS (NEW)",
+                "localname": "AMBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173698",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PWSS (NEW)",
+                        "localname": "AMBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMBARI PWSS (NEW)",
+                "localname": "AMBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173698",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMBARI PWSS (NEW)",
+                        "localname": "AMBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173698/ws-services-calculation/Penalty.json b/data/as/30173698/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f06fab823
--- /dev/null
+++ b/data/as/30173698/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173698",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173698/ws-services-calculation/WCBillingSlab.json b/data/as/30173698/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7cc77e14f4
--- /dev/null
+++ b/data/as/30173698/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173698",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173710/BillingService/BusinessService.json b/data/as/30173710/BillingService/BusinessService.json
new file mode 100644
index 0000000000..83f829c604
--- /dev/null
+++ b/data/as/30173710/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173710",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173710/egov-location/boundary-data.json b/data/as/30173710/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e9c057598a
--- /dev/null
+++ b/data/as/30173710/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173710",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHANUBHANGA PT-I PWSS (NEW)",
+                "localname": "DHANUBHANGA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173710",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHANUBHANGA PT-I PWSS (NEW)",
+                        "localname": "DHANUBHANGA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHANUBHANGA PT-I PWSS (NEW)",
+                "localname": "DHANUBHANGA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173710",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHANUBHANGA PT-I PWSS (NEW)",
+                        "localname": "DHANUBHANGA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173710/ws-services-calculation/Penalty.json b/data/as/30173710/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d6b443f27e
--- /dev/null
+++ b/data/as/30173710/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173710",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173710/ws-services-calculation/WCBillingSlab.json b/data/as/30173710/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..efb0242d8f
--- /dev/null
+++ b/data/as/30173710/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173710",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173740/BillingService/BusinessService.json b/data/as/30173740/BillingService/BusinessService.json
new file mode 100644
index 0000000000..144d284eaf
--- /dev/null
+++ b/data/as/30173740/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173740",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173740/egov-location/boundary-data.json b/data/as/30173740/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20ed3e17b1
--- /dev/null
+++ b/data/as/30173740/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173740",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THERATHOP PWSS (NEW)",
+                "localname": "THERATHOP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THERATHOP PWSS (NEW)",
+                        "localname": "THERATHOP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THERATHOP PWSS (NEW)",
+                "localname": "THERATHOP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THERATHOP PWSS (NEW)",
+                        "localname": "THERATHOP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173740/ws-services-calculation/Penalty.json b/data/as/30173740/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..79539a03b1
--- /dev/null
+++ b/data/as/30173740/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173740",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173740/ws-services-calculation/WCBillingSlab.json b/data/as/30173740/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3994ec08ce
--- /dev/null
+++ b/data/as/30173740/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173740",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173753/BillingService/BusinessService.json b/data/as/30173753/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2a79a5ffc1
--- /dev/null
+++ b/data/as/30173753/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173753",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173753/egov-location/boundary-data.json b/data/as/30173753/egov-location/boundary-data.json
new file mode 100644
index 0000000000..886a504bad
--- /dev/null
+++ b/data/as/30173753/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173753",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHIKONA PWSS (NEW)",
+                "localname": "MEDHIKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173753",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHIKONA PWSS (NEW)",
+                        "localname": "MEDHIKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHIKONA PWSS (NEW)",
+                "localname": "MEDHIKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173753",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHIKONA PWSS (NEW)",
+                        "localname": "MEDHIKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173753/ws-services-calculation/Penalty.json b/data/as/30173753/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e76f635b3
--- /dev/null
+++ b/data/as/30173753/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173753",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173753/ws-services-calculation/WCBillingSlab.json b/data/as/30173753/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..270c488d88
--- /dev/null
+++ b/data/as/30173753/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173753",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173770/BillingService/BusinessService.json b/data/as/30173770/BillingService/BusinessService.json
new file mode 100644
index 0000000000..51bcb5561c
--- /dev/null
+++ b/data/as/30173770/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173770",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173770/egov-location/boundary-data.json b/data/as/30173770/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b27e197351
--- /dev/null
+++ b/data/as/30173770/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173770",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAKPARA 2 PWSS (NEW)",
+                "localname": "CHARAKPARA 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173770",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAKPARA 2 PWSS (NEW)",
+                        "localname": "CHARAKPARA 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAKPARA 2 PWSS (NEW)",
+                "localname": "CHARAKPARA 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173770",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAKPARA 2 PWSS (NEW)",
+                        "localname": "CHARAKPARA 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173770/ws-services-calculation/Penalty.json b/data/as/30173770/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d7b372979c
--- /dev/null
+++ b/data/as/30173770/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173770",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173770/ws-services-calculation/WCBillingSlab.json b/data/as/30173770/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6a40f201c9
--- /dev/null
+++ b/data/as/30173770/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173770",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173782/BillingService/BusinessService.json b/data/as/30173782/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d755da6eea
--- /dev/null
+++ b/data/as/30173782/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173782",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173782/egov-location/boundary-data.json b/data/as/30173782/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6a242ef5a9
--- /dev/null
+++ b/data/as/30173782/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173782",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMATIA PT-I PWSS (NEW)",
+                "localname": "BARMATIA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173782",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMATIA PT-I PWSS (NEW)",
+                        "localname": "BARMATIA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARMATIA PT-I PWSS (NEW)",
+                "localname": "BARMATIA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173782",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARMATIA PT-I PWSS (NEW)",
+                        "localname": "BARMATIA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173782/ws-services-calculation/Penalty.json b/data/as/30173782/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7584f21368
--- /dev/null
+++ b/data/as/30173782/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173782",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173782/ws-services-calculation/WCBillingSlab.json b/data/as/30173782/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d9ca365e4c
--- /dev/null
+++ b/data/as/30173782/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173782",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173794/BillingService/BusinessService.json b/data/as/30173794/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dd6b2603ed
--- /dev/null
+++ b/data/as/30173794/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173794",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173794/egov-location/boundary-data.json b/data/as/30173794/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6b3e1ff990
--- /dev/null
+++ b/data/as/30173794/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173794",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOSAN PWSS (NEW)",
+                "localname": "CHEKOSAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173794",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOSAN PWSS (NEW)",
+                        "localname": "CHEKOSAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOSAN PWSS (NEW)",
+                "localname": "CHEKOSAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173794",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOSAN PWSS (NEW)",
+                        "localname": "CHEKOSAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173794/ws-services-calculation/Penalty.json b/data/as/30173794/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..583f5b2cd5
--- /dev/null
+++ b/data/as/30173794/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173794",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173794/ws-services-calculation/WCBillingSlab.json b/data/as/30173794/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..515b5da4b5
--- /dev/null
+++ b/data/as/30173794/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173794",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173812/BillingService/BusinessService.json b/data/as/30173812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f9be7c9aa
--- /dev/null
+++ b/data/as/30173812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173812/egov-location/boundary-data.json b/data/as/30173812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f9be3d020
--- /dev/null
+++ b/data/as/30173812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI PWSS (NEW)",
+                "localname": "ROWMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI PWSS (NEW)",
+                        "localname": "ROWMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI PWSS (NEW)",
+                "localname": "ROWMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI PWSS (NEW)",
+                        "localname": "ROWMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173812/ws-services-calculation/Penalty.json b/data/as/30173812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d45fd1034
--- /dev/null
+++ b/data/as/30173812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173812/ws-services-calculation/WCBillingSlab.json b/data/as/30173812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ecd1ba77f1
--- /dev/null
+++ b/data/as/30173812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173814/BillingService/BusinessService.json b/data/as/30173814/BillingService/BusinessService.json
new file mode 100644
index 0000000000..314c8cf865
--- /dev/null
+++ b/data/as/30173814/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173814",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173814/egov-location/boundary-data.json b/data/as/30173814/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c882b721e6
--- /dev/null
+++ b/data/as/30173814/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173814",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILOBARI PWSS (NEW)",
+                "localname": "SILOBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173814",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILOBARI PWSS (NEW)",
+                        "localname": "SILOBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILOBARI PWSS (NEW)",
+                "localname": "SILOBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173814",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILOBARI PWSS (NEW)",
+                        "localname": "SILOBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173814/ws-services-calculation/Penalty.json b/data/as/30173814/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..113c399d15
--- /dev/null
+++ b/data/as/30173814/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173814",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173814/ws-services-calculation/WCBillingSlab.json b/data/as/30173814/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..89d7c9027a
--- /dev/null
+++ b/data/as/30173814/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173814",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173816/BillingService/BusinessService.json b/data/as/30173816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c70a84fdc1
--- /dev/null
+++ b/data/as/30173816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173816/egov-location/boundary-data.json b/data/as/30173816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8d5c63e414
--- /dev/null
+++ b/data/as/30173816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ASSAM PARA PWSS (NEW)",
+                "localname": "ASSAM PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ASSAM PARA PWSS (NEW)",
+                        "localname": "ASSAM PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ASSAM PARA PWSS (NEW)",
+                "localname": "ASSAM PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ASSAM PARA PWSS (NEW)",
+                        "localname": "ASSAM PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173816/ws-services-calculation/Penalty.json b/data/as/30173816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..60e6f63f2c
--- /dev/null
+++ b/data/as/30173816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173816/ws-services-calculation/WCBillingSlab.json b/data/as/30173816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7d53d8bd51
--- /dev/null
+++ b/data/as/30173816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173961/BillingService/BusinessService.json b/data/as/30173961/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a96d42b125
--- /dev/null
+++ b/data/as/30173961/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173961",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173961/egov-location/boundary-data.json b/data/as/30173961/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0534f1d162
--- /dev/null
+++ b/data/as/30173961/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173961",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILDUBI PT-I PWSS (NEW)",
+                "localname": "SILDUBI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173961",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILDUBI PT-I PWSS (NEW)",
+                        "localname": "SILDUBI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILDUBI PT-I PWSS (NEW)",
+                "localname": "SILDUBI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173961",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILDUBI PT-I PWSS (NEW)",
+                        "localname": "SILDUBI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173961/ws-services-calculation/Penalty.json b/data/as/30173961/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..031f4ac1e0
--- /dev/null
+++ b/data/as/30173961/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173961",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173961/ws-services-calculation/WCBillingSlab.json b/data/as/30173961/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e6d318d09
--- /dev/null
+++ b/data/as/30173961/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173961",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173962/BillingService/BusinessService.json b/data/as/30173962/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85aebdb648
--- /dev/null
+++ b/data/as/30173962/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173962",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173962/egov-location/boundary-data.json b/data/as/30173962/egov-location/boundary-data.json
new file mode 100644
index 0000000000..686698922a
--- /dev/null
+++ b/data/as/30173962/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173962",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB-ZIRA PWSS (NEW)",
+                "localname": "PUB-ZIRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173962",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB-ZIRA PWSS (NEW)",
+                        "localname": "PUB-ZIRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB-ZIRA PWSS (NEW)",
+                "localname": "PUB-ZIRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173962",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB-ZIRA PWSS (NEW)",
+                        "localname": "PUB-ZIRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173962/ws-services-calculation/Penalty.json b/data/as/30173962/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..257ddf2549
--- /dev/null
+++ b/data/as/30173962/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173962",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173962/ws-services-calculation/WCBillingSlab.json b/data/as/30173962/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1118ef81f8
--- /dev/null
+++ b/data/as/30173962/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173962",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173963/BillingService/BusinessService.json b/data/as/30173963/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6341ac7f23
--- /dev/null
+++ b/data/as/30173963/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173963",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173963/egov-location/boundary-data.json b/data/as/30173963/egov-location/boundary-data.json
new file mode 100644
index 0000000000..303299a623
--- /dev/null
+++ b/data/as/30173963/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173963",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIPARA II PWSS (NEW)",
+                "localname": "JOGIPARA II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173963",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIPARA II PWSS (NEW)",
+                        "localname": "JOGIPARA II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGIPARA II PWSS (NEW)",
+                "localname": "JOGIPARA II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173963",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGIPARA II PWSS (NEW)",
+                        "localname": "JOGIPARA II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173963/ws-services-calculation/Penalty.json b/data/as/30173963/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..91f8bd3ed4
--- /dev/null
+++ b/data/as/30173963/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173963",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173963/ws-services-calculation/WCBillingSlab.json b/data/as/30173963/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9dcb32d731
--- /dev/null
+++ b/data/as/30173963/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173963",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173965/BillingService/BusinessService.json b/data/as/30173965/BillingService/BusinessService.json
new file mode 100644
index 0000000000..627f7cea96
--- /dev/null
+++ b/data/as/30173965/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173965",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173965/egov-location/boundary-data.json b/data/as/30173965/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7bedeb25f0
--- /dev/null
+++ b/data/as/30173965/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173965",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                "localname": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                        "localname": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                "localname": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                        "localname": "BAR MATIA PT-II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173965/ws-services-calculation/Penalty.json b/data/as/30173965/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62cb3b1fef
--- /dev/null
+++ b/data/as/30173965/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173965",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173965/ws-services-calculation/WCBillingSlab.json b/data/as/30173965/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..73af42d8ae
--- /dev/null
+++ b/data/as/30173965/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173965",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173967/BillingService/BusinessService.json b/data/as/30173967/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d644c61379
--- /dev/null
+++ b/data/as/30173967/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173967",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173967/egov-location/boundary-data.json b/data/as/30173967/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b88c09e4f
--- /dev/null
+++ b/data/as/30173967/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173967",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                "localname": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173967",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                        "localname": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                "localname": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173967",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                        "localname": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173967/ws-services-calculation/Penalty.json b/data/as/30173967/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bc12725159
--- /dev/null
+++ b/data/as/30173967/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173967",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173967/ws-services-calculation/WCBillingSlab.json b/data/as/30173967/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a39025e552
--- /dev/null
+++ b/data/as/30173967/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173967",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173972/BillingService/BusinessService.json b/data/as/30173972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5f2989c54
--- /dev/null
+++ b/data/as/30173972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173972/egov-location/boundary-data.json b/data/as/30173972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ee17ae00bb
--- /dev/null
+++ b/data/as/30173972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARTULI PWSS (NEW)",
+                "localname": "PAHARTULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARTULI PWSS (NEW)",
+                        "localname": "PAHARTULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHARTULI PWSS (NEW)",
+                "localname": "PAHARTULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHARTULI PWSS (NEW)",
+                        "localname": "PAHARTULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173972/ws-services-calculation/Penalty.json b/data/as/30173972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f8b1d0030
--- /dev/null
+++ b/data/as/30173972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173972/ws-services-calculation/WCBillingSlab.json b/data/as/30173972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a852114e28
--- /dev/null
+++ b/data/as/30173972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173973/BillingService/BusinessService.json b/data/as/30173973/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57f41f6698
--- /dev/null
+++ b/data/as/30173973/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173973",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173973/egov-location/boundary-data.json b/data/as/30173973/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7b74f4f17
--- /dev/null
+++ b/data/as/30173973/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173973",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAPARA PT-I PWSS (NEW)",
+                "localname": "DARAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAPARA PT-I PWSS (NEW)",
+                        "localname": "DARAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAPARA PT-I PWSS (NEW)",
+                "localname": "DARAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAPARA PT-I PWSS (NEW)",
+                        "localname": "DARAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173973/ws-services-calculation/Penalty.json b/data/as/30173973/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..551ff48011
--- /dev/null
+++ b/data/as/30173973/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173973",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173973/ws-services-calculation/WCBillingSlab.json b/data/as/30173973/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6a4b6b971
--- /dev/null
+++ b/data/as/30173973/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173973",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173975/BillingService/BusinessService.json b/data/as/30173975/BillingService/BusinessService.json
new file mode 100644
index 0000000000..546412850b
--- /dev/null
+++ b/data/as/30173975/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173975",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173975/egov-location/boundary-data.json b/data/as/30173975/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2da450953c
--- /dev/null
+++ b/data/as/30173975/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173975",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENGADING LETKUBARI PWSS (NEW)",
+                "localname": "SENGADING LETKUBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENGADING LETKUBARI PWSS (NEW)",
+                        "localname": "SENGADING LETKUBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENGADING LETKUBARI PWSS (NEW)",
+                "localname": "SENGADING LETKUBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173975",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENGADING LETKUBARI PWSS (NEW)",
+                        "localname": "SENGADING LETKUBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173975/ws-services-calculation/Penalty.json b/data/as/30173975/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37c635c8d3
--- /dev/null
+++ b/data/as/30173975/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173975",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173975/ws-services-calculation/WCBillingSlab.json b/data/as/30173975/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f77890a09b
--- /dev/null
+++ b/data/as/30173975/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173975",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173977/BillingService/BusinessService.json b/data/as/30173977/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9906ec5451
--- /dev/null
+++ b/data/as/30173977/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173977",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173977/egov-location/boundary-data.json b/data/as/30173977/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a4bc7bb4d
--- /dev/null
+++ b/data/as/30173977/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173977",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "REFUGIPARA PWSS (NEW)",
+                "localname": "REFUGIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "REFUGIPARA PWSS (NEW)",
+                        "localname": "REFUGIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "REFUGIPARA PWSS (NEW)",
+                "localname": "REFUGIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "REFUGIPARA PWSS (NEW)",
+                        "localname": "REFUGIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173977/ws-services-calculation/Penalty.json b/data/as/30173977/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e9f2ad588
--- /dev/null
+++ b/data/as/30173977/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173977",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173977/ws-services-calculation/WCBillingSlab.json b/data/as/30173977/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b00b79b284
--- /dev/null
+++ b/data/as/30173977/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173977",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173978/BillingService/BusinessService.json b/data/as/30173978/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42c7a7fe8a
--- /dev/null
+++ b/data/as/30173978/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173978",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173978/egov-location/boundary-data.json b/data/as/30173978/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43a358b7e8
--- /dev/null
+++ b/data/as/30173978/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173978",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARKASI DAMAS PWSS",
+                "localname": "KARKASI DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173978",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARKASI DAMAS PWSS",
+                        "localname": "KARKASI DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARKASI DAMAS PWSS",
+                "localname": "KARKASI DAMAS PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173978",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARKASI DAMAS PWSS",
+                        "localname": "KARKASI DAMAS PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173978/ws-services-calculation/Penalty.json b/data/as/30173978/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e009f99705
--- /dev/null
+++ b/data/as/30173978/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173978",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173978/ws-services-calculation/WCBillingSlab.json b/data/as/30173978/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1be0e1a759
--- /dev/null
+++ b/data/as/30173978/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173978",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173979/BillingService/BusinessService.json b/data/as/30173979/BillingService/BusinessService.json
new file mode 100644
index 0000000000..556e3119f7
--- /dev/null
+++ b/data/as/30173979/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173979",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173979/egov-location/boundary-data.json b/data/as/30173979/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d5b39070b9
--- /dev/null
+++ b/data/as/30173979/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173979",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPERTOLA PT-II PWSS (NEW)",
+                "localname": "UPPERTOLA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173979",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPERTOLA PT-II PWSS (NEW)",
+                        "localname": "UPPERTOLA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPERTOLA PT-II PWSS (NEW)",
+                "localname": "UPPERTOLA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173979",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPERTOLA PT-II PWSS (NEW)",
+                        "localname": "UPPERTOLA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173979/ws-services-calculation/Penalty.json b/data/as/30173979/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de2bde49b9
--- /dev/null
+++ b/data/as/30173979/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173979",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173979/ws-services-calculation/WCBillingSlab.json b/data/as/30173979/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..889a1f9601
--- /dev/null
+++ b/data/as/30173979/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173979",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173980/BillingService/BusinessService.json b/data/as/30173980/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e50813b25
--- /dev/null
+++ b/data/as/30173980/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173980",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173980/egov-location/boundary-data.json b/data/as/30173980/egov-location/boundary-data.json
new file mode 100644
index 0000000000..688dc74cc6
--- /dev/null
+++ b/data/as/30173980/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173980",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKRAPARA 1 PWSS (NEW)",
+                "localname": "BAKRAPARA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173980",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKRAPARA 1 PWSS (NEW)",
+                        "localname": "BAKRAPARA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKRAPARA 1 PWSS (NEW)",
+                "localname": "BAKRAPARA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173980",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKRAPARA 1 PWSS (NEW)",
+                        "localname": "BAKRAPARA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173980/ws-services-calculation/Penalty.json b/data/as/30173980/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a8929b163
--- /dev/null
+++ b/data/as/30173980/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173980",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173980/ws-services-calculation/WCBillingSlab.json b/data/as/30173980/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d0b87ee95
--- /dev/null
+++ b/data/as/30173980/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173980",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173981/BillingService/BusinessService.json b/data/as/30173981/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17c13240d1
--- /dev/null
+++ b/data/as/30173981/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173981",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173981/egov-location/boundary-data.json b/data/as/30173981/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd1ed48174
--- /dev/null
+++ b/data/as/30173981/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173981",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAPARA PT-II PWSS (NEW)",
+                "localname": "DARAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173981",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAPARA PT-II PWSS (NEW)",
+                        "localname": "DARAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAPARA PT-II PWSS (NEW)",
+                "localname": "DARAPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173981",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAPARA PT-II PWSS (NEW)",
+                        "localname": "DARAPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173981/ws-services-calculation/Penalty.json b/data/as/30173981/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..875d119879
--- /dev/null
+++ b/data/as/30173981/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173981",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173981/ws-services-calculation/WCBillingSlab.json b/data/as/30173981/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..76b886b42c
--- /dev/null
+++ b/data/as/30173981/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173981",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173982/BillingService/BusinessService.json b/data/as/30173982/BillingService/BusinessService.json
new file mode 100644
index 0000000000..257211c3e4
--- /dev/null
+++ b/data/as/30173982/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173982",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173982/egov-location/boundary-data.json b/data/as/30173982/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b62a05d50f
--- /dev/null
+++ b/data/as/30173982/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173982",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA PT -II NO. 3 PWSS (NEW)",
+                "localname": "KHARA PT -II NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173982",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA PT -II NO. 3 PWSS (NEW)",
+                        "localname": "KHARA PT -II NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA PT -II NO. 3 PWSS (NEW)",
+                "localname": "KHARA PT -II NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173982",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA PT -II NO. 3 PWSS (NEW)",
+                        "localname": "KHARA PT -II NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173982/ws-services-calculation/Penalty.json b/data/as/30173982/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c97d207a3
--- /dev/null
+++ b/data/as/30173982/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173982",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173982/ws-services-calculation/WCBillingSlab.json b/data/as/30173982/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e349d0706f
--- /dev/null
+++ b/data/as/30173982/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173982",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173983/BillingService/BusinessService.json b/data/as/30173983/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e472b4562
--- /dev/null
+++ b/data/as/30173983/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173983",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173983/egov-location/boundary-data.json b/data/as/30173983/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3de5ae5e16
--- /dev/null
+++ b/data/as/30173983/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173983",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                "localname": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                        "localname": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                "localname": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                        "localname": "KHARA BAGARIBARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173983/ws-services-calculation/Penalty.json b/data/as/30173983/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d0834c61fb
--- /dev/null
+++ b/data/as/30173983/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173983",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173983/ws-services-calculation/WCBillingSlab.json b/data/as/30173983/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..58cff7178d
--- /dev/null
+++ b/data/as/30173983/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173983",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173984/BillingService/BusinessService.json b/data/as/30173984/BillingService/BusinessService.json
new file mode 100644
index 0000000000..18cd555c20
--- /dev/null
+++ b/data/as/30173984/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30173984",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173984/egov-location/boundary-data.json b/data/as/30173984/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fcb5c017a5
--- /dev/null
+++ b/data/as/30173984/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30173984",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPERTOLA PT-I PWSS (NEW)",
+                "localname": "UPPERTOLA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPERTOLA PT-I PWSS (NEW)",
+                        "localname": "UPPERTOLA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPERTOLA PT-I PWSS (NEW)",
+                "localname": "UPPERTOLA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30173984",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPERTOLA PT-I PWSS (NEW)",
+                        "localname": "UPPERTOLA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173984/ws-services-calculation/Penalty.json b/data/as/30173984/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a3bbc3103d
--- /dev/null
+++ b/data/as/30173984/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30173984",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30173984/ws-services-calculation/WCBillingSlab.json b/data/as/30173984/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5b7d51707c
--- /dev/null
+++ b/data/as/30173984/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30173984",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174052/BillingService/BusinessService.json b/data/as/30174052/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1611747467
--- /dev/null
+++ b/data/as/30174052/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174052",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174052/egov-location/boundary-data.json b/data/as/30174052/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7328217e9c
--- /dev/null
+++ b/data/as/30174052/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174052",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASTINAPUR PWSS (NEW)",
+                "localname": "HASTINAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASTINAPUR PWSS (NEW)",
+                        "localname": "HASTINAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASTINAPUR PWSS (NEW)",
+                "localname": "HASTINAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174052",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASTINAPUR PWSS (NEW)",
+                        "localname": "HASTINAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174052/ws-services-calculation/Penalty.json b/data/as/30174052/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e8b1c93228
--- /dev/null
+++ b/data/as/30174052/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174052",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174052/ws-services-calculation/WCBillingSlab.json b/data/as/30174052/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c299411dd5
--- /dev/null
+++ b/data/as/30174052/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174052",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174053/BillingService/BusinessService.json b/data/as/30174053/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e0e2b710db
--- /dev/null
+++ b/data/as/30174053/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174053",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174053/egov-location/boundary-data.json b/data/as/30174053/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d2581b88ce
--- /dev/null
+++ b/data/as/30174053/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174053",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKOLA WEST PWSS",
+                "localname": "BAKOLA WEST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKOLA WEST PWSS",
+                        "localname": "BAKOLA WEST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKOLA WEST PWSS",
+                "localname": "BAKOLA WEST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKOLA WEST PWSS",
+                        "localname": "BAKOLA WEST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174053/ws-services-calculation/Penalty.json b/data/as/30174053/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dab8cd1be2
--- /dev/null
+++ b/data/as/30174053/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174053",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174053/ws-services-calculation/WCBillingSlab.json b/data/as/30174053/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..efbd1cfae0
--- /dev/null
+++ b/data/as/30174053/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174053",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174055/BillingService/BusinessService.json b/data/as/30174055/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a2fc5fb82d
--- /dev/null
+++ b/data/as/30174055/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174055",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174055/egov-location/boundary-data.json b/data/as/30174055/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b212fff61
--- /dev/null
+++ b/data/as/30174055/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174055",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAFLA CHUBURI PWSS",
+                "localname": "KAFLA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAFLA CHUBURI PWSS",
+                        "localname": "KAFLA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAFLA CHUBURI PWSS",
+                "localname": "KAFLA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAFLA CHUBURI PWSS",
+                        "localname": "KAFLA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174055/ws-services-calculation/Penalty.json b/data/as/30174055/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..31362fd43c
--- /dev/null
+++ b/data/as/30174055/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174055",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174055/ws-services-calculation/WCBillingSlab.json b/data/as/30174055/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10b9e64e31
--- /dev/null
+++ b/data/as/30174055/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174055",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174058/BillingService/BusinessService.json b/data/as/30174058/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0ea6c6905d
--- /dev/null
+++ b/data/as/30174058/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174058",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174058/egov-location/boundary-data.json b/data/as/30174058/egov-location/boundary-data.json
new file mode 100644
index 0000000000..105aa5e168
--- /dev/null
+++ b/data/as/30174058/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174058",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLON PUKHURI -B PWSS",
+                "localname": "MOLON PUKHURI -B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLON PUKHURI -B PWSS",
+                        "localname": "MOLON PUKHURI -B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOLON PUKHURI -B PWSS",
+                "localname": "MOLON PUKHURI -B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOLON PUKHURI -B PWSS",
+                        "localname": "MOLON PUKHURI -B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174058/ws-services-calculation/Penalty.json b/data/as/30174058/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc9c6a2dac
--- /dev/null
+++ b/data/as/30174058/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174058",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174058/ws-services-calculation/WCBillingSlab.json b/data/as/30174058/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..61116e197f
--- /dev/null
+++ b/data/as/30174058/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174058",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174059/BillingService/BusinessService.json b/data/as/30174059/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd2af1c118
--- /dev/null
+++ b/data/as/30174059/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174059",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174059/egov-location/boundary-data.json b/data/as/30174059/egov-location/boundary-data.json
new file mode 100644
index 0000000000..191958a1b6
--- /dev/null
+++ b/data/as/30174059/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174059",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGELIMARA BISHNUPUR PWSS",
+                "localname": "CHENGELIMARA BISHNUPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGELIMARA BISHNUPUR PWSS",
+                        "localname": "CHENGELIMARA BISHNUPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGELIMARA BISHNUPUR PWSS",
+                "localname": "CHENGELIMARA BISHNUPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGELIMARA BISHNUPUR PWSS",
+                        "localname": "CHENGELIMARA BISHNUPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174059/ws-services-calculation/Penalty.json b/data/as/30174059/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..50a1bdb809
--- /dev/null
+++ b/data/as/30174059/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174059",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174059/ws-services-calculation/WCBillingSlab.json b/data/as/30174059/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..51620f3ae2
--- /dev/null
+++ b/data/as/30174059/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174059",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174062/BillingService/BusinessService.json b/data/as/30174062/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad3c3c2642
--- /dev/null
+++ b/data/as/30174062/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174062",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174062/egov-location/boundary-data.json b/data/as/30174062/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c167567d1
--- /dev/null
+++ b/data/as/30174062/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174062",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASSIGAON MOHMORA PWSS",
+                "localname": "PASSIGAON MOHMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASSIGAON MOHMORA PWSS",
+                        "localname": "PASSIGAON MOHMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASSIGAON MOHMORA PWSS",
+                "localname": "PASSIGAON MOHMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASSIGAON MOHMORA PWSS",
+                        "localname": "PASSIGAON MOHMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174062/ws-services-calculation/Penalty.json b/data/as/30174062/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..93961f9e2d
--- /dev/null
+++ b/data/as/30174062/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174062",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174062/ws-services-calculation/WCBillingSlab.json b/data/as/30174062/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e73c437b43
--- /dev/null
+++ b/data/as/30174062/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174062",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174064/BillingService/BusinessService.json b/data/as/30174064/BillingService/BusinessService.json
new file mode 100644
index 0000000000..863a0c1f9b
--- /dev/null
+++ b/data/as/30174064/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174064",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174064/egov-location/boundary-data.json b/data/as/30174064/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e37a78111b
--- /dev/null
+++ b/data/as/30174064/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174064",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI BALIJAN MPWSS",
+                "localname": "DIGHALI BALIJAN MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174064",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI BALIJAN MPWSS",
+                        "localname": "DIGHALI BALIJAN MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALI BALIJAN MPWSS",
+                "localname": "DIGHALI BALIJAN MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174064",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALI BALIJAN MPWSS",
+                        "localname": "DIGHALI BALIJAN MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174064/ws-services-calculation/Penalty.json b/data/as/30174064/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15faceb0d6
--- /dev/null
+++ b/data/as/30174064/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174064",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174064/ws-services-calculation/WCBillingSlab.json b/data/as/30174064/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9bee5c04de
--- /dev/null
+++ b/data/as/30174064/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174064",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174065/BillingService/BusinessService.json b/data/as/30174065/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4240230d9c
--- /dev/null
+++ b/data/as/30174065/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174065",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174065/egov-location/boundary-data.json b/data/as/30174065/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7376c4746a
--- /dev/null
+++ b/data/as/30174065/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174065",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR MATIA PT-II PWSS (NEW)",
+                "localname": "BAR MATIA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR MATIA PT-II PWSS (NEW)",
+                        "localname": "BAR MATIA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR MATIA PT-II PWSS (NEW)",
+                "localname": "BAR MATIA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174065",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR MATIA PT-II PWSS (NEW)",
+                        "localname": "BAR MATIA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174065/ws-services-calculation/Penalty.json b/data/as/30174065/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a441332070
--- /dev/null
+++ b/data/as/30174065/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174065",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174065/ws-services-calculation/WCBillingSlab.json b/data/as/30174065/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1292df03ef
--- /dev/null
+++ b/data/as/30174065/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174065",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174068/BillingService/BusinessService.json b/data/as/30174068/BillingService/BusinessService.json
new file mode 100644
index 0000000000..349c46ec89
--- /dev/null
+++ b/data/as/30174068/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174068",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174068/egov-location/boundary-data.json b/data/as/30174068/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e849e68581
--- /dev/null
+++ b/data/as/30174068/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174068",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER KACHARI EAST MPWSS",
+                "localname": "UPPER KACHARI EAST MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER KACHARI EAST MPWSS",
+                        "localname": "UPPER KACHARI EAST MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER KACHARI EAST MPWSS",
+                "localname": "UPPER KACHARI EAST MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER KACHARI EAST MPWSS",
+                        "localname": "UPPER KACHARI EAST MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174068/ws-services-calculation/Penalty.json b/data/as/30174068/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94b172c4de
--- /dev/null
+++ b/data/as/30174068/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174068",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174068/ws-services-calculation/WCBillingSlab.json b/data/as/30174068/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..444206c853
--- /dev/null
+++ b/data/as/30174068/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174068",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174070/BillingService/BusinessService.json b/data/as/30174070/BillingService/BusinessService.json
new file mode 100644
index 0000000000..846f5397ec
--- /dev/null
+++ b/data/as/30174070/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174070",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174070/egov-location/boundary-data.json b/data/as/30174070/egov-location/boundary-data.json
new file mode 100644
index 0000000000..57125a5754
--- /dev/null
+++ b/data/as/30174070/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174070",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIPOTA 10 NO. LINE MPWSS",
+                "localname": "PANIPOTA 10 NO. LINE MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIPOTA 10 NO. LINE MPWSS",
+                        "localname": "PANIPOTA 10 NO. LINE MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANIPOTA 10 NO. LINE MPWSS",
+                "localname": "PANIPOTA 10 NO. LINE MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANIPOTA 10 NO. LINE MPWSS",
+                        "localname": "PANIPOTA 10 NO. LINE MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174070/ws-services-calculation/Penalty.json b/data/as/30174070/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fb6d26d4dd
--- /dev/null
+++ b/data/as/30174070/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174070",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174070/ws-services-calculation/WCBillingSlab.json b/data/as/30174070/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e618f5e23
--- /dev/null
+++ b/data/as/30174070/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174070",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174072/BillingService/BusinessService.json b/data/as/30174072/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a9e2de75ea
--- /dev/null
+++ b/data/as/30174072/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174072",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174072/egov-location/boundary-data.json b/data/as/30174072/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26ff65df0f
--- /dev/null
+++ b/data/as/30174072/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174072",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENSUWA PWSS",
+                "localname": "SENSUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENSUWA PWSS",
+                        "localname": "SENSUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENSUWA PWSS",
+                "localname": "SENSUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENSUWA PWSS",
+                        "localname": "SENSUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174072/ws-services-calculation/Penalty.json b/data/as/30174072/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d2f044aa6c
--- /dev/null
+++ b/data/as/30174072/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174072",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174072/ws-services-calculation/WCBillingSlab.json b/data/as/30174072/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e172fe7c62
--- /dev/null
+++ b/data/as/30174072/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174072",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174082/BillingService/BusinessService.json b/data/as/30174082/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d2307a9f08
--- /dev/null
+++ b/data/as/30174082/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174082",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174082/egov-location/boundary-data.json b/data/as/30174082/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b4dbb9d89f
--- /dev/null
+++ b/data/as/30174082/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174082",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUHOLA GAON B MPWSS",
+                "localname": "OUHOLA GAON B MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174082",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUHOLA GAON B MPWSS",
+                        "localname": "OUHOLA GAON B MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUHOLA GAON B MPWSS",
+                "localname": "OUHOLA GAON B MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174082",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUHOLA GAON B MPWSS",
+                        "localname": "OUHOLA GAON B MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174082/ws-services-calculation/Penalty.json b/data/as/30174082/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6bfa29496e
--- /dev/null
+++ b/data/as/30174082/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174082",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174082/ws-services-calculation/WCBillingSlab.json b/data/as/30174082/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8406a1c4e8
--- /dev/null
+++ b/data/as/30174082/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174082",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174084/BillingService/BusinessService.json b/data/as/30174084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aafdd0a439
--- /dev/null
+++ b/data/as/30174084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174084/egov-location/boundary-data.json b/data/as/30174084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8d85e087d9
--- /dev/null
+++ b/data/as/30174084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAHIBARI GAROPARA PWSS (NEW)",
+                "localname": "KAHIBARI GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAHIBARI GAROPARA PWSS (NEW)",
+                        "localname": "KAHIBARI GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAHIBARI GAROPARA PWSS (NEW)",
+                "localname": "KAHIBARI GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAHIBARI GAROPARA PWSS (NEW)",
+                        "localname": "KAHIBARI GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174084/ws-services-calculation/Penalty.json b/data/as/30174084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..008610ea4e
--- /dev/null
+++ b/data/as/30174084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174084/ws-services-calculation/WCBillingSlab.json b/data/as/30174084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0b05dfc87
--- /dev/null
+++ b/data/as/30174084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174085/BillingService/BusinessService.json b/data/as/30174085/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b3d40fbfb
--- /dev/null
+++ b/data/as/30174085/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174085",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174085/egov-location/boundary-data.json b/data/as/30174085/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d795df8e02
--- /dev/null
+++ b/data/as/30174085/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174085",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUAMARA PWSS",
+                "localname": "KUAMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174085",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUAMARA PWSS",
+                        "localname": "KUAMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUAMARA PWSS",
+                "localname": "KUAMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174085",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUAMARA PWSS",
+                        "localname": "KUAMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174085/ws-services-calculation/Penalty.json b/data/as/30174085/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8543ccfed9
--- /dev/null
+++ b/data/as/30174085/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174085",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174085/ws-services-calculation/WCBillingSlab.json b/data/as/30174085/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..19aff23502
--- /dev/null
+++ b/data/as/30174085/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174085",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174088/BillingService/BusinessService.json b/data/as/30174088/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9bbe7798d2
--- /dev/null
+++ b/data/as/30174088/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174088",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174088/egov-location/boundary-data.json b/data/as/30174088/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f5b77354bf
--- /dev/null
+++ b/data/as/30174088/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174088",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 KATHALGURI MPWSS",
+                "localname": "NO. 2 KATHALGURI MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 KATHALGURI MPWSS",
+                        "localname": "NO. 2 KATHALGURI MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 KATHALGURI MPWSS",
+                "localname": "NO. 2 KATHALGURI MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174088",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 KATHALGURI MPWSS",
+                        "localname": "NO. 2 KATHALGURI MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174088/ws-services-calculation/Penalty.json b/data/as/30174088/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aa96d5287f
--- /dev/null
+++ b/data/as/30174088/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174088",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174088/ws-services-calculation/WCBillingSlab.json b/data/as/30174088/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c90afcfb43
--- /dev/null
+++ b/data/as/30174088/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174088",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174094/BillingService/BusinessService.json b/data/as/30174094/BillingService/BusinessService.json
new file mode 100644
index 0000000000..972065bf93
--- /dev/null
+++ b/data/as/30174094/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174094",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174094/egov-location/boundary-data.json b/data/as/30174094/egov-location/boundary-data.json
new file mode 100644
index 0000000000..23e29f2f84
--- /dev/null
+++ b/data/as/30174094/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174094",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI HAT KHOLA PWSS",
+                "localname": "BARJULI HAT KHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174094",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI HAT KHOLA PWSS",
+                        "localname": "BARJULI HAT KHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARJULI HAT KHOLA PWSS",
+                "localname": "BARJULI HAT KHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174094",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARJULI HAT KHOLA PWSS",
+                        "localname": "BARJULI HAT KHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174094/ws-services-calculation/Penalty.json b/data/as/30174094/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..474ba3088f
--- /dev/null
+++ b/data/as/30174094/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174094",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174094/ws-services-calculation/WCBillingSlab.json b/data/as/30174094/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68d60d2339
--- /dev/null
+++ b/data/as/30174094/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174094",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174097/BillingService/BusinessService.json b/data/as/30174097/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98d28c5c67
--- /dev/null
+++ b/data/as/30174097/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174097",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174097/egov-location/boundary-data.json b/data/as/30174097/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06bb5a4bb3
--- /dev/null
+++ b/data/as/30174097/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174097",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHULAPADUNG GARDEN PWSS",
+                "localname": "DHULAPADUNG GARDEN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174097",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHULAPADUNG GARDEN PWSS",
+                        "localname": "DHULAPADUNG GARDEN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHULAPADUNG GARDEN PWSS",
+                "localname": "DHULAPADUNG GARDEN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174097",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHULAPADUNG GARDEN PWSS",
+                        "localname": "DHULAPADUNG GARDEN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174097/ws-services-calculation/Penalty.json b/data/as/30174097/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d4ab1a6518
--- /dev/null
+++ b/data/as/30174097/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174097",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174097/ws-services-calculation/WCBillingSlab.json b/data/as/30174097/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b6c80b290
--- /dev/null
+++ b/data/as/30174097/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174097",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174123/BillingService/BusinessService.json b/data/as/30174123/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9e84cd99ae
--- /dev/null
+++ b/data/as/30174123/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174123",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174123/egov-location/boundary-data.json b/data/as/30174123/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3e2e16d75
--- /dev/null
+++ b/data/as/30174123/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174123",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHANA PHULAGURI PWSS",
+                "localname": "GHANA PHULAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174123",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHANA PHULAGURI PWSS",
+                        "localname": "GHANA PHULAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHANA PHULAGURI PWSS",
+                "localname": "GHANA PHULAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174123",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHANA PHULAGURI PWSS",
+                        "localname": "GHANA PHULAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174123/ws-services-calculation/Penalty.json b/data/as/30174123/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee27fb9ebb
--- /dev/null
+++ b/data/as/30174123/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174123",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174123/ws-services-calculation/WCBillingSlab.json b/data/as/30174123/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1410b68a19
--- /dev/null
+++ b/data/as/30174123/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174123",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174125/BillingService/BusinessService.json b/data/as/30174125/BillingService/BusinessService.json
new file mode 100644
index 0000000000..495b82ad70
--- /dev/null
+++ b/data/as/30174125/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174125",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174125/egov-location/boundary-data.json b/data/as/30174125/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf6efe7902
--- /dev/null
+++ b/data/as/30174125/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174125",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MERENA BORABHUYAN PART 1 PWSS",
+                "localname": "MERENA BORABHUYAN PART 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MERENA BORABHUYAN PART 1 PWSS",
+                        "localname": "MERENA BORABHUYAN PART 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MERENA BORABHUYAN PART 1 PWSS",
+                "localname": "MERENA BORABHUYAN PART 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174125",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MERENA BORABHUYAN PART 1 PWSS",
+                        "localname": "MERENA BORABHUYAN PART 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174125/ws-services-calculation/Penalty.json b/data/as/30174125/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0fd6797aa3
--- /dev/null
+++ b/data/as/30174125/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174125",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174125/ws-services-calculation/WCBillingSlab.json b/data/as/30174125/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03f7a68f8b
--- /dev/null
+++ b/data/as/30174125/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174125",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174133/BillingService/BusinessService.json b/data/as/30174133/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b1118d5fbe
--- /dev/null
+++ b/data/as/30174133/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174133",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174133/egov-location/boundary-data.json b/data/as/30174133/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b82d70f3ae
--- /dev/null
+++ b/data/as/30174133/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174133",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALBOLA PWSS (NEW)",
+                "localname": "BALBOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALBOLA PWSS (NEW)",
+                        "localname": "BALBOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALBOLA PWSS (NEW)",
+                "localname": "BALBOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174133",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALBOLA PWSS (NEW)",
+                        "localname": "BALBOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174133/ws-services-calculation/Penalty.json b/data/as/30174133/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e561c2724
--- /dev/null
+++ b/data/as/30174133/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174133",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174133/ws-services-calculation/WCBillingSlab.json b/data/as/30174133/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fc34b0390
--- /dev/null
+++ b/data/as/30174133/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174133",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174139/BillingService/BusinessService.json b/data/as/30174139/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bbd9794eec
--- /dev/null
+++ b/data/as/30174139/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174139",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174139/egov-location/boundary-data.json b/data/as/30174139/egov-location/boundary-data.json
new file mode 100644
index 0000000000..99ad7281ca
--- /dev/null
+++ b/data/as/30174139/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174139",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAI BAGAN PWSS",
+                "localname": "MONAI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174139",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAI BAGAN PWSS",
+                        "localname": "MONAI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONAI BAGAN PWSS",
+                "localname": "MONAI BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174139",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONAI BAGAN PWSS",
+                        "localname": "MONAI BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174139/ws-services-calculation/Penalty.json b/data/as/30174139/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a6f9aaba5
--- /dev/null
+++ b/data/as/30174139/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174139",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174139/ws-services-calculation/WCBillingSlab.json b/data/as/30174139/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d558c7d2a1
--- /dev/null
+++ b/data/as/30174139/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174139",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174143/BillingService/BusinessService.json b/data/as/30174143/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ff7fef5de
--- /dev/null
+++ b/data/as/30174143/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174143",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174143/egov-location/boundary-data.json b/data/as/30174143/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8cc88c6339
--- /dev/null
+++ b/data/as/30174143/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174143",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DA-ATI PWSS",
+                "localname": "NEW DA-ATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DA-ATI PWSS",
+                        "localname": "NEW DA-ATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DA-ATI PWSS",
+                "localname": "NEW DA-ATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DA-ATI PWSS",
+                        "localname": "NEW DA-ATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174143/ws-services-calculation/Penalty.json b/data/as/30174143/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..61942d7f6f
--- /dev/null
+++ b/data/as/30174143/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174143",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174143/ws-services-calculation/WCBillingSlab.json b/data/as/30174143/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91ae615eff
--- /dev/null
+++ b/data/as/30174143/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174143",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174150/BillingService/BusinessService.json b/data/as/30174150/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4d98c31e27
--- /dev/null
+++ b/data/as/30174150/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174150",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174150/egov-location/boundary-data.json b/data/as/30174150/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d9871b8e04
--- /dev/null
+++ b/data/as/30174150/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174150",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHERBHERI PWSS",
+                "localname": "NEW BHERBHERI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHERBHERI PWSS",
+                        "localname": "NEW BHERBHERI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHERBHERI PWSS",
+                "localname": "NEW BHERBHERI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHERBHERI PWSS",
+                        "localname": "NEW BHERBHERI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174150/ws-services-calculation/Penalty.json b/data/as/30174150/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..63e3516b54
--- /dev/null
+++ b/data/as/30174150/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174150",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174150/ws-services-calculation/WCBillingSlab.json b/data/as/30174150/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d6dba8ce7
--- /dev/null
+++ b/data/as/30174150/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174150",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174158/BillingService/BusinessService.json b/data/as/30174158/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c26aa5abf8
--- /dev/null
+++ b/data/as/30174158/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174158",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174158/egov-location/boundary-data.json b/data/as/30174158/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0ffae23c9c
--- /dev/null
+++ b/data/as/30174158/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174158",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKMARI GAON PWSS",
+                "localname": "BHALUKMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKMARI GAON PWSS",
+                        "localname": "BHALUKMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKMARI GAON PWSS",
+                "localname": "BHALUKMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174158",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKMARI GAON PWSS",
+                        "localname": "BHALUKMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174158/ws-services-calculation/Penalty.json b/data/as/30174158/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6bf0798427
--- /dev/null
+++ b/data/as/30174158/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174158",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174158/ws-services-calculation/WCBillingSlab.json b/data/as/30174158/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1dafbf3fa6
--- /dev/null
+++ b/data/as/30174158/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174158",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174165/BillingService/BusinessService.json b/data/as/30174165/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3aef793866
--- /dev/null
+++ b/data/as/30174165/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174165",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174165/egov-location/boundary-data.json b/data/as/30174165/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a73436faf
--- /dev/null
+++ b/data/as/30174165/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174165",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI THAKURBARI PWSS",
+                "localname": "MORISUTI THAKURBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI THAKURBARI PWSS",
+                        "localname": "MORISUTI THAKURBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI THAKURBARI PWSS",
+                "localname": "MORISUTI THAKURBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI THAKURBARI PWSS",
+                        "localname": "MORISUTI THAKURBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174165/ws-services-calculation/Penalty.json b/data/as/30174165/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dda08834bb
--- /dev/null
+++ b/data/as/30174165/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174165",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174165/ws-services-calculation/WCBillingSlab.json b/data/as/30174165/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c72de25941
--- /dev/null
+++ b/data/as/30174165/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174165",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174178/BillingService/BusinessService.json b/data/as/30174178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..47fb76875e
--- /dev/null
+++ b/data/as/30174178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174178/egov-location/boundary-data.json b/data/as/30174178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dcb883e0c6
--- /dev/null
+++ b/data/as/30174178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONARIGAON PWSS",
+                "localname": "SONARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONARIGAON PWSS",
+                        "localname": "SONARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONARIGAON PWSS",
+                "localname": "SONARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONARIGAON PWSS",
+                        "localname": "SONARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174178/ws-services-calculation/Penalty.json b/data/as/30174178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..958534243b
--- /dev/null
+++ b/data/as/30174178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174178/ws-services-calculation/WCBillingSlab.json b/data/as/30174178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a1d091f93
--- /dev/null
+++ b/data/as/30174178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174186/BillingService/BusinessService.json b/data/as/30174186/BillingService/BusinessService.json
new file mode 100644
index 0000000000..31cf677740
--- /dev/null
+++ b/data/as/30174186/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174186",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174186/egov-location/boundary-data.json b/data/as/30174186/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bfe14af486
--- /dev/null
+++ b/data/as/30174186/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174186",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPOOR BAGAN PWSS",
+                "localname": "SANTIPOOR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174186",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPOOR BAGAN PWSS",
+                        "localname": "SANTIPOOR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPOOR BAGAN PWSS",
+                "localname": "SANTIPOOR BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174186",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPOOR BAGAN PWSS",
+                        "localname": "SANTIPOOR BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174186/ws-services-calculation/Penalty.json b/data/as/30174186/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a8ccd3d1bc
--- /dev/null
+++ b/data/as/30174186/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174186",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174186/ws-services-calculation/WCBillingSlab.json b/data/as/30174186/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..738c0d70a3
--- /dev/null
+++ b/data/as/30174186/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174186",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174190/BillingService/BusinessService.json b/data/as/30174190/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ba0d59c54
--- /dev/null
+++ b/data/as/30174190/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174190",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174190/egov-location/boundary-data.json b/data/as/30174190/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b022dff571
--- /dev/null
+++ b/data/as/30174190/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174190",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMLAGA PWSS",
+                "localname": "SAMLAGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174190",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMLAGA PWSS",
+                        "localname": "SAMLAGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMLAGA PWSS",
+                "localname": "SAMLAGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174190",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMLAGA PWSS",
+                        "localname": "SAMLAGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174190/ws-services-calculation/Penalty.json b/data/as/30174190/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0df90ea3d8
--- /dev/null
+++ b/data/as/30174190/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174190",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174190/ws-services-calculation/WCBillingSlab.json b/data/as/30174190/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6dccf46195
--- /dev/null
+++ b/data/as/30174190/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174190",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174199/BillingService/BusinessService.json b/data/as/30174199/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3155a66788
--- /dev/null
+++ b/data/as/30174199/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174199",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174199/egov-location/boundary-data.json b/data/as/30174199/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8fd5575438
--- /dev/null
+++ b/data/as/30174199/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174199",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. GORMORA PWSS",
+                "localname": "2 NO. GORMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174199",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. GORMORA PWSS",
+                        "localname": "2 NO. GORMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. GORMORA PWSS",
+                "localname": "2 NO. GORMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174199",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. GORMORA PWSS",
+                        "localname": "2 NO. GORMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174199/ws-services-calculation/Penalty.json b/data/as/30174199/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..379a7efc00
--- /dev/null
+++ b/data/as/30174199/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174199",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174199/ws-services-calculation/WCBillingSlab.json b/data/as/30174199/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e16d23aca
--- /dev/null
+++ b/data/as/30174199/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174199",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174210/BillingService/BusinessService.json b/data/as/30174210/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1593610d34
--- /dev/null
+++ b/data/as/30174210/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174210",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174210/egov-location/boundary-data.json b/data/as/30174210/egov-location/boundary-data.json
new file mode 100644
index 0000000000..611eff0eeb
--- /dev/null
+++ b/data/as/30174210/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174210",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALIGAON EAST PWSS",
+                "localname": "DIGHALIGAON EAST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALIGAON EAST PWSS",
+                        "localname": "DIGHALIGAON EAST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIGHALIGAON EAST PWSS",
+                "localname": "DIGHALIGAON EAST PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIGHALIGAON EAST PWSS",
+                        "localname": "DIGHALIGAON EAST PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174210/ws-services-calculation/Penalty.json b/data/as/30174210/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e33c345e13
--- /dev/null
+++ b/data/as/30174210/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174210",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174210/ws-services-calculation/WCBillingSlab.json b/data/as/30174210/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d8804a3f1c
--- /dev/null
+++ b/data/as/30174210/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174210",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174211/BillingService/BusinessService.json b/data/as/30174211/BillingService/BusinessService.json
new file mode 100644
index 0000000000..be873e3aaa
--- /dev/null
+++ b/data/as/30174211/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174211",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174211/egov-location/boundary-data.json b/data/as/30174211/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e82ca49f83
--- /dev/null
+++ b/data/as/30174211/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174211",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                "localname": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174211",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                        "localname": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                "localname": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174211",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                        "localname": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174211/ws-services-calculation/Penalty.json b/data/as/30174211/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fdbafc5ee2
--- /dev/null
+++ b/data/as/30174211/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174211",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174211/ws-services-calculation/WCBillingSlab.json b/data/as/30174211/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb62838455
--- /dev/null
+++ b/data/as/30174211/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174211",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174222/BillingService/BusinessService.json b/data/as/30174222/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4c518b0b85
--- /dev/null
+++ b/data/as/30174222/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174222",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174222/egov-location/boundary-data.json b/data/as/30174222/egov-location/boundary-data.json
new file mode 100644
index 0000000000..64b7f90aff
--- /dev/null
+++ b/data/as/30174222/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174222",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANGAMARI HOKAJAN PWSS",
+                "localname": "CHANGAMARI HOKAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174222",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANGAMARI HOKAJAN PWSS",
+                        "localname": "CHANGAMARI HOKAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANGAMARI HOKAJAN PWSS",
+                "localname": "CHANGAMARI HOKAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174222",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANGAMARI HOKAJAN PWSS",
+                        "localname": "CHANGAMARI HOKAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174222/ws-services-calculation/Penalty.json b/data/as/30174222/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86288743f2
--- /dev/null
+++ b/data/as/30174222/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174222",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174222/ws-services-calculation/WCBillingSlab.json b/data/as/30174222/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fa5d24252e
--- /dev/null
+++ b/data/as/30174222/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174222",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174241/BillingService/BusinessService.json b/data/as/30174241/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85d50a6321
--- /dev/null
+++ b/data/as/30174241/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174241",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174241/egov-location/boundary-data.json b/data/as/30174241/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a148c442c
--- /dev/null
+++ b/data/as/30174241/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174241",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHUKANSANG MINI PWSS",
+                "localname": "PHUKANSANG MINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHUKANSANG MINI PWSS",
+                        "localname": "PHUKANSANG MINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHUKANSANG MINI PWSS",
+                "localname": "PHUKANSANG MINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174241",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHUKANSANG MINI PWSS",
+                        "localname": "PHUKANSANG MINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174241/ws-services-calculation/Penalty.json b/data/as/30174241/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5548b4ff1a
--- /dev/null
+++ b/data/as/30174241/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174241",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174241/ws-services-calculation/WCBillingSlab.json b/data/as/30174241/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..284bb03d72
--- /dev/null
+++ b/data/as/30174241/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174241",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174244/BillingService/BusinessService.json b/data/as/30174244/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f053b1b31
--- /dev/null
+++ b/data/as/30174244/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174244",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174244/egov-location/boundary-data.json b/data/as/30174244/egov-location/boundary-data.json
new file mode 100644
index 0000000000..39232fafd1
--- /dev/null
+++ b/data/as/30174244/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174244",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILLANI NEPALI PWSS",
+                "localname": "CHILLANI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILLANI NEPALI PWSS",
+                        "localname": "CHILLANI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHILLANI NEPALI PWSS",
+                "localname": "CHILLANI NEPALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHILLANI NEPALI PWSS",
+                        "localname": "CHILLANI NEPALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174244/ws-services-calculation/Penalty.json b/data/as/30174244/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..324f93bce6
--- /dev/null
+++ b/data/as/30174244/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174244",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174244/ws-services-calculation/WCBillingSlab.json b/data/as/30174244/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ef1e82dd1
--- /dev/null
+++ b/data/as/30174244/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174244",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174286/BillingService/BusinessService.json b/data/as/30174286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b741c5f13d
--- /dev/null
+++ b/data/as/30174286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174286/egov-location/boundary-data.json b/data/as/30174286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b1f091e467
--- /dev/null
+++ b/data/as/30174286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDOL MINI PWSS",
+                "localname": "BORDOL MINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDOL MINI PWSS",
+                        "localname": "BORDOL MINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDOL MINI PWSS",
+                "localname": "BORDOL MINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDOL MINI PWSS",
+                        "localname": "BORDOL MINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174286/ws-services-calculation/Penalty.json b/data/as/30174286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b23f21f1f0
--- /dev/null
+++ b/data/as/30174286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174286/ws-services-calculation/WCBillingSlab.json b/data/as/30174286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1151c56e26
--- /dev/null
+++ b/data/as/30174286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174291/BillingService/BusinessService.json b/data/as/30174291/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa66383b82
--- /dev/null
+++ b/data/as/30174291/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174291",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174291/egov-location/boundary-data.json b/data/as/30174291/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef940a6791
--- /dev/null
+++ b/data/as/30174291/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174291",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW CHILLANI BENGALI PWSS",
+                "localname": "NEW CHILLANI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174291",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW CHILLANI BENGALI PWSS",
+                        "localname": "NEW CHILLANI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW CHILLANI BENGALI PWSS",
+                "localname": "NEW CHILLANI BENGALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174291",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW CHILLANI BENGALI PWSS",
+                        "localname": "NEW CHILLANI BENGALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174291/ws-services-calculation/Penalty.json b/data/as/30174291/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8d5711caeb
--- /dev/null
+++ b/data/as/30174291/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174291",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174291/ws-services-calculation/WCBillingSlab.json b/data/as/30174291/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e661bec0ed
--- /dev/null
+++ b/data/as/30174291/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174291",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174314/BillingService/BusinessService.json b/data/as/30174314/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46ee20687f
--- /dev/null
+++ b/data/as/30174314/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174314",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174314/egov-location/boundary-data.json b/data/as/30174314/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a507c62748
--- /dev/null
+++ b/data/as/30174314/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174314",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASITAR MINI PWSS",
+                "localname": "KASITAR MINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASITAR MINI PWSS",
+                        "localname": "KASITAR MINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASITAR MINI PWSS",
+                "localname": "KASITAR MINI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASITAR MINI PWSS",
+                        "localname": "KASITAR MINI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174314/ws-services-calculation/Penalty.json b/data/as/30174314/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..12d6e945c8
--- /dev/null
+++ b/data/as/30174314/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174314",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174314/ws-services-calculation/WCBillingSlab.json b/data/as/30174314/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..282d45d0cc
--- /dev/null
+++ b/data/as/30174314/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174314",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174344/BillingService/BusinessService.json b/data/as/30174344/BillingService/BusinessService.json
new file mode 100644
index 0000000000..edf353cb14
--- /dev/null
+++ b/data/as/30174344/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174344",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174344/egov-location/boundary-data.json b/data/as/30174344/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0cfa50c8a
--- /dev/null
+++ b/data/as/30174344/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174344",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIKIAL GAON PWSS",
+                "localname": "DARIKIAL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIKIAL GAON PWSS",
+                        "localname": "DARIKIAL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIKIAL GAON PWSS",
+                "localname": "DARIKIAL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIKIAL GAON PWSS",
+                        "localname": "DARIKIAL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174344/ws-services-calculation/Penalty.json b/data/as/30174344/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3b6602f49a
--- /dev/null
+++ b/data/as/30174344/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174344",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174344/ws-services-calculation/WCBillingSlab.json b/data/as/30174344/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33e40c19f0
--- /dev/null
+++ b/data/as/30174344/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174344",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174357/BillingService/BusinessService.json b/data/as/30174357/BillingService/BusinessService.json
new file mode 100644
index 0000000000..27b1cfaee2
--- /dev/null
+++ b/data/as/30174357/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174357",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174357/egov-location/boundary-data.json b/data/as/30174357/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b5c174232
--- /dev/null
+++ b/data/as/30174357/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174357",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JANGAL BASTI MPWSS",
+                "localname": "JANGAL BASTI MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JANGAL BASTI MPWSS",
+                        "localname": "JANGAL BASTI MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JANGAL BASTI MPWSS",
+                "localname": "JANGAL BASTI MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JANGAL BASTI MPWSS",
+                        "localname": "JANGAL BASTI MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174357/ws-services-calculation/Penalty.json b/data/as/30174357/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b74fbe75e8
--- /dev/null
+++ b/data/as/30174357/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174357",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174357/ws-services-calculation/WCBillingSlab.json b/data/as/30174357/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..07d81d8192
--- /dev/null
+++ b/data/as/30174357/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174357",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174375/BillingService/BusinessService.json b/data/as/30174375/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ff55cc16a
--- /dev/null
+++ b/data/as/30174375/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174375",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174375/egov-location/boundary-data.json b/data/as/30174375/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7cf3ed7d4
--- /dev/null
+++ b/data/as/30174375/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174375",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOLAR SONAR PWSS",
+                "localname": "SOLAR SONAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOLAR SONAR PWSS",
+                        "localname": "SOLAR SONAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOLAR SONAR PWSS",
+                "localname": "SOLAR SONAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOLAR SONAR PWSS",
+                        "localname": "SOLAR SONAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174375/ws-services-calculation/Penalty.json b/data/as/30174375/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2171452ef6
--- /dev/null
+++ b/data/as/30174375/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174375",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174375/ws-services-calculation/WCBillingSlab.json b/data/as/30174375/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac3b342096
--- /dev/null
+++ b/data/as/30174375/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174375",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174407/BillingService/BusinessService.json b/data/as/30174407/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aeb20ec6fb
--- /dev/null
+++ b/data/as/30174407/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174407",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174407/egov-location/boundary-data.json b/data/as/30174407/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e6ec0f5fb
--- /dev/null
+++ b/data/as/30174407/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174407",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULBARI RAILGATE MPWSS",
+                "localname": "PHULBARI RAILGATE MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULBARI RAILGATE MPWSS",
+                        "localname": "PHULBARI RAILGATE MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULBARI RAILGATE MPWSS",
+                "localname": "PHULBARI RAILGATE MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174407",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULBARI RAILGATE MPWSS",
+                        "localname": "PHULBARI RAILGATE MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174407/ws-services-calculation/Penalty.json b/data/as/30174407/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64d175a629
--- /dev/null
+++ b/data/as/30174407/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174407",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174407/ws-services-calculation/WCBillingSlab.json b/data/as/30174407/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e76a4c5cf
--- /dev/null
+++ b/data/as/30174407/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174407",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174416/BillingService/BusinessService.json b/data/as/30174416/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b27df61359
--- /dev/null
+++ b/data/as/30174416/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174416",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174416/egov-location/boundary-data.json b/data/as/30174416/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fbc956bbaf
--- /dev/null
+++ b/data/as/30174416/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174416",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR MANSIRI PWSS",
+                "localname": "UTTAR MANSIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174416",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR MANSIRI PWSS",
+                        "localname": "UTTAR MANSIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR MANSIRI PWSS",
+                "localname": "UTTAR MANSIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174416",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR MANSIRI PWSS",
+                        "localname": "UTTAR MANSIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174416/ws-services-calculation/Penalty.json b/data/as/30174416/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9814d3feaf
--- /dev/null
+++ b/data/as/30174416/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174416",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174416/ws-services-calculation/WCBillingSlab.json b/data/as/30174416/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..28f2426695
--- /dev/null
+++ b/data/as/30174416/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174416",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174419/BillingService/BusinessService.json b/data/as/30174419/BillingService/BusinessService.json
new file mode 100644
index 0000000000..626b7ab0dd
--- /dev/null
+++ b/data/as/30174419/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174419",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174419/egov-location/boundary-data.json b/data/as/30174419/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2b52f8e170
--- /dev/null
+++ b/data/as/30174419/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174419",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEZALPATTY PWSS",
+                "localname": "TEZALPATTY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEZALPATTY PWSS",
+                        "localname": "TEZALPATTY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEZALPATTY PWSS",
+                "localname": "TEZALPATTY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174419",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEZALPATTY PWSS",
+                        "localname": "TEZALPATTY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174419/ws-services-calculation/Penalty.json b/data/as/30174419/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c051d2e1f8
--- /dev/null
+++ b/data/as/30174419/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174419",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174419/ws-services-calculation/WCBillingSlab.json b/data/as/30174419/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ede4e36a10
--- /dev/null
+++ b/data/as/30174419/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174419",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174439/BillingService/BusinessService.json b/data/as/30174439/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9b6cb8e335
--- /dev/null
+++ b/data/as/30174439/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174439",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174439/egov-location/boundary-data.json b/data/as/30174439/egov-location/boundary-data.json
new file mode 100644
index 0000000000..664bf2a437
--- /dev/null
+++ b/data/as/30174439/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174439",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARFALIA PWSS",
+                "localname": "BARFALIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARFALIA PWSS",
+                        "localname": "BARFALIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARFALIA PWSS",
+                "localname": "BARFALIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARFALIA PWSS",
+                        "localname": "BARFALIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174439/ws-services-calculation/Penalty.json b/data/as/30174439/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1f64efc548
--- /dev/null
+++ b/data/as/30174439/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174439",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174439/ws-services-calculation/WCBillingSlab.json b/data/as/30174439/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc476b6573
--- /dev/null
+++ b/data/as/30174439/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174439",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174442/BillingService/BusinessService.json b/data/as/30174442/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac18f71efb
--- /dev/null
+++ b/data/as/30174442/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174442",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174442/egov-location/boundary-data.json b/data/as/30174442/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad1d7ee15a
--- /dev/null
+++ b/data/as/30174442/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174442",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MIZIBARI PATHAR PWSS",
+                "localname": "MIZIBARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MIZIBARI PATHAR PWSS",
+                        "localname": "MIZIBARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MIZIBARI PATHAR PWSS",
+                "localname": "MIZIBARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MIZIBARI PATHAR PWSS",
+                        "localname": "MIZIBARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174442/ws-services-calculation/Penalty.json b/data/as/30174442/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..564507250b
--- /dev/null
+++ b/data/as/30174442/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174442",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174442/ws-services-calculation/WCBillingSlab.json b/data/as/30174442/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..198df5ba80
--- /dev/null
+++ b/data/as/30174442/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174442",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174454/BillingService/BusinessService.json b/data/as/30174454/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d2b287fa23
--- /dev/null
+++ b/data/as/30174454/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174454",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174454/egov-location/boundary-data.json b/data/as/30174454/egov-location/boundary-data.json
new file mode 100644
index 0000000000..01f467fdb0
--- /dev/null
+++ b/data/as/30174454/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174454",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARUAH CHUBURI PWSS",
+                "localname": "BARUAH CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARUAH CHUBURI PWSS",
+                        "localname": "BARUAH CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARUAH CHUBURI PWSS",
+                "localname": "BARUAH CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARUAH CHUBURI PWSS",
+                        "localname": "BARUAH CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174454/ws-services-calculation/Penalty.json b/data/as/30174454/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..390af3b45a
--- /dev/null
+++ b/data/as/30174454/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174454",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174454/ws-services-calculation/WCBillingSlab.json b/data/as/30174454/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..da6f264431
--- /dev/null
+++ b/data/as/30174454/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174454",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174538/BillingService/BusinessService.json b/data/as/30174538/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fbeff53c1b
--- /dev/null
+++ b/data/as/30174538/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174538",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174538/egov-location/boundary-data.json b/data/as/30174538/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f9ab6da85
--- /dev/null
+++ b/data/as/30174538/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174538",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGABASTI PWSS",
+                "localname": "TENGABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGABASTI PWSS",
+                        "localname": "TENGABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGABASTI PWSS",
+                "localname": "TENGABASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174538",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGABASTI PWSS",
+                        "localname": "TENGABASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174538/ws-services-calculation/Penalty.json b/data/as/30174538/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f78e06c3ba
--- /dev/null
+++ b/data/as/30174538/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174538",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174538/ws-services-calculation/WCBillingSlab.json b/data/as/30174538/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c09a94f2a6
--- /dev/null
+++ b/data/as/30174538/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174538",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174541/BillingService/BusinessService.json b/data/as/30174541/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f72ed9271e
--- /dev/null
+++ b/data/as/30174541/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174541",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174541/egov-location/boundary-data.json b/data/as/30174541/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c7787973f
--- /dev/null
+++ b/data/as/30174541/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174541",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEJARHOLA PWSS",
+                "localname": "BEJARHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174541",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEJARHOLA PWSS",
+                        "localname": "BEJARHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEJARHOLA PWSS",
+                "localname": "BEJARHOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174541",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEJARHOLA PWSS",
+                        "localname": "BEJARHOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174541/ws-services-calculation/Penalty.json b/data/as/30174541/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a23a1218d
--- /dev/null
+++ b/data/as/30174541/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174541",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174541/ws-services-calculation/WCBillingSlab.json b/data/as/30174541/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37d0113b64
--- /dev/null
+++ b/data/as/30174541/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174541",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174546/BillingService/BusinessService.json b/data/as/30174546/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ca8795183
--- /dev/null
+++ b/data/as/30174546/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174546",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174546/egov-location/boundary-data.json b/data/as/30174546/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0740691bae
--- /dev/null
+++ b/data/as/30174546/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174546",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SADAIBORA PART-2 PWSS",
+                "localname": "SADAIBORA PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174546",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SADAIBORA PART-2 PWSS",
+                        "localname": "SADAIBORA PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SADAIBORA PART-2 PWSS",
+                "localname": "SADAIBORA PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174546",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SADAIBORA PART-2 PWSS",
+                        "localname": "SADAIBORA PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174546/ws-services-calculation/Penalty.json b/data/as/30174546/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a211c06098
--- /dev/null
+++ b/data/as/30174546/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174546",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174546/ws-services-calculation/WCBillingSlab.json b/data/as/30174546/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed5e79e241
--- /dev/null
+++ b/data/as/30174546/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174546",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174562/BillingService/BusinessService.json b/data/as/30174562/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2dd312a50e
--- /dev/null
+++ b/data/as/30174562/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174562",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174562/egov-location/boundary-data.json b/data/as/30174562/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b30efcb5a8
--- /dev/null
+++ b/data/as/30174562/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174562",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUBMANSIRI MPWS",
+                "localname": "PUBMANSIRI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUBMANSIRI MPWS",
+                        "localname": "PUBMANSIRI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUBMANSIRI MPWS",
+                "localname": "PUBMANSIRI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUBMANSIRI MPWS",
+                        "localname": "PUBMANSIRI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174562/ws-services-calculation/Penalty.json b/data/as/30174562/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7271d1a4a4
--- /dev/null
+++ b/data/as/30174562/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174562",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174562/ws-services-calculation/WCBillingSlab.json b/data/as/30174562/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0d34aad5e1
--- /dev/null
+++ b/data/as/30174562/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174562",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174577/BillingService/BusinessService.json b/data/as/30174577/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6f1a934d55
--- /dev/null
+++ b/data/as/30174577/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174577",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174577/egov-location/boundary-data.json b/data/as/30174577/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6911c34a58
--- /dev/null
+++ b/data/as/30174577/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174577",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAUMARI PATHAR PWSS",
+                "localname": "RAUMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAUMARI PATHAR PWSS",
+                        "localname": "RAUMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAUMARI PATHAR PWSS",
+                "localname": "RAUMARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAUMARI PATHAR PWSS",
+                        "localname": "RAUMARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174577/ws-services-calculation/Penalty.json b/data/as/30174577/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9e54dc9d8c
--- /dev/null
+++ b/data/as/30174577/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174577",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174577/ws-services-calculation/WCBillingSlab.json b/data/as/30174577/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b08fd8af54
--- /dev/null
+++ b/data/as/30174577/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174577",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174593/BillingService/BusinessService.json b/data/as/30174593/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4a9fb2e68e
--- /dev/null
+++ b/data/as/30174593/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174593",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174593/egov-location/boundary-data.json b/data/as/30174593/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6996b84ebe
--- /dev/null
+++ b/data/as/30174593/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174593",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMGAON PWSS",
+                "localname": "BAMGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174593",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMGAON PWSS",
+                        "localname": "BAMGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMGAON PWSS",
+                "localname": "BAMGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174593",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMGAON PWSS",
+                        "localname": "BAMGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174593/ws-services-calculation/Penalty.json b/data/as/30174593/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2a009be310
--- /dev/null
+++ b/data/as/30174593/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174593",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174593/ws-services-calculation/WCBillingSlab.json b/data/as/30174593/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6e505248f
--- /dev/null
+++ b/data/as/30174593/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174593",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174610/BillingService/BusinessService.json b/data/as/30174610/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a51124268f
--- /dev/null
+++ b/data/as/30174610/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174610",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174610/egov-location/boundary-data.json b/data/as/30174610/egov-location/boundary-data.json
new file mode 100644
index 0000000000..282f2f649c
--- /dev/null
+++ b/data/as/30174610/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174610",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULBARI PT WSS",
+                "localname": "PHULBARI PT WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174610",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULBARI PT WSS",
+                        "localname": "PHULBARI PT WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULBARI PT WSS",
+                "localname": "PHULBARI PT WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174610",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULBARI PT WSS",
+                        "localname": "PHULBARI PT WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174610/ws-services-calculation/Penalty.json b/data/as/30174610/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e7e45b4010
--- /dev/null
+++ b/data/as/30174610/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174610",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174610/ws-services-calculation/WCBillingSlab.json b/data/as/30174610/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..961135d78d
--- /dev/null
+++ b/data/as/30174610/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174610",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174622/BillingService/BusinessService.json b/data/as/30174622/BillingService/BusinessService.json
new file mode 100644
index 0000000000..920615c4ee
--- /dev/null
+++ b/data/as/30174622/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174622",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174622/egov-location/boundary-data.json b/data/as/30174622/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0613550a52
--- /dev/null
+++ b/data/as/30174622/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174622",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM BESSERIA PWSS",
+                "localname": "BAM BESSERIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174622",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM BESSERIA PWSS",
+                        "localname": "BAM BESSERIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAM BESSERIA PWSS",
+                "localname": "BAM BESSERIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174622",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAM BESSERIA PWSS",
+                        "localname": "BAM BESSERIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174622/ws-services-calculation/Penalty.json b/data/as/30174622/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..136e11a30c
--- /dev/null
+++ b/data/as/30174622/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174622",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174622/ws-services-calculation/WCBillingSlab.json b/data/as/30174622/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04757494ae
--- /dev/null
+++ b/data/as/30174622/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174622",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174633/BillingService/BusinessService.json b/data/as/30174633/BillingService/BusinessService.json
new file mode 100644
index 0000000000..53959b83cb
--- /dev/null
+++ b/data/as/30174633/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174633",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174633/egov-location/boundary-data.json b/data/as/30174633/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4954d7d0df
--- /dev/null
+++ b/data/as/30174633/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174633",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASONI PWSS",
+                "localname": "PALASONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174633",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASONI PWSS",
+                        "localname": "PALASONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASONI PWSS",
+                "localname": "PALASONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174633",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASONI PWSS",
+                        "localname": "PALASONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174633/ws-services-calculation/Penalty.json b/data/as/30174633/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..72cee177e6
--- /dev/null
+++ b/data/as/30174633/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174633",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174633/ws-services-calculation/WCBillingSlab.json b/data/as/30174633/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ae5bbab3cc
--- /dev/null
+++ b/data/as/30174633/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174633",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174651/BillingService/BusinessService.json b/data/as/30174651/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe151f5827
--- /dev/null
+++ b/data/as/30174651/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174651",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174651/egov-location/boundary-data.json b/data/as/30174651/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf9bffee16
--- /dev/null
+++ b/data/as/30174651/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174651",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OVOTA WSS",
+                "localname": "OVOTA WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OVOTA WSS",
+                        "localname": "OVOTA WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OVOTA WSS",
+                "localname": "OVOTA WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OVOTA WSS",
+                        "localname": "OVOTA WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174651/ws-services-calculation/Penalty.json b/data/as/30174651/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..308290c782
--- /dev/null
+++ b/data/as/30174651/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174651",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174651/ws-services-calculation/WCBillingSlab.json b/data/as/30174651/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..988730988a
--- /dev/null
+++ b/data/as/30174651/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174651",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174677/BillingService/BusinessService.json b/data/as/30174677/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4d87b53aa5
--- /dev/null
+++ b/data/as/30174677/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174677",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174677/egov-location/boundary-data.json b/data/as/30174677/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3669fcb41b
--- /dev/null
+++ b/data/as/30174677/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174677",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGRANGPARA PWSS (NEW)",
+                "localname": "RANGRANGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174677",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGRANGPARA PWSS (NEW)",
+                        "localname": "RANGRANGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGRANGPARA PWSS (NEW)",
+                "localname": "RANGRANGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174677",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGRANGPARA PWSS (NEW)",
+                        "localname": "RANGRANGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174677/ws-services-calculation/Penalty.json b/data/as/30174677/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..64745682b6
--- /dev/null
+++ b/data/as/30174677/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174677",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174677/ws-services-calculation/WCBillingSlab.json b/data/as/30174677/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f6ccd0333
--- /dev/null
+++ b/data/as/30174677/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174677",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174688/BillingService/BusinessService.json b/data/as/30174688/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db69dfd210
--- /dev/null
+++ b/data/as/30174688/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174688",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174688/egov-location/boundary-data.json b/data/as/30174688/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f6eabcaa8
--- /dev/null
+++ b/data/as/30174688/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174688",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 NALBARI PWSS",
+                "localname": "NO. 3 NALBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174688",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 NALBARI PWSS",
+                        "localname": "NO. 3 NALBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 NALBARI PWSS",
+                "localname": "NO. 3 NALBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174688",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 NALBARI PWSS",
+                        "localname": "NO. 3 NALBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174688/ws-services-calculation/Penalty.json b/data/as/30174688/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd27e6744d
--- /dev/null
+++ b/data/as/30174688/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174688",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174688/ws-services-calculation/WCBillingSlab.json b/data/as/30174688/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4839799d5c
--- /dev/null
+++ b/data/as/30174688/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174688",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174694/BillingService/BusinessService.json b/data/as/30174694/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a9e8658ab4
--- /dev/null
+++ b/data/as/30174694/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174694",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174694/egov-location/boundary-data.json b/data/as/30174694/egov-location/boundary-data.json
new file mode 100644
index 0000000000..722023cac7
--- /dev/null
+++ b/data/as/30174694/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174694",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 BALIJURI PART-2 PWSS",
+                "localname": "NO. 3 BALIJURI PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174694",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 BALIJURI PART-2 PWSS",
+                        "localname": "NO. 3 BALIJURI PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 BALIJURI PART-2 PWSS",
+                "localname": "NO. 3 BALIJURI PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174694",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 BALIJURI PART-2 PWSS",
+                        "localname": "NO. 3 BALIJURI PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174694/ws-services-calculation/Penalty.json b/data/as/30174694/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40dad8fb81
--- /dev/null
+++ b/data/as/30174694/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174694",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174694/ws-services-calculation/WCBillingSlab.json b/data/as/30174694/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1cc1efb51
--- /dev/null
+++ b/data/as/30174694/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174694",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174699/BillingService/BusinessService.json b/data/as/30174699/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6bbc5e0be
--- /dev/null
+++ b/data/as/30174699/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174699",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174699/egov-location/boundary-data.json b/data/as/30174699/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ddbb54eec
--- /dev/null
+++ b/data/as/30174699/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174699",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                "localname": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174699",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                        "localname": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                "localname": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174699",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                        "localname": "LASKARPARA (RANGJULI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174699/ws-services-calculation/Penalty.json b/data/as/30174699/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1eaa37985f
--- /dev/null
+++ b/data/as/30174699/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174699",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174699/ws-services-calculation/WCBillingSlab.json b/data/as/30174699/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac49a1b63b
--- /dev/null
+++ b/data/as/30174699/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174699",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174700/BillingService/BusinessService.json b/data/as/30174700/BillingService/BusinessService.json
new file mode 100644
index 0000000000..124ea98960
--- /dev/null
+++ b/data/as/30174700/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174700",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174700/egov-location/boundary-data.json b/data/as/30174700/egov-location/boundary-data.json
new file mode 100644
index 0000000000..575b7db454
--- /dev/null
+++ b/data/as/30174700/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174700",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGA BORA CHUBURI PWSS",
+                "localname": "BAGA BORA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174700",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGA BORA CHUBURI PWSS",
+                        "localname": "BAGA BORA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGA BORA CHUBURI PWSS",
+                "localname": "BAGA BORA CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174700",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGA BORA CHUBURI PWSS",
+                        "localname": "BAGA BORA CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174700/ws-services-calculation/Penalty.json b/data/as/30174700/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..30a78b7eae
--- /dev/null
+++ b/data/as/30174700/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174700",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174700/ws-services-calculation/WCBillingSlab.json b/data/as/30174700/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ddb0d108cf
--- /dev/null
+++ b/data/as/30174700/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174700",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174721/BillingService/BusinessService.json b/data/as/30174721/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4098157a1e
--- /dev/null
+++ b/data/as/30174721/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174721",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174721/egov-location/boundary-data.json b/data/as/30174721/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03f51b8846
--- /dev/null
+++ b/data/as/30174721/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174721",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DA BESSERIA PWSS",
+                "localname": "DA BESSERIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DA BESSERIA PWSS",
+                        "localname": "DA BESSERIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DA BESSERIA PWSS",
+                "localname": "DA BESSERIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DA BESSERIA PWSS",
+                        "localname": "DA BESSERIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174721/ws-services-calculation/Penalty.json b/data/as/30174721/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13c53ff68c
--- /dev/null
+++ b/data/as/30174721/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174721",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174721/ws-services-calculation/WCBillingSlab.json b/data/as/30174721/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..08fd08a52b
--- /dev/null
+++ b/data/as/30174721/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174721",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174729/BillingService/BusinessService.json b/data/as/30174729/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad6e1e6fd1
--- /dev/null
+++ b/data/as/30174729/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174729",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174729/egov-location/boundary-data.json b/data/as/30174729/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9cac1a86c4
--- /dev/null
+++ b/data/as/30174729/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174729",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 NALBARI WSS",
+                "localname": "NO.1 NALBARI WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174729",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 NALBARI WSS",
+                        "localname": "NO.1 NALBARI WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 NALBARI WSS",
+                "localname": "NO.1 NALBARI WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174729",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 NALBARI WSS",
+                        "localname": "NO.1 NALBARI WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174729/ws-services-calculation/Penalty.json b/data/as/30174729/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6735474e95
--- /dev/null
+++ b/data/as/30174729/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174729",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174729/ws-services-calculation/WCBillingSlab.json b/data/as/30174729/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..641f9dfbd6
--- /dev/null
+++ b/data/as/30174729/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174729",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174732/BillingService/BusinessService.json b/data/as/30174732/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e5739d7762
--- /dev/null
+++ b/data/as/30174732/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174732",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174732/egov-location/boundary-data.json b/data/as/30174732/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2754150167
--- /dev/null
+++ b/data/as/30174732/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174732",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNGAON PWSS",
+                "localname": "BAMUNGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNGAON PWSS",
+                        "localname": "BAMUNGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNGAON PWSS",
+                "localname": "BAMUNGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNGAON PWSS",
+                        "localname": "BAMUNGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174732/ws-services-calculation/Penalty.json b/data/as/30174732/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26ed0a93ef
--- /dev/null
+++ b/data/as/30174732/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174732",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174732/ws-services-calculation/WCBillingSlab.json b/data/as/30174732/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..813c677dd7
--- /dev/null
+++ b/data/as/30174732/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174732",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174740/BillingService/BusinessService.json b/data/as/30174740/BillingService/BusinessService.json
new file mode 100644
index 0000000000..127a7dd9ec
--- /dev/null
+++ b/data/as/30174740/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174740",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174740/egov-location/boundary-data.json b/data/as/30174740/egov-location/boundary-data.json
new file mode 100644
index 0000000000..91ba596ae6
--- /dev/null
+++ b/data/as/30174740/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174740",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMGURIPARA PWSS (NEW)",
+                "localname": "AMGURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMGURIPARA PWSS (NEW)",
+                        "localname": "AMGURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMGURIPARA PWSS (NEW)",
+                "localname": "AMGURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMGURIPARA PWSS (NEW)",
+                        "localname": "AMGURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174740/ws-services-calculation/Penalty.json b/data/as/30174740/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8dcf968978
--- /dev/null
+++ b/data/as/30174740/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174740",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174740/ws-services-calculation/WCBillingSlab.json b/data/as/30174740/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..345ba2222f
--- /dev/null
+++ b/data/as/30174740/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174740",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174745/BillingService/BusinessService.json b/data/as/30174745/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b84ee3f2e5
--- /dev/null
+++ b/data/as/30174745/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174745",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174745/egov-location/boundary-data.json b/data/as/30174745/egov-location/boundary-data.json
new file mode 100644
index 0000000000..064a30ab55
--- /dev/null
+++ b/data/as/30174745/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174745",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 GOSAIN CHAPORI PWSS",
+                "localname": "NO.1 GOSAIN CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 GOSAIN CHAPORI PWSS",
+                        "localname": "NO.1 GOSAIN CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 GOSAIN CHAPORI PWSS",
+                "localname": "NO.1 GOSAIN CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 GOSAIN CHAPORI PWSS",
+                        "localname": "NO.1 GOSAIN CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174745/ws-services-calculation/Penalty.json b/data/as/30174745/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..88e35ccc64
--- /dev/null
+++ b/data/as/30174745/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174745",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174745/ws-services-calculation/WCBillingSlab.json b/data/as/30174745/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48b8138914
--- /dev/null
+++ b/data/as/30174745/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174745",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174747/BillingService/BusinessService.json b/data/as/30174747/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4866d03aa
--- /dev/null
+++ b/data/as/30174747/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174747",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174747/egov-location/boundary-data.json b/data/as/30174747/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5b392baa96
--- /dev/null
+++ b/data/as/30174747/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174747",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMANI GAON NO.1 PWSS",
+                "localname": "NAMANI GAON NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMANI GAON NO.1 PWSS",
+                        "localname": "NAMANI GAON NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMANI GAON NO.1 PWSS",
+                "localname": "NAMANI GAON NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMANI GAON NO.1 PWSS",
+                        "localname": "NAMANI GAON NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174747/ws-services-calculation/Penalty.json b/data/as/30174747/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de2fee34c7
--- /dev/null
+++ b/data/as/30174747/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174747",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174747/ws-services-calculation/WCBillingSlab.json b/data/as/30174747/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a951e06f8d
--- /dev/null
+++ b/data/as/30174747/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174747",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174796/BillingService/BusinessService.json b/data/as/30174796/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b772b06b18
--- /dev/null
+++ b/data/as/30174796/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174796",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174796/egov-location/boundary-data.json b/data/as/30174796/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd81118030
--- /dev/null
+++ b/data/as/30174796/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174796",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAMARI-B PWSS",
+                "localname": "BATAMARI-B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAMARI-B PWSS",
+                        "localname": "BATAMARI-B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAMARI-B PWSS",
+                "localname": "BATAMARI-B PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174796",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAMARI-B PWSS",
+                        "localname": "BATAMARI-B PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174796/ws-services-calculation/Penalty.json b/data/as/30174796/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee9b13a863
--- /dev/null
+++ b/data/as/30174796/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174796",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174796/ws-services-calculation/WCBillingSlab.json b/data/as/30174796/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8b34032afd
--- /dev/null
+++ b/data/as/30174796/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174796",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174826/BillingService/BusinessService.json b/data/as/30174826/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0fd735afe2
--- /dev/null
+++ b/data/as/30174826/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174826",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174826/egov-location/boundary-data.json b/data/as/30174826/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b07ca01274
--- /dev/null
+++ b/data/as/30174826/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174826",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHOJKHOWA CHAPORI PWSS",
+                "localname": "NEW BHOJKHOWA CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174826",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHOJKHOWA CHAPORI PWSS",
+                        "localname": "NEW BHOJKHOWA CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHOJKHOWA CHAPORI PWSS",
+                "localname": "NEW BHOJKHOWA CHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174826",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHOJKHOWA CHAPORI PWSS",
+                        "localname": "NEW BHOJKHOWA CHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174826/ws-services-calculation/Penalty.json b/data/as/30174826/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef8a491fac
--- /dev/null
+++ b/data/as/30174826/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174826",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174826/ws-services-calculation/WCBillingSlab.json b/data/as/30174826/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c53f96c90
--- /dev/null
+++ b/data/as/30174826/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174826",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174847/BillingService/BusinessService.json b/data/as/30174847/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5f8ae37fe
--- /dev/null
+++ b/data/as/30174847/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174847",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174847/egov-location/boundary-data.json b/data/as/30174847/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1495368c01
--- /dev/null
+++ b/data/as/30174847/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174847",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHOMORAGURI PWSS",
+                "localname": "NEW BHOMORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174847",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHOMORAGURI PWSS",
+                        "localname": "NEW BHOMORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BHOMORAGURI PWSS",
+                "localname": "NEW BHOMORAGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174847",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BHOMORAGURI PWSS",
+                        "localname": "NEW BHOMORAGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174847/ws-services-calculation/Penalty.json b/data/as/30174847/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..290a1113e0
--- /dev/null
+++ b/data/as/30174847/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174847",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174847/ws-services-calculation/WCBillingSlab.json b/data/as/30174847/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e14fc54c01
--- /dev/null
+++ b/data/as/30174847/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174847",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174854/BillingService/BusinessService.json b/data/as/30174854/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57033481c3
--- /dev/null
+++ b/data/as/30174854/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174854",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174854/egov-location/boundary-data.json b/data/as/30174854/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ead78878b0
--- /dev/null
+++ b/data/as/30174854/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174854",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIPAM PWSS",
+                "localname": "KACHARIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIPAM PWSS",
+                        "localname": "KACHARIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIPAM PWSS",
+                "localname": "KACHARIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIPAM PWSS",
+                        "localname": "KACHARIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174854/ws-services-calculation/Penalty.json b/data/as/30174854/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1d30c5583
--- /dev/null
+++ b/data/as/30174854/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174854",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174854/ws-services-calculation/WCBillingSlab.json b/data/as/30174854/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f5039f57d
--- /dev/null
+++ b/data/as/30174854/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174854",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174863/BillingService/BusinessService.json b/data/as/30174863/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ef48501901
--- /dev/null
+++ b/data/as/30174863/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174863",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174863/egov-location/boundary-data.json b/data/as/30174863/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4d4405aa2d
--- /dev/null
+++ b/data/as/30174863/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174863",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHOMARI 1 PWSS (NEW)",
+                "localname": "KACHOMARI 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174863",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHOMARI 1 PWSS (NEW)",
+                        "localname": "KACHOMARI 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHOMARI 1 PWSS (NEW)",
+                "localname": "KACHOMARI 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174863",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHOMARI 1 PWSS (NEW)",
+                        "localname": "KACHOMARI 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174863/ws-services-calculation/Penalty.json b/data/as/30174863/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dfa89a5c8a
--- /dev/null
+++ b/data/as/30174863/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174863",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174863/ws-services-calculation/WCBillingSlab.json b/data/as/30174863/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c57aa5cbb
--- /dev/null
+++ b/data/as/30174863/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174863",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174870/BillingService/BusinessService.json b/data/as/30174870/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8e04e91f1
--- /dev/null
+++ b/data/as/30174870/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174870",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174870/egov-location/boundary-data.json b/data/as/30174870/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b5b1ffebb1
--- /dev/null
+++ b/data/as/30174870/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174870",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BALICHAPORI PWSS",
+                "localname": "NEW BALICHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BALICHAPORI PWSS",
+                        "localname": "NEW BALICHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BALICHAPORI PWSS",
+                "localname": "NEW BALICHAPORI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BALICHAPORI PWSS",
+                        "localname": "NEW BALICHAPORI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174870/ws-services-calculation/Penalty.json b/data/as/30174870/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..67321e8482
--- /dev/null
+++ b/data/as/30174870/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174870",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174870/ws-services-calculation/WCBillingSlab.json b/data/as/30174870/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5ec77140e1
--- /dev/null
+++ b/data/as/30174870/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174870",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174887/BillingService/BusinessService.json b/data/as/30174887/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2a2bbbd647
--- /dev/null
+++ b/data/as/30174887/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174887",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174887/egov-location/boundary-data.json b/data/as/30174887/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70f2f90753
--- /dev/null
+++ b/data/as/30174887/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174887",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMANI GAON NO.2 PWSS",
+                "localname": "NAMANI GAON NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174887",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMANI GAON NO.2 PWSS",
+                        "localname": "NAMANI GAON NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMANI GAON NO.2 PWSS",
+                "localname": "NAMANI GAON NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174887",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMANI GAON NO.2 PWSS",
+                        "localname": "NAMANI GAON NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174887/ws-services-calculation/Penalty.json b/data/as/30174887/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e08b530305
--- /dev/null
+++ b/data/as/30174887/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174887",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174887/ws-services-calculation/WCBillingSlab.json b/data/as/30174887/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7de3e1c5ec
--- /dev/null
+++ b/data/as/30174887/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174887",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174894/BillingService/BusinessService.json b/data/as/30174894/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bd9a5787e7
--- /dev/null
+++ b/data/as/30174894/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174894",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174894/egov-location/boundary-data.json b/data/as/30174894/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cfe544bddd
--- /dev/null
+++ b/data/as/30174894/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174894",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                "localname": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174894",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                        "localname": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                "localname": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174894",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                        "localname": "TOPLAKHOWA NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174894/ws-services-calculation/Penalty.json b/data/as/30174894/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a3cd6c40c
--- /dev/null
+++ b/data/as/30174894/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174894",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174894/ws-services-calculation/WCBillingSlab.json b/data/as/30174894/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9243b631f8
--- /dev/null
+++ b/data/as/30174894/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174894",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174961/BillingService/BusinessService.json b/data/as/30174961/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2cc6fa0a88
--- /dev/null
+++ b/data/as/30174961/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174961",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174961/egov-location/boundary-data.json b/data/as/30174961/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fccd5ee9af
--- /dev/null
+++ b/data/as/30174961/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174961",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW MAZGAON PWSS",
+                "localname": "NEW MAZGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174961",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW MAZGAON PWSS",
+                        "localname": "NEW MAZGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW MAZGAON PWSS",
+                "localname": "NEW MAZGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174961",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW MAZGAON PWSS",
+                        "localname": "NEW MAZGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174961/ws-services-calculation/Penalty.json b/data/as/30174961/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..03fd61f5b0
--- /dev/null
+++ b/data/as/30174961/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174961",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174961/ws-services-calculation/WCBillingSlab.json b/data/as/30174961/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f074ad6f0
--- /dev/null
+++ b/data/as/30174961/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174961",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174977/BillingService/BusinessService.json b/data/as/30174977/BillingService/BusinessService.json
new file mode 100644
index 0000000000..956f3a97be
--- /dev/null
+++ b/data/as/30174977/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30174977",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174977/egov-location/boundary-data.json b/data/as/30174977/egov-location/boundary-data.json
new file mode 100644
index 0000000000..648d36b527
--- /dev/null
+++ b/data/as/30174977/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30174977",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PT-II PWSS (NEW)",
+                "localname": "CHEKOWARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PT-II PWSS (NEW)",
+                        "localname": "CHEKOWARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PT-II PWSS (NEW)",
+                "localname": "CHEKOWARI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30174977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PT-II PWSS (NEW)",
+                        "localname": "CHEKOWARI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174977/ws-services-calculation/Penalty.json b/data/as/30174977/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d0e2116769
--- /dev/null
+++ b/data/as/30174977/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30174977",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30174977/ws-services-calculation/WCBillingSlab.json b/data/as/30174977/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1e4194ac6
--- /dev/null
+++ b/data/as/30174977/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30174977",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175021/BillingService/BusinessService.json b/data/as/30175021/BillingService/BusinessService.json
new file mode 100644
index 0000000000..005cbe943d
--- /dev/null
+++ b/data/as/30175021/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175021",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175021/egov-location/boundary-data.json b/data/as/30175021/egov-location/boundary-data.json
new file mode 100644
index 0000000000..abca14cc93
--- /dev/null
+++ b/data/as/30175021/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175021",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN KUMARGAON PWSS",
+                "localname": "TARAJAN KUMARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175021",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN KUMARGAON PWSS",
+                        "localname": "TARAJAN KUMARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN KUMARGAON PWSS",
+                "localname": "TARAJAN KUMARGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175021",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN KUMARGAON PWSS",
+                        "localname": "TARAJAN KUMARGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175021/ws-services-calculation/Penalty.json b/data/as/30175021/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..354126db3a
--- /dev/null
+++ b/data/as/30175021/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175021",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175021/ws-services-calculation/WCBillingSlab.json b/data/as/30175021/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac0f449785
--- /dev/null
+++ b/data/as/30175021/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175021",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175053/BillingService/BusinessService.json b/data/as/30175053/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32d8221885
--- /dev/null
+++ b/data/as/30175053/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175053",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175053/egov-location/boundary-data.json b/data/as/30175053/egov-location/boundary-data.json
new file mode 100644
index 0000000000..51d47ddec3
--- /dev/null
+++ b/data/as/30175053/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175053",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BAM PARBATIA PWSS",
+                "localname": "NEW BAM PARBATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BAM PARBATIA PWSS",
+                        "localname": "NEW BAM PARBATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW BAM PARBATIA PWSS",
+                "localname": "NEW BAM PARBATIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW BAM PARBATIA PWSS",
+                        "localname": "NEW BAM PARBATIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175053/ws-services-calculation/Penalty.json b/data/as/30175053/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6084d3ac58
--- /dev/null
+++ b/data/as/30175053/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175053",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175053/ws-services-calculation/WCBillingSlab.json b/data/as/30175053/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ecdf7c0e35
--- /dev/null
+++ b/data/as/30175053/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175053",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175075/BillingService/BusinessService.json b/data/as/30175075/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f2c73eb440
--- /dev/null
+++ b/data/as/30175075/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175075",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175075/egov-location/boundary-data.json b/data/as/30175075/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2278329df5
--- /dev/null
+++ b/data/as/30175075/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175075",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELATAR GAON MPWSS",
+                "localname": "BHELATAR GAON MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175075",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELATAR GAON MPWSS",
+                        "localname": "BHELATAR GAON MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELATAR GAON MPWSS",
+                "localname": "BHELATAR GAON MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175075",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELATAR GAON MPWSS",
+                        "localname": "BHELATAR GAON MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175075/ws-services-calculation/Penalty.json b/data/as/30175075/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5410385d8e
--- /dev/null
+++ b/data/as/30175075/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175075",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175075/ws-services-calculation/WCBillingSlab.json b/data/as/30175075/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b4b7f4d9a4
--- /dev/null
+++ b/data/as/30175075/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175075",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175155/BillingService/BusinessService.json b/data/as/30175155/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6096f965f5
--- /dev/null
+++ b/data/as/30175155/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175155",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175155/egov-location/boundary-data.json b/data/as/30175155/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e52022b868
--- /dev/null
+++ b/data/as/30175155/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175155",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIDUBI GAON PWSS",
+                "localname": "HATIDUBI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175155",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIDUBI GAON PWSS",
+                        "localname": "HATIDUBI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIDUBI GAON PWSS",
+                "localname": "HATIDUBI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175155",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIDUBI GAON PWSS",
+                        "localname": "HATIDUBI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175155/ws-services-calculation/Penalty.json b/data/as/30175155/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..993ceeb42d
--- /dev/null
+++ b/data/as/30175155/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175155",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175155/ws-services-calculation/WCBillingSlab.json b/data/as/30175155/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a992ab4941
--- /dev/null
+++ b/data/as/30175155/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175155",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175169/BillingService/BusinessService.json b/data/as/30175169/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d1d4b85b26
--- /dev/null
+++ b/data/as/30175169/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175169",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175169/egov-location/boundary-data.json b/data/as/30175169/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a4e68d1f2b
--- /dev/null
+++ b/data/as/30175169/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175169",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BAHUMARI GAON PWSS",
+                "localname": "NO.1 BAHUMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175169",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BAHUMARI GAON PWSS",
+                        "localname": "NO.1 BAHUMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BAHUMARI GAON PWSS",
+                "localname": "NO.1 BAHUMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175169",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BAHUMARI GAON PWSS",
+                        "localname": "NO.1 BAHUMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175169/ws-services-calculation/Penalty.json b/data/as/30175169/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1eada6f61e
--- /dev/null
+++ b/data/as/30175169/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175169",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175169/ws-services-calculation/WCBillingSlab.json b/data/as/30175169/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a77fb6ab19
--- /dev/null
+++ b/data/as/30175169/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175169",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175190/BillingService/BusinessService.json b/data/as/30175190/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e39bff66d
--- /dev/null
+++ b/data/as/30175190/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175190",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175190/egov-location/boundary-data.json b/data/as/30175190/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dab394d51b
--- /dev/null
+++ b/data/as/30175190/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175190",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIPUKHURI NORTH PWSS",
+                "localname": "HATIPUKHURI NORTH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175190",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIPUKHURI NORTH PWSS",
+                        "localname": "HATIPUKHURI NORTH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIPUKHURI NORTH PWSS",
+                "localname": "HATIPUKHURI NORTH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175190",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIPUKHURI NORTH PWSS",
+                        "localname": "HATIPUKHURI NORTH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175190/ws-services-calculation/Penalty.json b/data/as/30175190/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a384b4ea25
--- /dev/null
+++ b/data/as/30175190/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175190",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175190/ws-services-calculation/WCBillingSlab.json b/data/as/30175190/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..79bfcec6cf
--- /dev/null
+++ b/data/as/30175190/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175190",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175203/BillingService/BusinessService.json b/data/as/30175203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ddfffd350c
--- /dev/null
+++ b/data/as/30175203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175203/egov-location/boundary-data.json b/data/as/30175203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..55f399cc0e
--- /dev/null
+++ b/data/as/30175203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMUKIA KACHARI PWSS",
+                "localname": "SAMUKIA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMUKIA KACHARI PWSS",
+                        "localname": "SAMUKIA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMUKIA KACHARI PWSS",
+                "localname": "SAMUKIA KACHARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMUKIA KACHARI PWSS",
+                        "localname": "SAMUKIA KACHARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175203/ws-services-calculation/Penalty.json b/data/as/30175203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..67e57926ac
--- /dev/null
+++ b/data/as/30175203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175203/ws-services-calculation/WCBillingSlab.json b/data/as/30175203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..92ee96f889
--- /dev/null
+++ b/data/as/30175203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175204/BillingService/BusinessService.json b/data/as/30175204/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9dfad719e8
--- /dev/null
+++ b/data/as/30175204/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175204",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175204/egov-location/boundary-data.json b/data/as/30175204/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c7347931de
--- /dev/null
+++ b/data/as/30175204/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175204",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURHATI PWSS",
+                "localname": "KURHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175204",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURHATI PWSS",
+                        "localname": "KURHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KURHATI PWSS",
+                "localname": "KURHATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175204",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KURHATI PWSS",
+                        "localname": "KURHATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175204/ws-services-calculation/Penalty.json b/data/as/30175204/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..286e276c96
--- /dev/null
+++ b/data/as/30175204/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175204",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175204/ws-services-calculation/WCBillingSlab.json b/data/as/30175204/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..40a7328d02
--- /dev/null
+++ b/data/as/30175204/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175204",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175213/BillingService/BusinessService.json b/data/as/30175213/BillingService/BusinessService.json
new file mode 100644
index 0000000000..165bb3e714
--- /dev/null
+++ b/data/as/30175213/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175213",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175213/egov-location/boundary-data.json b/data/as/30175213/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1325cc42d1
--- /dev/null
+++ b/data/as/30175213/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175213",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANIGAON PWSS",
+                "localname": "NAHARANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANIGAON PWSS",
+                        "localname": "NAHARANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAHARANIGAON PWSS",
+                "localname": "NAHARANIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175213",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAHARANIGAON PWSS",
+                        "localname": "NAHARANIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175213/ws-services-calculation/Penalty.json b/data/as/30175213/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9725522231
--- /dev/null
+++ b/data/as/30175213/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175213",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175213/ws-services-calculation/WCBillingSlab.json b/data/as/30175213/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4b65dd211b
--- /dev/null
+++ b/data/as/30175213/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175213",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175228/BillingService/BusinessService.json b/data/as/30175228/BillingService/BusinessService.json
new file mode 100644
index 0000000000..970725ba09
--- /dev/null
+++ b/data/as/30175228/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175228",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175228/egov-location/boundary-data.json b/data/as/30175228/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f08b25b6e
--- /dev/null
+++ b/data/as/30175228/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175228",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHATOWAL 1 PWSS",
+                "localname": "KHATOWAL 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHATOWAL 1 PWSS",
+                        "localname": "KHATOWAL 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHATOWAL 1 PWSS",
+                "localname": "KHATOWAL 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175228",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHATOWAL 1 PWSS",
+                        "localname": "KHATOWAL 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175228/ws-services-calculation/Penalty.json b/data/as/30175228/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ce0d62919
--- /dev/null
+++ b/data/as/30175228/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175228",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175228/ws-services-calculation/WCBillingSlab.json b/data/as/30175228/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b46c89c4e9
--- /dev/null
+++ b/data/as/30175228/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175228",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175239/BillingService/BusinessService.json b/data/as/30175239/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d04321bdd
--- /dev/null
+++ b/data/as/30175239/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175239",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175239/egov-location/boundary-data.json b/data/as/30175239/egov-location/boundary-data.json
new file mode 100644
index 0000000000..597a637b30
--- /dev/null
+++ b/data/as/30175239/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175239",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHARMAPUR PWSS",
+                "localname": "DHARMAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHARMAPUR PWSS",
+                        "localname": "DHARMAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHARMAPUR PWSS",
+                "localname": "DHARMAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175239",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHARMAPUR PWSS",
+                        "localname": "DHARMAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175239/ws-services-calculation/Penalty.json b/data/as/30175239/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40bf0440d1
--- /dev/null
+++ b/data/as/30175239/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175239",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175239/ws-services-calculation/WCBillingSlab.json b/data/as/30175239/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2758ab7691
--- /dev/null
+++ b/data/as/30175239/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175239",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175264/BillingService/BusinessService.json b/data/as/30175264/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b14a182323
--- /dev/null
+++ b/data/as/30175264/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175264",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175264/egov-location/boundary-data.json b/data/as/30175264/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f7811d447
--- /dev/null
+++ b/data/as/30175264/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175264",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR DIKARAI MIRI PWSS",
+                "localname": "BAR DIKARAI MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR DIKARAI MIRI PWSS",
+                        "localname": "BAR DIKARAI MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR DIKARAI MIRI PWSS",
+                "localname": "BAR DIKARAI MIRI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175264",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR DIKARAI MIRI PWSS",
+                        "localname": "BAR DIKARAI MIRI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175264/ws-services-calculation/Penalty.json b/data/as/30175264/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ac156382c0
--- /dev/null
+++ b/data/as/30175264/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175264",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175264/ws-services-calculation/WCBillingSlab.json b/data/as/30175264/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0690a39eff
--- /dev/null
+++ b/data/as/30175264/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175264",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175272/BillingService/BusinessService.json b/data/as/30175272/BillingService/BusinessService.json
new file mode 100644
index 0000000000..604718dea7
--- /dev/null
+++ b/data/as/30175272/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175272",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175272/egov-location/boundary-data.json b/data/as/30175272/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5b05211ffb
--- /dev/null
+++ b/data/as/30175272/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175272",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALITA KEOT CHUBURI PWSS",
+                "localname": "KALITA KEOT CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175272",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALITA KEOT CHUBURI PWSS",
+                        "localname": "KALITA KEOT CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALITA KEOT CHUBURI PWSS",
+                "localname": "KALITA KEOT CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175272",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALITA KEOT CHUBURI PWSS",
+                        "localname": "KALITA KEOT CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175272/ws-services-calculation/Penalty.json b/data/as/30175272/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..145ce5cb46
--- /dev/null
+++ b/data/as/30175272/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175272",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175272/ws-services-calculation/WCBillingSlab.json b/data/as/30175272/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54ca532d8d
--- /dev/null
+++ b/data/as/30175272/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175272",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175295/BillingService/BusinessService.json b/data/as/30175295/BillingService/BusinessService.json
new file mode 100644
index 0000000000..71350c6343
--- /dev/null
+++ b/data/as/30175295/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175295",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175295/egov-location/boundary-data.json b/data/as/30175295/egov-location/boundary-data.json
new file mode 100644
index 0000000000..32819f4595
--- /dev/null
+++ b/data/as/30175295/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175295",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARI PUKHURI DAKHIN MPWSS",
+                "localname": "CHARI PUKHURI DAKHIN MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARI PUKHURI DAKHIN MPWSS",
+                        "localname": "CHARI PUKHURI DAKHIN MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARI PUKHURI DAKHIN MPWSS",
+                "localname": "CHARI PUKHURI DAKHIN MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARI PUKHURI DAKHIN MPWSS",
+                        "localname": "CHARI PUKHURI DAKHIN MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175295/ws-services-calculation/Penalty.json b/data/as/30175295/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..01d082038f
--- /dev/null
+++ b/data/as/30175295/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175295",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175295/ws-services-calculation/WCBillingSlab.json b/data/as/30175295/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e2416a591c
--- /dev/null
+++ b/data/as/30175295/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175295",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175334/BillingService/BusinessService.json b/data/as/30175334/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e61b99bd5b
--- /dev/null
+++ b/data/as/30175334/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175334",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175334/egov-location/boundary-data.json b/data/as/30175334/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4810c77dfb
--- /dev/null
+++ b/data/as/30175334/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175334",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BATAMARI PWSS",
+                "localname": "NO.1 BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BATAMARI PWSS",
+                        "localname": "NO.1 BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.1 BATAMARI PWSS",
+                "localname": "NO.1 BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.1 BATAMARI PWSS",
+                        "localname": "NO.1 BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175334/ws-services-calculation/Penalty.json b/data/as/30175334/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0fcba6e8d9
--- /dev/null
+++ b/data/as/30175334/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175334",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175334/ws-services-calculation/WCBillingSlab.json b/data/as/30175334/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5cb420aae
--- /dev/null
+++ b/data/as/30175334/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175334",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175367/BillingService/BusinessService.json b/data/as/30175367/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6240357e48
--- /dev/null
+++ b/data/as/30175367/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175367",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175367/egov-location/boundary-data.json b/data/as/30175367/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3443fca648
--- /dev/null
+++ b/data/as/30175367/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175367",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI GOPSAR PWSS",
+                "localname": "MORISUTI GOPSAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI GOPSAR PWSS",
+                        "localname": "MORISUTI GOPSAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI GOPSAR PWSS",
+                "localname": "MORISUTI GOPSAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI GOPSAR PWSS",
+                        "localname": "MORISUTI GOPSAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175367/ws-services-calculation/Penalty.json b/data/as/30175367/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..849508e5bd
--- /dev/null
+++ b/data/as/30175367/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175367",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175367/ws-services-calculation/WCBillingSlab.json b/data/as/30175367/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d8cb9f40fa
--- /dev/null
+++ b/data/as/30175367/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175367",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175392/BillingService/BusinessService.json b/data/as/30175392/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b238231aca
--- /dev/null
+++ b/data/as/30175392/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175392",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175392/egov-location/boundary-data.json b/data/as/30175392/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a888929a9
--- /dev/null
+++ b/data/as/30175392/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175392",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANG GAON PWSS",
+                "localname": "BANG GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175392",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANG GAON PWSS",
+                        "localname": "BANG GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANG GAON PWSS",
+                "localname": "BANG GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175392",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANG GAON PWSS",
+                        "localname": "BANG GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175392/ws-services-calculation/Penalty.json b/data/as/30175392/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aff5f8177c
--- /dev/null
+++ b/data/as/30175392/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175392",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175392/ws-services-calculation/WCBillingSlab.json b/data/as/30175392/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..730de57fa6
--- /dev/null
+++ b/data/as/30175392/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175392",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175425/BillingService/BusinessService.json b/data/as/30175425/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1601ce6daa
--- /dev/null
+++ b/data/as/30175425/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175425",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175425/egov-location/boundary-data.json b/data/as/30175425/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6638eb18ed
--- /dev/null
+++ b/data/as/30175425/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175425",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW NO.1 BAR DIKARAI PWSS",
+                "localname": "NEW NO.1 BAR DIKARAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW NO.1 BAR DIKARAI PWSS",
+                        "localname": "NEW NO.1 BAR DIKARAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW NO.1 BAR DIKARAI PWSS",
+                "localname": "NEW NO.1 BAR DIKARAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW NO.1 BAR DIKARAI PWSS",
+                        "localname": "NEW NO.1 BAR DIKARAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175425/ws-services-calculation/Penalty.json b/data/as/30175425/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..121c29e68e
--- /dev/null
+++ b/data/as/30175425/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175425",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175425/ws-services-calculation/WCBillingSlab.json b/data/as/30175425/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54dfb7e408
--- /dev/null
+++ b/data/as/30175425/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175425",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175446/BillingService/BusinessService.json b/data/as/30175446/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b49ae013ce
--- /dev/null
+++ b/data/as/30175446/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175446",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175446/egov-location/boundary-data.json b/data/as/30175446/egov-location/boundary-data.json
new file mode 100644
index 0000000000..96a39155c9
--- /dev/null
+++ b/data/as/30175446/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175446",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAKATI PWSS",
+                "localname": "KALAKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAKATI PWSS",
+                        "localname": "KALAKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAKATI PWSS",
+                "localname": "KALAKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175446",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAKATI PWSS",
+                        "localname": "KALAKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175446/ws-services-calculation/Penalty.json b/data/as/30175446/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1827f47d9a
--- /dev/null
+++ b/data/as/30175446/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175446",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175446/ws-services-calculation/WCBillingSlab.json b/data/as/30175446/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..72c7168b70
--- /dev/null
+++ b/data/as/30175446/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175446",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175464/BillingService/BusinessService.json b/data/as/30175464/BillingService/BusinessService.json
new file mode 100644
index 0000000000..961e795662
--- /dev/null
+++ b/data/as/30175464/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175464",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175464/egov-location/boundary-data.json b/data/as/30175464/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b46f2a46d
--- /dev/null
+++ b/data/as/30175464/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175464",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ITAKHOLA-1 PWSS",
+                "localname": "ITAKHOLA-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175464",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ITAKHOLA-1 PWSS",
+                        "localname": "ITAKHOLA-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ITAKHOLA-1 PWSS",
+                "localname": "ITAKHOLA-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175464",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ITAKHOLA-1 PWSS",
+                        "localname": "ITAKHOLA-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175464/ws-services-calculation/Penalty.json b/data/as/30175464/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b1bda1dbc0
--- /dev/null
+++ b/data/as/30175464/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175464",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175464/ws-services-calculation/WCBillingSlab.json b/data/as/30175464/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4cef689795
--- /dev/null
+++ b/data/as/30175464/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175464",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175466/BillingService/BusinessService.json b/data/as/30175466/BillingService/BusinessService.json
new file mode 100644
index 0000000000..179647f18a
--- /dev/null
+++ b/data/as/30175466/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175466",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175466/egov-location/boundary-data.json b/data/as/30175466/egov-location/boundary-data.json
new file mode 100644
index 0000000000..92ac372b6d
--- /dev/null
+++ b/data/as/30175466/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175466",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI TOPUBASTI MPWS",
+                "localname": "MORISUTI TOPUBASTI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175466",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI TOPUBASTI MPWS",
+                        "localname": "MORISUTI TOPUBASTI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI TOPUBASTI MPWS",
+                "localname": "MORISUTI TOPUBASTI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175466",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI TOPUBASTI MPWS",
+                        "localname": "MORISUTI TOPUBASTI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175466/ws-services-calculation/Penalty.json b/data/as/30175466/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8ee369fa76
--- /dev/null
+++ b/data/as/30175466/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175466",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175466/ws-services-calculation/WCBillingSlab.json b/data/as/30175466/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca8b3a4207
--- /dev/null
+++ b/data/as/30175466/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175466",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175474/BillingService/BusinessService.json b/data/as/30175474/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de58e4e524
--- /dev/null
+++ b/data/as/30175474/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175474",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175474/egov-location/boundary-data.json b/data/as/30175474/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26737905f0
--- /dev/null
+++ b/data/as/30175474/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175474",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOKAJAN-1 PWSS",
+                "localname": "HOKAJAN-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175474",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOKAJAN-1 PWSS",
+                        "localname": "HOKAJAN-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOKAJAN-1 PWSS",
+                "localname": "HOKAJAN-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175474",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOKAJAN-1 PWSS",
+                        "localname": "HOKAJAN-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175474/ws-services-calculation/Penalty.json b/data/as/30175474/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6ff446a1f
--- /dev/null
+++ b/data/as/30175474/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175474",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175474/ws-services-calculation/WCBillingSlab.json b/data/as/30175474/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5caa1b8016
--- /dev/null
+++ b/data/as/30175474/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175474",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175490/BillingService/BusinessService.json b/data/as/30175490/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d1b608ef5b
--- /dev/null
+++ b/data/as/30175490/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175490",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175490/egov-location/boundary-data.json b/data/as/30175490/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8085a264aa
--- /dev/null
+++ b/data/as/30175490/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175490",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATISAL PWSS",
+                "localname": "HATISAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATISAL PWSS",
+                        "localname": "HATISAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATISAL PWSS",
+                "localname": "HATISAL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175490",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATISAL PWSS",
+                        "localname": "HATISAL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175490/ws-services-calculation/Penalty.json b/data/as/30175490/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..30e50fe6e1
--- /dev/null
+++ b/data/as/30175490/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175490",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175490/ws-services-calculation/WCBillingSlab.json b/data/as/30175490/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8aa7b275aa
--- /dev/null
+++ b/data/as/30175490/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175490",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175493/BillingService/BusinessService.json b/data/as/30175493/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8d4d8c795
--- /dev/null
+++ b/data/as/30175493/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175493",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175493/egov-location/boundary-data.json b/data/as/30175493/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7b1e0fd6d
--- /dev/null
+++ b/data/as/30175493/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175493",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAMARI BHAIRABI PWSS",
+                "localname": "BATIAMARI BHAIRABI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175493",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAMARI BHAIRABI PWSS",
+                        "localname": "BATIAMARI BHAIRABI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAMARI BHAIRABI PWSS",
+                "localname": "BATIAMARI BHAIRABI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175493",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAMARI BHAIRABI PWSS",
+                        "localname": "BATIAMARI BHAIRABI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175493/ws-services-calculation/Penalty.json b/data/as/30175493/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d0482ee1c0
--- /dev/null
+++ b/data/as/30175493/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175493",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175493/ws-services-calculation/WCBillingSlab.json b/data/as/30175493/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6a813b6a5e
--- /dev/null
+++ b/data/as/30175493/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175493",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175539/BillingService/BusinessService.json b/data/as/30175539/BillingService/BusinessService.json
new file mode 100644
index 0000000000..518481ce9b
--- /dev/null
+++ b/data/as/30175539/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175539",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175539/egov-location/boundary-data.json b/data/as/30175539/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8c99e35be
--- /dev/null
+++ b/data/as/30175539/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175539",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW KUMAR GAON PWSS",
+                "localname": "NEW KUMAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175539",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW KUMAR GAON PWSS",
+                        "localname": "NEW KUMAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW KUMAR GAON PWSS",
+                "localname": "NEW KUMAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175539",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW KUMAR GAON PWSS",
+                        "localname": "NEW KUMAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175539/ws-services-calculation/Penalty.json b/data/as/30175539/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c836846097
--- /dev/null
+++ b/data/as/30175539/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175539",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175539/ws-services-calculation/WCBillingSlab.json b/data/as/30175539/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..38a43b1d8a
--- /dev/null
+++ b/data/as/30175539/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175539",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175554/BillingService/BusinessService.json b/data/as/30175554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5402cdbeaa
--- /dev/null
+++ b/data/as/30175554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175554/egov-location/boundary-data.json b/data/as/30175554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e7cc56063
--- /dev/null
+++ b/data/as/30175554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOHMARA PWSS",
+                "localname": "MOHMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOHMARA PWSS",
+                        "localname": "MOHMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOHMARA PWSS",
+                "localname": "MOHMARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOHMARA PWSS",
+                        "localname": "MOHMARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175554/ws-services-calculation/Penalty.json b/data/as/30175554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..102343ef46
--- /dev/null
+++ b/data/as/30175554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175554/ws-services-calculation/WCBillingSlab.json b/data/as/30175554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a4c4dca392
--- /dev/null
+++ b/data/as/30175554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175635/BillingService/BusinessService.json b/data/as/30175635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d7d113a96b
--- /dev/null
+++ b/data/as/30175635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175635/egov-location/boundary-data.json b/data/as/30175635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9f1c1d6a57
--- /dev/null
+++ b/data/as/30175635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NADIDHAR PWSS",
+                "localname": "NADIDHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NADIDHAR PWSS",
+                        "localname": "NADIDHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NADIDHAR PWSS",
+                "localname": "NADIDHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NADIDHAR PWSS",
+                        "localname": "NADIDHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175635/ws-services-calculation/Penalty.json b/data/as/30175635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..758faa144e
--- /dev/null
+++ b/data/as/30175635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175635/ws-services-calculation/WCBillingSlab.json b/data/as/30175635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..66a2c1a15f
--- /dev/null
+++ b/data/as/30175635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175648/BillingService/BusinessService.json b/data/as/30175648/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8769c97ea8
--- /dev/null
+++ b/data/as/30175648/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175648",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175648/egov-location/boundary-data.json b/data/as/30175648/egov-location/boundary-data.json
new file mode 100644
index 0000000000..56d4870c9f
--- /dev/null
+++ b/data/as/30175648/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175648",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARO BAHAMPARA PWSS (NEW)",
+                "localname": "GARO BAHAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARO BAHAMPARA PWSS (NEW)",
+                        "localname": "GARO BAHAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARO BAHAMPARA PWSS (NEW)",
+                "localname": "GARO BAHAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARO BAHAMPARA PWSS (NEW)",
+                        "localname": "GARO BAHAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175648/ws-services-calculation/Penalty.json b/data/as/30175648/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e674617a12
--- /dev/null
+++ b/data/as/30175648/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175648",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175648/ws-services-calculation/WCBillingSlab.json b/data/as/30175648/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3870f479fa
--- /dev/null
+++ b/data/as/30175648/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175648",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175668/BillingService/BusinessService.json b/data/as/30175668/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f8e85b1d87
--- /dev/null
+++ b/data/as/30175668/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175668",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175668/egov-location/boundary-data.json b/data/as/30175668/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3e96ca5ee
--- /dev/null
+++ b/data/as/30175668/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175668",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NISHANGRAM NO.2 PWSS (NEW)",
+                "localname": "NISHANGRAM NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175668",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NISHANGRAM NO.2 PWSS (NEW)",
+                        "localname": "NISHANGRAM NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NISHANGRAM NO.2 PWSS (NEW)",
+                "localname": "NISHANGRAM NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175668",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NISHANGRAM NO.2 PWSS (NEW)",
+                        "localname": "NISHANGRAM NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175668/ws-services-calculation/Penalty.json b/data/as/30175668/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab741f4b81
--- /dev/null
+++ b/data/as/30175668/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175668",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175668/ws-services-calculation/WCBillingSlab.json b/data/as/30175668/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56bf1ce3ac
--- /dev/null
+++ b/data/as/30175668/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175668",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175691/BillingService/BusinessService.json b/data/as/30175691/BillingService/BusinessService.json
new file mode 100644
index 0000000000..771da10e23
--- /dev/null
+++ b/data/as/30175691/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175691",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175691/egov-location/boundary-data.json b/data/as/30175691/egov-location/boundary-data.json
new file mode 100644
index 0000000000..616282b3c7
--- /dev/null
+++ b/data/as/30175691/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175691",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAIRAPARA PWSS (NEW)",
+                "localname": "KHAIRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAIRAPARA PWSS (NEW)",
+                        "localname": "KHAIRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAIRAPARA PWSS (NEW)",
+                "localname": "KHAIRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175691",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAIRAPARA PWSS (NEW)",
+                        "localname": "KHAIRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175691/ws-services-calculation/Penalty.json b/data/as/30175691/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..91f8dfe961
--- /dev/null
+++ b/data/as/30175691/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175691",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175691/ws-services-calculation/WCBillingSlab.json b/data/as/30175691/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..12bd0ebe28
--- /dev/null
+++ b/data/as/30175691/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175691",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175708/BillingService/BusinessService.json b/data/as/30175708/BillingService/BusinessService.json
new file mode 100644
index 0000000000..49e6b2f7a4
--- /dev/null
+++ b/data/as/30175708/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175708",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175708/egov-location/boundary-data.json b/data/as/30175708/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f6a7638249
--- /dev/null
+++ b/data/as/30175708/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175708",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HALESWAR",
+                "localname": "NEW HALESWAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HALESWAR",
+                        "localname": "NEW HALESWAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW HALESWAR",
+                "localname": "NEW HALESWAR",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW HALESWAR",
+                        "localname": "NEW HALESWAR",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175708/ws-services-calculation/Penalty.json b/data/as/30175708/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc03ca24db
--- /dev/null
+++ b/data/as/30175708/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175708",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175708/ws-services-calculation/WCBillingSlab.json b/data/as/30175708/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0a7a1d4d7a
--- /dev/null
+++ b/data/as/30175708/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175708",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175727/BillingService/BusinessService.json b/data/as/30175727/BillingService/BusinessService.json
new file mode 100644
index 0000000000..303f5495c1
--- /dev/null
+++ b/data/as/30175727/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175727",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175727/egov-location/boundary-data.json b/data/as/30175727/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5f1607541a
--- /dev/null
+++ b/data/as/30175727/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175727",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                "localname": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175727",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                        "localname": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                "localname": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175727",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                        "localname": "KUCHDHOWA CHESAPANI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175727/ws-services-calculation/Penalty.json b/data/as/30175727/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..898352a944
--- /dev/null
+++ b/data/as/30175727/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175727",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175727/ws-services-calculation/WCBillingSlab.json b/data/as/30175727/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..848f14dce5
--- /dev/null
+++ b/data/as/30175727/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175727",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175767/BillingService/BusinessService.json b/data/as/30175767/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bff06925e8
--- /dev/null
+++ b/data/as/30175767/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175767",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175767/egov-location/boundary-data.json b/data/as/30175767/egov-location/boundary-data.json
new file mode 100644
index 0000000000..724b32efa5
--- /dev/null
+++ b/data/as/30175767/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175767",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIMUKH PART-3 PWSS",
+                "localname": "GHILADHARIMUKH PART-3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIMUKH PART-3 PWSS",
+                        "localname": "GHILADHARIMUKH PART-3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIMUKH PART-3 PWSS",
+                "localname": "GHILADHARIMUKH PART-3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIMUKH PART-3 PWSS",
+                        "localname": "GHILADHARIMUKH PART-3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175767/ws-services-calculation/Penalty.json b/data/as/30175767/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d7d6f73c5
--- /dev/null
+++ b/data/as/30175767/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175767",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175767/ws-services-calculation/WCBillingSlab.json b/data/as/30175767/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e3a57e565
--- /dev/null
+++ b/data/as/30175767/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175767",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175783/BillingService/BusinessService.json b/data/as/30175783/BillingService/BusinessService.json
new file mode 100644
index 0000000000..416b26f238
--- /dev/null
+++ b/data/as/30175783/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175783",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175783/egov-location/boundary-data.json b/data/as/30175783/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b90e01b73c
--- /dev/null
+++ b/data/as/30175783/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175783",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HERAPUWA PWSS",
+                "localname": "HERAPUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HERAPUWA PWSS",
+                        "localname": "HERAPUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HERAPUWA PWSS",
+                "localname": "HERAPUWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HERAPUWA PWSS",
+                        "localname": "HERAPUWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175783/ws-services-calculation/Penalty.json b/data/as/30175783/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..567aecd418
--- /dev/null
+++ b/data/as/30175783/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175783",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175783/ws-services-calculation/WCBillingSlab.json b/data/as/30175783/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91f52b30c5
--- /dev/null
+++ b/data/as/30175783/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175783",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175784/BillingService/BusinessService.json b/data/as/30175784/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09e0aa309d
--- /dev/null
+++ b/data/as/30175784/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175784",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175784/egov-location/boundary-data.json b/data/as/30175784/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e2af7db8bd
--- /dev/null
+++ b/data/as/30175784/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175784",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIMUKH PART-2 PWSS",
+                "localname": "GHILADHARIMUKH PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175784",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIMUKH PART-2 PWSS",
+                        "localname": "GHILADHARIMUKH PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIMUKH PART-2 PWSS",
+                "localname": "GHILADHARIMUKH PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175784",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIMUKH PART-2 PWSS",
+                        "localname": "GHILADHARIMUKH PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175784/ws-services-calculation/Penalty.json b/data/as/30175784/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5561432158
--- /dev/null
+++ b/data/as/30175784/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175784",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175784/ws-services-calculation/WCBillingSlab.json b/data/as/30175784/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6e629f86b
--- /dev/null
+++ b/data/as/30175784/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175784",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175795/BillingService/BusinessService.json b/data/as/30175795/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5102b1e7a0
--- /dev/null
+++ b/data/as/30175795/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175795",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175795/egov-location/boundary-data.json b/data/as/30175795/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20d0c272a7
--- /dev/null
+++ b/data/as/30175795/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175795",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TANGABARI NO. 2 PWSS (NEW)",
+                "localname": "TANGABARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175795",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TANGABARI NO. 2 PWSS (NEW)",
+                        "localname": "TANGABARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TANGABARI NO. 2 PWSS (NEW)",
+                "localname": "TANGABARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175795",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TANGABARI NO. 2 PWSS (NEW)",
+                        "localname": "TANGABARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175795/ws-services-calculation/Penalty.json b/data/as/30175795/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9447eb5cd4
--- /dev/null
+++ b/data/as/30175795/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175795",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175795/ws-services-calculation/WCBillingSlab.json b/data/as/30175795/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b93e61f149
--- /dev/null
+++ b/data/as/30175795/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175795",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175807/BillingService/BusinessService.json b/data/as/30175807/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f3ace3c0bb
--- /dev/null
+++ b/data/as/30175807/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175807",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175807/egov-location/boundary-data.json b/data/as/30175807/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b531f670ce
--- /dev/null
+++ b/data/as/30175807/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175807",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAJAN NO 1",
+                "localname": "BOKAJAN NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAJAN NO 1",
+                        "localname": "BOKAJAN NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKAJAN NO 1",
+                "localname": "BOKAJAN NO 1",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175807",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKAJAN NO 1",
+                        "localname": "BOKAJAN NO 1",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175807/ws-services-calculation/Penalty.json b/data/as/30175807/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc06a426a0
--- /dev/null
+++ b/data/as/30175807/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175807",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175807/ws-services-calculation/WCBillingSlab.json b/data/as/30175807/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fad4af1f63
--- /dev/null
+++ b/data/as/30175807/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175807",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175812/BillingService/BusinessService.json b/data/as/30175812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..38c6fe96e6
--- /dev/null
+++ b/data/as/30175812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175812/egov-location/boundary-data.json b/data/as/30175812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5c2a8f4346
--- /dev/null
+++ b/data/as/30175812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AZARBARI PWSS",
+                "localname": "AZARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AZARBARI PWSS",
+                        "localname": "AZARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AZARBARI PWSS",
+                "localname": "AZARBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AZARBARI PWSS",
+                        "localname": "AZARBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175812/ws-services-calculation/Penalty.json b/data/as/30175812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de8326f985
--- /dev/null
+++ b/data/as/30175812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175812/ws-services-calculation/WCBillingSlab.json b/data/as/30175812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..06f5f61c27
--- /dev/null
+++ b/data/as/30175812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175821/BillingService/BusinessService.json b/data/as/30175821/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9107fffe76
--- /dev/null
+++ b/data/as/30175821/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175821",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175821/egov-location/boundary-data.json b/data/as/30175821/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4508f89f9
--- /dev/null
+++ b/data/as/30175821/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175821",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMARIBARI PWSS",
+                "localname": "AMARIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMARIBARI PWSS",
+                        "localname": "AMARIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMARIBARI PWSS",
+                "localname": "AMARIBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMARIBARI PWSS",
+                        "localname": "AMARIBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175821/ws-services-calculation/Penalty.json b/data/as/30175821/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6e5c5bb3b
--- /dev/null
+++ b/data/as/30175821/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175821",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175821/ws-services-calculation/WCBillingSlab.json b/data/as/30175821/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5413dd782c
--- /dev/null
+++ b/data/as/30175821/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175821",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175827/BillingService/BusinessService.json b/data/as/30175827/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0d0981ab08
--- /dev/null
+++ b/data/as/30175827/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175827",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175827/egov-location/boundary-data.json b/data/as/30175827/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f83a28a06
--- /dev/null
+++ b/data/as/30175827/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175827",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIMUKH PART-1 PWSS",
+                "localname": "GHILADHARIMUKH PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIMUKH PART-1 PWSS",
+                        "localname": "GHILADHARIMUKH PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHILADHARIMUKH PART-1 PWSS",
+                "localname": "GHILADHARIMUKH PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175827",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHILADHARIMUKH PART-1 PWSS",
+                        "localname": "GHILADHARIMUKH PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175827/ws-services-calculation/Penalty.json b/data/as/30175827/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..805785e8fc
--- /dev/null
+++ b/data/as/30175827/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175827",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175827/ws-services-calculation/WCBillingSlab.json b/data/as/30175827/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..636cabad50
--- /dev/null
+++ b/data/as/30175827/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175827",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175831/BillingService/BusinessService.json b/data/as/30175831/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0641ab1abd
--- /dev/null
+++ b/data/as/30175831/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175831",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175831/egov-location/boundary-data.json b/data/as/30175831/egov-location/boundary-data.json
new file mode 100644
index 0000000000..38efe1717a
--- /dev/null
+++ b/data/as/30175831/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175831",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DHARIKATI PWSS",
+                "localname": "NEW DHARIKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DHARIKATI PWSS",
+                        "localname": "NEW DHARIKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DHARIKATI PWSS",
+                "localname": "NEW DHARIKATI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175831",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DHARIKATI PWSS",
+                        "localname": "NEW DHARIKATI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175831/ws-services-calculation/Penalty.json b/data/as/30175831/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..43e3d7c435
--- /dev/null
+++ b/data/as/30175831/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175831",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175831/ws-services-calculation/WCBillingSlab.json b/data/as/30175831/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6689648707
--- /dev/null
+++ b/data/as/30175831/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175831",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175853/BillingService/BusinessService.json b/data/as/30175853/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a12b55dceb
--- /dev/null
+++ b/data/as/30175853/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175853",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175853/egov-location/boundary-data.json b/data/as/30175853/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc39aca389
--- /dev/null
+++ b/data/as/30175853/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175853",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW CHARDUAR GAON PWSS",
+                "localname": "NEW CHARDUAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175853",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW CHARDUAR GAON PWSS",
+                        "localname": "NEW CHARDUAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW CHARDUAR GAON PWSS",
+                "localname": "NEW CHARDUAR GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175853",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW CHARDUAR GAON PWSS",
+                        "localname": "NEW CHARDUAR GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175853/ws-services-calculation/Penalty.json b/data/as/30175853/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5fdb6aabe7
--- /dev/null
+++ b/data/as/30175853/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175853",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175853/ws-services-calculation/WCBillingSlab.json b/data/as/30175853/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..93e5e6fe49
--- /dev/null
+++ b/data/as/30175853/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175853",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175854/BillingService/BusinessService.json b/data/as/30175854/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a64fcd26f9
--- /dev/null
+++ b/data/as/30175854/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175854",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175854/egov-location/boundary-data.json b/data/as/30175854/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bad4cffb64
--- /dev/null
+++ b/data/as/30175854/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175854",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHIGAON-1 PWSS",
+                "localname": "GHAHIGAON-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHIGAON-1 PWSS",
+                        "localname": "GHAHIGAON-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHIGAON-1 PWSS",
+                "localname": "GHAHIGAON-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175854",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHIGAON-1 PWSS",
+                        "localname": "GHAHIGAON-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175854/ws-services-calculation/Penalty.json b/data/as/30175854/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86e9f802bc
--- /dev/null
+++ b/data/as/30175854/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175854",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175854/ws-services-calculation/WCBillingSlab.json b/data/as/30175854/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de353c2059
--- /dev/null
+++ b/data/as/30175854/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175854",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175867/BillingService/BusinessService.json b/data/as/30175867/BillingService/BusinessService.json
new file mode 100644
index 0000000000..00ce817480
--- /dev/null
+++ b/data/as/30175867/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175867",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175867/egov-location/boundary-data.json b/data/as/30175867/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b47419a3e1
--- /dev/null
+++ b/data/as/30175867/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175867",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                "localname": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                        "localname": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                "localname": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175867",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                        "localname": "CHEKOWARI PWSS (NEW) (KOTHAKUTHI)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175867/ws-services-calculation/Penalty.json b/data/as/30175867/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..229de9df02
--- /dev/null
+++ b/data/as/30175867/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175867",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175867/ws-services-calculation/WCBillingSlab.json b/data/as/30175867/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3c42b7ed31
--- /dev/null
+++ b/data/as/30175867/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175867",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175876/BillingService/BusinessService.json b/data/as/30175876/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc5dbd869a
--- /dev/null
+++ b/data/as/30175876/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175876",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175876/egov-location/boundary-data.json b/data/as/30175876/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2d6137cae
--- /dev/null
+++ b/data/as/30175876/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175876",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYANTA PUR PWSS",
+                "localname": "JAYANTA PUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175876",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYANTA PUR PWSS",
+                        "localname": "JAYANTA PUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYANTA PUR PWSS",
+                "localname": "JAYANTA PUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175876",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYANTA PUR PWSS",
+                        "localname": "JAYANTA PUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175876/ws-services-calculation/Penalty.json b/data/as/30175876/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..da9825dacb
--- /dev/null
+++ b/data/as/30175876/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175876",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175876/ws-services-calculation/WCBillingSlab.json b/data/as/30175876/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..20fa1af42b
--- /dev/null
+++ b/data/as/30175876/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175876",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175883/BillingService/BusinessService.json b/data/as/30175883/BillingService/BusinessService.json
new file mode 100644
index 0000000000..966c575fb3
--- /dev/null
+++ b/data/as/30175883/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175883",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175883/egov-location/boundary-data.json b/data/as/30175883/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e8465ad86
--- /dev/null
+++ b/data/as/30175883/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175883",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALAPARA NO.1 MPWSS",
+                "localname": "BALAPARA NO.1 MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175883",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALAPARA NO.1 MPWSS",
+                        "localname": "BALAPARA NO.1 MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALAPARA NO.1 MPWSS",
+                "localname": "BALAPARA NO.1 MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175883",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALAPARA NO.1 MPWSS",
+                        "localname": "BALAPARA NO.1 MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175883/ws-services-calculation/Penalty.json b/data/as/30175883/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b566e11c2
--- /dev/null
+++ b/data/as/30175883/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175883",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175883/ws-services-calculation/WCBillingSlab.json b/data/as/30175883/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47550694fa
--- /dev/null
+++ b/data/as/30175883/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175883",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175888/BillingService/BusinessService.json b/data/as/30175888/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19d8e235ca
--- /dev/null
+++ b/data/as/30175888/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175888",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175888/egov-location/boundary-data.json b/data/as/30175888/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8823e6f1b
--- /dev/null
+++ b/data/as/30175888/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175888",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHI TATIPARA WSS",
+                "localname": "GHAHI TATIPARA WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175888",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHI TATIPARA WSS",
+                        "localname": "GHAHI TATIPARA WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHI TATIPARA WSS",
+                "localname": "GHAHI TATIPARA WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175888",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHI TATIPARA WSS",
+                        "localname": "GHAHI TATIPARA WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175888/ws-services-calculation/Penalty.json b/data/as/30175888/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df9d40ca79
--- /dev/null
+++ b/data/as/30175888/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175888",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175888/ws-services-calculation/WCBillingSlab.json b/data/as/30175888/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b31bc936aa
--- /dev/null
+++ b/data/as/30175888/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175888",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175891/BillingService/BusinessService.json b/data/as/30175891/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9628da10b9
--- /dev/null
+++ b/data/as/30175891/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175891",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175891/egov-location/boundary-data.json b/data/as/30175891/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1db75f7089
--- /dev/null
+++ b/data/as/30175891/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175891",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORMORA JOYPUR MPWSS",
+                "localname": "GORMORA JOYPUR MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175891",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORMORA JOYPUR MPWSS",
+                        "localname": "GORMORA JOYPUR MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORMORA JOYPUR MPWSS",
+                "localname": "GORMORA JOYPUR MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175891",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORMORA JOYPUR MPWSS",
+                        "localname": "GORMORA JOYPUR MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175891/ws-services-calculation/Penalty.json b/data/as/30175891/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..342a819a7d
--- /dev/null
+++ b/data/as/30175891/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175891",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175891/ws-services-calculation/WCBillingSlab.json b/data/as/30175891/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..45abc4f1de
--- /dev/null
+++ b/data/as/30175891/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175891",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175904/BillingService/BusinessService.json b/data/as/30175904/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9cedb94ab5
--- /dev/null
+++ b/data/as/30175904/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175904",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175904/egov-location/boundary-data.json b/data/as/30175904/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f6f41ea873
--- /dev/null
+++ b/data/as/30175904/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175904",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADIPARA GAROPARA PWSS (NEW)",
+                "localname": "HADIPARA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175904",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADIPARA GAROPARA PWSS (NEW)",
+                        "localname": "HADIPARA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADIPARA GAROPARA PWSS (NEW)",
+                "localname": "HADIPARA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175904",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADIPARA GAROPARA PWSS (NEW)",
+                        "localname": "HADIPARA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175904/ws-services-calculation/Penalty.json b/data/as/30175904/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..099c594019
--- /dev/null
+++ b/data/as/30175904/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175904",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175904/ws-services-calculation/WCBillingSlab.json b/data/as/30175904/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..51a8e94a0d
--- /dev/null
+++ b/data/as/30175904/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175904",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175917/BillingService/BusinessService.json b/data/as/30175917/BillingService/BusinessService.json
new file mode 100644
index 0000000000..26c8f3e60b
--- /dev/null
+++ b/data/as/30175917/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175917",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175917/egov-location/boundary-data.json b/data/as/30175917/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e764966e73
--- /dev/null
+++ b/data/as/30175917/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175917",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA BAGARIBARI PWSS (NEW)",
+                "localname": "KHARA BAGARIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA BAGARIBARI PWSS (NEW)",
+                        "localname": "KHARA BAGARIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA BAGARIBARI PWSS (NEW)",
+                "localname": "KHARA BAGARIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175917",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA BAGARIBARI PWSS (NEW)",
+                        "localname": "KHARA BAGARIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175917/ws-services-calculation/Penalty.json b/data/as/30175917/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8532a1fc07
--- /dev/null
+++ b/data/as/30175917/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175917",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175917/ws-services-calculation/WCBillingSlab.json b/data/as/30175917/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a95691a3b2
--- /dev/null
+++ b/data/as/30175917/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175917",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175983/BillingService/BusinessService.json b/data/as/30175983/BillingService/BusinessService.json
new file mode 100644
index 0000000000..db2c387c39
--- /dev/null
+++ b/data/as/30175983/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30175983",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175983/egov-location/boundary-data.json b/data/as/30175983/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4da3f9b62f
--- /dev/null
+++ b/data/as/30175983/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30175983",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SELAPARA PWSS (NEW)",
+                "localname": "SELAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SELAPARA PWSS (NEW)",
+                        "localname": "SELAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SELAPARA PWSS (NEW)",
+                "localname": "SELAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30175983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SELAPARA PWSS (NEW)",
+                        "localname": "SELAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175983/ws-services-calculation/Penalty.json b/data/as/30175983/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1ab10939d0
--- /dev/null
+++ b/data/as/30175983/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30175983",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30175983/ws-services-calculation/WCBillingSlab.json b/data/as/30175983/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d533e8e604
--- /dev/null
+++ b/data/as/30175983/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30175983",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176038/BillingService/BusinessService.json b/data/as/30176038/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce88d0467e
--- /dev/null
+++ b/data/as/30176038/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176038",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176038/egov-location/boundary-data.json b/data/as/30176038/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c138845872
--- /dev/null
+++ b/data/as/30176038/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176038",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FALGOMPARA PWSS (NEW)",
+                "localname": "FALGOMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FALGOMPARA PWSS (NEW)",
+                        "localname": "FALGOMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FALGOMPARA PWSS (NEW)",
+                "localname": "FALGOMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FALGOMPARA PWSS (NEW)",
+                        "localname": "FALGOMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176038/ws-services-calculation/Penalty.json b/data/as/30176038/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..016d02919d
--- /dev/null
+++ b/data/as/30176038/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176038",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176038/ws-services-calculation/WCBillingSlab.json b/data/as/30176038/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67f2cc0082
--- /dev/null
+++ b/data/as/30176038/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176038",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176114/BillingService/BusinessService.json b/data/as/30176114/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b9d5a6eb0
--- /dev/null
+++ b/data/as/30176114/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176114",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176114/egov-location/boundary-data.json b/data/as/30176114/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2cfee3f26e
--- /dev/null
+++ b/data/as/30176114/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176114",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBIL MORIONI PWSS",
+                "localname": "BORBIL MORIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBIL MORIONI PWSS",
+                        "localname": "BORBIL MORIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBIL MORIONI PWSS",
+                "localname": "BORBIL MORIONI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176114",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBIL MORIONI PWSS",
+                        "localname": "BORBIL MORIONI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176114/ws-services-calculation/Penalty.json b/data/as/30176114/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c75564043b
--- /dev/null
+++ b/data/as/30176114/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176114",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176114/ws-services-calculation/WCBillingSlab.json b/data/as/30176114/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..492563d859
--- /dev/null
+++ b/data/as/30176114/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176114",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176117/BillingService/BusinessService.json b/data/as/30176117/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10c6f2947a
--- /dev/null
+++ b/data/as/30176117/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176117",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176117/egov-location/boundary-data.json b/data/as/30176117/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dce0a212cf
--- /dev/null
+++ b/data/as/30176117/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176117",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAKPURA 1 PWSS (NEW)",
+                "localname": "SARAKPURA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176117",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAKPURA 1 PWSS (NEW)",
+                        "localname": "SARAKPURA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARAKPURA 1 PWSS (NEW)",
+                "localname": "SARAKPURA 1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176117",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARAKPURA 1 PWSS (NEW)",
+                        "localname": "SARAKPURA 1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176117/ws-services-calculation/Penalty.json b/data/as/30176117/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf16e68976
--- /dev/null
+++ b/data/as/30176117/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176117",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176117/ws-services-calculation/WCBillingSlab.json b/data/as/30176117/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..529835f3c6
--- /dev/null
+++ b/data/as/30176117/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176117",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176156/BillingService/BusinessService.json b/data/as/30176156/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ea89fe1bae
--- /dev/null
+++ b/data/as/30176156/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176156",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176156/egov-location/boundary-data.json b/data/as/30176156/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5c83928032
--- /dev/null
+++ b/data/as/30176156/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176156",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLDAMPARA PWSS (NEW)",
+                "localname": "BOLDAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176156",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLDAMPARA PWSS (NEW)",
+                        "localname": "BOLDAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLDAMPARA PWSS (NEW)",
+                "localname": "BOLDAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176156",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLDAMPARA PWSS (NEW)",
+                        "localname": "BOLDAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176156/ws-services-calculation/Penalty.json b/data/as/30176156/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13bcb29c0e
--- /dev/null
+++ b/data/as/30176156/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176156",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176156/ws-services-calculation/WCBillingSlab.json b/data/as/30176156/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e25ae390b6
--- /dev/null
+++ b/data/as/30176156/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176156",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176170/BillingService/BusinessService.json b/data/as/30176170/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee5f48704b
--- /dev/null
+++ b/data/as/30176170/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176170",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176170/egov-location/boundary-data.json b/data/as/30176170/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e005ace35
--- /dev/null
+++ b/data/as/30176170/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176170",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOMORAGURI RF MPWS",
+                "localname": "BHOMORAGURI RF MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOMORAGURI RF MPWS",
+                        "localname": "BHOMORAGURI RF MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOMORAGURI RF MPWS",
+                "localname": "BHOMORAGURI RF MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176170",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOMORAGURI RF MPWS",
+                        "localname": "BHOMORAGURI RF MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176170/ws-services-calculation/Penalty.json b/data/as/30176170/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..314b7c743f
--- /dev/null
+++ b/data/as/30176170/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176170",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176170/ws-services-calculation/WCBillingSlab.json b/data/as/30176170/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f96eabada6
--- /dev/null
+++ b/data/as/30176170/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176170",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176178/BillingService/BusinessService.json b/data/as/30176178/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e3687196c3
--- /dev/null
+++ b/data/as/30176178/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176178",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176178/egov-location/boundary-data.json b/data/as/30176178/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5fe3f126e0
--- /dev/null
+++ b/data/as/30176178/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176178",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TANGABARI PWSS (NEW)",
+                "localname": "TANGABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TANGABARI PWSS (NEW)",
+                        "localname": "TANGABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TANGABARI PWSS (NEW)",
+                "localname": "TANGABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176178",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TANGABARI PWSS (NEW)",
+                        "localname": "TANGABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176178/ws-services-calculation/Penalty.json b/data/as/30176178/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f1d03a713
--- /dev/null
+++ b/data/as/30176178/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176178",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176178/ws-services-calculation/WCBillingSlab.json b/data/as/30176178/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..309d324d6e
--- /dev/null
+++ b/data/as/30176178/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176178",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176209/BillingService/BusinessService.json b/data/as/30176209/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f468d6a6a
--- /dev/null
+++ b/data/as/30176209/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176209",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176209/egov-location/boundary-data.json b/data/as/30176209/egov-location/boundary-data.json
new file mode 100644
index 0000000000..10ccaf5386
--- /dev/null
+++ b/data/as/30176209/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176209",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARIDHORA PWSS (NEW)",
+                "localname": "KHARIDHORA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARIDHORA PWSS (NEW)",
+                        "localname": "KHARIDHORA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARIDHORA PWSS (NEW)",
+                "localname": "KHARIDHORA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARIDHORA PWSS (NEW)",
+                        "localname": "KHARIDHORA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176209/ws-services-calculation/Penalty.json b/data/as/30176209/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b4e31715b6
--- /dev/null
+++ b/data/as/30176209/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176209",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176209/ws-services-calculation/WCBillingSlab.json b/data/as/30176209/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6929b69895
--- /dev/null
+++ b/data/as/30176209/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176209",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176222/BillingService/BusinessService.json b/data/as/30176222/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d61430e38b
--- /dev/null
+++ b/data/as/30176222/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176222",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176222/egov-location/boundary-data.json b/data/as/30176222/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dae1b79718
--- /dev/null
+++ b/data/as/30176222/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176222",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHIDAL PWSS (NEW)",
+                "localname": "PAHIDAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176222",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHIDAL PWSS (NEW)",
+                        "localname": "PAHIDAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAHIDAL PWSS (NEW)",
+                "localname": "PAHIDAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176222",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAHIDAL PWSS (NEW)",
+                        "localname": "PAHIDAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176222/ws-services-calculation/Penalty.json b/data/as/30176222/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5d57ddc7dd
--- /dev/null
+++ b/data/as/30176222/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176222",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176222/ws-services-calculation/WCBillingSlab.json b/data/as/30176222/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b33a1e354
--- /dev/null
+++ b/data/as/30176222/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176222",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176252/BillingService/BusinessService.json b/data/as/30176252/BillingService/BusinessService.json
new file mode 100644
index 0000000000..38fd21d844
--- /dev/null
+++ b/data/as/30176252/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176252",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176252/egov-location/boundary-data.json b/data/as/30176252/egov-location/boundary-data.json
new file mode 100644
index 0000000000..df24541158
--- /dev/null
+++ b/data/as/30176252/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176252",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR PATHAR PWSS (NEW)",
+                "localname": "BAR PATHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176252",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR PATHAR PWSS (NEW)",
+                        "localname": "BAR PATHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR PATHAR PWSS (NEW)",
+                "localname": "BAR PATHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176252",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR PATHAR PWSS (NEW)",
+                        "localname": "BAR PATHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176252/ws-services-calculation/Penalty.json b/data/as/30176252/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1b938364c1
--- /dev/null
+++ b/data/as/30176252/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176252",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176252/ws-services-calculation/WCBillingSlab.json b/data/as/30176252/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5292190c80
--- /dev/null
+++ b/data/as/30176252/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176252",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176279/BillingService/BusinessService.json b/data/as/30176279/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc6ebe8c81
--- /dev/null
+++ b/data/as/30176279/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176279",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176279/egov-location/boundary-data.json b/data/as/30176279/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b2fefade13
--- /dev/null
+++ b/data/as/30176279/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176279",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKARAPATTTA PWSS",
+                "localname": "BAKARAPATTTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176279",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKARAPATTTA PWSS",
+                        "localname": "BAKARAPATTTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKARAPATTTA PWSS",
+                "localname": "BAKARAPATTTA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176279",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKARAPATTTA PWSS",
+                        "localname": "BAKARAPATTTA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176279/ws-services-calculation/Penalty.json b/data/as/30176279/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..69ae015312
--- /dev/null
+++ b/data/as/30176279/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176279",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176279/ws-services-calculation/WCBillingSlab.json b/data/as/30176279/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b538122b3
--- /dev/null
+++ b/data/as/30176279/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176279",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176310/BillingService/BusinessService.json b/data/as/30176310/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6660a29d31
--- /dev/null
+++ b/data/as/30176310/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176310",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176310/egov-location/boundary-data.json b/data/as/30176310/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6b8e98d5a5
--- /dev/null
+++ b/data/as/30176310/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176310",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIMURA PT-II PWSS (NEW)",
+                "localname": "HATIMURA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIMURA PT-II PWSS (NEW)",
+                        "localname": "HATIMURA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATIMURA PT-II PWSS (NEW)",
+                "localname": "HATIMURA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATIMURA PT-II PWSS (NEW)",
+                        "localname": "HATIMURA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176310/ws-services-calculation/Penalty.json b/data/as/30176310/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6fa92db197
--- /dev/null
+++ b/data/as/30176310/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176310",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176310/ws-services-calculation/WCBillingSlab.json b/data/as/30176310/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..59d91ff2b6
--- /dev/null
+++ b/data/as/30176310/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176310",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176350/BillingService/BusinessService.json b/data/as/30176350/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e0e9bffdc3
--- /dev/null
+++ b/data/as/30176350/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176350",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176350/egov-location/boundary-data.json b/data/as/30176350/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1c4e9a2de
--- /dev/null
+++ b/data/as/30176350/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176350",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                "localname": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                        "localname": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                "localname": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176350",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                        "localname": "SUCHIA PAHAR PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176350/ws-services-calculation/Penalty.json b/data/as/30176350/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e2bcf8769c
--- /dev/null
+++ b/data/as/30176350/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176350",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176350/ws-services-calculation/WCBillingSlab.json b/data/as/30176350/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d804d62f7
--- /dev/null
+++ b/data/as/30176350/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176350",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176394/BillingService/BusinessService.json b/data/as/30176394/BillingService/BusinessService.json
new file mode 100644
index 0000000000..29467c8f35
--- /dev/null
+++ b/data/as/30176394/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176394",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176394/egov-location/boundary-data.json b/data/as/30176394/egov-location/boundary-data.json
new file mode 100644
index 0000000000..51421e5ba9
--- /dev/null
+++ b/data/as/30176394/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176394",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARIMARA PWSS (NEW)",
+                "localname": "ARIMARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176394",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARIMARA PWSS (NEW)",
+                        "localname": "ARIMARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARIMARA PWSS (NEW)",
+                "localname": "ARIMARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176394",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARIMARA PWSS (NEW)",
+                        "localname": "ARIMARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176394/ws-services-calculation/Penalty.json b/data/as/30176394/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2ed1e5c3e4
--- /dev/null
+++ b/data/as/30176394/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176394",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176394/ws-services-calculation/WCBillingSlab.json b/data/as/30176394/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d8d7df42a7
--- /dev/null
+++ b/data/as/30176394/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176394",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176403/BillingService/BusinessService.json b/data/as/30176403/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3feabebf61
--- /dev/null
+++ b/data/as/30176403/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176403",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176403/egov-location/boundary-data.json b/data/as/30176403/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7fd650e207
--- /dev/null
+++ b/data/as/30176403/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176403",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                "localname": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176403",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                        "localname": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                "localname": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176403",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                        "localname": "UHANI PATHAR BATABARI NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176403/ws-services-calculation/Penalty.json b/data/as/30176403/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3c3d4901c2
--- /dev/null
+++ b/data/as/30176403/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176403",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176403/ws-services-calculation/WCBillingSlab.json b/data/as/30176403/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8119ee0ef7
--- /dev/null
+++ b/data/as/30176403/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176403",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176503/BillingService/BusinessService.json b/data/as/30176503/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1648a26267
--- /dev/null
+++ b/data/as/30176503/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176503",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176503/egov-location/boundary-data.json b/data/as/30176503/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc3d1a03b6
--- /dev/null
+++ b/data/as/30176503/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176503",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILDUBI PWSS (NEW)",
+                "localname": "SILDUBI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176503",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILDUBI PWSS (NEW)",
+                        "localname": "SILDUBI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILDUBI PWSS (NEW)",
+                "localname": "SILDUBI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176503",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILDUBI PWSS (NEW)",
+                        "localname": "SILDUBI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176503/ws-services-calculation/Penalty.json b/data/as/30176503/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6666e22e3d
--- /dev/null
+++ b/data/as/30176503/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176503",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176503/ws-services-calculation/WCBillingSlab.json b/data/as/30176503/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..04a4fa1863
--- /dev/null
+++ b/data/as/30176503/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176503",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176512/BillingService/BusinessService.json b/data/as/30176512/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4088ed5552
--- /dev/null
+++ b/data/as/30176512/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176512",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176512/egov-location/boundary-data.json b/data/as/30176512/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f22a18654d
--- /dev/null
+++ b/data/as/30176512/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176512",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAIMARI PWSS (NEW)",
+                "localname": "CHARAIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176512",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAIMARI PWSS (NEW)",
+                        "localname": "CHARAIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHARAIMARI PWSS (NEW)",
+                "localname": "CHARAIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176512",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHARAIMARI PWSS (NEW)",
+                        "localname": "CHARAIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176512/ws-services-calculation/Penalty.json b/data/as/30176512/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a00c877c2f
--- /dev/null
+++ b/data/as/30176512/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176512",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176512/ws-services-calculation/WCBillingSlab.json b/data/as/30176512/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..50f86e41cc
--- /dev/null
+++ b/data/as/30176512/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176512",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176517/BillingService/BusinessService.json b/data/as/30176517/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1ac046ef0d
--- /dev/null
+++ b/data/as/30176517/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176517",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176517/egov-location/boundary-data.json b/data/as/30176517/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9c480f09f5
--- /dev/null
+++ b/data/as/30176517/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176517",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA PT -II NO. 2 PWSS (NEW)",
+                "localname": "KHARA PT -II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA PT -II NO. 2 PWSS (NEW)",
+                        "localname": "KHARA PT -II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA PT -II NO. 2 PWSS (NEW)",
+                "localname": "KHARA PT -II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176517",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA PT -II NO. 2 PWSS (NEW)",
+                        "localname": "KHARA PT -II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176517/ws-services-calculation/Penalty.json b/data/as/30176517/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3fe628a48c
--- /dev/null
+++ b/data/as/30176517/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176517",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176517/ws-services-calculation/WCBillingSlab.json b/data/as/30176517/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3adf626c6d
--- /dev/null
+++ b/data/as/30176517/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176517",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176525/BillingService/BusinessService.json b/data/as/30176525/BillingService/BusinessService.json
new file mode 100644
index 0000000000..63726d4975
--- /dev/null
+++ b/data/as/30176525/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176525",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176525/egov-location/boundary-data.json b/data/as/30176525/egov-location/boundary-data.json
new file mode 100644
index 0000000000..50f849d176
--- /dev/null
+++ b/data/as/30176525/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176525",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HABANGGIRI NO.2 PWSS (NEW)",
+                "localname": "HABANGGIRI NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176525",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HABANGGIRI NO.2 PWSS (NEW)",
+                        "localname": "HABANGGIRI NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HABANGGIRI NO.2 PWSS (NEW)",
+                "localname": "HABANGGIRI NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176525",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HABANGGIRI NO.2 PWSS (NEW)",
+                        "localname": "HABANGGIRI NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176525/ws-services-calculation/Penalty.json b/data/as/30176525/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..75de39bd12
--- /dev/null
+++ b/data/as/30176525/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176525",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176525/ws-services-calculation/WCBillingSlab.json b/data/as/30176525/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aba8d8888b
--- /dev/null
+++ b/data/as/30176525/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176525",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176539/egov-location/boundary-data.json b/data/as/30176539/egov-location/boundary-data.json
index 9ffbca41c2..71678e3a44 100644
--- a/data/as/30176539/egov-location/boundary-data.json
+++ b/data/as/30176539/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "BAPUJINAGAR PWSS",
-                "localname": "BAPUJINAGAR PWSS",
+                "name": "BAPUJINAGAR PWSS (NEW)",
+                "localname": "BAPUJINAGAR PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "BAPUJINAGAR PWSS",
-                        "localname": "BAPUJINAGAR PWSS",
+                        "name": "BAPUJINAGAR PWSS (NEW)",
+                        "localname": "BAPUJINAGAR PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "BAPUJINAGAR PWSS",
-                "localname": "BAPUJINAGAR PWSS",
+                "name": "BAPUJINAGAR PWSS (NEW)",
+                "localname": "BAPUJINAGAR PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "BAPUJINAGAR PWSS",
-                        "localname": "BAPUJINAGAR PWSS",
+                        "name": "BAPUJINAGAR PWSS (NEW)",
+                        "localname": "BAPUJINAGAR PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/30176539/ws-services-calculation/WCBillingSlab.json b/data/as/30176539/ws-services-calculation/WCBillingSlab.json
index e8093e7233..ec1334f08e 100644
--- a/data/as/30176539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176539/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176552/BillingService/BusinessService.json b/data/as/30176552/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a6517da278
--- /dev/null
+++ b/data/as/30176552/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176552",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176552/egov-location/boundary-data.json b/data/as/30176552/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89b4107361
--- /dev/null
+++ b/data/as/30176552/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176552",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGULAMARI NO. 3 PWSS (NEW)",
+                "localname": "BAGULAMARI NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176552",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGULAMARI NO. 3 PWSS (NEW)",
+                        "localname": "BAGULAMARI NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGULAMARI NO. 3 PWSS (NEW)",
+                "localname": "BAGULAMARI NO. 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176552",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGULAMARI NO. 3 PWSS (NEW)",
+                        "localname": "BAGULAMARI NO. 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176552/ws-services-calculation/Penalty.json b/data/as/30176552/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..49344e3ebd
--- /dev/null
+++ b/data/as/30176552/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176552",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176552/ws-services-calculation/WCBillingSlab.json b/data/as/30176552/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46fabbf511
--- /dev/null
+++ b/data/as/30176552/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176552",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176563/BillingService/BusinessService.json b/data/as/30176563/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ee68040ce
--- /dev/null
+++ b/data/as/30176563/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176563",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176563/egov-location/boundary-data.json b/data/as/30176563/egov-location/boundary-data.json
new file mode 100644
index 0000000000..405947d9cf
--- /dev/null
+++ b/data/as/30176563/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176563",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                "localname": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176563",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                        "localname": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                "localname": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176563",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                        "localname": "UPPERTOLA KALITAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176563/ws-services-calculation/Penalty.json b/data/as/30176563/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8f5ce62e76
--- /dev/null
+++ b/data/as/30176563/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176563",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176563/ws-services-calculation/WCBillingSlab.json b/data/as/30176563/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b4f2cda798
--- /dev/null
+++ b/data/as/30176563/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176563",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176575/BillingService/BusinessService.json b/data/as/30176575/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1078ecd1b8
--- /dev/null
+++ b/data/as/30176575/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176575",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176575/egov-location/boundary-data.json b/data/as/30176575/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6786be364b
--- /dev/null
+++ b/data/as/30176575/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176575",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEKIPOOL PWSS (NEW)",
+                "localname": "BEKIPOOL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEKIPOOL PWSS (NEW)",
+                        "localname": "BEKIPOOL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEKIPOOL PWSS (NEW)",
+                "localname": "BEKIPOOL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEKIPOOL PWSS (NEW)",
+                        "localname": "BEKIPOOL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176575/ws-services-calculation/Penalty.json b/data/as/30176575/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..270b59ae81
--- /dev/null
+++ b/data/as/30176575/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176575",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176575/ws-services-calculation/WCBillingSlab.json b/data/as/30176575/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cb47e3cce7
--- /dev/null
+++ b/data/as/30176575/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176575",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176589/BillingService/BusinessService.json b/data/as/30176589/BillingService/BusinessService.json
new file mode 100644
index 0000000000..530ebed17c
--- /dev/null
+++ b/data/as/30176589/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176589",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176589/egov-location/boundary-data.json b/data/as/30176589/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bf786f0581
--- /dev/null
+++ b/data/as/30176589/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176589",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI KALIPUR PWSS (NEW)",
+                "localname": "ROWMARI KALIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176589",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI KALIPUR PWSS (NEW)",
+                        "localname": "ROWMARI KALIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI KALIPUR PWSS (NEW)",
+                "localname": "ROWMARI KALIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176589",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI KALIPUR PWSS (NEW)",
+                        "localname": "ROWMARI KALIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176589/ws-services-calculation/Penalty.json b/data/as/30176589/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e4651812c7
--- /dev/null
+++ b/data/as/30176589/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176589",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176589/ws-services-calculation/WCBillingSlab.json b/data/as/30176589/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f2371d9ae
--- /dev/null
+++ b/data/as/30176589/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176589",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176605/BillingService/BusinessService.json b/data/as/30176605/BillingService/BusinessService.json
new file mode 100644
index 0000000000..24de268169
--- /dev/null
+++ b/data/as/30176605/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176605",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176605/egov-location/boundary-data.json b/data/as/30176605/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74bd371252
--- /dev/null
+++ b/data/as/30176605/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176605",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERBARI PWSS (NEW)",
+                "localname": "KHERBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176605",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERBARI PWSS (NEW)",
+                        "localname": "KHERBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERBARI PWSS (NEW)",
+                "localname": "KHERBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176605",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERBARI PWSS (NEW)",
+                        "localname": "KHERBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176605/ws-services-calculation/Penalty.json b/data/as/30176605/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7563e5375c
--- /dev/null
+++ b/data/as/30176605/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176605",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176605/ws-services-calculation/WCBillingSlab.json b/data/as/30176605/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..40df40683f
--- /dev/null
+++ b/data/as/30176605/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176605",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176670/BillingService/BusinessService.json b/data/as/30176670/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e88456fd2
--- /dev/null
+++ b/data/as/30176670/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176670",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176670/egov-location/boundary-data.json b/data/as/30176670/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b384d8cd0c
--- /dev/null
+++ b/data/as/30176670/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176670",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JILIKAPARA PWSS (NEW)",
+                "localname": "JILIKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JILIKAPARA PWSS (NEW)",
+                        "localname": "JILIKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JILIKAPARA PWSS (NEW)",
+                "localname": "JILIKAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176670",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JILIKAPARA PWSS (NEW)",
+                        "localname": "JILIKAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176670/ws-services-calculation/Penalty.json b/data/as/30176670/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e0c657e2b
--- /dev/null
+++ b/data/as/30176670/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176670",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176670/ws-services-calculation/WCBillingSlab.json b/data/as/30176670/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c7fb45341
--- /dev/null
+++ b/data/as/30176670/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176670",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176673/BillingService/BusinessService.json b/data/as/30176673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..603aa52e44
--- /dev/null
+++ b/data/as/30176673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176673/egov-location/boundary-data.json b/data/as/30176673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e417bda195
--- /dev/null
+++ b/data/as/30176673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILUK PT-II PWSS (NEW)",
+                "localname": "SILUK PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILUK PT-II PWSS (NEW)",
+                        "localname": "SILUK PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILUK PT-II PWSS (NEW)",
+                "localname": "SILUK PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILUK PT-II PWSS (NEW)",
+                        "localname": "SILUK PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176673/ws-services-calculation/Penalty.json b/data/as/30176673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f349491ab
--- /dev/null
+++ b/data/as/30176673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176673/ws-services-calculation/WCBillingSlab.json b/data/as/30176673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ab45c6624
--- /dev/null
+++ b/data/as/30176673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176676/BillingService/BusinessService.json b/data/as/30176676/BillingService/BusinessService.json
new file mode 100644
index 0000000000..93907156ae
--- /dev/null
+++ b/data/as/30176676/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176676",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176676/egov-location/boundary-data.json b/data/as/30176676/egov-location/boundary-data.json
new file mode 100644
index 0000000000..41448e6cbd
--- /dev/null
+++ b/data/as/30176676/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176676",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGULAMARI NO. 2 PWSS (NEW)",
+                "localname": "BAGULAMARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGULAMARI NO. 2 PWSS (NEW)",
+                        "localname": "BAGULAMARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGULAMARI NO. 2 PWSS (NEW)",
+                "localname": "BAGULAMARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGULAMARI NO. 2 PWSS (NEW)",
+                        "localname": "BAGULAMARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176676/ws-services-calculation/Penalty.json b/data/as/30176676/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6fedb8917
--- /dev/null
+++ b/data/as/30176676/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176676",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176676/ws-services-calculation/WCBillingSlab.json b/data/as/30176676/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..213f95f5a8
--- /dev/null
+++ b/data/as/30176676/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176676",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176679/BillingService/BusinessService.json b/data/as/30176679/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2397f42f2c
--- /dev/null
+++ b/data/as/30176679/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176679",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176679/egov-location/boundary-data.json b/data/as/30176679/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a8c2dbd00
--- /dev/null
+++ b/data/as/30176679/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176679",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMABASTI PWSS (NEW)",
+                "localname": "NAMABASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176679",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMABASTI PWSS (NEW)",
+                        "localname": "NAMABASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMABASTI PWSS (NEW)",
+                "localname": "NAMABASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176679",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMABASTI PWSS (NEW)",
+                        "localname": "NAMABASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176679/ws-services-calculation/Penalty.json b/data/as/30176679/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f28f603614
--- /dev/null
+++ b/data/as/30176679/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176679",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176679/ws-services-calculation/WCBillingSlab.json b/data/as/30176679/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a2ac15838
--- /dev/null
+++ b/data/as/30176679/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176679",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176683/BillingService/BusinessService.json b/data/as/30176683/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3cc0cf5ab0
--- /dev/null
+++ b/data/as/30176683/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176683",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176683/egov-location/boundary-data.json b/data/as/30176683/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d6f6761d60
--- /dev/null
+++ b/data/as/30176683/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176683",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHILASASTRA PWSS (NEW)",
+                "localname": "KHILASASTRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176683",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHILASASTRA PWSS (NEW)",
+                        "localname": "KHILASASTRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHILASASTRA PWSS (NEW)",
+                "localname": "KHILASASTRA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176683",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHILASASTRA PWSS (NEW)",
+                        "localname": "KHILASASTRA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176683/ws-services-calculation/Penalty.json b/data/as/30176683/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..979662014a
--- /dev/null
+++ b/data/as/30176683/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176683",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176683/ws-services-calculation/WCBillingSlab.json b/data/as/30176683/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69fead2097
--- /dev/null
+++ b/data/as/30176683/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176683",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176709/BillingService/BusinessService.json b/data/as/30176709/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ab8bc65097
--- /dev/null
+++ b/data/as/30176709/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176709",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176709/egov-location/boundary-data.json b/data/as/30176709/egov-location/boundary-data.json
new file mode 100644
index 0000000000..802a9bd74d
--- /dev/null
+++ b/data/as/30176709/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176709",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGAPANI PWSS (NEW)",
+                "localname": "RONGAPANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176709",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGAPANI PWSS (NEW)",
+                        "localname": "RONGAPANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RONGAPANI PWSS (NEW)",
+                "localname": "RONGAPANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176709",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RONGAPANI PWSS (NEW)",
+                        "localname": "RONGAPANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176709/ws-services-calculation/Penalty.json b/data/as/30176709/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..273b4485ef
--- /dev/null
+++ b/data/as/30176709/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176709",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176709/ws-services-calculation/WCBillingSlab.json b/data/as/30176709/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9424368008
--- /dev/null
+++ b/data/as/30176709/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176709",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176714/BillingService/BusinessService.json b/data/as/30176714/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a8209bfe0f
--- /dev/null
+++ b/data/as/30176714/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176714",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176714/egov-location/boundary-data.json b/data/as/30176714/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6ab46a571b
--- /dev/null
+++ b/data/as/30176714/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176714",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABAGRAM PWSS (NEW)",
+                "localname": "NABAGRAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176714",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABAGRAM PWSS (NEW)",
+                        "localname": "NABAGRAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NABAGRAM PWSS (NEW)",
+                "localname": "NABAGRAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176714",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NABAGRAM PWSS (NEW)",
+                        "localname": "NABAGRAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176714/ws-services-calculation/Penalty.json b/data/as/30176714/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90b511b620
--- /dev/null
+++ b/data/as/30176714/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176714",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176714/ws-services-calculation/WCBillingSlab.json b/data/as/30176714/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8b883d941c
--- /dev/null
+++ b/data/as/30176714/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176714",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176720/BillingService/BusinessService.json b/data/as/30176720/BillingService/BusinessService.json
new file mode 100644
index 0000000000..40b06614d0
--- /dev/null
+++ b/data/as/30176720/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176720",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176720/egov-location/boundary-data.json b/data/as/30176720/egov-location/boundary-data.json
new file mode 100644
index 0000000000..27cf964aee
--- /dev/null
+++ b/data/as/30176720/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176720",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMBUK NO. 2 PWSS (NEW)",
+                "localname": "RAMBUK NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMBUK NO. 2 PWSS (NEW)",
+                        "localname": "RAMBUK NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMBUK NO. 2 PWSS (NEW)",
+                "localname": "RAMBUK NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176720",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMBUK NO. 2 PWSS (NEW)",
+                        "localname": "RAMBUK NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176720/ws-services-calculation/Penalty.json b/data/as/30176720/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1108390d19
--- /dev/null
+++ b/data/as/30176720/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176720",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176720/ws-services-calculation/WCBillingSlab.json b/data/as/30176720/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bf03d32854
--- /dev/null
+++ b/data/as/30176720/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176720",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176756/BillingService/BusinessService.json b/data/as/30176756/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3bc2aa77d1
--- /dev/null
+++ b/data/as/30176756/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30176756",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176756/egov-location/boundary-data.json b/data/as/30176756/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2bb22326e6
--- /dev/null
+++ b/data/as/30176756/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30176756",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HABANGGIRI NO.4 PWSS (NEW)",
+                "localname": "HABANGGIRI NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176756",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HABANGGIRI NO.4 PWSS (NEW)",
+                        "localname": "HABANGGIRI NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HABANGGIRI NO.4 PWSS (NEW)",
+                "localname": "HABANGGIRI NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30176756",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HABANGGIRI NO.4 PWSS (NEW)",
+                        "localname": "HABANGGIRI NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176756/ws-services-calculation/Penalty.json b/data/as/30176756/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f456a68c62
--- /dev/null
+++ b/data/as/30176756/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30176756",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30176756/ws-services-calculation/WCBillingSlab.json b/data/as/30176756/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..009a9cc31f
--- /dev/null
+++ b/data/as/30176756/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30176756",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177227/BillingService/BusinessService.json b/data/as/30177227/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dd10cfab4
--- /dev/null
+++ b/data/as/30177227/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177227",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177227/egov-location/boundary-data.json b/data/as/30177227/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b59575badd
--- /dev/null
+++ b/data/as/30177227/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177227",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKABIL PWSS",
+                "localname": "BOKABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKABIL PWSS",
+                        "localname": "BOKABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKABIL PWSS",
+                "localname": "BOKABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKABIL PWSS",
+                        "localname": "BOKABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177227/ws-services-calculation/Penalty.json b/data/as/30177227/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8bf6aa5e19
--- /dev/null
+++ b/data/as/30177227/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177227",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177227/ws-services-calculation/WCBillingSlab.json b/data/as/30177227/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27d9ea5d1e
--- /dev/null
+++ b/data/as/30177227/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177227",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177242/BillingService/BusinessService.json b/data/as/30177242/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b91f220c78
--- /dev/null
+++ b/data/as/30177242/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177242",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177242/egov-location/boundary-data.json b/data/as/30177242/egov-location/boundary-data.json
new file mode 100644
index 0000000000..700b9e01a9
--- /dev/null
+++ b/data/as/30177242/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177242",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORALIMORA PWSS",
+                "localname": "BORALIMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORALIMORA PWSS",
+                        "localname": "BORALIMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORALIMORA PWSS",
+                "localname": "BORALIMORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORALIMORA PWSS",
+                        "localname": "BORALIMORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177242/ws-services-calculation/Penalty.json b/data/as/30177242/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f696b5246
--- /dev/null
+++ b/data/as/30177242/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177242",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177242/ws-services-calculation/WCBillingSlab.json b/data/as/30177242/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1749996384
--- /dev/null
+++ b/data/as/30177242/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177242",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177275/BillingService/BusinessService.json b/data/as/30177275/BillingService/BusinessService.json
new file mode 100644
index 0000000000..702ecae309
--- /dev/null
+++ b/data/as/30177275/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177275",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177275/egov-location/boundary-data.json b/data/as/30177275/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0979793b4d
--- /dev/null
+++ b/data/as/30177275/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177275",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAMARDOLONI-1 PWSS",
+                "localname": "CHAMARDOLONI-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAMARDOLONI-1 PWSS",
+                        "localname": "CHAMARDOLONI-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAMARDOLONI-1 PWSS",
+                "localname": "CHAMARDOLONI-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAMARDOLONI-1 PWSS",
+                        "localname": "CHAMARDOLONI-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177275/ws-services-calculation/Penalty.json b/data/as/30177275/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad410eb82c
--- /dev/null
+++ b/data/as/30177275/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177275",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177275/ws-services-calculation/WCBillingSlab.json b/data/as/30177275/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dc3ca15868
--- /dev/null
+++ b/data/as/30177275/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177275",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177297/BillingService/BusinessService.json b/data/as/30177297/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ece2fba22
--- /dev/null
+++ b/data/as/30177297/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177297",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177297/egov-location/boundary-data.json b/data/as/30177297/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ec1fa9067f
--- /dev/null
+++ b/data/as/30177297/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177297",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGAMARI-1 PWSS",
+                "localname": "CHENGAMARI-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGAMARI-1 PWSS",
+                        "localname": "CHENGAMARI-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHENGAMARI-1 PWSS",
+                "localname": "CHENGAMARI-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177297",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHENGAMARI-1 PWSS",
+                        "localname": "CHENGAMARI-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177297/ws-services-calculation/Penalty.json b/data/as/30177297/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b2924813a2
--- /dev/null
+++ b/data/as/30177297/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177297",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177297/ws-services-calculation/WCBillingSlab.json b/data/as/30177297/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6a73fcb991
--- /dev/null
+++ b/data/as/30177297/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177297",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177314/BillingService/BusinessService.json b/data/as/30177314/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f375fb015
--- /dev/null
+++ b/data/as/30177314/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177314",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177314/egov-location/boundary-data.json b/data/as/30177314/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed41fe8367
--- /dev/null
+++ b/data/as/30177314/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177314",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIPUR WSS",
+                "localname": "CHOIPUR WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIPUR WSS",
+                        "localname": "CHOIPUR WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOIPUR WSS",
+                "localname": "CHOIPUR WSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177314",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOIPUR WSS",
+                        "localname": "CHOIPUR WSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177314/ws-services-calculation/Penalty.json b/data/as/30177314/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f359af788
--- /dev/null
+++ b/data/as/30177314/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177314",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177314/ws-services-calculation/WCBillingSlab.json b/data/as/30177314/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d72c93b1b
--- /dev/null
+++ b/data/as/30177314/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177314",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177334/BillingService/BusinessService.json b/data/as/30177334/BillingService/BusinessService.json
new file mode 100644
index 0000000000..87db091a7c
--- /dev/null
+++ b/data/as/30177334/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177334",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177334/egov-location/boundary-data.json b/data/as/30177334/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d6bfd222c8
--- /dev/null
+++ b/data/as/30177334/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177334",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GEREKIGRANT PWSS",
+                "localname": "GEREKIGRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GEREKIGRANT PWSS",
+                        "localname": "GEREKIGRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GEREKIGRANT PWSS",
+                "localname": "GEREKIGRANT PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GEREKIGRANT PWSS",
+                        "localname": "GEREKIGRANT PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177334/ws-services-calculation/Penalty.json b/data/as/30177334/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3e7f1e0984
--- /dev/null
+++ b/data/as/30177334/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177334",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177334/ws-services-calculation/WCBillingSlab.json b/data/as/30177334/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2834cbcacb
--- /dev/null
+++ b/data/as/30177334/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177334",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177375/BillingService/BusinessService.json b/data/as/30177375/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca7c8be029
--- /dev/null
+++ b/data/as/30177375/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177375",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177375/egov-location/boundary-data.json b/data/as/30177375/egov-location/boundary-data.json
new file mode 100644
index 0000000000..435b87728f
--- /dev/null
+++ b/data/as/30177375/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177375",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHI MUSLIM PART-1 PWSS",
+                "localname": "GHAHI MUSLIM PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHI MUSLIM PART-1 PWSS",
+                        "localname": "GHAHI MUSLIM PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHI MUSLIM PART-1 PWSS",
+                "localname": "GHAHI MUSLIM PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177375",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHI MUSLIM PART-1 PWSS",
+                        "localname": "GHAHI MUSLIM PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177375/ws-services-calculation/Penalty.json b/data/as/30177375/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..54bd4db717
--- /dev/null
+++ b/data/as/30177375/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177375",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177375/ws-services-calculation/WCBillingSlab.json b/data/as/30177375/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c0b5534de
--- /dev/null
+++ b/data/as/30177375/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177375",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177874/egov-location/boundary-data.json b/data/as/30177874/egov-location/boundary-data.json
index 3f495961ea..aea0214576 100644
--- a/data/as/30177874/egov-location/boundary-data.json
+++ b/data/as/30177874/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "BHEBHERI 2 PWSS",
-                "localname": "BHEBHERI 2 PWSS",
+                "name": "BHEBHERI 2 PWSS (NEW)",
+                "localname": "BHEBHERI 2 PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "BHEBHERI 2 PWSS",
-                        "localname": "BHEBHERI 2 PWSS",
+                        "name": "BHEBHERI 2 PWSS (NEW)",
+                        "localname": "BHEBHERI 2 PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "BHEBHERI 2 PWSS",
-                "localname": "BHEBHERI 2 PWSS",
+                "name": "BHEBHERI 2 PWSS (NEW)",
+                "localname": "BHEBHERI 2 PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "BHEBHERI 2 PWSS",
-                        "localname": "BHEBHERI 2 PWSS",
+                        "name": "BHEBHERI 2 PWSS (NEW)",
+                        "localname": "BHEBHERI 2 PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/30177874/ws-services-calculation/WCBillingSlab.json b/data/as/30177874/ws-services-calculation/WCBillingSlab.json
index b243f8f3a9..34e75a052b 100644
--- a/data/as/30177874/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177874/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177929/BillingService/BusinessService.json b/data/as/30177929/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee1e67e04a
--- /dev/null
+++ b/data/as/30177929/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177929",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177929/egov-location/boundary-data.json b/data/as/30177929/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed4e8a6a02
--- /dev/null
+++ b/data/as/30177929/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177929",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHUBHERI-1 PWSS (NEW)",
+                "localname": "BHUBHERI-1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177929",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHUBHERI-1 PWSS (NEW)",
+                        "localname": "BHUBHERI-1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHUBHERI-1 PWSS (NEW)",
+                "localname": "BHUBHERI-1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177929",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHUBHERI-1 PWSS (NEW)",
+                        "localname": "BHUBHERI-1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177929/ws-services-calculation/Penalty.json b/data/as/30177929/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d93f8d192f
--- /dev/null
+++ b/data/as/30177929/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177929",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177929/ws-services-calculation/WCBillingSlab.json b/data/as/30177929/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e79c82ebfa
--- /dev/null
+++ b/data/as/30177929/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177929",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177971/BillingService/BusinessService.json b/data/as/30177971/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5a2957563e
--- /dev/null
+++ b/data/as/30177971/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177971",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177971/egov-location/boundary-data.json b/data/as/30177971/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7f1b15273
--- /dev/null
+++ b/data/as/30177971/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177971",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHONAPARA PWSS (NEW)",
+                "localname": "GHONAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177971",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHONAPARA PWSS (NEW)",
+                        "localname": "GHONAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHONAPARA PWSS (NEW)",
+                "localname": "GHONAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177971",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHONAPARA PWSS (NEW)",
+                        "localname": "GHONAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177971/ws-services-calculation/Penalty.json b/data/as/30177971/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ee572b25c
--- /dev/null
+++ b/data/as/30177971/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177971",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177971/ws-services-calculation/WCBillingSlab.json b/data/as/30177971/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22cabbef0d
--- /dev/null
+++ b/data/as/30177971/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177971",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177999/BillingService/BusinessService.json b/data/as/30177999/BillingService/BusinessService.json
new file mode 100644
index 0000000000..61d671a4eb
--- /dev/null
+++ b/data/as/30177999/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30177999",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177999/egov-location/boundary-data.json b/data/as/30177999/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9e0f79669
--- /dev/null
+++ b/data/as/30177999/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30177999",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENIMARI PT-I PWSS (NEW)",
+                "localname": "SENIMARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177999",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENIMARI PT-I PWSS (NEW)",
+                        "localname": "SENIMARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENIMARI PT-I PWSS (NEW)",
+                "localname": "SENIMARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30177999",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENIMARI PT-I PWSS (NEW)",
+                        "localname": "SENIMARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177999/ws-services-calculation/Penalty.json b/data/as/30177999/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4ab77bc32a
--- /dev/null
+++ b/data/as/30177999/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30177999",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30177999/ws-services-calculation/WCBillingSlab.json b/data/as/30177999/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f4a4ee10a5
--- /dev/null
+++ b/data/as/30177999/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30177999",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178023/BillingService/BusinessService.json b/data/as/30178023/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e45e898367
--- /dev/null
+++ b/data/as/30178023/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178023",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178023/egov-location/boundary-data.json b/data/as/30178023/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c80c9c344b
--- /dev/null
+++ b/data/as/30178023/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178023",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANYAKUCHI PWSS (NEW)",
+                "localname": "KANYAKUCHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANYAKUCHI PWSS (NEW)",
+                        "localname": "KANYAKUCHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANYAKUCHI PWSS (NEW)",
+                "localname": "KANYAKUCHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANYAKUCHI PWSS (NEW)",
+                        "localname": "KANYAKUCHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178023/ws-services-calculation/Penalty.json b/data/as/30178023/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..042f58459d
--- /dev/null
+++ b/data/as/30178023/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178023",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178023/ws-services-calculation/WCBillingSlab.json b/data/as/30178023/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5009ee6b76
--- /dev/null
+++ b/data/as/30178023/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178023",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178056/BillingService/BusinessService.json b/data/as/30178056/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c8f9142f1a
--- /dev/null
+++ b/data/as/30178056/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178056",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178056/egov-location/boundary-data.json b/data/as/30178056/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9f4b1e098
--- /dev/null
+++ b/data/as/30178056/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178056",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIJANI PWSS (NEW)",
+                "localname": "SINGIJANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178056",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIJANI PWSS (NEW)",
+                        "localname": "SINGIJANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGIJANI PWSS (NEW)",
+                "localname": "SINGIJANI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178056",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGIJANI PWSS (NEW)",
+                        "localname": "SINGIJANI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178056/ws-services-calculation/Penalty.json b/data/as/30178056/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c1c26535af
--- /dev/null
+++ b/data/as/30178056/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178056",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178056/ws-services-calculation/WCBillingSlab.json b/data/as/30178056/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c088aa7578
--- /dev/null
+++ b/data/as/30178056/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178056",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178092/BillingService/BusinessService.json b/data/as/30178092/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bac872cf57
--- /dev/null
+++ b/data/as/30178092/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178092",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178092/egov-location/boundary-data.json b/data/as/30178092/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad06a120fc
--- /dev/null
+++ b/data/as/30178092/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178092",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                "localname": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178092",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                "localname": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178092",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178092/ws-services-calculation/Penalty.json b/data/as/30178092/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2299bc7dc4
--- /dev/null
+++ b/data/as/30178092/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178092",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178092/ws-services-calculation/WCBillingSlab.json b/data/as/30178092/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f581b156b8
--- /dev/null
+++ b/data/as/30178092/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178092",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178124/BillingService/BusinessService.json b/data/as/30178124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aeb48c6695
--- /dev/null
+++ b/data/as/30178124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178124/egov-location/boundary-data.json b/data/as/30178124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0bfe1a23f
--- /dev/null
+++ b/data/as/30178124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                "localname": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                        "localname": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                "localname": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                        "localname": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178124/ws-services-calculation/Penalty.json b/data/as/30178124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f638f2774
--- /dev/null
+++ b/data/as/30178124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178124/ws-services-calculation/WCBillingSlab.json b/data/as/30178124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6ef18011b4
--- /dev/null
+++ b/data/as/30178124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178175/BillingService/BusinessService.json b/data/as/30178175/BillingService/BusinessService.json
new file mode 100644
index 0000000000..beee6a90a7
--- /dev/null
+++ b/data/as/30178175/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178175",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178175/egov-location/boundary-data.json b/data/as/30178175/egov-location/boundary-data.json
new file mode 100644
index 0000000000..33c5076570
--- /dev/null
+++ b/data/as/30178175/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178175",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMBUK PWSS (NEW)",
+                "localname": "RAMBUK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMBUK PWSS (NEW)",
+                        "localname": "RAMBUK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMBUK PWSS (NEW)",
+                "localname": "RAMBUK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178175",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMBUK PWSS (NEW)",
+                        "localname": "RAMBUK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178175/ws-services-calculation/Penalty.json b/data/as/30178175/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6bea81b6c2
--- /dev/null
+++ b/data/as/30178175/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178175",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178175/ws-services-calculation/WCBillingSlab.json b/data/as/30178175/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..180dfecfc3
--- /dev/null
+++ b/data/as/30178175/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178175",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178287/BillingService/BusinessService.json b/data/as/30178287/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf0c7d04f7
--- /dev/null
+++ b/data/as/30178287/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178287",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178287/egov-location/boundary-data.json b/data/as/30178287/egov-location/boundary-data.json
new file mode 100644
index 0000000000..18e27caaae
--- /dev/null
+++ b/data/as/30178287/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178287",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAPARA PWSS (NEW)",
+                "localname": "HIRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAPARA PWSS (NEW)",
+                        "localname": "HIRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAPARA PWSS (NEW)",
+                "localname": "HIRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178287",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAPARA PWSS (NEW)",
+                        "localname": "HIRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178287/ws-services-calculation/Penalty.json b/data/as/30178287/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a145052137
--- /dev/null
+++ b/data/as/30178287/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178287",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178287/ws-services-calculation/WCBillingSlab.json b/data/as/30178287/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d17ddb1ebf
--- /dev/null
+++ b/data/as/30178287/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178287",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178310/BillingService/BusinessService.json b/data/as/30178310/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d12c2de9d9
--- /dev/null
+++ b/data/as/30178310/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178310",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178310/egov-location/boundary-data.json b/data/as/30178310/egov-location/boundary-data.json
new file mode 100644
index 0000000000..66046fb385
--- /dev/null
+++ b/data/as/30178310/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178310",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARDARPARA BAGUAN PWSS",
+                "localname": "SARDARPARA BAGUAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARDARPARA BAGUAN PWSS",
+                        "localname": "SARDARPARA BAGUAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SARDARPARA BAGUAN PWSS",
+                "localname": "SARDARPARA BAGUAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178310",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SARDARPARA BAGUAN PWSS",
+                        "localname": "SARDARPARA BAGUAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178310/ws-services-calculation/Penalty.json b/data/as/30178310/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9dda4ba0d8
--- /dev/null
+++ b/data/as/30178310/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178310",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178310/ws-services-calculation/WCBillingSlab.json b/data/as/30178310/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..59f686e7ef
--- /dev/null
+++ b/data/as/30178310/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178310",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178331/BillingService/BusinessService.json b/data/as/30178331/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e520a5ee96
--- /dev/null
+++ b/data/as/30178331/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178331",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178331/egov-location/boundary-data.json b/data/as/30178331/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ae11e96740
--- /dev/null
+++ b/data/as/30178331/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178331",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALGRAM PT-I PWSS (NEW)",
+                "localname": "MANDALGRAM PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178331",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALGRAM PT-I PWSS (NEW)",
+                        "localname": "MANDALGRAM PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALGRAM PT-I PWSS (NEW)",
+                "localname": "MANDALGRAM PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178331",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALGRAM PT-I PWSS (NEW)",
+                        "localname": "MANDALGRAM PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178331/ws-services-calculation/Penalty.json b/data/as/30178331/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05b7a0fb99
--- /dev/null
+++ b/data/as/30178331/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178331",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178331/ws-services-calculation/WCBillingSlab.json b/data/as/30178331/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1c986e48f1
--- /dev/null
+++ b/data/as/30178331/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178331",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178371/BillingService/BusinessService.json b/data/as/30178371/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f2cc082bf
--- /dev/null
+++ b/data/as/30178371/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178371",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178371/egov-location/boundary-data.json b/data/as/30178371/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c19645bc08
--- /dev/null
+++ b/data/as/30178371/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178371",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHADARJAN PWSS (NEW)",
+                "localname": "KHADARJAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178371",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHADARJAN PWSS (NEW)",
+                        "localname": "KHADARJAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHADARJAN PWSS (NEW)",
+                "localname": "KHADARJAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178371",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHADARJAN PWSS (NEW)",
+                        "localname": "KHADARJAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178371/ws-services-calculation/Penalty.json b/data/as/30178371/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3cbb8ec053
--- /dev/null
+++ b/data/as/30178371/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178371",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178371/ws-services-calculation/WCBillingSlab.json b/data/as/30178371/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..49147c58b3
--- /dev/null
+++ b/data/as/30178371/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178371",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178397/BillingService/BusinessService.json b/data/as/30178397/BillingService/BusinessService.json
new file mode 100644
index 0000000000..452c49ed63
--- /dev/null
+++ b/data/as/30178397/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178397",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178397/egov-location/boundary-data.json b/data/as/30178397/egov-location/boundary-data.json
new file mode 100644
index 0000000000..30dec86908
--- /dev/null
+++ b/data/as/30178397/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178397",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILUK PT-I PWSS (NEW)",
+                "localname": "SILUK PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILUK PT-I PWSS (NEW)",
+                        "localname": "SILUK PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILUK PT-I PWSS (NEW)",
+                "localname": "SILUK PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILUK PT-I PWSS (NEW)",
+                        "localname": "SILUK PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178397/ws-services-calculation/Penalty.json b/data/as/30178397/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce67236de5
--- /dev/null
+++ b/data/as/30178397/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178397",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178397/ws-services-calculation/WCBillingSlab.json b/data/as/30178397/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31957fe914
--- /dev/null
+++ b/data/as/30178397/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178397",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178423/BillingService/BusinessService.json b/data/as/30178423/BillingService/BusinessService.json
new file mode 100644
index 0000000000..604b0e322d
--- /dev/null
+++ b/data/as/30178423/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178423",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178423/egov-location/boundary-data.json b/data/as/30178423/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52ebb975d4
--- /dev/null
+++ b/data/as/30178423/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178423",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELPARA PT-II PWSS (NEW)",
+                "localname": "BELPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELPARA PT-II PWSS (NEW)",
+                        "localname": "BELPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELPARA PT-II PWSS (NEW)",
+                "localname": "BELPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178423",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELPARA PT-II PWSS (NEW)",
+                        "localname": "BELPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178423/ws-services-calculation/Penalty.json b/data/as/30178423/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb9412ba0f
--- /dev/null
+++ b/data/as/30178423/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178423",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178423/ws-services-calculation/WCBillingSlab.json b/data/as/30178423/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c70af171e
--- /dev/null
+++ b/data/as/30178423/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178423",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178440/BillingService/BusinessService.json b/data/as/30178440/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b260a55e1
--- /dev/null
+++ b/data/as/30178440/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178440",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178440/egov-location/boundary-data.json b/data/as/30178440/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e987bfc16a
--- /dev/null
+++ b/data/as/30178440/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178440",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR NO. 2 PWSS",
+                "localname": "UHANI PATHAR NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178440",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR NO. 2 PWSS",
+                        "localname": "UHANI PATHAR NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UHANI PATHAR NO. 2 PWSS",
+                "localname": "UHANI PATHAR NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178440",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UHANI PATHAR NO. 2 PWSS",
+                        "localname": "UHANI PATHAR NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178440/ws-services-calculation/Penalty.json b/data/as/30178440/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..553c79d1a5
--- /dev/null
+++ b/data/as/30178440/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178440",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178440/ws-services-calculation/WCBillingSlab.json b/data/as/30178440/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..be00fb7c0a
--- /dev/null
+++ b/data/as/30178440/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178440",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178942/BillingService/BusinessService.json b/data/as/30178942/BillingService/BusinessService.json
new file mode 100644
index 0000000000..83972baa2f
--- /dev/null
+++ b/data/as/30178942/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178942",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178942/egov-location/boundary-data.json b/data/as/30178942/egov-location/boundary-data.json
new file mode 100644
index 0000000000..155f3d547b
--- /dev/null
+++ b/data/as/30178942/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178942",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                "localname": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                        "localname": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                "localname": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                        "localname": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178942/ws-services-calculation/Penalty.json b/data/as/30178942/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..72a42d369a
--- /dev/null
+++ b/data/as/30178942/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178942",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178942/ws-services-calculation/WCBillingSlab.json b/data/as/30178942/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..853a337d1d
--- /dev/null
+++ b/data/as/30178942/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178942",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178977/BillingService/BusinessService.json b/data/as/30178977/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2138e34061
--- /dev/null
+++ b/data/as/30178977/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30178977",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178977/egov-location/boundary-data.json b/data/as/30178977/egov-location/boundary-data.json
new file mode 100644
index 0000000000..68684eb499
--- /dev/null
+++ b/data/as/30178977/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30178977",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DABLI PWSS (NEW)",
+                "localname": "DABLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DABLI PWSS (NEW)",
+                        "localname": "DABLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DABLI PWSS (NEW)",
+                "localname": "DABLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30178977",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DABLI PWSS (NEW)",
+                        "localname": "DABLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178977/ws-services-calculation/Penalty.json b/data/as/30178977/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48923a43c0
--- /dev/null
+++ b/data/as/30178977/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30178977",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30178977/ws-services-calculation/WCBillingSlab.json b/data/as/30178977/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6dafc2b0a8
--- /dev/null
+++ b/data/as/30178977/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30178977",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179000/BillingService/BusinessService.json b/data/as/30179000/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55be3ab27e
--- /dev/null
+++ b/data/as/30179000/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179000",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179000/egov-location/boundary-data.json b/data/as/30179000/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c9f686f079
--- /dev/null
+++ b/data/as/30179000/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179000",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA MEDHIPARA PWSS (NEW)",
+                "localname": "KHARA MEDHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179000",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA MEDHIPARA PWSS (NEW)",
+                        "localname": "KHARA MEDHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARA MEDHIPARA PWSS (NEW)",
+                "localname": "KHARA MEDHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179000",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARA MEDHIPARA PWSS (NEW)",
+                        "localname": "KHARA MEDHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179000/ws-services-calculation/Penalty.json b/data/as/30179000/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9c2d557845
--- /dev/null
+++ b/data/as/30179000/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179000",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179000/ws-services-calculation/WCBillingSlab.json b/data/as/30179000/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85dea5aab2
--- /dev/null
+++ b/data/as/30179000/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179000",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179124/BillingService/BusinessService.json b/data/as/30179124/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c1ecf0c84c
--- /dev/null
+++ b/data/as/30179124/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179124",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179124/egov-location/boundary-data.json b/data/as/30179124/egov-location/boundary-data.json
new file mode 100644
index 0000000000..75ad37df35
--- /dev/null
+++ b/data/as/30179124/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179124",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                "localname": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                        "localname": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                "localname": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179124",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                        "localname": "BAGUAN PT-IV NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179124/ws-services-calculation/Penalty.json b/data/as/30179124/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e89501f7e
--- /dev/null
+++ b/data/as/30179124/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179124",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179124/ws-services-calculation/WCBillingSlab.json b/data/as/30179124/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2e636dbc63
--- /dev/null
+++ b/data/as/30179124/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179124",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179165/BillingService/BusinessService.json b/data/as/30179165/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d50cac26b6
--- /dev/null
+++ b/data/as/30179165/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179165",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179165/egov-location/boundary-data.json b/data/as/30179165/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e98c06ab79
--- /dev/null
+++ b/data/as/30179165/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179165",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILUK PT-II NO. 2 PWSS (NEW)",
+                "localname": "SILUK PT-II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILUK PT-II NO. 2 PWSS (NEW)",
+                        "localname": "SILUK PT-II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILUK PT-II NO. 2 PWSS (NEW)",
+                "localname": "SILUK PT-II NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179165",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILUK PT-II NO. 2 PWSS (NEW)",
+                        "localname": "SILUK PT-II NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179165/ws-services-calculation/Penalty.json b/data/as/30179165/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9464fb4e6e
--- /dev/null
+++ b/data/as/30179165/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179165",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179165/ws-services-calculation/WCBillingSlab.json b/data/as/30179165/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f4ea3dcc0
--- /dev/null
+++ b/data/as/30179165/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179165",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179209/BillingService/BusinessService.json b/data/as/30179209/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ab4c723ced
--- /dev/null
+++ b/data/as/30179209/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179209",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179209/egov-location/boundary-data.json b/data/as/30179209/egov-location/boundary-data.json
new file mode 100644
index 0000000000..78a24d920f
--- /dev/null
+++ b/data/as/30179209/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179209",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANI BHITA PWSS (NEW)",
+                "localname": "PURANI BHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANI BHITA PWSS (NEW)",
+                        "localname": "PURANI BHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANI BHITA PWSS (NEW)",
+                "localname": "PURANI BHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANI BHITA PWSS (NEW)",
+                        "localname": "PURANI BHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179209/ws-services-calculation/Penalty.json b/data/as/30179209/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..31a99ae893
--- /dev/null
+++ b/data/as/30179209/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179209",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179209/ws-services-calculation/WCBillingSlab.json b/data/as/30179209/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..78de743af9
--- /dev/null
+++ b/data/as/30179209/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179209",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179232/BillingService/BusinessService.json b/data/as/30179232/BillingService/BusinessService.json
new file mode 100644
index 0000000000..742fa94efc
--- /dev/null
+++ b/data/as/30179232/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179232",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179232/egov-location/boundary-data.json b/data/as/30179232/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0cc7c99d48
--- /dev/null
+++ b/data/as/30179232/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179232",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARIGOAN PWSS (NEW)",
+                "localname": "BARIGOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179232",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARIGOAN PWSS (NEW)",
+                        "localname": "BARIGOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARIGOAN PWSS (NEW)",
+                "localname": "BARIGOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179232",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARIGOAN PWSS (NEW)",
+                        "localname": "BARIGOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179232/ws-services-calculation/Penalty.json b/data/as/30179232/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..38b2db6e2a
--- /dev/null
+++ b/data/as/30179232/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179232",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179232/ws-services-calculation/WCBillingSlab.json b/data/as/30179232/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..641d769407
--- /dev/null
+++ b/data/as/30179232/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179232",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179397/BillingService/BusinessService.json b/data/as/30179397/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da10511660
--- /dev/null
+++ b/data/as/30179397/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179397",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179397/egov-location/boundary-data.json b/data/as/30179397/egov-location/boundary-data.json
new file mode 100644
index 0000000000..346c5a6a6c
--- /dev/null
+++ b/data/as/30179397/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179397",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMAPARA EAST PWSS (NEW)",
+                "localname": "NAMAPARA EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMAPARA EAST PWSS (NEW)",
+                        "localname": "NAMAPARA EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAMAPARA EAST PWSS (NEW)",
+                "localname": "NAMAPARA EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAMAPARA EAST PWSS (NEW)",
+                        "localname": "NAMAPARA EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179397/ws-services-calculation/Penalty.json b/data/as/30179397/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef650d4859
--- /dev/null
+++ b/data/as/30179397/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179397",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179397/ws-services-calculation/WCBillingSlab.json b/data/as/30179397/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1c1a2a6a58
--- /dev/null
+++ b/data/as/30179397/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179397",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179439/BillingService/BusinessService.json b/data/as/30179439/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e42e1f5e1b
--- /dev/null
+++ b/data/as/30179439/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179439",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179439/egov-location/boundary-data.json b/data/as/30179439/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d88e451b69
--- /dev/null
+++ b/data/as/30179439/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179439",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANI BHITA NO.2 PWSS (NEW)",
+                "localname": "PURANI BHITA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANI BHITA NO.2 PWSS (NEW)",
+                        "localname": "PURANI BHITA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURANI BHITA NO.2 PWSS (NEW)",
+                "localname": "PURANI BHITA NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179439",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURANI BHITA NO.2 PWSS (NEW)",
+                        "localname": "PURANI BHITA NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179439/ws-services-calculation/Penalty.json b/data/as/30179439/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..159186c325
--- /dev/null
+++ b/data/as/30179439/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179439",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179439/ws-services-calculation/WCBillingSlab.json b/data/as/30179439/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6fce53c07
--- /dev/null
+++ b/data/as/30179439/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179439",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179473/BillingService/BusinessService.json b/data/as/30179473/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2829c11938
--- /dev/null
+++ b/data/as/30179473/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179473",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179473/egov-location/boundary-data.json b/data/as/30179473/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc5a099b77
--- /dev/null
+++ b/data/as/30179473/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179473",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PEKPEKI PWSS (NEW)",
+                "localname": "PEKPEKI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PEKPEKI PWSS (NEW)",
+                        "localname": "PEKPEKI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PEKPEKI PWSS (NEW)",
+                "localname": "PEKPEKI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PEKPEKI PWSS (NEW)",
+                        "localname": "PEKPEKI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179473/ws-services-calculation/Penalty.json b/data/as/30179473/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..43aacca6d4
--- /dev/null
+++ b/data/as/30179473/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179473",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179473/ws-services-calculation/WCBillingSlab.json b/data/as/30179473/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e7a93413aa
--- /dev/null
+++ b/data/as/30179473/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179473",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179510/BillingService/BusinessService.json b/data/as/30179510/BillingService/BusinessService.json
new file mode 100644
index 0000000000..85f1b1207f
--- /dev/null
+++ b/data/as/30179510/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179510",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179510/egov-location/boundary-data.json b/data/as/30179510/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e39b0c3d5
--- /dev/null
+++ b/data/as/30179510/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179510",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                "localname": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                        "localname": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                "localname": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                        "localname": "THEKASHU PT.III NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179510/ws-services-calculation/Penalty.json b/data/as/30179510/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..efecf1428e
--- /dev/null
+++ b/data/as/30179510/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179510",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179510/ws-services-calculation/WCBillingSlab.json b/data/as/30179510/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad226dd820
--- /dev/null
+++ b/data/as/30179510/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179510",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179533/BillingService/BusinessService.json b/data/as/30179533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1548d7a292
--- /dev/null
+++ b/data/as/30179533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179533/egov-location/boundary-data.json b/data/as/30179533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a0571f7e4
--- /dev/null
+++ b/data/as/30179533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-II PWSS (NEW)",
+                "localname": "BAGUAN PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-II PWSS (NEW)",
+                        "localname": "BAGUAN PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-II PWSS (NEW)",
+                "localname": "BAGUAN PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-II PWSS (NEW)",
+                        "localname": "BAGUAN PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179533/ws-services-calculation/Penalty.json b/data/as/30179533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ddd884cb71
--- /dev/null
+++ b/data/as/30179533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179533/ws-services-calculation/WCBillingSlab.json b/data/as/30179533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d7a587e63
--- /dev/null
+++ b/data/as/30179533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179578/BillingService/BusinessService.json b/data/as/30179578/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8124a4cdcf
--- /dev/null
+++ b/data/as/30179578/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179578",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179578/egov-location/boundary-data.json b/data/as/30179578/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5b0f322009
--- /dev/null
+++ b/data/as/30179578/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179578",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-IV PWSS (NEW)",
+                "localname": "BAGUAN PT-IV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179578",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-IV PWSS (NEW)",
+                        "localname": "BAGUAN PT-IV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-IV PWSS (NEW)",
+                "localname": "BAGUAN PT-IV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179578",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-IV PWSS (NEW)",
+                        "localname": "BAGUAN PT-IV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179578/ws-services-calculation/Penalty.json b/data/as/30179578/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f24f22c08
--- /dev/null
+++ b/data/as/30179578/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179578",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179578/ws-services-calculation/WCBillingSlab.json b/data/as/30179578/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9e4a143cc8
--- /dev/null
+++ b/data/as/30179578/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179578",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179689/BillingService/BusinessService.json b/data/as/30179689/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c488a52cc
--- /dev/null
+++ b/data/as/30179689/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179689",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179689/egov-location/boundary-data.json b/data/as/30179689/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e2f95ab6ac
--- /dev/null
+++ b/data/as/30179689/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179689",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNIGAON PWSS (NEW)",
+                "localname": "BAMUNIGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179689",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNIGAON PWSS (NEW)",
+                        "localname": "BAMUNIGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNIGAON PWSS (NEW)",
+                "localname": "BAMUNIGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179689",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNIGAON PWSS (NEW)",
+                        "localname": "BAMUNIGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179689/ws-services-calculation/Penalty.json b/data/as/30179689/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99bc1ee80a
--- /dev/null
+++ b/data/as/30179689/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179689",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179689/ws-services-calculation/WCBillingSlab.json b/data/as/30179689/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15e1fe1b38
--- /dev/null
+++ b/data/as/30179689/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179689",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179724/BillingService/BusinessService.json b/data/as/30179724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45a890f015
--- /dev/null
+++ b/data/as/30179724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179724/egov-location/boundary-data.json b/data/as/30179724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d60c5c2cde
--- /dev/null
+++ b/data/as/30179724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                "localname": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                "localname": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                        "localname": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179724/ws-services-calculation/Penalty.json b/data/as/30179724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f204e1d42f
--- /dev/null
+++ b/data/as/30179724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179724/ws-services-calculation/WCBillingSlab.json b/data/as/30179724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..62ab7c8031
--- /dev/null
+++ b/data/as/30179724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179739/BillingService/BusinessService.json b/data/as/30179739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c73f38b880
--- /dev/null
+++ b/data/as/30179739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179739/egov-location/boundary-data.json b/data/as/30179739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15307b0ce8
--- /dev/null
+++ b/data/as/30179739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANAND BAZAR M PWSS (NEW)",
+                "localname": "ANAND BAZAR M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANAND BAZAR M PWSS (NEW)",
+                        "localname": "ANAND BAZAR M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANAND BAZAR M PWSS (NEW)",
+                "localname": "ANAND BAZAR M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANAND BAZAR M PWSS (NEW)",
+                        "localname": "ANAND BAZAR M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179739/ws-services-calculation/Penalty.json b/data/as/30179739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aacd689ae0
--- /dev/null
+++ b/data/as/30179739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179739/ws-services-calculation/WCBillingSlab.json b/data/as/30179739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3901efdc87
--- /dev/null
+++ b/data/as/30179739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179767/BillingService/BusinessService.json b/data/as/30179767/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10a4f45c45
--- /dev/null
+++ b/data/as/30179767/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179767",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179767/egov-location/boundary-data.json b/data/as/30179767/egov-location/boundary-data.json
new file mode 100644
index 0000000000..107b1bd4ee
--- /dev/null
+++ b/data/as/30179767/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179767",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAI GA DHAWA II M PWSS (NEW)",
+                "localname": "GOSAI GA DHAWA II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAI GA DHAWA II M PWSS (NEW)",
+                        "localname": "GOSAI GA DHAWA II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSAI GA DHAWA II M PWSS (NEW)",
+                "localname": "GOSAI GA DHAWA II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179767",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSAI GA DHAWA II M PWSS (NEW)",
+                        "localname": "GOSAI GA DHAWA II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179767/ws-services-calculation/Penalty.json b/data/as/30179767/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c98095dd1a
--- /dev/null
+++ b/data/as/30179767/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179767",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179767/ws-services-calculation/WCBillingSlab.json b/data/as/30179767/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e77a619ba
--- /dev/null
+++ b/data/as/30179767/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179767",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179793/BillingService/BusinessService.json b/data/as/30179793/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e2a733d0e4
--- /dev/null
+++ b/data/as/30179793/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179793",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179793/egov-location/boundary-data.json b/data/as/30179793/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b28b63dde5
--- /dev/null
+++ b/data/as/30179793/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179793",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                "localname": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                        "localname": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                "localname": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179793",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                        "localname": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179793/ws-services-calculation/Penalty.json b/data/as/30179793/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11ab94e63d
--- /dev/null
+++ b/data/as/30179793/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179793",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179793/ws-services-calculation/WCBillingSlab.json b/data/as/30179793/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..43914676ce
--- /dev/null
+++ b/data/as/30179793/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179793",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179802/BillingService/BusinessService.json b/data/as/30179802/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c262368eb
--- /dev/null
+++ b/data/as/30179802/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179802",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179802/egov-location/boundary-data.json b/data/as/30179802/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cc3d211430
--- /dev/null
+++ b/data/as/30179802/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179802",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUKSIPARA PWSS (NEW)",
+                "localname": "KHUKSIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUKSIPARA PWSS (NEW)",
+                        "localname": "KHUKSIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUKSIPARA PWSS (NEW)",
+                "localname": "KHUKSIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179802",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUKSIPARA PWSS (NEW)",
+                        "localname": "KHUKSIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179802/ws-services-calculation/Penalty.json b/data/as/30179802/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..55a6889590
--- /dev/null
+++ b/data/as/30179802/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179802",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179802/ws-services-calculation/WCBillingSlab.json b/data/as/30179802/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..141fe19904
--- /dev/null
+++ b/data/as/30179802/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179802",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179808/BillingService/BusinessService.json b/data/as/30179808/BillingService/BusinessService.json
new file mode 100644
index 0000000000..479a690d9b
--- /dev/null
+++ b/data/as/30179808/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179808",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179808/egov-location/boundary-data.json b/data/as/30179808/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a3888f813
--- /dev/null
+++ b/data/as/30179808/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179808",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALGODA PWSS (NEW)",
+                "localname": "SALGODA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179808",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALGODA PWSS (NEW)",
+                        "localname": "SALGODA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALGODA PWSS (NEW)",
+                "localname": "SALGODA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179808",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALGODA PWSS (NEW)",
+                        "localname": "SALGODA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179808/ws-services-calculation/Penalty.json b/data/as/30179808/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f4cfbe7ef9
--- /dev/null
+++ b/data/as/30179808/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179808",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179808/ws-services-calculation/WCBillingSlab.json b/data/as/30179808/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9c5ea98627
--- /dev/null
+++ b/data/as/30179808/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179808",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179812/BillingService/BusinessService.json b/data/as/30179812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c31c6c8c5
--- /dev/null
+++ b/data/as/30179812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179812/egov-location/boundary-data.json b/data/as/30179812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b840bf9a9d
--- /dev/null
+++ b/data/as/30179812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALPANI GAROPARA PWSS (NEW)",
+                "localname": "KALPANI GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALPANI GAROPARA PWSS (NEW)",
+                        "localname": "KALPANI GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALPANI GAROPARA PWSS (NEW)",
+                "localname": "KALPANI GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALPANI GAROPARA PWSS (NEW)",
+                        "localname": "KALPANI GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179812/ws-services-calculation/Penalty.json b/data/as/30179812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c253b2850f
--- /dev/null
+++ b/data/as/30179812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179812/ws-services-calculation/WCBillingSlab.json b/data/as/30179812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..40a3759e98
--- /dev/null
+++ b/data/as/30179812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179815/BillingService/BusinessService.json b/data/as/30179815/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3c0d4f7635
--- /dev/null
+++ b/data/as/30179815/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179815",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179815/egov-location/boundary-data.json b/data/as/30179815/egov-location/boundary-data.json
new file mode 100644
index 0000000000..486a5f031b
--- /dev/null
+++ b/data/as/30179815/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179815",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAGOLAKONAPARA PWSS (NEW)",
+                "localname": "PAGOLAKONAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179815",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAGOLAKONAPARA PWSS (NEW)",
+                        "localname": "PAGOLAKONAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAGOLAKONAPARA PWSS (NEW)",
+                "localname": "PAGOLAKONAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179815",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAGOLAKONAPARA PWSS (NEW)",
+                        "localname": "PAGOLAKONAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179815/ws-services-calculation/Penalty.json b/data/as/30179815/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..479bda983b
--- /dev/null
+++ b/data/as/30179815/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179815",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179815/ws-services-calculation/WCBillingSlab.json b/data/as/30179815/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5f786bbd6e
--- /dev/null
+++ b/data/as/30179815/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179815",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179821/BillingService/BusinessService.json b/data/as/30179821/BillingService/BusinessService.json
new file mode 100644
index 0000000000..efa9c43edd
--- /dev/null
+++ b/data/as/30179821/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30179821",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179821/egov-location/boundary-data.json b/data/as/30179821/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1be4b7be75
--- /dev/null
+++ b/data/as/30179821/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30179821",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PT-II M PWSS (NEW)",
+                "localname": "KALYANPUR PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PT-II M PWSS (NEW)",
+                        "localname": "KALYANPUR PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PT-II M PWSS (NEW)",
+                "localname": "KALYANPUR PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30179821",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PT-II M PWSS (NEW)",
+                        "localname": "KALYANPUR PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179821/ws-services-calculation/Penalty.json b/data/as/30179821/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4175128a5c
--- /dev/null
+++ b/data/as/30179821/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30179821",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30179821/ws-services-calculation/WCBillingSlab.json b/data/as/30179821/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0ae52b511d
--- /dev/null
+++ b/data/as/30179821/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30179821",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180631/BillingService/BusinessService.json b/data/as/30180631/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4e5e9a71c
--- /dev/null
+++ b/data/as/30180631/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180631",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180631/egov-location/boundary-data.json b/data/as/30180631/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1d5f0cbece
--- /dev/null
+++ b/data/as/30180631/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180631",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILABEEL TILAPARA M PWSS (NEW)",
+                "localname": "HASILABEEL TILAPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILABEEL TILAPARA M PWSS (NEW)",
+                        "localname": "HASILABEEL TILAPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILABEEL TILAPARA M PWSS (NEW)",
+                "localname": "HASILABEEL TILAPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180631",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILABEEL TILAPARA M PWSS (NEW)",
+                        "localname": "HASILABEEL TILAPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180631/ws-services-calculation/Penalty.json b/data/as/30180631/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab5026faa7
--- /dev/null
+++ b/data/as/30180631/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180631",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180631/ws-services-calculation/WCBillingSlab.json b/data/as/30180631/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5163c11b0
--- /dev/null
+++ b/data/as/30180631/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180631",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180654/BillingService/BusinessService.json b/data/as/30180654/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88103e600e
--- /dev/null
+++ b/data/as/30180654/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180654",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180654/egov-location/boundary-data.json b/data/as/30180654/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f03477431d
--- /dev/null
+++ b/data/as/30180654/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180654",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUJARIPARA PWSS (NEW)",
+                "localname": "PUJARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180654",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUJARIPARA PWSS (NEW)",
+                        "localname": "PUJARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUJARIPARA PWSS (NEW)",
+                "localname": "PUJARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180654",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUJARIPARA PWSS (NEW)",
+                        "localname": "PUJARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180654/ws-services-calculation/Penalty.json b/data/as/30180654/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..70ed7f3603
--- /dev/null
+++ b/data/as/30180654/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180654",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180654/ws-services-calculation/WCBillingSlab.json b/data/as/30180654/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..518765836c
--- /dev/null
+++ b/data/as/30180654/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180654",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180663/BillingService/BusinessService.json b/data/as/30180663/BillingService/BusinessService.json
new file mode 100644
index 0000000000..69ecd1eb2e
--- /dev/null
+++ b/data/as/30180663/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180663",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180663/egov-location/boundary-data.json b/data/as/30180663/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad772a10ff
--- /dev/null
+++ b/data/as/30180663/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180663",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 TARAJULI PWSS",
+                "localname": "NO. 2 TARAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180663",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 TARAJULI PWSS",
+                        "localname": "NO. 2 TARAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 TARAJULI PWSS",
+                "localname": "NO. 2 TARAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180663",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 TARAJULI PWSS",
+                        "localname": "NO. 2 TARAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180663/ws-services-calculation/Penalty.json b/data/as/30180663/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..919100b51b
--- /dev/null
+++ b/data/as/30180663/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180663",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180663/ws-services-calculation/WCBillingSlab.json b/data/as/30180663/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..78f7dbbc50
--- /dev/null
+++ b/data/as/30180663/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180663",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180675/BillingService/BusinessService.json b/data/as/30180675/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c80245884f
--- /dev/null
+++ b/data/as/30180675/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180675",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180675/egov-location/boundary-data.json b/data/as/30180675/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f8b47ac58
--- /dev/null
+++ b/data/as/30180675/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180675",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHENDAI TE NO. 2 PWSS",
+                "localname": "DHENDAI TE NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180675",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHENDAI TE NO. 2 PWSS",
+                        "localname": "DHENDAI TE NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHENDAI TE NO. 2 PWSS",
+                "localname": "DHENDAI TE NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180675",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHENDAI TE NO. 2 PWSS",
+                        "localname": "DHENDAI TE NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180675/ws-services-calculation/Penalty.json b/data/as/30180675/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94cbcc154e
--- /dev/null
+++ b/data/as/30180675/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180675",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180675/ws-services-calculation/WCBillingSlab.json b/data/as/30180675/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a8fd0db37
--- /dev/null
+++ b/data/as/30180675/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180675",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180698/BillingService/BusinessService.json b/data/as/30180698/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4cfb004625
--- /dev/null
+++ b/data/as/30180698/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180698",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180698/egov-location/boundary-data.json b/data/as/30180698/egov-location/boundary-data.json
new file mode 100644
index 0000000000..76377ddad9
--- /dev/null
+++ b/data/as/30180698/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180698",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIJUKONA MINI PWSS (NEW)",
+                "localname": "SIJUKONA MINI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180698",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIJUKONA MINI PWSS (NEW)",
+                        "localname": "SIJUKONA MINI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIJUKONA MINI PWSS (NEW)",
+                "localname": "SIJUKONA MINI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180698",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIJUKONA MINI PWSS (NEW)",
+                        "localname": "SIJUKONA MINI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180698/ws-services-calculation/Penalty.json b/data/as/30180698/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d160746767
--- /dev/null
+++ b/data/as/30180698/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180698",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180698/ws-services-calculation/WCBillingSlab.json b/data/as/30180698/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4225b225d2
--- /dev/null
+++ b/data/as/30180698/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180698",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180724/BillingService/BusinessService.json b/data/as/30180724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d7f92a51ef
--- /dev/null
+++ b/data/as/30180724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180724/egov-location/boundary-data.json b/data/as/30180724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e915bfe8a8
--- /dev/null
+++ b/data/as/30180724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAKONA PWSS (NEW)",
+                "localname": "DARAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAKONA PWSS (NEW)",
+                        "localname": "DARAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAKONA PWSS (NEW)",
+                "localname": "DARAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAKONA PWSS (NEW)",
+                        "localname": "DARAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180724/ws-services-calculation/Penalty.json b/data/as/30180724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46f3fbfb3c
--- /dev/null
+++ b/data/as/30180724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180724/ws-services-calculation/WCBillingSlab.json b/data/as/30180724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cec757e552
--- /dev/null
+++ b/data/as/30180724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180855/BillingService/BusinessService.json b/data/as/30180855/BillingService/BusinessService.json
new file mode 100644
index 0000000000..671768e725
--- /dev/null
+++ b/data/as/30180855/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180855",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180855/egov-location/boundary-data.json b/data/as/30180855/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b3801bf7b5
--- /dev/null
+++ b/data/as/30180855/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180855",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONABIL PWSS",
+                "localname": "SONABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONABIL PWSS",
+                        "localname": "SONABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONABIL PWSS",
+                "localname": "SONABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONABIL PWSS",
+                        "localname": "SONABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180855/ws-services-calculation/Penalty.json b/data/as/30180855/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f8149abdb
--- /dev/null
+++ b/data/as/30180855/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180855",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180855/ws-services-calculation/WCBillingSlab.json b/data/as/30180855/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0ad5b598b2
--- /dev/null
+++ b/data/as/30180855/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180855",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180870/BillingService/BusinessService.json b/data/as/30180870/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6037dd5919
--- /dev/null
+++ b/data/as/30180870/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180870",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180870/egov-location/boundary-data.json b/data/as/30180870/egov-location/boundary-data.json
new file mode 100644
index 0000000000..36d8b9352c
--- /dev/null
+++ b/data/as/30180870/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180870",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA (TUKURA) PWSS (NEW)",
+                "localname": "GAROPARA (TUKURA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA (TUKURA) PWSS (NEW)",
+                        "localname": "GAROPARA (TUKURA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA (TUKURA) PWSS (NEW)",
+                "localname": "GAROPARA (TUKURA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180870",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA (TUKURA) PWSS (NEW)",
+                        "localname": "GAROPARA (TUKURA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180870/ws-services-calculation/Penalty.json b/data/as/30180870/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3610d72ca8
--- /dev/null
+++ b/data/as/30180870/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180870",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180870/ws-services-calculation/WCBillingSlab.json b/data/as/30180870/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d4a2304f5
--- /dev/null
+++ b/data/as/30180870/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180870",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180952/BillingService/BusinessService.json b/data/as/30180952/BillingService/BusinessService.json
new file mode 100644
index 0000000000..55cf6376c9
--- /dev/null
+++ b/data/as/30180952/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180952",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180952/egov-location/boundary-data.json b/data/as/30180952/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b2952ca246
--- /dev/null
+++ b/data/as/30180952/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180952",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILAPARA M PWSS (NEW)",
+                "localname": "HASILAPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILAPARA M PWSS (NEW)",
+                        "localname": "HASILAPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILAPARA M PWSS (NEW)",
+                "localname": "HASILAPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILAPARA M PWSS (NEW)",
+                        "localname": "HASILAPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180952/ws-services-calculation/Penalty.json b/data/as/30180952/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3106aa40a
--- /dev/null
+++ b/data/as/30180952/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180952",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180952/ws-services-calculation/WCBillingSlab.json b/data/as/30180952/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..daa679fbb5
--- /dev/null
+++ b/data/as/30180952/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180952",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180965/BillingService/BusinessService.json b/data/as/30180965/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f709cea167
--- /dev/null
+++ b/data/as/30180965/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30180965",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180965/egov-location/boundary-data.json b/data/as/30180965/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12b8925f6b
--- /dev/null
+++ b/data/as/30180965/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30180965",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIPARA PWSS (NEW)",
+                "localname": "PACHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIPARA PWSS (NEW)",
+                        "localname": "PACHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIPARA PWSS (NEW)",
+                "localname": "PACHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30180965",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIPARA PWSS (NEW)",
+                        "localname": "PACHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180965/ws-services-calculation/Penalty.json b/data/as/30180965/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8262db70f8
--- /dev/null
+++ b/data/as/30180965/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30180965",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30180965/ws-services-calculation/WCBillingSlab.json b/data/as/30180965/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7066aff7d0
--- /dev/null
+++ b/data/as/30180965/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30180965",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181077/BillingService/BusinessService.json b/data/as/30181077/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cdb783c516
--- /dev/null
+++ b/data/as/30181077/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181077",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181077/egov-location/boundary-data.json b/data/as/30181077/egov-location/boundary-data.json
new file mode 100644
index 0000000000..208a942d34
--- /dev/null
+++ b/data/as/30181077/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181077",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BODAHPUR PWSS (NEW)",
+                "localname": "BODAHPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BODAHPUR PWSS (NEW)",
+                        "localname": "BODAHPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BODAHPUR PWSS (NEW)",
+                "localname": "BODAHPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BODAHPUR PWSS (NEW)",
+                        "localname": "BODAHPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181077/ws-services-calculation/Penalty.json b/data/as/30181077/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1416e38c0a
--- /dev/null
+++ b/data/as/30181077/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181077",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181077/ws-services-calculation/WCBillingSlab.json b/data/as/30181077/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..311c125954
--- /dev/null
+++ b/data/as/30181077/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181077",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181091/BillingService/BusinessService.json b/data/as/30181091/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f2dc78353b
--- /dev/null
+++ b/data/as/30181091/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181091",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181091/egov-location/boundary-data.json b/data/as/30181091/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e8375e0845
--- /dev/null
+++ b/data/as/30181091/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181091",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMJONGA PT-II PWSS (NEW)",
+                "localname": "AMJONGA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMJONGA PT-II PWSS (NEW)",
+                        "localname": "AMJONGA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMJONGA PT-II PWSS (NEW)",
+                "localname": "AMJONGA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181091",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMJONGA PT-II PWSS (NEW)",
+                        "localname": "AMJONGA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181091/ws-services-calculation/Penalty.json b/data/as/30181091/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6b891bd988
--- /dev/null
+++ b/data/as/30181091/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181091",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181091/ws-services-calculation/WCBillingSlab.json b/data/as/30181091/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c25b3d06c4
--- /dev/null
+++ b/data/as/30181091/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181091",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181099/BillingService/BusinessService.json b/data/as/30181099/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bea6d40b62
--- /dev/null
+++ b/data/as/30181099/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181099",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181099/egov-location/boundary-data.json b/data/as/30181099/egov-location/boundary-data.json
new file mode 100644
index 0000000000..558ef3985a
--- /dev/null
+++ b/data/as/30181099/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181099",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MASKIGON PWSS",
+                "localname": "MASKIGON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181099",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MASKIGON PWSS",
+                        "localname": "MASKIGON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MASKIGON PWSS",
+                "localname": "MASKIGON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181099",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MASKIGON PWSS",
+                        "localname": "MASKIGON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181099/ws-services-calculation/Penalty.json b/data/as/30181099/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4a39568ea4
--- /dev/null
+++ b/data/as/30181099/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181099",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181099/ws-services-calculation/WCBillingSlab.json b/data/as/30181099/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67938b3748
--- /dev/null
+++ b/data/as/30181099/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181099",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181126/BillingService/BusinessService.json b/data/as/30181126/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad7b8ee01a
--- /dev/null
+++ b/data/as/30181126/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181126",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181126/egov-location/boundary-data.json b/data/as/30181126/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e1cc8e5dda
--- /dev/null
+++ b/data/as/30181126/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181126",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JARENGPARA PWSS (NEW)",
+                "localname": "JARENGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JARENGPARA PWSS (NEW)",
+                        "localname": "JARENGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JARENGPARA PWSS (NEW)",
+                "localname": "JARENGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181126",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JARENGPARA PWSS (NEW)",
+                        "localname": "JARENGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181126/ws-services-calculation/Penalty.json b/data/as/30181126/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3b75bb280e
--- /dev/null
+++ b/data/as/30181126/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181126",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181126/ws-services-calculation/WCBillingSlab.json b/data/as/30181126/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0cdb095cd9
--- /dev/null
+++ b/data/as/30181126/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181126",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181144/BillingService/BusinessService.json b/data/as/30181144/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1668f13193
--- /dev/null
+++ b/data/as/30181144/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181144",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181144/egov-location/boundary-data.json b/data/as/30181144/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d3c94ad0c5
--- /dev/null
+++ b/data/as/30181144/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181144",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIM GAON PWSS",
+                "localname": "MUSLIM GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181144",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIM GAON PWSS",
+                        "localname": "MUSLIM GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIM GAON PWSS",
+                "localname": "MUSLIM GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181144",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIM GAON PWSS",
+                        "localname": "MUSLIM GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181144/ws-services-calculation/Penalty.json b/data/as/30181144/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce0a11b3f6
--- /dev/null
+++ b/data/as/30181144/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181144",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181144/ws-services-calculation/WCBillingSlab.json b/data/as/30181144/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..77bb6ae9ec
--- /dev/null
+++ b/data/as/30181144/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181144",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181145/BillingService/BusinessService.json b/data/as/30181145/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b92ab20b5
--- /dev/null
+++ b/data/as/30181145/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181145",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181145/egov-location/boundary-data.json b/data/as/30181145/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1a82e79012
--- /dev/null
+++ b/data/as/30181145/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181145",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ACHONGPARA PWSS (NEW)",
+                "localname": "ACHONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181145",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ACHONGPARA PWSS (NEW)",
+                        "localname": "ACHONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ACHONGPARA PWSS (NEW)",
+                "localname": "ACHONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181145",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ACHONGPARA PWSS (NEW)",
+                        "localname": "ACHONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181145/ws-services-calculation/Penalty.json b/data/as/30181145/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..86e1640096
--- /dev/null
+++ b/data/as/30181145/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181145",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181145/ws-services-calculation/WCBillingSlab.json b/data/as/30181145/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e8c6b6760a
--- /dev/null
+++ b/data/as/30181145/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181145",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181168/BillingService/BusinessService.json b/data/as/30181168/BillingService/BusinessService.json
new file mode 100644
index 0000000000..df014b39c4
--- /dev/null
+++ b/data/as/30181168/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181168",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181168/egov-location/boundary-data.json b/data/as/30181168/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3bc3873a2f
--- /dev/null
+++ b/data/as/30181168/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181168",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW PHULBARI TE PWSS",
+                "localname": "NEW PHULBARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW PHULBARI TE PWSS",
+                        "localname": "NEW PHULBARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW PHULBARI TE PWSS",
+                "localname": "NEW PHULBARI TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW PHULBARI TE PWSS",
+                        "localname": "NEW PHULBARI TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181168/ws-services-calculation/Penalty.json b/data/as/30181168/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9fb2f7f2f
--- /dev/null
+++ b/data/as/30181168/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181168",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181168/ws-services-calculation/WCBillingSlab.json b/data/as/30181168/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ab45e7be32
--- /dev/null
+++ b/data/as/30181168/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181168",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181188/BillingService/BusinessService.json b/data/as/30181188/BillingService/BusinessService.json
new file mode 100644
index 0000000000..680a090071
--- /dev/null
+++ b/data/as/30181188/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181188",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181188/egov-location/boundary-data.json b/data/as/30181188/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7bb23d172
--- /dev/null
+++ b/data/as/30181188/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181188",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.12 MOLANGAON PWSS",
+                "localname": "NO.12 MOLANGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181188",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.12 MOLANGAON PWSS",
+                        "localname": "NO.12 MOLANGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.12 MOLANGAON PWSS",
+                "localname": "NO.12 MOLANGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181188",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.12 MOLANGAON PWSS",
+                        "localname": "NO.12 MOLANGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181188/ws-services-calculation/Penalty.json b/data/as/30181188/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca20db93e1
--- /dev/null
+++ b/data/as/30181188/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181188",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181188/ws-services-calculation/WCBillingSlab.json b/data/as/30181188/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..39afd22faf
--- /dev/null
+++ b/data/as/30181188/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181188",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181246/BillingService/BusinessService.json b/data/as/30181246/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f9c1b36d2
--- /dev/null
+++ b/data/as/30181246/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181246",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181246/egov-location/boundary-data.json b/data/as/30181246/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba6e2cdc9c
--- /dev/null
+++ b/data/as/30181246/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181246",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGIA PT-I PWSS (NEW)",
+                "localname": "AGIA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181246",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGIA PT-I PWSS (NEW)",
+                        "localname": "AGIA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AGIA PT-I PWSS (NEW)",
+                "localname": "AGIA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181246",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AGIA PT-I PWSS (NEW)",
+                        "localname": "AGIA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181246/ws-services-calculation/Penalty.json b/data/as/30181246/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..177e0dc3d8
--- /dev/null
+++ b/data/as/30181246/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181246",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181246/ws-services-calculation/WCBillingSlab.json b/data/as/30181246/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee533f02e0
--- /dev/null
+++ b/data/as/30181246/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181246",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181257/BillingService/BusinessService.json b/data/as/30181257/BillingService/BusinessService.json
new file mode 100644
index 0000000000..69337c6065
--- /dev/null
+++ b/data/as/30181257/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181257",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181257/egov-location/boundary-data.json b/data/as/30181257/egov-location/boundary-data.json
new file mode 100644
index 0000000000..288e2a125f
--- /dev/null
+++ b/data/as/30181257/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181257",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELAKHAMAR PWSS (NEW)",
+                "localname": "BHELAKHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELAKHAMAR PWSS (NEW)",
+                        "localname": "BHELAKHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHELAKHAMAR PWSS (NEW)",
+                "localname": "BHELAKHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181257",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHELAKHAMAR PWSS (NEW)",
+                        "localname": "BHELAKHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181257/ws-services-calculation/Penalty.json b/data/as/30181257/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11d89397f2
--- /dev/null
+++ b/data/as/30181257/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181257",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181257/ws-services-calculation/WCBillingSlab.json b/data/as/30181257/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1c5323735f
--- /dev/null
+++ b/data/as/30181257/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181257",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181268/BillingService/BusinessService.json b/data/as/30181268/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cbb079ff8
--- /dev/null
+++ b/data/as/30181268/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181268",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181268/egov-location/boundary-data.json b/data/as/30181268/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd6d1f25e3
--- /dev/null
+++ b/data/as/30181268/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181268",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                "localname": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181268",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                        "localname": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                "localname": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181268",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                        "localname": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181268/ws-services-calculation/Penalty.json b/data/as/30181268/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..006a2fea94
--- /dev/null
+++ b/data/as/30181268/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181268",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181268/ws-services-calculation/WCBillingSlab.json b/data/as/30181268/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9854502133
--- /dev/null
+++ b/data/as/30181268/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181268",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181293/BillingService/BusinessService.json b/data/as/30181293/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3e851d472e
--- /dev/null
+++ b/data/as/30181293/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181293",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181293/egov-location/boundary-data.json b/data/as/30181293/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4fbe4868e5
--- /dev/null
+++ b/data/as/30181293/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181293",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIDA PWSS (NEW)",
+                "localname": "BAIDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181293",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIDA PWSS (NEW)",
+                        "localname": "BAIDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIDA PWSS (NEW)",
+                "localname": "BAIDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181293",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIDA PWSS (NEW)",
+                        "localname": "BAIDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181293/ws-services-calculation/Penalty.json b/data/as/30181293/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19807cd706
--- /dev/null
+++ b/data/as/30181293/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181293",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181293/ws-services-calculation/WCBillingSlab.json b/data/as/30181293/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e262fc120
--- /dev/null
+++ b/data/as/30181293/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181293",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181327/BillingService/BusinessService.json b/data/as/30181327/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a47d7a0c97
--- /dev/null
+++ b/data/as/30181327/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181327",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181327/egov-location/boundary-data.json b/data/as/30181327/egov-location/boundary-data.json
new file mode 100644
index 0000000000..90be00d3b0
--- /dev/null
+++ b/data/as/30181327/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181327",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLANGKATA M PWSS (NEW)",
+                "localname": "CHAPLANGKATA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181327",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLANGKATA M PWSS (NEW)",
+                        "localname": "CHAPLANGKATA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLANGKATA M PWSS (NEW)",
+                "localname": "CHAPLANGKATA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181327",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLANGKATA M PWSS (NEW)",
+                        "localname": "CHAPLANGKATA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181327/ws-services-calculation/Penalty.json b/data/as/30181327/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..09c4b98401
--- /dev/null
+++ b/data/as/30181327/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181327",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181327/ws-services-calculation/WCBillingSlab.json b/data/as/30181327/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2c2175ea9b
--- /dev/null
+++ b/data/as/30181327/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181327",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181400/BillingService/BusinessService.json b/data/as/30181400/BillingService/BusinessService.json
new file mode 100644
index 0000000000..354d0458b7
--- /dev/null
+++ b/data/as/30181400/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181400",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181400/egov-location/boundary-data.json b/data/as/30181400/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4bb73c5e9b
--- /dev/null
+++ b/data/as/30181400/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181400",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEGADAM PWSS (NEW)",
+                "localname": "MEGADAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEGADAM PWSS (NEW)",
+                        "localname": "MEGADAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEGADAM PWSS (NEW)",
+                "localname": "MEGADAM PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181400",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEGADAM PWSS (NEW)",
+                        "localname": "MEGADAM PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181400/ws-services-calculation/Penalty.json b/data/as/30181400/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..15e894bf7b
--- /dev/null
+++ b/data/as/30181400/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181400",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181400/ws-services-calculation/WCBillingSlab.json b/data/as/30181400/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f56d7207aa
--- /dev/null
+++ b/data/as/30181400/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181400",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181411/BillingService/BusinessService.json b/data/as/30181411/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5647098021
--- /dev/null
+++ b/data/as/30181411/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181411",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181411/egov-location/boundary-data.json b/data/as/30181411/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e3f8064ca2
--- /dev/null
+++ b/data/as/30181411/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181411",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIJURI PWSS (NEW)",
+                "localname": "BAIJURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIJURI PWSS (NEW)",
+                        "localname": "BAIJURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIJURI PWSS (NEW)",
+                "localname": "BAIJURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIJURI PWSS (NEW)",
+                        "localname": "BAIJURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181411/ws-services-calculation/Penalty.json b/data/as/30181411/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eada7acd06
--- /dev/null
+++ b/data/as/30181411/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181411",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181411/ws-services-calculation/WCBillingSlab.json b/data/as/30181411/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0ca9648f00
--- /dev/null
+++ b/data/as/30181411/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181411",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181434/BillingService/BusinessService.json b/data/as/30181434/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97b29f2d75
--- /dev/null
+++ b/data/as/30181434/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181434",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181434/egov-location/boundary-data.json b/data/as/30181434/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bdfd1ed545
--- /dev/null
+++ b/data/as/30181434/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181434",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIMPARA PWSS (NEW)",
+                "localname": "MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIMPARA PWSS (NEW)",
+                        "localname": "MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIMPARA PWSS (NEW)",
+                "localname": "MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIMPARA PWSS (NEW)",
+                        "localname": "MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181434/ws-services-calculation/Penalty.json b/data/as/30181434/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4b5685af99
--- /dev/null
+++ b/data/as/30181434/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181434",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181434/ws-services-calculation/WCBillingSlab.json b/data/as/30181434/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c218ab71a
--- /dev/null
+++ b/data/as/30181434/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181434",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181444/BillingService/BusinessService.json b/data/as/30181444/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19a0aa6a02
--- /dev/null
+++ b/data/as/30181444/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181444",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181444/egov-location/boundary-data.json b/data/as/30181444/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b18cc2d4dd
--- /dev/null
+++ b/data/as/30181444/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181444",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURKATA PWSS (NEW)",
+                "localname": "KUKURKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURKATA PWSS (NEW)",
+                        "localname": "KUKURKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURKATA PWSS (NEW)",
+                "localname": "KUKURKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURKATA PWSS (NEW)",
+                        "localname": "KUKURKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181444/ws-services-calculation/Penalty.json b/data/as/30181444/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90fe3a0dc4
--- /dev/null
+++ b/data/as/30181444/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181444",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181444/ws-services-calculation/WCBillingSlab.json b/data/as/30181444/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..232713d4dd
--- /dev/null
+++ b/data/as/30181444/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181444",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181457/BillingService/BusinessService.json b/data/as/30181457/BillingService/BusinessService.json
new file mode 100644
index 0000000000..33b8ba4635
--- /dev/null
+++ b/data/as/30181457/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181457",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181457/egov-location/boundary-data.json b/data/as/30181457/egov-location/boundary-data.json
new file mode 100644
index 0000000000..80f74b6359
--- /dev/null
+++ b/data/as/30181457/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181457",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNAPARA DEREK II PWSS (NEW)",
+                "localname": "JOGNAPARA DEREK II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNAPARA DEREK II PWSS (NEW)",
+                        "localname": "JOGNAPARA DEREK II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOGNAPARA DEREK II PWSS (NEW)",
+                "localname": "JOGNAPARA DEREK II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOGNAPARA DEREK II PWSS (NEW)",
+                        "localname": "JOGNAPARA DEREK II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181457/ws-services-calculation/Penalty.json b/data/as/30181457/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..40635773c1
--- /dev/null
+++ b/data/as/30181457/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181457",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181457/ws-services-calculation/WCBillingSlab.json b/data/as/30181457/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1b7823ec91
--- /dev/null
+++ b/data/as/30181457/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181457",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181562/BillingService/BusinessService.json b/data/as/30181562/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5d8597306
--- /dev/null
+++ b/data/as/30181562/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181562",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181562/egov-location/boundary-data.json b/data/as/30181562/egov-location/boundary-data.json
new file mode 100644
index 0000000000..beb5aa5557
--- /dev/null
+++ b/data/as/30181562/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181562",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADIAPARA FAFANGA PWSS (NEW)",
+                "localname": "HADIAPARA FAFANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADIAPARA FAFANGA PWSS (NEW)",
+                        "localname": "HADIAPARA FAFANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HADIAPARA FAFANGA PWSS (NEW)",
+                "localname": "HADIAPARA FAFANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HADIAPARA FAFANGA PWSS (NEW)",
+                        "localname": "HADIAPARA FAFANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181562/ws-services-calculation/Penalty.json b/data/as/30181562/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c11a22bb58
--- /dev/null
+++ b/data/as/30181562/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181562",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181562/ws-services-calculation/WCBillingSlab.json b/data/as/30181562/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..19c942e7cf
--- /dev/null
+++ b/data/as/30181562/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181562",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181575/BillingService/BusinessService.json b/data/as/30181575/BillingService/BusinessService.json
new file mode 100644
index 0000000000..63a988486a
--- /dev/null
+++ b/data/as/30181575/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181575",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181575/egov-location/boundary-data.json b/data/as/30181575/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fcad71f772
--- /dev/null
+++ b/data/as/30181575/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181575",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONGRAI PWSS (NEW)",
+                "localname": "MONGRAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONGRAI PWSS (NEW)",
+                        "localname": "MONGRAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MONGRAI PWSS (NEW)",
+                "localname": "MONGRAI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181575",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MONGRAI PWSS (NEW)",
+                        "localname": "MONGRAI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181575/ws-services-calculation/Penalty.json b/data/as/30181575/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f1e9d7da6
--- /dev/null
+++ b/data/as/30181575/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181575",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181575/ws-services-calculation/WCBillingSlab.json b/data/as/30181575/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..65645dd78a
--- /dev/null
+++ b/data/as/30181575/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181575",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181597/BillingService/BusinessService.json b/data/as/30181597/BillingService/BusinessService.json
new file mode 100644
index 0000000000..57f588f4de
--- /dev/null
+++ b/data/as/30181597/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181597",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181597/egov-location/boundary-data.json b/data/as/30181597/egov-location/boundary-data.json
new file mode 100644
index 0000000000..455b4ba201
--- /dev/null
+++ b/data/as/30181597/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181597",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                "localname": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181597",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                        "localname": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                "localname": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181597",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                        "localname": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181597/ws-services-calculation/Penalty.json b/data/as/30181597/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..917f816d11
--- /dev/null
+++ b/data/as/30181597/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181597",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181597/ws-services-calculation/WCBillingSlab.json b/data/as/30181597/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0462cec1a2
--- /dev/null
+++ b/data/as/30181597/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181597",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181604/BillingService/BusinessService.json b/data/as/30181604/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f6d17a8bf
--- /dev/null
+++ b/data/as/30181604/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181604",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181604/egov-location/boundary-data.json b/data/as/30181604/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3673155eab
--- /dev/null
+++ b/data/as/30181604/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181604",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 HATIBARI T.E. MPWS",
+                "localname": "NO. 4 HATIBARI T.E. MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181604",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 HATIBARI T.E. MPWS",
+                        "localname": "NO. 4 HATIBARI T.E. MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 HATIBARI T.E. MPWS",
+                "localname": "NO. 4 HATIBARI T.E. MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181604",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 HATIBARI T.E. MPWS",
+                        "localname": "NO. 4 HATIBARI T.E. MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181604/ws-services-calculation/Penalty.json b/data/as/30181604/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..941c41f812
--- /dev/null
+++ b/data/as/30181604/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181604",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181604/ws-services-calculation/WCBillingSlab.json b/data/as/30181604/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ac8613786c
--- /dev/null
+++ b/data/as/30181604/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181604",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181615/BillingService/BusinessService.json b/data/as/30181615/BillingService/BusinessService.json
new file mode 100644
index 0000000000..005f66cb9f
--- /dev/null
+++ b/data/as/30181615/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181615",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181615/egov-location/boundary-data.json b/data/as/30181615/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cfc9c380d6
--- /dev/null
+++ b/data/as/30181615/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181615",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORKANDA PWSS (NEW)",
+                "localname": "BORKANDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORKANDA PWSS (NEW)",
+                        "localname": "BORKANDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORKANDA PWSS (NEW)",
+                "localname": "BORKANDA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORKANDA PWSS (NEW)",
+                        "localname": "BORKANDA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181615/ws-services-calculation/Penalty.json b/data/as/30181615/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db23f05e14
--- /dev/null
+++ b/data/as/30181615/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181615",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181615/ws-services-calculation/WCBillingSlab.json b/data/as/30181615/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..100c65771b
--- /dev/null
+++ b/data/as/30181615/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181615",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181621/BillingService/BusinessService.json b/data/as/30181621/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ff995b477
--- /dev/null
+++ b/data/as/30181621/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181621",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181621/egov-location/boundary-data.json b/data/as/30181621/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89d2be6e81
--- /dev/null
+++ b/data/as/30181621/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181621",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 SIRUANI PWSS",
+                "localname": "NO. 4 SIRUANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181621",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 SIRUANI PWSS",
+                        "localname": "NO. 4 SIRUANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 SIRUANI PWSS",
+                "localname": "NO. 4 SIRUANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181621",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 SIRUANI PWSS",
+                        "localname": "NO. 4 SIRUANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181621/ws-services-calculation/Penalty.json b/data/as/30181621/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1898d05309
--- /dev/null
+++ b/data/as/30181621/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181621",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181621/ws-services-calculation/WCBillingSlab.json b/data/as/30181621/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..532df4c0bd
--- /dev/null
+++ b/data/as/30181621/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181621",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181628/BillingService/BusinessService.json b/data/as/30181628/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e09d1e7c0
--- /dev/null
+++ b/data/as/30181628/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181628",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181628/egov-location/boundary-data.json b/data/as/30181628/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9f29c0252
--- /dev/null
+++ b/data/as/30181628/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181628",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULI IZARA PWSS (NEW)",
+                "localname": "DEULI IZARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181628",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULI IZARA PWSS (NEW)",
+                        "localname": "DEULI IZARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULI IZARA PWSS (NEW)",
+                "localname": "DEULI IZARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181628",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULI IZARA PWSS (NEW)",
+                        "localname": "DEULI IZARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181628/ws-services-calculation/Penalty.json b/data/as/30181628/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cecc1e746c
--- /dev/null
+++ b/data/as/30181628/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181628",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181628/ws-services-calculation/WCBillingSlab.json b/data/as/30181628/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e40c92279
--- /dev/null
+++ b/data/as/30181628/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181628",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181639/BillingService/BusinessService.json b/data/as/30181639/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b16d0c2709
--- /dev/null
+++ b/data/as/30181639/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181639",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181639/egov-location/boundary-data.json b/data/as/30181639/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d6b61f7566
--- /dev/null
+++ b/data/as/30181639/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181639",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NORTH BHALUKPONG PWSS",
+                "localname": "NORTH BHALUKPONG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181639",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NORTH BHALUKPONG PWSS",
+                        "localname": "NORTH BHALUKPONG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NORTH BHALUKPONG PWSS",
+                "localname": "NORTH BHALUKPONG PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181639",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NORTH BHALUKPONG PWSS",
+                        "localname": "NORTH BHALUKPONG PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181639/ws-services-calculation/Penalty.json b/data/as/30181639/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..681302ceb0
--- /dev/null
+++ b/data/as/30181639/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181639",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181639/ws-services-calculation/WCBillingSlab.json b/data/as/30181639/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..40931b3010
--- /dev/null
+++ b/data/as/30181639/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181639",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181769/BillingService/BusinessService.json b/data/as/30181769/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ebdd415d2
--- /dev/null
+++ b/data/as/30181769/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181769",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181769/egov-location/boundary-data.json b/data/as/30181769/egov-location/boundary-data.json
new file mode 100644
index 0000000000..19359b61dc
--- /dev/null
+++ b/data/as/30181769/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181769",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANBARI PWSS",
+                "localname": "PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANBARI PWSS",
+                        "localname": "PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANBARI PWSS",
+                "localname": "PANBARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181769",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANBARI PWSS",
+                        "localname": "PANBARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181769/ws-services-calculation/Penalty.json b/data/as/30181769/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3cea954bf
--- /dev/null
+++ b/data/as/30181769/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181769",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181769/ws-services-calculation/WCBillingSlab.json b/data/as/30181769/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..20700033bd
--- /dev/null
+++ b/data/as/30181769/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181769",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181824/BillingService/BusinessService.json b/data/as/30181824/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86beb76a21
--- /dev/null
+++ b/data/as/30181824/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181824",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181824/egov-location/boundary-data.json b/data/as/30181824/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e1bde45d1
--- /dev/null
+++ b/data/as/30181824/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181824",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULOGURI GAROGAON PWSS",
+                "localname": "PHULOGURI GAROGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULOGURI GAROGAON PWSS",
+                        "localname": "PHULOGURI GAROGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULOGURI GAROGAON PWSS",
+                "localname": "PHULOGURI GAROGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181824",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULOGURI GAROGAON PWSS",
+                        "localname": "PHULOGURI GAROGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181824/ws-services-calculation/Penalty.json b/data/as/30181824/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..826424dcc7
--- /dev/null
+++ b/data/as/30181824/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181824",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181824/ws-services-calculation/WCBillingSlab.json b/data/as/30181824/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1363a323af
--- /dev/null
+++ b/data/as/30181824/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181824",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181850/BillingService/BusinessService.json b/data/as/30181850/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b2dc54efc7
--- /dev/null
+++ b/data/as/30181850/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181850",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181850/egov-location/boundary-data.json b/data/as/30181850/egov-location/boundary-data.json
new file mode 100644
index 0000000000..56ed17866d
--- /dev/null
+++ b/data/as/30181850/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181850",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROUMARI GAON PWSS",
+                "localname": "ROUMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROUMARI GAON PWSS",
+                        "localname": "ROUMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROUMARI GAON PWSS",
+                "localname": "ROUMARI GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROUMARI GAON PWSS",
+                        "localname": "ROUMARI GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181850/ws-services-calculation/Penalty.json b/data/as/30181850/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c1679fa5b4
--- /dev/null
+++ b/data/as/30181850/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181850",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181850/ws-services-calculation/WCBillingSlab.json b/data/as/30181850/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33692a2ac9
--- /dev/null
+++ b/data/as/30181850/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181850",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181892/BillingService/BusinessService.json b/data/as/30181892/BillingService/BusinessService.json
new file mode 100644
index 0000000000..72d461d1b0
--- /dev/null
+++ b/data/as/30181892/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181892",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181892/egov-location/boundary-data.json b/data/as/30181892/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d347fd791e
--- /dev/null
+++ b/data/as/30181892/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181892",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIPARA PWSS (NEW)",
+                "localname": "KACHARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIPARA PWSS (NEW)",
+                        "localname": "KACHARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIPARA PWSS (NEW)",
+                "localname": "KACHARIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181892",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIPARA PWSS (NEW)",
+                        "localname": "KACHARIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181892/ws-services-calculation/Penalty.json b/data/as/30181892/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b621ec619a
--- /dev/null
+++ b/data/as/30181892/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181892",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181892/ws-services-calculation/WCBillingSlab.json b/data/as/30181892/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ef373bc21f
--- /dev/null
+++ b/data/as/30181892/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181892",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From 9ba4021fd344b9be8beea05fb853d7794ce381a6 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:45:45 +0530
Subject: [PATCH 07/23] added 400 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181910/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181935/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181958/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30181970/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182020/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182059/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182076/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182096/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182115/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182130/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182227/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182259/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182280/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182312/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182324/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182346/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182357/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182369/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182379/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182397/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182413/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182433/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182444/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182458/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182473/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182492/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30182502/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183072/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183077/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183135/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183229/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183244/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183255/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183275/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183307/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183330/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183351/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183367/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183379/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183385/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183392/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183402/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183409/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183414/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183459/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183462/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183468/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183522/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183574/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183599/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183693/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183728/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183739/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183758/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183945/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183971/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30183980/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30184382/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30184383/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30184384/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30184386/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30184393/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30184401/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30185152/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30186115/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30186145/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30186206/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30186275/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30186307/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188401/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188411/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188425/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188440/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188457/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188494/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188506/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188524/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188535/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188564/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188569/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188583/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188648/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188716/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188739/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188761/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188772/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188786/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188820/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30188848/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189208/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189234/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189242/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189256/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189269/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189277/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189286/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189299/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189315/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189323/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189328/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189336/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189344/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189379/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189381/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189391/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189399/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189413/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189424/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189431/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189444/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189455/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189469/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189496/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189526/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189537/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189551/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189562/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189571/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189582/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189595/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30189615/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191686/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191713/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191743/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191765/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191816/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191837/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191855/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191889/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191910/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191941/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30191974/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30192001/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30192026/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30192045/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30192070/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30192093/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30192129/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30193693/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30196401/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30196757/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30196783/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30196788/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30196800/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30196806/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30199561/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30199580/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30199609/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30199656/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200209/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200338/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200348/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200365/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200373/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200381/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200390/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30200395/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201829/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201845/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201859/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201868/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201884/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201910/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201927/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201982/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30201998/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202047/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202048/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202080/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202118/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202288/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202311/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202346/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202436/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202462/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202484/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202510/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202537/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202570/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202595/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202611/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202636/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202651/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202908/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30202964/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30204586/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207281/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207843/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207863/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207883/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207923/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../30207980/egov-location/boundary-data.json |  16 +-
 .../WCBillingSlab.json                        |   8 +-
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207990/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30207996/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208033/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208074/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208101/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208625/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208644/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208681/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30208803/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211530/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211543/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211556/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211591/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211653/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211673/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211695/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211715/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211747/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30211881/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212673/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212710/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212736/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212751/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212766/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212780/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212817/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212830/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212847/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212906/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212926/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212942/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212948/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212952/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212973/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212983/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30212996/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213000/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213013/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213023/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213053/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213057/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213059/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213066/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213067/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213075/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213079/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213084/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213135/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213136/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213138/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213140/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213143/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213146/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213148/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213150/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213200/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213202/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213205/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213208/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213210/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213215/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213219/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213224/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213489/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213521/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213556/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213569/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213581/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213587/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213598/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213603/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213638/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213716/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213729/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213788/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213798/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213839/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213850/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213862/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213877/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213916/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30213935/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214038/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214044/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214051/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214059/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214062/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214069/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214095/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214145/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214148/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214152/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214157/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214168/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214174/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214298/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214330/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214334/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214398/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214413/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214437/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214444/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214454/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214478/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214502/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214524/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214533/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214551/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214559/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214579/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214623/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214632/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214635/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214651/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214686/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214704/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30214731/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30215695/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30215708/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216018/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216021/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216024/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216027/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216030/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216039/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216045/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216049/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216051/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216053/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216054/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216055/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216056/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216057/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216058/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216059/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216061/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216062/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216214/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216258/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216269/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216295/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216302/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216319/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216336/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216372/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216378/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216401/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216427/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216449/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216472/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216505/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216577/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216676/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216841/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216849/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216928/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216939/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30216955/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30217247/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30217255/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30217976/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218422/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218426/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218431/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218437/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218442/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218453/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218465/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218467/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218469/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218658/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218660/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218662/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218664/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218673/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218675/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218682/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218684/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218703/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218711/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218717/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218718/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218719/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218721/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218722/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218724/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218726/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218728/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218731/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218732/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218733/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218734/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218735/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218736/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218737/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218738/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218739/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218740/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218741/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218742/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218743/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218744/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218745/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218812/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218889/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30218974/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219042/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 1598 files changed, 136470 insertions(+), 12 deletions(-)
 create mode 100644 data/as/30181910/BillingService/BusinessService.json
 create mode 100644 data/as/30181910/egov-location/boundary-data.json
 create mode 100644 data/as/30181910/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181910/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181935/BillingService/BusinessService.json
 create mode 100644 data/as/30181935/egov-location/boundary-data.json
 create mode 100644 data/as/30181935/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181935/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181958/BillingService/BusinessService.json
 create mode 100644 data/as/30181958/egov-location/boundary-data.json
 create mode 100644 data/as/30181958/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181958/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30181970/BillingService/BusinessService.json
 create mode 100644 data/as/30181970/egov-location/boundary-data.json
 create mode 100644 data/as/30181970/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30181970/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182020/BillingService/BusinessService.json
 create mode 100644 data/as/30182020/egov-location/boundary-data.json
 create mode 100644 data/as/30182020/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182020/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182059/BillingService/BusinessService.json
 create mode 100644 data/as/30182059/egov-location/boundary-data.json
 create mode 100644 data/as/30182059/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182059/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182076/BillingService/BusinessService.json
 create mode 100644 data/as/30182076/egov-location/boundary-data.json
 create mode 100644 data/as/30182076/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182076/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182096/BillingService/BusinessService.json
 create mode 100644 data/as/30182096/egov-location/boundary-data.json
 create mode 100644 data/as/30182096/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182096/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182115/BillingService/BusinessService.json
 create mode 100644 data/as/30182115/egov-location/boundary-data.json
 create mode 100644 data/as/30182115/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182115/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182130/BillingService/BusinessService.json
 create mode 100644 data/as/30182130/egov-location/boundary-data.json
 create mode 100644 data/as/30182130/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182130/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182227/BillingService/BusinessService.json
 create mode 100644 data/as/30182227/egov-location/boundary-data.json
 create mode 100644 data/as/30182227/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182227/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182259/BillingService/BusinessService.json
 create mode 100644 data/as/30182259/egov-location/boundary-data.json
 create mode 100644 data/as/30182259/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182259/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182280/BillingService/BusinessService.json
 create mode 100644 data/as/30182280/egov-location/boundary-data.json
 create mode 100644 data/as/30182280/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182280/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182312/BillingService/BusinessService.json
 create mode 100644 data/as/30182312/egov-location/boundary-data.json
 create mode 100644 data/as/30182312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182324/BillingService/BusinessService.json
 create mode 100644 data/as/30182324/egov-location/boundary-data.json
 create mode 100644 data/as/30182324/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182324/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182346/BillingService/BusinessService.json
 create mode 100644 data/as/30182346/egov-location/boundary-data.json
 create mode 100644 data/as/30182346/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182346/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182357/BillingService/BusinessService.json
 create mode 100644 data/as/30182357/egov-location/boundary-data.json
 create mode 100644 data/as/30182357/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182357/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182369/BillingService/BusinessService.json
 create mode 100644 data/as/30182369/egov-location/boundary-data.json
 create mode 100644 data/as/30182369/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182369/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182379/BillingService/BusinessService.json
 create mode 100644 data/as/30182379/egov-location/boundary-data.json
 create mode 100644 data/as/30182379/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182379/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182397/BillingService/BusinessService.json
 create mode 100644 data/as/30182397/egov-location/boundary-data.json
 create mode 100644 data/as/30182397/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182397/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182413/BillingService/BusinessService.json
 create mode 100644 data/as/30182413/egov-location/boundary-data.json
 create mode 100644 data/as/30182413/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182413/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182433/BillingService/BusinessService.json
 create mode 100644 data/as/30182433/egov-location/boundary-data.json
 create mode 100644 data/as/30182433/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182433/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182444/BillingService/BusinessService.json
 create mode 100644 data/as/30182444/egov-location/boundary-data.json
 create mode 100644 data/as/30182444/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182444/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182458/BillingService/BusinessService.json
 create mode 100644 data/as/30182458/egov-location/boundary-data.json
 create mode 100644 data/as/30182458/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182458/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182473/BillingService/BusinessService.json
 create mode 100644 data/as/30182473/egov-location/boundary-data.json
 create mode 100644 data/as/30182473/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182473/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182492/BillingService/BusinessService.json
 create mode 100644 data/as/30182492/egov-location/boundary-data.json
 create mode 100644 data/as/30182492/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182492/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30182502/BillingService/BusinessService.json
 create mode 100644 data/as/30182502/egov-location/boundary-data.json
 create mode 100644 data/as/30182502/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30182502/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183072/BillingService/BusinessService.json
 create mode 100644 data/as/30183072/egov-location/boundary-data.json
 create mode 100644 data/as/30183072/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183072/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183077/BillingService/BusinessService.json
 create mode 100644 data/as/30183077/egov-location/boundary-data.json
 create mode 100644 data/as/30183077/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183077/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183135/BillingService/BusinessService.json
 create mode 100644 data/as/30183135/egov-location/boundary-data.json
 create mode 100644 data/as/30183135/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183135/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183229/BillingService/BusinessService.json
 create mode 100644 data/as/30183229/egov-location/boundary-data.json
 create mode 100644 data/as/30183229/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183229/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183244/BillingService/BusinessService.json
 create mode 100644 data/as/30183244/egov-location/boundary-data.json
 create mode 100644 data/as/30183244/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183244/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183255/BillingService/BusinessService.json
 create mode 100644 data/as/30183255/egov-location/boundary-data.json
 create mode 100644 data/as/30183255/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183255/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183275/BillingService/BusinessService.json
 create mode 100644 data/as/30183275/egov-location/boundary-data.json
 create mode 100644 data/as/30183275/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183275/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183307/BillingService/BusinessService.json
 create mode 100644 data/as/30183307/egov-location/boundary-data.json
 create mode 100644 data/as/30183307/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183307/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183330/BillingService/BusinessService.json
 create mode 100644 data/as/30183330/egov-location/boundary-data.json
 create mode 100644 data/as/30183330/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183330/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183351/BillingService/BusinessService.json
 create mode 100644 data/as/30183351/egov-location/boundary-data.json
 create mode 100644 data/as/30183351/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183351/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183367/BillingService/BusinessService.json
 create mode 100644 data/as/30183367/egov-location/boundary-data.json
 create mode 100644 data/as/30183367/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183367/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183379/BillingService/BusinessService.json
 create mode 100644 data/as/30183379/egov-location/boundary-data.json
 create mode 100644 data/as/30183379/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183379/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183385/BillingService/BusinessService.json
 create mode 100644 data/as/30183385/egov-location/boundary-data.json
 create mode 100644 data/as/30183385/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183385/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183392/BillingService/BusinessService.json
 create mode 100644 data/as/30183392/egov-location/boundary-data.json
 create mode 100644 data/as/30183392/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183392/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183402/BillingService/BusinessService.json
 create mode 100644 data/as/30183402/egov-location/boundary-data.json
 create mode 100644 data/as/30183402/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183402/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183409/BillingService/BusinessService.json
 create mode 100644 data/as/30183409/egov-location/boundary-data.json
 create mode 100644 data/as/30183409/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183409/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183414/BillingService/BusinessService.json
 create mode 100644 data/as/30183414/egov-location/boundary-data.json
 create mode 100644 data/as/30183414/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183414/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183459/BillingService/BusinessService.json
 create mode 100644 data/as/30183459/egov-location/boundary-data.json
 create mode 100644 data/as/30183459/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183459/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183462/BillingService/BusinessService.json
 create mode 100644 data/as/30183462/egov-location/boundary-data.json
 create mode 100644 data/as/30183462/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183462/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183468/BillingService/BusinessService.json
 create mode 100644 data/as/30183468/egov-location/boundary-data.json
 create mode 100644 data/as/30183468/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183468/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183496/BillingService/BusinessService.json
 create mode 100644 data/as/30183496/egov-location/boundary-data.json
 create mode 100644 data/as/30183496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183522/BillingService/BusinessService.json
 create mode 100644 data/as/30183522/egov-location/boundary-data.json
 create mode 100644 data/as/30183522/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183522/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183574/BillingService/BusinessService.json
 create mode 100644 data/as/30183574/egov-location/boundary-data.json
 create mode 100644 data/as/30183574/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183574/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183599/BillingService/BusinessService.json
 create mode 100644 data/as/30183599/egov-location/boundary-data.json
 create mode 100644 data/as/30183599/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183599/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183693/BillingService/BusinessService.json
 create mode 100644 data/as/30183693/egov-location/boundary-data.json
 create mode 100644 data/as/30183693/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183693/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183728/BillingService/BusinessService.json
 create mode 100644 data/as/30183728/egov-location/boundary-data.json
 create mode 100644 data/as/30183728/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183728/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183739/BillingService/BusinessService.json
 create mode 100644 data/as/30183739/egov-location/boundary-data.json
 create mode 100644 data/as/30183739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183758/BillingService/BusinessService.json
 create mode 100644 data/as/30183758/egov-location/boundary-data.json
 create mode 100644 data/as/30183758/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183758/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183945/BillingService/BusinessService.json
 create mode 100644 data/as/30183945/egov-location/boundary-data.json
 create mode 100644 data/as/30183945/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183945/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183971/BillingService/BusinessService.json
 create mode 100644 data/as/30183971/egov-location/boundary-data.json
 create mode 100644 data/as/30183971/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183971/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30183980/BillingService/BusinessService.json
 create mode 100644 data/as/30183980/egov-location/boundary-data.json
 create mode 100644 data/as/30183980/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30183980/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30184382/BillingService/BusinessService.json
 create mode 100644 data/as/30184382/egov-location/boundary-data.json
 create mode 100644 data/as/30184382/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30184382/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30184383/BillingService/BusinessService.json
 create mode 100644 data/as/30184383/egov-location/boundary-data.json
 create mode 100644 data/as/30184383/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30184383/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30184384/BillingService/BusinessService.json
 create mode 100644 data/as/30184384/egov-location/boundary-data.json
 create mode 100644 data/as/30184384/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30184384/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30184386/BillingService/BusinessService.json
 create mode 100644 data/as/30184386/egov-location/boundary-data.json
 create mode 100644 data/as/30184386/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30184386/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30184393/BillingService/BusinessService.json
 create mode 100644 data/as/30184393/egov-location/boundary-data.json
 create mode 100644 data/as/30184393/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30184393/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30184401/BillingService/BusinessService.json
 create mode 100644 data/as/30184401/egov-location/boundary-data.json
 create mode 100644 data/as/30184401/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30184401/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30185152/BillingService/BusinessService.json
 create mode 100644 data/as/30185152/egov-location/boundary-data.json
 create mode 100644 data/as/30185152/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30185152/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30186115/BillingService/BusinessService.json
 create mode 100644 data/as/30186115/egov-location/boundary-data.json
 create mode 100644 data/as/30186115/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30186115/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30186145/BillingService/BusinessService.json
 create mode 100644 data/as/30186145/egov-location/boundary-data.json
 create mode 100644 data/as/30186145/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30186145/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30186206/BillingService/BusinessService.json
 create mode 100644 data/as/30186206/egov-location/boundary-data.json
 create mode 100644 data/as/30186206/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30186206/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30186275/BillingService/BusinessService.json
 create mode 100644 data/as/30186275/egov-location/boundary-data.json
 create mode 100644 data/as/30186275/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30186275/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30186307/BillingService/BusinessService.json
 create mode 100644 data/as/30186307/egov-location/boundary-data.json
 create mode 100644 data/as/30186307/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30186307/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188401/BillingService/BusinessService.json
 create mode 100644 data/as/30188401/egov-location/boundary-data.json
 create mode 100644 data/as/30188401/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188401/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188411/BillingService/BusinessService.json
 create mode 100644 data/as/30188411/egov-location/boundary-data.json
 create mode 100644 data/as/30188411/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188411/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188425/BillingService/BusinessService.json
 create mode 100644 data/as/30188425/egov-location/boundary-data.json
 create mode 100644 data/as/30188425/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188425/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188440/BillingService/BusinessService.json
 create mode 100644 data/as/30188440/egov-location/boundary-data.json
 create mode 100644 data/as/30188440/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188440/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188457/BillingService/BusinessService.json
 create mode 100644 data/as/30188457/egov-location/boundary-data.json
 create mode 100644 data/as/30188457/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188457/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188494/BillingService/BusinessService.json
 create mode 100644 data/as/30188494/egov-location/boundary-data.json
 create mode 100644 data/as/30188494/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188494/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188506/BillingService/BusinessService.json
 create mode 100644 data/as/30188506/egov-location/boundary-data.json
 create mode 100644 data/as/30188506/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188506/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188524/BillingService/BusinessService.json
 create mode 100644 data/as/30188524/egov-location/boundary-data.json
 create mode 100644 data/as/30188524/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188524/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188535/BillingService/BusinessService.json
 create mode 100644 data/as/30188535/egov-location/boundary-data.json
 create mode 100644 data/as/30188535/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188535/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188564/BillingService/BusinessService.json
 create mode 100644 data/as/30188564/egov-location/boundary-data.json
 create mode 100644 data/as/30188564/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188564/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188569/BillingService/BusinessService.json
 create mode 100644 data/as/30188569/egov-location/boundary-data.json
 create mode 100644 data/as/30188569/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188569/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188583/BillingService/BusinessService.json
 create mode 100644 data/as/30188583/egov-location/boundary-data.json
 create mode 100644 data/as/30188583/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188583/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188648/BillingService/BusinessService.json
 create mode 100644 data/as/30188648/egov-location/boundary-data.json
 create mode 100644 data/as/30188648/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188648/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188716/BillingService/BusinessService.json
 create mode 100644 data/as/30188716/egov-location/boundary-data.json
 create mode 100644 data/as/30188716/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188716/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188739/BillingService/BusinessService.json
 create mode 100644 data/as/30188739/egov-location/boundary-data.json
 create mode 100644 data/as/30188739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188761/BillingService/BusinessService.json
 create mode 100644 data/as/30188761/egov-location/boundary-data.json
 create mode 100644 data/as/30188761/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188761/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188772/BillingService/BusinessService.json
 create mode 100644 data/as/30188772/egov-location/boundary-data.json
 create mode 100644 data/as/30188772/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188772/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188786/BillingService/BusinessService.json
 create mode 100644 data/as/30188786/egov-location/boundary-data.json
 create mode 100644 data/as/30188786/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188786/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188820/BillingService/BusinessService.json
 create mode 100644 data/as/30188820/egov-location/boundary-data.json
 create mode 100644 data/as/30188820/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188820/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30188848/BillingService/BusinessService.json
 create mode 100644 data/as/30188848/egov-location/boundary-data.json
 create mode 100644 data/as/30188848/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30188848/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189208/BillingService/BusinessService.json
 create mode 100644 data/as/30189208/egov-location/boundary-data.json
 create mode 100644 data/as/30189208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189234/BillingService/BusinessService.json
 create mode 100644 data/as/30189234/egov-location/boundary-data.json
 create mode 100644 data/as/30189234/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189234/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189242/BillingService/BusinessService.json
 create mode 100644 data/as/30189242/egov-location/boundary-data.json
 create mode 100644 data/as/30189242/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189242/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189256/BillingService/BusinessService.json
 create mode 100644 data/as/30189256/egov-location/boundary-data.json
 create mode 100644 data/as/30189256/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189256/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189269/BillingService/BusinessService.json
 create mode 100644 data/as/30189269/egov-location/boundary-data.json
 create mode 100644 data/as/30189269/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189269/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189277/BillingService/BusinessService.json
 create mode 100644 data/as/30189277/egov-location/boundary-data.json
 create mode 100644 data/as/30189277/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189277/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189286/BillingService/BusinessService.json
 create mode 100644 data/as/30189286/egov-location/boundary-data.json
 create mode 100644 data/as/30189286/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189286/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189299/BillingService/BusinessService.json
 create mode 100644 data/as/30189299/egov-location/boundary-data.json
 create mode 100644 data/as/30189299/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189299/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189315/BillingService/BusinessService.json
 create mode 100644 data/as/30189315/egov-location/boundary-data.json
 create mode 100644 data/as/30189315/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189315/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189323/BillingService/BusinessService.json
 create mode 100644 data/as/30189323/egov-location/boundary-data.json
 create mode 100644 data/as/30189323/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189323/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189328/BillingService/BusinessService.json
 create mode 100644 data/as/30189328/egov-location/boundary-data.json
 create mode 100644 data/as/30189328/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189328/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189336/BillingService/BusinessService.json
 create mode 100644 data/as/30189336/egov-location/boundary-data.json
 create mode 100644 data/as/30189336/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189336/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189344/BillingService/BusinessService.json
 create mode 100644 data/as/30189344/egov-location/boundary-data.json
 create mode 100644 data/as/30189344/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189344/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189379/BillingService/BusinessService.json
 create mode 100644 data/as/30189379/egov-location/boundary-data.json
 create mode 100644 data/as/30189379/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189379/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189381/BillingService/BusinessService.json
 create mode 100644 data/as/30189381/egov-location/boundary-data.json
 create mode 100644 data/as/30189381/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189381/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189391/BillingService/BusinessService.json
 create mode 100644 data/as/30189391/egov-location/boundary-data.json
 create mode 100644 data/as/30189391/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189391/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189399/BillingService/BusinessService.json
 create mode 100644 data/as/30189399/egov-location/boundary-data.json
 create mode 100644 data/as/30189399/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189399/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189413/BillingService/BusinessService.json
 create mode 100644 data/as/30189413/egov-location/boundary-data.json
 create mode 100644 data/as/30189413/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189413/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189424/BillingService/BusinessService.json
 create mode 100644 data/as/30189424/egov-location/boundary-data.json
 create mode 100644 data/as/30189424/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189424/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189431/BillingService/BusinessService.json
 create mode 100644 data/as/30189431/egov-location/boundary-data.json
 create mode 100644 data/as/30189431/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189431/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189444/BillingService/BusinessService.json
 create mode 100644 data/as/30189444/egov-location/boundary-data.json
 create mode 100644 data/as/30189444/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189444/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189455/BillingService/BusinessService.json
 create mode 100644 data/as/30189455/egov-location/boundary-data.json
 create mode 100644 data/as/30189455/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189455/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189469/BillingService/BusinessService.json
 create mode 100644 data/as/30189469/egov-location/boundary-data.json
 create mode 100644 data/as/30189469/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189469/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189496/BillingService/BusinessService.json
 create mode 100644 data/as/30189496/egov-location/boundary-data.json
 create mode 100644 data/as/30189496/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189496/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189526/BillingService/BusinessService.json
 create mode 100644 data/as/30189526/egov-location/boundary-data.json
 create mode 100644 data/as/30189526/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189526/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189537/BillingService/BusinessService.json
 create mode 100644 data/as/30189537/egov-location/boundary-data.json
 create mode 100644 data/as/30189537/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189537/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189551/BillingService/BusinessService.json
 create mode 100644 data/as/30189551/egov-location/boundary-data.json
 create mode 100644 data/as/30189551/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189551/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189562/BillingService/BusinessService.json
 create mode 100644 data/as/30189562/egov-location/boundary-data.json
 create mode 100644 data/as/30189562/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189562/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189571/BillingService/BusinessService.json
 create mode 100644 data/as/30189571/egov-location/boundary-data.json
 create mode 100644 data/as/30189571/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189571/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189582/BillingService/BusinessService.json
 create mode 100644 data/as/30189582/egov-location/boundary-data.json
 create mode 100644 data/as/30189582/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189582/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189595/BillingService/BusinessService.json
 create mode 100644 data/as/30189595/egov-location/boundary-data.json
 create mode 100644 data/as/30189595/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189595/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30189615/BillingService/BusinessService.json
 create mode 100644 data/as/30189615/egov-location/boundary-data.json
 create mode 100644 data/as/30189615/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30189615/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191686/BillingService/BusinessService.json
 create mode 100644 data/as/30191686/egov-location/boundary-data.json
 create mode 100644 data/as/30191686/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191686/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191713/BillingService/BusinessService.json
 create mode 100644 data/as/30191713/egov-location/boundary-data.json
 create mode 100644 data/as/30191713/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191713/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191743/BillingService/BusinessService.json
 create mode 100644 data/as/30191743/egov-location/boundary-data.json
 create mode 100644 data/as/30191743/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191743/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191765/BillingService/BusinessService.json
 create mode 100644 data/as/30191765/egov-location/boundary-data.json
 create mode 100644 data/as/30191765/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191765/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191816/BillingService/BusinessService.json
 create mode 100644 data/as/30191816/egov-location/boundary-data.json
 create mode 100644 data/as/30191816/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191816/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191837/BillingService/BusinessService.json
 create mode 100644 data/as/30191837/egov-location/boundary-data.json
 create mode 100644 data/as/30191837/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191837/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191855/BillingService/BusinessService.json
 create mode 100644 data/as/30191855/egov-location/boundary-data.json
 create mode 100644 data/as/30191855/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191855/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191889/BillingService/BusinessService.json
 create mode 100644 data/as/30191889/egov-location/boundary-data.json
 create mode 100644 data/as/30191889/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191889/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191910/BillingService/BusinessService.json
 create mode 100644 data/as/30191910/egov-location/boundary-data.json
 create mode 100644 data/as/30191910/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191910/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191941/BillingService/BusinessService.json
 create mode 100644 data/as/30191941/egov-location/boundary-data.json
 create mode 100644 data/as/30191941/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191941/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30191974/BillingService/BusinessService.json
 create mode 100644 data/as/30191974/egov-location/boundary-data.json
 create mode 100644 data/as/30191974/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30191974/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30192001/BillingService/BusinessService.json
 create mode 100644 data/as/30192001/egov-location/boundary-data.json
 create mode 100644 data/as/30192001/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30192001/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30192026/BillingService/BusinessService.json
 create mode 100644 data/as/30192026/egov-location/boundary-data.json
 create mode 100644 data/as/30192026/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30192026/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30192045/BillingService/BusinessService.json
 create mode 100644 data/as/30192045/egov-location/boundary-data.json
 create mode 100644 data/as/30192045/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30192045/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30192070/BillingService/BusinessService.json
 create mode 100644 data/as/30192070/egov-location/boundary-data.json
 create mode 100644 data/as/30192070/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30192070/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30192093/BillingService/BusinessService.json
 create mode 100644 data/as/30192093/egov-location/boundary-data.json
 create mode 100644 data/as/30192093/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30192093/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30192129/BillingService/BusinessService.json
 create mode 100644 data/as/30192129/egov-location/boundary-data.json
 create mode 100644 data/as/30192129/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30192129/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30193693/BillingService/BusinessService.json
 create mode 100644 data/as/30193693/egov-location/boundary-data.json
 create mode 100644 data/as/30193693/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30193693/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30196401/BillingService/BusinessService.json
 create mode 100644 data/as/30196401/egov-location/boundary-data.json
 create mode 100644 data/as/30196401/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30196401/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30196757/BillingService/BusinessService.json
 create mode 100644 data/as/30196757/egov-location/boundary-data.json
 create mode 100644 data/as/30196757/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30196757/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30196783/BillingService/BusinessService.json
 create mode 100644 data/as/30196783/egov-location/boundary-data.json
 create mode 100644 data/as/30196783/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30196783/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30196788/BillingService/BusinessService.json
 create mode 100644 data/as/30196788/egov-location/boundary-data.json
 create mode 100644 data/as/30196788/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30196788/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30196800/BillingService/BusinessService.json
 create mode 100644 data/as/30196800/egov-location/boundary-data.json
 create mode 100644 data/as/30196800/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30196800/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30196806/BillingService/BusinessService.json
 create mode 100644 data/as/30196806/egov-location/boundary-data.json
 create mode 100644 data/as/30196806/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30196806/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30199561/BillingService/BusinessService.json
 create mode 100644 data/as/30199561/egov-location/boundary-data.json
 create mode 100644 data/as/30199561/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30199561/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30199580/BillingService/BusinessService.json
 create mode 100644 data/as/30199580/egov-location/boundary-data.json
 create mode 100644 data/as/30199580/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30199580/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30199609/BillingService/BusinessService.json
 create mode 100644 data/as/30199609/egov-location/boundary-data.json
 create mode 100644 data/as/30199609/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30199609/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30199656/BillingService/BusinessService.json
 create mode 100644 data/as/30199656/egov-location/boundary-data.json
 create mode 100644 data/as/30199656/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30199656/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200209/BillingService/BusinessService.json
 create mode 100644 data/as/30200209/egov-location/boundary-data.json
 create mode 100644 data/as/30200209/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200209/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200338/BillingService/BusinessService.json
 create mode 100644 data/as/30200338/egov-location/boundary-data.json
 create mode 100644 data/as/30200338/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200338/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200348/BillingService/BusinessService.json
 create mode 100644 data/as/30200348/egov-location/boundary-data.json
 create mode 100644 data/as/30200348/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200348/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200365/BillingService/BusinessService.json
 create mode 100644 data/as/30200365/egov-location/boundary-data.json
 create mode 100644 data/as/30200365/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200365/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200373/BillingService/BusinessService.json
 create mode 100644 data/as/30200373/egov-location/boundary-data.json
 create mode 100644 data/as/30200373/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200373/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200381/BillingService/BusinessService.json
 create mode 100644 data/as/30200381/egov-location/boundary-data.json
 create mode 100644 data/as/30200381/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200381/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200390/BillingService/BusinessService.json
 create mode 100644 data/as/30200390/egov-location/boundary-data.json
 create mode 100644 data/as/30200390/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200390/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30200395/BillingService/BusinessService.json
 create mode 100644 data/as/30200395/egov-location/boundary-data.json
 create mode 100644 data/as/30200395/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30200395/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201829/BillingService/BusinessService.json
 create mode 100644 data/as/30201829/egov-location/boundary-data.json
 create mode 100644 data/as/30201829/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201829/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201845/BillingService/BusinessService.json
 create mode 100644 data/as/30201845/egov-location/boundary-data.json
 create mode 100644 data/as/30201845/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201845/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201859/BillingService/BusinessService.json
 create mode 100644 data/as/30201859/egov-location/boundary-data.json
 create mode 100644 data/as/30201859/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201859/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201868/BillingService/BusinessService.json
 create mode 100644 data/as/30201868/egov-location/boundary-data.json
 create mode 100644 data/as/30201868/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201868/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201884/BillingService/BusinessService.json
 create mode 100644 data/as/30201884/egov-location/boundary-data.json
 create mode 100644 data/as/30201884/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201884/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201910/BillingService/BusinessService.json
 create mode 100644 data/as/30201910/egov-location/boundary-data.json
 create mode 100644 data/as/30201910/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201910/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201927/BillingService/BusinessService.json
 create mode 100644 data/as/30201927/egov-location/boundary-data.json
 create mode 100644 data/as/30201927/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201927/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201982/BillingService/BusinessService.json
 create mode 100644 data/as/30201982/egov-location/boundary-data.json
 create mode 100644 data/as/30201982/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201982/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30201998/BillingService/BusinessService.json
 create mode 100644 data/as/30201998/egov-location/boundary-data.json
 create mode 100644 data/as/30201998/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30201998/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202047/BillingService/BusinessService.json
 create mode 100644 data/as/30202047/egov-location/boundary-data.json
 create mode 100644 data/as/30202047/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202047/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202048/BillingService/BusinessService.json
 create mode 100644 data/as/30202048/egov-location/boundary-data.json
 create mode 100644 data/as/30202048/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202048/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202080/BillingService/BusinessService.json
 create mode 100644 data/as/30202080/egov-location/boundary-data.json
 create mode 100644 data/as/30202080/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202080/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202118/BillingService/BusinessService.json
 create mode 100644 data/as/30202118/egov-location/boundary-data.json
 create mode 100644 data/as/30202118/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202118/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202288/BillingService/BusinessService.json
 create mode 100644 data/as/30202288/egov-location/boundary-data.json
 create mode 100644 data/as/30202288/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202288/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202311/BillingService/BusinessService.json
 create mode 100644 data/as/30202311/egov-location/boundary-data.json
 create mode 100644 data/as/30202311/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202311/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202346/BillingService/BusinessService.json
 create mode 100644 data/as/30202346/egov-location/boundary-data.json
 create mode 100644 data/as/30202346/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202346/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202436/BillingService/BusinessService.json
 create mode 100644 data/as/30202436/egov-location/boundary-data.json
 create mode 100644 data/as/30202436/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202436/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202462/BillingService/BusinessService.json
 create mode 100644 data/as/30202462/egov-location/boundary-data.json
 create mode 100644 data/as/30202462/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202462/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202484/BillingService/BusinessService.json
 create mode 100644 data/as/30202484/egov-location/boundary-data.json
 create mode 100644 data/as/30202484/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202484/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202510/BillingService/BusinessService.json
 create mode 100644 data/as/30202510/egov-location/boundary-data.json
 create mode 100644 data/as/30202510/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202510/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202537/BillingService/BusinessService.json
 create mode 100644 data/as/30202537/egov-location/boundary-data.json
 create mode 100644 data/as/30202537/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202537/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202570/BillingService/BusinessService.json
 create mode 100644 data/as/30202570/egov-location/boundary-data.json
 create mode 100644 data/as/30202570/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202570/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202595/BillingService/BusinessService.json
 create mode 100644 data/as/30202595/egov-location/boundary-data.json
 create mode 100644 data/as/30202595/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202595/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202611/BillingService/BusinessService.json
 create mode 100644 data/as/30202611/egov-location/boundary-data.json
 create mode 100644 data/as/30202611/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202611/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202636/BillingService/BusinessService.json
 create mode 100644 data/as/30202636/egov-location/boundary-data.json
 create mode 100644 data/as/30202636/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202636/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202651/BillingService/BusinessService.json
 create mode 100644 data/as/30202651/egov-location/boundary-data.json
 create mode 100644 data/as/30202651/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202651/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202908/BillingService/BusinessService.json
 create mode 100644 data/as/30202908/egov-location/boundary-data.json
 create mode 100644 data/as/30202908/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202908/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30202964/BillingService/BusinessService.json
 create mode 100644 data/as/30202964/egov-location/boundary-data.json
 create mode 100644 data/as/30202964/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30202964/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30204586/BillingService/BusinessService.json
 create mode 100644 data/as/30204586/egov-location/boundary-data.json
 create mode 100644 data/as/30204586/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30204586/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207281/BillingService/BusinessService.json
 create mode 100644 data/as/30207281/egov-location/boundary-data.json
 create mode 100644 data/as/30207281/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207281/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207843/BillingService/BusinessService.json
 create mode 100644 data/as/30207843/egov-location/boundary-data.json
 create mode 100644 data/as/30207843/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207843/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207863/BillingService/BusinessService.json
 create mode 100644 data/as/30207863/egov-location/boundary-data.json
 create mode 100644 data/as/30207863/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207863/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207883/BillingService/BusinessService.json
 create mode 100644 data/as/30207883/egov-location/boundary-data.json
 create mode 100644 data/as/30207883/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207883/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207923/BillingService/BusinessService.json
 create mode 100644 data/as/30207923/egov-location/boundary-data.json
 create mode 100644 data/as/30207923/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207923/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207990/BillingService/BusinessService.json
 create mode 100644 data/as/30207990/egov-location/boundary-data.json
 create mode 100644 data/as/30207990/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207990/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30207996/BillingService/BusinessService.json
 create mode 100644 data/as/30207996/egov-location/boundary-data.json
 create mode 100644 data/as/30207996/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30207996/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208033/BillingService/BusinessService.json
 create mode 100644 data/as/30208033/egov-location/boundary-data.json
 create mode 100644 data/as/30208033/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208033/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208074/BillingService/BusinessService.json
 create mode 100644 data/as/30208074/egov-location/boundary-data.json
 create mode 100644 data/as/30208074/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208074/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208101/BillingService/BusinessService.json
 create mode 100644 data/as/30208101/egov-location/boundary-data.json
 create mode 100644 data/as/30208101/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208101/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208625/BillingService/BusinessService.json
 create mode 100644 data/as/30208625/egov-location/boundary-data.json
 create mode 100644 data/as/30208625/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208625/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208644/BillingService/BusinessService.json
 create mode 100644 data/as/30208644/egov-location/boundary-data.json
 create mode 100644 data/as/30208644/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208644/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208681/BillingService/BusinessService.json
 create mode 100644 data/as/30208681/egov-location/boundary-data.json
 create mode 100644 data/as/30208681/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208681/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30208803/BillingService/BusinessService.json
 create mode 100644 data/as/30208803/egov-location/boundary-data.json
 create mode 100644 data/as/30208803/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30208803/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211530/BillingService/BusinessService.json
 create mode 100644 data/as/30211530/egov-location/boundary-data.json
 create mode 100644 data/as/30211530/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211530/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211543/BillingService/BusinessService.json
 create mode 100644 data/as/30211543/egov-location/boundary-data.json
 create mode 100644 data/as/30211543/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211543/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211556/BillingService/BusinessService.json
 create mode 100644 data/as/30211556/egov-location/boundary-data.json
 create mode 100644 data/as/30211556/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211556/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211591/BillingService/BusinessService.json
 create mode 100644 data/as/30211591/egov-location/boundary-data.json
 create mode 100644 data/as/30211591/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211591/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211653/BillingService/BusinessService.json
 create mode 100644 data/as/30211653/egov-location/boundary-data.json
 create mode 100644 data/as/30211653/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211653/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211673/BillingService/BusinessService.json
 create mode 100644 data/as/30211673/egov-location/boundary-data.json
 create mode 100644 data/as/30211673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211695/BillingService/BusinessService.json
 create mode 100644 data/as/30211695/egov-location/boundary-data.json
 create mode 100644 data/as/30211695/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211695/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211715/BillingService/BusinessService.json
 create mode 100644 data/as/30211715/egov-location/boundary-data.json
 create mode 100644 data/as/30211715/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211715/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211747/BillingService/BusinessService.json
 create mode 100644 data/as/30211747/egov-location/boundary-data.json
 create mode 100644 data/as/30211747/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211747/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30211881/BillingService/BusinessService.json
 create mode 100644 data/as/30211881/egov-location/boundary-data.json
 create mode 100644 data/as/30211881/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30211881/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212673/BillingService/BusinessService.json
 create mode 100644 data/as/30212673/egov-location/boundary-data.json
 create mode 100644 data/as/30212673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212710/BillingService/BusinessService.json
 create mode 100644 data/as/30212710/egov-location/boundary-data.json
 create mode 100644 data/as/30212710/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212710/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212736/BillingService/BusinessService.json
 create mode 100644 data/as/30212736/egov-location/boundary-data.json
 create mode 100644 data/as/30212736/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212736/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212751/BillingService/BusinessService.json
 create mode 100644 data/as/30212751/egov-location/boundary-data.json
 create mode 100644 data/as/30212751/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212751/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212766/BillingService/BusinessService.json
 create mode 100644 data/as/30212766/egov-location/boundary-data.json
 create mode 100644 data/as/30212766/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212766/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212780/BillingService/BusinessService.json
 create mode 100644 data/as/30212780/egov-location/boundary-data.json
 create mode 100644 data/as/30212780/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212780/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212817/BillingService/BusinessService.json
 create mode 100644 data/as/30212817/egov-location/boundary-data.json
 create mode 100644 data/as/30212817/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212817/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212830/BillingService/BusinessService.json
 create mode 100644 data/as/30212830/egov-location/boundary-data.json
 create mode 100644 data/as/30212830/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212830/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212847/BillingService/BusinessService.json
 create mode 100644 data/as/30212847/egov-location/boundary-data.json
 create mode 100644 data/as/30212847/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212847/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212906/BillingService/BusinessService.json
 create mode 100644 data/as/30212906/egov-location/boundary-data.json
 create mode 100644 data/as/30212906/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212906/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212926/BillingService/BusinessService.json
 create mode 100644 data/as/30212926/egov-location/boundary-data.json
 create mode 100644 data/as/30212926/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212926/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212942/BillingService/BusinessService.json
 create mode 100644 data/as/30212942/egov-location/boundary-data.json
 create mode 100644 data/as/30212942/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212942/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212948/BillingService/BusinessService.json
 create mode 100644 data/as/30212948/egov-location/boundary-data.json
 create mode 100644 data/as/30212948/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212948/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212952/BillingService/BusinessService.json
 create mode 100644 data/as/30212952/egov-location/boundary-data.json
 create mode 100644 data/as/30212952/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212952/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212973/BillingService/BusinessService.json
 create mode 100644 data/as/30212973/egov-location/boundary-data.json
 create mode 100644 data/as/30212973/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212973/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212983/BillingService/BusinessService.json
 create mode 100644 data/as/30212983/egov-location/boundary-data.json
 create mode 100644 data/as/30212983/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212983/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30212996/BillingService/BusinessService.json
 create mode 100644 data/as/30212996/egov-location/boundary-data.json
 create mode 100644 data/as/30212996/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30212996/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213000/BillingService/BusinessService.json
 create mode 100644 data/as/30213000/egov-location/boundary-data.json
 create mode 100644 data/as/30213000/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213000/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213013/BillingService/BusinessService.json
 create mode 100644 data/as/30213013/egov-location/boundary-data.json
 create mode 100644 data/as/30213013/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213013/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213023/BillingService/BusinessService.json
 create mode 100644 data/as/30213023/egov-location/boundary-data.json
 create mode 100644 data/as/30213023/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213023/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213053/BillingService/BusinessService.json
 create mode 100644 data/as/30213053/egov-location/boundary-data.json
 create mode 100644 data/as/30213053/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213053/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213057/BillingService/BusinessService.json
 create mode 100644 data/as/30213057/egov-location/boundary-data.json
 create mode 100644 data/as/30213057/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213057/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213059/BillingService/BusinessService.json
 create mode 100644 data/as/30213059/egov-location/boundary-data.json
 create mode 100644 data/as/30213059/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213059/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213066/BillingService/BusinessService.json
 create mode 100644 data/as/30213066/egov-location/boundary-data.json
 create mode 100644 data/as/30213066/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213066/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213067/BillingService/BusinessService.json
 create mode 100644 data/as/30213067/egov-location/boundary-data.json
 create mode 100644 data/as/30213067/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213067/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213075/BillingService/BusinessService.json
 create mode 100644 data/as/30213075/egov-location/boundary-data.json
 create mode 100644 data/as/30213075/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213075/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213079/BillingService/BusinessService.json
 create mode 100644 data/as/30213079/egov-location/boundary-data.json
 create mode 100644 data/as/30213079/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213079/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213084/BillingService/BusinessService.json
 create mode 100644 data/as/30213084/egov-location/boundary-data.json
 create mode 100644 data/as/30213084/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213084/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213135/BillingService/BusinessService.json
 create mode 100644 data/as/30213135/egov-location/boundary-data.json
 create mode 100644 data/as/30213135/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213135/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213136/BillingService/BusinessService.json
 create mode 100644 data/as/30213136/egov-location/boundary-data.json
 create mode 100644 data/as/30213136/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213136/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213138/BillingService/BusinessService.json
 create mode 100644 data/as/30213138/egov-location/boundary-data.json
 create mode 100644 data/as/30213138/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213138/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213140/BillingService/BusinessService.json
 create mode 100644 data/as/30213140/egov-location/boundary-data.json
 create mode 100644 data/as/30213140/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213140/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213143/BillingService/BusinessService.json
 create mode 100644 data/as/30213143/egov-location/boundary-data.json
 create mode 100644 data/as/30213143/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213143/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213146/BillingService/BusinessService.json
 create mode 100644 data/as/30213146/egov-location/boundary-data.json
 create mode 100644 data/as/30213146/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213146/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213148/BillingService/BusinessService.json
 create mode 100644 data/as/30213148/egov-location/boundary-data.json
 create mode 100644 data/as/30213148/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213148/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213150/BillingService/BusinessService.json
 create mode 100644 data/as/30213150/egov-location/boundary-data.json
 create mode 100644 data/as/30213150/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213150/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213200/BillingService/BusinessService.json
 create mode 100644 data/as/30213200/egov-location/boundary-data.json
 create mode 100644 data/as/30213200/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213200/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213202/BillingService/BusinessService.json
 create mode 100644 data/as/30213202/egov-location/boundary-data.json
 create mode 100644 data/as/30213202/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213202/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213205/BillingService/BusinessService.json
 create mode 100644 data/as/30213205/egov-location/boundary-data.json
 create mode 100644 data/as/30213205/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213205/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213208/BillingService/BusinessService.json
 create mode 100644 data/as/30213208/egov-location/boundary-data.json
 create mode 100644 data/as/30213208/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213208/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213210/BillingService/BusinessService.json
 create mode 100644 data/as/30213210/egov-location/boundary-data.json
 create mode 100644 data/as/30213210/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213210/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213215/BillingService/BusinessService.json
 create mode 100644 data/as/30213215/egov-location/boundary-data.json
 create mode 100644 data/as/30213215/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213215/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213219/BillingService/BusinessService.json
 create mode 100644 data/as/30213219/egov-location/boundary-data.json
 create mode 100644 data/as/30213219/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213219/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213224/BillingService/BusinessService.json
 create mode 100644 data/as/30213224/egov-location/boundary-data.json
 create mode 100644 data/as/30213224/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213224/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213489/BillingService/BusinessService.json
 create mode 100644 data/as/30213489/egov-location/boundary-data.json
 create mode 100644 data/as/30213489/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213489/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213521/BillingService/BusinessService.json
 create mode 100644 data/as/30213521/egov-location/boundary-data.json
 create mode 100644 data/as/30213521/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213521/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213556/BillingService/BusinessService.json
 create mode 100644 data/as/30213556/egov-location/boundary-data.json
 create mode 100644 data/as/30213556/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213556/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213569/BillingService/BusinessService.json
 create mode 100644 data/as/30213569/egov-location/boundary-data.json
 create mode 100644 data/as/30213569/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213569/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213581/BillingService/BusinessService.json
 create mode 100644 data/as/30213581/egov-location/boundary-data.json
 create mode 100644 data/as/30213581/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213581/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213587/BillingService/BusinessService.json
 create mode 100644 data/as/30213587/egov-location/boundary-data.json
 create mode 100644 data/as/30213587/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213587/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213598/BillingService/BusinessService.json
 create mode 100644 data/as/30213598/egov-location/boundary-data.json
 create mode 100644 data/as/30213598/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213598/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213603/BillingService/BusinessService.json
 create mode 100644 data/as/30213603/egov-location/boundary-data.json
 create mode 100644 data/as/30213603/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213603/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213638/BillingService/BusinessService.json
 create mode 100644 data/as/30213638/egov-location/boundary-data.json
 create mode 100644 data/as/30213638/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213638/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213716/BillingService/BusinessService.json
 create mode 100644 data/as/30213716/egov-location/boundary-data.json
 create mode 100644 data/as/30213716/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213716/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213729/BillingService/BusinessService.json
 create mode 100644 data/as/30213729/egov-location/boundary-data.json
 create mode 100644 data/as/30213729/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213729/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213788/BillingService/BusinessService.json
 create mode 100644 data/as/30213788/egov-location/boundary-data.json
 create mode 100644 data/as/30213788/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213788/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213798/BillingService/BusinessService.json
 create mode 100644 data/as/30213798/egov-location/boundary-data.json
 create mode 100644 data/as/30213798/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213798/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213839/BillingService/BusinessService.json
 create mode 100644 data/as/30213839/egov-location/boundary-data.json
 create mode 100644 data/as/30213839/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213839/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213850/BillingService/BusinessService.json
 create mode 100644 data/as/30213850/egov-location/boundary-data.json
 create mode 100644 data/as/30213850/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213850/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213862/BillingService/BusinessService.json
 create mode 100644 data/as/30213862/egov-location/boundary-data.json
 create mode 100644 data/as/30213862/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213862/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213877/BillingService/BusinessService.json
 create mode 100644 data/as/30213877/egov-location/boundary-data.json
 create mode 100644 data/as/30213877/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213877/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213916/BillingService/BusinessService.json
 create mode 100644 data/as/30213916/egov-location/boundary-data.json
 create mode 100644 data/as/30213916/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213916/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30213935/BillingService/BusinessService.json
 create mode 100644 data/as/30213935/egov-location/boundary-data.json
 create mode 100644 data/as/30213935/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30213935/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214038/BillingService/BusinessService.json
 create mode 100644 data/as/30214038/egov-location/boundary-data.json
 create mode 100644 data/as/30214038/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214038/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214044/BillingService/BusinessService.json
 create mode 100644 data/as/30214044/egov-location/boundary-data.json
 create mode 100644 data/as/30214044/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214044/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214051/BillingService/BusinessService.json
 create mode 100644 data/as/30214051/egov-location/boundary-data.json
 create mode 100644 data/as/30214051/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214051/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214059/BillingService/BusinessService.json
 create mode 100644 data/as/30214059/egov-location/boundary-data.json
 create mode 100644 data/as/30214059/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214059/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214062/BillingService/BusinessService.json
 create mode 100644 data/as/30214062/egov-location/boundary-data.json
 create mode 100644 data/as/30214062/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214062/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214069/BillingService/BusinessService.json
 create mode 100644 data/as/30214069/egov-location/boundary-data.json
 create mode 100644 data/as/30214069/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214069/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214095/BillingService/BusinessService.json
 create mode 100644 data/as/30214095/egov-location/boundary-data.json
 create mode 100644 data/as/30214095/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214095/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214145/BillingService/BusinessService.json
 create mode 100644 data/as/30214145/egov-location/boundary-data.json
 create mode 100644 data/as/30214145/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214145/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214148/BillingService/BusinessService.json
 create mode 100644 data/as/30214148/egov-location/boundary-data.json
 create mode 100644 data/as/30214148/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214148/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214152/BillingService/BusinessService.json
 create mode 100644 data/as/30214152/egov-location/boundary-data.json
 create mode 100644 data/as/30214152/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214152/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214157/BillingService/BusinessService.json
 create mode 100644 data/as/30214157/egov-location/boundary-data.json
 create mode 100644 data/as/30214157/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214157/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214168/BillingService/BusinessService.json
 create mode 100644 data/as/30214168/egov-location/boundary-data.json
 create mode 100644 data/as/30214168/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214168/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214174/BillingService/BusinessService.json
 create mode 100644 data/as/30214174/egov-location/boundary-data.json
 create mode 100644 data/as/30214174/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214174/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214298/BillingService/BusinessService.json
 create mode 100644 data/as/30214298/egov-location/boundary-data.json
 create mode 100644 data/as/30214298/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214298/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214330/BillingService/BusinessService.json
 create mode 100644 data/as/30214330/egov-location/boundary-data.json
 create mode 100644 data/as/30214330/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214330/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214334/BillingService/BusinessService.json
 create mode 100644 data/as/30214334/egov-location/boundary-data.json
 create mode 100644 data/as/30214334/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214334/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214398/BillingService/BusinessService.json
 create mode 100644 data/as/30214398/egov-location/boundary-data.json
 create mode 100644 data/as/30214398/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214398/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214413/BillingService/BusinessService.json
 create mode 100644 data/as/30214413/egov-location/boundary-data.json
 create mode 100644 data/as/30214413/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214413/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214437/BillingService/BusinessService.json
 create mode 100644 data/as/30214437/egov-location/boundary-data.json
 create mode 100644 data/as/30214437/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214437/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214444/BillingService/BusinessService.json
 create mode 100644 data/as/30214444/egov-location/boundary-data.json
 create mode 100644 data/as/30214444/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214444/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214454/BillingService/BusinessService.json
 create mode 100644 data/as/30214454/egov-location/boundary-data.json
 create mode 100644 data/as/30214454/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214454/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214478/BillingService/BusinessService.json
 create mode 100644 data/as/30214478/egov-location/boundary-data.json
 create mode 100644 data/as/30214478/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214478/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214502/BillingService/BusinessService.json
 create mode 100644 data/as/30214502/egov-location/boundary-data.json
 create mode 100644 data/as/30214502/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214502/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214524/BillingService/BusinessService.json
 create mode 100644 data/as/30214524/egov-location/boundary-data.json
 create mode 100644 data/as/30214524/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214524/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214533/BillingService/BusinessService.json
 create mode 100644 data/as/30214533/egov-location/boundary-data.json
 create mode 100644 data/as/30214533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214551/BillingService/BusinessService.json
 create mode 100644 data/as/30214551/egov-location/boundary-data.json
 create mode 100644 data/as/30214551/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214551/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214559/BillingService/BusinessService.json
 create mode 100644 data/as/30214559/egov-location/boundary-data.json
 create mode 100644 data/as/30214559/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214559/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214579/BillingService/BusinessService.json
 create mode 100644 data/as/30214579/egov-location/boundary-data.json
 create mode 100644 data/as/30214579/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214579/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214623/BillingService/BusinessService.json
 create mode 100644 data/as/30214623/egov-location/boundary-data.json
 create mode 100644 data/as/30214623/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214623/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214632/BillingService/BusinessService.json
 create mode 100644 data/as/30214632/egov-location/boundary-data.json
 create mode 100644 data/as/30214632/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214632/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214635/BillingService/BusinessService.json
 create mode 100644 data/as/30214635/egov-location/boundary-data.json
 create mode 100644 data/as/30214635/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214635/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214651/BillingService/BusinessService.json
 create mode 100644 data/as/30214651/egov-location/boundary-data.json
 create mode 100644 data/as/30214651/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214651/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214686/BillingService/BusinessService.json
 create mode 100644 data/as/30214686/egov-location/boundary-data.json
 create mode 100644 data/as/30214686/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214686/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214704/BillingService/BusinessService.json
 create mode 100644 data/as/30214704/egov-location/boundary-data.json
 create mode 100644 data/as/30214704/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214704/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30214731/BillingService/BusinessService.json
 create mode 100644 data/as/30214731/egov-location/boundary-data.json
 create mode 100644 data/as/30214731/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30214731/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30215695/BillingService/BusinessService.json
 create mode 100644 data/as/30215695/egov-location/boundary-data.json
 create mode 100644 data/as/30215695/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30215695/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30215708/BillingService/BusinessService.json
 create mode 100644 data/as/30215708/egov-location/boundary-data.json
 create mode 100644 data/as/30215708/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30215708/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216018/BillingService/BusinessService.json
 create mode 100644 data/as/30216018/egov-location/boundary-data.json
 create mode 100644 data/as/30216018/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216018/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216021/BillingService/BusinessService.json
 create mode 100644 data/as/30216021/egov-location/boundary-data.json
 create mode 100644 data/as/30216021/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216021/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216024/BillingService/BusinessService.json
 create mode 100644 data/as/30216024/egov-location/boundary-data.json
 create mode 100644 data/as/30216024/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216024/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216027/BillingService/BusinessService.json
 create mode 100644 data/as/30216027/egov-location/boundary-data.json
 create mode 100644 data/as/30216027/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216027/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216030/BillingService/BusinessService.json
 create mode 100644 data/as/30216030/egov-location/boundary-data.json
 create mode 100644 data/as/30216030/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216030/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216039/BillingService/BusinessService.json
 create mode 100644 data/as/30216039/egov-location/boundary-data.json
 create mode 100644 data/as/30216039/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216039/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216045/BillingService/BusinessService.json
 create mode 100644 data/as/30216045/egov-location/boundary-data.json
 create mode 100644 data/as/30216045/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216045/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216049/BillingService/BusinessService.json
 create mode 100644 data/as/30216049/egov-location/boundary-data.json
 create mode 100644 data/as/30216049/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216049/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216051/BillingService/BusinessService.json
 create mode 100644 data/as/30216051/egov-location/boundary-data.json
 create mode 100644 data/as/30216051/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216051/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216053/BillingService/BusinessService.json
 create mode 100644 data/as/30216053/egov-location/boundary-data.json
 create mode 100644 data/as/30216053/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216053/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216054/BillingService/BusinessService.json
 create mode 100644 data/as/30216054/egov-location/boundary-data.json
 create mode 100644 data/as/30216054/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216054/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216055/BillingService/BusinessService.json
 create mode 100644 data/as/30216055/egov-location/boundary-data.json
 create mode 100644 data/as/30216055/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216055/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216056/BillingService/BusinessService.json
 create mode 100644 data/as/30216056/egov-location/boundary-data.json
 create mode 100644 data/as/30216056/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216056/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216057/BillingService/BusinessService.json
 create mode 100644 data/as/30216057/egov-location/boundary-data.json
 create mode 100644 data/as/30216057/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216057/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216058/BillingService/BusinessService.json
 create mode 100644 data/as/30216058/egov-location/boundary-data.json
 create mode 100644 data/as/30216058/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216058/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216059/BillingService/BusinessService.json
 create mode 100644 data/as/30216059/egov-location/boundary-data.json
 create mode 100644 data/as/30216059/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216059/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216061/BillingService/BusinessService.json
 create mode 100644 data/as/30216061/egov-location/boundary-data.json
 create mode 100644 data/as/30216061/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216061/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216062/BillingService/BusinessService.json
 create mode 100644 data/as/30216062/egov-location/boundary-data.json
 create mode 100644 data/as/30216062/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216062/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216214/BillingService/BusinessService.json
 create mode 100644 data/as/30216214/egov-location/boundary-data.json
 create mode 100644 data/as/30216214/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216214/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216258/BillingService/BusinessService.json
 create mode 100644 data/as/30216258/egov-location/boundary-data.json
 create mode 100644 data/as/30216258/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216258/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216269/BillingService/BusinessService.json
 create mode 100644 data/as/30216269/egov-location/boundary-data.json
 create mode 100644 data/as/30216269/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216269/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216295/BillingService/BusinessService.json
 create mode 100644 data/as/30216295/egov-location/boundary-data.json
 create mode 100644 data/as/30216295/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216295/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216302/BillingService/BusinessService.json
 create mode 100644 data/as/30216302/egov-location/boundary-data.json
 create mode 100644 data/as/30216302/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216302/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216319/BillingService/BusinessService.json
 create mode 100644 data/as/30216319/egov-location/boundary-data.json
 create mode 100644 data/as/30216319/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216319/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216336/BillingService/BusinessService.json
 create mode 100644 data/as/30216336/egov-location/boundary-data.json
 create mode 100644 data/as/30216336/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216336/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216372/BillingService/BusinessService.json
 create mode 100644 data/as/30216372/egov-location/boundary-data.json
 create mode 100644 data/as/30216372/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216372/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216378/BillingService/BusinessService.json
 create mode 100644 data/as/30216378/egov-location/boundary-data.json
 create mode 100644 data/as/30216378/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216378/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216401/BillingService/BusinessService.json
 create mode 100644 data/as/30216401/egov-location/boundary-data.json
 create mode 100644 data/as/30216401/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216401/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216427/BillingService/BusinessService.json
 create mode 100644 data/as/30216427/egov-location/boundary-data.json
 create mode 100644 data/as/30216427/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216427/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216449/BillingService/BusinessService.json
 create mode 100644 data/as/30216449/egov-location/boundary-data.json
 create mode 100644 data/as/30216449/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216449/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216472/BillingService/BusinessService.json
 create mode 100644 data/as/30216472/egov-location/boundary-data.json
 create mode 100644 data/as/30216472/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216472/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216505/BillingService/BusinessService.json
 create mode 100644 data/as/30216505/egov-location/boundary-data.json
 create mode 100644 data/as/30216505/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216505/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216577/BillingService/BusinessService.json
 create mode 100644 data/as/30216577/egov-location/boundary-data.json
 create mode 100644 data/as/30216577/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216577/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216676/BillingService/BusinessService.json
 create mode 100644 data/as/30216676/egov-location/boundary-data.json
 create mode 100644 data/as/30216676/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216676/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216841/BillingService/BusinessService.json
 create mode 100644 data/as/30216841/egov-location/boundary-data.json
 create mode 100644 data/as/30216841/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216841/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216849/BillingService/BusinessService.json
 create mode 100644 data/as/30216849/egov-location/boundary-data.json
 create mode 100644 data/as/30216849/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216849/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216928/BillingService/BusinessService.json
 create mode 100644 data/as/30216928/egov-location/boundary-data.json
 create mode 100644 data/as/30216928/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216928/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216939/BillingService/BusinessService.json
 create mode 100644 data/as/30216939/egov-location/boundary-data.json
 create mode 100644 data/as/30216939/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216939/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30216955/BillingService/BusinessService.json
 create mode 100644 data/as/30216955/egov-location/boundary-data.json
 create mode 100644 data/as/30216955/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30216955/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30217247/BillingService/BusinessService.json
 create mode 100644 data/as/30217247/egov-location/boundary-data.json
 create mode 100644 data/as/30217247/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30217247/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30217255/BillingService/BusinessService.json
 create mode 100644 data/as/30217255/egov-location/boundary-data.json
 create mode 100644 data/as/30217255/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30217255/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30217976/BillingService/BusinessService.json
 create mode 100644 data/as/30217976/egov-location/boundary-data.json
 create mode 100644 data/as/30217976/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30217976/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218422/BillingService/BusinessService.json
 create mode 100644 data/as/30218422/egov-location/boundary-data.json
 create mode 100644 data/as/30218422/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218422/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218426/BillingService/BusinessService.json
 create mode 100644 data/as/30218426/egov-location/boundary-data.json
 create mode 100644 data/as/30218426/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218426/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218431/BillingService/BusinessService.json
 create mode 100644 data/as/30218431/egov-location/boundary-data.json
 create mode 100644 data/as/30218431/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218431/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218437/BillingService/BusinessService.json
 create mode 100644 data/as/30218437/egov-location/boundary-data.json
 create mode 100644 data/as/30218437/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218437/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218442/BillingService/BusinessService.json
 create mode 100644 data/as/30218442/egov-location/boundary-data.json
 create mode 100644 data/as/30218442/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218442/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218453/BillingService/BusinessService.json
 create mode 100644 data/as/30218453/egov-location/boundary-data.json
 create mode 100644 data/as/30218453/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218453/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218465/BillingService/BusinessService.json
 create mode 100644 data/as/30218465/egov-location/boundary-data.json
 create mode 100644 data/as/30218465/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218465/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218467/BillingService/BusinessService.json
 create mode 100644 data/as/30218467/egov-location/boundary-data.json
 create mode 100644 data/as/30218467/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218467/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218469/BillingService/BusinessService.json
 create mode 100644 data/as/30218469/egov-location/boundary-data.json
 create mode 100644 data/as/30218469/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218469/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218658/BillingService/BusinessService.json
 create mode 100644 data/as/30218658/egov-location/boundary-data.json
 create mode 100644 data/as/30218658/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218658/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218660/BillingService/BusinessService.json
 create mode 100644 data/as/30218660/egov-location/boundary-data.json
 create mode 100644 data/as/30218660/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218660/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218662/BillingService/BusinessService.json
 create mode 100644 data/as/30218662/egov-location/boundary-data.json
 create mode 100644 data/as/30218662/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218662/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218664/BillingService/BusinessService.json
 create mode 100644 data/as/30218664/egov-location/boundary-data.json
 create mode 100644 data/as/30218664/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218664/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218673/BillingService/BusinessService.json
 create mode 100644 data/as/30218673/egov-location/boundary-data.json
 create mode 100644 data/as/30218673/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218673/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218675/BillingService/BusinessService.json
 create mode 100644 data/as/30218675/egov-location/boundary-data.json
 create mode 100644 data/as/30218675/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218675/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218682/BillingService/BusinessService.json
 create mode 100644 data/as/30218682/egov-location/boundary-data.json
 create mode 100644 data/as/30218682/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218682/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218684/BillingService/BusinessService.json
 create mode 100644 data/as/30218684/egov-location/boundary-data.json
 create mode 100644 data/as/30218684/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218684/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218703/BillingService/BusinessService.json
 create mode 100644 data/as/30218703/egov-location/boundary-data.json
 create mode 100644 data/as/30218703/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218703/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218711/BillingService/BusinessService.json
 create mode 100644 data/as/30218711/egov-location/boundary-data.json
 create mode 100644 data/as/30218711/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218711/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218717/BillingService/BusinessService.json
 create mode 100644 data/as/30218717/egov-location/boundary-data.json
 create mode 100644 data/as/30218717/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218717/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218718/BillingService/BusinessService.json
 create mode 100644 data/as/30218718/egov-location/boundary-data.json
 create mode 100644 data/as/30218718/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218718/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218719/BillingService/BusinessService.json
 create mode 100644 data/as/30218719/egov-location/boundary-data.json
 create mode 100644 data/as/30218719/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218719/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218721/BillingService/BusinessService.json
 create mode 100644 data/as/30218721/egov-location/boundary-data.json
 create mode 100644 data/as/30218721/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218721/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218722/BillingService/BusinessService.json
 create mode 100644 data/as/30218722/egov-location/boundary-data.json
 create mode 100644 data/as/30218722/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218722/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218724/BillingService/BusinessService.json
 create mode 100644 data/as/30218724/egov-location/boundary-data.json
 create mode 100644 data/as/30218724/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218724/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218726/BillingService/BusinessService.json
 create mode 100644 data/as/30218726/egov-location/boundary-data.json
 create mode 100644 data/as/30218726/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218726/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218728/BillingService/BusinessService.json
 create mode 100644 data/as/30218728/egov-location/boundary-data.json
 create mode 100644 data/as/30218728/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218728/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218731/BillingService/BusinessService.json
 create mode 100644 data/as/30218731/egov-location/boundary-data.json
 create mode 100644 data/as/30218731/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218731/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218732/BillingService/BusinessService.json
 create mode 100644 data/as/30218732/egov-location/boundary-data.json
 create mode 100644 data/as/30218732/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218732/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218733/BillingService/BusinessService.json
 create mode 100644 data/as/30218733/egov-location/boundary-data.json
 create mode 100644 data/as/30218733/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218733/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218734/BillingService/BusinessService.json
 create mode 100644 data/as/30218734/egov-location/boundary-data.json
 create mode 100644 data/as/30218734/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218734/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218735/BillingService/BusinessService.json
 create mode 100644 data/as/30218735/egov-location/boundary-data.json
 create mode 100644 data/as/30218735/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218735/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218736/BillingService/BusinessService.json
 create mode 100644 data/as/30218736/egov-location/boundary-data.json
 create mode 100644 data/as/30218736/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218736/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218737/BillingService/BusinessService.json
 create mode 100644 data/as/30218737/egov-location/boundary-data.json
 create mode 100644 data/as/30218737/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218737/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218738/BillingService/BusinessService.json
 create mode 100644 data/as/30218738/egov-location/boundary-data.json
 create mode 100644 data/as/30218738/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218738/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218739/BillingService/BusinessService.json
 create mode 100644 data/as/30218739/egov-location/boundary-data.json
 create mode 100644 data/as/30218739/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218739/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218740/BillingService/BusinessService.json
 create mode 100644 data/as/30218740/egov-location/boundary-data.json
 create mode 100644 data/as/30218740/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218740/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218741/BillingService/BusinessService.json
 create mode 100644 data/as/30218741/egov-location/boundary-data.json
 create mode 100644 data/as/30218741/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218741/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218742/BillingService/BusinessService.json
 create mode 100644 data/as/30218742/egov-location/boundary-data.json
 create mode 100644 data/as/30218742/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218742/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218743/BillingService/BusinessService.json
 create mode 100644 data/as/30218743/egov-location/boundary-data.json
 create mode 100644 data/as/30218743/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218743/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218744/BillingService/BusinessService.json
 create mode 100644 data/as/30218744/egov-location/boundary-data.json
 create mode 100644 data/as/30218744/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218744/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218745/BillingService/BusinessService.json
 create mode 100644 data/as/30218745/egov-location/boundary-data.json
 create mode 100644 data/as/30218745/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218745/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218812/BillingService/BusinessService.json
 create mode 100644 data/as/30218812/egov-location/boundary-data.json
 create mode 100644 data/as/30218812/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218812/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218889/BillingService/BusinessService.json
 create mode 100644 data/as/30218889/egov-location/boundary-data.json
 create mode 100644 data/as/30218889/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218889/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30218974/BillingService/BusinessService.json
 create mode 100644 data/as/30218974/egov-location/boundary-data.json
 create mode 100644 data/as/30218974/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30218974/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219042/BillingService/BusinessService.json
 create mode 100644 data/as/30219042/egov-location/boundary-data.json
 create mode 100644 data/as/30219042/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219042/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/30181910/BillingService/BusinessService.json b/data/as/30181910/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b7f94e55e8
--- /dev/null
+++ b/data/as/30181910/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181910",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181910/egov-location/boundary-data.json b/data/as/30181910/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c4601ecb17
--- /dev/null
+++ b/data/as/30181910/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181910",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAGAON PWSS (NEW)",
+                "localname": "NAYAGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAGAON PWSS (NEW)",
+                        "localname": "NAYAGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAGAON PWSS (NEW)",
+                "localname": "NAYAGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAGAON PWSS (NEW)",
+                        "localname": "NAYAGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181910/ws-services-calculation/Penalty.json b/data/as/30181910/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eec55e9e90
--- /dev/null
+++ b/data/as/30181910/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181910",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181910/ws-services-calculation/WCBillingSlab.json b/data/as/30181910/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2cdf4b4080
--- /dev/null
+++ b/data/as/30181910/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181910",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181935/BillingService/BusinessService.json b/data/as/30181935/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a1d7aaf4aa
--- /dev/null
+++ b/data/as/30181935/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181935",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181935/egov-location/boundary-data.json b/data/as/30181935/egov-location/boundary-data.json
new file mode 100644
index 0000000000..23bdfb0b78
--- /dev/null
+++ b/data/as/30181935/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181935",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KESHORIDOBI PT-I PWSS (NEW)",
+                "localname": "KESHORIDOBI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KESHORIDOBI PT-I PWSS (NEW)",
+                        "localname": "KESHORIDOBI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KESHORIDOBI PT-I PWSS (NEW)",
+                "localname": "KESHORIDOBI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KESHORIDOBI PT-I PWSS (NEW)",
+                        "localname": "KESHORIDOBI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181935/ws-services-calculation/Penalty.json b/data/as/30181935/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e426d75a23
--- /dev/null
+++ b/data/as/30181935/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181935",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181935/ws-services-calculation/WCBillingSlab.json b/data/as/30181935/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..456b407c27
--- /dev/null
+++ b/data/as/30181935/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181935",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181958/BillingService/BusinessService.json b/data/as/30181958/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d51cf82a7e
--- /dev/null
+++ b/data/as/30181958/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181958",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181958/egov-location/boundary-data.json b/data/as/30181958/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9d815d6dcb
--- /dev/null
+++ b/data/as/30181958/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181958",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILGHAGARI PATHAR PWSS",
+                "localname": "SILGHAGARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181958",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILGHAGARI PATHAR PWSS",
+                        "localname": "SILGHAGARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILGHAGARI PATHAR PWSS",
+                "localname": "SILGHAGARI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181958",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILGHAGARI PATHAR PWSS",
+                        "localname": "SILGHAGARI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181958/ws-services-calculation/Penalty.json b/data/as/30181958/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7513136037
--- /dev/null
+++ b/data/as/30181958/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181958",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181958/ws-services-calculation/WCBillingSlab.json b/data/as/30181958/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a0e54381c
--- /dev/null
+++ b/data/as/30181958/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181958",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181970/BillingService/BusinessService.json b/data/as/30181970/BillingService/BusinessService.json
new file mode 100644
index 0000000000..03086bf318
--- /dev/null
+++ b/data/as/30181970/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30181970",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181970/egov-location/boundary-data.json b/data/as/30181970/egov-location/boundary-data.json
new file mode 100644
index 0000000000..605acba998
--- /dev/null
+++ b/data/as/30181970/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30181970",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                "localname": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181970",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                        "localname": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                "localname": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30181970",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                        "localname": "JOLDHAPARA (MESSELKHOWA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181970/ws-services-calculation/Penalty.json b/data/as/30181970/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..051182a337
--- /dev/null
+++ b/data/as/30181970/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30181970",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30181970/ws-services-calculation/WCBillingSlab.json b/data/as/30181970/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..840d9a6a40
--- /dev/null
+++ b/data/as/30181970/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30181970",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182020/BillingService/BusinessService.json b/data/as/30182020/BillingService/BusinessService.json
new file mode 100644
index 0000000000..526292a9dd
--- /dev/null
+++ b/data/as/30182020/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182020",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182020/egov-location/boundary-data.json b/data/as/30182020/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f1d861581
--- /dev/null
+++ b/data/as/30182020/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182020",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALOK PWSS (NEW)",
+                "localname": "DALOK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALOK PWSS (NEW)",
+                        "localname": "DALOK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALOK PWSS (NEW)",
+                "localname": "DALOK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182020",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALOK PWSS (NEW)",
+                        "localname": "DALOK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182020/ws-services-calculation/Penalty.json b/data/as/30182020/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..497c9b8e1e
--- /dev/null
+++ b/data/as/30182020/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182020",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182020/ws-services-calculation/WCBillingSlab.json b/data/as/30182020/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cd61d16e48
--- /dev/null
+++ b/data/as/30182020/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182020",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182059/BillingService/BusinessService.json b/data/as/30182059/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f1ea0b86e6
--- /dev/null
+++ b/data/as/30182059/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182059",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182059/egov-location/boundary-data.json b/data/as/30182059/egov-location/boundary-data.json
new file mode 100644
index 0000000000..812b8b60af
--- /dev/null
+++ b/data/as/30182059/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182059",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAT BAINI PWSS (NEW)",
+                "localname": "SAT BAINI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAT BAINI PWSS (NEW)",
+                        "localname": "SAT BAINI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAT BAINI PWSS (NEW)",
+                "localname": "SAT BAINI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAT BAINI PWSS (NEW)",
+                        "localname": "SAT BAINI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182059/ws-services-calculation/Penalty.json b/data/as/30182059/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8fef8ad05c
--- /dev/null
+++ b/data/as/30182059/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182059",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182059/ws-services-calculation/WCBillingSlab.json b/data/as/30182059/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0101843ee4
--- /dev/null
+++ b/data/as/30182059/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182059",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182076/BillingService/BusinessService.json b/data/as/30182076/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a33ea7de88
--- /dev/null
+++ b/data/as/30182076/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182076",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182076/egov-location/boundary-data.json b/data/as/30182076/egov-location/boundary-data.json
new file mode 100644
index 0000000000..078c1d0e8e
--- /dev/null
+++ b/data/as/30182076/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182076",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS (NEW)",
+                "localname": "SALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182076",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS (NEW)",
+                        "localname": "SALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SALPARA PWSS (NEW)",
+                "localname": "SALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182076",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SALPARA PWSS (NEW)",
+                        "localname": "SALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182076/ws-services-calculation/Penalty.json b/data/as/30182076/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e4af222756
--- /dev/null
+++ b/data/as/30182076/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182076",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182076/ws-services-calculation/WCBillingSlab.json b/data/as/30182076/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02d826f3e2
--- /dev/null
+++ b/data/as/30182076/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182076",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182096/BillingService/BusinessService.json b/data/as/30182096/BillingService/BusinessService.json
new file mode 100644
index 0000000000..753b09819f
--- /dev/null
+++ b/data/as/30182096/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182096",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182096/egov-location/boundary-data.json b/data/as/30182096/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b469721e16
--- /dev/null
+++ b/data/as/30182096/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182096",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHANGKHAL PWSS (NEW)",
+                "localname": "KHANGKHAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHANGKHAL PWSS (NEW)",
+                        "localname": "KHANGKHAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHANGKHAL PWSS (NEW)",
+                "localname": "KHANGKHAL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182096",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHANGKHAL PWSS (NEW)",
+                        "localname": "KHANGKHAL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182096/ws-services-calculation/Penalty.json b/data/as/30182096/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f2fd796cf5
--- /dev/null
+++ b/data/as/30182096/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182096",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182096/ws-services-calculation/WCBillingSlab.json b/data/as/30182096/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6271d6abaa
--- /dev/null
+++ b/data/as/30182096/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182096",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182115/BillingService/BusinessService.json b/data/as/30182115/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ee4ea7fede
--- /dev/null
+++ b/data/as/30182115/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182115",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182115/egov-location/boundary-data.json b/data/as/30182115/egov-location/boundary-data.json
new file mode 100644
index 0000000000..29b53d0eff
--- /dev/null
+++ b/data/as/30182115/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182115",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARVITA (MANIKPUR) PWSS (NEW)",
+                "localname": "BARVITA (MANIKPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARVITA (MANIKPUR) PWSS (NEW)",
+                        "localname": "BARVITA (MANIKPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARVITA (MANIKPUR) PWSS (NEW)",
+                "localname": "BARVITA (MANIKPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARVITA (MANIKPUR) PWSS (NEW)",
+                        "localname": "BARVITA (MANIKPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182115/ws-services-calculation/Penalty.json b/data/as/30182115/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d13fcbe4a4
--- /dev/null
+++ b/data/as/30182115/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182115",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182115/ws-services-calculation/WCBillingSlab.json b/data/as/30182115/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ff8dbf56f2
--- /dev/null
+++ b/data/as/30182115/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182115",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182130/BillingService/BusinessService.json b/data/as/30182130/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a98e058474
--- /dev/null
+++ b/data/as/30182130/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182130",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182130/egov-location/boundary-data.json b/data/as/30182130/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e73d546c61
--- /dev/null
+++ b/data/as/30182130/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182130",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURIA PT-II PWSS (NEW)",
+                "localname": "KUKURIA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURIA PT-II PWSS (NEW)",
+                        "localname": "KUKURIA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKURIA PT-II PWSS (NEW)",
+                "localname": "KUKURIA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182130",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKURIA PT-II PWSS (NEW)",
+                        "localname": "KUKURIA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182130/ws-services-calculation/Penalty.json b/data/as/30182130/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd4cf00e51
--- /dev/null
+++ b/data/as/30182130/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182130",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182130/ws-services-calculation/WCBillingSlab.json b/data/as/30182130/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..70c80a4461
--- /dev/null
+++ b/data/as/30182130/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182130",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182227/BillingService/BusinessService.json b/data/as/30182227/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe8826dd2d
--- /dev/null
+++ b/data/as/30182227/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182227",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182227/egov-location/boundary-data.json b/data/as/30182227/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1acc90c693
--- /dev/null
+++ b/data/as/30182227/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182227",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                "localname": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                        "localname": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                "localname": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182227",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                        "localname": "JUNGLE BLOCK PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182227/ws-services-calculation/Penalty.json b/data/as/30182227/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f0f288d5d
--- /dev/null
+++ b/data/as/30182227/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182227",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182227/ws-services-calculation/WCBillingSlab.json b/data/as/30182227/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7f8e924608
--- /dev/null
+++ b/data/as/30182227/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182227",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182259/BillingService/BusinessService.json b/data/as/30182259/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a477076109
--- /dev/null
+++ b/data/as/30182259/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182259",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182259/egov-location/boundary-data.json b/data/as/30182259/egov-location/boundary-data.json
new file mode 100644
index 0000000000..84e73efd74
--- /dev/null
+++ b/data/as/30182259/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182259",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATASIBARI PWSS (NEW)",
+                "localname": "KATASIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182259",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATASIBARI PWSS (NEW)",
+                        "localname": "KATASIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATASIBARI PWSS (NEW)",
+                "localname": "KATASIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182259",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATASIBARI PWSS (NEW)",
+                        "localname": "KATASIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182259/ws-services-calculation/Penalty.json b/data/as/30182259/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c19f141491
--- /dev/null
+++ b/data/as/30182259/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182259",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182259/ws-services-calculation/WCBillingSlab.json b/data/as/30182259/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..70bd43bb4a
--- /dev/null
+++ b/data/as/30182259/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182259",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182280/BillingService/BusinessService.json b/data/as/30182280/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8991b1e2ad
--- /dev/null
+++ b/data/as/30182280/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182280",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182280/egov-location/boundary-data.json b/data/as/30182280/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02ceb45802
--- /dev/null
+++ b/data/as/30182280/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182280",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                "localname": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182280",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                        "localname": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                "localname": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182280",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                        "localname": "PACHIM BHELAKHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182280/ws-services-calculation/Penalty.json b/data/as/30182280/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..409fd8f2f1
--- /dev/null
+++ b/data/as/30182280/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182280",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182280/ws-services-calculation/WCBillingSlab.json b/data/as/30182280/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5f7be152b
--- /dev/null
+++ b/data/as/30182280/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182280",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182312/BillingService/BusinessService.json b/data/as/30182312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..86e1cb4c79
--- /dev/null
+++ b/data/as/30182312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182312/egov-location/boundary-data.json b/data/as/30182312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..71733724aa
--- /dev/null
+++ b/data/as/30182312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUJRUKGAON PWSS (NEW)",
+                "localname": "BUJRUKGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUJRUKGAON PWSS (NEW)",
+                        "localname": "BUJRUKGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUJRUKGAON PWSS (NEW)",
+                "localname": "BUJRUKGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUJRUKGAON PWSS (NEW)",
+                        "localname": "BUJRUKGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182312/ws-services-calculation/Penalty.json b/data/as/30182312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8934cd6214
--- /dev/null
+++ b/data/as/30182312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182312/ws-services-calculation/WCBillingSlab.json b/data/as/30182312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3599e859a
--- /dev/null
+++ b/data/as/30182312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182324/BillingService/BusinessService.json b/data/as/30182324/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a80e105fc1
--- /dev/null
+++ b/data/as/30182324/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182324",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182324/egov-location/boundary-data.json b/data/as/30182324/egov-location/boundary-data.json
new file mode 100644
index 0000000000..242bb2c1b9
--- /dev/null
+++ b/data/as/30182324/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182324",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKKOMARI PWSS (NEW)",
+                "localname": "SAKKOMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKKOMARI PWSS (NEW)",
+                        "localname": "SAKKOMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKKOMARI PWSS (NEW)",
+                "localname": "SAKKOMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182324",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKKOMARI PWSS (NEW)",
+                        "localname": "SAKKOMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182324/ws-services-calculation/Penalty.json b/data/as/30182324/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..069bcff94d
--- /dev/null
+++ b/data/as/30182324/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182324",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182324/ws-services-calculation/WCBillingSlab.json b/data/as/30182324/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..713952e6b0
--- /dev/null
+++ b/data/as/30182324/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182324",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182346/BillingService/BusinessService.json b/data/as/30182346/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eec460a9cf
--- /dev/null
+++ b/data/as/30182346/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182346",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182346/egov-location/boundary-data.json b/data/as/30182346/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9c819f21d0
--- /dev/null
+++ b/data/as/30182346/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182346",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKRIPARA PWSS (NEW)",
+                "localname": "BAKRIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKRIPARA PWSS (NEW)",
+                        "localname": "BAKRIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKRIPARA PWSS (NEW)",
+                "localname": "BAKRIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKRIPARA PWSS (NEW)",
+                        "localname": "BAKRIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182346/ws-services-calculation/Penalty.json b/data/as/30182346/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..932548715a
--- /dev/null
+++ b/data/as/30182346/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182346",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182346/ws-services-calculation/WCBillingSlab.json b/data/as/30182346/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..615cde46e4
--- /dev/null
+++ b/data/as/30182346/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182346",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182357/BillingService/BusinessService.json b/data/as/30182357/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc94248dd5
--- /dev/null
+++ b/data/as/30182357/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182357",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182357/egov-location/boundary-data.json b/data/as/30182357/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a544b81b95
--- /dev/null
+++ b/data/as/30182357/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182357",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMOHRA PT-II PWSS (NEW)",
+                "localname": "BORMOHRA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMOHRA PT-II PWSS (NEW)",
+                        "localname": "BORMOHRA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMOHRA PT-II PWSS (NEW)",
+                "localname": "BORMOHRA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182357",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMOHRA PT-II PWSS (NEW)",
+                        "localname": "BORMOHRA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182357/ws-services-calculation/Penalty.json b/data/as/30182357/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d442d24d3
--- /dev/null
+++ b/data/as/30182357/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182357",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182357/ws-services-calculation/WCBillingSlab.json b/data/as/30182357/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91944a3619
--- /dev/null
+++ b/data/as/30182357/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182357",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182369/BillingService/BusinessService.json b/data/as/30182369/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d2a5ddcb42
--- /dev/null
+++ b/data/as/30182369/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182369",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182369/egov-location/boundary-data.json b/data/as/30182369/egov-location/boundary-data.json
new file mode 100644
index 0000000000..17e9ad4988
--- /dev/null
+++ b/data/as/30182369/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182369",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                "localname": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182369",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                        "localname": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                "localname": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182369",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                        "localname": "BENGULIPARA, GAROVITA, MAJIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182369/ws-services-calculation/Penalty.json b/data/as/30182369/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df599354d0
--- /dev/null
+++ b/data/as/30182369/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182369",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182369/ws-services-calculation/WCBillingSlab.json b/data/as/30182369/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..077461e915
--- /dev/null
+++ b/data/as/30182369/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182369",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182379/BillingService/BusinessService.json b/data/as/30182379/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4989e42b21
--- /dev/null
+++ b/data/as/30182379/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182379",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182379/egov-location/boundary-data.json b/data/as/30182379/egov-location/boundary-data.json
new file mode 100644
index 0000000000..15d89b3a86
--- /dev/null
+++ b/data/as/30182379/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182379",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILABEEL PUBPARA PWSS (NEW)",
+                "localname": "HASILABEEL PUBPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILABEEL PUBPARA PWSS (NEW)",
+                        "localname": "HASILABEEL PUBPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILABEEL PUBPARA PWSS (NEW)",
+                "localname": "HASILABEEL PUBPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILABEEL PUBPARA PWSS (NEW)",
+                        "localname": "HASILABEEL PUBPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182379/ws-services-calculation/Penalty.json b/data/as/30182379/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc40b59d8e
--- /dev/null
+++ b/data/as/30182379/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182379",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182379/ws-services-calculation/WCBillingSlab.json b/data/as/30182379/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de84bed4ad
--- /dev/null
+++ b/data/as/30182379/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182379",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182397/BillingService/BusinessService.json b/data/as/30182397/BillingService/BusinessService.json
new file mode 100644
index 0000000000..19ce8a1388
--- /dev/null
+++ b/data/as/30182397/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182397",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182397/egov-location/boundary-data.json b/data/as/30182397/egov-location/boundary-data.json
new file mode 100644
index 0000000000..900d9ceb82
--- /dev/null
+++ b/data/as/30182397/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182397",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA PWSS (NEW)",
+                "localname": "GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA PWSS (NEW)",
+                        "localname": "GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA PWSS (NEW)",
+                "localname": "GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182397",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA PWSS (NEW)",
+                        "localname": "GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182397/ws-services-calculation/Penalty.json b/data/as/30182397/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7894fea54f
--- /dev/null
+++ b/data/as/30182397/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182397",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182397/ws-services-calculation/WCBillingSlab.json b/data/as/30182397/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..82f1b90de0
--- /dev/null
+++ b/data/as/30182397/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182397",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182413/BillingService/BusinessService.json b/data/as/30182413/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7f08536ecd
--- /dev/null
+++ b/data/as/30182413/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182413",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182413/egov-location/boundary-data.json b/data/as/30182413/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f0afe67ac
--- /dev/null
+++ b/data/as/30182413/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182413",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBINDAPUR M PWSS (NEW)",
+                "localname": "GOBINDAPUR M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBINDAPUR M PWSS (NEW)",
+                        "localname": "GOBINDAPUR M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBINDAPUR M PWSS (NEW)",
+                "localname": "GOBINDAPUR M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBINDAPUR M PWSS (NEW)",
+                        "localname": "GOBINDAPUR M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182413/ws-services-calculation/Penalty.json b/data/as/30182413/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1cb74f327
--- /dev/null
+++ b/data/as/30182413/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182413",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182413/ws-services-calculation/WCBillingSlab.json b/data/as/30182413/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a724899b71
--- /dev/null
+++ b/data/as/30182413/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182413",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182433/BillingService/BusinessService.json b/data/as/30182433/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7445912f01
--- /dev/null
+++ b/data/as/30182433/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182433",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182433/egov-location/boundary-data.json b/data/as/30182433/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ef7789cbc
--- /dev/null
+++ b/data/as/30182433/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182433",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANIKPUR PWSS (NEW)",
+                "localname": "MANIKPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182433",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANIKPUR PWSS (NEW)",
+                        "localname": "MANIKPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANIKPUR PWSS (NEW)",
+                "localname": "MANIKPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182433",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANIKPUR PWSS (NEW)",
+                        "localname": "MANIKPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182433/ws-services-calculation/Penalty.json b/data/as/30182433/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1d9bacab09
--- /dev/null
+++ b/data/as/30182433/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182433",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182433/ws-services-calculation/WCBillingSlab.json b/data/as/30182433/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f72089e26b
--- /dev/null
+++ b/data/as/30182433/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182433",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182444/BillingService/BusinessService.json b/data/as/30182444/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0ec6cb4ee6
--- /dev/null
+++ b/data/as/30182444/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182444",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182444/egov-location/boundary-data.json b/data/as/30182444/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7327f2bee0
--- /dev/null
+++ b/data/as/30182444/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182444",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JONGPARA PWSS (NEW)",
+                "localname": "JONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JONGPARA PWSS (NEW)",
+                        "localname": "JONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JONGPARA PWSS (NEW)",
+                "localname": "JONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JONGPARA PWSS (NEW)",
+                        "localname": "JONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182444/ws-services-calculation/Penalty.json b/data/as/30182444/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..17922e0e84
--- /dev/null
+++ b/data/as/30182444/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182444",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182444/ws-services-calculation/WCBillingSlab.json b/data/as/30182444/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74ea05f592
--- /dev/null
+++ b/data/as/30182444/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182444",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182458/BillingService/BusinessService.json b/data/as/30182458/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c39c8978ae
--- /dev/null
+++ b/data/as/30182458/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182458",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182458/egov-location/boundary-data.json b/data/as/30182458/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bec4360629
--- /dev/null
+++ b/data/as/30182458/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182458",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                "localname": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182458",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                        "localname": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                "localname": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182458",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                        "localname": "BAMUNGHOPA PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182458/ws-services-calculation/Penalty.json b/data/as/30182458/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbc526cb95
--- /dev/null
+++ b/data/as/30182458/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182458",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182458/ws-services-calculation/WCBillingSlab.json b/data/as/30182458/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0ab6381cc0
--- /dev/null
+++ b/data/as/30182458/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182458",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182473/BillingService/BusinessService.json b/data/as/30182473/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5cc3087e5f
--- /dev/null
+++ b/data/as/30182473/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182473",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182473/egov-location/boundary-data.json b/data/as/30182473/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e2fe1feb3
--- /dev/null
+++ b/data/as/30182473/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182473",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNTILA M PWSS (NEW)",
+                "localname": "BAMUNTILA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNTILA M PWSS (NEW)",
+                        "localname": "BAMUNTILA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNTILA M PWSS (NEW)",
+                "localname": "BAMUNTILA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182473",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNTILA M PWSS (NEW)",
+                        "localname": "BAMUNTILA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182473/ws-services-calculation/Penalty.json b/data/as/30182473/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f9d8cc6692
--- /dev/null
+++ b/data/as/30182473/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182473",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182473/ws-services-calculation/WCBillingSlab.json b/data/as/30182473/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91e031c414
--- /dev/null
+++ b/data/as/30182473/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182473",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182492/BillingService/BusinessService.json b/data/as/30182492/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66a89b1464
--- /dev/null
+++ b/data/as/30182492/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182492",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182492/egov-location/boundary-data.json b/data/as/30182492/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fec992a1bc
--- /dev/null
+++ b/data/as/30182492/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182492",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO MAKRI M PWSS (NEW)",
+                "localname": "BORO MAKRI M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO MAKRI M PWSS (NEW)",
+                        "localname": "BORO MAKRI M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO MAKRI M PWSS (NEW)",
+                "localname": "BORO MAKRI M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO MAKRI M PWSS (NEW)",
+                        "localname": "BORO MAKRI M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182492/ws-services-calculation/Penalty.json b/data/as/30182492/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1640be3c3
--- /dev/null
+++ b/data/as/30182492/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182492",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182492/ws-services-calculation/WCBillingSlab.json b/data/as/30182492/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b97a5de9ac
--- /dev/null
+++ b/data/as/30182492/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182492",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182502/BillingService/BusinessService.json b/data/as/30182502/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb4e4ea498
--- /dev/null
+++ b/data/as/30182502/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30182502",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182502/egov-location/boundary-data.json b/data/as/30182502/egov-location/boundary-data.json
new file mode 100644
index 0000000000..88576c0d9b
--- /dev/null
+++ b/data/as/30182502/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30182502",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAGLAT TEK PWSS (NEW)",
+                "localname": "PAGLAT TEK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAGLAT TEK PWSS (NEW)",
+                        "localname": "PAGLAT TEK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAGLAT TEK PWSS (NEW)",
+                "localname": "PAGLAT TEK PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30182502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAGLAT TEK PWSS (NEW)",
+                        "localname": "PAGLAT TEK PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182502/ws-services-calculation/Penalty.json b/data/as/30182502/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c057730011
--- /dev/null
+++ b/data/as/30182502/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30182502",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30182502/ws-services-calculation/WCBillingSlab.json b/data/as/30182502/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5c87645ec
--- /dev/null
+++ b/data/as/30182502/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30182502",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183072/BillingService/BusinessService.json b/data/as/30183072/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9e7c4aea32
--- /dev/null
+++ b/data/as/30183072/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183072",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183072/egov-location/boundary-data.json b/data/as/30183072/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1453d3d3eb
--- /dev/null
+++ b/data/as/30183072/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183072",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SATAI NAMILE PWSS",
+                "localname": "SATAI NAMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SATAI NAMILE PWSS",
+                        "localname": "SATAI NAMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SATAI NAMILE PWSS",
+                "localname": "SATAI NAMILE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183072",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SATAI NAMILE PWSS",
+                        "localname": "SATAI NAMILE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183072/ws-services-calculation/Penalty.json b/data/as/30183072/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..581765bc70
--- /dev/null
+++ b/data/as/30183072/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183072",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183072/ws-services-calculation/WCBillingSlab.json b/data/as/30183072/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..743c0d17d3
--- /dev/null
+++ b/data/as/30183072/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183072",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183077/BillingService/BusinessService.json b/data/as/30183077/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dec65134ae
--- /dev/null
+++ b/data/as/30183077/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183077",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183077/egov-location/boundary-data.json b/data/as/30183077/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7876ee0d4
--- /dev/null
+++ b/data/as/30183077/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183077",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPALOGA PWSS",
+                "localname": "SOPALOGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPALOGA PWSS",
+                        "localname": "SOPALOGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOPALOGA PWSS",
+                "localname": "SOPALOGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183077",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOPALOGA PWSS",
+                        "localname": "SOPALOGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183077/ws-services-calculation/Penalty.json b/data/as/30183077/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7b0f5414df
--- /dev/null
+++ b/data/as/30183077/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183077",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183077/ws-services-calculation/WCBillingSlab.json b/data/as/30183077/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b3f526ae16
--- /dev/null
+++ b/data/as/30183077/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183077",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183135/BillingService/BusinessService.json b/data/as/30183135/BillingService/BusinessService.json
new file mode 100644
index 0000000000..647408e623
--- /dev/null
+++ b/data/as/30183135/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183135",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183135/egov-location/boundary-data.json b/data/as/30183135/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e308f4dc2f
--- /dev/null
+++ b/data/as/30183135/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183135",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATALIA KHOWA PWSS",
+                "localname": "PATALIA KHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATALIA KHOWA PWSS",
+                        "localname": "PATALIA KHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATALIA KHOWA PWSS",
+                "localname": "PATALIA KHOWA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATALIA KHOWA PWSS",
+                        "localname": "PATALIA KHOWA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183135/ws-services-calculation/Penalty.json b/data/as/30183135/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00ad21dac2
--- /dev/null
+++ b/data/as/30183135/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183135",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183135/ws-services-calculation/WCBillingSlab.json b/data/as/30183135/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13ac4804b7
--- /dev/null
+++ b/data/as/30183135/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183135",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183229/BillingService/BusinessService.json b/data/as/30183229/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a89aa15702
--- /dev/null
+++ b/data/as/30183229/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183229",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183229/egov-location/boundary-data.json b/data/as/30183229/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c4809be12
--- /dev/null
+++ b/data/as/30183229/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183229",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THAKURBILLA M PWSS (NEW)",
+                "localname": "THAKURBILLA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183229",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THAKURBILLA M PWSS (NEW)",
+                        "localname": "THAKURBILLA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THAKURBILLA M PWSS (NEW)",
+                "localname": "THAKURBILLA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183229",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THAKURBILLA M PWSS (NEW)",
+                        "localname": "THAKURBILLA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183229/ws-services-calculation/Penalty.json b/data/as/30183229/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6104f99c1f
--- /dev/null
+++ b/data/as/30183229/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183229",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183229/ws-services-calculation/WCBillingSlab.json b/data/as/30183229/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22c9694a7a
--- /dev/null
+++ b/data/as/30183229/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183229",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183244/BillingService/BusinessService.json b/data/as/30183244/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8ad42f4c8a
--- /dev/null
+++ b/data/as/30183244/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183244",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183244/egov-location/boundary-data.json b/data/as/30183244/egov-location/boundary-data.json
new file mode 100644
index 0000000000..60f2852c47
--- /dev/null
+++ b/data/as/30183244/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183244",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJANPARA PWSS (NEW)",
+                "localname": "BORJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJANPARA PWSS (NEW)",
+                        "localname": "BORJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJANPARA PWSS (NEW)",
+                "localname": "BORJANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183244",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJANPARA PWSS (NEW)",
+                        "localname": "BORJANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183244/ws-services-calculation/Penalty.json b/data/as/30183244/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..274420567d
--- /dev/null
+++ b/data/as/30183244/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183244",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183244/ws-services-calculation/WCBillingSlab.json b/data/as/30183244/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5974c8d766
--- /dev/null
+++ b/data/as/30183244/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183244",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183255/BillingService/BusinessService.json b/data/as/30183255/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5983fde0a0
--- /dev/null
+++ b/data/as/30183255/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183255",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183255/egov-location/boundary-data.json b/data/as/30183255/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9287ec199
--- /dev/null
+++ b/data/as/30183255/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183255",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                "localname": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183255",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                        "localname": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                "localname": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183255",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                        "localname": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183255/ws-services-calculation/Penalty.json b/data/as/30183255/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c885770901
--- /dev/null
+++ b/data/as/30183255/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183255",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183255/ws-services-calculation/WCBillingSlab.json b/data/as/30183255/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9f0a5f8acf
--- /dev/null
+++ b/data/as/30183255/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183255",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183275/BillingService/BusinessService.json b/data/as/30183275/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4b04df0af
--- /dev/null
+++ b/data/as/30183275/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183275",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183275/egov-location/boundary-data.json b/data/as/30183275/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f88f409365
--- /dev/null
+++ b/data/as/30183275/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183275",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB LEMAKONA PWSS (NEW)",
+                "localname": "PUB LEMAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB LEMAKONA PWSS (NEW)",
+                        "localname": "PUB LEMAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB LEMAKONA PWSS (NEW)",
+                "localname": "PUB LEMAKONA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB LEMAKONA PWSS (NEW)",
+                        "localname": "PUB LEMAKONA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183275/ws-services-calculation/Penalty.json b/data/as/30183275/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5acc5d4a5d
--- /dev/null
+++ b/data/as/30183275/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183275",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183275/ws-services-calculation/WCBillingSlab.json b/data/as/30183275/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..14375e6cbd
--- /dev/null
+++ b/data/as/30183275/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183275",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183307/BillingService/BusinessService.json b/data/as/30183307/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e6c5b3203
--- /dev/null
+++ b/data/as/30183307/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183307",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183307/egov-location/boundary-data.json b/data/as/30183307/egov-location/boundary-data.json
new file mode 100644
index 0000000000..63e7cb7c6e
--- /dev/null
+++ b/data/as/30183307/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183307",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                "localname": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                        "localname": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                "localname": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                        "localname": "DARIDURI UZANPARA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183307/ws-services-calculation/Penalty.json b/data/as/30183307/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27b1a0edcd
--- /dev/null
+++ b/data/as/30183307/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183307",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183307/ws-services-calculation/WCBillingSlab.json b/data/as/30183307/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33b902b1c3
--- /dev/null
+++ b/data/as/30183307/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183307",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183330/BillingService/BusinessService.json b/data/as/30183330/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e97e40446
--- /dev/null
+++ b/data/as/30183330/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183330",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183330/egov-location/boundary-data.json b/data/as/30183330/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2447a92035
--- /dev/null
+++ b/data/as/30183330/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183330",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENGKANDA M PWSS (NEW)",
+                "localname": "BENGKANDA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENGKANDA M PWSS (NEW)",
+                        "localname": "BENGKANDA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BENGKANDA M PWSS (NEW)",
+                "localname": "BENGKANDA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BENGKANDA M PWSS (NEW)",
+                        "localname": "BENGKANDA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183330/ws-services-calculation/Penalty.json b/data/as/30183330/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3f3b197f8
--- /dev/null
+++ b/data/as/30183330/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183330",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183330/ws-services-calculation/WCBillingSlab.json b/data/as/30183330/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9660170113
--- /dev/null
+++ b/data/as/30183330/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183330",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183351/BillingService/BusinessService.json b/data/as/30183351/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bdb0a44e70
--- /dev/null
+++ b/data/as/30183351/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183351",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183351/egov-location/boundary-data.json b/data/as/30183351/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f51b10f1f1
--- /dev/null
+++ b/data/as/30183351/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183351",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALADHARA PT-II PWSS (NEW)",
+                "localname": "MALADHARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183351",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALADHARA PT-II PWSS (NEW)",
+                        "localname": "MALADHARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALADHARA PT-II PWSS (NEW)",
+                "localname": "MALADHARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183351",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALADHARA PT-II PWSS (NEW)",
+                        "localname": "MALADHARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183351/ws-services-calculation/Penalty.json b/data/as/30183351/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bb452e41d3
--- /dev/null
+++ b/data/as/30183351/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183351",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183351/ws-services-calculation/WCBillingSlab.json b/data/as/30183351/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..249ce72612
--- /dev/null
+++ b/data/as/30183351/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183351",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183367/BillingService/BusinessService.json b/data/as/30183367/BillingService/BusinessService.json
new file mode 100644
index 0000000000..64f31412f9
--- /dev/null
+++ b/data/as/30183367/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183367",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183367/egov-location/boundary-data.json b/data/as/30183367/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c7a2e022ae
--- /dev/null
+++ b/data/as/30183367/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183367",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLA BILLPARA PWSS (NEW)",
+                "localname": "CHAKLA BILLPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLA BILLPARA PWSS (NEW)",
+                        "localname": "CHAKLA BILLPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLA BILLPARA PWSS (NEW)",
+                "localname": "CHAKLA BILLPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183367",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLA BILLPARA PWSS (NEW)",
+                        "localname": "CHAKLA BILLPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183367/ws-services-calculation/Penalty.json b/data/as/30183367/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d52b02e2c
--- /dev/null
+++ b/data/as/30183367/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183367",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183367/ws-services-calculation/WCBillingSlab.json b/data/as/30183367/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d45db25263
--- /dev/null
+++ b/data/as/30183367/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183367",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183379/BillingService/BusinessService.json b/data/as/30183379/BillingService/BusinessService.json
new file mode 100644
index 0000000000..32e629abe2
--- /dev/null
+++ b/data/as/30183379/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183379",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183379/egov-location/boundary-data.json b/data/as/30183379/egov-location/boundary-data.json
new file mode 100644
index 0000000000..37638e77d0
--- /dev/null
+++ b/data/as/30183379/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183379",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISKHULI PT-II M PWSS (NEW)",
+                "localname": "BHOISKHULI PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISKHULI PT-II M PWSS (NEW)",
+                        "localname": "BHOISKHULI PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOISKHULI PT-II M PWSS (NEW)",
+                "localname": "BHOISKHULI PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOISKHULI PT-II M PWSS (NEW)",
+                        "localname": "BHOISKHULI PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183379/ws-services-calculation/Penalty.json b/data/as/30183379/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..af1a08bc99
--- /dev/null
+++ b/data/as/30183379/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183379",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183379/ws-services-calculation/WCBillingSlab.json b/data/as/30183379/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e399b2e6bb
--- /dev/null
+++ b/data/as/30183379/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183379",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183385/BillingService/BusinessService.json b/data/as/30183385/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8a88635de
--- /dev/null
+++ b/data/as/30183385/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183385",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183385/egov-location/boundary-data.json b/data/as/30183385/egov-location/boundary-data.json
new file mode 100644
index 0000000000..448d0d2404
--- /dev/null
+++ b/data/as/30183385/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183385",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHIPARA PT-II PWSS (NEW)",
+                "localname": "MEDHIPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183385",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHIPARA PT-II PWSS (NEW)",
+                        "localname": "MEDHIPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEDHIPARA PT-II PWSS (NEW)",
+                "localname": "MEDHIPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183385",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEDHIPARA PT-II PWSS (NEW)",
+                        "localname": "MEDHIPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183385/ws-services-calculation/Penalty.json b/data/as/30183385/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..12ba329dc4
--- /dev/null
+++ b/data/as/30183385/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183385",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183385/ws-services-calculation/WCBillingSlab.json b/data/as/30183385/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5fb57f77e6
--- /dev/null
+++ b/data/as/30183385/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183385",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183392/BillingService/BusinessService.json b/data/as/30183392/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ef12f55f60
--- /dev/null
+++ b/data/as/30183392/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183392",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183392/egov-location/boundary-data.json b/data/as/30183392/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c86b152dbf
--- /dev/null
+++ b/data/as/30183392/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183392",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                "localname": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183392",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                        "localname": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                "localname": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183392",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                        "localname": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183392/ws-services-calculation/Penalty.json b/data/as/30183392/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9598f721e2
--- /dev/null
+++ b/data/as/30183392/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183392",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183392/ws-services-calculation/WCBillingSlab.json b/data/as/30183392/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f40d308a1
--- /dev/null
+++ b/data/as/30183392/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183392",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183402/BillingService/BusinessService.json b/data/as/30183402/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5425b745b
--- /dev/null
+++ b/data/as/30183402/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183402",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183402/egov-location/boundary-data.json b/data/as/30183402/egov-location/boundary-data.json
new file mode 100644
index 0000000000..091794a267
--- /dev/null
+++ b/data/as/30183402/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183402",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                "localname": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183402",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                        "localname": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                "localname": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183402",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                        "localname": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183402/ws-services-calculation/Penalty.json b/data/as/30183402/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..25db0932d9
--- /dev/null
+++ b/data/as/30183402/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183402",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183402/ws-services-calculation/WCBillingSlab.json b/data/as/30183402/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..01ed90aa47
--- /dev/null
+++ b/data/as/30183402/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183402",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183409/BillingService/BusinessService.json b/data/as/30183409/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f3ace57a2
--- /dev/null
+++ b/data/as/30183409/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183409",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183409/egov-location/boundary-data.json b/data/as/30183409/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f64be09f6
--- /dev/null
+++ b/data/as/30183409/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183409",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHATRYAPARA PWSS (NEW)",
+                "localname": "KHATRYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHATRYAPARA PWSS (NEW)",
+                        "localname": "KHATRYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHATRYAPARA PWSS (NEW)",
+                "localname": "KHATRYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183409",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHATRYAPARA PWSS (NEW)",
+                        "localname": "KHATRYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183409/ws-services-calculation/Penalty.json b/data/as/30183409/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d5604fe542
--- /dev/null
+++ b/data/as/30183409/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183409",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183409/ws-services-calculation/WCBillingSlab.json b/data/as/30183409/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..992b5b1c6b
--- /dev/null
+++ b/data/as/30183409/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183409",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183414/BillingService/BusinessService.json b/data/as/30183414/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1462899f8b
--- /dev/null
+++ b/data/as/30183414/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183414",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183414/egov-location/boundary-data.json b/data/as/30183414/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4fb7f4f6d3
--- /dev/null
+++ b/data/as/30183414/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183414",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                "localname": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183414",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                        "localname": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                "localname": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183414",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                        "localname": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183414/ws-services-calculation/Penalty.json b/data/as/30183414/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..29b7078923
--- /dev/null
+++ b/data/as/30183414/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183414",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183414/ws-services-calculation/WCBillingSlab.json b/data/as/30183414/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ebab028daa
--- /dev/null
+++ b/data/as/30183414/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183414",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183459/BillingService/BusinessService.json b/data/as/30183459/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09b2d9fe4e
--- /dev/null
+++ b/data/as/30183459/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183459",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183459/egov-location/boundary-data.json b/data/as/30183459/egov-location/boundary-data.json
new file mode 100644
index 0000000000..af6f6abf02
--- /dev/null
+++ b/data/as/30183459/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183459",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA M PWSS (NEW)",
+                "localname": "MATIA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183459",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA M PWSS (NEW)",
+                        "localname": "MATIA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA M PWSS (NEW)",
+                "localname": "MATIA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183459",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA M PWSS (NEW)",
+                        "localname": "MATIA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183459/ws-services-calculation/Penalty.json b/data/as/30183459/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..884e87fd2b
--- /dev/null
+++ b/data/as/30183459/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183459",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183459/ws-services-calculation/WCBillingSlab.json b/data/as/30183459/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..79dfca30e6
--- /dev/null
+++ b/data/as/30183459/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183459",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183462/BillingService/BusinessService.json b/data/as/30183462/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a8f68ce10
--- /dev/null
+++ b/data/as/30183462/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183462",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183462/egov-location/boundary-data.json b/data/as/30183462/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2cac57fd0
--- /dev/null
+++ b/data/as/30183462/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183462",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASH KANDI PWSS (NEW)",
+                "localname": "PALASH KANDI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183462",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASH KANDI PWSS (NEW)",
+                        "localname": "PALASH KANDI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PALASH KANDI PWSS (NEW)",
+                "localname": "PALASH KANDI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183462",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PALASH KANDI PWSS (NEW)",
+                        "localname": "PALASH KANDI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183462/ws-services-calculation/Penalty.json b/data/as/30183462/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6738e69e93
--- /dev/null
+++ b/data/as/30183462/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183462",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183462/ws-services-calculation/WCBillingSlab.json b/data/as/30183462/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a80204010
--- /dev/null
+++ b/data/as/30183462/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183462",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183468/BillingService/BusinessService.json b/data/as/30183468/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45cf69035f
--- /dev/null
+++ b/data/as/30183468/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183468",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183468/egov-location/boundary-data.json b/data/as/30183468/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b5bba513cb
--- /dev/null
+++ b/data/as/30183468/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183468",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOGHO PT-III PWSS (NEW)",
+                "localname": "MOGHO PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183468",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOGHO PT-III PWSS (NEW)",
+                        "localname": "MOGHO PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOGHO PT-III PWSS (NEW)",
+                "localname": "MOGHO PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183468",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOGHO PT-III PWSS (NEW)",
+                        "localname": "MOGHO PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183468/ws-services-calculation/Penalty.json b/data/as/30183468/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..446e26079e
--- /dev/null
+++ b/data/as/30183468/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183468",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183468/ws-services-calculation/WCBillingSlab.json b/data/as/30183468/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..168af444c1
--- /dev/null
+++ b/data/as/30183468/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183468",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183496/BillingService/BusinessService.json b/data/as/30183496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90e9b14b23
--- /dev/null
+++ b/data/as/30183496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183496/egov-location/boundary-data.json b/data/as/30183496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ab8297c57
--- /dev/null
+++ b/data/as/30183496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUMRI PT-II PWSS (NEW)",
+                "localname": "KUMRI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUMRI PT-II PWSS (NEW)",
+                        "localname": "KUMRI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUMRI PT-II PWSS (NEW)",
+                "localname": "KUMRI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUMRI PT-II PWSS (NEW)",
+                        "localname": "KUMRI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183496/ws-services-calculation/Penalty.json b/data/as/30183496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5b085075e4
--- /dev/null
+++ b/data/as/30183496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183496/ws-services-calculation/WCBillingSlab.json b/data/as/30183496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..567a7579d1
--- /dev/null
+++ b/data/as/30183496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183522/BillingService/BusinessService.json b/data/as/30183522/BillingService/BusinessService.json
new file mode 100644
index 0000000000..160746daf1
--- /dev/null
+++ b/data/as/30183522/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183522",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183522/egov-location/boundary-data.json b/data/as/30183522/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3cbb90c349
--- /dev/null
+++ b/data/as/30183522/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183522",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPKAI PT-I PWSS (NEW)",
+                "localname": "DIPKAI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183522",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPKAI PT-I PWSS (NEW)",
+                        "localname": "DIPKAI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPKAI PT-I PWSS (NEW)",
+                "localname": "DIPKAI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183522",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPKAI PT-I PWSS (NEW)",
+                        "localname": "DIPKAI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183522/ws-services-calculation/Penalty.json b/data/as/30183522/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9e4b0d5dac
--- /dev/null
+++ b/data/as/30183522/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183522",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183522/ws-services-calculation/WCBillingSlab.json b/data/as/30183522/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d32b6d4e8
--- /dev/null
+++ b/data/as/30183522/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183522",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183574/BillingService/BusinessService.json b/data/as/30183574/BillingService/BusinessService.json
new file mode 100644
index 0000000000..37afb21063
--- /dev/null
+++ b/data/as/30183574/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183574",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183574/egov-location/boundary-data.json b/data/as/30183574/egov-location/boundary-data.json
new file mode 100644
index 0000000000..33cf036ac1
--- /dev/null
+++ b/data/as/30183574/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183574",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHILDANGA PWSS (NEW)",
+                "localname": "SHILDANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHILDANGA PWSS (NEW)",
+                        "localname": "SHILDANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHILDANGA PWSS (NEW)",
+                "localname": "SHILDANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183574",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHILDANGA PWSS (NEW)",
+                        "localname": "SHILDANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183574/ws-services-calculation/Penalty.json b/data/as/30183574/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a6a8c77f87
--- /dev/null
+++ b/data/as/30183574/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183574",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183574/ws-services-calculation/WCBillingSlab.json b/data/as/30183574/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9b380080c2
--- /dev/null
+++ b/data/as/30183574/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183574",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183599/BillingService/BusinessService.json b/data/as/30183599/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bdc3c16a32
--- /dev/null
+++ b/data/as/30183599/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183599",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183599/egov-location/boundary-data.json b/data/as/30183599/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aaca99e1a4
--- /dev/null
+++ b/data/as/30183599/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183599",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON KANDAPARA PWSS (NEW)",
+                "localname": "JURIGAON KANDAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183599",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON KANDAPARA PWSS (NEW)",
+                        "localname": "JURIGAON KANDAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JURIGAON KANDAPARA PWSS (NEW)",
+                "localname": "JURIGAON KANDAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183599",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JURIGAON KANDAPARA PWSS (NEW)",
+                        "localname": "JURIGAON KANDAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183599/ws-services-calculation/Penalty.json b/data/as/30183599/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d92dd9169
--- /dev/null
+++ b/data/as/30183599/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183599",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183599/ws-services-calculation/WCBillingSlab.json b/data/as/30183599/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bad2e48c0d
--- /dev/null
+++ b/data/as/30183599/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183599",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183693/BillingService/BusinessService.json b/data/as/30183693/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f85402e73a
--- /dev/null
+++ b/data/as/30183693/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183693",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183693/egov-location/boundary-data.json b/data/as/30183693/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e06e3d431
--- /dev/null
+++ b/data/as/30183693/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183693",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJHORA (DADAN) PWSS (NEW)",
+                "localname": "BORJHORA (DADAN) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJHORA (DADAN) PWSS (NEW)",
+                        "localname": "BORJHORA (DADAN) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJHORA (DADAN) PWSS (NEW)",
+                "localname": "BORJHORA (DADAN) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJHORA (DADAN) PWSS (NEW)",
+                        "localname": "BORJHORA (DADAN) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183693/ws-services-calculation/Penalty.json b/data/as/30183693/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a122df62df
--- /dev/null
+++ b/data/as/30183693/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183693",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183693/ws-services-calculation/WCBillingSlab.json b/data/as/30183693/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..60399e4f6c
--- /dev/null
+++ b/data/as/30183693/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183693",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183728/BillingService/BusinessService.json b/data/as/30183728/BillingService/BusinessService.json
new file mode 100644
index 0000000000..505379655f
--- /dev/null
+++ b/data/as/30183728/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183728",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183728/egov-location/boundary-data.json b/data/as/30183728/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7c62cdf97f
--- /dev/null
+++ b/data/as/30183728/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183728",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR MARKHULA PWSS (NEW)",
+                "localname": "UTTAR MARKHULA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183728",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR MARKHULA PWSS (NEW)",
+                        "localname": "UTTAR MARKHULA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR MARKHULA PWSS (NEW)",
+                "localname": "UTTAR MARKHULA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183728",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR MARKHULA PWSS (NEW)",
+                        "localname": "UTTAR MARKHULA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183728/ws-services-calculation/Penalty.json b/data/as/30183728/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..521bd6df72
--- /dev/null
+++ b/data/as/30183728/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183728",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183728/ws-services-calculation/WCBillingSlab.json b/data/as/30183728/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c33fb41f1d
--- /dev/null
+++ b/data/as/30183728/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183728",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183739/BillingService/BusinessService.json b/data/as/30183739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..535e108645
--- /dev/null
+++ b/data/as/30183739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183739/egov-location/boundary-data.json b/data/as/30183739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48fa1b3bb6
--- /dev/null
+++ b/data/as/30183739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIDA PT-II PWSS (NEW)",
+                "localname": "BAIDA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIDA PT-II PWSS (NEW)",
+                        "localname": "BAIDA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAIDA PT-II PWSS (NEW)",
+                "localname": "BAIDA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAIDA PT-II PWSS (NEW)",
+                        "localname": "BAIDA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183739/ws-services-calculation/Penalty.json b/data/as/30183739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1902a3876d
--- /dev/null
+++ b/data/as/30183739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183739/ws-services-calculation/WCBillingSlab.json b/data/as/30183739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee46e18fbc
--- /dev/null
+++ b/data/as/30183739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183758/BillingService/BusinessService.json b/data/as/30183758/BillingService/BusinessService.json
new file mode 100644
index 0000000000..538dcd6e72
--- /dev/null
+++ b/data/as/30183758/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183758",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183758/egov-location/boundary-data.json b/data/as/30183758/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ff961f05fe
--- /dev/null
+++ b/data/as/30183758/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183758",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDHIPARA PWSS (NEW)",
+                "localname": "BUDHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDHIPARA PWSS (NEW)",
+                        "localname": "BUDHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDHIPARA PWSS (NEW)",
+                "localname": "BUDHIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183758",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDHIPARA PWSS (NEW)",
+                        "localname": "BUDHIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183758/ws-services-calculation/Penalty.json b/data/as/30183758/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b36bd88218
--- /dev/null
+++ b/data/as/30183758/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183758",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183758/ws-services-calculation/WCBillingSlab.json b/data/as/30183758/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fe4f2373fc
--- /dev/null
+++ b/data/as/30183758/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183758",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183945/BillingService/BusinessService.json b/data/as/30183945/BillingService/BusinessService.json
new file mode 100644
index 0000000000..22f8cab99f
--- /dev/null
+++ b/data/as/30183945/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183945",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183945/egov-location/boundary-data.json b/data/as/30183945/egov-location/boundary-data.json
new file mode 100644
index 0000000000..db7a6ed82f
--- /dev/null
+++ b/data/as/30183945/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183945",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                "localname": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183945",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                        "localname": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                "localname": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183945",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                        "localname": "ROWMARI KALIPUR (KHARMUZA) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183945/ws-services-calculation/Penalty.json b/data/as/30183945/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c14696c961
--- /dev/null
+++ b/data/as/30183945/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183945",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183945/ws-services-calculation/WCBillingSlab.json b/data/as/30183945/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f67edbe1a7
--- /dev/null
+++ b/data/as/30183945/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183945",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183971/BillingService/BusinessService.json b/data/as/30183971/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ceacde2162
--- /dev/null
+++ b/data/as/30183971/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183971",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183971/egov-location/boundary-data.json b/data/as/30183971/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4801295c78
--- /dev/null
+++ b/data/as/30183971/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183971",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOGHO HATISILA PWSS (NEW)",
+                "localname": "MOGHO HATISILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183971",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOGHO HATISILA PWSS (NEW)",
+                        "localname": "MOGHO HATISILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOGHO HATISILA PWSS (NEW)",
+                "localname": "MOGHO HATISILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183971",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOGHO HATISILA PWSS (NEW)",
+                        "localname": "MOGHO HATISILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183971/ws-services-calculation/Penalty.json b/data/as/30183971/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..581742f908
--- /dev/null
+++ b/data/as/30183971/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183971",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183971/ws-services-calculation/WCBillingSlab.json b/data/as/30183971/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a5e487e9f9
--- /dev/null
+++ b/data/as/30183971/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183971",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183980/BillingService/BusinessService.json b/data/as/30183980/BillingService/BusinessService.json
new file mode 100644
index 0000000000..efbe1fb4e4
--- /dev/null
+++ b/data/as/30183980/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30183980",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183980/egov-location/boundary-data.json b/data/as/30183980/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2018b27efb
--- /dev/null
+++ b/data/as/30183980/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30183980",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULI PT-II PWSS (NEW)",
+                "localname": "DEULI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183980",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULI PT-II PWSS (NEW)",
+                        "localname": "DEULI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEULI PT-II PWSS (NEW)",
+                "localname": "DEULI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30183980",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEULI PT-II PWSS (NEW)",
+                        "localname": "DEULI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183980/ws-services-calculation/Penalty.json b/data/as/30183980/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..841fabaeca
--- /dev/null
+++ b/data/as/30183980/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30183980",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30183980/ws-services-calculation/WCBillingSlab.json b/data/as/30183980/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..20cb51c3f5
--- /dev/null
+++ b/data/as/30183980/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30183980",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184382/BillingService/BusinessService.json b/data/as/30184382/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae1ca0839c
--- /dev/null
+++ b/data/as/30184382/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30184382",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184382/egov-location/boundary-data.json b/data/as/30184382/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f61adf32b9
--- /dev/null
+++ b/data/as/30184382/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30184382",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA PT-II PWSS (NEW)",
+                "localname": "MATIA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA PT-II PWSS (NEW)",
+                        "localname": "MATIA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA PT-II PWSS (NEW)",
+                "localname": "MATIA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA PT-II PWSS (NEW)",
+                        "localname": "MATIA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184382/ws-services-calculation/Penalty.json b/data/as/30184382/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3eac420bc3
--- /dev/null
+++ b/data/as/30184382/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30184382",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184382/ws-services-calculation/WCBillingSlab.json b/data/as/30184382/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7346f59f72
--- /dev/null
+++ b/data/as/30184382/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30184382",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184383/BillingService/BusinessService.json b/data/as/30184383/BillingService/BusinessService.json
new file mode 100644
index 0000000000..befc6bf57c
--- /dev/null
+++ b/data/as/30184383/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30184383",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184383/egov-location/boundary-data.json b/data/as/30184383/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c45cd7e23
--- /dev/null
+++ b/data/as/30184383/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30184383",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARANGABARI PT-I PWSS (NEW)",
+                "localname": "NARANGABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARANGABARI PT-I PWSS (NEW)",
+                        "localname": "NARANGABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NARANGABARI PT-I PWSS (NEW)",
+                "localname": "NARANGABARI PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184383",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NARANGABARI PT-I PWSS (NEW)",
+                        "localname": "NARANGABARI PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184383/ws-services-calculation/Penalty.json b/data/as/30184383/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b71f11fa94
--- /dev/null
+++ b/data/as/30184383/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30184383",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184383/ws-services-calculation/WCBillingSlab.json b/data/as/30184383/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aa4d63a906
--- /dev/null
+++ b/data/as/30184383/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30184383",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184384/BillingService/BusinessService.json b/data/as/30184384/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cfa6d21120
--- /dev/null
+++ b/data/as/30184384/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30184384",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184384/egov-location/boundary-data.json b/data/as/30184384/egov-location/boundary-data.json
new file mode 100644
index 0000000000..91171ea28b
--- /dev/null
+++ b/data/as/30184384/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30184384",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHARATNA PWSS (NEW)",
+                "localname": "PANCHARATNA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184384",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHARATNA PWSS (NEW)",
+                        "localname": "PANCHARATNA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PANCHARATNA PWSS (NEW)",
+                "localname": "PANCHARATNA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184384",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PANCHARATNA PWSS (NEW)",
+                        "localname": "PANCHARATNA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184384/ws-services-calculation/Penalty.json b/data/as/30184384/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3fc8ccfa4c
--- /dev/null
+++ b/data/as/30184384/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30184384",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184384/ws-services-calculation/WCBillingSlab.json b/data/as/30184384/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a0ff506b68
--- /dev/null
+++ b/data/as/30184384/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30184384",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184386/BillingService/BusinessService.json b/data/as/30184386/BillingService/BusinessService.json
new file mode 100644
index 0000000000..99191dd4cc
--- /dev/null
+++ b/data/as/30184386/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30184386",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184386/egov-location/boundary-data.json b/data/as/30184386/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2d4b20d77e
--- /dev/null
+++ b/data/as/30184386/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30184386",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALARBHITA PWSS (NEW)",
+                "localname": "BALARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALARBHITA PWSS (NEW)",
+                        "localname": "BALARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALARBHITA PWSS (NEW)",
+                "localname": "BALARBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184386",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALARBHITA PWSS (NEW)",
+                        "localname": "BALARBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184386/ws-services-calculation/Penalty.json b/data/as/30184386/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a16b8ab53c
--- /dev/null
+++ b/data/as/30184386/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30184386",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184386/ws-services-calculation/WCBillingSlab.json b/data/as/30184386/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc3987ca15
--- /dev/null
+++ b/data/as/30184386/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30184386",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184393/BillingService/BusinessService.json b/data/as/30184393/BillingService/BusinessService.json
new file mode 100644
index 0000000000..acd67cb286
--- /dev/null
+++ b/data/as/30184393/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30184393",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184393/egov-location/boundary-data.json b/data/as/30184393/egov-location/boundary-data.json
new file mode 100644
index 0000000000..27e0b87719
--- /dev/null
+++ b/data/as/30184393/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30184393",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAIBARI PWSS (NEW)",
+                "localname": "TARAIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAIBARI PWSS (NEW)",
+                        "localname": "TARAIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAIBARI PWSS (NEW)",
+                "localname": "TARAIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184393",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAIBARI PWSS (NEW)",
+                        "localname": "TARAIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184393/ws-services-calculation/Penalty.json b/data/as/30184393/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..458151175e
--- /dev/null
+++ b/data/as/30184393/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30184393",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184393/ws-services-calculation/WCBillingSlab.json b/data/as/30184393/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6616ca25e0
--- /dev/null
+++ b/data/as/30184393/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30184393",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184401/BillingService/BusinessService.json b/data/as/30184401/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66e8d5e95e
--- /dev/null
+++ b/data/as/30184401/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30184401",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184401/egov-location/boundary-data.json b/data/as/30184401/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ccae33d820
--- /dev/null
+++ b/data/as/30184401/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30184401",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJHORA PWSS (NEW)",
+                "localname": "BORJHORA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJHORA PWSS (NEW)",
+                        "localname": "BORJHORA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJHORA PWSS (NEW)",
+                "localname": "BORJHORA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30184401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJHORA PWSS (NEW)",
+                        "localname": "BORJHORA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184401/ws-services-calculation/Penalty.json b/data/as/30184401/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6f0dd34819
--- /dev/null
+++ b/data/as/30184401/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30184401",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30184401/ws-services-calculation/WCBillingSlab.json b/data/as/30184401/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a45045221
--- /dev/null
+++ b/data/as/30184401/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30184401",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30185152/BillingService/BusinessService.json b/data/as/30185152/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e07e93cd9e
--- /dev/null
+++ b/data/as/30185152/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30185152",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30185152/egov-location/boundary-data.json b/data/as/30185152/egov-location/boundary-data.json
new file mode 100644
index 0000000000..12c525f3a9
--- /dev/null
+++ b/data/as/30185152/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30185152",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON PAMBASTI PWSS",
+                "localname": "KACHARIGAON PAMBASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30185152",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON PAMBASTI PWSS",
+                        "localname": "KACHARIGAON PAMBASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHARIGAON PAMBASTI PWSS",
+                "localname": "KACHARIGAON PAMBASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30185152",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHARIGAON PAMBASTI PWSS",
+                        "localname": "KACHARIGAON PAMBASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30185152/ws-services-calculation/Penalty.json b/data/as/30185152/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a1e36ae54
--- /dev/null
+++ b/data/as/30185152/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30185152",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30185152/ws-services-calculation/WCBillingSlab.json b/data/as/30185152/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..756e189a4d
--- /dev/null
+++ b/data/as/30185152/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30185152",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186115/BillingService/BusinessService.json b/data/as/30186115/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7309f57e7
--- /dev/null
+++ b/data/as/30186115/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30186115",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186115/egov-location/boundary-data.json b/data/as/30186115/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e101fa93bb
--- /dev/null
+++ b/data/as/30186115/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30186115",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR MOLAN GAON PWSS",
+                "localname": "UTTAR MOLAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR MOLAN GAON PWSS",
+                        "localname": "UTTAR MOLAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR MOLAN GAON PWSS",
+                "localname": "UTTAR MOLAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186115",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR MOLAN GAON PWSS",
+                        "localname": "UTTAR MOLAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186115/ws-services-calculation/Penalty.json b/data/as/30186115/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..454108f750
--- /dev/null
+++ b/data/as/30186115/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30186115",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186115/ws-services-calculation/WCBillingSlab.json b/data/as/30186115/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc541b9020
--- /dev/null
+++ b/data/as/30186115/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30186115",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186145/BillingService/BusinessService.json b/data/as/30186145/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6a18d2202d
--- /dev/null
+++ b/data/as/30186145/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30186145",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186145/egov-location/boundary-data.json b/data/as/30186145/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d57dbfc512
--- /dev/null
+++ b/data/as/30186145/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30186145",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPAR MOLAGAON PWSS",
+                "localname": "UPPAR MOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186145",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPAR MOLAGAON PWSS",
+                        "localname": "UPPAR MOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPAR MOLAGAON PWSS",
+                "localname": "UPPAR MOLAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186145",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPAR MOLAGAON PWSS",
+                        "localname": "UPPAR MOLAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186145/ws-services-calculation/Penalty.json b/data/as/30186145/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..01777a5fd6
--- /dev/null
+++ b/data/as/30186145/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30186145",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186145/ws-services-calculation/WCBillingSlab.json b/data/as/30186145/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..908b309db5
--- /dev/null
+++ b/data/as/30186145/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30186145",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186206/BillingService/BusinessService.json b/data/as/30186206/BillingService/BusinessService.json
new file mode 100644
index 0000000000..731cb17721
--- /dev/null
+++ b/data/as/30186206/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30186206",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186206/egov-location/boundary-data.json b/data/as/30186206/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1cf78f19fd
--- /dev/null
+++ b/data/as/30186206/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30186206",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOU BHANGA MISSING PWSS",
+                "localname": "TOU BHANGA MISSING PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOU BHANGA MISSING PWSS",
+                        "localname": "TOU BHANGA MISSING PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOU BHANGA MISSING PWSS",
+                "localname": "TOU BHANGA MISSING PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186206",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOU BHANGA MISSING PWSS",
+                        "localname": "TOU BHANGA MISSING PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186206/ws-services-calculation/Penalty.json b/data/as/30186206/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9dd389b0b
--- /dev/null
+++ b/data/as/30186206/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30186206",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186206/ws-services-calculation/WCBillingSlab.json b/data/as/30186206/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e3f937df9b
--- /dev/null
+++ b/data/as/30186206/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30186206",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186275/BillingService/BusinessService.json b/data/as/30186275/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f886d0fa5
--- /dev/null
+++ b/data/as/30186275/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30186275",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186275/egov-location/boundary-data.json b/data/as/30186275/egov-location/boundary-data.json
new file mode 100644
index 0000000000..90278e3ccd
--- /dev/null
+++ b/data/as/30186275/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30186275",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN PWSS",
+                "localname": "TARAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN PWSS",
+                        "localname": "TARAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN PWSS",
+                "localname": "TARAJAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186275",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN PWSS",
+                        "localname": "TARAJAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186275/ws-services-calculation/Penalty.json b/data/as/30186275/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2c354e41fa
--- /dev/null
+++ b/data/as/30186275/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30186275",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186275/ws-services-calculation/WCBillingSlab.json b/data/as/30186275/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b95e90870f
--- /dev/null
+++ b/data/as/30186275/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30186275",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186307/BillingService/BusinessService.json b/data/as/30186307/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfd29c6ce1
--- /dev/null
+++ b/data/as/30186307/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30186307",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186307/egov-location/boundary-data.json b/data/as/30186307/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b6038e87fe
--- /dev/null
+++ b/data/as/30186307/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30186307",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN MEKHANI PWSS",
+                "localname": "TARAJAN MEKHANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN MEKHANI PWSS",
+                        "localname": "TARAJAN MEKHANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN MEKHANI PWSS",
+                "localname": "TARAJAN MEKHANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30186307",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN MEKHANI PWSS",
+                        "localname": "TARAJAN MEKHANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186307/ws-services-calculation/Penalty.json b/data/as/30186307/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f7aeaf021a
--- /dev/null
+++ b/data/as/30186307/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30186307",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30186307/ws-services-calculation/WCBillingSlab.json b/data/as/30186307/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..952d081f42
--- /dev/null
+++ b/data/as/30186307/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30186307",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188401/BillingService/BusinessService.json b/data/as/30188401/BillingService/BusinessService.json
new file mode 100644
index 0000000000..035e7daff9
--- /dev/null
+++ b/data/as/30188401/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188401",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188401/egov-location/boundary-data.json b/data/as/30188401/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1af022ac1f
--- /dev/null
+++ b/data/as/30188401/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188401",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTHABARI (LAKHIPUR) PWSS",
+                "localname": "MOTHABARI (LAKHIPUR) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTHABARI (LAKHIPUR) PWSS",
+                        "localname": "MOTHABARI (LAKHIPUR) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTHABARI (LAKHIPUR) PWSS",
+                "localname": "MOTHABARI (LAKHIPUR) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTHABARI (LAKHIPUR) PWSS",
+                        "localname": "MOTHABARI (LAKHIPUR) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188401/ws-services-calculation/Penalty.json b/data/as/30188401/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a685eb80e5
--- /dev/null
+++ b/data/as/30188401/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188401",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188401/ws-services-calculation/WCBillingSlab.json b/data/as/30188401/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e1d44bea45
--- /dev/null
+++ b/data/as/30188401/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188401",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188411/BillingService/BusinessService.json b/data/as/30188411/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5cdad58fb7
--- /dev/null
+++ b/data/as/30188411/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188411",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188411/egov-location/boundary-data.json b/data/as/30188411/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4abb8171f
--- /dev/null
+++ b/data/as/30188411/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188411",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATLAMARI PWSS (NEW)",
+                "localname": "KATLAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATLAMARI PWSS (NEW)",
+                        "localname": "KATLAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATLAMARI PWSS (NEW)",
+                "localname": "KATLAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATLAMARI PWSS (NEW)",
+                        "localname": "KATLAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188411/ws-services-calculation/Penalty.json b/data/as/30188411/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cecf57e0e7
--- /dev/null
+++ b/data/as/30188411/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188411",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188411/ws-services-calculation/WCBillingSlab.json b/data/as/30188411/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..219c55b84e
--- /dev/null
+++ b/data/as/30188411/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188411",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188425/BillingService/BusinessService.json b/data/as/30188425/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8102e81a39
--- /dev/null
+++ b/data/as/30188425/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188425",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188425/egov-location/boundary-data.json b/data/as/30188425/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c139c0cf9c
--- /dev/null
+++ b/data/as/30188425/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188425",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHATYATARI PWSS (NEW)",
+                "localname": "KHATYATARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHATYATARI PWSS (NEW)",
+                        "localname": "KHATYATARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHATYATARI PWSS (NEW)",
+                "localname": "KHATYATARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188425",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHATYATARI PWSS (NEW)",
+                        "localname": "KHATYATARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188425/ws-services-calculation/Penalty.json b/data/as/30188425/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9a79a0c9e
--- /dev/null
+++ b/data/as/30188425/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188425",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188425/ws-services-calculation/WCBillingSlab.json b/data/as/30188425/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..faaddafcac
--- /dev/null
+++ b/data/as/30188425/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188425",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188440/BillingService/BusinessService.json b/data/as/30188440/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ca23e819de
--- /dev/null
+++ b/data/as/30188440/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188440",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188440/egov-location/boundary-data.json b/data/as/30188440/egov-location/boundary-data.json
new file mode 100644
index 0000000000..07626830b6
--- /dev/null
+++ b/data/as/30188440/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188440",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALADHARA PT-I PWSS (NEW)",
+                "localname": "MALADHARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188440",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALADHARA PT-I PWSS (NEW)",
+                        "localname": "MALADHARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALADHARA PT-I PWSS (NEW)",
+                "localname": "MALADHARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188440",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALADHARA PT-I PWSS (NEW)",
+                        "localname": "MALADHARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188440/ws-services-calculation/Penalty.json b/data/as/30188440/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee6ae269e4
--- /dev/null
+++ b/data/as/30188440/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188440",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188440/ws-services-calculation/WCBillingSlab.json b/data/as/30188440/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e8dc900da
--- /dev/null
+++ b/data/as/30188440/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188440",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188457/BillingService/BusinessService.json b/data/as/30188457/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d4888a37c8
--- /dev/null
+++ b/data/as/30188457/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188457",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188457/egov-location/boundary-data.json b/data/as/30188457/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c50e63aeb9
--- /dev/null
+++ b/data/as/30188457/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188457",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARI AMGURI PWSS (NEW)",
+                "localname": "BALASARI AMGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARI AMGURI PWSS (NEW)",
+                        "localname": "BALASARI AMGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARI AMGURI PWSS (NEW)",
+                "localname": "BALASARI AMGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188457",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARI AMGURI PWSS (NEW)",
+                        "localname": "BALASARI AMGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188457/ws-services-calculation/Penalty.json b/data/as/30188457/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..36f530ad88
--- /dev/null
+++ b/data/as/30188457/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188457",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188457/ws-services-calculation/WCBillingSlab.json b/data/as/30188457/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a05c64ddb7
--- /dev/null
+++ b/data/as/30188457/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188457",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188494/BillingService/BusinessService.json b/data/as/30188494/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d310548f69
--- /dev/null
+++ b/data/as/30188494/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188494",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188494/egov-location/boundary-data.json b/data/as/30188494/egov-location/boundary-data.json
new file mode 100644
index 0000000000..58b499a054
--- /dev/null
+++ b/data/as/30188494/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188494",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALADHARA GAROPARA PWSS (NEW)",
+                "localname": "MALADHARA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188494",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALADHARA GAROPARA PWSS (NEW)",
+                        "localname": "MALADHARA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MALADHARA GAROPARA PWSS (NEW)",
+                "localname": "MALADHARA GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188494",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MALADHARA GAROPARA PWSS (NEW)",
+                        "localname": "MALADHARA GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188494/ws-services-calculation/Penalty.json b/data/as/30188494/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab9ccce369
--- /dev/null
+++ b/data/as/30188494/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188494",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188494/ws-services-calculation/WCBillingSlab.json b/data/as/30188494/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6a1b7f827a
--- /dev/null
+++ b/data/as/30188494/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188494",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188506/BillingService/BusinessService.json b/data/as/30188506/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dd1feffff7
--- /dev/null
+++ b/data/as/30188506/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188506",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188506/egov-location/boundary-data.json b/data/as/30188506/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c8ed686b4
--- /dev/null
+++ b/data/as/30188506/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188506",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHULARCHAR PWSS (NEW)",
+                "localname": "CHULARCHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHULARCHAR PWSS (NEW)",
+                        "localname": "CHULARCHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHULARCHAR PWSS (NEW)",
+                "localname": "CHULARCHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHULARCHAR PWSS (NEW)",
+                        "localname": "CHULARCHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188506/ws-services-calculation/Penalty.json b/data/as/30188506/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df36f660f7
--- /dev/null
+++ b/data/as/30188506/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188506",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188506/ws-services-calculation/WCBillingSlab.json b/data/as/30188506/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..27729aa54e
--- /dev/null
+++ b/data/as/30188506/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188506",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188524/BillingService/BusinessService.json b/data/as/30188524/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3f2b6bcb74
--- /dev/null
+++ b/data/as/30188524/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188524",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188524/egov-location/boundary-data.json b/data/as/30188524/egov-location/boundary-data.json
new file mode 100644
index 0000000000..65616cb8fe
--- /dev/null
+++ b/data/as/30188524/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188524",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                "localname": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                        "localname": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                "localname": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                        "localname": "KADOTIKA PATHALIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188524/ws-services-calculation/Penalty.json b/data/as/30188524/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee7b257956
--- /dev/null
+++ b/data/as/30188524/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188524",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188524/ws-services-calculation/WCBillingSlab.json b/data/as/30188524/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..180b63dcfe
--- /dev/null
+++ b/data/as/30188524/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188524",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188535/BillingService/BusinessService.json b/data/as/30188535/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4e188e7ad8
--- /dev/null
+++ b/data/as/30188535/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188535",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188535/egov-location/boundary-data.json b/data/as/30188535/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac828b9ce3
--- /dev/null
+++ b/data/as/30188535/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188535",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUMBANDHA (D) PWSS (NEW)",
+                "localname": "DHUMBANDHA (D) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUMBANDHA (D) PWSS (NEW)",
+                        "localname": "DHUMBANDHA (D) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUMBANDHA (D) PWSS (NEW)",
+                "localname": "DHUMBANDHA (D) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188535",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUMBANDHA (D) PWSS (NEW)",
+                        "localname": "DHUMBANDHA (D) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188535/ws-services-calculation/Penalty.json b/data/as/30188535/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04b6dce8a6
--- /dev/null
+++ b/data/as/30188535/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188535",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188535/ws-services-calculation/WCBillingSlab.json b/data/as/30188535/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b60d0c9233
--- /dev/null
+++ b/data/as/30188535/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188535",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188564/BillingService/BusinessService.json b/data/as/30188564/BillingService/BusinessService.json
new file mode 100644
index 0000000000..282a855cf1
--- /dev/null
+++ b/data/as/30188564/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188564",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188564/egov-location/boundary-data.json b/data/as/30188564/egov-location/boundary-data.json
new file mode 100644
index 0000000000..534e4e7d7c
--- /dev/null
+++ b/data/as/30188564/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188564",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAMAR BEEL PWSS (NEW)",
+                "localname": "DHAMAR BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188564",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAMAR BEEL PWSS (NEW)",
+                        "localname": "DHAMAR BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHAMAR BEEL PWSS (NEW)",
+                "localname": "DHAMAR BEEL PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188564",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHAMAR BEEL PWSS (NEW)",
+                        "localname": "DHAMAR BEEL PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188564/ws-services-calculation/Penalty.json b/data/as/30188564/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..426ceb0c15
--- /dev/null
+++ b/data/as/30188564/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188564",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188564/ws-services-calculation/WCBillingSlab.json b/data/as/30188564/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..832d205b46
--- /dev/null
+++ b/data/as/30188564/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188564",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188569/BillingService/BusinessService.json b/data/as/30188569/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ba068877b6
--- /dev/null
+++ b/data/as/30188569/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188569",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188569/egov-location/boundary-data.json b/data/as/30188569/egov-location/boundary-data.json
new file mode 100644
index 0000000000..91b8dc90d2
--- /dev/null
+++ b/data/as/30188569/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188569",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI BHUYANPARA PWSS (NEW)",
+                "localname": "ROWMARI BHUYANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI BHUYANPARA PWSS (NEW)",
+                        "localname": "ROWMARI BHUYANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWMARI BHUYANPARA PWSS (NEW)",
+                "localname": "ROWMARI BHUYANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWMARI BHUYANPARA PWSS (NEW)",
+                        "localname": "ROWMARI BHUYANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188569/ws-services-calculation/Penalty.json b/data/as/30188569/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7cb6994048
--- /dev/null
+++ b/data/as/30188569/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188569",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188569/ws-services-calculation/WCBillingSlab.json b/data/as/30188569/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3fc2ec87b5
--- /dev/null
+++ b/data/as/30188569/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188569",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188583/BillingService/BusinessService.json b/data/as/30188583/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fff2fa3d8f
--- /dev/null
+++ b/data/as/30188583/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188583",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188583/egov-location/boundary-data.json b/data/as/30188583/egov-location/boundary-data.json
new file mode 100644
index 0000000000..062ab1898a
--- /dev/null
+++ b/data/as/30188583/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188583",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUMKAIPARA PART PWSS (NEW)",
+                "localname": "JUMKAIPARA PART PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUMKAIPARA PART PWSS (NEW)",
+                        "localname": "JUMKAIPARA PART PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JUMKAIPARA PART PWSS (NEW)",
+                "localname": "JUMKAIPARA PART PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188583",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JUMKAIPARA PART PWSS (NEW)",
+                        "localname": "JUMKAIPARA PART PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188583/ws-services-calculation/Penalty.json b/data/as/30188583/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0082cdf8b0
--- /dev/null
+++ b/data/as/30188583/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188583",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188583/ws-services-calculation/WCBillingSlab.json b/data/as/30188583/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b32186846
--- /dev/null
+++ b/data/as/30188583/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188583",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188648/BillingService/BusinessService.json b/data/as/30188648/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e989c4f78
--- /dev/null
+++ b/data/as/30188648/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188648",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188648/egov-location/boundary-data.json b/data/as/30188648/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48dfbb6a9b
--- /dev/null
+++ b/data/as/30188648/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188648",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARABANDHA PWSS (NEW)",
+                "localname": "ARABANDHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARABANDHA PWSS (NEW)",
+                        "localname": "ARABANDHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARABANDHA PWSS (NEW)",
+                "localname": "ARABANDHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188648",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARABANDHA PWSS (NEW)",
+                        "localname": "ARABANDHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188648/ws-services-calculation/Penalty.json b/data/as/30188648/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5cfaee9c31
--- /dev/null
+++ b/data/as/30188648/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188648",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188648/ws-services-calculation/WCBillingSlab.json b/data/as/30188648/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37b82ef7b6
--- /dev/null
+++ b/data/as/30188648/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188648",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188716/BillingService/BusinessService.json b/data/as/30188716/BillingService/BusinessService.json
new file mode 100644
index 0000000000..463281dd09
--- /dev/null
+++ b/data/as/30188716/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188716",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188716/egov-location/boundary-data.json b/data/as/30188716/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f2bbd674f5
--- /dev/null
+++ b/data/as/30188716/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188716",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA RABHAPARA PWSS (NEW)",
+                "localname": "NALANGA RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA RABHAPARA PWSS (NEW)",
+                        "localname": "NALANGA RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALANGA RABHAPARA PWSS (NEW)",
+                "localname": "NALANGA RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALANGA RABHAPARA PWSS (NEW)",
+                        "localname": "NALANGA RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188716/ws-services-calculation/Penalty.json b/data/as/30188716/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..19b2e18e63
--- /dev/null
+++ b/data/as/30188716/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188716",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188716/ws-services-calculation/WCBillingSlab.json b/data/as/30188716/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fa3dd4cef4
--- /dev/null
+++ b/data/as/30188716/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188716",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188739/BillingService/BusinessService.json b/data/as/30188739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c535266a29
--- /dev/null
+++ b/data/as/30188739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188739/egov-location/boundary-data.json b/data/as/30188739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d44ca8bdb
--- /dev/null
+++ b/data/as/30188739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PT-I PWSS (NEW)",
+                "localname": "BAMUNDANGA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PT-I PWSS (NEW)",
+                        "localname": "BAMUNDANGA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNDANGA PT-I PWSS (NEW)",
+                "localname": "BAMUNDANGA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNDANGA PT-I PWSS (NEW)",
+                        "localname": "BAMUNDANGA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188739/ws-services-calculation/Penalty.json b/data/as/30188739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08201e791e
--- /dev/null
+++ b/data/as/30188739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188739/ws-services-calculation/WCBillingSlab.json b/data/as/30188739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c1667886f
--- /dev/null
+++ b/data/as/30188739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188761/BillingService/BusinessService.json b/data/as/30188761/BillingService/BusinessService.json
new file mode 100644
index 0000000000..97588331c2
--- /dev/null
+++ b/data/as/30188761/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188761",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188761/egov-location/boundary-data.json b/data/as/30188761/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f4aa157886
--- /dev/null
+++ b/data/as/30188761/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188761",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KADOTIKA PWSS (NEW)",
+                "localname": "KADOTIKA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188761",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KADOTIKA PWSS (NEW)",
+                        "localname": "KADOTIKA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KADOTIKA PWSS (NEW)",
+                "localname": "KADOTIKA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188761",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KADOTIKA PWSS (NEW)",
+                        "localname": "KADOTIKA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188761/ws-services-calculation/Penalty.json b/data/as/30188761/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b6a922f9c2
--- /dev/null
+++ b/data/as/30188761/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188761",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188761/ws-services-calculation/WCBillingSlab.json b/data/as/30188761/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8c7bfbc123
--- /dev/null
+++ b/data/as/30188761/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188761",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188772/BillingService/BusinessService.json b/data/as/30188772/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cadd7c5b0f
--- /dev/null
+++ b/data/as/30188772/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188772",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188772/egov-location/boundary-data.json b/data/as/30188772/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1aa02de62e
--- /dev/null
+++ b/data/as/30188772/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188772",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINABARI PWSS (NEW)",
+                "localname": "SINABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188772",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINABARI PWSS (NEW)",
+                        "localname": "SINABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINABARI PWSS (NEW)",
+                "localname": "SINABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188772",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINABARI PWSS (NEW)",
+                        "localname": "SINABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188772/ws-services-calculation/Penalty.json b/data/as/30188772/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95c60f14b6
--- /dev/null
+++ b/data/as/30188772/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188772",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188772/ws-services-calculation/WCBillingSlab.json b/data/as/30188772/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a19ffacfc0
--- /dev/null
+++ b/data/as/30188772/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188772",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188786/BillingService/BusinessService.json b/data/as/30188786/BillingService/BusinessService.json
new file mode 100644
index 0000000000..76718c00e0
--- /dev/null
+++ b/data/as/30188786/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188786",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188786/egov-location/boundary-data.json b/data/as/30188786/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6231b9564c
--- /dev/null
+++ b/data/as/30188786/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188786",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                "localname": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                        "localname": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                "localname": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188786",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                        "localname": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188786/ws-services-calculation/Penalty.json b/data/as/30188786/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ceb6f58acf
--- /dev/null
+++ b/data/as/30188786/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188786",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188786/ws-services-calculation/WCBillingSlab.json b/data/as/30188786/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03959cf0e0
--- /dev/null
+++ b/data/as/30188786/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188786",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188820/BillingService/BusinessService.json b/data/as/30188820/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f442230ae
--- /dev/null
+++ b/data/as/30188820/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188820",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188820/egov-location/boundary-data.json b/data/as/30188820/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4328033548
--- /dev/null
+++ b/data/as/30188820/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188820",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HALDIBARI PWSS (NEW)",
+                "localname": "HALDIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HALDIBARI PWSS (NEW)",
+                        "localname": "HALDIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HALDIBARI PWSS (NEW)",
+                "localname": "HALDIBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188820",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HALDIBARI PWSS (NEW)",
+                        "localname": "HALDIBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188820/ws-services-calculation/Penalty.json b/data/as/30188820/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee4b5348f1
--- /dev/null
+++ b/data/as/30188820/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188820",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188820/ws-services-calculation/WCBillingSlab.json b/data/as/30188820/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5fbe405aeb
--- /dev/null
+++ b/data/as/30188820/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188820",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188848/BillingService/BusinessService.json b/data/as/30188848/BillingService/BusinessService.json
new file mode 100644
index 0000000000..957aad4021
--- /dev/null
+++ b/data/as/30188848/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30188848",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188848/egov-location/boundary-data.json b/data/as/30188848/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a294d756ec
--- /dev/null
+++ b/data/as/30188848/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30188848",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINABARI NAYAPARA PWSS (NEW)",
+                "localname": "SINABARI NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINABARI NAYAPARA PWSS (NEW)",
+                        "localname": "SINABARI NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINABARI NAYAPARA PWSS (NEW)",
+                "localname": "SINABARI NAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30188848",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINABARI NAYAPARA PWSS (NEW)",
+                        "localname": "SINABARI NAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188848/ws-services-calculation/Penalty.json b/data/as/30188848/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ea5fc5e9c5
--- /dev/null
+++ b/data/as/30188848/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30188848",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30188848/ws-services-calculation/WCBillingSlab.json b/data/as/30188848/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7b7ba0b694
--- /dev/null
+++ b/data/as/30188848/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30188848",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189208/BillingService/BusinessService.json b/data/as/30189208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..05047cee08
--- /dev/null
+++ b/data/as/30189208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189208/egov-location/boundary-data.json b/data/as/30189208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c38fc7641a
--- /dev/null
+++ b/data/as/30189208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KILLHARA PT-I PWSS (NEW)",
+                "localname": "KILLHARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KILLHARA PT-I PWSS (NEW)",
+                        "localname": "KILLHARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KILLHARA PT-I PWSS (NEW)",
+                "localname": "KILLHARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KILLHARA PT-I PWSS (NEW)",
+                        "localname": "KILLHARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189208/ws-services-calculation/Penalty.json b/data/as/30189208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cfb8d89b03
--- /dev/null
+++ b/data/as/30189208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189208/ws-services-calculation/WCBillingSlab.json b/data/as/30189208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7060e8edcb
--- /dev/null
+++ b/data/as/30189208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189234/BillingService/BusinessService.json b/data/as/30189234/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4da9f4dea9
--- /dev/null
+++ b/data/as/30189234/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189234",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189234/egov-location/boundary-data.json b/data/as/30189234/egov-location/boundary-data.json
new file mode 100644
index 0000000000..78e2a6384c
--- /dev/null
+++ b/data/as/30189234/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189234",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLAKURA PT-I PWSS (NEW)",
+                "localname": "CHOLAKURA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189234",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLAKURA PT-I PWSS (NEW)",
+                        "localname": "CHOLAKURA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLAKURA PT-I PWSS (NEW)",
+                "localname": "CHOLAKURA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189234",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLAKURA PT-I PWSS (NEW)",
+                        "localname": "CHOLAKURA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189234/ws-services-calculation/Penalty.json b/data/as/30189234/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..22a9dea833
--- /dev/null
+++ b/data/as/30189234/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189234",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189234/ws-services-calculation/WCBillingSlab.json b/data/as/30189234/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..05dd8546bb
--- /dev/null
+++ b/data/as/30189234/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189234",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189242/BillingService/BusinessService.json b/data/as/30189242/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9b4e474e61
--- /dev/null
+++ b/data/as/30189242/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189242",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189242/egov-location/boundary-data.json b/data/as/30189242/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4a6093561d
--- /dev/null
+++ b/data/as/30189242/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189242",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARI PWSS (NEW)",
+                "localname": "BALASARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARI PWSS (NEW)",
+                        "localname": "BALASARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALASARI PWSS (NEW)",
+                "localname": "BALASARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189242",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALASARI PWSS (NEW)",
+                        "localname": "BALASARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189242/ws-services-calculation/Penalty.json b/data/as/30189242/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2657bea718
--- /dev/null
+++ b/data/as/30189242/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189242",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189242/ws-services-calculation/WCBillingSlab.json b/data/as/30189242/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..000ae7c004
--- /dev/null
+++ b/data/as/30189242/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189242",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189256/BillingService/BusinessService.json b/data/as/30189256/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b8ab29412
--- /dev/null
+++ b/data/as/30189256/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189256",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189256/egov-location/boundary-data.json b/data/as/30189256/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f9eee9ff3
--- /dev/null
+++ b/data/as/30189256/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189256",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                "localname": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                        "localname": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                "localname": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                        "localname": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189256/ws-services-calculation/Penalty.json b/data/as/30189256/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6cf4891e3
--- /dev/null
+++ b/data/as/30189256/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189256",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189256/ws-services-calculation/WCBillingSlab.json b/data/as/30189256/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67cefaa8cf
--- /dev/null
+++ b/data/as/30189256/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189256",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189269/BillingService/BusinessService.json b/data/as/30189269/BillingService/BusinessService.json
new file mode 100644
index 0000000000..80ea2b93a5
--- /dev/null
+++ b/data/as/30189269/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189269",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189269/egov-location/boundary-data.json b/data/as/30189269/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6560b8dea1
--- /dev/null
+++ b/data/as/30189269/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189269",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                "localname": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189269",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                        "localname": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                "localname": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189269",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                        "localname": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189269/ws-services-calculation/Penalty.json b/data/as/30189269/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..664a423fd1
--- /dev/null
+++ b/data/as/30189269/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189269",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189269/ws-services-calculation/WCBillingSlab.json b/data/as/30189269/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..67e93ff147
--- /dev/null
+++ b/data/as/30189269/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189269",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189277/BillingService/BusinessService.json b/data/as/30189277/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5b865a481a
--- /dev/null
+++ b/data/as/30189277/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189277",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189277/egov-location/boundary-data.json b/data/as/30189277/egov-location/boundary-data.json
new file mode 100644
index 0000000000..702dfd7924
--- /dev/null
+++ b/data/as/30189277/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189277",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                "localname": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                        "localname": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                "localname": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189277",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                        "localname": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189277/ws-services-calculation/Penalty.json b/data/as/30189277/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0690d5e34a
--- /dev/null
+++ b/data/as/30189277/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189277",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189277/ws-services-calculation/WCBillingSlab.json b/data/as/30189277/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f442b8e6a9
--- /dev/null
+++ b/data/as/30189277/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189277",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189286/BillingService/BusinessService.json b/data/as/30189286/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fde2d81fbd
--- /dev/null
+++ b/data/as/30189286/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189286",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189286/egov-location/boundary-data.json b/data/as/30189286/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e82c18486c
--- /dev/null
+++ b/data/as/30189286/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189286",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUNDARPARA PWSS (NEW)",
+                "localname": "SUNDARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUNDARPARA PWSS (NEW)",
+                        "localname": "SUNDARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUNDARPARA PWSS (NEW)",
+                "localname": "SUNDARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189286",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUNDARPARA PWSS (NEW)",
+                        "localname": "SUNDARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189286/ws-services-calculation/Penalty.json b/data/as/30189286/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f1a213eea9
--- /dev/null
+++ b/data/as/30189286/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189286",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189286/ws-services-calculation/WCBillingSlab.json b/data/as/30189286/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a078748bd
--- /dev/null
+++ b/data/as/30189286/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189286",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189299/BillingService/BusinessService.json b/data/as/30189299/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4416358797
--- /dev/null
+++ b/data/as/30189299/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189299",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189299/egov-location/boundary-data.json b/data/as/30189299/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d25962fa64
--- /dev/null
+++ b/data/as/30189299/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189299",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKRADANGA PWSS (NEW)",
+                "localname": "KUKRADANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189299",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKRADANGA PWSS (NEW)",
+                        "localname": "KUKRADANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KUKRADANGA PWSS (NEW)",
+                "localname": "KUKRADANGA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189299",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KUKRADANGA PWSS (NEW)",
+                        "localname": "KUKRADANGA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189299/ws-services-calculation/Penalty.json b/data/as/30189299/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c6ba9e1f3a
--- /dev/null
+++ b/data/as/30189299/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189299",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189299/ws-services-calculation/WCBillingSlab.json b/data/as/30189299/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b34b57e39
--- /dev/null
+++ b/data/as/30189299/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189299",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189315/BillingService/BusinessService.json b/data/as/30189315/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0636d3a13a
--- /dev/null
+++ b/data/as/30189315/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189315",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189315/egov-location/boundary-data.json b/data/as/30189315/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4a568afb17
--- /dev/null
+++ b/data/as/30189315/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189315",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIAPARA MADHYA PWSS (NEW)",
+                "localname": "TIAPARA MADHYA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIAPARA MADHYA PWSS (NEW)",
+                        "localname": "TIAPARA MADHYA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TIAPARA MADHYA PWSS (NEW)",
+                "localname": "TIAPARA MADHYA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189315",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TIAPARA MADHYA PWSS (NEW)",
+                        "localname": "TIAPARA MADHYA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189315/ws-services-calculation/Penalty.json b/data/as/30189315/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..91f9919128
--- /dev/null
+++ b/data/as/30189315/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189315",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189315/ws-services-calculation/WCBillingSlab.json b/data/as/30189315/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e97e000ad3
--- /dev/null
+++ b/data/as/30189315/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189315",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189323/BillingService/BusinessService.json b/data/as/30189323/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b2e062bd9e
--- /dev/null
+++ b/data/as/30189323/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189323",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189323/egov-location/boundary-data.json b/data/as/30189323/egov-location/boundary-data.json
new file mode 100644
index 0000000000..643dbc060f
--- /dev/null
+++ b/data/as/30189323/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189323",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                "localname": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189323",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                        "localname": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                "localname": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189323",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                        "localname": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189323/ws-services-calculation/Penalty.json b/data/as/30189323/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d93edbd895
--- /dev/null
+++ b/data/as/30189323/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189323",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189323/ws-services-calculation/WCBillingSlab.json b/data/as/30189323/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..10538e0144
--- /dev/null
+++ b/data/as/30189323/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189323",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189328/BillingService/BusinessService.json b/data/as/30189328/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3cfb1e9b5a
--- /dev/null
+++ b/data/as/30189328/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189328",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189328/egov-location/boundary-data.json b/data/as/30189328/egov-location/boundary-data.json
new file mode 100644
index 0000000000..de26c7ffe3
--- /dev/null
+++ b/data/as/30189328/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189328",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ABHIRAMPARA PWSS (NEW)",
+                "localname": "ABHIRAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189328",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ABHIRAMPARA PWSS (NEW)",
+                        "localname": "ABHIRAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ABHIRAMPARA PWSS (NEW)",
+                "localname": "ABHIRAMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189328",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ABHIRAMPARA PWSS (NEW)",
+                        "localname": "ABHIRAMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189328/ws-services-calculation/Penalty.json b/data/as/30189328/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ba95f0592e
--- /dev/null
+++ b/data/as/30189328/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189328",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189328/ws-services-calculation/WCBillingSlab.json b/data/as/30189328/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..52fbdfd6dd
--- /dev/null
+++ b/data/as/30189328/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189328",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189336/BillingService/BusinessService.json b/data/as/30189336/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fcb0f78cd6
--- /dev/null
+++ b/data/as/30189336/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189336",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189336/egov-location/boundary-data.json b/data/as/30189336/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2695eb4d74
--- /dev/null
+++ b/data/as/30189336/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189336",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAHAPARA PWSS (NEW)",
+                "localname": "LAHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189336",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAHAPARA PWSS (NEW)",
+                        "localname": "LAHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAHAPARA PWSS (NEW)",
+                "localname": "LAHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189336",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAHAPARA PWSS (NEW)",
+                        "localname": "LAHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189336/ws-services-calculation/Penalty.json b/data/as/30189336/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..453d828d65
--- /dev/null
+++ b/data/as/30189336/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189336",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189336/ws-services-calculation/WCBillingSlab.json b/data/as/30189336/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7bdefdb848
--- /dev/null
+++ b/data/as/30189336/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189336",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189344/BillingService/BusinessService.json b/data/as/30189344/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b62d599018
--- /dev/null
+++ b/data/as/30189344/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189344",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189344/egov-location/boundary-data.json b/data/as/30189344/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fc9a3b4aae
--- /dev/null
+++ b/data/as/30189344/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189344",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDIRPARA PWSS (NEW)",
+                "localname": "MANDIRPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDIRPARA PWSS (NEW)",
+                        "localname": "MANDIRPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDIRPARA PWSS (NEW)",
+                "localname": "MANDIRPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189344",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDIRPARA PWSS (NEW)",
+                        "localname": "MANDIRPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189344/ws-services-calculation/Penalty.json b/data/as/30189344/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8864ec706d
--- /dev/null
+++ b/data/as/30189344/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189344",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189344/ws-services-calculation/WCBillingSlab.json b/data/as/30189344/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5bcece3ded
--- /dev/null
+++ b/data/as/30189344/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189344",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189379/BillingService/BusinessService.json b/data/as/30189379/BillingService/BusinessService.json
new file mode 100644
index 0000000000..408ee69b69
--- /dev/null
+++ b/data/as/30189379/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189379",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189379/egov-location/boundary-data.json b/data/as/30189379/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74a9d68671
--- /dev/null
+++ b/data/as/30189379/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189379",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                "localname": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                        "localname": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                "localname": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                        "localname": "NAYAPARA (LAKHIPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189379/ws-services-calculation/Penalty.json b/data/as/30189379/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5a736bf059
--- /dev/null
+++ b/data/as/30189379/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189379",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189379/ws-services-calculation/WCBillingSlab.json b/data/as/30189379/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..676a601440
--- /dev/null
+++ b/data/as/30189379/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189379",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189381/BillingService/BusinessService.json b/data/as/30189381/BillingService/BusinessService.json
new file mode 100644
index 0000000000..16cc54b21c
--- /dev/null
+++ b/data/as/30189381/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189381",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189381/egov-location/boundary-data.json b/data/as/30189381/egov-location/boundary-data.json
new file mode 100644
index 0000000000..625e8bc56b
--- /dev/null
+++ b/data/as/30189381/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189381",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEONAPARA PT-I PWSS (NEW)",
+                "localname": "DEONAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEONAPARA PT-I PWSS (NEW)",
+                        "localname": "DEONAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEONAPARA PT-I PWSS (NEW)",
+                "localname": "DEONAPARA PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEONAPARA PT-I PWSS (NEW)",
+                        "localname": "DEONAPARA PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189381/ws-services-calculation/Penalty.json b/data/as/30189381/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d4f9d3ec72
--- /dev/null
+++ b/data/as/30189381/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189381",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189381/ws-services-calculation/WCBillingSlab.json b/data/as/30189381/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a3e160a1a7
--- /dev/null
+++ b/data/as/30189381/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189381",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189391/BillingService/BusinessService.json b/data/as/30189391/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07eb741e47
--- /dev/null
+++ b/data/as/30189391/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189391",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189391/egov-location/boundary-data.json b/data/as/30189391/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d66c64552c
--- /dev/null
+++ b/data/as/30189391/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189391",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUNGHUNIRBHITA PWSS (NEW)",
+                "localname": "GHUNGHUNIRBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUNGHUNIRBHITA PWSS (NEW)",
+                        "localname": "GHUNGHUNIRBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUNGHUNIRBHITA PWSS (NEW)",
+                "localname": "GHUNGHUNIRBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189391",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUNGHUNIRBHITA PWSS (NEW)",
+                        "localname": "GHUNGHUNIRBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189391/ws-services-calculation/Penalty.json b/data/as/30189391/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e8b0355cbc
--- /dev/null
+++ b/data/as/30189391/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189391",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189391/ws-services-calculation/WCBillingSlab.json b/data/as/30189391/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..515ee6816b
--- /dev/null
+++ b/data/as/30189391/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189391",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189399/BillingService/BusinessService.json b/data/as/30189399/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d8a2199e90
--- /dev/null
+++ b/data/as/30189399/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189399",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189399/egov-location/boundary-data.json b/data/as/30189399/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dba25a6ae6
--- /dev/null
+++ b/data/as/30189399/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189399",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                "localname": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189399",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                        "localname": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                "localname": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189399",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                        "localname": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189399/ws-services-calculation/Penalty.json b/data/as/30189399/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d837ad9f52
--- /dev/null
+++ b/data/as/30189399/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189399",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189399/ws-services-calculation/WCBillingSlab.json b/data/as/30189399/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..def6fb455e
--- /dev/null
+++ b/data/as/30189399/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189399",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189413/BillingService/BusinessService.json b/data/as/30189413/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a9d801b22
--- /dev/null
+++ b/data/as/30189413/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189413",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189413/egov-location/boundary-data.json b/data/as/30189413/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e13b8fb118
--- /dev/null
+++ b/data/as/30189413/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189413",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOKPARA M PWSS (NEW)",
+                "localname": "TOKPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOKPARA M PWSS (NEW)",
+                        "localname": "TOKPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOKPARA M PWSS (NEW)",
+                "localname": "TOKPARA M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOKPARA M PWSS (NEW)",
+                        "localname": "TOKPARA M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189413/ws-services-calculation/Penalty.json b/data/as/30189413/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e6f6d825d0
--- /dev/null
+++ b/data/as/30189413/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189413",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189413/ws-services-calculation/WCBillingSlab.json b/data/as/30189413/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..28e2fe0914
--- /dev/null
+++ b/data/as/30189413/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189413",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189424/BillingService/BusinessService.json b/data/as/30189424/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f3d689663b
--- /dev/null
+++ b/data/as/30189424/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189424",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189424/egov-location/boundary-data.json b/data/as/30189424/egov-location/boundary-data.json
new file mode 100644
index 0000000000..253b3db968
--- /dev/null
+++ b/data/as/30189424/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189424",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                "localname": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189424",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                        "localname": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                "localname": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189424",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                        "localname": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189424/ws-services-calculation/Penalty.json b/data/as/30189424/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d8d99d0953
--- /dev/null
+++ b/data/as/30189424/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189424",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189424/ws-services-calculation/WCBillingSlab.json b/data/as/30189424/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..68dbac5a47
--- /dev/null
+++ b/data/as/30189424/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189424",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189431/BillingService/BusinessService.json b/data/as/30189431/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8a0854dac3
--- /dev/null
+++ b/data/as/30189431/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189431",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189431/egov-location/boundary-data.json b/data/as/30189431/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a290b71d9
--- /dev/null
+++ b/data/as/30189431/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189431",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUN TULI PWSS",
+                "localname": "BAGUN TULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189431",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUN TULI PWSS",
+                        "localname": "BAGUN TULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUN TULI PWSS",
+                "localname": "BAGUN TULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189431",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUN TULI PWSS",
+                        "localname": "BAGUN TULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189431/ws-services-calculation/Penalty.json b/data/as/30189431/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de5fef290c
--- /dev/null
+++ b/data/as/30189431/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189431",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189431/ws-services-calculation/WCBillingSlab.json b/data/as/30189431/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b268e800ab
--- /dev/null
+++ b/data/as/30189431/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189431",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189444/BillingService/BusinessService.json b/data/as/30189444/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e87bb6ee8a
--- /dev/null
+++ b/data/as/30189444/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189444",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189444/egov-location/boundary-data.json b/data/as/30189444/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4cb0fd245
--- /dev/null
+++ b/data/as/30189444/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189444",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMAHARU PWSS (NEW)",
+                "localname": "BORMAHARU PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMAHARU PWSS (NEW)",
+                        "localname": "BORMAHARU PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORMAHARU PWSS (NEW)",
+                "localname": "BORMAHARU PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORMAHARU PWSS (NEW)",
+                        "localname": "BORMAHARU PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189444/ws-services-calculation/Penalty.json b/data/as/30189444/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62cffa4496
--- /dev/null
+++ b/data/as/30189444/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189444",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189444/ws-services-calculation/WCBillingSlab.json b/data/as/30189444/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e1057d166
--- /dev/null
+++ b/data/as/30189444/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189444",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189455/BillingService/BusinessService.json b/data/as/30189455/BillingService/BusinessService.json
new file mode 100644
index 0000000000..84f7acf103
--- /dev/null
+++ b/data/as/30189455/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189455",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189455/egov-location/boundary-data.json b/data/as/30189455/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bbb7f6c8fa
--- /dev/null
+++ b/data/as/30189455/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189455",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARA PWSS (NEW)",
+                "localname": "GARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARA PWSS (NEW)",
+                        "localname": "GARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARA PWSS (NEW)",
+                "localname": "GARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189455",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARA PWSS (NEW)",
+                        "localname": "GARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189455/ws-services-calculation/Penalty.json b/data/as/30189455/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..82d2904bc2
--- /dev/null
+++ b/data/as/30189455/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189455",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189455/ws-services-calculation/WCBillingSlab.json b/data/as/30189455/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8686bb7024
--- /dev/null
+++ b/data/as/30189455/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189455",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189469/BillingService/BusinessService.json b/data/as/30189469/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b8b6dd0d7a
--- /dev/null
+++ b/data/as/30189469/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189469",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189469/egov-location/boundary-data.json b/data/as/30189469/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c956479c1
--- /dev/null
+++ b/data/as/30189469/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189469",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAPARA PWSS (NEW)",
+                "localname": "KALAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAPARA PWSS (NEW)",
+                        "localname": "KALAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAPARA PWSS (NEW)",
+                "localname": "KALAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAPARA PWSS (NEW)",
+                        "localname": "KALAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189469/ws-services-calculation/Penalty.json b/data/as/30189469/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a7a39501bb
--- /dev/null
+++ b/data/as/30189469/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189469",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189469/ws-services-calculation/WCBillingSlab.json b/data/as/30189469/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ceb02aa81f
--- /dev/null
+++ b/data/as/30189469/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189469",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189496/BillingService/BusinessService.json b/data/as/30189496/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5a810ae44
--- /dev/null
+++ b/data/as/30189496/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189496",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189496/egov-location/boundary-data.json b/data/as/30189496/egov-location/boundary-data.json
new file mode 100644
index 0000000000..58525994ad
--- /dev/null
+++ b/data/as/30189496/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189496",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALGARA PWSS (NEW)",
+                "localname": "NALGARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALGARA PWSS (NEW)",
+                        "localname": "NALGARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALGARA PWSS (NEW)",
+                "localname": "NALGARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189496",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALGARA PWSS (NEW)",
+                        "localname": "NALGARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189496/ws-services-calculation/Penalty.json b/data/as/30189496/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3b0eea81df
--- /dev/null
+++ b/data/as/30189496/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189496",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189496/ws-services-calculation/WCBillingSlab.json b/data/as/30189496/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7c19ea46b6
--- /dev/null
+++ b/data/as/30189496/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189496",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189526/BillingService/BusinessService.json b/data/as/30189526/BillingService/BusinessService.json
new file mode 100644
index 0000000000..61e6da3bd2
--- /dev/null
+++ b/data/as/30189526/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189526",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189526/egov-location/boundary-data.json b/data/as/30189526/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2caf4fc9ad
--- /dev/null
+++ b/data/as/30189526/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189526",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                "localname": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                        "localname": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                "localname": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189526",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                        "localname": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189526/ws-services-calculation/Penalty.json b/data/as/30189526/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2294779b4b
--- /dev/null
+++ b/data/as/30189526/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189526",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189526/ws-services-calculation/WCBillingSlab.json b/data/as/30189526/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca9ccc1bf6
--- /dev/null
+++ b/data/as/30189526/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189526",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189537/BillingService/BusinessService.json b/data/as/30189537/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e1fd86c018
--- /dev/null
+++ b/data/as/30189537/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189537",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189537/egov-location/boundary-data.json b/data/as/30189537/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e12eb804a7
--- /dev/null
+++ b/data/as/30189537/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189537",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHIALDHORA SPB M PWSS (NEW)",
+                "localname": "CHIALDHORA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHIALDHORA SPB M PWSS (NEW)",
+                        "localname": "CHIALDHORA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHIALDHORA SPB M PWSS (NEW)",
+                "localname": "CHIALDHORA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHIALDHORA SPB M PWSS (NEW)",
+                        "localname": "CHIALDHORA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189537/ws-services-calculation/Penalty.json b/data/as/30189537/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..821f233488
--- /dev/null
+++ b/data/as/30189537/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189537",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189537/ws-services-calculation/WCBillingSlab.json b/data/as/30189537/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..584b9eef35
--- /dev/null
+++ b/data/as/30189537/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189537",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189551/BillingService/BusinessService.json b/data/as/30189551/BillingService/BusinessService.json
new file mode 100644
index 0000000000..336c08a0b5
--- /dev/null
+++ b/data/as/30189551/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189551",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189551/egov-location/boundary-data.json b/data/as/30189551/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26a950bfcb
--- /dev/null
+++ b/data/as/30189551/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189551",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                "localname": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189551",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                        "localname": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                "localname": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189551",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                        "localname": "MOTHABARI PWSS (NEW) (TAKIMARI)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189551/ws-services-calculation/Penalty.json b/data/as/30189551/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cfb0367b24
--- /dev/null
+++ b/data/as/30189551/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189551",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189551/ws-services-calculation/WCBillingSlab.json b/data/as/30189551/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bb32efa45a
--- /dev/null
+++ b/data/as/30189551/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189551",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189562/BillingService/BusinessService.json b/data/as/30189562/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac272f2cd6
--- /dev/null
+++ b/data/as/30189562/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189562",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189562/egov-location/boundary-data.json b/data/as/30189562/egov-location/boundary-data.json
new file mode 100644
index 0000000000..faf9e4a008
--- /dev/null
+++ b/data/as/30189562/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189562",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIDYAPARA PWSS (NEW)",
+                "localname": "BIDYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIDYAPARA PWSS (NEW)",
+                        "localname": "BIDYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BIDYAPARA PWSS (NEW)",
+                "localname": "BIDYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189562",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BIDYAPARA PWSS (NEW)",
+                        "localname": "BIDYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189562/ws-services-calculation/Penalty.json b/data/as/30189562/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee8141210c
--- /dev/null
+++ b/data/as/30189562/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189562",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189562/ws-services-calculation/WCBillingSlab.json b/data/as/30189562/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5d960fe83
--- /dev/null
+++ b/data/as/30189562/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189562",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189571/BillingService/BusinessService.json b/data/as/30189571/BillingService/BusinessService.json
new file mode 100644
index 0000000000..922e67659b
--- /dev/null
+++ b/data/as/30189571/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189571",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189571/egov-location/boundary-data.json b/data/as/30189571/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d900676b45
--- /dev/null
+++ b/data/as/30189571/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189571",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                "localname": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                        "localname": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                "localname": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189571",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                        "localname": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189571/ws-services-calculation/Penalty.json b/data/as/30189571/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5ac9a08c42
--- /dev/null
+++ b/data/as/30189571/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189571",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189571/ws-services-calculation/WCBillingSlab.json b/data/as/30189571/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9a38f9eae
--- /dev/null
+++ b/data/as/30189571/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189571",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189582/BillingService/BusinessService.json b/data/as/30189582/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d44420d40
--- /dev/null
+++ b/data/as/30189582/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189582",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189582/egov-location/boundary-data.json b/data/as/30189582/egov-location/boundary-data.json
new file mode 100644
index 0000000000..62732d3358
--- /dev/null
+++ b/data/as/30189582/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189582",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOPAJULI PWSS (NEW)",
+                "localname": "TOPAJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189582",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOPAJULI PWSS (NEW)",
+                        "localname": "TOPAJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TOPAJULI PWSS (NEW)",
+                "localname": "TOPAJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189582",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TOPAJULI PWSS (NEW)",
+                        "localname": "TOPAJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189582/ws-services-calculation/Penalty.json b/data/as/30189582/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7927f91a7f
--- /dev/null
+++ b/data/as/30189582/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189582",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189582/ws-services-calculation/WCBillingSlab.json b/data/as/30189582/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c5e506bc30
--- /dev/null
+++ b/data/as/30189582/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189582",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189595/BillingService/BusinessService.json b/data/as/30189595/BillingService/BusinessService.json
new file mode 100644
index 0000000000..778721dad5
--- /dev/null
+++ b/data/as/30189595/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189595",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189595/egov-location/boundary-data.json b/data/as/30189595/egov-location/boundary-data.json
new file mode 100644
index 0000000000..193d658c0e
--- /dev/null
+++ b/data/as/30189595/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189595",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                "localname": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                        "localname": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                "localname": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                        "localname": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189595/ws-services-calculation/Penalty.json b/data/as/30189595/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9eb046071b
--- /dev/null
+++ b/data/as/30189595/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189595",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189595/ws-services-calculation/WCBillingSlab.json b/data/as/30189595/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..621371ca5d
--- /dev/null
+++ b/data/as/30189595/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189595",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189615/BillingService/BusinessService.json b/data/as/30189615/BillingService/BusinessService.json
new file mode 100644
index 0000000000..938bb4476c
--- /dev/null
+++ b/data/as/30189615/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30189615",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189615/egov-location/boundary-data.json b/data/as/30189615/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2ae8fc7c7f
--- /dev/null
+++ b/data/as/30189615/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30189615",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOIMARI PWSS (NEW)",
+                "localname": "KOIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOIMARI PWSS (NEW)",
+                        "localname": "KOIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOIMARI PWSS (NEW)",
+                "localname": "KOIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30189615",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOIMARI PWSS (NEW)",
+                        "localname": "KOIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189615/ws-services-calculation/Penalty.json b/data/as/30189615/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..77b6fe2ea2
--- /dev/null
+++ b/data/as/30189615/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30189615",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30189615/ws-services-calculation/WCBillingSlab.json b/data/as/30189615/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7e96e19bba
--- /dev/null
+++ b/data/as/30189615/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30189615",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191686/BillingService/BusinessService.json b/data/as/30191686/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7c56b3ebbc
--- /dev/null
+++ b/data/as/30191686/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191686",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191686/egov-location/boundary-data.json b/data/as/30191686/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1064b32790
--- /dev/null
+++ b/data/as/30191686/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191686",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHERGERALGA SPB M PWSS (NEW)",
+                "localname": "CHERGERALGA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHERGERALGA SPB M PWSS (NEW)",
+                        "localname": "CHERGERALGA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHERGERALGA SPB M PWSS (NEW)",
+                "localname": "CHERGERALGA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHERGERALGA SPB M PWSS (NEW)",
+                        "localname": "CHERGERALGA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191686/ws-services-calculation/Penalty.json b/data/as/30191686/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5975161725
--- /dev/null
+++ b/data/as/30191686/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191686",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191686/ws-services-calculation/WCBillingSlab.json b/data/as/30191686/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..40c7f2ffcd
--- /dev/null
+++ b/data/as/30191686/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191686",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191713/BillingService/BusinessService.json b/data/as/30191713/BillingService/BusinessService.json
new file mode 100644
index 0000000000..46ed5b49ea
--- /dev/null
+++ b/data/as/30191713/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191713",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191713/egov-location/boundary-data.json b/data/as/30191713/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7e062eb1c5
--- /dev/null
+++ b/data/as/30191713/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191713",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FULKAKATA SPB M PWSS (NEW)",
+                "localname": "FULKAKATA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191713",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FULKAKATA SPB M PWSS (NEW)",
+                        "localname": "FULKAKATA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FULKAKATA SPB M PWSS (NEW)",
+                "localname": "FULKAKATA SPB M PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191713",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FULKAKATA SPB M PWSS (NEW)",
+                        "localname": "FULKAKATA SPB M PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191713/ws-services-calculation/Penalty.json b/data/as/30191713/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..300e6e5cfb
--- /dev/null
+++ b/data/as/30191713/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191713",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191713/ws-services-calculation/WCBillingSlab.json b/data/as/30191713/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb78b3b8f9
--- /dev/null
+++ b/data/as/30191713/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191713",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191743/BillingService/BusinessService.json b/data/as/30191743/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1cfd67d45b
--- /dev/null
+++ b/data/as/30191743/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191743",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191743/egov-location/boundary-data.json b/data/as/30191743/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf1bd465a3
--- /dev/null
+++ b/data/as/30191743/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191743",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAYCHANDCHAR SPB PWSS (NEW)",
+                "localname": "RAYCHANDCHAR SPB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAYCHANDCHAR SPB PWSS (NEW)",
+                        "localname": "RAYCHANDCHAR SPB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAYCHANDCHAR SPB PWSS (NEW)",
+                "localname": "RAYCHANDCHAR SPB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAYCHANDCHAR SPB PWSS (NEW)",
+                        "localname": "RAYCHANDCHAR SPB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191743/ws-services-calculation/Penalty.json b/data/as/30191743/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1f968f1e7e
--- /dev/null
+++ b/data/as/30191743/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191743",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191743/ws-services-calculation/WCBillingSlab.json b/data/as/30191743/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a68395838
--- /dev/null
+++ b/data/as/30191743/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191743",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191765/BillingService/BusinessService.json b/data/as/30191765/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa5bb40289
--- /dev/null
+++ b/data/as/30191765/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191765",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191765/egov-location/boundary-data.json b/data/as/30191765/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a92b1e6a2c
--- /dev/null
+++ b/data/as/30191765/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191765",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                "localname": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191765",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                        "localname": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                "localname": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191765",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                        "localname": "GHUNGHUNIRBHITA M PWSS (NEW) (SIMLABARI)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191765/ws-services-calculation/Penalty.json b/data/as/30191765/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e825fb808d
--- /dev/null
+++ b/data/as/30191765/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191765",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191765/ws-services-calculation/WCBillingSlab.json b/data/as/30191765/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5fdde0a88e
--- /dev/null
+++ b/data/as/30191765/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191765",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191816/BillingService/BusinessService.json b/data/as/30191816/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9882acfde0
--- /dev/null
+++ b/data/as/30191816/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191816",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191816/egov-location/boundary-data.json b/data/as/30191816/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ce8af2f792
--- /dev/null
+++ b/data/as/30191816/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191816",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FALIMARI SASAN PWSS (NEW)",
+                "localname": "FALIMARI SASAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FALIMARI SASAN PWSS (NEW)",
+                        "localname": "FALIMARI SASAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FALIMARI SASAN PWSS (NEW)",
+                "localname": "FALIMARI SASAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191816",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FALIMARI SASAN PWSS (NEW)",
+                        "localname": "FALIMARI SASAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191816/ws-services-calculation/Penalty.json b/data/as/30191816/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1303cc635
--- /dev/null
+++ b/data/as/30191816/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191816",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191816/ws-services-calculation/WCBillingSlab.json b/data/as/30191816/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..16978befa8
--- /dev/null
+++ b/data/as/30191816/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191816",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191837/BillingService/BusinessService.json b/data/as/30191837/BillingService/BusinessService.json
new file mode 100644
index 0000000000..801e6153ef
--- /dev/null
+++ b/data/as/30191837/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191837",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191837/egov-location/boundary-data.json b/data/as/30191837/egov-location/boundary-data.json
new file mode 100644
index 0000000000..59509745de
--- /dev/null
+++ b/data/as/30191837/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191837",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALPARA PWSS (NEW)",
+                "localname": "MANDALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191837",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALPARA PWSS (NEW)",
+                        "localname": "MANDALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANDALPARA PWSS (NEW)",
+                "localname": "MANDALPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191837",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANDALPARA PWSS (NEW)",
+                        "localname": "MANDALPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191837/ws-services-calculation/Penalty.json b/data/as/30191837/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5333422a0b
--- /dev/null
+++ b/data/as/30191837/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191837",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191837/ws-services-calculation/WCBillingSlab.json b/data/as/30191837/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..399616b47b
--- /dev/null
+++ b/data/as/30191837/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191837",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191855/BillingService/BusinessService.json b/data/as/30191855/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4db1bb4583
--- /dev/null
+++ b/data/as/30191855/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191855",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191855/egov-location/boundary-data.json b/data/as/30191855/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c4c9909f62
--- /dev/null
+++ b/data/as/30191855/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191855",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAMER BOLA PWSS (NEW)",
+                "localname": "PAMER BOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAMER BOLA PWSS (NEW)",
+                        "localname": "PAMER BOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAMER BOLA PWSS (NEW)",
+                "localname": "PAMER BOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191855",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAMER BOLA PWSS (NEW)",
+                        "localname": "PAMER BOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191855/ws-services-calculation/Penalty.json b/data/as/30191855/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7fe802dde8
--- /dev/null
+++ b/data/as/30191855/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191855",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191855/ws-services-calculation/WCBillingSlab.json b/data/as/30191855/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3403b13447
--- /dev/null
+++ b/data/as/30191855/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191855",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191889/BillingService/BusinessService.json b/data/as/30191889/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2ab92c7e94
--- /dev/null
+++ b/data/as/30191889/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191889",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191889/egov-location/boundary-data.json b/data/as/30191889/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8135e1f108
--- /dev/null
+++ b/data/as/30191889/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191889",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                "localname": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191889",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                        "localname": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                "localname": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191889",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                        "localname": "CHAKLI DAMRIBHASA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191889/ws-services-calculation/Penalty.json b/data/as/30191889/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..760947384b
--- /dev/null
+++ b/data/as/30191889/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191889",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191889/ws-services-calculation/WCBillingSlab.json b/data/as/30191889/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7fa40c4f5a
--- /dev/null
+++ b/data/as/30191889/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191889",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191910/BillingService/BusinessService.json b/data/as/30191910/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a8fd563572
--- /dev/null
+++ b/data/as/30191910/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191910",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191910/egov-location/boundary-data.json b/data/as/30191910/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e73eda673c
--- /dev/null
+++ b/data/as/30191910/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191910",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERER CHAR PWSS (NEW)",
+                "localname": "KHERER CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERER CHAR PWSS (NEW)",
+                        "localname": "KHERER CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHERER CHAR PWSS (NEW)",
+                "localname": "KHERER CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHERER CHAR PWSS (NEW)",
+                        "localname": "KHERER CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191910/ws-services-calculation/Penalty.json b/data/as/30191910/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5e29dba2c
--- /dev/null
+++ b/data/as/30191910/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191910",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191910/ws-services-calculation/WCBillingSlab.json b/data/as/30191910/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..947054f7ca
--- /dev/null
+++ b/data/as/30191910/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191910",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191941/BillingService/BusinessService.json b/data/as/30191941/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a5af820fdc
--- /dev/null
+++ b/data/as/30191941/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191941",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191941/egov-location/boundary-data.json b/data/as/30191941/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a16935832
--- /dev/null
+++ b/data/as/30191941/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191941",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATAKATA PT-I SPB PWSS (NEW)",
+                "localname": "PATAKATA PT-I SPB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATAKATA PT-I SPB PWSS (NEW)",
+                        "localname": "PATAKATA PT-I SPB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PATAKATA PT-I SPB PWSS (NEW)",
+                "localname": "PATAKATA PT-I SPB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191941",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PATAKATA PT-I SPB PWSS (NEW)",
+                        "localname": "PATAKATA PT-I SPB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191941/ws-services-calculation/Penalty.json b/data/as/30191941/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ea7326a75e
--- /dev/null
+++ b/data/as/30191941/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191941",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191941/ws-services-calculation/WCBillingSlab.json b/data/as/30191941/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4c32d6ca32
--- /dev/null
+++ b/data/as/30191941/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191941",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191974/BillingService/BusinessService.json b/data/as/30191974/BillingService/BusinessService.json
new file mode 100644
index 0000000000..690d67d53e
--- /dev/null
+++ b/data/as/30191974/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30191974",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191974/egov-location/boundary-data.json b/data/as/30191974/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ac24e3ffa1
--- /dev/null
+++ b/data/as/30191974/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30191974",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                "localname": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                        "localname": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                "localname": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30191974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                        "localname": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191974/ws-services-calculation/Penalty.json b/data/as/30191974/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e591df13e
--- /dev/null
+++ b/data/as/30191974/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30191974",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30191974/ws-services-calculation/WCBillingSlab.json b/data/as/30191974/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..590c426ab3
--- /dev/null
+++ b/data/as/30191974/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30191974",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192001/BillingService/BusinessService.json b/data/as/30192001/BillingService/BusinessService.json
new file mode 100644
index 0000000000..72a580c686
--- /dev/null
+++ b/data/as/30192001/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30192001",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192001/egov-location/boundary-data.json b/data/as/30192001/egov-location/boundary-data.json
new file mode 100644
index 0000000000..602f1be9b8
--- /dev/null
+++ b/data/as/30192001/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30192001",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO HASHDOBA PWSS (NEW)",
+                "localname": "BORO HASHDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192001",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO HASHDOBA PWSS (NEW)",
+                        "localname": "BORO HASHDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO HASHDOBA PWSS (NEW)",
+                "localname": "BORO HASHDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192001",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO HASHDOBA PWSS (NEW)",
+                        "localname": "BORO HASHDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192001/ws-services-calculation/Penalty.json b/data/as/30192001/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..950f151a9d
--- /dev/null
+++ b/data/as/30192001/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30192001",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192001/ws-services-calculation/WCBillingSlab.json b/data/as/30192001/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47e769d978
--- /dev/null
+++ b/data/as/30192001/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30192001",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192026/BillingService/BusinessService.json b/data/as/30192026/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bb7ef7a9f6
--- /dev/null
+++ b/data/as/30192026/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30192026",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192026/egov-location/boundary-data.json b/data/as/30192026/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7ed2b4ba7d
--- /dev/null
+++ b/data/as/30192026/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30192026",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROJAN NO.1 PWSS (NEW)",
+                "localname": "GAROJAN NO.1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192026",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROJAN NO.1 PWSS (NEW)",
+                        "localname": "GAROJAN NO.1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROJAN NO.1 PWSS (NEW)",
+                "localname": "GAROJAN NO.1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192026",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROJAN NO.1 PWSS (NEW)",
+                        "localname": "GAROJAN NO.1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192026/ws-services-calculation/Penalty.json b/data/as/30192026/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dbf95f2b6c
--- /dev/null
+++ b/data/as/30192026/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30192026",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192026/ws-services-calculation/WCBillingSlab.json b/data/as/30192026/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94299ed719
--- /dev/null
+++ b/data/as/30192026/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30192026",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192045/BillingService/BusinessService.json b/data/as/30192045/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41d71dd230
--- /dev/null
+++ b/data/as/30192045/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30192045",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192045/egov-location/boundary-data.json b/data/as/30192045/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4bfaff6ac0
--- /dev/null
+++ b/data/as/30192045/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30192045",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROJAN NO.2 PWSS (NEW)",
+                "localname": "GAROJAN NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192045",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROJAN NO.2 PWSS (NEW)",
+                        "localname": "GAROJAN NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROJAN NO.2 PWSS (NEW)",
+                "localname": "GAROJAN NO.2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192045",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROJAN NO.2 PWSS (NEW)",
+                        "localname": "GAROJAN NO.2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192045/ws-services-calculation/Penalty.json b/data/as/30192045/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6789ab6bfa
--- /dev/null
+++ b/data/as/30192045/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30192045",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192045/ws-services-calculation/WCBillingSlab.json b/data/as/30192045/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7a9063440e
--- /dev/null
+++ b/data/as/30192045/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30192045",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192070/BillingService/BusinessService.json b/data/as/30192070/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f1ed66399
--- /dev/null
+++ b/data/as/30192070/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30192070",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192070/egov-location/boundary-data.json b/data/as/30192070/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0a8441cc68
--- /dev/null
+++ b/data/as/30192070/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30192070",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HALOIPARA PWSS (NEW)",
+                "localname": "HALOIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HALOIPARA PWSS (NEW)",
+                        "localname": "HALOIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HALOIPARA PWSS (NEW)",
+                "localname": "HALOIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192070",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HALOIPARA PWSS (NEW)",
+                        "localname": "HALOIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192070/ws-services-calculation/Penalty.json b/data/as/30192070/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1002ce4d58
--- /dev/null
+++ b/data/as/30192070/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30192070",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192070/ws-services-calculation/WCBillingSlab.json b/data/as/30192070/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ffaf3732cf
--- /dev/null
+++ b/data/as/30192070/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30192070",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192093/BillingService/BusinessService.json b/data/as/30192093/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e7218b709d
--- /dev/null
+++ b/data/as/30192093/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30192093",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192093/egov-location/boundary-data.json b/data/as/30192093/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf536ff6d3
--- /dev/null
+++ b/data/as/30192093/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30192093",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THORKO GAROPARA PWSS (NEW)",
+                "localname": "THORKO GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192093",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THORKO GAROPARA PWSS (NEW)",
+                        "localname": "THORKO GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THORKO GAROPARA PWSS (NEW)",
+                "localname": "THORKO GAROPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192093",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THORKO GAROPARA PWSS (NEW)",
+                        "localname": "THORKO GAROPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192093/ws-services-calculation/Penalty.json b/data/as/30192093/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4e5571b9c3
--- /dev/null
+++ b/data/as/30192093/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30192093",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192093/ws-services-calculation/WCBillingSlab.json b/data/as/30192093/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..418602be2a
--- /dev/null
+++ b/data/as/30192093/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30192093",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192129/BillingService/BusinessService.json b/data/as/30192129/BillingService/BusinessService.json
new file mode 100644
index 0000000000..34701ccff1
--- /dev/null
+++ b/data/as/30192129/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30192129",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192129/egov-location/boundary-data.json b/data/as/30192129/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4cf74cc64b
--- /dev/null
+++ b/data/as/30192129/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30192129",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                "localname": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                        "localname": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                "localname": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30192129",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                        "localname": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192129/ws-services-calculation/Penalty.json b/data/as/30192129/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d83959d51
--- /dev/null
+++ b/data/as/30192129/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30192129",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30192129/ws-services-calculation/WCBillingSlab.json b/data/as/30192129/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8a9d3d01d4
--- /dev/null
+++ b/data/as/30192129/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30192129",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30193693/BillingService/BusinessService.json b/data/as/30193693/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88ec35fa94
--- /dev/null
+++ b/data/as/30193693/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30193693",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30193693/egov-location/boundary-data.json b/data/as/30193693/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bffb9213ed
--- /dev/null
+++ b/data/as/30193693/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30193693",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAROWA BAGICHA NO. 2 PWSS",
+                "localname": "PAROWA BAGICHA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30193693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAROWA BAGICHA NO. 2 PWSS",
+                        "localname": "PAROWA BAGICHA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAROWA BAGICHA NO. 2 PWSS",
+                "localname": "PAROWA BAGICHA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30193693",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAROWA BAGICHA NO. 2 PWSS",
+                        "localname": "PAROWA BAGICHA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30193693/ws-services-calculation/Penalty.json b/data/as/30193693/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f1171e7c0
--- /dev/null
+++ b/data/as/30193693/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30193693",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30193693/ws-services-calculation/WCBillingSlab.json b/data/as/30193693/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2723349c78
--- /dev/null
+++ b/data/as/30193693/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30193693",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196401/BillingService/BusinessService.json b/data/as/30196401/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe0479e8a3
--- /dev/null
+++ b/data/as/30196401/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30196401",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196401/egov-location/boundary-data.json b/data/as/30196401/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a8cf4b70dc
--- /dev/null
+++ b/data/as/30196401/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30196401",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHREE PT-II PWSS (NEW)",
+                "localname": "BANDARSHREE PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHREE PT-II PWSS (NEW)",
+                        "localname": "BANDARSHREE PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANDARSHREE PT-II PWSS (NEW)",
+                "localname": "BANDARSHREE PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANDARSHREE PT-II PWSS (NEW)",
+                        "localname": "BANDARSHREE PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196401/ws-services-calculation/Penalty.json b/data/as/30196401/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..805bbccf6d
--- /dev/null
+++ b/data/as/30196401/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30196401",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196401/ws-services-calculation/WCBillingSlab.json b/data/as/30196401/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..02d0a2c410
--- /dev/null
+++ b/data/as/30196401/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30196401",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196757/BillingService/BusinessService.json b/data/as/30196757/BillingService/BusinessService.json
new file mode 100644
index 0000000000..806f8bbd8d
--- /dev/null
+++ b/data/as/30196757/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30196757",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196757/egov-location/boundary-data.json b/data/as/30196757/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e3e2fba97
--- /dev/null
+++ b/data/as/30196757/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30196757",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                "localname": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196757",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                        "localname": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                "localname": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196757",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                        "localname": "KALYANPUR PACHIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196757/ws-services-calculation/Penalty.json b/data/as/30196757/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c870a786bd
--- /dev/null
+++ b/data/as/30196757/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30196757",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196757/ws-services-calculation/WCBillingSlab.json b/data/as/30196757/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df4d9a6d65
--- /dev/null
+++ b/data/as/30196757/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30196757",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196783/BillingService/BusinessService.json b/data/as/30196783/BillingService/BusinessService.json
new file mode 100644
index 0000000000..193b65bfc9
--- /dev/null
+++ b/data/as/30196783/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30196783",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196783/egov-location/boundary-data.json b/data/as/30196783/egov-location/boundary-data.json
new file mode 100644
index 0000000000..940ea808bd
--- /dev/null
+++ b/data/as/30196783/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30196783",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MESERVITA NORTH PWSS (NEW)",
+                "localname": "MESERVITA NORTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MESERVITA NORTH PWSS (NEW)",
+                        "localname": "MESERVITA NORTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MESERVITA NORTH PWSS (NEW)",
+                "localname": "MESERVITA NORTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196783",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MESERVITA NORTH PWSS (NEW)",
+                        "localname": "MESERVITA NORTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196783/ws-services-calculation/Penalty.json b/data/as/30196783/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..35018ff599
--- /dev/null
+++ b/data/as/30196783/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30196783",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196783/ws-services-calculation/WCBillingSlab.json b/data/as/30196783/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f4ee0a611c
--- /dev/null
+++ b/data/as/30196783/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30196783",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196788/BillingService/BusinessService.json b/data/as/30196788/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9187abb5a7
--- /dev/null
+++ b/data/as/30196788/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30196788",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196788/egov-location/boundary-data.json b/data/as/30196788/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c9b67023af
--- /dev/null
+++ b/data/as/30196788/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30196788",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATOGAON PT-I PWSS (NEW)",
+                "localname": "HATOGAON PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATOGAON PT-I PWSS (NEW)",
+                        "localname": "HATOGAON PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATOGAON PT-I PWSS (NEW)",
+                "localname": "HATOGAON PT-I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATOGAON PT-I PWSS (NEW)",
+                        "localname": "HATOGAON PT-I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196788/ws-services-calculation/Penalty.json b/data/as/30196788/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8965334d6b
--- /dev/null
+++ b/data/as/30196788/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30196788",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196788/ws-services-calculation/WCBillingSlab.json b/data/as/30196788/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7601690ca4
--- /dev/null
+++ b/data/as/30196788/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30196788",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196800/BillingService/BusinessService.json b/data/as/30196800/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d77712df1b
--- /dev/null
+++ b/data/as/30196800/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30196800",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196800/egov-location/boundary-data.json b/data/as/30196800/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a9efbf4610
--- /dev/null
+++ b/data/as/30196800/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30196800",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                "localname": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                        "localname": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                "localname": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196800",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                        "localname": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196800/ws-services-calculation/Penalty.json b/data/as/30196800/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ee5d55a60
--- /dev/null
+++ b/data/as/30196800/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30196800",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196800/ws-services-calculation/WCBillingSlab.json b/data/as/30196800/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1e62e0955a
--- /dev/null
+++ b/data/as/30196800/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30196800",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196806/BillingService/BusinessService.json b/data/as/30196806/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c664a676ab
--- /dev/null
+++ b/data/as/30196806/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30196806",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196806/egov-location/boundary-data.json b/data/as/30196806/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aad8c026d7
--- /dev/null
+++ b/data/as/30196806/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30196806",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                "localname": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                        "localname": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                "localname": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30196806",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                        "localname": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196806/ws-services-calculation/Penalty.json b/data/as/30196806/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca6e5f3b3c
--- /dev/null
+++ b/data/as/30196806/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30196806",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30196806/ws-services-calculation/WCBillingSlab.json b/data/as/30196806/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..85bdf8d95d
--- /dev/null
+++ b/data/as/30196806/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30196806",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199561/BillingService/BusinessService.json b/data/as/30199561/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1dcaf61c34
--- /dev/null
+++ b/data/as/30199561/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30199561",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199561/egov-location/boundary-data.json b/data/as/30199561/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7a2a25ae78
--- /dev/null
+++ b/data/as/30199561/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30199561",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORAIMARI PWSS",
+                "localname": "GORAIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199561",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORAIMARI PWSS",
+                        "localname": "GORAIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GORAIMARI PWSS",
+                "localname": "GORAIMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199561",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GORAIMARI PWSS",
+                        "localname": "GORAIMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199561/ws-services-calculation/Penalty.json b/data/as/30199561/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0d9607c49d
--- /dev/null
+++ b/data/as/30199561/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30199561",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199561/ws-services-calculation/WCBillingSlab.json b/data/as/30199561/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d461c1712e
--- /dev/null
+++ b/data/as/30199561/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30199561",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199580/BillingService/BusinessService.json b/data/as/30199580/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b2d75cc3b0
--- /dev/null
+++ b/data/as/30199580/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30199580",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199580/egov-location/boundary-data.json b/data/as/30199580/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a7c111efc
--- /dev/null
+++ b/data/as/30199580/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30199580",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 SIRUANI MPWS",
+                "localname": "NO. 1 SIRUANI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199580",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 SIRUANI MPWS",
+                        "localname": "NO. 1 SIRUANI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 SIRUANI MPWS",
+                "localname": "NO. 1 SIRUANI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199580",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 SIRUANI MPWS",
+                        "localname": "NO. 1 SIRUANI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199580/ws-services-calculation/Penalty.json b/data/as/30199580/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..79b254c569
--- /dev/null
+++ b/data/as/30199580/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30199580",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199580/ws-services-calculation/WCBillingSlab.json b/data/as/30199580/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aba50d6eec
--- /dev/null
+++ b/data/as/30199580/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30199580",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199609/BillingService/BusinessService.json b/data/as/30199609/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1621fed6de
--- /dev/null
+++ b/data/as/30199609/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30199609",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199609/egov-location/boundary-data.json b/data/as/30199609/egov-location/boundary-data.json
new file mode 100644
index 0000000000..17eee65d14
--- /dev/null
+++ b/data/as/30199609/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30199609",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 HATIBARI T.E. PWSS",
+                "localname": "NO. 2 HATIBARI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 HATIBARI T.E. PWSS",
+                        "localname": "NO. 2 HATIBARI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 HATIBARI T.E. PWSS",
+                "localname": "NO. 2 HATIBARI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199609",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 HATIBARI T.E. PWSS",
+                        "localname": "NO. 2 HATIBARI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199609/ws-services-calculation/Penalty.json b/data/as/30199609/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2ec26a9078
--- /dev/null
+++ b/data/as/30199609/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30199609",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199609/ws-services-calculation/WCBillingSlab.json b/data/as/30199609/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..df851a767f
--- /dev/null
+++ b/data/as/30199609/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30199609",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199656/BillingService/BusinessService.json b/data/as/30199656/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90e64af633
--- /dev/null
+++ b/data/as/30199656/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30199656",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199656/egov-location/boundary-data.json b/data/as/30199656/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a29d403b1a
--- /dev/null
+++ b/data/as/30199656/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30199656",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAN GAJAN MIRI PATHAR PWSS",
+                "localname": "RAN GAJAN MIRI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199656",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAN GAJAN MIRI PATHAR PWSS",
+                        "localname": "RAN GAJAN MIRI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAN GAJAN MIRI PATHAR PWSS",
+                "localname": "RAN GAJAN MIRI PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30199656",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAN GAJAN MIRI PATHAR PWSS",
+                        "localname": "RAN GAJAN MIRI PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199656/ws-services-calculation/Penalty.json b/data/as/30199656/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d9660e5c90
--- /dev/null
+++ b/data/as/30199656/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30199656",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30199656/ws-services-calculation/WCBillingSlab.json b/data/as/30199656/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..89eef27bf3
--- /dev/null
+++ b/data/as/30199656/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30199656",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200209/BillingService/BusinessService.json b/data/as/30200209/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1cdffd3b67
--- /dev/null
+++ b/data/as/30200209/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200209",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200209/egov-location/boundary-data.json b/data/as/30200209/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e8cb36959
--- /dev/null
+++ b/data/as/30200209/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200209",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                "localname": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                        "localname": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                "localname": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200209",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                        "localname": "RETROFITTING OF GATANGA KAHDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200209/ws-services-calculation/Penalty.json b/data/as/30200209/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3072603853
--- /dev/null
+++ b/data/as/30200209/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200209",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200209/ws-services-calculation/WCBillingSlab.json b/data/as/30200209/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..14b347bdda
--- /dev/null
+++ b/data/as/30200209/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200209",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200338/BillingService/BusinessService.json b/data/as/30200338/BillingService/BusinessService.json
new file mode 100644
index 0000000000..be83976f74
--- /dev/null
+++ b/data/as/30200338/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200338",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200338/egov-location/boundary-data.json b/data/as/30200338/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f308cbe708
--- /dev/null
+++ b/data/as/30200338/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200338",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATIACHUBURI PWSS",
+                "localname": "RETROFITTING OF PATIACHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200338",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATIACHUBURI PWSS",
+                        "localname": "RETROFITTING OF PATIACHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PATIACHUBURI PWSS",
+                "localname": "RETROFITTING OF PATIACHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200338",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PATIACHUBURI PWSS",
+                        "localname": "RETROFITTING OF PATIACHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200338/ws-services-calculation/Penalty.json b/data/as/30200338/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1b883809b8
--- /dev/null
+++ b/data/as/30200338/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200338",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200338/ws-services-calculation/WCBillingSlab.json b/data/as/30200338/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..29f7bbad0b
--- /dev/null
+++ b/data/as/30200338/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200338",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200348/BillingService/BusinessService.json b/data/as/30200348/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f09340c4fb
--- /dev/null
+++ b/data/as/30200348/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200348",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200348/egov-location/boundary-data.json b/data/as/30200348/egov-location/boundary-data.json
new file mode 100644
index 0000000000..892c157c40
--- /dev/null
+++ b/data/as/30200348/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200348",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIDOL PWSS",
+                "localname": "RETROFITTING OF DHEKIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200348",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIDOL PWSS",
+                        "localname": "RETROFITTING OF DHEKIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF DHEKIDOL PWSS",
+                "localname": "RETROFITTING OF DHEKIDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200348",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF DHEKIDOL PWSS",
+                        "localname": "RETROFITTING OF DHEKIDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200348/ws-services-calculation/Penalty.json b/data/as/30200348/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90f0d94928
--- /dev/null
+++ b/data/as/30200348/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200348",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200348/ws-services-calculation/WCBillingSlab.json b/data/as/30200348/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c061f2a06b
--- /dev/null
+++ b/data/as/30200348/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200348",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200365/BillingService/BusinessService.json b/data/as/30200365/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eee546b63b
--- /dev/null
+++ b/data/as/30200365/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200365",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200365/egov-location/boundary-data.json b/data/as/30200365/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1e1ffd81c
--- /dev/null
+++ b/data/as/30200365/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200365",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAMDHARA PWSS",
+                "localname": "RETROFITTING OF CHAMDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200365",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAMDHARA PWSS",
+                        "localname": "RETROFITTING OF CHAMDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF CHAMDHARA PWSS",
+                "localname": "RETROFITTING OF CHAMDHARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200365",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF CHAMDHARA PWSS",
+                        "localname": "RETROFITTING OF CHAMDHARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200365/ws-services-calculation/Penalty.json b/data/as/30200365/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a089430c6e
--- /dev/null
+++ b/data/as/30200365/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200365",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200365/ws-services-calculation/WCBillingSlab.json b/data/as/30200365/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..46ac308b2d
--- /dev/null
+++ b/data/as/30200365/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200365",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200373/BillingService/BusinessService.json b/data/as/30200373/BillingService/BusinessService.json
new file mode 100644
index 0000000000..89b09fbdac
--- /dev/null
+++ b/data/as/30200373/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200373",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200373/egov-location/boundary-data.json b/data/as/30200373/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8f078a3b76
--- /dev/null
+++ b/data/as/30200373/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200373",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MORONAKURI PWSS",
+                "localname": "RETROFITTING OF MORONAKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MORONAKURI PWSS",
+                        "localname": "RETROFITTING OF MORONAKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF MORONAKURI PWSS",
+                "localname": "RETROFITTING OF MORONAKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200373",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF MORONAKURI PWSS",
+                        "localname": "RETROFITTING OF MORONAKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200373/ws-services-calculation/Penalty.json b/data/as/30200373/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ac9672436d
--- /dev/null
+++ b/data/as/30200373/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200373",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200373/ws-services-calculation/WCBillingSlab.json b/data/as/30200373/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f32248fe9
--- /dev/null
+++ b/data/as/30200373/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200373",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200381/BillingService/BusinessService.json b/data/as/30200381/BillingService/BusinessService.json
new file mode 100644
index 0000000000..045fdc52f5
--- /dev/null
+++ b/data/as/30200381/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200381",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200381/egov-location/boundary-data.json b/data/as/30200381/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20212b025d
--- /dev/null
+++ b/data/as/30200381/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200381",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SESSA TE PWSS",
+                "localname": "RETROFITTING OF SESSA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SESSA TE PWSS",
+                        "localname": "RETROFITTING OF SESSA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF SESSA TE PWSS",
+                "localname": "RETROFITTING OF SESSA TE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200381",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF SESSA TE PWSS",
+                        "localname": "RETROFITTING OF SESSA TE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200381/ws-services-calculation/Penalty.json b/data/as/30200381/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..17d1d5b48e
--- /dev/null
+++ b/data/as/30200381/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200381",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200381/ws-services-calculation/WCBillingSlab.json b/data/as/30200381/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3f5716bd20
--- /dev/null
+++ b/data/as/30200381/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200381",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200390/BillingService/BusinessService.json b/data/as/30200390/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e451e7227
--- /dev/null
+++ b/data/as/30200390/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200390",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200390/egov-location/boundary-data.json b/data/as/30200390/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4d1c0061ce
--- /dev/null
+++ b/data/as/30200390/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200390",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TARAJULIGAON PWSS",
+                "localname": "RETROFITTING OF TARAJULIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200390",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TARAJULIGAON PWSS",
+                        "localname": "RETROFITTING OF TARAJULIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF TARAJULIGAON PWSS",
+                "localname": "RETROFITTING OF TARAJULIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200390",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF TARAJULIGAON PWSS",
+                        "localname": "RETROFITTING OF TARAJULIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200390/ws-services-calculation/Penalty.json b/data/as/30200390/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2db5033653
--- /dev/null
+++ b/data/as/30200390/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200390",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200390/ws-services-calculation/WCBillingSlab.json b/data/as/30200390/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd6a51b046
--- /dev/null
+++ b/data/as/30200390/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200390",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200395/BillingService/BusinessService.json b/data/as/30200395/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d3455201c6
--- /dev/null
+++ b/data/as/30200395/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30200395",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200395/egov-location/boundary-data.json b/data/as/30200395/egov-location/boundary-data.json
new file mode 100644
index 0000000000..763bdf20bd
--- /dev/null
+++ b/data/as/30200395/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30200395",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NORTH SOOTEA PWSS",
+                "localname": "RETROFITTING OF NORTH SOOTEA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NORTH SOOTEA PWSS",
+                        "localname": "RETROFITTING OF NORTH SOOTEA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NORTH SOOTEA PWSS",
+                "localname": "RETROFITTING OF NORTH SOOTEA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30200395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NORTH SOOTEA PWSS",
+                        "localname": "RETROFITTING OF NORTH SOOTEA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200395/ws-services-calculation/Penalty.json b/data/as/30200395/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..62c6afb059
--- /dev/null
+++ b/data/as/30200395/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30200395",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30200395/ws-services-calculation/WCBillingSlab.json b/data/as/30200395/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..71bb715883
--- /dev/null
+++ b/data/as/30200395/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30200395",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201829/BillingService/BusinessService.json b/data/as/30201829/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6abf9e257d
--- /dev/null
+++ b/data/as/30201829/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201829",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201829/egov-location/boundary-data.json b/data/as/30201829/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e7fbbe26c
--- /dev/null
+++ b/data/as/30201829/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201829",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADIBASHI CHUBURI PWSS",
+                "localname": "ADIBASHI CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201829",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADIBASHI CHUBURI PWSS",
+                        "localname": "ADIBASHI CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADIBASHI CHUBURI PWSS",
+                "localname": "ADIBASHI CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201829",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADIBASHI CHUBURI PWSS",
+                        "localname": "ADIBASHI CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201829/ws-services-calculation/Penalty.json b/data/as/30201829/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6cedbe3700
--- /dev/null
+++ b/data/as/30201829/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201829",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201829/ws-services-calculation/WCBillingSlab.json b/data/as/30201829/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..96b17a247f
--- /dev/null
+++ b/data/as/30201829/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201829",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201845/BillingService/BusinessService.json b/data/as/30201845/BillingService/BusinessService.json
new file mode 100644
index 0000000000..73a7b0d02d
--- /dev/null
+++ b/data/as/30201845/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201845",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201845/egov-location/boundary-data.json b/data/as/30201845/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2bb33a7292
--- /dev/null
+++ b/data/as/30201845/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201845",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMLOGA NO. 2 PWSS",
+                "localname": "AMLOGA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMLOGA NO. 2 PWSS",
+                        "localname": "AMLOGA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AMLOGA NO. 2 PWSS",
+                "localname": "AMLOGA NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AMLOGA NO. 2 PWSS",
+                        "localname": "AMLOGA NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201845/ws-services-calculation/Penalty.json b/data/as/30201845/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef90676d7b
--- /dev/null
+++ b/data/as/30201845/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201845",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201845/ws-services-calculation/WCBillingSlab.json b/data/as/30201845/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c968c0b9c6
--- /dev/null
+++ b/data/as/30201845/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201845",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201859/BillingService/BusinessService.json b/data/as/30201859/BillingService/BusinessService.json
new file mode 100644
index 0000000000..36dde9fc36
--- /dev/null
+++ b/data/as/30201859/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201859",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201859/egov-location/boundary-data.json b/data/as/30201859/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a324785210
--- /dev/null
+++ b/data/as/30201859/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201859",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANADIKORAI PWSS",
+                "localname": "ANADIKORAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201859",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANADIKORAI PWSS",
+                        "localname": "ANADIKORAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ANADIKORAI PWSS",
+                "localname": "ANADIKORAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201859",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ANADIKORAI PWSS",
+                        "localname": "ANADIKORAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201859/ws-services-calculation/Penalty.json b/data/as/30201859/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd524ce20c
--- /dev/null
+++ b/data/as/30201859/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201859",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201859/ws-services-calculation/WCBillingSlab.json b/data/as/30201859/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5fe842eb08
--- /dev/null
+++ b/data/as/30201859/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201859",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201868/BillingService/BusinessService.json b/data/as/30201868/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fc9a68aff6
--- /dev/null
+++ b/data/as/30201868/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201868",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201868/egov-location/boundary-data.json b/data/as/30201868/egov-location/boundary-data.json
new file mode 100644
index 0000000000..941f072b7a
--- /dev/null
+++ b/data/as/30201868/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201868",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AUHOLAGAON MPWS",
+                "localname": "AUHOLAGAON MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201868",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AUHOLAGAON MPWS",
+                        "localname": "AUHOLAGAON MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AUHOLAGAON MPWS",
+                "localname": "AUHOLAGAON MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201868",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AUHOLAGAON MPWS",
+                        "localname": "AUHOLAGAON MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201868/ws-services-calculation/Penalty.json b/data/as/30201868/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6554b3dafc
--- /dev/null
+++ b/data/as/30201868/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201868",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201868/ws-services-calculation/WCBillingSlab.json b/data/as/30201868/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..508ef588b5
--- /dev/null
+++ b/data/as/30201868/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201868",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201884/BillingService/BusinessService.json b/data/as/30201884/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2c0820be5a
--- /dev/null
+++ b/data/as/30201884/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201884",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201884/egov-location/boundary-data.json b/data/as/30201884/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6809127031
--- /dev/null
+++ b/data/as/30201884/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201884",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKULA PATHAR PWSS",
+                "localname": "BAKULA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201884",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKULA PATHAR PWSS",
+                        "localname": "BAKULA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKULA PATHAR PWSS",
+                "localname": "BAKULA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201884",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKULA PATHAR PWSS",
+                        "localname": "BAKULA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201884/ws-services-calculation/Penalty.json b/data/as/30201884/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..eb1f803a1f
--- /dev/null
+++ b/data/as/30201884/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201884",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201884/ws-services-calculation/WCBillingSlab.json b/data/as/30201884/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc2a78a032
--- /dev/null
+++ b/data/as/30201884/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201884",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201910/BillingService/BusinessService.json b/data/as/30201910/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ec24dc3f2f
--- /dev/null
+++ b/data/as/30201910/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201910",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201910/egov-location/boundary-data.json b/data/as/30201910/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a43c6d6703
--- /dev/null
+++ b/data/as/30201910/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201910",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER GEREKI MPWS",
+                "localname": "UPPER GEREKI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER GEREKI MPWS",
+                        "localname": "UPPER GEREKI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER GEREKI MPWS",
+                "localname": "UPPER GEREKI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201910",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER GEREKI MPWS",
+                        "localname": "UPPER GEREKI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201910/ws-services-calculation/Penalty.json b/data/as/30201910/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b828058ae
--- /dev/null
+++ b/data/as/30201910/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201910",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201910/ws-services-calculation/WCBillingSlab.json b/data/as/30201910/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fe05e340a3
--- /dev/null
+++ b/data/as/30201910/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201910",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201927/BillingService/BusinessService.json b/data/as/30201927/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6855a9d2d2
--- /dev/null
+++ b/data/as/30201927/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201927",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201927/egov-location/boundary-data.json b/data/as/30201927/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b056ce982
--- /dev/null
+++ b/data/as/30201927/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201927",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPOR MORONAKURI PWSS",
+                "localname": "UPOR MORONAKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201927",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPOR MORONAKURI PWSS",
+                        "localname": "UPOR MORONAKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPOR MORONAKURI PWSS",
+                "localname": "UPOR MORONAKURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201927",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPOR MORONAKURI PWSS",
+                        "localname": "UPOR MORONAKURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201927/ws-services-calculation/Penalty.json b/data/as/30201927/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..04b244a865
--- /dev/null
+++ b/data/as/30201927/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201927",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201927/ws-services-calculation/WCBillingSlab.json b/data/as/30201927/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..00cc2d9ae0
--- /dev/null
+++ b/data/as/30201927/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201927",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201982/BillingService/BusinessService.json b/data/as/30201982/BillingService/BusinessService.json
new file mode 100644
index 0000000000..45224ac3b0
--- /dev/null
+++ b/data/as/30201982/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201982",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201982/egov-location/boundary-data.json b/data/as/30201982/egov-location/boundary-data.json
new file mode 100644
index 0000000000..099b445809
--- /dev/null
+++ b/data/as/30201982/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201982",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGA BIL PWSS",
+                "localname": "TENGA BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201982",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGA BIL PWSS",
+                        "localname": "TENGA BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TENGA BIL PWSS",
+                "localname": "TENGA BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201982",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TENGA BIL PWSS",
+                        "localname": "TENGA BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201982/ws-services-calculation/Penalty.json b/data/as/30201982/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..daceb86be7
--- /dev/null
+++ b/data/as/30201982/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201982",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201982/ws-services-calculation/WCBillingSlab.json b/data/as/30201982/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e5415f300e
--- /dev/null
+++ b/data/as/30201982/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201982",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201998/BillingService/BusinessService.json b/data/as/30201998/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a6a66bb22
--- /dev/null
+++ b/data/as/30201998/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30201998",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201998/egov-location/boundary-data.json b/data/as/30201998/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5b89d4a913
--- /dev/null
+++ b/data/as/30201998/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30201998",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THAIGIR BARI PWSS",
+                "localname": "THAIGIR BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THAIGIR BARI PWSS",
+                        "localname": "THAIGIR BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THAIGIR BARI PWSS",
+                "localname": "THAIGIR BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30201998",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THAIGIR BARI PWSS",
+                        "localname": "THAIGIR BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201998/ws-services-calculation/Penalty.json b/data/as/30201998/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6c073a458e
--- /dev/null
+++ b/data/as/30201998/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30201998",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30201998/ws-services-calculation/WCBillingSlab.json b/data/as/30201998/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b35fe73d92
--- /dev/null
+++ b/data/as/30201998/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30201998",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202047/BillingService/BusinessService.json b/data/as/30202047/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d53aeb9b4
--- /dev/null
+++ b/data/as/30202047/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202047",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202047/egov-location/boundary-data.json b/data/as/30202047/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2c0788a8e6
--- /dev/null
+++ b/data/as/30202047/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202047",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIPUKHURI PWSS",
+                "localname": "BALIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202047",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIPUKHURI PWSS",
+                        "localname": "BALIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIPUKHURI PWSS",
+                "localname": "BALIPUKHURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202047",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIPUKHURI PWSS",
+                        "localname": "BALIPUKHURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202047/ws-services-calculation/Penalty.json b/data/as/30202047/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b16a12b0d3
--- /dev/null
+++ b/data/as/30202047/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202047",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202047/ws-services-calculation/WCBillingSlab.json b/data/as/30202047/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a6f4299df
--- /dev/null
+++ b/data/as/30202047/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202047",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202048/BillingService/BusinessService.json b/data/as/30202048/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fd41dfdbb5
--- /dev/null
+++ b/data/as/30202048/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202048",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202048/egov-location/boundary-data.json b/data/as/30202048/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e0baa282e8
--- /dev/null
+++ b/data/as/30202048/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202048",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKERALOGA PWSS",
+                "localname": "THEKERALOGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKERALOGA PWSS",
+                        "localname": "THEKERALOGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKERALOGA PWSS",
+                "localname": "THEKERALOGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202048",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKERALOGA PWSS",
+                        "localname": "THEKERALOGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202048/ws-services-calculation/Penalty.json b/data/as/30202048/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d659ccf00f
--- /dev/null
+++ b/data/as/30202048/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202048",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202048/ws-services-calculation/WCBillingSlab.json b/data/as/30202048/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f7fa1b50a5
--- /dev/null
+++ b/data/as/30202048/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202048",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202080/BillingService/BusinessService.json b/data/as/30202080/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7fe2d6e863
--- /dev/null
+++ b/data/as/30202080/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202080",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202080/egov-location/boundary-data.json b/data/as/30202080/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6fecb00854
--- /dev/null
+++ b/data/as/30202080/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202080",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPAR TALAKABARI PWSS",
+                "localname": "UPAR TALAKABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPAR TALAKABARI PWSS",
+                        "localname": "UPAR TALAKABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPAR TALAKABARI PWSS",
+                "localname": "UPAR TALAKABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202080",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPAR TALAKABARI PWSS",
+                        "localname": "UPAR TALAKABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202080/ws-services-calculation/Penalty.json b/data/as/30202080/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d262a8b310
--- /dev/null
+++ b/data/as/30202080/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202080",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202080/ws-services-calculation/WCBillingSlab.json b/data/as/30202080/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7925c21d94
--- /dev/null
+++ b/data/as/30202080/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202080",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202118/BillingService/BusinessService.json b/data/as/30202118/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c1becc8f16
--- /dev/null
+++ b/data/as/30202118/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202118",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202118/egov-location/boundary-data.json b/data/as/30202118/egov-location/boundary-data.json
new file mode 100644
index 0000000000..935b437f61
--- /dev/null
+++ b/data/as/30202118/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202118",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARABARI PWSS",
+                "localname": "TARABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202118",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARABARI PWSS",
+                        "localname": "TARABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARABARI PWSS",
+                "localname": "TARABARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202118",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARABARI PWSS",
+                        "localname": "TARABARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202118/ws-services-calculation/Penalty.json b/data/as/30202118/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5b8145869
--- /dev/null
+++ b/data/as/30202118/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202118",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202118/ws-services-calculation/WCBillingSlab.json b/data/as/30202118/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c86ac6ad83
--- /dev/null
+++ b/data/as/30202118/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202118",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202288/BillingService/BusinessService.json b/data/as/30202288/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6a28d47e9f
--- /dev/null
+++ b/data/as/30202288/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202288",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202288/egov-location/boundary-data.json b/data/as/30202288/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2e44efe3f3
--- /dev/null
+++ b/data/as/30202288/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202288",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNIPAM PWSS",
+                "localname": "BAMUNIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNIPAM PWSS",
+                        "localname": "BAMUNIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAMUNIPAM PWSS",
+                "localname": "BAMUNIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202288",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAMUNIPAM PWSS",
+                        "localname": "BAMUNIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202288/ws-services-calculation/Penalty.json b/data/as/30202288/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dd4c54c36c
--- /dev/null
+++ b/data/as/30202288/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202288",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202288/ws-services-calculation/WCBillingSlab.json b/data/as/30202288/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d5e6f7b9bf
--- /dev/null
+++ b/data/as/30202288/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202288",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202311/BillingService/BusinessService.json b/data/as/30202311/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2532bf12f1
--- /dev/null
+++ b/data/as/30202311/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202311",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202311/egov-location/boundary-data.json b/data/as/30202311/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4aae783955
--- /dev/null
+++ b/data/as/30202311/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202311",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGA BASTI PWSS",
+                "localname": "BANGA BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGA BASTI PWSS",
+                        "localname": "BANGA BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGA BASTI PWSS",
+                "localname": "BANGA BASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202311",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGA BASTI PWSS",
+                        "localname": "BANGA BASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202311/ws-services-calculation/Penalty.json b/data/as/30202311/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..77ab41827e
--- /dev/null
+++ b/data/as/30202311/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202311",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202311/ws-services-calculation/WCBillingSlab.json b/data/as/30202311/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8cd6ac3b5b
--- /dev/null
+++ b/data/as/30202311/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202311",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202346/BillingService/BusinessService.json b/data/as/30202346/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d5a2431f8
--- /dev/null
+++ b/data/as/30202346/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202346",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202346/egov-location/boundary-data.json b/data/as/30202346/egov-location/boundary-data.json
new file mode 100644
index 0000000000..49eecad739
--- /dev/null
+++ b/data/as/30202346/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202346",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR DIKARAI BALI CHAPORI MPWS",
+                "localname": "BAR DIKARAI BALI CHAPORI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR DIKARAI BALI CHAPORI MPWS",
+                        "localname": "BAR DIKARAI BALI CHAPORI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAR DIKARAI BALI CHAPORI MPWS",
+                "localname": "BAR DIKARAI BALI CHAPORI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202346",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAR DIKARAI BALI CHAPORI MPWS",
+                        "localname": "BAR DIKARAI BALI CHAPORI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202346/ws-services-calculation/Penalty.json b/data/as/30202346/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..37dd406fb1
--- /dev/null
+++ b/data/as/30202346/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202346",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202346/ws-services-calculation/WCBillingSlab.json b/data/as/30202346/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1406de16a2
--- /dev/null
+++ b/data/as/30202346/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202346",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202436/BillingService/BusinessService.json b/data/as/30202436/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c37d82389e
--- /dev/null
+++ b/data/as/30202436/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202436",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202436/egov-location/boundary-data.json b/data/as/30202436/egov-location/boundary-data.json
new file mode 100644
index 0000000000..53a390aa7f
--- /dev/null
+++ b/data/as/30202436/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202436",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARKHAPUR MPWS",
+                "localname": "BARKHAPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202436",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARKHAPUR MPWS",
+                        "localname": "BARKHAPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARKHAPUR MPWS",
+                "localname": "BARKHAPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202436",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARKHAPUR MPWS",
+                        "localname": "BARKHAPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202436/ws-services-calculation/Penalty.json b/data/as/30202436/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..45c77e82ad
--- /dev/null
+++ b/data/as/30202436/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202436",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202436/ws-services-calculation/WCBillingSlab.json b/data/as/30202436/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4dd4feb4f1
--- /dev/null
+++ b/data/as/30202436/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202436",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202462/BillingService/BusinessService.json b/data/as/30202462/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b49ca08c5
--- /dev/null
+++ b/data/as/30202462/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202462",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202462/egov-location/boundary-data.json b/data/as/30202462/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b48f6bb78e
--- /dev/null
+++ b/data/as/30202462/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202462",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKPUNG NIGAM PWSS",
+                "localname": "BHALUKPUNG NIGAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202462",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKPUNG NIGAM PWSS",
+                        "localname": "BHALUKPUNG NIGAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKPUNG NIGAM PWSS",
+                "localname": "BHALUKPUNG NIGAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202462",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKPUNG NIGAM PWSS",
+                        "localname": "BHALUKPUNG NIGAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202462/ws-services-calculation/Penalty.json b/data/as/30202462/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f43f4155cf
--- /dev/null
+++ b/data/as/30202462/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202462",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202462/ws-services-calculation/WCBillingSlab.json b/data/as/30202462/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..151f23119b
--- /dev/null
+++ b/data/as/30202462/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202462",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202484/BillingService/BusinessService.json b/data/as/30202484/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6a99be056e
--- /dev/null
+++ b/data/as/30202484/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202484",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202484/egov-location/boundary-data.json b/data/as/30202484/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca0f066cd5
--- /dev/null
+++ b/data/as/30202484/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202484",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAI PAM GAON PWSS",
+                "localname": "SONAI PAM GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202484",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAI PAM GAON PWSS",
+                        "localname": "SONAI PAM GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAI PAM GAON PWSS",
+                "localname": "SONAI PAM GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202484",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAI PAM GAON PWSS",
+                        "localname": "SONAI PAM GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202484/ws-services-calculation/Penalty.json b/data/as/30202484/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7951fba785
--- /dev/null
+++ b/data/as/30202484/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202484",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202484/ws-services-calculation/WCBillingSlab.json b/data/as/30202484/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c690c690d6
--- /dev/null
+++ b/data/as/30202484/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202484",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202510/BillingService/BusinessService.json b/data/as/30202510/BillingService/BusinessService.json
new file mode 100644
index 0000000000..02d9fe671f
--- /dev/null
+++ b/data/as/30202510/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202510",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202510/egov-location/boundary-data.json b/data/as/30202510/egov-location/boundary-data.json
new file mode 100644
index 0000000000..209dbedba6
--- /dev/null
+++ b/data/as/30202510/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202510",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOGIJULI NO. 1 PWSS",
+                "localname": "BOGIJULI NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOGIJULI NO. 1 PWSS",
+                        "localname": "BOGIJULI NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOGIJULI NO. 1 PWSS",
+                "localname": "BOGIJULI NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202510",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOGIJULI NO. 1 PWSS",
+                        "localname": "BOGIJULI NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202510/ws-services-calculation/Penalty.json b/data/as/30202510/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..faa3dc1e44
--- /dev/null
+++ b/data/as/30202510/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202510",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202510/ws-services-calculation/WCBillingSlab.json b/data/as/30202510/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..73510371aa
--- /dev/null
+++ b/data/as/30202510/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202510",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202537/BillingService/BusinessService.json b/data/as/30202537/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa1aa00a73
--- /dev/null
+++ b/data/as/30202537/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202537",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202537/egov-location/boundary-data.json b/data/as/30202537/egov-location/boundary-data.json
new file mode 100644
index 0000000000..70d0cfc139
--- /dev/null
+++ b/data/as/30202537/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202537",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILKOWARI KHANDA PWSS",
+                "localname": "SILKOWARI KHANDA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILKOWARI KHANDA PWSS",
+                        "localname": "SILKOWARI KHANDA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SILKOWARI KHANDA PWSS",
+                "localname": "SILKOWARI KHANDA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202537",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SILKOWARI KHANDA PWSS",
+                        "localname": "SILKOWARI KHANDA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202537/ws-services-calculation/Penalty.json b/data/as/30202537/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3f2e6167b7
--- /dev/null
+++ b/data/as/30202537/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202537",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202537/ws-services-calculation/WCBillingSlab.json b/data/as/30202537/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bb5f6bc7c3
--- /dev/null
+++ b/data/as/30202537/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202537",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202570/BillingService/BusinessService.json b/data/as/30202570/BillingService/BusinessService.json
new file mode 100644
index 0000000000..516e3b5ed3
--- /dev/null
+++ b/data/as/30202570/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202570",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202570/egov-location/boundary-data.json b/data/as/30202570/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cf0563d3ec
--- /dev/null
+++ b/data/as/30202570/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202570",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIALMARI PWSS",
+                "localname": "SIALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIALMARI PWSS",
+                        "localname": "SIALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIALMARI PWSS",
+                "localname": "SIALMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202570",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIALMARI PWSS",
+                        "localname": "SIALMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202570/ws-services-calculation/Penalty.json b/data/as/30202570/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c49796ca48
--- /dev/null
+++ b/data/as/30202570/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202570",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202570/ws-services-calculation/WCBillingSlab.json b/data/as/30202570/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..88fa5cad15
--- /dev/null
+++ b/data/as/30202570/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202570",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202595/BillingService/BusinessService.json b/data/as/30202595/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c72fc7752a
--- /dev/null
+++ b/data/as/30202595/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202595",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202595/egov-location/boundary-data.json b/data/as/30202595/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d8d728a5fd
--- /dev/null
+++ b/data/as/30202595/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202595",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORACHUK PWSS",
+                "localname": "BORACHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORACHUK PWSS",
+                        "localname": "BORACHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORACHUK PWSS",
+                "localname": "BORACHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORACHUK PWSS",
+                        "localname": "BORACHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202595/ws-services-calculation/Penalty.json b/data/as/30202595/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42b4b9c730
--- /dev/null
+++ b/data/as/30202595/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202595",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202595/ws-services-calculation/WCBillingSlab.json b/data/as/30202595/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ae447a6d11
--- /dev/null
+++ b/data/as/30202595/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202595",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202611/BillingService/BusinessService.json b/data/as/30202611/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c135b61d42
--- /dev/null
+++ b/data/as/30202611/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202611",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202611/egov-location/boundary-data.json b/data/as/30202611/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1b08bb000d
--- /dev/null
+++ b/data/as/30202611/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202611",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORIGAON PWSS",
+                "localname": "BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORIGAON PWSS",
+                        "localname": "BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORIGAON PWSS",
+                "localname": "BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORIGAON PWSS",
+                        "localname": "BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202611/ws-services-calculation/Penalty.json b/data/as/30202611/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a10c15a36b
--- /dev/null
+++ b/data/as/30202611/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202611",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202611/ws-services-calculation/WCBillingSlab.json b/data/as/30202611/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d2f605663
--- /dev/null
+++ b/data/as/30202611/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202611",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202636/BillingService/BusinessService.json b/data/as/30202636/BillingService/BusinessService.json
new file mode 100644
index 0000000000..937213182d
--- /dev/null
+++ b/data/as/30202636/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202636",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202636/egov-location/boundary-data.json b/data/as/30202636/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e02b79c3a
--- /dev/null
+++ b/data/as/30202636/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202636",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURBURI PWSS",
+                "localname": "BURBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202636",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURBURI PWSS",
+                        "localname": "BURBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BURBURI PWSS",
+                "localname": "BURBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202636",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BURBURI PWSS",
+                        "localname": "BURBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202636/ws-services-calculation/Penalty.json b/data/as/30202636/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..df541a4aae
--- /dev/null
+++ b/data/as/30202636/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202636",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202636/ws-services-calculation/WCBillingSlab.json b/data/as/30202636/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..559ba64854
--- /dev/null
+++ b/data/as/30202636/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202636",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202651/BillingService/BusinessService.json b/data/as/30202651/BillingService/BusinessService.json
new file mode 100644
index 0000000000..281704eefd
--- /dev/null
+++ b/data/as/30202651/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202651",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202651/egov-location/boundary-data.json b/data/as/30202651/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef72cfb801
--- /dev/null
+++ b/data/as/30202651/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202651",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTIPUR PWSS",
+                "localname": "SANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTIPUR PWSS",
+                        "localname": "SANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202651/ws-services-calculation/Penalty.json b/data/as/30202651/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..14ad8c59a3
--- /dev/null
+++ b/data/as/30202651/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202651",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202651/ws-services-calculation/WCBillingSlab.json b/data/as/30202651/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4199c3717f
--- /dev/null
+++ b/data/as/30202651/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202651",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202908/BillingService/BusinessService.json b/data/as/30202908/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6ea91e5836
--- /dev/null
+++ b/data/as/30202908/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202908",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202908/egov-location/boundary-data.json b/data/as/30202908/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02b0147d2c
--- /dev/null
+++ b/data/as/30202908/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202908",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                "localname": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202908",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                        "localname": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                "localname": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202908",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                        "localname": "SAIKIA CHUBURI DEKAR GAON NO. 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202908/ws-services-calculation/Penalty.json b/data/as/30202908/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b0d9e78a93
--- /dev/null
+++ b/data/as/30202908/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202908",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202908/ws-services-calculation/WCBillingSlab.json b/data/as/30202908/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13c59d5f2b
--- /dev/null
+++ b/data/as/30202908/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202908",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202964/BillingService/BusinessService.json b/data/as/30202964/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c5f6cb95f8
--- /dev/null
+++ b/data/as/30202964/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30202964",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202964/egov-location/boundary-data.json b/data/as/30202964/egov-location/boundary-data.json
new file mode 100644
index 0000000000..35c6e9333f
--- /dev/null
+++ b/data/as/30202964/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30202964",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAIGAON PWSS",
+                "localname": "RAIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202964",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAIGAON PWSS",
+                        "localname": "RAIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAIGAON PWSS",
+                "localname": "RAIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30202964",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAIGAON PWSS",
+                        "localname": "RAIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202964/ws-services-calculation/Penalty.json b/data/as/30202964/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..98be631f9c
--- /dev/null
+++ b/data/as/30202964/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30202964",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30202964/ws-services-calculation/WCBillingSlab.json b/data/as/30202964/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5238ee24ed
--- /dev/null
+++ b/data/as/30202964/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30202964",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30204586/BillingService/BusinessService.json b/data/as/30204586/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e463530647
--- /dev/null
+++ b/data/as/30204586/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30204586",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30204586/egov-location/boundary-data.json b/data/as/30204586/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d330a48791
--- /dev/null
+++ b/data/as/30204586/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30204586",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHMUKH MPWS",
+                "localname": "PACHMUKH MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30204586",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHMUKH MPWS",
+                        "localname": "PACHMUKH MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHMUKH MPWS",
+                "localname": "PACHMUKH MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30204586",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHMUKH MPWS",
+                        "localname": "PACHMUKH MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30204586/ws-services-calculation/Penalty.json b/data/as/30204586/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d802f0fbca
--- /dev/null
+++ b/data/as/30204586/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30204586",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30204586/ws-services-calculation/WCBillingSlab.json b/data/as/30204586/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4fc76456c
--- /dev/null
+++ b/data/as/30204586/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30204586",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207281/BillingService/BusinessService.json b/data/as/30207281/BillingService/BusinessService.json
new file mode 100644
index 0000000000..71eda1178a
--- /dev/null
+++ b/data/as/30207281/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207281",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207281/egov-location/boundary-data.json b/data/as/30207281/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0ca9e43d59
--- /dev/null
+++ b/data/as/30207281/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207281",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUJULI RANGAGORA PWSS",
+                "localname": "OUJULI RANGAGORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207281",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUJULI RANGAGORA PWSS",
+                        "localname": "OUJULI RANGAGORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUJULI RANGAGORA PWSS",
+                "localname": "OUJULI RANGAGORA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207281",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUJULI RANGAGORA PWSS",
+                        "localname": "OUJULI RANGAGORA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207281/ws-services-calculation/Penalty.json b/data/as/30207281/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b60af04ecf
--- /dev/null
+++ b/data/as/30207281/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207281",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207281/ws-services-calculation/WCBillingSlab.json b/data/as/30207281/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0af0ef40c1
--- /dev/null
+++ b/data/as/30207281/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207281",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207843/BillingService/BusinessService.json b/data/as/30207843/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ecd6b04927
--- /dev/null
+++ b/data/as/30207843/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207843",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207843/egov-location/boundary-data.json b/data/as/30207843/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b1591fb1f2
--- /dev/null
+++ b/data/as/30207843/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207843",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHONAPARA PWSS (NEW)",
+                "localname": "GHONAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207843",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHONAPARA PWSS (NEW)",
+                        "localname": "GHONAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHONAPARA PWSS (NEW)",
+                "localname": "GHONAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207843",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHONAPARA PWSS (NEW)",
+                        "localname": "GHONAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207843/ws-services-calculation/Penalty.json b/data/as/30207843/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a7837fcd90
--- /dev/null
+++ b/data/as/30207843/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207843",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207843/ws-services-calculation/WCBillingSlab.json b/data/as/30207843/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d1c9cde739
--- /dev/null
+++ b/data/as/30207843/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207843",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207863/BillingService/BusinessService.json b/data/as/30207863/BillingService/BusinessService.json
new file mode 100644
index 0000000000..939b648d20
--- /dev/null
+++ b/data/as/30207863/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207863",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207863/egov-location/boundary-data.json b/data/as/30207863/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c3b338e54
--- /dev/null
+++ b/data/as/30207863/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207863",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                "localname": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207863",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                        "localname": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                "localname": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207863",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                        "localname": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207863/ws-services-calculation/Penalty.json b/data/as/30207863/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..444319d77a
--- /dev/null
+++ b/data/as/30207863/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207863",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207863/ws-services-calculation/WCBillingSlab.json b/data/as/30207863/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1df461ecff
--- /dev/null
+++ b/data/as/30207863/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207863",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207883/BillingService/BusinessService.json b/data/as/30207883/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c57ca142e1
--- /dev/null
+++ b/data/as/30207883/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207883",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207883/egov-location/boundary-data.json b/data/as/30207883/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f9d132925f
--- /dev/null
+++ b/data/as/30207883/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207883",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASCHIM BASHMURA PWSS (NEW)",
+                "localname": "PASCHIM BASHMURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207883",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASCHIM BASHMURA PWSS (NEW)",
+                        "localname": "PASCHIM BASHMURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASCHIM BASHMURA PWSS (NEW)",
+                "localname": "PASCHIM BASHMURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207883",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASCHIM BASHMURA PWSS (NEW)",
+                        "localname": "PASCHIM BASHMURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207883/ws-services-calculation/Penalty.json b/data/as/30207883/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5cce2761a
--- /dev/null
+++ b/data/as/30207883/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207883",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207883/ws-services-calculation/WCBillingSlab.json b/data/as/30207883/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a95aa9d65
--- /dev/null
+++ b/data/as/30207883/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207883",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207923/BillingService/BusinessService.json b/data/as/30207923/BillingService/BusinessService.json
new file mode 100644
index 0000000000..66b91c7f3f
--- /dev/null
+++ b/data/as/30207923/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207923",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207923/egov-location/boundary-data.json b/data/as/30207923/egov-location/boundary-data.json
new file mode 100644
index 0000000000..09361720f3
--- /dev/null
+++ b/data/as/30207923/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207923",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRISALHANA PWSS (NEW)",
+                "localname": "SIGRISALHANA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRISALHANA PWSS (NEW)",
+                        "localname": "SIGRISALHANA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIGRISALHANA PWSS (NEW)",
+                "localname": "SIGRISALHANA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207923",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIGRISALHANA PWSS (NEW)",
+                        "localname": "SIGRISALHANA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207923/ws-services-calculation/Penalty.json b/data/as/30207923/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd4f0a76d7
--- /dev/null
+++ b/data/as/30207923/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207923",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207923/ws-services-calculation/WCBillingSlab.json b/data/as/30207923/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f230df5500
--- /dev/null
+++ b/data/as/30207923/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207923",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207980/egov-location/boundary-data.json b/data/as/30207980/egov-location/boundary-data.json
index 0e60a09c44..0924ac270e 100644
--- a/data/as/30207980/egov-location/boundary-data.json
+++ b/data/as/30207980/egov-location/boundary-data.json
@@ -10,8 +10,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "MUGALPARA PWSS",
-                "localname": "MUGALPARA PWSS",
+                "name": "MUGALPARA PWSS (NEW)",
+                "localname": "MUGALPARA PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -20,8 +20,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "MUGALPARA PWSS",
-                        "localname": "MUGALPARA PWSS",
+                        "name": "MUGALPARA PWSS (NEW)",
+                        "localname": "MUGALPARA PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
@@ -38,8 +38,8 @@
             "boundary": {
                 "id": 1,
                 "boundaryNum": 1,
-                "name": "MUGALPARA PWSS",
-                "localname": "MUGALPARA PWSS",
+                "name": "MUGALPARA PWSS (NEW)",
+                "localname": "MUGALPARA PWSS (NEW)",
                 "longitude": null,
                 "latitude": null,
                 "label": "City",
@@ -48,8 +48,8 @@
                     {
                         "id": 1,
                         "boundaryNum": 1,
-                        "name": "MUGALPARA PWSS",
-                        "localname": "MUGALPARA PWSS",
+                        "name": "MUGALPARA PWSS (NEW)",
+                        "localname": "MUGALPARA PWSS (NEW)",
                         "longitude": null,
                         "latitude": null,
                         "label": "Locality",
diff --git a/data/as/30207980/ws-services-calculation/WCBillingSlab.json b/data/as/30207980/ws-services-calculation/WCBillingSlab.json
index 7b14648ebb..441f9aa59a 100644
--- a/data/as/30207980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207980/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 30.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207990/BillingService/BusinessService.json b/data/as/30207990/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e59b709a5
--- /dev/null
+++ b/data/as/30207990/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207990",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207990/egov-location/boundary-data.json b/data/as/30207990/egov-location/boundary-data.json
new file mode 100644
index 0000000000..98cf468ff7
--- /dev/null
+++ b/data/as/30207990/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207990",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THANGURIPARA PWSS (NEW)",
+                "localname": "THANGURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207990",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THANGURIPARA PWSS (NEW)",
+                        "localname": "THANGURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THANGURIPARA PWSS (NEW)",
+                "localname": "THANGURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207990",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THANGURIPARA PWSS (NEW)",
+                        "localname": "THANGURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207990/ws-services-calculation/Penalty.json b/data/as/30207990/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4014d5615f
--- /dev/null
+++ b/data/as/30207990/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207990",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207990/ws-services-calculation/WCBillingSlab.json b/data/as/30207990/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d0415ac395
--- /dev/null
+++ b/data/as/30207990/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207990",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207996/BillingService/BusinessService.json b/data/as/30207996/BillingService/BusinessService.json
new file mode 100644
index 0000000000..822fccb21e
--- /dev/null
+++ b/data/as/30207996/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30207996",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207996/egov-location/boundary-data.json b/data/as/30207996/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1087df8b76
--- /dev/null
+++ b/data/as/30207996/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30207996",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHANJIPARA PT-II PWSS (NEW)",
+                "localname": "JHANJIPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHANJIPARA PT-II PWSS (NEW)",
+                        "localname": "JHANJIPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JHANJIPARA PT-II PWSS (NEW)",
+                "localname": "JHANJIPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30207996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JHANJIPARA PT-II PWSS (NEW)",
+                        "localname": "JHANJIPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207996/ws-services-calculation/Penalty.json b/data/as/30207996/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..01ca50f97e
--- /dev/null
+++ b/data/as/30207996/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30207996",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30207996/ws-services-calculation/WCBillingSlab.json b/data/as/30207996/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b0cd916f7f
--- /dev/null
+++ b/data/as/30207996/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30207996",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208033/BillingService/BusinessService.json b/data/as/30208033/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f76bf6d868
--- /dev/null
+++ b/data/as/30208033/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208033",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208033/egov-location/boundary-data.json b/data/as/30208033/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d0942d8d6
--- /dev/null
+++ b/data/as/30208033/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208033",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                "localname": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208033",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                        "localname": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                "localname": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208033",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                        "localname": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208033/ws-services-calculation/Penalty.json b/data/as/30208033/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..92857e4c39
--- /dev/null
+++ b/data/as/30208033/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208033",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208033/ws-services-calculation/WCBillingSlab.json b/data/as/30208033/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..178a519153
--- /dev/null
+++ b/data/as/30208033/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208033",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208074/BillingService/BusinessService.json b/data/as/30208074/BillingService/BusinessService.json
new file mode 100644
index 0000000000..830a1ae6a4
--- /dev/null
+++ b/data/as/30208074/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208074",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208074/egov-location/boundary-data.json b/data/as/30208074/egov-location/boundary-data.json
new file mode 100644
index 0000000000..62839528ba
--- /dev/null
+++ b/data/as/30208074/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208074",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDRAPUR PWSS (NEW)",
+                "localname": "CHANDRAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208074",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDRAPUR PWSS (NEW)",
+                        "localname": "CHANDRAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDRAPUR PWSS (NEW)",
+                "localname": "CHANDRAPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208074",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDRAPUR PWSS (NEW)",
+                        "localname": "CHANDRAPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208074/ws-services-calculation/Penalty.json b/data/as/30208074/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9272b83a99
--- /dev/null
+++ b/data/as/30208074/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208074",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208074/ws-services-calculation/WCBillingSlab.json b/data/as/30208074/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..961571bb48
--- /dev/null
+++ b/data/as/30208074/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208074",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208101/BillingService/BusinessService.json b/data/as/30208101/BillingService/BusinessService.json
new file mode 100644
index 0000000000..136aa2f3d9
--- /dev/null
+++ b/data/as/30208101/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208101",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208101/egov-location/boundary-data.json b/data/as/30208101/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c2f12e0d1
--- /dev/null
+++ b/data/as/30208101/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208101",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAKH NEW PWSS",
+                "localname": "DARAKH NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208101",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAKH NEW PWSS",
+                        "localname": "DARAKH NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARAKH NEW PWSS",
+                "localname": "DARAKH NEW PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208101",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARAKH NEW PWSS",
+                        "localname": "DARAKH NEW PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208101/ws-services-calculation/Penalty.json b/data/as/30208101/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ce42a422c1
--- /dev/null
+++ b/data/as/30208101/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208101",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208101/ws-services-calculation/WCBillingSlab.json b/data/as/30208101/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0bb53cd760
--- /dev/null
+++ b/data/as/30208101/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208101",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208625/BillingService/BusinessService.json b/data/as/30208625/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41e6ead711
--- /dev/null
+++ b/data/as/30208625/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208625",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208625/egov-location/boundary-data.json b/data/as/30208625/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8c232ee18d
--- /dev/null
+++ b/data/as/30208625/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208625",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIARPAR UTTAR PWSS (NEW)",
+                "localname": "DARIARPAR UTTAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208625",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIARPAR UTTAR PWSS (NEW)",
+                        "localname": "DARIARPAR UTTAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DARIARPAR UTTAR PWSS (NEW)",
+                "localname": "DARIARPAR UTTAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208625",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DARIARPAR UTTAR PWSS (NEW)",
+                        "localname": "DARIARPAR UTTAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208625/ws-services-calculation/Penalty.json b/data/as/30208625/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..22e7ee3ecd
--- /dev/null
+++ b/data/as/30208625/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208625",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208625/ws-services-calculation/WCBillingSlab.json b/data/as/30208625/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0e9463501a
--- /dev/null
+++ b/data/as/30208625/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208625",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208644/BillingService/BusinessService.json b/data/as/30208644/BillingService/BusinessService.json
new file mode 100644
index 0000000000..540ded60a4
--- /dev/null
+++ b/data/as/30208644/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208644",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208644/egov-location/boundary-data.json b/data/as/30208644/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c0999290fd
--- /dev/null
+++ b/data/as/30208644/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208644",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOTO UDMARI PWSS (NEW)",
+                "localname": "CHOTO UDMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208644",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOTO UDMARI PWSS (NEW)",
+                        "localname": "CHOTO UDMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOTO UDMARI PWSS (NEW)",
+                "localname": "CHOTO UDMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208644",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOTO UDMARI PWSS (NEW)",
+                        "localname": "CHOTO UDMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208644/ws-services-calculation/Penalty.json b/data/as/30208644/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..650eafdc46
--- /dev/null
+++ b/data/as/30208644/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208644",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208644/ws-services-calculation/WCBillingSlab.json b/data/as/30208644/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1c6f1d241b
--- /dev/null
+++ b/data/as/30208644/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208644",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208681/BillingService/BusinessService.json b/data/as/30208681/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a0858d3b5e
--- /dev/null
+++ b/data/as/30208681/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208681",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208681/egov-location/boundary-data.json b/data/as/30208681/egov-location/boundary-data.json
new file mode 100644
index 0000000000..17b331be6e
--- /dev/null
+++ b/data/as/30208681/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208681",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                "localname": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                        "localname": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                "localname": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                        "localname": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208681/ws-services-calculation/Penalty.json b/data/as/30208681/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6545bc24d8
--- /dev/null
+++ b/data/as/30208681/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208681",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208681/ws-services-calculation/WCBillingSlab.json b/data/as/30208681/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..62bbd07ce4
--- /dev/null
+++ b/data/as/30208681/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208681",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208803/BillingService/BusinessService.json b/data/as/30208803/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8faad19d7f
--- /dev/null
+++ b/data/as/30208803/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30208803",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208803/egov-location/boundary-data.json b/data/as/30208803/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9bd83d03c8
--- /dev/null
+++ b/data/as/30208803/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30208803",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                "localname": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                        "localname": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                "localname": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30208803",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                        "localname": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208803/ws-services-calculation/Penalty.json b/data/as/30208803/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ee33a12485
--- /dev/null
+++ b/data/as/30208803/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30208803",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30208803/ws-services-calculation/WCBillingSlab.json b/data/as/30208803/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1a244e1ce8
--- /dev/null
+++ b/data/as/30208803/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30208803",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211530/BillingService/BusinessService.json b/data/as/30211530/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f246e2cb4
--- /dev/null
+++ b/data/as/30211530/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211530",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211530/egov-location/boundary-data.json b/data/as/30211530/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3144aa98c7
--- /dev/null
+++ b/data/as/30211530/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211530",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "REHMATPUR TILA PWSS (NEW)",
+                "localname": "REHMATPUR TILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211530",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "REHMATPUR TILA PWSS (NEW)",
+                        "localname": "REHMATPUR TILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "REHMATPUR TILA PWSS (NEW)",
+                "localname": "REHMATPUR TILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211530",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "REHMATPUR TILA PWSS (NEW)",
+                        "localname": "REHMATPUR TILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211530/ws-services-calculation/Penalty.json b/data/as/30211530/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9b6255e866
--- /dev/null
+++ b/data/as/30211530/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211530",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211530/ws-services-calculation/WCBillingSlab.json b/data/as/30211530/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad152a2b99
--- /dev/null
+++ b/data/as/30211530/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211530",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211543/BillingService/BusinessService.json b/data/as/30211543/BillingService/BusinessService.json
new file mode 100644
index 0000000000..98663070a5
--- /dev/null
+++ b/data/as/30211543/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211543",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211543/egov-location/boundary-data.json b/data/as/30211543/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d58a735aea
--- /dev/null
+++ b/data/as/30211543/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211543",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUNDARPUR NC PWSS (NEW)",
+                "localname": "SUNDARPUR NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUNDARPUR NC PWSS (NEW)",
+                        "localname": "SUNDARPUR NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUNDARPUR NC PWSS (NEW)",
+                "localname": "SUNDARPUR NC PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211543",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUNDARPUR NC PWSS (NEW)",
+                        "localname": "SUNDARPUR NC PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211543/ws-services-calculation/Penalty.json b/data/as/30211543/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f35c2bd5c
--- /dev/null
+++ b/data/as/30211543/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211543",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211543/ws-services-calculation/WCBillingSlab.json b/data/as/30211543/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f3da2f69e1
--- /dev/null
+++ b/data/as/30211543/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211543",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211556/BillingService/BusinessService.json b/data/as/30211556/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cd4c035a35
--- /dev/null
+++ b/data/as/30211556/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211556",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211556/egov-location/boundary-data.json b/data/as/30211556/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5c2443e3a1
--- /dev/null
+++ b/data/as/30211556/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211556",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBAL, TIKRIPARA PWSS (NEW)",
+                "localname": "GOBAL, TIKRIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBAL, TIKRIPARA PWSS (NEW)",
+                        "localname": "GOBAL, TIKRIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBAL, TIKRIPARA PWSS (NEW)",
+                "localname": "GOBAL, TIKRIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBAL, TIKRIPARA PWSS (NEW)",
+                        "localname": "GOBAL, TIKRIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211556/ws-services-calculation/Penalty.json b/data/as/30211556/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..16a7d90fc2
--- /dev/null
+++ b/data/as/30211556/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211556",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211556/ws-services-calculation/WCBillingSlab.json b/data/as/30211556/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f81eaa7cf6
--- /dev/null
+++ b/data/as/30211556/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211556",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211591/BillingService/BusinessService.json b/data/as/30211591/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3caab5eb43
--- /dev/null
+++ b/data/as/30211591/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211591",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211591/egov-location/boundary-data.json b/data/as/30211591/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef3a5adfb6
--- /dev/null
+++ b/data/as/30211591/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211591",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                "localname": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211591",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                        "localname": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                "localname": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211591",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                        "localname": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211591/ws-services-calculation/Penalty.json b/data/as/30211591/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2219cd8a62
--- /dev/null
+++ b/data/as/30211591/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211591",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211591/ws-services-calculation/WCBillingSlab.json b/data/as/30211591/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..be61df6348
--- /dev/null
+++ b/data/as/30211591/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211591",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211653/BillingService/BusinessService.json b/data/as/30211653/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c39666cc79
--- /dev/null
+++ b/data/as/30211653/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211653",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211653/egov-location/boundary-data.json b/data/as/30211653/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fcd922a0b1
--- /dev/null
+++ b/data/as/30211653/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211653",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPAKURA PWSS (NEW)",
+                "localname": "RUPAKURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211653",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPAKURA PWSS (NEW)",
+                        "localname": "RUPAKURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RUPAKURA PWSS (NEW)",
+                "localname": "RUPAKURA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211653",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RUPAKURA PWSS (NEW)",
+                        "localname": "RUPAKURA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211653/ws-services-calculation/Penalty.json b/data/as/30211653/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f076ef06bc
--- /dev/null
+++ b/data/as/30211653/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211653",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211653/ws-services-calculation/WCBillingSlab.json b/data/as/30211653/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6880d27e48
--- /dev/null
+++ b/data/as/30211653/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211653",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211673/BillingService/BusinessService.json b/data/as/30211673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..64ea8c2eb1
--- /dev/null
+++ b/data/as/30211673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211673/egov-location/boundary-data.json b/data/as/30211673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..337f9608ac
--- /dev/null
+++ b/data/as/30211673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MIAPARA EAST PWSS (NEW)",
+                "localname": "MIAPARA EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MIAPARA EAST PWSS (NEW)",
+                        "localname": "MIAPARA EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MIAPARA EAST PWSS (NEW)",
+                "localname": "MIAPARA EAST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MIAPARA EAST PWSS (NEW)",
+                        "localname": "MIAPARA EAST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211673/ws-services-calculation/Penalty.json b/data/as/30211673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9dc61c8114
--- /dev/null
+++ b/data/as/30211673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211673/ws-services-calculation/WCBillingSlab.json b/data/as/30211673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e60dcf58c5
--- /dev/null
+++ b/data/as/30211673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211695/BillingService/BusinessService.json b/data/as/30211695/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2b1993df1c
--- /dev/null
+++ b/data/as/30211695/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211695",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211695/egov-location/boundary-data.json b/data/as/30211695/egov-location/boundary-data.json
new file mode 100644
index 0000000000..614448907a
--- /dev/null
+++ b/data/as/30211695/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211695",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BESAPARA PWSS (NEW)",
+                "localname": "BESAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BESAPARA PWSS (NEW)",
+                        "localname": "BESAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BESAPARA PWSS (NEW)",
+                "localname": "BESAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BESAPARA PWSS (NEW)",
+                        "localname": "BESAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211695/ws-services-calculation/Penalty.json b/data/as/30211695/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..98ee14546b
--- /dev/null
+++ b/data/as/30211695/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211695",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211695/ws-services-calculation/WCBillingSlab.json b/data/as/30211695/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..263c15876f
--- /dev/null
+++ b/data/as/30211695/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211695",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211715/BillingService/BusinessService.json b/data/as/30211715/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad3b484cdd
--- /dev/null
+++ b/data/as/30211715/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211715",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211715/egov-location/boundary-data.json b/data/as/30211715/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f3c61edefc
--- /dev/null
+++ b/data/as/30211715/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211715",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIMPARA PWSS (NEW)",
+                "localname": "MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIMPARA PWSS (NEW)",
+                        "localname": "MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUSLIMPARA PWSS (NEW)",
+                "localname": "MUSLIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211715",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUSLIMPARA PWSS (NEW)",
+                        "localname": "MUSLIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211715/ws-services-calculation/Penalty.json b/data/as/30211715/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ae383e720f
--- /dev/null
+++ b/data/as/30211715/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211715",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211715/ws-services-calculation/WCBillingSlab.json b/data/as/30211715/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..888414ef07
--- /dev/null
+++ b/data/as/30211715/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211715",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211747/BillingService/BusinessService.json b/data/as/30211747/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe03f07077
--- /dev/null
+++ b/data/as/30211747/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211747",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211747/egov-location/boundary-data.json b/data/as/30211747/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0c6104e146
--- /dev/null
+++ b/data/as/30211747/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211747",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JONGSIPARA PWSS (NEW)",
+                "localname": "JONGSIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JONGSIPARA PWSS (NEW)",
+                        "localname": "JONGSIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JONGSIPARA PWSS (NEW)",
+                "localname": "JONGSIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211747",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JONGSIPARA PWSS (NEW)",
+                        "localname": "JONGSIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211747/ws-services-calculation/Penalty.json b/data/as/30211747/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..73ced798cd
--- /dev/null
+++ b/data/as/30211747/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211747",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211747/ws-services-calculation/WCBillingSlab.json b/data/as/30211747/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e8b3fcb3d3
--- /dev/null
+++ b/data/as/30211747/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211747",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211881/BillingService/BusinessService.json b/data/as/30211881/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b425ad7267
--- /dev/null
+++ b/data/as/30211881/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30211881",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211881/egov-location/boundary-data.json b/data/as/30211881/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fb1314fdcd
--- /dev/null
+++ b/data/as/30211881/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30211881",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAKCHIGIRI PWSS (NEW)",
+                "localname": "NAKCHIGIRI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211881",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAKCHIGIRI PWSS (NEW)",
+                        "localname": "NAKCHIGIRI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAKCHIGIRI PWSS (NEW)",
+                "localname": "NAKCHIGIRI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30211881",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAKCHIGIRI PWSS (NEW)",
+                        "localname": "NAKCHIGIRI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211881/ws-services-calculation/Penalty.json b/data/as/30211881/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1ab7542e61
--- /dev/null
+++ b/data/as/30211881/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30211881",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30211881/ws-services-calculation/WCBillingSlab.json b/data/as/30211881/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6d9151ba82
--- /dev/null
+++ b/data/as/30211881/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30211881",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212673/BillingService/BusinessService.json b/data/as/30212673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..23e3db8fa0
--- /dev/null
+++ b/data/as/30212673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212673/egov-location/boundary-data.json b/data/as/30212673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ad3517ea3a
--- /dev/null
+++ b/data/as/30212673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEGHRI PASCIMPARA PWSS (NEW)",
+                "localname": "DEGHRI PASCIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEGHRI PASCIMPARA PWSS (NEW)",
+                        "localname": "DEGHRI PASCIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEGHRI PASCIMPARA PWSS (NEW)",
+                "localname": "DEGHRI PASCIMPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEGHRI PASCIMPARA PWSS (NEW)",
+                        "localname": "DEGHRI PASCIMPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212673/ws-services-calculation/Penalty.json b/data/as/30212673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48afb17b8a
--- /dev/null
+++ b/data/as/30212673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212673/ws-services-calculation/WCBillingSlab.json b/data/as/30212673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9819b284de
--- /dev/null
+++ b/data/as/30212673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212710/BillingService/BusinessService.json b/data/as/30212710/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d5db2c89b2
--- /dev/null
+++ b/data/as/30212710/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212710",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212710/egov-location/boundary-data.json b/data/as/30212710/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f440d0dfb6
--- /dev/null
+++ b/data/as/30212710/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212710",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIB BARI PWSS (NEW)",
+                "localname": "SIB BARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212710",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIB BARI PWSS (NEW)",
+                        "localname": "SIB BARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIB BARI PWSS (NEW)",
+                "localname": "SIB BARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212710",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIB BARI PWSS (NEW)",
+                        "localname": "SIB BARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212710/ws-services-calculation/Penalty.json b/data/as/30212710/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf9ec4e550
--- /dev/null
+++ b/data/as/30212710/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212710",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212710/ws-services-calculation/WCBillingSlab.json b/data/as/30212710/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6e5873ac78
--- /dev/null
+++ b/data/as/30212710/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212710",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212736/BillingService/BusinessService.json b/data/as/30212736/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dd13152864
--- /dev/null
+++ b/data/as/30212736/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212736",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212736/egov-location/boundary-data.json b/data/as/30212736/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e4d06fac69
--- /dev/null
+++ b/data/as/30212736/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212736",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASUMARI NOABARA PWSS (NEW)",
+                "localname": "KASUMARI NOABARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212736",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASUMARI NOABARA PWSS (NEW)",
+                        "localname": "KASUMARI NOABARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASUMARI NOABARA PWSS (NEW)",
+                "localname": "KASUMARI NOABARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212736",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASUMARI NOABARA PWSS (NEW)",
+                        "localname": "KASUMARI NOABARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212736/ws-services-calculation/Penalty.json b/data/as/30212736/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c67ea9ef07
--- /dev/null
+++ b/data/as/30212736/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212736",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212736/ws-services-calculation/WCBillingSlab.json b/data/as/30212736/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fef3b50781
--- /dev/null
+++ b/data/as/30212736/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212736",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212751/BillingService/BusinessService.json b/data/as/30212751/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42ec8c61bb
--- /dev/null
+++ b/data/as/30212751/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212751",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212751/egov-location/boundary-data.json b/data/as/30212751/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b50681ecc4
--- /dev/null
+++ b/data/as/30212751/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212751",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                "localname": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212751",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                        "localname": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                "localname": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212751",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                        "localname": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212751/ws-services-calculation/Penalty.json b/data/as/30212751/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8b3d3b0220
--- /dev/null
+++ b/data/as/30212751/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212751",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212751/ws-services-calculation/WCBillingSlab.json b/data/as/30212751/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0352850863
--- /dev/null
+++ b/data/as/30212751/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212751",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212766/BillingService/BusinessService.json b/data/as/30212766/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c50f070081
--- /dev/null
+++ b/data/as/30212766/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212766",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212766/egov-location/boundary-data.json b/data/as/30212766/egov-location/boundary-data.json
new file mode 100644
index 0000000000..13d249f2e6
--- /dev/null
+++ b/data/as/30212766/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212766",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                "localname": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212766",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                        "localname": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                "localname": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212766",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                        "localname": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212766/ws-services-calculation/Penalty.json b/data/as/30212766/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc2f5d2cd0
--- /dev/null
+++ b/data/as/30212766/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212766",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212766/ws-services-calculation/WCBillingSlab.json b/data/as/30212766/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8f0e72eb5e
--- /dev/null
+++ b/data/as/30212766/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212766",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212780/BillingService/BusinessService.json b/data/as/30212780/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5be4fa237d
--- /dev/null
+++ b/data/as/30212780/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212780",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212780/egov-location/boundary-data.json b/data/as/30212780/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7b2db2ec7c
--- /dev/null
+++ b/data/as/30212780/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212780",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASHIKHAGRA WEST PWSS (NEW)",
+                "localname": "KASHIKHAGRA WEST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212780",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASHIKHAGRA WEST PWSS (NEW)",
+                        "localname": "KASHIKHAGRA WEST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KASHIKHAGRA WEST PWSS (NEW)",
+                "localname": "KASHIKHAGRA WEST PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212780",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KASHIKHAGRA WEST PWSS (NEW)",
+                        "localname": "KASHIKHAGRA WEST PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212780/ws-services-calculation/Penalty.json b/data/as/30212780/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78a92561ac
--- /dev/null
+++ b/data/as/30212780/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212780",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212780/ws-services-calculation/WCBillingSlab.json b/data/as/30212780/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..515601674c
--- /dev/null
+++ b/data/as/30212780/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212780",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212817/BillingService/BusinessService.json b/data/as/30212817/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a4f5b75754
--- /dev/null
+++ b/data/as/30212817/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212817",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212817/egov-location/boundary-data.json b/data/as/30212817/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8768756a58
--- /dev/null
+++ b/data/as/30212817/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212817",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                "localname": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212817",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                        "localname": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                "localname": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212817",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                        "localname": "MAJGAON (MANIKPUR) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212817/ws-services-calculation/Penalty.json b/data/as/30212817/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..55d1f7ae6e
--- /dev/null
+++ b/data/as/30212817/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212817",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212817/ws-services-calculation/WCBillingSlab.json b/data/as/30212817/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8628aeb250
--- /dev/null
+++ b/data/as/30212817/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212817",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212830/BillingService/BusinessService.json b/data/as/30212830/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1710b135a8
--- /dev/null
+++ b/data/as/30212830/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212830",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212830/egov-location/boundary-data.json b/data/as/30212830/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8447883d39
--- /dev/null
+++ b/data/as/30212830/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212830",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KULIYA PWSS (NEW)",
+                "localname": "KULIYA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KULIYA PWSS (NEW)",
+                        "localname": "KULIYA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KULIYA PWSS (NEW)",
+                "localname": "KULIYA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212830",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KULIYA PWSS (NEW)",
+                        "localname": "KULIYA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212830/ws-services-calculation/Penalty.json b/data/as/30212830/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bacd3e1ab8
--- /dev/null
+++ b/data/as/30212830/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212830",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212830/ws-services-calculation/WCBillingSlab.json b/data/as/30212830/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5e8230dd3a
--- /dev/null
+++ b/data/as/30212830/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212830",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212847/BillingService/BusinessService.json b/data/as/30212847/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1a8c5ad591
--- /dev/null
+++ b/data/as/30212847/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212847",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212847/egov-location/boundary-data.json b/data/as/30212847/egov-location/boundary-data.json
new file mode 100644
index 0000000000..05c19557fc
--- /dev/null
+++ b/data/as/30212847/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212847",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "WANGNANG PWSS (NEW)",
+                "localname": "WANGNANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212847",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "WANGNANG PWSS (NEW)",
+                        "localname": "WANGNANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "WANGNANG PWSS (NEW)",
+                "localname": "WANGNANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212847",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "WANGNANG PWSS (NEW)",
+                        "localname": "WANGNANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212847/ws-services-calculation/Penalty.json b/data/as/30212847/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6a53929d8d
--- /dev/null
+++ b/data/as/30212847/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212847",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212847/ws-services-calculation/WCBillingSlab.json b/data/as/30212847/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ee2bcebcd
--- /dev/null
+++ b/data/as/30212847/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212847",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212906/BillingService/BusinessService.json b/data/as/30212906/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfd31dee40
--- /dev/null
+++ b/data/as/30212906/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212906",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212906/egov-location/boundary-data.json b/data/as/30212906/egov-location/boundary-data.json
new file mode 100644
index 0000000000..92ed39cc8d
--- /dev/null
+++ b/data/as/30212906/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212906",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4,5 & 6 JOYPUR PWSS",
+                "localname": "NO. 4,5 & 6 JOYPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212906",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4,5 & 6 JOYPUR PWSS",
+                        "localname": "NO. 4,5 & 6 JOYPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4,5 & 6 JOYPUR PWSS",
+                "localname": "NO. 4,5 & 6 JOYPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212906",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4,5 & 6 JOYPUR PWSS",
+                        "localname": "NO. 4,5 & 6 JOYPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212906/ws-services-calculation/Penalty.json b/data/as/30212906/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5fc485e858
--- /dev/null
+++ b/data/as/30212906/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212906",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212906/ws-services-calculation/WCBillingSlab.json b/data/as/30212906/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..56bbc3e791
--- /dev/null
+++ b/data/as/30212906/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212906",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212926/BillingService/BusinessService.json b/data/as/30212926/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e771630e41
--- /dev/null
+++ b/data/as/30212926/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212926",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212926/egov-location/boundary-data.json b/data/as/30212926/egov-location/boundary-data.json
new file mode 100644
index 0000000000..83da12419d
--- /dev/null
+++ b/data/as/30212926/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212926",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 HATIBARI T.E. PWSS",
+                "localname": "NO. 3 HATIBARI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212926",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 HATIBARI T.E. PWSS",
+                        "localname": "NO. 3 HATIBARI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 3 HATIBARI T.E. PWSS",
+                "localname": "NO. 3 HATIBARI T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212926",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 3 HATIBARI T.E. PWSS",
+                        "localname": "NO. 3 HATIBARI T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212926/ws-services-calculation/Penalty.json b/data/as/30212926/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3aa593fd63
--- /dev/null
+++ b/data/as/30212926/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212926",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212926/ws-services-calculation/WCBillingSlab.json b/data/as/30212926/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03ecd67d66
--- /dev/null
+++ b/data/as/30212926/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212926",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212942/BillingService/BusinessService.json b/data/as/30212942/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e6ec0ea4c
--- /dev/null
+++ b/data/as/30212942/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212942",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212942/egov-location/boundary-data.json b/data/as/30212942/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6ea8f9e73f
--- /dev/null
+++ b/data/as/30212942/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212942",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJULI PWSS (NEW)",
+                "localname": "BORJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJULI PWSS (NEW)",
+                        "localname": "BORJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORJULI PWSS (NEW)",
+                "localname": "BORJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212942",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORJULI PWSS (NEW)",
+                        "localname": "BORJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212942/ws-services-calculation/Penalty.json b/data/as/30212942/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf8267e59d
--- /dev/null
+++ b/data/as/30212942/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212942",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212942/ws-services-calculation/WCBillingSlab.json b/data/as/30212942/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..03af55afe6
--- /dev/null
+++ b/data/as/30212942/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212942",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212948/BillingService/BusinessService.json b/data/as/30212948/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1f9ba4aeba
--- /dev/null
+++ b/data/as/30212948/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212948",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212948/egov-location/boundary-data.json b/data/as/30212948/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f94331ea81
--- /dev/null
+++ b/data/as/30212948/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212948",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 BATAMARI PWSS",
+                "localname": "NO.2 BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 BATAMARI PWSS",
+                        "localname": "NO.2 BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 BATAMARI PWSS",
+                "localname": "NO.2 BATAMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212948",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 BATAMARI PWSS",
+                        "localname": "NO.2 BATAMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212948/ws-services-calculation/Penalty.json b/data/as/30212948/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42cd1de9c6
--- /dev/null
+++ b/data/as/30212948/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212948",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212948/ws-services-calculation/WCBillingSlab.json b/data/as/30212948/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f651c42ee8
--- /dev/null
+++ b/data/as/30212948/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212948",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212952/BillingService/BusinessService.json b/data/as/30212952/BillingService/BusinessService.json
new file mode 100644
index 0000000000..401ee53a44
--- /dev/null
+++ b/data/as/30212952/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212952",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212952/egov-location/boundary-data.json b/data/as/30212952/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f1e516996
--- /dev/null
+++ b/data/as/30212952/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212952",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DABPARA BORIPARA PWSS (NEW)",
+                "localname": "DABPARA BORIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DABPARA BORIPARA PWSS (NEW)",
+                        "localname": "DABPARA BORIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DABPARA BORIPARA PWSS (NEW)",
+                "localname": "DABPARA BORIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212952",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DABPARA BORIPARA PWSS (NEW)",
+                        "localname": "DABPARA BORIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212952/ws-services-calculation/Penalty.json b/data/as/30212952/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..42bb837c6c
--- /dev/null
+++ b/data/as/30212952/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212952",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212952/ws-services-calculation/WCBillingSlab.json b/data/as/30212952/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a0532ddea5
--- /dev/null
+++ b/data/as/30212952/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212952",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212973/BillingService/BusinessService.json b/data/as/30212973/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6a8e5b359e
--- /dev/null
+++ b/data/as/30212973/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212973",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212973/egov-location/boundary-data.json b/data/as/30212973/egov-location/boundary-data.json
new file mode 100644
index 0000000000..91aa1521d6
--- /dev/null
+++ b/data/as/30212973/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212973",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                "localname": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                        "localname": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                "localname": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212973",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                        "localname": "DAMRIBHASA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212973/ws-services-calculation/Penalty.json b/data/as/30212973/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd8428b62e
--- /dev/null
+++ b/data/as/30212973/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212973",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212973/ws-services-calculation/WCBillingSlab.json b/data/as/30212973/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..37271f65d8
--- /dev/null
+++ b/data/as/30212973/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212973",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212983/BillingService/BusinessService.json b/data/as/30212983/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e26e356167
--- /dev/null
+++ b/data/as/30212983/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212983",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212983/egov-location/boundary-data.json b/data/as/30212983/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6ce163b699
--- /dev/null
+++ b/data/as/30212983/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212983",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEUSILA PWSS (NEW)",
+                "localname": "DEUSILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEUSILA PWSS (NEW)",
+                        "localname": "DEUSILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEUSILA PWSS (NEW)",
+                "localname": "DEUSILA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212983",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEUSILA PWSS (NEW)",
+                        "localname": "DEUSILA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212983/ws-services-calculation/Penalty.json b/data/as/30212983/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3572720a2
--- /dev/null
+++ b/data/as/30212983/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212983",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212983/ws-services-calculation/WCBillingSlab.json b/data/as/30212983/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48dc5ab588
--- /dev/null
+++ b/data/as/30212983/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212983",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212996/BillingService/BusinessService.json b/data/as/30212996/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e2bae2f691
--- /dev/null
+++ b/data/as/30212996/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30212996",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212996/egov-location/boundary-data.json b/data/as/30212996/egov-location/boundary-data.json
new file mode 100644
index 0000000000..64c62b085b
--- /dev/null
+++ b/data/as/30212996/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30212996",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 & 3 JOYPAM PWSS",
+                "localname": "NO. 2 & 3 JOYPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 & 3 JOYPAM PWSS",
+                        "localname": "NO. 2 & 3 JOYPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 & 3 JOYPAM PWSS",
+                "localname": "NO. 2 & 3 JOYPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30212996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 & 3 JOYPAM PWSS",
+                        "localname": "NO. 2 & 3 JOYPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212996/ws-services-calculation/Penalty.json b/data/as/30212996/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9cbde65e47
--- /dev/null
+++ b/data/as/30212996/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30212996",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30212996/ws-services-calculation/WCBillingSlab.json b/data/as/30212996/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f29a1bb73d
--- /dev/null
+++ b/data/as/30212996/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30212996",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213000/BillingService/BusinessService.json b/data/as/30213000/BillingService/BusinessService.json
new file mode 100644
index 0000000000..458a763344
--- /dev/null
+++ b/data/as/30213000/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213000",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213000/egov-location/boundary-data.json b/data/as/30213000/egov-location/boundary-data.json
new file mode 100644
index 0000000000..57e986bd58
--- /dev/null
+++ b/data/as/30213000/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213000",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATHIAPARA(1) PWSS (NEW)",
+                "localname": "GATHIAPARA(1) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213000",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATHIAPARA(1) PWSS (NEW)",
+                        "localname": "GATHIAPARA(1) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GATHIAPARA(1) PWSS (NEW)",
+                "localname": "GATHIAPARA(1) PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213000",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GATHIAPARA(1) PWSS (NEW)",
+                        "localname": "GATHIAPARA(1) PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213000/ws-services-calculation/Penalty.json b/data/as/30213000/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..46ba1b48d5
--- /dev/null
+++ b/data/as/30213000/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213000",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213000/ws-services-calculation/WCBillingSlab.json b/data/as/30213000/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..004c1918ee
--- /dev/null
+++ b/data/as/30213000/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213000",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213013/BillingService/BusinessService.json b/data/as/30213013/BillingService/BusinessService.json
new file mode 100644
index 0000000000..275d6d8255
--- /dev/null
+++ b/data/as/30213013/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213013",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213013/egov-location/boundary-data.json b/data/as/30213013/egov-location/boundary-data.json
new file mode 100644
index 0000000000..82acc4eb87
--- /dev/null
+++ b/data/as/30213013/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213013",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                "localname": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213013",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                        "localname": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                "localname": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213013",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                        "localname": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213013/ws-services-calculation/Penalty.json b/data/as/30213013/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..387d737e97
--- /dev/null
+++ b/data/as/30213013/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213013",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213013/ws-services-calculation/WCBillingSlab.json b/data/as/30213013/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad36449978
--- /dev/null
+++ b/data/as/30213013/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213013",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213023/BillingService/BusinessService.json b/data/as/30213023/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d623185738
--- /dev/null
+++ b/data/as/30213023/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213023",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213023/egov-location/boundary-data.json b/data/as/30213023/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02c1fb2a7d
--- /dev/null
+++ b/data/as/30213023/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213023",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALGURI PWSS (NEW)",
+                "localname": "KATHALGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALGURI PWSS (NEW)",
+                        "localname": "KATHALGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHALGURI PWSS (NEW)",
+                "localname": "KATHALGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213023",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHALGURI PWSS (NEW)",
+                        "localname": "KATHALGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213023/ws-services-calculation/Penalty.json b/data/as/30213023/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..54611d5111
--- /dev/null
+++ b/data/as/30213023/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213023",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213023/ws-services-calculation/WCBillingSlab.json b/data/as/30213023/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..863c7ef394
--- /dev/null
+++ b/data/as/30213023/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213023",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213053/BillingService/BusinessService.json b/data/as/30213053/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7c0f1cd5f8
--- /dev/null
+++ b/data/as/30213053/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213053",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213053/egov-location/boundary-data.json b/data/as/30213053/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c4ce410ee1
--- /dev/null
+++ b/data/as/30213053/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213053",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA TILAPARA PWSS (NEW)",
+                "localname": "MANUPARA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA TILAPARA PWSS (NEW)",
+                        "localname": "MANUPARA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANUPARA TILAPARA PWSS (NEW)",
+                "localname": "MANUPARA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANUPARA TILAPARA PWSS (NEW)",
+                        "localname": "MANUPARA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213053/ws-services-calculation/Penalty.json b/data/as/30213053/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf7d20b30e
--- /dev/null
+++ b/data/as/30213053/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213053",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213053/ws-services-calculation/WCBillingSlab.json b/data/as/30213053/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..09f74548e4
--- /dev/null
+++ b/data/as/30213053/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213053",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213057/BillingService/BusinessService.json b/data/as/30213057/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c9f7f15010
--- /dev/null
+++ b/data/as/30213057/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213057",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213057/egov-location/boundary-data.json b/data/as/30213057/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c29170d37e
--- /dev/null
+++ b/data/as/30213057/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213057",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMPUR PWSS (NEW)",
+                "localname": "RAMPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMPUR PWSS (NEW)",
+                        "localname": "RAMPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMPUR PWSS (NEW)",
+                "localname": "RAMPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMPUR PWSS (NEW)",
+                        "localname": "RAMPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213057/ws-services-calculation/Penalty.json b/data/as/30213057/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..79fda9945a
--- /dev/null
+++ b/data/as/30213057/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213057",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213057/ws-services-calculation/WCBillingSlab.json b/data/as/30213057/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f98a7ba1d8
--- /dev/null
+++ b/data/as/30213057/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213057",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213059/BillingService/BusinessService.json b/data/as/30213059/BillingService/BusinessService.json
new file mode 100644
index 0000000000..579c11d298
--- /dev/null
+++ b/data/as/30213059/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213059",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213059/egov-location/boundary-data.json b/data/as/30213059/egov-location/boundary-data.json
new file mode 100644
index 0000000000..66c295a4ff
--- /dev/null
+++ b/data/as/30213059/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213059",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAPARA PWSS (NEW)",
+                "localname": "RANGAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAPARA PWSS (NEW)",
+                        "localname": "RANGAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RANGAPARA PWSS (NEW)",
+                "localname": "RANGAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RANGAPARA PWSS (NEW)",
+                        "localname": "RANGAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213059/ws-services-calculation/Penalty.json b/data/as/30213059/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..792d2956a7
--- /dev/null
+++ b/data/as/30213059/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213059",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213059/ws-services-calculation/WCBillingSlab.json b/data/as/30213059/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..758b91d349
--- /dev/null
+++ b/data/as/30213059/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213059",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213066/BillingService/BusinessService.json b/data/as/30213066/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc8c8c446e
--- /dev/null
+++ b/data/as/30213066/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213066",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213066/egov-location/boundary-data.json b/data/as/30213066/egov-location/boundary-data.json
new file mode 100644
index 0000000000..76b5c28efe
--- /dev/null
+++ b/data/as/30213066/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213066",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIHALIRBHITA PWSS (NEW)",
+                "localname": "NIHALIRBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213066",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIHALIRBHITA PWSS (NEW)",
+                        "localname": "NIHALIRBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIHALIRBHITA PWSS (NEW)",
+                "localname": "NIHALIRBHITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213066",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIHALIRBHITA PWSS (NEW)",
+                        "localname": "NIHALIRBHITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213066/ws-services-calculation/Penalty.json b/data/as/30213066/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..558ba4ecc3
--- /dev/null
+++ b/data/as/30213066/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213066",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213066/ws-services-calculation/WCBillingSlab.json b/data/as/30213066/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1ba8bbe921
--- /dev/null
+++ b/data/as/30213066/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213066",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213067/BillingService/BusinessService.json b/data/as/30213067/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6373ec9cfe
--- /dev/null
+++ b/data/as/30213067/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213067",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213067/egov-location/boundary-data.json b/data/as/30213067/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a58924c71c
--- /dev/null
+++ b/data/as/30213067/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213067",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMFANG PWSS (NEW)",
+                "localname": "SAMFANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213067",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMFANG PWSS (NEW)",
+                        "localname": "SAMFANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAMFANG PWSS (NEW)",
+                "localname": "SAMFANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213067",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAMFANG PWSS (NEW)",
+                        "localname": "SAMFANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213067/ws-services-calculation/Penalty.json b/data/as/30213067/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6ee35c765
--- /dev/null
+++ b/data/as/30213067/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213067",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213067/ws-services-calculation/WCBillingSlab.json b/data/as/30213067/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1240e4c5cd
--- /dev/null
+++ b/data/as/30213067/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213067",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213075/BillingService/BusinessService.json b/data/as/30213075/BillingService/BusinessService.json
new file mode 100644
index 0000000000..021615f9f3
--- /dev/null
+++ b/data/as/30213075/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213075",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213075/egov-location/boundary-data.json b/data/as/30213075/egov-location/boundary-data.json
new file mode 100644
index 0000000000..51247d6ba8
--- /dev/null
+++ b/data/as/30213075/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213075",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALURTARI PWSS (NEW)",
+                "localname": "BALURTARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213075",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALURTARI PWSS (NEW)",
+                        "localname": "BALURTARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALURTARI PWSS (NEW)",
+                "localname": "BALURTARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213075",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALURTARI PWSS (NEW)",
+                        "localname": "BALURTARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213075/ws-services-calculation/Penalty.json b/data/as/30213075/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d68a44377a
--- /dev/null
+++ b/data/as/30213075/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213075",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213075/ws-services-calculation/WCBillingSlab.json b/data/as/30213075/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..65ed4755c3
--- /dev/null
+++ b/data/as/30213075/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213075",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213079/BillingService/BusinessService.json b/data/as/30213079/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3935ff51cc
--- /dev/null
+++ b/data/as/30213079/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213079",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213079/egov-location/boundary-data.json b/data/as/30213079/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cac768ce0f
--- /dev/null
+++ b/data/as/30213079/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213079",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BERUBARI PT-I PWSS",
+                "localname": "BERUBARI PT-I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213079",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BERUBARI PT-I PWSS",
+                        "localname": "BERUBARI PT-I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BERUBARI PT-I PWSS",
+                "localname": "BERUBARI PT-I PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213079",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BERUBARI PT-I PWSS",
+                        "localname": "BERUBARI PT-I PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213079/ws-services-calculation/Penalty.json b/data/as/30213079/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b5b4cc7ec9
--- /dev/null
+++ b/data/as/30213079/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213079",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213079/ws-services-calculation/WCBillingSlab.json b/data/as/30213079/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5f9dcf7f2f
--- /dev/null
+++ b/data/as/30213079/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213079",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213084/BillingService/BusinessService.json b/data/as/30213084/BillingService/BusinessService.json
new file mode 100644
index 0000000000..390599f00d
--- /dev/null
+++ b/data/as/30213084/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213084",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213084/egov-location/boundary-data.json b/data/as/30213084/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74c78efc7b
--- /dev/null
+++ b/data/as/30213084/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213084",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOMONI BORIPARA PWSS (NEW)",
+                "localname": "DOMONI BORIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOMONI BORIPARA PWSS (NEW)",
+                        "localname": "DOMONI BORIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOMONI BORIPARA PWSS (NEW)",
+                "localname": "DOMONI BORIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213084",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOMONI BORIPARA PWSS (NEW)",
+                        "localname": "DOMONI BORIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213084/ws-services-calculation/Penalty.json b/data/as/30213084/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8be85bf419
--- /dev/null
+++ b/data/as/30213084/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213084",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213084/ws-services-calculation/WCBillingSlab.json b/data/as/30213084/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1da90ab80e
--- /dev/null
+++ b/data/as/30213084/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213084",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213135/BillingService/BusinessService.json b/data/as/30213135/BillingService/BusinessService.json
new file mode 100644
index 0000000000..40dfe8842f
--- /dev/null
+++ b/data/as/30213135/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213135",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213135/egov-location/boundary-data.json b/data/as/30213135/egov-location/boundary-data.json
new file mode 100644
index 0000000000..805fd5064f
--- /dev/null
+++ b/data/as/30213135/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213135",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATARIHARA SARAKPARA PWSS (NEW)",
+                "localname": "KATARIHARA SARAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATARIHARA SARAKPARA PWSS (NEW)",
+                        "localname": "KATARIHARA SARAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATARIHARA SARAKPARA PWSS (NEW)",
+                "localname": "KATARIHARA SARAKPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATARIHARA SARAKPARA PWSS (NEW)",
+                        "localname": "KATARIHARA SARAKPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213135/ws-services-calculation/Penalty.json b/data/as/30213135/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4560afdc10
--- /dev/null
+++ b/data/as/30213135/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213135",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213135/ws-services-calculation/WCBillingSlab.json b/data/as/30213135/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..810a1ce95a
--- /dev/null
+++ b/data/as/30213135/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213135",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213136/BillingService/BusinessService.json b/data/as/30213136/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a238cf67c7
--- /dev/null
+++ b/data/as/30213136/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213136",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213136/egov-location/boundary-data.json b/data/as/30213136/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a95926a3f
--- /dev/null
+++ b/data/as/30213136/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213136",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONDAPARA PWSS (NEW)",
+                "localname": "KONDAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONDAPARA PWSS (NEW)",
+                        "localname": "KONDAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KONDAPARA PWSS (NEW)",
+                "localname": "KONDAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213136",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KONDAPARA PWSS (NEW)",
+                        "localname": "KONDAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213136/ws-services-calculation/Penalty.json b/data/as/30213136/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e11e4171f7
--- /dev/null
+++ b/data/as/30213136/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213136",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213136/ws-services-calculation/WCBillingSlab.json b/data/as/30213136/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3b8b0bd4ac
--- /dev/null
+++ b/data/as/30213136/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213136",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213138/BillingService/BusinessService.json b/data/as/30213138/BillingService/BusinessService.json
new file mode 100644
index 0000000000..34e2dc523c
--- /dev/null
+++ b/data/as/30213138/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213138",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213138/egov-location/boundary-data.json b/data/as/30213138/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c4842b032c
--- /dev/null
+++ b/data/as/30213138/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213138",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAMUDPUR PWSS (NEW)",
+                "localname": "MAMUDPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213138",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAMUDPUR PWSS (NEW)",
+                        "localname": "MAMUDPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MAMUDPUR PWSS (NEW)",
+                "localname": "MAMUDPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213138",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MAMUDPUR PWSS (NEW)",
+                        "localname": "MAMUDPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213138/ws-services-calculation/Penalty.json b/data/as/30213138/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ac846de888
--- /dev/null
+++ b/data/as/30213138/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213138",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213138/ws-services-calculation/WCBillingSlab.json b/data/as/30213138/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6527d26566
--- /dev/null
+++ b/data/as/30213138/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213138",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213140/BillingService/BusinessService.json b/data/as/30213140/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa7e62dd80
--- /dev/null
+++ b/data/as/30213140/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213140",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213140/egov-location/boundary-data.json b/data/as/30213140/egov-location/boundary-data.json
new file mode 100644
index 0000000000..45f95aad82
--- /dev/null
+++ b/data/as/30213140/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213140",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                "localname": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213140",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                        "localname": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                "localname": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213140",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                        "localname": "MARIYOMNAGAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213140/ws-services-calculation/Penalty.json b/data/as/30213140/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cf1e30e0dd
--- /dev/null
+++ b/data/as/30213140/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213140",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213140/ws-services-calculation/WCBillingSlab.json b/data/as/30213140/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..54be76dc1f
--- /dev/null
+++ b/data/as/30213140/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213140",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213143/BillingService/BusinessService.json b/data/as/30213143/BillingService/BusinessService.json
new file mode 100644
index 0000000000..506164cc33
--- /dev/null
+++ b/data/as/30213143/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213143",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213143/egov-location/boundary-data.json b/data/as/30213143/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6cac6a10bf
--- /dev/null
+++ b/data/as/30213143/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213143",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ULMAPARA PWSS (NEW)",
+                "localname": "ULMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ULMAPARA PWSS (NEW)",
+                        "localname": "ULMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ULMAPARA PWSS (NEW)",
+                "localname": "ULMAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213143",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ULMAPARA PWSS (NEW)",
+                        "localname": "ULMAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213143/ws-services-calculation/Penalty.json b/data/as/30213143/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c012761520
--- /dev/null
+++ b/data/as/30213143/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213143",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213143/ws-services-calculation/WCBillingSlab.json b/data/as/30213143/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3523f78efe
--- /dev/null
+++ b/data/as/30213143/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213143",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213146/BillingService/BusinessService.json b/data/as/30213146/BillingService/BusinessService.json
new file mode 100644
index 0000000000..dfecd61d07
--- /dev/null
+++ b/data/as/30213146/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213146",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213146/egov-location/boundary-data.json b/data/as/30213146/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c6b69a53c
--- /dev/null
+++ b/data/as/30213146/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213146",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR GOBINDOPUR PWSS (NEW)",
+                "localname": "UTTAR GOBINDOPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR GOBINDOPUR PWSS (NEW)",
+                        "localname": "UTTAR GOBINDOPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UTTAR GOBINDOPUR PWSS (NEW)",
+                "localname": "UTTAR GOBINDOPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213146",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UTTAR GOBINDOPUR PWSS (NEW)",
+                        "localname": "UTTAR GOBINDOPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213146/ws-services-calculation/Penalty.json b/data/as/30213146/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..80c20a3492
--- /dev/null
+++ b/data/as/30213146/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213146",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213146/ws-services-calculation/WCBillingSlab.json b/data/as/30213146/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..61d7bf87ee
--- /dev/null
+++ b/data/as/30213146/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213146",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213148/BillingService/BusinessService.json b/data/as/30213148/BillingService/BusinessService.json
new file mode 100644
index 0000000000..82cb370430
--- /dev/null
+++ b/data/as/30213148/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213148",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213148/egov-location/boundary-data.json b/data/as/30213148/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f25ebb7ab6
--- /dev/null
+++ b/data/as/30213148/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213148",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARABANDHA BILPARA PWSS (NEW)",
+                "localname": "ARABANDHA BILPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARABANDHA BILPARA PWSS (NEW)",
+                        "localname": "ARABANDHA BILPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ARABANDHA BILPARA PWSS (NEW)",
+                "localname": "ARABANDHA BILPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ARABANDHA BILPARA PWSS (NEW)",
+                        "localname": "ARABANDHA BILPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213148/ws-services-calculation/Penalty.json b/data/as/30213148/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d8e9481b6
--- /dev/null
+++ b/data/as/30213148/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213148",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213148/ws-services-calculation/WCBillingSlab.json b/data/as/30213148/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cdac1abdef
--- /dev/null
+++ b/data/as/30213148/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213148",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213150/BillingService/BusinessService.json b/data/as/30213150/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c949b76543
--- /dev/null
+++ b/data/as/30213150/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213150",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213150/egov-location/boundary-data.json b/data/as/30213150/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e95a1b342d
--- /dev/null
+++ b/data/as/30213150/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213150",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELDENGPARA PWSS (NEW)",
+                "localname": "BELDENGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELDENGPARA PWSS (NEW)",
+                        "localname": "BELDENGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BELDENGPARA PWSS (NEW)",
+                "localname": "BELDENGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213150",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BELDENGPARA PWSS (NEW)",
+                        "localname": "BELDENGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213150/ws-services-calculation/Penalty.json b/data/as/30213150/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a79d8f5636
--- /dev/null
+++ b/data/as/30213150/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213150",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213150/ws-services-calculation/WCBillingSlab.json b/data/as/30213150/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..498a172906
--- /dev/null
+++ b/data/as/30213150/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213150",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213200/BillingService/BusinessService.json b/data/as/30213200/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7b4593c8c
--- /dev/null
+++ b/data/as/30213200/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213200",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213200/egov-location/boundary-data.json b/data/as/30213200/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0ce0e4af99
--- /dev/null
+++ b/data/as/30213200/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213200",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKJULI PWSS (NEW)",
+                "localname": "BHALUKJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213200",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKJULI PWSS (NEW)",
+                        "localname": "BHALUKJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKJULI PWSS (NEW)",
+                "localname": "BHALUKJULI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213200",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKJULI PWSS (NEW)",
+                        "localname": "BHALUKJULI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213200/ws-services-calculation/Penalty.json b/data/as/30213200/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0cbab36688
--- /dev/null
+++ b/data/as/30213200/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213200",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213200/ws-services-calculation/WCBillingSlab.json b/data/as/30213200/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..29fcc151a1
--- /dev/null
+++ b/data/as/30213200/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213200",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213202/BillingService/BusinessService.json b/data/as/30213202/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3d8485d200
--- /dev/null
+++ b/data/as/30213202/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213202",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213202/egov-location/boundary-data.json b/data/as/30213202/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe10df6485
--- /dev/null
+++ b/data/as/30213202/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213202",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARO SICHA PWSS (NEW)",
+                "localname": "GARO SICHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARO SICHA PWSS (NEW)",
+                        "localname": "GARO SICHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GARO SICHA PWSS (NEW)",
+                "localname": "GARO SICHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213202",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GARO SICHA PWSS (NEW)",
+                        "localname": "GARO SICHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213202/ws-services-calculation/Penalty.json b/data/as/30213202/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..02b1030d56
--- /dev/null
+++ b/data/as/30213202/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213202",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213202/ws-services-calculation/WCBillingSlab.json b/data/as/30213202/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f7c14faae
--- /dev/null
+++ b/data/as/30213202/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213202",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213205/BillingService/BusinessService.json b/data/as/30213205/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79e77ecb26
--- /dev/null
+++ b/data/as/30213205/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213205",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213205/egov-location/boundary-data.json b/data/as/30213205/egov-location/boundary-data.json
new file mode 100644
index 0000000000..34f8c9f5dd
--- /dev/null
+++ b/data/as/30213205/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213205",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                "localname": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                        "localname": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                "localname": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213205",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                        "localname": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213205/ws-services-calculation/Penalty.json b/data/as/30213205/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a0f2801d69
--- /dev/null
+++ b/data/as/30213205/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213205",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213205/ws-services-calculation/WCBillingSlab.json b/data/as/30213205/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0aaca76e06
--- /dev/null
+++ b/data/as/30213205/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213205",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213208/BillingService/BusinessService.json b/data/as/30213208/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f181c451f3
--- /dev/null
+++ b/data/as/30213208/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213208",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213208/egov-location/boundary-data.json b/data/as/30213208/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f7783e0f13
--- /dev/null
+++ b/data/as/30213208/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213208",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                "localname": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                        "localname": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                "localname": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213208",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                        "localname": "GOSSAIBORI MILANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213208/ws-services-calculation/Penalty.json b/data/as/30213208/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d15d8580d9
--- /dev/null
+++ b/data/as/30213208/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213208",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213208/ws-services-calculation/WCBillingSlab.json b/data/as/30213208/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..81ea606e12
--- /dev/null
+++ b/data/as/30213208/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213208",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213210/BillingService/BusinessService.json b/data/as/30213210/BillingService/BusinessService.json
new file mode 100644
index 0000000000..71145f91aa
--- /dev/null
+++ b/data/as/30213210/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213210",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213210/egov-location/boundary-data.json b/data/as/30213210/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1f642a3743
--- /dev/null
+++ b/data/as/30213210/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213210",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                "localname": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                        "localname": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                "localname": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213210",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                        "localname": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213210/ws-services-calculation/Penalty.json b/data/as/30213210/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..152d3a3a79
--- /dev/null
+++ b/data/as/30213210/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213210",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213210/ws-services-calculation/WCBillingSlab.json b/data/as/30213210/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..537211c503
--- /dev/null
+++ b/data/as/30213210/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213210",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213215/BillingService/BusinessService.json b/data/as/30213215/BillingService/BusinessService.json
new file mode 100644
index 0000000000..228fd8d177
--- /dev/null
+++ b/data/as/30213215/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213215",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213215/egov-location/boundary-data.json b/data/as/30213215/egov-location/boundary-data.json
new file mode 100644
index 0000000000..83ec5017fa
--- /dev/null
+++ b/data/as/30213215/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213215",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAYATPARA PURANPARA PWSS (NEW)",
+                "localname": "RAYATPARA PURANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213215",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAYATPARA PURANPARA PWSS (NEW)",
+                        "localname": "RAYATPARA PURANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAYATPARA PURANPARA PWSS (NEW)",
+                "localname": "RAYATPARA PURANPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213215",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAYATPARA PURANPARA PWSS (NEW)",
+                        "localname": "RAYATPARA PURANPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213215/ws-services-calculation/Penalty.json b/data/as/30213215/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd0c0a10be
--- /dev/null
+++ b/data/as/30213215/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213215",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213215/ws-services-calculation/WCBillingSlab.json b/data/as/30213215/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3889b80877
--- /dev/null
+++ b/data/as/30213215/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213215",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213219/BillingService/BusinessService.json b/data/as/30213219/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cf2e3ee680
--- /dev/null
+++ b/data/as/30213219/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213219",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213219/egov-location/boundary-data.json b/data/as/30213219/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4f5be4c594
--- /dev/null
+++ b/data/as/30213219/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213219",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                "localname": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                        "localname": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                "localname": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213219",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                        "localname": "SOULMARI PWSS (KHARMUZA)(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213219/ws-services-calculation/Penalty.json b/data/as/30213219/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..16f0b61900
--- /dev/null
+++ b/data/as/30213219/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213219",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213219/ws-services-calculation/WCBillingSlab.json b/data/as/30213219/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ca1da51332
--- /dev/null
+++ b/data/as/30213219/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213219",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213224/BillingService/BusinessService.json b/data/as/30213224/BillingService/BusinessService.json
new file mode 100644
index 0000000000..834a54d2da
--- /dev/null
+++ b/data/as/30213224/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213224",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213224/egov-location/boundary-data.json b/data/as/30213224/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7c5b362891
--- /dev/null
+++ b/data/as/30213224/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213224",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                "localname": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                        "localname": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                "localname": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213224",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                        "localname": "BAKAITARY KHALAIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213224/ws-services-calculation/Penalty.json b/data/as/30213224/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..48ed7474e4
--- /dev/null
+++ b/data/as/30213224/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213224",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213224/ws-services-calculation/WCBillingSlab.json b/data/as/30213224/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0b94c1b8b9
--- /dev/null
+++ b/data/as/30213224/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213224",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213489/BillingService/BusinessService.json b/data/as/30213489/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a9f2dcdc7a
--- /dev/null
+++ b/data/as/30213489/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213489",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213489/egov-location/boundary-data.json b/data/as/30213489/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4c4bc065d2
--- /dev/null
+++ b/data/as/30213489/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213489",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JIAGABHARU NO.1 PWSS",
+                "localname": "JIAGABHARU NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213489",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JIAGABHARU NO.1 PWSS",
+                        "localname": "JIAGABHARU NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JIAGABHARU NO.1 PWSS",
+                "localname": "JIAGABHARU NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213489",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JIAGABHARU NO.1 PWSS",
+                        "localname": "JIAGABHARU NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213489/ws-services-calculation/Penalty.json b/data/as/30213489/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ca124563a
--- /dev/null
+++ b/data/as/30213489/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213489",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213489/ws-services-calculation/WCBillingSlab.json b/data/as/30213489/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ba8354f47
--- /dev/null
+++ b/data/as/30213489/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213489",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213521/BillingService/BusinessService.json b/data/as/30213521/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d60ab0d935
--- /dev/null
+++ b/data/as/30213521/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213521",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213521/egov-location/boundary-data.json b/data/as/30213521/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f251873d78
--- /dev/null
+++ b/data/as/30213521/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213521",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                "localname": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213521",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                        "localname": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                "localname": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213521",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                        "localname": "PURONI JAMUGURI PART-A PWSS - (OLD NAME - HATIBARIJAN PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213521/ws-services-calculation/Penalty.json b/data/as/30213521/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fd91e8c2f4
--- /dev/null
+++ b/data/as/30213521/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213521",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213521/ws-services-calculation/WCBillingSlab.json b/data/as/30213521/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..69e89ccf89
--- /dev/null
+++ b/data/as/30213521/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213521",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213556/BillingService/BusinessService.json b/data/as/30213556/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da6378ab7f
--- /dev/null
+++ b/data/as/30213556/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213556",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213556/egov-location/boundary-data.json b/data/as/30213556/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bec4febcc4
--- /dev/null
+++ b/data/as/30213556/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213556",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                "localname": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                        "localname": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                "localname": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213556",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                        "localname": "MITHAM BANGALI PWSS - (OLD NAME - HABIGAON PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213556/ws-services-calculation/Penalty.json b/data/as/30213556/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d3b71b5eae
--- /dev/null
+++ b/data/as/30213556/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213556",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213556/ws-services-calculation/WCBillingSlab.json b/data/as/30213556/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1ca9d97d9c
--- /dev/null
+++ b/data/as/30213556/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213556",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213569/BillingService/BusinessService.json b/data/as/30213569/BillingService/BusinessService.json
new file mode 100644
index 0000000000..16c11534b8
--- /dev/null
+++ b/data/as/30213569/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213569",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213569/egov-location/boundary-data.json b/data/as/30213569/egov-location/boundary-data.json
new file mode 100644
index 0000000000..04ce7d6e8c
--- /dev/null
+++ b/data/as/30213569/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213569",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHRISTAN BASTI NO. 2 PWSS",
+                "localname": "CHRISTAN BASTI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHRISTAN BASTI NO. 2 PWSS",
+                        "localname": "CHRISTAN BASTI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHRISTAN BASTI NO. 2 PWSS",
+                "localname": "CHRISTAN BASTI NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213569",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHRISTAN BASTI NO. 2 PWSS",
+                        "localname": "CHRISTAN BASTI NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213569/ws-services-calculation/Penalty.json b/data/as/30213569/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..90b9f954d7
--- /dev/null
+++ b/data/as/30213569/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213569",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213569/ws-services-calculation/WCBillingSlab.json b/data/as/30213569/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4869bfa8d9
--- /dev/null
+++ b/data/as/30213569/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213569",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213581/BillingService/BusinessService.json b/data/as/30213581/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3bae8c8c40
--- /dev/null
+++ b/data/as/30213581/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213581",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213581/egov-location/boundary-data.json b/data/as/30213581/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8398262745
--- /dev/null
+++ b/data/as/30213581/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213581",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHUTIUM PWSS",
+                "localname": "CHUTIUM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213581",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHUTIUM PWSS",
+                        "localname": "CHUTIUM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHUTIUM PWSS",
+                "localname": "CHUTIUM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213581",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHUTIUM PWSS",
+                        "localname": "CHUTIUM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213581/ws-services-calculation/Penalty.json b/data/as/30213581/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d8c34cf31f
--- /dev/null
+++ b/data/as/30213581/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213581",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213581/ws-services-calculation/WCBillingSlab.json b/data/as/30213581/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..94af05910a
--- /dev/null
+++ b/data/as/30213581/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213581",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213587/BillingService/BusinessService.json b/data/as/30213587/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1b7d13f47b
--- /dev/null
+++ b/data/as/30213587/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213587",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213587/egov-location/boundary-data.json b/data/as/30213587/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8a9819046d
--- /dev/null
+++ b/data/as/30213587/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213587",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                "localname": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                        "localname": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                "localname": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213587",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                        "localname": "BALIGAON PART PWSS - (OLD NAME - PANBARI GAON PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213587/ws-services-calculation/Penalty.json b/data/as/30213587/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab1562d930
--- /dev/null
+++ b/data/as/30213587/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213587",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213587/ws-services-calculation/WCBillingSlab.json b/data/as/30213587/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6256a2f06a
--- /dev/null
+++ b/data/as/30213587/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213587",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213598/BillingService/BusinessService.json b/data/as/30213598/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5a02d52ea7
--- /dev/null
+++ b/data/as/30213598/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213598",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213598/egov-location/boundary-data.json b/data/as/30213598/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6dfde4a1fa
--- /dev/null
+++ b/data/as/30213598/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213598",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN GAON PWSS",
+                "localname": "TARAJAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213598",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN GAON PWSS",
+                        "localname": "TARAJAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TARAJAN GAON PWSS",
+                "localname": "TARAJAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213598",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TARAJAN GAON PWSS",
+                        "localname": "TARAJAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213598/ws-services-calculation/Penalty.json b/data/as/30213598/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f5644e5efb
--- /dev/null
+++ b/data/as/30213598/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213598",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213598/ws-services-calculation/WCBillingSlab.json b/data/as/30213598/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5a2f71b4cc
--- /dev/null
+++ b/data/as/30213598/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213598",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213603/BillingService/BusinessService.json b/data/as/30213603/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c22977f4d
--- /dev/null
+++ b/data/as/30213603/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213603",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213603/egov-location/boundary-data.json b/data/as/30213603/egov-location/boundary-data.json
new file mode 100644
index 0000000000..559699a52c
--- /dev/null
+++ b/data/as/30213603/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213603",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAFALA BIL PWSS",
+                "localname": "DAFALA BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213603",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAFALA BIL PWSS",
+                        "localname": "DAFALA BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAFALA BIL PWSS",
+                "localname": "DAFALA BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213603",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAFALA BIL PWSS",
+                        "localname": "DAFALA BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213603/ws-services-calculation/Penalty.json b/data/as/30213603/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..005f80c508
--- /dev/null
+++ b/data/as/30213603/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213603",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213603/ws-services-calculation/WCBillingSlab.json b/data/as/30213603/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e4bd3d58fe
--- /dev/null
+++ b/data/as/30213603/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213603",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213638/BillingService/BusinessService.json b/data/as/30213638/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ef23910cb
--- /dev/null
+++ b/data/as/30213638/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213638",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213638/egov-location/boundary-data.json b/data/as/30213638/egov-location/boundary-data.json
new file mode 100644
index 0000000000..06e8ce0892
--- /dev/null
+++ b/data/as/30213638/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213638",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DIGHALIGAON MPWS",
+                "localname": "NEW DIGHALIGAON MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213638",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DIGHALIGAON MPWS",
+                        "localname": "NEW DIGHALIGAON MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW DIGHALIGAON MPWS",
+                "localname": "NEW DIGHALIGAON MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213638",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW DIGHALIGAON MPWS",
+                        "localname": "NEW DIGHALIGAON MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213638/ws-services-calculation/Penalty.json b/data/as/30213638/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0965b92861
--- /dev/null
+++ b/data/as/30213638/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213638",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213638/ws-services-calculation/WCBillingSlab.json b/data/as/30213638/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7583e0ab02
--- /dev/null
+++ b/data/as/30213638/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213638",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213716/BillingService/BusinessService.json b/data/as/30213716/BillingService/BusinessService.json
new file mode 100644
index 0000000000..018360eec9
--- /dev/null
+++ b/data/as/30213716/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213716",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213716/egov-location/boundary-data.json b/data/as/30213716/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48a3419878
--- /dev/null
+++ b/data/as/30213716/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213716",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 JOYPAM PWSS",
+                "localname": "NO. 1 JOYPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 JOYPAM PWSS",
+                        "localname": "NO. 1 JOYPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 JOYPAM PWSS",
+                "localname": "NO. 1 JOYPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213716",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 JOYPAM PWSS",
+                        "localname": "NO. 1 JOYPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213716/ws-services-calculation/Penalty.json b/data/as/30213716/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44e4112384
--- /dev/null
+++ b/data/as/30213716/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213716",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213716/ws-services-calculation/WCBillingSlab.json b/data/as/30213716/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..278624dda8
--- /dev/null
+++ b/data/as/30213716/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213716",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213729/BillingService/BusinessService.json b/data/as/30213729/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ed3cfe4e5e
--- /dev/null
+++ b/data/as/30213729/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213729",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213729/egov-location/boundary-data.json b/data/as/30213729/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1e5178dbeb
--- /dev/null
+++ b/data/as/30213729/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213729",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 GERGUAJULI PWSS",
+                "localname": "NO. 1 GERGUAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213729",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 GERGUAJULI PWSS",
+                        "localname": "NO. 1 GERGUAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 1 GERGUAJULI PWSS",
+                "localname": "NO. 1 GERGUAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213729",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 1 GERGUAJULI PWSS",
+                        "localname": "NO. 1 GERGUAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213729/ws-services-calculation/Penalty.json b/data/as/30213729/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b786ba63bb
--- /dev/null
+++ b/data/as/30213729/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213729",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213729/ws-services-calculation/WCBillingSlab.json b/data/as/30213729/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..35369d5084
--- /dev/null
+++ b/data/as/30213729/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213729",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213788/BillingService/BusinessService.json b/data/as/30213788/BillingService/BusinessService.json
new file mode 100644
index 0000000000..59029ae167
--- /dev/null
+++ b/data/as/30213788/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213788",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213788/egov-location/boundary-data.json b/data/as/30213788/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5d6424e9cf
--- /dev/null
+++ b/data/as/30213788/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213788",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW PAT GAON PWSS",
+                "localname": "NEW PAT GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW PAT GAON PWSS",
+                        "localname": "NEW PAT GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW PAT GAON PWSS",
+                "localname": "NEW PAT GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213788",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW PAT GAON PWSS",
+                        "localname": "NEW PAT GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213788/ws-services-calculation/Penalty.json b/data/as/30213788/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c4ffa5fbdc
--- /dev/null
+++ b/data/as/30213788/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213788",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213788/ws-services-calculation/WCBillingSlab.json b/data/as/30213788/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b530a96a13
--- /dev/null
+++ b/data/as/30213788/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213788",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213798/BillingService/BusinessService.json b/data/as/30213798/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42a7693f28
--- /dev/null
+++ b/data/as/30213798/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213798",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213798/egov-location/boundary-data.json b/data/as/30213798/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7c94cf4a1f
--- /dev/null
+++ b/data/as/30213798/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213798",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW NAMGAON T.E. PWSS",
+                "localname": "NEW NAMGAON T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213798",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW NAMGAON T.E. PWSS",
+                        "localname": "NEW NAMGAON T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW NAMGAON T.E. PWSS",
+                "localname": "NEW NAMGAON T.E. PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213798",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW NAMGAON T.E. PWSS",
+                        "localname": "NEW NAMGAON T.E. PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213798/ws-services-calculation/Penalty.json b/data/as/30213798/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7adf551e1e
--- /dev/null
+++ b/data/as/30213798/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213798",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213798/ws-services-calculation/WCBillingSlab.json b/data/as/30213798/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3a504cff8a
--- /dev/null
+++ b/data/as/30213798/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213798",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213839/BillingService/BusinessService.json b/data/as/30213839/BillingService/BusinessService.json
new file mode 100644
index 0000000000..41cd5ab630
--- /dev/null
+++ b/data/as/30213839/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213839",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213839/egov-location/boundary-data.json b/data/as/30213839/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c65aceeec0
--- /dev/null
+++ b/data/as/30213839/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213839",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEPALI CHUBURI PWSS",
+                "localname": "NEPALI CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213839",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEPALI CHUBURI PWSS",
+                        "localname": "NEPALI CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEPALI CHUBURI PWSS",
+                "localname": "NEPALI CHUBURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213839",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEPALI CHUBURI PWSS",
+                        "localname": "NEPALI CHUBURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213839/ws-services-calculation/Penalty.json b/data/as/30213839/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0ef3388aad
--- /dev/null
+++ b/data/as/30213839/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213839",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213839/ws-services-calculation/WCBillingSlab.json b/data/as/30213839/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c42ef8589e
--- /dev/null
+++ b/data/as/30213839/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213839",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213850/BillingService/BusinessService.json b/data/as/30213850/BillingService/BusinessService.json
new file mode 100644
index 0000000000..93a9671616
--- /dev/null
+++ b/data/as/30213850/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213850",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213850/egov-location/boundary-data.json b/data/as/30213850/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d680a963ce
--- /dev/null
+++ b/data/as/30213850/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213850",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAN PUR MPWS",
+                "localname": "NAYAN PUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAN PUR MPWS",
+                        "localname": "NAYAN PUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAN PUR MPWS",
+                "localname": "NAYAN PUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213850",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAN PUR MPWS",
+                        "localname": "NAYAN PUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213850/ws-services-calculation/Penalty.json b/data/as/30213850/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..369b663c27
--- /dev/null
+++ b/data/as/30213850/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213850",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213850/ws-services-calculation/WCBillingSlab.json b/data/as/30213850/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c0f9c60a28
--- /dev/null
+++ b/data/as/30213850/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213850",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213862/BillingService/BusinessService.json b/data/as/30213862/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c0adeed202
--- /dev/null
+++ b/data/as/30213862/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213862",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213862/egov-location/boundary-data.json b/data/as/30213862/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5a39eb758e
--- /dev/null
+++ b/data/as/30213862/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213862",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAK BASTI MPWS",
+                "localname": "NAYAK BASTI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213862",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAK BASTI MPWS",
+                        "localname": "NAYAK BASTI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAK BASTI MPWS",
+                "localname": "NAYAK BASTI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213862",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAK BASTI MPWS",
+                        "localname": "NAYAK BASTI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213862/ws-services-calculation/Penalty.json b/data/as/30213862/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a76028845d
--- /dev/null
+++ b/data/as/30213862/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213862",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213862/ws-services-calculation/WCBillingSlab.json b/data/as/30213862/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de48c8f73d
--- /dev/null
+++ b/data/as/30213862/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213862",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213877/BillingService/BusinessService.json b/data/as/30213877/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5dc3c4e43f
--- /dev/null
+++ b/data/as/30213877/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213877",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213877/egov-location/boundary-data.json b/data/as/30213877/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7fbb4f6b6e
--- /dev/null
+++ b/data/as/30213877/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213877",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALGHAGARI PWSS",
+                "localname": "NALGHAGARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALGHAGARI PWSS",
+                        "localname": "NALGHAGARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALGHAGARI PWSS",
+                "localname": "NALGHAGARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213877",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALGHAGARI PWSS",
+                        "localname": "NALGHAGARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213877/ws-services-calculation/Penalty.json b/data/as/30213877/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2e52e92992
--- /dev/null
+++ b/data/as/30213877/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213877",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213877/ws-services-calculation/WCBillingSlab.json b/data/as/30213877/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9dc0b15da
--- /dev/null
+++ b/data/as/30213877/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213877",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213916/BillingService/BusinessService.json b/data/as/30213916/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e9ecdc2fac
--- /dev/null
+++ b/data/as/30213916/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213916",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213916/egov-location/boundary-data.json b/data/as/30213916/egov-location/boundary-data.json
new file mode 100644
index 0000000000..962fadd5ba
--- /dev/null
+++ b/data/as/30213916/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213916",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUNDA BASTI MPWS",
+                "localname": "MUNDA BASTI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213916",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUNDA BASTI MPWS",
+                        "localname": "MUNDA BASTI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUNDA BASTI MPWS",
+                "localname": "MUNDA BASTI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213916",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUNDA BASTI MPWS",
+                        "localname": "MUNDA BASTI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213916/ws-services-calculation/Penalty.json b/data/as/30213916/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..260b8d0518
--- /dev/null
+++ b/data/as/30213916/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213916",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213916/ws-services-calculation/WCBillingSlab.json b/data/as/30213916/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47fb9adf2c
--- /dev/null
+++ b/data/as/30213916/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213916",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213935/BillingService/BusinessService.json b/data/as/30213935/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f85bfb5d07
--- /dev/null
+++ b/data/as/30213935/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30213935",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213935/egov-location/boundary-data.json b/data/as/30213935/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4fe78ad9ec
--- /dev/null
+++ b/data/as/30213935/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30213935",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHIN MOLAN GAON PWSS",
+                "localname": "DAKHIN MOLAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHIN MOLAN GAON PWSS",
+                        "localname": "DAKHIN MOLAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKHIN MOLAN GAON PWSS",
+                "localname": "DAKHIN MOLAN GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30213935",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKHIN MOLAN GAON PWSS",
+                        "localname": "DAKHIN MOLAN GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213935/ws-services-calculation/Penalty.json b/data/as/30213935/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e187cb614d
--- /dev/null
+++ b/data/as/30213935/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30213935",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30213935/ws-services-calculation/WCBillingSlab.json b/data/as/30213935/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..480ea458ec
--- /dev/null
+++ b/data/as/30213935/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30213935",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214038/BillingService/BusinessService.json b/data/as/30214038/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7a49dc4927
--- /dev/null
+++ b/data/as/30214038/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214038",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214038/egov-location/boundary-data.json b/data/as/30214038/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1b99734cc5
--- /dev/null
+++ b/data/as/30214038/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214038",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR NO. 2 PWSS",
+                "localname": "MILANPUR NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR NO. 2 PWSS",
+                        "localname": "MILANPUR NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR NO. 2 PWSS",
+                "localname": "MILANPUR NO. 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214038",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR NO. 2 PWSS",
+                        "localname": "MILANPUR NO. 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214038/ws-services-calculation/Penalty.json b/data/as/30214038/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..09830af7ba
--- /dev/null
+++ b/data/as/30214038/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214038",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214038/ws-services-calculation/WCBillingSlab.json b/data/as/30214038/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f25fa72e9
--- /dev/null
+++ b/data/as/30214038/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214038",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214044/BillingService/BusinessService.json b/data/as/30214044/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac68abab9e
--- /dev/null
+++ b/data/as/30214044/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214044",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214044/egov-location/boundary-data.json b/data/as/30214044/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9579a0aeb6
--- /dev/null
+++ b/data/as/30214044/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214044",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUBIGHAT KHILKOWARI MPWSS",
+                "localname": "DHUBIGHAT KHILKOWARI MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUBIGHAT KHILKOWARI MPWSS",
+                        "localname": "DHUBIGHAT KHILKOWARI MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUBIGHAT KHILKOWARI MPWSS",
+                "localname": "DHUBIGHAT KHILKOWARI MPWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214044",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUBIGHAT KHILKOWARI MPWSS",
+                        "localname": "DHUBIGHAT KHILKOWARI MPWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214044/ws-services-calculation/Penalty.json b/data/as/30214044/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0dcf91be26
--- /dev/null
+++ b/data/as/30214044/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214044",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214044/ws-services-calculation/WCBillingSlab.json b/data/as/30214044/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..74f75158a6
--- /dev/null
+++ b/data/as/30214044/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214044",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214051/BillingService/BusinessService.json b/data/as/30214051/BillingService/BusinessService.json
new file mode 100644
index 0000000000..79143cb131
--- /dev/null
+++ b/data/as/30214051/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214051",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214051/egov-location/boundary-data.json b/data/as/30214051/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3aeb0de337
--- /dev/null
+++ b/data/as/30214051/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214051",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR MPWS",
+                "localname": "MILANPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214051",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR MPWS",
+                        "localname": "MILANPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MILANPUR MPWS",
+                "localname": "MILANPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214051",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MILANPUR MPWS",
+                        "localname": "MILANPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214051/ws-services-calculation/Penalty.json b/data/as/30214051/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad6ebdbcde
--- /dev/null
+++ b/data/as/30214051/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214051",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214051/ws-services-calculation/WCBillingSlab.json b/data/as/30214051/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8d244ed8ac
--- /dev/null
+++ b/data/as/30214051/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214051",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214059/BillingService/BusinessService.json b/data/as/30214059/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8e38532f9d
--- /dev/null
+++ b/data/as/30214059/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214059",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214059/egov-location/boundary-data.json b/data/as/30214059/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e29345a59a
--- /dev/null
+++ b/data/as/30214059/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214059",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEHERBASTI PWSS",
+                "localname": "MEHERBASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEHERBASTI PWSS",
+                        "localname": "MEHERBASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MEHERBASTI PWSS",
+                "localname": "MEHERBASTI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MEHERBASTI PWSS",
+                        "localname": "MEHERBASTI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214059/ws-services-calculation/Penalty.json b/data/as/30214059/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f62fe4cca5
--- /dev/null
+++ b/data/as/30214059/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214059",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214059/ws-services-calculation/WCBillingSlab.json b/data/as/30214059/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d602c8cc26
--- /dev/null
+++ b/data/as/30214059/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214059",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214062/BillingService/BusinessService.json b/data/as/30214062/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e8810ce347
--- /dev/null
+++ b/data/as/30214062/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214062",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214062/egov-location/boundary-data.json b/data/as/30214062/egov-location/boundary-data.json
new file mode 100644
index 0000000000..64563e2b49
--- /dev/null
+++ b/data/as/30214062/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214062",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUBIKHOLA MPWS",
+                "localname": "DHUBIKHOLA MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUBIKHOLA MPWS",
+                        "localname": "DHUBIKHOLA MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHUBIKHOLA MPWS",
+                "localname": "DHUBIKHOLA MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHUBIKHOLA MPWS",
+                        "localname": "DHUBIKHOLA MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214062/ws-services-calculation/Penalty.json b/data/as/30214062/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3a59e50459
--- /dev/null
+++ b/data/as/30214062/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214062",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214062/ws-services-calculation/WCBillingSlab.json b/data/as/30214062/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f586ccd162
--- /dev/null
+++ b/data/as/30214062/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214062",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214069/BillingService/BusinessService.json b/data/as/30214069/BillingService/BusinessService.json
new file mode 100644
index 0000000000..431edd2481
--- /dev/null
+++ b/data/as/30214069/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214069",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214069/egov-location/boundary-data.json b/data/as/30214069/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ff95ce3c29
--- /dev/null
+++ b/data/as/30214069/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214069",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPANJALI PWSS",
+                "localname": "DIPANJALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214069",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPANJALI PWSS",
+                        "localname": "DIPANJALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPANJALI PWSS",
+                "localname": "DIPANJALI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214069",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPANJALI PWSS",
+                        "localname": "DIPANJALI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214069/ws-services-calculation/Penalty.json b/data/as/30214069/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7077dd20e4
--- /dev/null
+++ b/data/as/30214069/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214069",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214069/ws-services-calculation/WCBillingSlab.json b/data/as/30214069/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fb2e127677
--- /dev/null
+++ b/data/as/30214069/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214069",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214095/BillingService/BusinessService.json b/data/as/30214095/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d34bd4607c
--- /dev/null
+++ b/data/as/30214095/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214095",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214095/egov-location/boundary-data.json b/data/as/30214095/egov-location/boundary-data.json
new file mode 100644
index 0000000000..96eb460c37
--- /dev/null
+++ b/data/as/30214095/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214095",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLONGBASTI DAFALA PWSS",
+                "localname": "DOLONGBASTI DAFALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214095",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLONGBASTI DAFALA PWSS",
+                        "localname": "DOLONGBASTI DAFALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLONGBASTI DAFALA PWSS",
+                "localname": "DOLONGBASTI DAFALA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214095",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLONGBASTI DAFALA PWSS",
+                        "localname": "DOLONGBASTI DAFALA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214095/ws-services-calculation/Penalty.json b/data/as/30214095/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bbc931f6a2
--- /dev/null
+++ b/data/as/30214095/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214095",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214095/ws-services-calculation/WCBillingSlab.json b/data/as/30214095/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..91fc0f6ea6
--- /dev/null
+++ b/data/as/30214095/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214095",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214145/BillingService/BusinessService.json b/data/as/30214145/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6cad8c9089
--- /dev/null
+++ b/data/as/30214145/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214145",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214145/egov-location/boundary-data.json b/data/as/30214145/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a33a464ba6
--- /dev/null
+++ b/data/as/30214145/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214145",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLONGBASTI FV PWSS",
+                "localname": "DOLONGBASTI FV PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214145",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLONGBASTI FV PWSS",
+                        "localname": "DOLONGBASTI FV PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOLONGBASTI FV PWSS",
+                "localname": "DOLONGBASTI FV PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214145",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOLONGBASTI FV PWSS",
+                        "localname": "DOLONGBASTI FV PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214145/ws-services-calculation/Penalty.json b/data/as/30214145/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..902422d7be
--- /dev/null
+++ b/data/as/30214145/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214145",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214145/ws-services-calculation/WCBillingSlab.json b/data/as/30214145/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..863689a097
--- /dev/null
+++ b/data/as/30214145/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214145",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214148/BillingService/BusinessService.json b/data/as/30214148/BillingService/BusinessService.json
new file mode 100644
index 0000000000..410e06473c
--- /dev/null
+++ b/data/as/30214148/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214148",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214148/egov-location/boundary-data.json b/data/as/30214148/egov-location/boundary-data.json
new file mode 100644
index 0000000000..44f8955d02
--- /dev/null
+++ b/data/as/30214148/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214148",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOPDOPI RANGPUR PWSS",
+                "localname": "DOPDOPI RANGPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOPDOPI RANGPUR PWSS",
+                        "localname": "DOPDOPI RANGPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOPDOPI RANGPUR PWSS",
+                "localname": "DOPDOPI RANGPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOPDOPI RANGPUR PWSS",
+                        "localname": "DOPDOPI RANGPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214148/ws-services-calculation/Penalty.json b/data/as/30214148/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c58d31db2e
--- /dev/null
+++ b/data/as/30214148/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214148",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214148/ws-services-calculation/WCBillingSlab.json b/data/as/30214148/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ad89401445
--- /dev/null
+++ b/data/as/30214148/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214148",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214152/BillingService/BusinessService.json b/data/as/30214152/BillingService/BusinessService.json
new file mode 100644
index 0000000000..abe54cc74e
--- /dev/null
+++ b/data/as/30214152/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214152",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214152/egov-location/boundary-data.json b/data/as/30214152/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca10774744
--- /dev/null
+++ b/data/as/30214152/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214152",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANESHPUR MPWS",
+                "localname": "GANESHPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214152",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANESHPUR MPWS",
+                        "localname": "GANESHPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANESHPUR MPWS",
+                "localname": "GANESHPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214152",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANESHPUR MPWS",
+                        "localname": "GANESHPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214152/ws-services-calculation/Penalty.json b/data/as/30214152/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..09942f132b
--- /dev/null
+++ b/data/as/30214152/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214152",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214152/ws-services-calculation/WCBillingSlab.json b/data/as/30214152/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1e6be5a62
--- /dev/null
+++ b/data/as/30214152/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214152",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214157/BillingService/BusinessService.json b/data/as/30214157/BillingService/BusinessService.json
new file mode 100644
index 0000000000..921263af75
--- /dev/null
+++ b/data/as/30214157/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214157",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214157/egov-location/boundary-data.json b/data/as/30214157/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2890fc5420
--- /dev/null
+++ b/data/as/30214157/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214157",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANESHPUR NO.4 MPWS",
+                "localname": "GANESHPUR NO.4 MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANESHPUR NO.4 MPWS",
+                        "localname": "GANESHPUR NO.4 MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GANESHPUR NO.4 MPWS",
+                "localname": "GANESHPUR NO.4 MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214157",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GANESHPUR NO.4 MPWS",
+                        "localname": "GANESHPUR NO.4 MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214157/ws-services-calculation/Penalty.json b/data/as/30214157/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..26d27fdd03
--- /dev/null
+++ b/data/as/30214157/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214157",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214157/ws-services-calculation/WCBillingSlab.json b/data/as/30214157/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..71c52dd623
--- /dev/null
+++ b/data/as/30214157/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214157",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214168/BillingService/BusinessService.json b/data/as/30214168/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a8b468a834
--- /dev/null
+++ b/data/as/30214168/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214168",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214168/egov-location/boundary-data.json b/data/as/30214168/egov-location/boundary-data.json
new file mode 100644
index 0000000000..62b3abbafc
--- /dev/null
+++ b/data/as/30214168/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214168",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAONJAN BIL PWSS",
+                "localname": "GAONJAN BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAONJAN BIL PWSS",
+                        "localname": "GAONJAN BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAONJAN BIL PWSS",
+                "localname": "GAONJAN BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214168",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAONJAN BIL PWSS",
+                        "localname": "GAONJAN BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214168/ws-services-calculation/Penalty.json b/data/as/30214168/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fc20d64713
--- /dev/null
+++ b/data/as/30214168/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214168",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214168/ws-services-calculation/WCBillingSlab.json b/data/as/30214168/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1e32f10cb
--- /dev/null
+++ b/data/as/30214168/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214168",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214174/BillingService/BusinessService.json b/data/as/30214174/BillingService/BusinessService.json
new file mode 100644
index 0000000000..18b1486da8
--- /dev/null
+++ b/data/as/30214174/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214174",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214174/egov-location/boundary-data.json b/data/as/30214174/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dd73c2d171
--- /dev/null
+++ b/data/as/30214174/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214174",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERJULI PWSS",
+                "localname": "GERJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214174",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERJULI PWSS",
+                        "localname": "GERJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GERJULI PWSS",
+                "localname": "GERJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214174",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GERJULI PWSS",
+                        "localname": "GERJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214174/ws-services-calculation/Penalty.json b/data/as/30214174/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0283acc511
--- /dev/null
+++ b/data/as/30214174/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214174",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214174/ws-services-calculation/WCBillingSlab.json b/data/as/30214174/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8fa79a7d5e
--- /dev/null
+++ b/data/as/30214174/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214174",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214298/BillingService/BusinessService.json b/data/as/30214298/BillingService/BusinessService.json
new file mode 100644
index 0000000000..90c8107e37
--- /dev/null
+++ b/data/as/30214298/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214298",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214298/egov-location/boundary-data.json b/data/as/30214298/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c511af7769
--- /dev/null
+++ b/data/as/30214298/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214298",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOURIPAM PWSS",
+                "localname": "GOURIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOURIPAM PWSS",
+                        "localname": "GOURIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOURIPAM PWSS",
+                "localname": "GOURIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214298",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOURIPAM PWSS",
+                        "localname": "GOURIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214298/ws-services-calculation/Penalty.json b/data/as/30214298/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..47c2c33891
--- /dev/null
+++ b/data/as/30214298/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214298",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214298/ws-services-calculation/WCBillingSlab.json b/data/as/30214298/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b803c5be8f
--- /dev/null
+++ b/data/as/30214298/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214298",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214330/BillingService/BusinessService.json b/data/as/30214330/BillingService/BusinessService.json
new file mode 100644
index 0000000000..09b2e013b8
--- /dev/null
+++ b/data/as/30214330/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214330",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214330/egov-location/boundary-data.json b/data/as/30214330/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3a33846521
--- /dev/null
+++ b/data/as/30214330/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214330",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOLAKAN PWSS",
+                "localname": "HOLAKAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOLAKAN PWSS",
+                        "localname": "HOLAKAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOLAKAN PWSS",
+                "localname": "HOLAKAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOLAKAN PWSS",
+                        "localname": "HOLAKAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214330/ws-services-calculation/Penalty.json b/data/as/30214330/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8f5823e287
--- /dev/null
+++ b/data/as/30214330/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214330",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214330/ws-services-calculation/WCBillingSlab.json b/data/as/30214330/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b29acd412f
--- /dev/null
+++ b/data/as/30214330/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214330",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214334/BillingService/BusinessService.json b/data/as/30214334/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa43178ca0
--- /dev/null
+++ b/data/as/30214334/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214334",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214334/egov-location/boundary-data.json b/data/as/30214334/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0e7eb2dfdd
--- /dev/null
+++ b/data/as/30214334/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214334",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANSIRI SONAPUR PWSS",
+                "localname": "MANSIRI SONAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANSIRI SONAPUR PWSS",
+                        "localname": "MANSIRI SONAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANSIRI SONAPUR PWSS",
+                "localname": "MANSIRI SONAPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214334",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANSIRI SONAPUR PWSS",
+                        "localname": "MANSIRI SONAPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214334/ws-services-calculation/Penalty.json b/data/as/30214334/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..af682c0721
--- /dev/null
+++ b/data/as/30214334/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214334",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214334/ws-services-calculation/WCBillingSlab.json b/data/as/30214334/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6ed681d1b0
--- /dev/null
+++ b/data/as/30214334/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214334",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214398/BillingService/BusinessService.json b/data/as/30214398/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bdc7f0a5a0
--- /dev/null
+++ b/data/as/30214398/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214398",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214398/egov-location/boundary-data.json b/data/as/30214398/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bc7b3705f3
--- /dev/null
+++ b/data/as/30214398/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214398",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHU BIL PWSS",
+                "localname": "KACHU BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214398",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHU BIL PWSS",
+                        "localname": "KACHU BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KACHU BIL PWSS",
+                "localname": "KACHU BIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214398",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KACHU BIL PWSS",
+                        "localname": "KACHU BIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214398/ws-services-calculation/Penalty.json b/data/as/30214398/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ea94f0556a
--- /dev/null
+++ b/data/as/30214398/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214398",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214398/ws-services-calculation/WCBillingSlab.json b/data/as/30214398/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..92c7b46a16
--- /dev/null
+++ b/data/as/30214398/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214398",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214413/BillingService/BusinessService.json b/data/as/30214413/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5e4ded84f8
--- /dev/null
+++ b/data/as/30214413/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214413",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214413/egov-location/boundary-data.json b/data/as/30214413/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e49f9f8ba6
--- /dev/null
+++ b/data/as/30214413/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214413",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAILAJULI PWSS",
+                "localname": "KAILAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAILAJULI PWSS",
+                        "localname": "KAILAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAILAJULI PWSS",
+                "localname": "KAILAJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214413",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAILAJULI PWSS",
+                        "localname": "KAILAJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214413/ws-services-calculation/Penalty.json b/data/as/30214413/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3fa16f5c20
--- /dev/null
+++ b/data/as/30214413/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214413",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214413/ws-services-calculation/WCBillingSlab.json b/data/as/30214413/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f68c25e076
--- /dev/null
+++ b/data/as/30214413/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214413",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214437/BillingService/BusinessService.json b/data/as/30214437/BillingService/BusinessService.json
new file mode 100644
index 0000000000..35bd1978dd
--- /dev/null
+++ b/data/as/30214437/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214437",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214437/egov-location/boundary-data.json b/data/as/30214437/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5c37f5e0fc
--- /dev/null
+++ b/data/as/30214437/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214437",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                "localname": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                        "localname": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                "localname": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                        "localname": "LINE NO. 8/16 GELAHATINGA TE MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214437/ws-services-calculation/Penalty.json b/data/as/30214437/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3333b1ba5b
--- /dev/null
+++ b/data/as/30214437/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214437",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214437/ws-services-calculation/WCBillingSlab.json b/data/as/30214437/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f9502ddf65
--- /dev/null
+++ b/data/as/30214437/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214437",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214444/BillingService/BusinessService.json b/data/as/30214444/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5ccc0ea10
--- /dev/null
+++ b/data/as/30214444/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214444",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214444/egov-location/boundary-data.json b/data/as/30214444/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b0086a0b3a
--- /dev/null
+++ b/data/as/30214444/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214444",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARAITAPU MPWS",
+                "localname": "KARAITAPU MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARAITAPU MPWS",
+                        "localname": "KARAITAPU MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARAITAPU MPWS",
+                "localname": "KARAITAPU MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214444",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARAITAPU MPWS",
+                        "localname": "KARAITAPU MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214444/ws-services-calculation/Penalty.json b/data/as/30214444/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..632c2c2a5f
--- /dev/null
+++ b/data/as/30214444/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214444",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214444/ws-services-calculation/WCBillingSlab.json b/data/as/30214444/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..107f7c8dc1
--- /dev/null
+++ b/data/as/30214444/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214444",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214454/BillingService/BusinessService.json b/data/as/30214454/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a33756fbf8
--- /dev/null
+++ b/data/as/30214454/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214454",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214454/egov-location/boundary-data.json b/data/as/30214454/egov-location/boundary-data.json
new file mode 100644
index 0000000000..47e3cc4dc3
--- /dev/null
+++ b/data/as/30214454/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214454",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHABARI MPWS",
+                "localname": "KATHABARI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHABARI MPWS",
+                        "localname": "KATHABARI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KATHABARI MPWS",
+                "localname": "KATHABARI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214454",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KATHABARI MPWS",
+                        "localname": "KATHABARI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214454/ws-services-calculation/Penalty.json b/data/as/30214454/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..948673edd3
--- /dev/null
+++ b/data/as/30214454/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214454",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214454/ws-services-calculation/WCBillingSlab.json b/data/as/30214454/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e692a0f975
--- /dev/null
+++ b/data/as/30214454/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214454",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214478/BillingService/BusinessService.json b/data/as/30214478/BillingService/BusinessService.json
new file mode 100644
index 0000000000..42700c6cde
--- /dev/null
+++ b/data/as/30214478/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214478",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214478/egov-location/boundary-data.json b/data/as/30214478/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1301a926a8
--- /dev/null
+++ b/data/as/30214478/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214478",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KERIMARI MPWS",
+                "localname": "KERIMARI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214478",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KERIMARI MPWS",
+                        "localname": "KERIMARI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KERIMARI MPWS",
+                "localname": "KERIMARI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214478",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KERIMARI MPWS",
+                        "localname": "KERIMARI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214478/ws-services-calculation/Penalty.json b/data/as/30214478/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e062dabb54
--- /dev/null
+++ b/data/as/30214478/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214478",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214478/ws-services-calculation/WCBillingSlab.json b/data/as/30214478/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3e7b6c4d1f
--- /dev/null
+++ b/data/as/30214478/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214478",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214502/BillingService/BusinessService.json b/data/as/30214502/BillingService/BusinessService.json
new file mode 100644
index 0000000000..56d03b26d8
--- /dev/null
+++ b/data/as/30214502/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214502",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214502/egov-location/boundary-data.json b/data/as/30214502/egov-location/boundary-data.json
new file mode 100644
index 0000000000..43ce19cd66
--- /dev/null
+++ b/data/as/30214502/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214502",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAL TAPU PWSS",
+                "localname": "LAL TAPU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAL TAPU PWSS",
+                        "localname": "LAL TAPU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAL TAPU PWSS",
+                "localname": "LAL TAPU PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214502",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAL TAPU PWSS",
+                        "localname": "LAL TAPU PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214502/ws-services-calculation/Penalty.json b/data/as/30214502/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a132594ad7
--- /dev/null
+++ b/data/as/30214502/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214502",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214502/ws-services-calculation/WCBillingSlab.json b/data/as/30214502/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3647e8da06
--- /dev/null
+++ b/data/as/30214502/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214502",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214524/BillingService/BusinessService.json b/data/as/30214524/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a799ae1df5
--- /dev/null
+++ b/data/as/30214524/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214524",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214524/egov-location/boundary-data.json b/data/as/30214524/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a0062a1743
--- /dev/null
+++ b/data/as/30214524/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214524",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAL BARAHI PWSS",
+                "localname": "LAL BARAHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAL BARAHI PWSS",
+                        "localname": "LAL BARAHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAL BARAHI PWSS",
+                "localname": "LAL BARAHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214524",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAL BARAHI PWSS",
+                        "localname": "LAL BARAHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214524/ws-services-calculation/Penalty.json b/data/as/30214524/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..efa8bc0b5e
--- /dev/null
+++ b/data/as/30214524/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214524",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214524/ws-services-calculation/WCBillingSlab.json b/data/as/30214524/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..59bb3cfcc6
--- /dev/null
+++ b/data/as/30214524/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214524",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214533/BillingService/BusinessService.json b/data/as/30214533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..61dad1e813
--- /dev/null
+++ b/data/as/30214533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214533/egov-location/boundary-data.json b/data/as/30214533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..199c2d94d6
--- /dev/null
+++ b/data/as/30214533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAL BARAHI NO.1 PWSS",
+                "localname": "LAL BARAHI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAL BARAHI NO.1 PWSS",
+                        "localname": "LAL BARAHI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAL BARAHI NO.1 PWSS",
+                "localname": "LAL BARAHI NO.1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAL BARAHI NO.1 PWSS",
+                        "localname": "LAL BARAHI NO.1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214533/ws-services-calculation/Penalty.json b/data/as/30214533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef1558c841
--- /dev/null
+++ b/data/as/30214533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214533/ws-services-calculation/WCBillingSlab.json b/data/as/30214533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..aa5dbb974b
--- /dev/null
+++ b/data/as/30214533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214551/BillingService/BusinessService.json b/data/as/30214551/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bebab4c6b4
--- /dev/null
+++ b/data/as/30214551/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214551",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214551/egov-location/boundary-data.json b/data/as/30214551/egov-location/boundary-data.json
new file mode 100644
index 0000000000..76b69e621a
--- /dev/null
+++ b/data/as/30214551/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214551",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SADAIBORA PART-1 PWSS",
+                "localname": "SADAIBORA PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214551",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SADAIBORA PART-1 PWSS",
+                        "localname": "SADAIBORA PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SADAIBORA PART-1 PWSS",
+                "localname": "SADAIBORA PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214551",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SADAIBORA PART-1 PWSS",
+                        "localname": "SADAIBORA PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214551/ws-services-calculation/Penalty.json b/data/as/30214551/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..00cd839085
--- /dev/null
+++ b/data/as/30214551/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214551",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214551/ws-services-calculation/WCBillingSlab.json b/data/as/30214551/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..78a4816ff6
--- /dev/null
+++ b/data/as/30214551/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214551",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214559/BillingService/BusinessService.json b/data/as/30214559/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6fe78f7321
--- /dev/null
+++ b/data/as/30214559/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214559",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214559/egov-location/boundary-data.json b/data/as/30214559/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6f53e4a786
--- /dev/null
+++ b/data/as/30214559/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214559",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAKHIPATHAR PWSS",
+                "localname": "LAKHIPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214559",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAKHIPATHAR PWSS",
+                        "localname": "LAKHIPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAKHIPATHAR PWSS",
+                "localname": "LAKHIPATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214559",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAKHIPATHAR PWSS",
+                        "localname": "LAKHIPATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214559/ws-services-calculation/Penalty.json b/data/as/30214559/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ad77e40cf4
--- /dev/null
+++ b/data/as/30214559/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214559",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214559/ws-services-calculation/WCBillingSlab.json b/data/as/30214559/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6a7fd652a
--- /dev/null
+++ b/data/as/30214559/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214559",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214579/BillingService/BusinessService.json b/data/as/30214579/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f23684553b
--- /dev/null
+++ b/data/as/30214579/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214579",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214579/egov-location/boundary-data.json b/data/as/30214579/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7aeaaff57b
--- /dev/null
+++ b/data/as/30214579/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214579",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAIGANGPARA PWSS",
+                "localname": "LAIGANGPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAIGANGPARA PWSS",
+                        "localname": "LAIGANGPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LAIGANGPARA PWSS",
+                "localname": "LAIGANGPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214579",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LAIGANGPARA PWSS",
+                        "localname": "LAIGANGPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214579/ws-services-calculation/Penalty.json b/data/as/30214579/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8f87be53e9
--- /dev/null
+++ b/data/as/30214579/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214579",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214579/ws-services-calculation/WCBillingSlab.json b/data/as/30214579/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15f7cd1080
--- /dev/null
+++ b/data/as/30214579/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214579",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214623/BillingService/BusinessService.json b/data/as/30214623/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4ac41671d3
--- /dev/null
+++ b/data/as/30214623/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214623",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214623/egov-location/boundary-data.json b/data/as/30214623/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3fa3d5e5bf
--- /dev/null
+++ b/data/as/30214623/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214623",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 BHOJMARI PART-2 PWSS",
+                "localname": "NO. 4 BHOJMARI PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214623",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 BHOJMARI PART-2 PWSS",
+                        "localname": "NO. 4 BHOJMARI PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 4 BHOJMARI PART-2 PWSS",
+                "localname": "NO. 4 BHOJMARI PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214623",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 4 BHOJMARI PART-2 PWSS",
+                        "localname": "NO. 4 BHOJMARI PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214623/ws-services-calculation/Penalty.json b/data/as/30214623/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe436ee7fc
--- /dev/null
+++ b/data/as/30214623/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214623",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214623/ws-services-calculation/WCBillingSlab.json b/data/as/30214623/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..198e09104b
--- /dev/null
+++ b/data/as/30214623/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214623",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214632/BillingService/BusinessService.json b/data/as/30214632/BillingService/BusinessService.json
new file mode 100644
index 0000000000..04f342cf8f
--- /dev/null
+++ b/data/as/30214632/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214632",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214632/egov-location/boundary-data.json b/data/as/30214632/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a51c6a3bd4
--- /dev/null
+++ b/data/as/30214632/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214632",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TAMANG GAON PWSS",
+                "localname": "TAMANG GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214632",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TAMANG GAON PWSS",
+                        "localname": "TAMANG GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TAMANG GAON PWSS",
+                "localname": "TAMANG GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214632",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TAMANG GAON PWSS",
+                        "localname": "TAMANG GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214632/ws-services-calculation/Penalty.json b/data/as/30214632/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bfe9032a1b
--- /dev/null
+++ b/data/as/30214632/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214632",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214632/ws-services-calculation/WCBillingSlab.json b/data/as/30214632/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a0e6e62b0c
--- /dev/null
+++ b/data/as/30214632/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214632",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214635/BillingService/BusinessService.json b/data/as/30214635/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c199e5b3f
--- /dev/null
+++ b/data/as/30214635/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214635",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214635/egov-location/boundary-data.json b/data/as/30214635/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca749d96cf
--- /dev/null
+++ b/data/as/30214635/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214635",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 BHOJMARI PART -1 PWSS",
+                "localname": "NO.4 BHOJMARI PART -1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 BHOJMARI PART -1 PWSS",
+                        "localname": "NO.4 BHOJMARI PART -1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.4 BHOJMARI PART -1 PWSS",
+                "localname": "NO.4 BHOJMARI PART -1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214635",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.4 BHOJMARI PART -1 PWSS",
+                        "localname": "NO.4 BHOJMARI PART -1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214635/ws-services-calculation/Penalty.json b/data/as/30214635/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..560f337164
--- /dev/null
+++ b/data/as/30214635/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214635",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214635/ws-services-calculation/WCBillingSlab.json b/data/as/30214635/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4c7a5c7d11
--- /dev/null
+++ b/data/as/30214635/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214635",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214651/BillingService/BusinessService.json b/data/as/30214651/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7bfb2529f5
--- /dev/null
+++ b/data/as/30214651/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214651",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214651/egov-location/boundary-data.json b/data/as/30214651/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a180109be6
--- /dev/null
+++ b/data/as/30214651/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214651",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTICHUK PWSS",
+                "localname": "SUTICHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTICHUK PWSS",
+                        "localname": "SUTICHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SUTICHUK PWSS",
+                "localname": "SUTICHUK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214651",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SUTICHUK PWSS",
+                        "localname": "SUTICHUK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214651/ws-services-calculation/Penalty.json b/data/as/30214651/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41fdd9f096
--- /dev/null
+++ b/data/as/30214651/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214651",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214651/ws-services-calculation/WCBillingSlab.json b/data/as/30214651/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15ea6001cb
--- /dev/null
+++ b/data/as/30214651/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214651",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214686/BillingService/BusinessService.json b/data/as/30214686/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fb123fc1f7
--- /dev/null
+++ b/data/as/30214686/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214686",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214686/egov-location/boundary-data.json b/data/as/30214686/egov-location/boundary-data.json
new file mode 100644
index 0000000000..36f2fccd94
--- /dev/null
+++ b/data/as/30214686/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214686",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 BALIJURI PART-1 PWSS",
+                "localname": "NO.3 BALIJURI PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 BALIJURI PART-1 PWSS",
+                        "localname": "NO.3 BALIJURI PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.3 BALIJURI PART-1 PWSS",
+                "localname": "NO.3 BALIJURI PART-1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214686",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.3 BALIJURI PART-1 PWSS",
+                        "localname": "NO.3 BALIJURI PART-1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214686/ws-services-calculation/Penalty.json b/data/as/30214686/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..de3499db7d
--- /dev/null
+++ b/data/as/30214686/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214686",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214686/ws-services-calculation/WCBillingSlab.json b/data/as/30214686/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d714c4f731
--- /dev/null
+++ b/data/as/30214686/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214686",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214704/BillingService/BusinessService.json b/data/as/30214704/BillingService/BusinessService.json
new file mode 100644
index 0000000000..322e10c015
--- /dev/null
+++ b/data/as/30214704/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214704",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214704/egov-location/boundary-data.json b/data/as/30214704/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fdd6ed6899
--- /dev/null
+++ b/data/as/30214704/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214704",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RATNAPUR MPWS",
+                "localname": "RATNAPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RATNAPUR MPWS",
+                        "localname": "RATNAPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RATNAPUR MPWS",
+                "localname": "RATNAPUR MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214704",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RATNAPUR MPWS",
+                        "localname": "RATNAPUR MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214704/ws-services-calculation/Penalty.json b/data/as/30214704/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a6af532b36
--- /dev/null
+++ b/data/as/30214704/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214704",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214704/ws-services-calculation/WCBillingSlab.json b/data/as/30214704/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8c90ce0608
--- /dev/null
+++ b/data/as/30214704/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214704",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214731/BillingService/BusinessService.json b/data/as/30214731/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7c0554e988
--- /dev/null
+++ b/data/as/30214731/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30214731",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214731/egov-location/boundary-data.json b/data/as/30214731/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ca2a7ae6c0
--- /dev/null
+++ b/data/as/30214731/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30214731",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHI MUSLIM PART-2 PWSS",
+                "localname": "GHAHI MUSLIM PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214731",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHI MUSLIM PART-2 PWSS",
+                        "localname": "GHAHI MUSLIM PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GHAHI MUSLIM PART-2 PWSS",
+                "localname": "GHAHI MUSLIM PART-2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30214731",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GHAHI MUSLIM PART-2 PWSS",
+                        "localname": "GHAHI MUSLIM PART-2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214731/ws-services-calculation/Penalty.json b/data/as/30214731/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b045c47ed2
--- /dev/null
+++ b/data/as/30214731/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30214731",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30214731/ws-services-calculation/WCBillingSlab.json b/data/as/30214731/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ed1c224d76
--- /dev/null
+++ b/data/as/30214731/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30214731",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215695/BillingService/BusinessService.json b/data/as/30215695/BillingService/BusinessService.json
new file mode 100644
index 0000000000..796d5c000c
--- /dev/null
+++ b/data/as/30215695/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30215695",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215695/egov-location/boundary-data.json b/data/as/30215695/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9e7f0de30e
--- /dev/null
+++ b/data/as/30215695/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30215695",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAMBARI PWSS (NEW)",
+                "localname": "JAMBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30215695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAMBARI PWSS (NEW)",
+                        "localname": "JAMBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAMBARI PWSS (NEW)",
+                "localname": "JAMBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30215695",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAMBARI PWSS (NEW)",
+                        "localname": "JAMBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215695/ws-services-calculation/Penalty.json b/data/as/30215695/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..861300968d
--- /dev/null
+++ b/data/as/30215695/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30215695",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215695/ws-services-calculation/WCBillingSlab.json b/data/as/30215695/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0bf346bf74
--- /dev/null
+++ b/data/as/30215695/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30215695",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215708/BillingService/BusinessService.json b/data/as/30215708/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d9b384784
--- /dev/null
+++ b/data/as/30215708/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30215708",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215708/egov-location/boundary-data.json b/data/as/30215708/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dbdebdbab3
--- /dev/null
+++ b/data/as/30215708/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30215708",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYBHUM DESIPARA PWSS (NEW)",
+                "localname": "JOYBHUM DESIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30215708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYBHUM DESIPARA PWSS (NEW)",
+                        "localname": "JOYBHUM DESIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOYBHUM DESIPARA PWSS (NEW)",
+                "localname": "JOYBHUM DESIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30215708",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOYBHUM DESIPARA PWSS (NEW)",
+                        "localname": "JOYBHUM DESIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215708/ws-services-calculation/Penalty.json b/data/as/30215708/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd96aa9111
--- /dev/null
+++ b/data/as/30215708/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30215708",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30215708/ws-services-calculation/WCBillingSlab.json b/data/as/30215708/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9826d5874b
--- /dev/null
+++ b/data/as/30215708/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30215708",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216018/BillingService/BusinessService.json b/data/as/30216018/BillingService/BusinessService.json
new file mode 100644
index 0000000000..640596e963
--- /dev/null
+++ b/data/as/30216018/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216018",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216018/egov-location/boundary-data.json b/data/as/30216018/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b12705cd63
--- /dev/null
+++ b/data/as/30216018/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216018",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB DHUMBANDHA PWSS (NEW)",
+                "localname": "PUB DHUMBANDHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216018",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB DHUMBANDHA PWSS (NEW)",
+                        "localname": "PUB DHUMBANDHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB DHUMBANDHA PWSS (NEW)",
+                "localname": "PUB DHUMBANDHA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216018",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB DHUMBANDHA PWSS (NEW)",
+                        "localname": "PUB DHUMBANDHA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216018/ws-services-calculation/Penalty.json b/data/as/30216018/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a58dbeea91
--- /dev/null
+++ b/data/as/30216018/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216018",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216018/ws-services-calculation/WCBillingSlab.json b/data/as/30216018/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6fcf96e17f
--- /dev/null
+++ b/data/as/30216018/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216018",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216021/BillingService/BusinessService.json b/data/as/30216021/BillingService/BusinessService.json
new file mode 100644
index 0000000000..345ea228ed
--- /dev/null
+++ b/data/as/30216021/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216021",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216021/egov-location/boundary-data.json b/data/as/30216021/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c95e36e641
--- /dev/null
+++ b/data/as/30216021/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216021",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                "localname": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216021",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                        "localname": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                "localname": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216021",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                        "localname": "THEKASHU PT-I NO.5 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216021/ws-services-calculation/Penalty.json b/data/as/30216021/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1277b2dd1f
--- /dev/null
+++ b/data/as/30216021/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216021",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216021/ws-services-calculation/WCBillingSlab.json b/data/as/30216021/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ebe24d1f7b
--- /dev/null
+++ b/data/as/30216021/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216021",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216024/BillingService/BusinessService.json b/data/as/30216024/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1d516f4752
--- /dev/null
+++ b/data/as/30216024/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216024",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216024/egov-location/boundary-data.json b/data/as/30216024/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0b41548b7c
--- /dev/null
+++ b/data/as/30216024/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216024",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                "localname": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216024",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                        "localname": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                "localname": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216024",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                        "localname": "BAGUAN PT-III NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216024/ws-services-calculation/Penalty.json b/data/as/30216024/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a33a2d553e
--- /dev/null
+++ b/data/as/30216024/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216024",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216024/ws-services-calculation/WCBillingSlab.json b/data/as/30216024/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1b093c008
--- /dev/null
+++ b/data/as/30216024/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216024",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216027/BillingService/BusinessService.json b/data/as/30216027/BillingService/BusinessService.json
new file mode 100644
index 0000000000..44b7872ebd
--- /dev/null
+++ b/data/as/30216027/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216027",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216027/egov-location/boundary-data.json b/data/as/30216027/egov-location/boundary-data.json
new file mode 100644
index 0000000000..492f850ec7
--- /dev/null
+++ b/data/as/30216027/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216027",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOMNAPARA PWSS (NEW)",
+                "localname": "DOMNAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOMNAPARA PWSS (NEW)",
+                        "localname": "DOMNAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOMNAPARA PWSS (NEW)",
+                "localname": "DOMNAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216027",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOMNAPARA PWSS (NEW)",
+                        "localname": "DOMNAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216027/ws-services-calculation/Penalty.json b/data/as/30216027/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ab5f665850
--- /dev/null
+++ b/data/as/30216027/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216027",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216027/ws-services-calculation/WCBillingSlab.json b/data/as/30216027/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..beb1ef3707
--- /dev/null
+++ b/data/as/30216027/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216027",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216030/BillingService/BusinessService.json b/data/as/30216030/BillingService/BusinessService.json
new file mode 100644
index 0000000000..72af7d048d
--- /dev/null
+++ b/data/as/30216030/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216030",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216030/egov-location/boundary-data.json b/data/as/30216030/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ed1e251e99
--- /dev/null
+++ b/data/as/30216030/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216030",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                "localname": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                        "localname": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                "localname": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216030",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                        "localname": "JALDHAPARA BADIARPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216030/ws-services-calculation/Penalty.json b/data/as/30216030/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..76ba8d1bae
--- /dev/null
+++ b/data/as/30216030/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216030",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216030/ws-services-calculation/WCBillingSlab.json b/data/as/30216030/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d36ec0fcc
--- /dev/null
+++ b/data/as/30216030/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216030",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216039/BillingService/BusinessService.json b/data/as/30216039/BillingService/BusinessService.json
new file mode 100644
index 0000000000..715f9ecfb9
--- /dev/null
+++ b/data/as/30216039/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216039",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216039/egov-location/boundary-data.json b/data/as/30216039/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6e05699583
--- /dev/null
+++ b/data/as/30216039/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216039",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALBARI PWSS (NEW)",
+                "localname": "NALBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216039",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALBARI PWSS (NEW)",
+                        "localname": "NALBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NALBARI PWSS (NEW)",
+                "localname": "NALBARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216039",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NALBARI PWSS (NEW)",
+                        "localname": "NALBARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216039/ws-services-calculation/Penalty.json b/data/as/30216039/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b8e01372a7
--- /dev/null
+++ b/data/as/30216039/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216039",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216039/ws-services-calculation/WCBillingSlab.json b/data/as/30216039/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1164bfa818
--- /dev/null
+++ b/data/as/30216039/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216039",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216045/BillingService/BusinessService.json b/data/as/30216045/BillingService/BusinessService.json
new file mode 100644
index 0000000000..65f7d68ccf
--- /dev/null
+++ b/data/as/30216045/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216045",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216045/egov-location/boundary-data.json b/data/as/30216045/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f1a70edb2f
--- /dev/null
+++ b/data/as/30216045/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216045",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRAMARI RIVER BLOCK (NEW)",
+                "localname": "SINGRAMARI RIVER BLOCK (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216045",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRAMARI RIVER BLOCK (NEW)",
+                        "localname": "SINGRAMARI RIVER BLOCK (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRAMARI RIVER BLOCK (NEW)",
+                "localname": "SINGRAMARI RIVER BLOCK (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216045",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRAMARI RIVER BLOCK (NEW)",
+                        "localname": "SINGRAMARI RIVER BLOCK (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216045/ws-services-calculation/Penalty.json b/data/as/30216045/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..05393f8d1a
--- /dev/null
+++ b/data/as/30216045/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216045",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216045/ws-services-calculation/WCBillingSlab.json b/data/as/30216045/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..702c7b3e71
--- /dev/null
+++ b/data/as/30216045/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216045",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216049/BillingService/BusinessService.json b/data/as/30216049/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b0d7e54556
--- /dev/null
+++ b/data/as/30216049/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216049",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216049/egov-location/boundary-data.json b/data/as/30216049/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3d801c9101
--- /dev/null
+++ b/data/as/30216049/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216049",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAPARA PWSS (NEW)",
+                "localname": "HIRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216049",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAPARA PWSS (NEW)",
+                        "localname": "HIRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HIRAPARA PWSS (NEW)",
+                "localname": "HIRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216049",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HIRAPARA PWSS (NEW)",
+                        "localname": "HIRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216049/ws-services-calculation/Penalty.json b/data/as/30216049/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8097118375
--- /dev/null
+++ b/data/as/30216049/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216049",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216049/ws-services-calculation/WCBillingSlab.json b/data/as/30216049/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cbab1c7641
--- /dev/null
+++ b/data/as/30216049/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216049",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216051/BillingService/BusinessService.json b/data/as/30216051/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a12e692b20
--- /dev/null
+++ b/data/as/30216051/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216051",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216051/egov-location/boundary-data.json b/data/as/30216051/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7be0f2830d
--- /dev/null
+++ b/data/as/30216051/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216051",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAJIPUTA PWSS (NEW)",
+                "localname": "KAJIPUTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216051",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAJIPUTA PWSS (NEW)",
+                        "localname": "KAJIPUTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAJIPUTA PWSS (NEW)",
+                "localname": "KAJIPUTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216051",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAJIPUTA PWSS (NEW)",
+                        "localname": "KAJIPUTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216051/ws-services-calculation/Penalty.json b/data/as/30216051/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3b0be2f074
--- /dev/null
+++ b/data/as/30216051/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216051",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216051/ws-services-calculation/WCBillingSlab.json b/data/as/30216051/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4cc996a740
--- /dev/null
+++ b/data/as/30216051/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216051",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216053/BillingService/BusinessService.json b/data/as/30216053/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3f290f81c
--- /dev/null
+++ b/data/as/30216053/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216053",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216053/egov-location/boundary-data.json b/data/as/30216053/egov-location/boundary-data.json
new file mode 100644
index 0000000000..20d2421f75
--- /dev/null
+++ b/data/as/30216053/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216053",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA PWSS (KRISHNAI) NEW",
+                "localname": "TILAPARA PWSS (KRISHNAI) NEW",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA PWSS (KRISHNAI) NEW",
+                        "localname": "TILAPARA PWSS (KRISHNAI) NEW",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA PWSS (KRISHNAI) NEW",
+                "localname": "TILAPARA PWSS (KRISHNAI) NEW",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216053",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA PWSS (KRISHNAI) NEW",
+                        "localname": "TILAPARA PWSS (KRISHNAI) NEW",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216053/ws-services-calculation/Penalty.json b/data/as/30216053/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c7a025642b
--- /dev/null
+++ b/data/as/30216053/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216053",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216053/ws-services-calculation/WCBillingSlab.json b/data/as/30216053/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..41d91a4686
--- /dev/null
+++ b/data/as/30216053/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216053",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216054/BillingService/BusinessService.json b/data/as/30216054/BillingService/BusinessService.json
new file mode 100644
index 0000000000..569885ae7f
--- /dev/null
+++ b/data/as/30216054/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216054",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216054/egov-location/boundary-data.json b/data/as/30216054/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74f5674f5a
--- /dev/null
+++ b/data/as/30216054/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216054",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA PT-IV PWSS (NEW)",
+                "localname": "KARIPARA PT-IV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216054",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA PT-IV PWSS (NEW)",
+                        "localname": "KARIPARA PT-IV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARIPARA PT-IV PWSS (NEW)",
+                "localname": "KARIPARA PT-IV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216054",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARIPARA PT-IV PWSS (NEW)",
+                        "localname": "KARIPARA PT-IV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216054/ws-services-calculation/Penalty.json b/data/as/30216054/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9ae259b6e0
--- /dev/null
+++ b/data/as/30216054/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216054",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216054/ws-services-calculation/WCBillingSlab.json b/data/as/30216054/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bb1081ee0f
--- /dev/null
+++ b/data/as/30216054/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216054",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216055/BillingService/BusinessService.json b/data/as/30216055/BillingService/BusinessService.json
new file mode 100644
index 0000000000..63cc373561
--- /dev/null
+++ b/data/as/30216055/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216055",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216055/egov-location/boundary-data.json b/data/as/30216055/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5003805dac
--- /dev/null
+++ b/data/as/30216055/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216055",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                "localname": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                        "localname": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                "localname": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216055",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                        "localname": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216055/ws-services-calculation/Penalty.json b/data/as/30216055/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1289176715
--- /dev/null
+++ b/data/as/30216055/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216055",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216055/ws-services-calculation/WCBillingSlab.json b/data/as/30216055/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c19f89306c
--- /dev/null
+++ b/data/as/30216055/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216055",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216056/BillingService/BusinessService.json b/data/as/30216056/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b6ce66891
--- /dev/null
+++ b/data/as/30216056/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216056",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216056/egov-location/boundary-data.json b/data/as/30216056/egov-location/boundary-data.json
new file mode 100644
index 0000000000..86a6a6c466
--- /dev/null
+++ b/data/as/30216056/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216056",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAHARA PART PWSS (NEW)",
+                "localname": "SONAHARA PART PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216056",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAHARA PART PWSS (NEW)",
+                        "localname": "SONAHARA PART PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SONAHARA PART PWSS (NEW)",
+                "localname": "SONAHARA PART PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216056",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SONAHARA PART PWSS (NEW)",
+                        "localname": "SONAHARA PART PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216056/ws-services-calculation/Penalty.json b/data/as/30216056/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bf61464931
--- /dev/null
+++ b/data/as/30216056/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216056",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216056/ws-services-calculation/WCBillingSlab.json b/data/as/30216056/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7aad2e1ac2
--- /dev/null
+++ b/data/as/30216056/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216056",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216057/BillingService/BusinessService.json b/data/as/30216057/BillingService/BusinessService.json
new file mode 100644
index 0000000000..49403a9568
--- /dev/null
+++ b/data/as/30216057/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216057",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216057/egov-location/boundary-data.json b/data/as/30216057/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ced53504a
--- /dev/null
+++ b/data/as/30216057/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216057",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                "localname": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                        "localname": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                "localname": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216057",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                        "localname": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216057/ws-services-calculation/Penalty.json b/data/as/30216057/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..99b41fee66
--- /dev/null
+++ b/data/as/30216057/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216057",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216057/ws-services-calculation/WCBillingSlab.json b/data/as/30216057/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6ea6c8c4a3
--- /dev/null
+++ b/data/as/30216057/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216057",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216058/BillingService/BusinessService.json b/data/as/30216058/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2d516e7bb2
--- /dev/null
+++ b/data/as/30216058/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216058",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216058/egov-location/boundary-data.json b/data/as/30216058/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b672ec69a
--- /dev/null
+++ b/data/as/30216058/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216058",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                "localname": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216058",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                        "localname": "DAMRA PATPARA NO.5 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216058/ws-services-calculation/Penalty.json b/data/as/30216058/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c21c31027e
--- /dev/null
+++ b/data/as/30216058/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216058",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216058/ws-services-calculation/WCBillingSlab.json b/data/as/30216058/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd3c713c0e
--- /dev/null
+++ b/data/as/30216058/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216058",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216059/BillingService/BusinessService.json b/data/as/30216059/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a58824b3dc
--- /dev/null
+++ b/data/as/30216059/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216059",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216059/egov-location/boundary-data.json b/data/as/30216059/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c2511de2ca
--- /dev/null
+++ b/data/as/30216059/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216059",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIMNA RAJAPARA PWSS (NEW)",
+                "localname": "NIMNA RAJAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIMNA RAJAPARA PWSS (NEW)",
+                        "localname": "NIMNA RAJAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIMNA RAJAPARA PWSS (NEW)",
+                "localname": "NIMNA RAJAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216059",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIMNA RAJAPARA PWSS (NEW)",
+                        "localname": "NIMNA RAJAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216059/ws-services-calculation/Penalty.json b/data/as/30216059/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2deb4d2eb3
--- /dev/null
+++ b/data/as/30216059/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216059",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216059/ws-services-calculation/WCBillingSlab.json b/data/as/30216059/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2233ae078d
--- /dev/null
+++ b/data/as/30216059/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216059",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216061/BillingService/BusinessService.json b/data/as/30216061/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ef4e548ab9
--- /dev/null
+++ b/data/as/30216061/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216061",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216061/egov-location/boundary-data.json b/data/as/30216061/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f4f7576f3
--- /dev/null
+++ b/data/as/30216061/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216061",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                "localname": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216061",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                        "localname": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                "localname": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216061",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                        "localname": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216061/ws-services-calculation/Penalty.json b/data/as/30216061/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..93629d3f56
--- /dev/null
+++ b/data/as/30216061/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216061",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216061/ws-services-calculation/WCBillingSlab.json b/data/as/30216061/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15cbd8d504
--- /dev/null
+++ b/data/as/30216061/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216061",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216062/BillingService/BusinessService.json b/data/as/30216062/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a61cc8e70c
--- /dev/null
+++ b/data/as/30216062/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216062",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216062/egov-location/boundary-data.json b/data/as/30216062/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0d5cec1aab
--- /dev/null
+++ b/data/as/30216062/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216062",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALAPARA PWSS (NEW)",
+                "localname": "BALAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALAPARA PWSS (NEW)",
+                        "localname": "BALAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALAPARA PWSS (NEW)",
+                "localname": "BALAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216062",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALAPARA PWSS (NEW)",
+                        "localname": "BALAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216062/ws-services-calculation/Penalty.json b/data/as/30216062/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c27ae46bf3
--- /dev/null
+++ b/data/as/30216062/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216062",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216062/ws-services-calculation/WCBillingSlab.json b/data/as/30216062/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..af83297e97
--- /dev/null
+++ b/data/as/30216062/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216062",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216214/BillingService/BusinessService.json b/data/as/30216214/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4d9cfdf79b
--- /dev/null
+++ b/data/as/30216214/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216214",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216214/egov-location/boundary-data.json b/data/as/30216214/egov-location/boundary-data.json
new file mode 100644
index 0000000000..241e4088eb
--- /dev/null
+++ b/data/as/30216214/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216214",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                "localname": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216214",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                        "localname": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                "localname": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216214",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                        "localname": "MANGALBARIA BAZAAR MULTI VILLAGE PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216214/ws-services-calculation/Penalty.json b/data/as/30216214/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc3f834c18
--- /dev/null
+++ b/data/as/30216214/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216214",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216214/ws-services-calculation/WCBillingSlab.json b/data/as/30216214/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e9c5a6e9fa
--- /dev/null
+++ b/data/as/30216214/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216214",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216258/BillingService/BusinessService.json b/data/as/30216258/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4f963ddfe3
--- /dev/null
+++ b/data/as/30216258/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216258",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216258/egov-location/boundary-data.json b/data/as/30216258/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c896547226
--- /dev/null
+++ b/data/as/30216258/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216258",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABHETI PART 3 PWSS",
+                "localname": "ADABHETI PART 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216258",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABHETI PART 3 PWSS",
+                        "localname": "ADABHETI PART 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABHETI PART 3 PWSS",
+                "localname": "ADABHETI PART 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216258",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABHETI PART 3 PWSS",
+                        "localname": "ADABHETI PART 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216258/ws-services-calculation/Penalty.json b/data/as/30216258/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9fd80d3117
--- /dev/null
+++ b/data/as/30216258/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216258",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216258/ws-services-calculation/WCBillingSlab.json b/data/as/30216258/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..473d37e867
--- /dev/null
+++ b/data/as/30216258/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216258",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216269/BillingService/BusinessService.json b/data/as/30216269/BillingService/BusinessService.json
new file mode 100644
index 0000000000..44ce707ca2
--- /dev/null
+++ b/data/as/30216269/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216269",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216269/egov-location/boundary-data.json b/data/as/30216269/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52c5cc645f
--- /dev/null
+++ b/data/as/30216269/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216269",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABHETI PART 2 PWSS",
+                "localname": "ADABHETI PART 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216269",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABHETI PART 2 PWSS",
+                        "localname": "ADABHETI PART 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABHETI PART 2 PWSS",
+                "localname": "ADABHETI PART 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216269",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABHETI PART 2 PWSS",
+                        "localname": "ADABHETI PART 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216269/ws-services-calculation/Penalty.json b/data/as/30216269/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f670f33130
--- /dev/null
+++ b/data/as/30216269/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216269",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216269/ws-services-calculation/WCBillingSlab.json b/data/as/30216269/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bddb4aa4c7
--- /dev/null
+++ b/data/as/30216269/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216269",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216295/BillingService/BusinessService.json b/data/as/30216295/BillingService/BusinessService.json
new file mode 100644
index 0000000000..da660ee00d
--- /dev/null
+++ b/data/as/30216295/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216295",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216295/egov-location/boundary-data.json b/data/as/30216295/egov-location/boundary-data.json
new file mode 100644
index 0000000000..575dd33f3a
--- /dev/null
+++ b/data/as/30216295/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216295",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KERANIPAM PWSS",
+                "localname": "KERANIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KERANIPAM PWSS",
+                        "localname": "KERANIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KERANIPAM PWSS",
+                "localname": "KERANIPAM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216295",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KERANIPAM PWSS",
+                        "localname": "KERANIPAM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216295/ws-services-calculation/Penalty.json b/data/as/30216295/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3635640a9
--- /dev/null
+++ b/data/as/30216295/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216295",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216295/ws-services-calculation/WCBillingSlab.json b/data/as/30216295/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a8f8d29d75
--- /dev/null
+++ b/data/as/30216295/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216295",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216302/BillingService/BusinessService.json b/data/as/30216302/BillingService/BusinessService.json
new file mode 100644
index 0000000000..25868a54e1
--- /dev/null
+++ b/data/as/30216302/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216302",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216302/egov-location/boundary-data.json b/data/as/30216302/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a7ed339523
--- /dev/null
+++ b/data/as/30216302/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216302",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                "localname": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                        "localname": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                "localname": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216302",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                        "localname": "BORIGAON SIVA MANDIR BORIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216302/ws-services-calculation/Penalty.json b/data/as/30216302/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..119702f325
--- /dev/null
+++ b/data/as/30216302/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216302",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216302/ws-services-calculation/WCBillingSlab.json b/data/as/30216302/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..419d71d2b1
--- /dev/null
+++ b/data/as/30216302/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216302",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216319/BillingService/BusinessService.json b/data/as/30216319/BillingService/BusinessService.json
new file mode 100644
index 0000000000..92b2fb2129
--- /dev/null
+++ b/data/as/30216319/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216319",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216319/egov-location/boundary-data.json b/data/as/30216319/egov-location/boundary-data.json
new file mode 100644
index 0000000000..488dc905ad
--- /dev/null
+++ b/data/as/30216319/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216319",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MISSION CHARIALI MPWS",
+                "localname": "MISSION CHARIALI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216319",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MISSION CHARIALI MPWS",
+                        "localname": "MISSION CHARIALI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MISSION CHARIALI MPWS",
+                "localname": "MISSION CHARIALI MPWS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216319",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MISSION CHARIALI MPWS",
+                        "localname": "MISSION CHARIALI MPWS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216319/ws-services-calculation/Penalty.json b/data/as/30216319/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6276373745
--- /dev/null
+++ b/data/as/30216319/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216319",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216319/ws-services-calculation/WCBillingSlab.json b/data/as/30216319/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c1e6fb7fa2
--- /dev/null
+++ b/data/as/30216319/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216319",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216336/BillingService/BusinessService.json b/data/as/30216336/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f4ec6e0971
--- /dev/null
+++ b/data/as/30216336/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216336",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216336/egov-location/boundary-data.json b/data/as/30216336/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d36a853c9b
--- /dev/null
+++ b/data/as/30216336/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216336",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI KHERGOLA PWSS",
+                "localname": "MORISUTI KHERGOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216336",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI KHERGOLA PWSS",
+                        "localname": "MORISUTI KHERGOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MORISUTI KHERGOLA PWSS",
+                "localname": "MORISUTI KHERGOLA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216336",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MORISUTI KHERGOLA PWSS",
+                        "localname": "MORISUTI KHERGOLA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216336/ws-services-calculation/Penalty.json b/data/as/30216336/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ca0df808cb
--- /dev/null
+++ b/data/as/30216336/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216336",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216336/ws-services-calculation/WCBillingSlab.json b/data/as/30216336/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7464bfd1d7
--- /dev/null
+++ b/data/as/30216336/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216336",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216372/BillingService/BusinessService.json b/data/as/30216372/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6c072a633a
--- /dev/null
+++ b/data/as/30216372/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216372",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216372/egov-location/boundary-data.json b/data/as/30216372/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6d80f9848a
--- /dev/null
+++ b/data/as/30216372/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216372",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW CHENGELIMARA RF PWSS",
+                "localname": "NEW CHENGELIMARA RF PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216372",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW CHENGELIMARA RF PWSS",
+                        "localname": "NEW CHENGELIMARA RF PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW CHENGELIMARA RF PWSS",
+                "localname": "NEW CHENGELIMARA RF PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216372",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW CHENGELIMARA RF PWSS",
+                        "localname": "NEW CHENGELIMARA RF PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216372/ws-services-calculation/Penalty.json b/data/as/30216372/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c60a9e30b2
--- /dev/null
+++ b/data/as/30216372/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216372",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216372/ws-services-calculation/WCBillingSlab.json b/data/as/30216372/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7d1904e82c
--- /dev/null
+++ b/data/as/30216372/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216372",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216378/BillingService/BusinessService.json b/data/as/30216378/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d856647134
--- /dev/null
+++ b/data/as/30216378/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216378",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216378/egov-location/boundary-data.json b/data/as/30216378/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba6b2050df
--- /dev/null
+++ b/data/as/30216378/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216378",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW TUPIA PWSS",
+                "localname": "NEW TUPIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216378",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW TUPIA PWSS",
+                        "localname": "NEW TUPIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NEW TUPIA PWSS",
+                "localname": "NEW TUPIA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216378",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NEW TUPIA PWSS",
+                        "localname": "NEW TUPIA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216378/ws-services-calculation/Penalty.json b/data/as/30216378/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..72d7bddfd2
--- /dev/null
+++ b/data/as/30216378/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216378",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216378/ws-services-calculation/WCBillingSlab.json b/data/as/30216378/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..13c860e8d1
--- /dev/null
+++ b/data/as/30216378/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216378",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216401/BillingService/BusinessService.json b/data/as/30216401/BillingService/BusinessService.json
new file mode 100644
index 0000000000..234324a857
--- /dev/null
+++ b/data/as/30216401/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216401",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216401/egov-location/boundary-data.json b/data/as/30216401/egov-location/boundary-data.json
new file mode 100644
index 0000000000..079ae76f36
--- /dev/null
+++ b/data/as/30216401/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216401",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                "localname": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                        "localname": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                "localname": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216401",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                        "localname": "NO. 2 MIRI PATHAR (RAJGARH) PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216401/ws-services-calculation/Penalty.json b/data/as/30216401/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f66305112f
--- /dev/null
+++ b/data/as/30216401/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216401",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216401/ws-services-calculation/WCBillingSlab.json b/data/as/30216401/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9a2ce51cd2
--- /dev/null
+++ b/data/as/30216401/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216401",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216427/BillingService/BusinessService.json b/data/as/30216427/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a23d5005bd
--- /dev/null
+++ b/data/as/30216427/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216427",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216427/egov-location/boundary-data.json b/data/as/30216427/egov-location/boundary-data.json
new file mode 100644
index 0000000000..03e3895183
--- /dev/null
+++ b/data/as/30216427/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216427",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM BOGIBIL PWSS",
+                "localname": "PACHIM BOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM BOGIBIL PWSS",
+                        "localname": "PACHIM BOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM BOGIBIL PWSS",
+                "localname": "PACHIM BOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216427",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM BOGIBIL PWSS",
+                        "localname": "PACHIM BOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216427/ws-services-calculation/Penalty.json b/data/as/30216427/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d24df1ced
--- /dev/null
+++ b/data/as/30216427/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216427",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216427/ws-services-calculation/WCBillingSlab.json b/data/as/30216427/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ded0a2c10
--- /dev/null
+++ b/data/as/30216427/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216427",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216449/BillingService/BusinessService.json b/data/as/30216449/BillingService/BusinessService.json
new file mode 100644
index 0000000000..803d8329e6
--- /dev/null
+++ b/data/as/30216449/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216449",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216449/egov-location/boundary-data.json b/data/as/30216449/egov-location/boundary-data.json
new file mode 100644
index 0000000000..02e9979e0c
--- /dev/null
+++ b/data/as/30216449/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216449",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM TOWBHANGA PWSS",
+                "localname": "PACHIM TOWBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216449",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM TOWBHANGA PWSS",
+                        "localname": "PACHIM TOWBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PACHIM TOWBHANGA PWSS",
+                "localname": "PACHIM TOWBHANGA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216449",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PACHIM TOWBHANGA PWSS",
+                        "localname": "PACHIM TOWBHANGA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216449/ws-services-calculation/Penalty.json b/data/as/30216449/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..3fece993ff
--- /dev/null
+++ b/data/as/30216449/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216449",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216449/ws-services-calculation/WCBillingSlab.json b/data/as/30216449/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f0b295e24
--- /dev/null
+++ b/data/as/30216449/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216449",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216472/BillingService/BusinessService.json b/data/as/30216472/BillingService/BusinessService.json
new file mode 100644
index 0000000000..89dc2af433
--- /dev/null
+++ b/data/as/30216472/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216472",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216472/egov-location/boundary-data.json b/data/as/30216472/egov-location/boundary-data.json
new file mode 100644
index 0000000000..99a933f4cb
--- /dev/null
+++ b/data/as/30216472/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216472",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PADUMANI PWSS",
+                "localname": "PADUMANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PADUMANI PWSS",
+                        "localname": "PADUMANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PADUMANI PWSS",
+                "localname": "PADUMANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216472",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PADUMANI PWSS",
+                        "localname": "PADUMANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216472/ws-services-calculation/Penalty.json b/data/as/30216472/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dc73843a04
--- /dev/null
+++ b/data/as/30216472/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216472",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216472/ws-services-calculation/WCBillingSlab.json b/data/as/30216472/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b6a3bc80d1
--- /dev/null
+++ b/data/as/30216472/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216472",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216505/BillingService/BusinessService.json b/data/as/30216505/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a61d338973
--- /dev/null
+++ b/data/as/30216505/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216505",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216505/egov-location/boundary-data.json b/data/as/30216505/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5711a2a5bd
--- /dev/null
+++ b/data/as/30216505/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216505",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUHOLA GAON PWSS",
+                "localname": "OUHOLA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216505",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUHOLA GAON PWSS",
+                        "localname": "OUHOLA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "OUHOLA GAON PWSS",
+                "localname": "OUHOLA GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216505",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "OUHOLA GAON PWSS",
+                        "localname": "OUHOLA GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216505/ws-services-calculation/Penalty.json b/data/as/30216505/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..21eb86f560
--- /dev/null
+++ b/data/as/30216505/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216505",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216505/ws-services-calculation/WCBillingSlab.json b/data/as/30216505/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..412c62427d
--- /dev/null
+++ b/data/as/30216505/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216505",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216577/BillingService/BusinessService.json b/data/as/30216577/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7e87d132ea
--- /dev/null
+++ b/data/as/30216577/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216577",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216577/egov-location/boundary-data.json b/data/as/30216577/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e108151fa
--- /dev/null
+++ b/data/as/30216577/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216577",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB BOGIBIL PWSS",
+                "localname": "PUB BOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB BOGIBIL PWSS",
+                        "localname": "PUB BOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB BOGIBIL PWSS",
+                "localname": "PUB BOGIBIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB BOGIBIL PWSS",
+                        "localname": "PUB BOGIBIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216577/ws-services-calculation/Penalty.json b/data/as/30216577/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c9c5e80a19
--- /dev/null
+++ b/data/as/30216577/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216577",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216577/ws-services-calculation/WCBillingSlab.json b/data/as/30216577/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ae8117a4f4
--- /dev/null
+++ b/data/as/30216577/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216577",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216676/BillingService/BusinessService.json b/data/as/30216676/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3b06f46275
--- /dev/null
+++ b/data/as/30216676/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216676",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216676/egov-location/boundary-data.json b/data/as/30216676/egov-location/boundary-data.json
new file mode 100644
index 0000000000..853e7002b8
--- /dev/null
+++ b/data/as/30216676/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216676",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB PHULOGURI PWSS",
+                "localname": "PUB PHULOGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB PHULOGURI PWSS",
+                        "localname": "PUB PHULOGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB PHULOGURI PWSS",
+                "localname": "PUB PHULOGURI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216676",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB PHULOGURI PWSS",
+                        "localname": "PUB PHULOGURI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216676/ws-services-calculation/Penalty.json b/data/as/30216676/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5946fe885c
--- /dev/null
+++ b/data/as/30216676/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216676",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216676/ws-services-calculation/WCBillingSlab.json b/data/as/30216676/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b88d008182
--- /dev/null
+++ b/data/as/30216676/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216676",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216841/BillingService/BusinessService.json b/data/as/30216841/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2c88b69421
--- /dev/null
+++ b/data/as/30216841/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216841",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216841/egov-location/boundary-data.json b/data/as/30216841/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3733e779b1
--- /dev/null
+++ b/data/as/30216841/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216841",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOURANGJULI PWSS",
+                "localname": "SOURANGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216841",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOURANGJULI PWSS",
+                        "localname": "SOURANGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SOURANGJULI PWSS",
+                "localname": "SOURANGJULI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216841",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SOURANGJULI PWSS",
+                        "localname": "SOURANGJULI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216841/ws-services-calculation/Penalty.json b/data/as/30216841/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b3e97dbfb5
--- /dev/null
+++ b/data/as/30216841/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216841",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216841/ws-services-calculation/WCBillingSlab.json b/data/as/30216841/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f99b7eccd4
--- /dev/null
+++ b/data/as/30216841/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216841",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216849/BillingService/BusinessService.json b/data/as/30216849/BillingService/BusinessService.json
new file mode 100644
index 0000000000..95f1a1563b
--- /dev/null
+++ b/data/as/30216849/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216849",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216849/egov-location/boundary-data.json b/data/as/30216849/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d9cf52f23d
--- /dev/null
+++ b/data/as/30216849/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216849",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHANTIPUR PWSS",
+                "localname": "SHANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHANTIPUR PWSS",
+                        "localname": "SHANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SHANTIPUR PWSS",
+                "localname": "SHANTIPUR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216849",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SHANTIPUR PWSS",
+                        "localname": "SHANTIPUR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216849/ws-services-calculation/Penalty.json b/data/as/30216849/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2d76b324a6
--- /dev/null
+++ b/data/as/30216849/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216849",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216849/ws-services-calculation/WCBillingSlab.json b/data/as/30216849/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ddf56de9b1
--- /dev/null
+++ b/data/as/30216849/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216849",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216928/BillingService/BusinessService.json b/data/as/30216928/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b07114950d
--- /dev/null
+++ b/data/as/30216928/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216928",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216928/egov-location/boundary-data.json b/data/as/30216928/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4e45002eb0
--- /dev/null
+++ b/data/as/30216928/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216928",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHPARA PWSS (NEW) (ZIRA)",
+                "localname": "KOCHPARA PWSS (NEW) (ZIRA)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216928",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHPARA PWSS (NEW) (ZIRA)",
+                        "localname": "KOCHPARA PWSS (NEW) (ZIRA)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KOCHPARA PWSS (NEW) (ZIRA)",
+                "localname": "KOCHPARA PWSS (NEW) (ZIRA)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216928",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KOCHPARA PWSS (NEW) (ZIRA)",
+                        "localname": "KOCHPARA PWSS (NEW) (ZIRA)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216928/ws-services-calculation/Penalty.json b/data/as/30216928/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e4b2daea4b
--- /dev/null
+++ b/data/as/30216928/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216928",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216928/ws-services-calculation/WCBillingSlab.json b/data/as/30216928/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f157f8c981
--- /dev/null
+++ b/data/as/30216928/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216928",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216939/BillingService/BusinessService.json b/data/as/30216939/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b5ee278ab4
--- /dev/null
+++ b/data/as/30216939/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216939",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216939/egov-location/boundary-data.json b/data/as/30216939/egov-location/boundary-data.json
new file mode 100644
index 0000000000..72d290ede1
--- /dev/null
+++ b/data/as/30216939/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216939",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAKIRPARA PUKHURIPARA PWSS",
+                "localname": "FAKIRPARA PUKHURIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAKIRPARA PUKHURIPARA PWSS",
+                        "localname": "FAKIRPARA PUKHURIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "FAKIRPARA PUKHURIPARA PWSS",
+                "localname": "FAKIRPARA PUKHURIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216939",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "FAKIRPARA PUKHURIPARA PWSS",
+                        "localname": "FAKIRPARA PUKHURIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216939/ws-services-calculation/Penalty.json b/data/as/30216939/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6cd6ee4e0e
--- /dev/null
+++ b/data/as/30216939/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216939",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216939/ws-services-calculation/WCBillingSlab.json b/data/as/30216939/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5820999f79
--- /dev/null
+++ b/data/as/30216939/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216939",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216955/BillingService/BusinessService.json b/data/as/30216955/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10cf2ff439
--- /dev/null
+++ b/data/as/30216955/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30216955",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216955/egov-location/boundary-data.json b/data/as/30216955/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b05f9e7861
--- /dev/null
+++ b/data/as/30216955/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30216955",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEKDHOWA TALTOLA PWSS (NEW)",
+                "localname": "DEKDHOWA TALTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEKDHOWA TALTOLA PWSS (NEW)",
+                        "localname": "DEKDHOWA TALTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DEKDHOWA TALTOLA PWSS (NEW)",
+                "localname": "DEKDHOWA TALTOLA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30216955",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DEKDHOWA TALTOLA PWSS (NEW)",
+                        "localname": "DEKDHOWA TALTOLA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216955/ws-services-calculation/Penalty.json b/data/as/30216955/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cc81672265
--- /dev/null
+++ b/data/as/30216955/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30216955",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30216955/ws-services-calculation/WCBillingSlab.json b/data/as/30216955/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bc6d0fec8a
--- /dev/null
+++ b/data/as/30216955/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30216955",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217247/BillingService/BusinessService.json b/data/as/30217247/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4c59aeeac9
--- /dev/null
+++ b/data/as/30217247/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30217247",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217247/egov-location/boundary-data.json b/data/as/30217247/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c656a5d059
--- /dev/null
+++ b/data/as/30217247/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30217247",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 RANGAGARA BIL GAON PWSS",
+                "localname": "NO.2 RANGAGARA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30217247",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 RANGAGARA BIL GAON PWSS",
+                        "localname": "NO.2 RANGAGARA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 RANGAGARA BIL GAON PWSS",
+                "localname": "NO.2 RANGAGARA BIL GAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30217247",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 RANGAGARA BIL GAON PWSS",
+                        "localname": "NO.2 RANGAGARA BIL GAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217247/ws-services-calculation/Penalty.json b/data/as/30217247/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1166890f41
--- /dev/null
+++ b/data/as/30217247/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30217247",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217247/ws-services-calculation/WCBillingSlab.json b/data/as/30217247/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80fac6169c
--- /dev/null
+++ b/data/as/30217247/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30217247",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217255/BillingService/BusinessService.json b/data/as/30217255/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a21e762e8c
--- /dev/null
+++ b/data/as/30217255/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30217255",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217255/egov-location/boundary-data.json b/data/as/30217255/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9621c8218a
--- /dev/null
+++ b/data/as/30217255/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30217255",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAI JARANI PWSS",
+                "localname": "DHIRAI JARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30217255",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAI JARANI PWSS",
+                        "localname": "DHIRAI JARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHIRAI JARANI PWSS",
+                "localname": "DHIRAI JARANI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30217255",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHIRAI JARANI PWSS",
+                        "localname": "DHIRAI JARANI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217255/ws-services-calculation/Penalty.json b/data/as/30217255/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..35b972a577
--- /dev/null
+++ b/data/as/30217255/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30217255",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217255/ws-services-calculation/WCBillingSlab.json b/data/as/30217255/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..419d6a9dd6
--- /dev/null
+++ b/data/as/30217255/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30217255",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217976/BillingService/BusinessService.json b/data/as/30217976/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8572e9f388
--- /dev/null
+++ b/data/as/30217976/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30217976",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217976/egov-location/boundary-data.json b/data/as/30217976/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54768a791f
--- /dev/null
+++ b/data/as/30217976/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30217976",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 BHOJMARI PWSS",
+                "localname": "NO.2 BHOJMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30217976",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 BHOJMARI PWSS",
+                        "localname": "NO.2 BHOJMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NO.2 BHOJMARI PWSS",
+                "localname": "NO.2 BHOJMARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30217976",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NO.2 BHOJMARI PWSS",
+                        "localname": "NO.2 BHOJMARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217976/ws-services-calculation/Penalty.json b/data/as/30217976/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4f6d343fcb
--- /dev/null
+++ b/data/as/30217976/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30217976",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30217976/ws-services-calculation/WCBillingSlab.json b/data/as/30217976/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f48e471eb9
--- /dev/null
+++ b/data/as/30217976/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30217976",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218422/BillingService/BusinessService.json b/data/as/30218422/BillingService/BusinessService.json
new file mode 100644
index 0000000000..1c0111c7f5
--- /dev/null
+++ b/data/as/30218422/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218422",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218422/egov-location/boundary-data.json b/data/as/30218422/egov-location/boundary-data.json
new file mode 100644
index 0000000000..003739856b
--- /dev/null
+++ b/data/as/30218422/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218422",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PT-II PWSS (NEW)",
+                "localname": "BAHATI CHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218422",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PT-II PWSS (NEW)",
+                        "localname": "BAHATI CHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PT-II PWSS (NEW)",
+                "localname": "BAHATI CHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218422",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PT-II PWSS (NEW)",
+                        "localname": "BAHATI CHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218422/ws-services-calculation/Penalty.json b/data/as/30218422/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78c6d7710e
--- /dev/null
+++ b/data/as/30218422/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218422",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218422/ws-services-calculation/WCBillingSlab.json b/data/as/30218422/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c80798bf6
--- /dev/null
+++ b/data/as/30218422/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218422",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218426/BillingService/BusinessService.json b/data/as/30218426/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f9ac8aed68
--- /dev/null
+++ b/data/as/30218426/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218426",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218426/egov-location/boundary-data.json b/data/as/30218426/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52d55acf59
--- /dev/null
+++ b/data/as/30218426/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218426",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAJONGPARA PWSS (NEW)",
+                "localname": "HAJONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218426",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAJONGPARA PWSS (NEW)",
+                        "localname": "HAJONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HAJONGPARA PWSS (NEW)",
+                "localname": "HAJONGPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218426",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HAJONGPARA PWSS (NEW)",
+                        "localname": "HAJONGPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218426/ws-services-calculation/Penalty.json b/data/as/30218426/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..901a4a3f17
--- /dev/null
+++ b/data/as/30218426/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218426",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218426/ws-services-calculation/WCBillingSlab.json b/data/as/30218426/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f5ed3f61c1
--- /dev/null
+++ b/data/as/30218426/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218426",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218431/BillingService/BusinessService.json b/data/as/30218431/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d1fa42283
--- /dev/null
+++ b/data/as/30218431/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218431",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218431/egov-location/boundary-data.json b/data/as/30218431/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a39379e723
--- /dev/null
+++ b/data/as/30218431/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218431",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA BAKRAPARA PWSS (NEW)",
+                "localname": "GAROPARA BAKRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218431",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA BAKRAPARA PWSS (NEW)",
+                        "localname": "GAROPARA BAKRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROPARA BAKRAPARA PWSS (NEW)",
+                "localname": "GAROPARA BAKRAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218431",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROPARA BAKRAPARA PWSS (NEW)",
+                        "localname": "GAROPARA BAKRAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218431/ws-services-calculation/Penalty.json b/data/as/30218431/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5ac8449fdd
--- /dev/null
+++ b/data/as/30218431/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218431",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218431/ws-services-calculation/WCBillingSlab.json b/data/as/30218431/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e38d168f06
--- /dev/null
+++ b/data/as/30218431/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218431",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218437/BillingService/BusinessService.json b/data/as/30218437/BillingService/BusinessService.json
new file mode 100644
index 0000000000..983a2465e9
--- /dev/null
+++ b/data/as/30218437/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218437",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218437/egov-location/boundary-data.json b/data/as/30218437/egov-location/boundary-data.json
new file mode 100644
index 0000000000..391f06ccbd
--- /dev/null
+++ b/data/as/30218437/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218437",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                "localname": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                        "localname": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                "localname": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218437",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                        "localname": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218437/ws-services-calculation/Penalty.json b/data/as/30218437/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b365e5fc58
--- /dev/null
+++ b/data/as/30218437/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218437",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218437/ws-services-calculation/WCBillingSlab.json b/data/as/30218437/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1c2c0a0e5f
--- /dev/null
+++ b/data/as/30218437/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218437",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218442/BillingService/BusinessService.json b/data/as/30218442/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9c19e7603c
--- /dev/null
+++ b/data/as/30218442/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218442",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218442/egov-location/boundary-data.json b/data/as/30218442/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3f72fa83bb
--- /dev/null
+++ b/data/as/30218442/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218442",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                "localname": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                "localname": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218442",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                        "localname": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218442/ws-services-calculation/Penalty.json b/data/as/30218442/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..12d56bd61d
--- /dev/null
+++ b/data/as/30218442/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218442",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218442/ws-services-calculation/WCBillingSlab.json b/data/as/30218442/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a18052e426
--- /dev/null
+++ b/data/as/30218442/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218442",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218453/BillingService/BusinessService.json b/data/as/30218453/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b9e7591483
--- /dev/null
+++ b/data/as/30218453/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218453",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218453/egov-location/boundary-data.json b/data/as/30218453/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c95b0bc6fe
--- /dev/null
+++ b/data/as/30218453/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218453",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                "localname": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218453",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                "localname": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218453",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                        "localname": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218453/ws-services-calculation/Penalty.json b/data/as/30218453/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5df4fd0643
--- /dev/null
+++ b/data/as/30218453/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218453",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218453/ws-services-calculation/WCBillingSlab.json b/data/as/30218453/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..31fca98b18
--- /dev/null
+++ b/data/as/30218453/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218453",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218465/BillingService/BusinessService.json b/data/as/30218465/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0c80c57c09
--- /dev/null
+++ b/data/as/30218465/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218465",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218465/egov-location/boundary-data.json b/data/as/30218465/egov-location/boundary-data.json
new file mode 100644
index 0000000000..74b9fdf875
--- /dev/null
+++ b/data/as/30218465/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218465",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LALUPARA PWSS (NEW)",
+                "localname": "LALUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LALUPARA PWSS (NEW)",
+                        "localname": "LALUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LALUPARA PWSS (NEW)",
+                "localname": "LALUPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218465",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LALUPARA PWSS (NEW)",
+                        "localname": "LALUPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218465/ws-services-calculation/Penalty.json b/data/as/30218465/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..045e3e3724
--- /dev/null
+++ b/data/as/30218465/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218465",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218465/ws-services-calculation/WCBillingSlab.json b/data/as/30218465/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..65527356e1
--- /dev/null
+++ b/data/as/30218465/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218465",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218467/BillingService/BusinessService.json b/data/as/30218467/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ce6dd7af38
--- /dev/null
+++ b/data/as/30218467/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218467",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218467/egov-location/boundary-data.json b/data/as/30218467/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e78d4f41a7
--- /dev/null
+++ b/data/as/30218467/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218467",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PWSS (NEW)",
+                "localname": "BAHATI CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218467",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PWSS (NEW)",
+                        "localname": "BAHATI CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PWSS (NEW)",
+                "localname": "BAHATI CHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218467",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PWSS (NEW)",
+                        "localname": "BAHATI CHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218467/ws-services-calculation/Penalty.json b/data/as/30218467/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f91f96093
--- /dev/null
+++ b/data/as/30218467/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218467",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218467/ws-services-calculation/WCBillingSlab.json b/data/as/30218467/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e21ed49d3b
--- /dev/null
+++ b/data/as/30218467/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218467",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218469/BillingService/BusinessService.json b/data/as/30218469/BillingService/BusinessService.json
new file mode 100644
index 0000000000..88281656fa
--- /dev/null
+++ b/data/as/30218469/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218469",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218469/egov-location/boundary-data.json b/data/as/30218469/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b7d58e6bb7
--- /dev/null
+++ b/data/as/30218469/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218469",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JANAIMARI PWSS (NEW)",
+                "localname": "JANAIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JANAIMARI PWSS (NEW)",
+                        "localname": "JANAIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JANAIMARI PWSS (NEW)",
+                "localname": "JANAIMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218469",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JANAIMARI PWSS (NEW)",
+                        "localname": "JANAIMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218469/ws-services-calculation/Penalty.json b/data/as/30218469/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c2d500b055
--- /dev/null
+++ b/data/as/30218469/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218469",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218469/ws-services-calculation/WCBillingSlab.json b/data/as/30218469/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5429ebef53
--- /dev/null
+++ b/data/as/30218469/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218469",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218658/BillingService/BusinessService.json b/data/as/30218658/BillingService/BusinessService.json
new file mode 100644
index 0000000000..10a9faa3ea
--- /dev/null
+++ b/data/as/30218658/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218658",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218658/egov-location/boundary-data.json b/data/as/30218658/egov-location/boundary-data.json
new file mode 100644
index 0000000000..df166a5c04
--- /dev/null
+++ b/data/as/30218658/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218658",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUJGURI MV PWSS (NEW)",
+                "localname": "MUJGURI MV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218658",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUJGURI MV PWSS (NEW)",
+                        "localname": "MUJGURI MV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MUJGURI MV PWSS (NEW)",
+                "localname": "MUJGURI MV PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218658",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MUJGURI MV PWSS (NEW)",
+                        "localname": "MUJGURI MV PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218658/ws-services-calculation/Penalty.json b/data/as/30218658/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c76bf25f8b
--- /dev/null
+++ b/data/as/30218658/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218658",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218658/ws-services-calculation/WCBillingSlab.json b/data/as/30218658/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..396b6d9b59
--- /dev/null
+++ b/data/as/30218658/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218658",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218660/BillingService/BusinessService.json b/data/as/30218660/BillingService/BusinessService.json
new file mode 100644
index 0000000000..70b2b7c15e
--- /dev/null
+++ b/data/as/30218660/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218660",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218660/egov-location/boundary-data.json b/data/as/30218660/egov-location/boundary-data.json
new file mode 100644
index 0000000000..55c77e27c8
--- /dev/null
+++ b/data/as/30218660/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218660",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ISLAMPUR PWSS (NEW)",
+                "localname": "ISLAMPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218660",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ISLAMPUR PWSS (NEW)",
+                        "localname": "ISLAMPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ISLAMPUR PWSS (NEW)",
+                "localname": "ISLAMPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218660",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ISLAMPUR PWSS (NEW)",
+                        "localname": "ISLAMPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218660/ws-services-calculation/Penalty.json b/data/as/30218660/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..db92b7ceb8
--- /dev/null
+++ b/data/as/30218660/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218660",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218660/ws-services-calculation/WCBillingSlab.json b/data/as/30218660/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a316147621
--- /dev/null
+++ b/data/as/30218660/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218660",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218662/BillingService/BusinessService.json b/data/as/30218662/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5c9ce97567
--- /dev/null
+++ b/data/as/30218662/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218662",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218662/egov-location/boundary-data.json b/data/as/30218662/egov-location/boundary-data.json
new file mode 100644
index 0000000000..832fd688d3
--- /dev/null
+++ b/data/as/30218662/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218662",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA PWSS (NEW)",
+                "localname": "TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA PWSS (NEW)",
+                        "localname": "TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TILAPARA PWSS (NEW)",
+                "localname": "TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218662",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TILAPARA PWSS (NEW)",
+                        "localname": "TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218662/ws-services-calculation/Penalty.json b/data/as/30218662/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..187ae1d332
--- /dev/null
+++ b/data/as/30218662/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218662",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218662/ws-services-calculation/WCBillingSlab.json b/data/as/30218662/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15cde1d4ae
--- /dev/null
+++ b/data/as/30218662/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218662",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218664/BillingService/BusinessService.json b/data/as/30218664/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4844dac13e
--- /dev/null
+++ b/data/as/30218664/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218664",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218664/egov-location/boundary-data.json b/data/as/30218664/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7775287143
--- /dev/null
+++ b/data/as/30218664/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218664",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIDANPUR PWSS (NEW)",
+                "localname": "NIDANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218664",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIDANPUR PWSS (NEW)",
+                        "localname": "NIDANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NIDANPUR PWSS (NEW)",
+                "localname": "NIDANPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218664",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NIDANPUR PWSS (NEW)",
+                        "localname": "NIDANPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218664/ws-services-calculation/Penalty.json b/data/as/30218664/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2df92860fa
--- /dev/null
+++ b/data/as/30218664/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218664",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218664/ws-services-calculation/WCBillingSlab.json b/data/as/30218664/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9b4ad8aa47
--- /dev/null
+++ b/data/as/30218664/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218664",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218673/BillingService/BusinessService.json b/data/as/30218673/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a616bd7650
--- /dev/null
+++ b/data/as/30218673/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218673",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218673/egov-location/boundary-data.json b/data/as/30218673/egov-location/boundary-data.json
new file mode 100644
index 0000000000..2a6c7f9bd0
--- /dev/null
+++ b/data/as/30218673/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218673",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                "localname": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                        "localname": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                "localname": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218673",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                        "localname": "KHUDRAPOITARY NORTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218673/ws-services-calculation/Penalty.json b/data/as/30218673/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..84e25e2375
--- /dev/null
+++ b/data/as/30218673/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218673",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218673/ws-services-calculation/WCBillingSlab.json b/data/as/30218673/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..71936c31ed
--- /dev/null
+++ b/data/as/30218673/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218673",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218675/BillingService/BusinessService.json b/data/as/30218675/BillingService/BusinessService.json
new file mode 100644
index 0000000000..182b77fdae
--- /dev/null
+++ b/data/as/30218675/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218675",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218675/egov-location/boundary-data.json b/data/as/30218675/egov-location/boundary-data.json
new file mode 100644
index 0000000000..54a91dd137
--- /dev/null
+++ b/data/as/30218675/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218675",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                "localname": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218675",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                        "localname": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                "localname": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218675",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                        "localname": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218675/ws-services-calculation/Penalty.json b/data/as/30218675/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1066c0d2a9
--- /dev/null
+++ b/data/as/30218675/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218675",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218675/ws-services-calculation/WCBillingSlab.json b/data/as/30218675/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..24391eff5a
--- /dev/null
+++ b/data/as/30218675/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218675",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218682/BillingService/BusinessService.json b/data/as/30218682/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9b7a950335
--- /dev/null
+++ b/data/as/30218682/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218682",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218682/egov-location/boundary-data.json b/data/as/30218682/egov-location/boundary-data.json
new file mode 100644
index 0000000000..adb6647406
--- /dev/null
+++ b/data/as/30218682/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218682",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAKALIA PARA PWSS (NEW)",
+                "localname": "NAKALIA PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218682",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAKALIA PARA PWSS (NEW)",
+                        "localname": "NAKALIA PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NAKALIA PARA PWSS (NEW)",
+                "localname": "NAKALIA PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218682",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NAKALIA PARA PWSS (NEW)",
+                        "localname": "NAKALIA PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218682/ws-services-calculation/Penalty.json b/data/as/30218682/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ac436aafb4
--- /dev/null
+++ b/data/as/30218682/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218682",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218682/ws-services-calculation/WCBillingSlab.json b/data/as/30218682/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2f2b51379d
--- /dev/null
+++ b/data/as/30218682/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218682",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218684/BillingService/BusinessService.json b/data/as/30218684/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7d98175b14
--- /dev/null
+++ b/data/as/30218684/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218684",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218684/egov-location/boundary-data.json b/data/as/30218684/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b87f6c9ec7
--- /dev/null
+++ b/data/as/30218684/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218684",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                "localname": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218684",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                        "localname": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                "localname": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218684",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                        "localname": "RAMHARIR CHAR PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218684/ws-services-calculation/Penalty.json b/data/as/30218684/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11fc516ca0
--- /dev/null
+++ b/data/as/30218684/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218684",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218684/ws-services-calculation/WCBillingSlab.json b/data/as/30218684/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..da0c2e3f17
--- /dev/null
+++ b/data/as/30218684/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218684",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218703/BillingService/BusinessService.json b/data/as/30218703/BillingService/BusinessService.json
new file mode 100644
index 0000000000..147af727d2
--- /dev/null
+++ b/data/as/30218703/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218703",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218703/egov-location/boundary-data.json b/data/as/30218703/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b237ed6693
--- /dev/null
+++ b/data/as/30218703/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218703",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                "localname": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                        "localname": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                "localname": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218703",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                        "localname": "BANGALJHAR DEVIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218703/ws-services-calculation/Penalty.json b/data/as/30218703/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d221ab1bc0
--- /dev/null
+++ b/data/as/30218703/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218703",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218703/ws-services-calculation/WCBillingSlab.json b/data/as/30218703/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd016279ac
--- /dev/null
+++ b/data/as/30218703/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218703",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218711/BillingService/BusinessService.json b/data/as/30218711/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a13e99a339
--- /dev/null
+++ b/data/as/30218711/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218711",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218711/egov-location/boundary-data.json b/data/as/30218711/egov-location/boundary-data.json
new file mode 100644
index 0000000000..764fdc61cb
--- /dev/null
+++ b/data/as/30218711/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218711",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGALJHAR DESIPARA PWSS (NEW)",
+                "localname": "BANGALJHAR DESIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGALJHAR DESIPARA PWSS (NEW)",
+                        "localname": "BANGALJHAR DESIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BANGALJHAR DESIPARA PWSS (NEW)",
+                "localname": "BANGALJHAR DESIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218711",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BANGALJHAR DESIPARA PWSS (NEW)",
+                        "localname": "BANGALJHAR DESIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218711/ws-services-calculation/Penalty.json b/data/as/30218711/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f3a5b5837e
--- /dev/null
+++ b/data/as/30218711/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218711",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218711/ws-services-calculation/WCBillingSlab.json b/data/as/30218711/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6c1c08d524
--- /dev/null
+++ b/data/as/30218711/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218711",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218717/BillingService/BusinessService.json b/data/as/30218717/BillingService/BusinessService.json
new file mode 100644
index 0000000000..01f0b825e7
--- /dev/null
+++ b/data/as/30218717/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218717",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218717/egov-location/boundary-data.json b/data/as/30218717/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3672c51a08
--- /dev/null
+++ b/data/as/30218717/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218717",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLAI PT-II PWSS (NEW)",
+                "localname": "CHAPLAI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLAI PT-II PWSS (NEW)",
+                        "localname": "CHAPLAI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLAI PT-II PWSS (NEW)",
+                "localname": "CHAPLAI PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218717",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLAI PT-II PWSS (NEW)",
+                        "localname": "CHAPLAI PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218717/ws-services-calculation/Penalty.json b/data/as/30218717/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f605dcff7
--- /dev/null
+++ b/data/as/30218717/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218717",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218717/ws-services-calculation/WCBillingSlab.json b/data/as/30218717/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..81fbfaad23
--- /dev/null
+++ b/data/as/30218717/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218717",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218718/BillingService/BusinessService.json b/data/as/30218718/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f33ea36b4d
--- /dev/null
+++ b/data/as/30218718/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218718",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218718/egov-location/boundary-data.json b/data/as/30218718/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89a0b40b07
--- /dev/null
+++ b/data/as/30218718/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218718",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                "localname": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218718",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                        "localname": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                "localname": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218718",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                        "localname": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218718/ws-services-calculation/Penalty.json b/data/as/30218718/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..13c1d90724
--- /dev/null
+++ b/data/as/30218718/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218718",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218718/ws-services-calculation/WCBillingSlab.json b/data/as/30218718/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2ea14abc4f
--- /dev/null
+++ b/data/as/30218718/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218718",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218719/BillingService/BusinessService.json b/data/as/30218719/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5f655519bc
--- /dev/null
+++ b/data/as/30218719/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218719",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218719/egov-location/boundary-data.json b/data/as/30218719/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aa935dddc6
--- /dev/null
+++ b/data/as/30218719/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218719",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA RABHAPARA PWSS",
+                "localname": "MATIA RABHAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218719",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA RABHAPARA PWSS",
+                        "localname": "MATIA RABHAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MATIA RABHAPARA PWSS",
+                "localname": "MATIA RABHAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218719",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MATIA RABHAPARA PWSS",
+                        "localname": "MATIA RABHAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218719/ws-services-calculation/Penalty.json b/data/as/30218719/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f9722b24b3
--- /dev/null
+++ b/data/as/30218719/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218719",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218719/ws-services-calculation/WCBillingSlab.json b/data/as/30218719/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8e65c69933
--- /dev/null
+++ b/data/as/30218719/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218719",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218721/BillingService/BusinessService.json b/data/as/30218721/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac9c0249fc
--- /dev/null
+++ b/data/as/30218721/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218721",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218721/egov-location/boundary-data.json b/data/as/30218721/egov-location/boundary-data.json
new file mode 100644
index 0000000000..23f4d16ff7
--- /dev/null
+++ b/data/as/30218721/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218721",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIPARA PWSS (NEW)",
+                "localname": "BALIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIPARA PWSS (NEW)",
+                        "localname": "BALIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIPARA PWSS (NEW)",
+                "localname": "BALIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218721",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIPARA PWSS (NEW)",
+                        "localname": "BALIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218721/ws-services-calculation/Penalty.json b/data/as/30218721/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a943dd00b0
--- /dev/null
+++ b/data/as/30218721/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218721",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218721/ws-services-calculation/WCBillingSlab.json b/data/as/30218721/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a51799d518
--- /dev/null
+++ b/data/as/30218721/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218721",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218722/BillingService/BusinessService.json b/data/as/30218722/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cb57c321de
--- /dev/null
+++ b/data/as/30218722/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218722",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218722/egov-location/boundary-data.json b/data/as/30218722/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ef207720ea
--- /dev/null
+++ b/data/as/30218722/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218722",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTAPARA PWSS (NEW)",
+                "localname": "SANTAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218722",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTAPARA PWSS (NEW)",
+                        "localname": "SANTAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SANTAPARA PWSS (NEW)",
+                "localname": "SANTAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218722",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SANTAPARA PWSS (NEW)",
+                        "localname": "SANTAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218722/ws-services-calculation/Penalty.json b/data/as/30218722/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2054886a11
--- /dev/null
+++ b/data/as/30218722/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218722",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218722/ws-services-calculation/WCBillingSlab.json b/data/as/30218722/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4d009ce9c7
--- /dev/null
+++ b/data/as/30218722/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218722",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218724/BillingService/BusinessService.json b/data/as/30218724/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9b263dfd26
--- /dev/null
+++ b/data/as/30218724/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218724",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218724/egov-location/boundary-data.json b/data/as/30218724/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1651abe06
--- /dev/null
+++ b/data/as/30218724/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218724",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUDHURIPARA PWSS (NEW)",
+                "localname": "CHOUDHURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUDHURIPARA PWSS (NEW)",
+                        "localname": "CHOUDHURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOUDHURIPARA PWSS (NEW)",
+                "localname": "CHOUDHURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218724",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOUDHURIPARA PWSS (NEW)",
+                        "localname": "CHOUDHURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218724/ws-services-calculation/Penalty.json b/data/as/30218724/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d35b566735
--- /dev/null
+++ b/data/as/30218724/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218724",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218724/ws-services-calculation/WCBillingSlab.json b/data/as/30218724/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7caae88abc
--- /dev/null
+++ b/data/as/30218724/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218724",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218726/BillingService/BusinessService.json b/data/as/30218726/BillingService/BusinessService.json
new file mode 100644
index 0000000000..8c8f65cd53
--- /dev/null
+++ b/data/as/30218726/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218726",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218726/egov-location/boundary-data.json b/data/as/30218726/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e656d4f9f9
--- /dev/null
+++ b/data/as/30218726/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218726",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAPARA TILAPARA PWSS (NEW)",
+                "localname": "BATAPARA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218726",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAPARA TILAPARA PWSS (NEW)",
+                        "localname": "BATAPARA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATAPARA TILAPARA PWSS (NEW)",
+                "localname": "BATAPARA TILAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218726",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATAPARA TILAPARA PWSS (NEW)",
+                        "localname": "BATAPARA TILAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218726/ws-services-calculation/Penalty.json b/data/as/30218726/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a73e149d2
--- /dev/null
+++ b/data/as/30218726/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218726",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218726/ws-services-calculation/WCBillingSlab.json b/data/as/30218726/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2dca1ce2f7
--- /dev/null
+++ b/data/as/30218726/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218726",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218728/BillingService/BusinessService.json b/data/as/30218728/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d36b1655eb
--- /dev/null
+++ b/data/as/30218728/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218728",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218728/egov-location/boundary-data.json b/data/as/30218728/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b85b8b76c3
--- /dev/null
+++ b/data/as/30218728/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218728",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAURIDUBI TELIPARA PWSS (NEW)",
+                "localname": "KAURIDUBI TELIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218728",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAURIDUBI TELIPARA PWSS (NEW)",
+                        "localname": "KAURIDUBI TELIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAURIDUBI TELIPARA PWSS (NEW)",
+                "localname": "KAURIDUBI TELIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218728",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAURIDUBI TELIPARA PWSS (NEW)",
+                        "localname": "KAURIDUBI TELIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218728/ws-services-calculation/Penalty.json b/data/as/30218728/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5982ee458c
--- /dev/null
+++ b/data/as/30218728/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218728",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218728/ws-services-calculation/WCBillingSlab.json b/data/as/30218728/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8b8dcd3ff9
--- /dev/null
+++ b/data/as/30218728/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218728",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218731/BillingService/BusinessService.json b/data/as/30218731/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b04435fbac
--- /dev/null
+++ b/data/as/30218731/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218731",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218731/egov-location/boundary-data.json b/data/as/30218731/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3e16b86cd6
--- /dev/null
+++ b/data/as/30218731/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218731",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASHIM BORVITA PWSS (NEW)",
+                "localname": "PASHIM BORVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218731",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASHIM BORVITA PWSS (NEW)",
+                        "localname": "PASHIM BORVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PASHIM BORVITA PWSS (NEW)",
+                "localname": "PASHIM BORVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218731",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PASHIM BORVITA PWSS (NEW)",
+                        "localname": "PASHIM BORVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218731/ws-services-calculation/Penalty.json b/data/as/30218731/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71fa185dad
--- /dev/null
+++ b/data/as/30218731/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218731",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218731/ws-services-calculation/WCBillingSlab.json b/data/as/30218731/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d6b87fc60
--- /dev/null
+++ b/data/as/30218731/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218731",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218732/BillingService/BusinessService.json b/data/as/30218732/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f6dff72c6c
--- /dev/null
+++ b/data/as/30218732/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218732",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218732/egov-location/boundary-data.json b/data/as/30218732/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5eb1ee63f3
--- /dev/null
+++ b/data/as/30218732/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218732",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEELPARA PWSS (NEW)",
+                "localname": "BEELPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEELPARA PWSS (NEW)",
+                        "localname": "BEELPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BEELPARA PWSS (NEW)",
+                "localname": "BEELPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218732",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BEELPARA PWSS (NEW)",
+                        "localname": "BEELPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218732/ws-services-calculation/Penalty.json b/data/as/30218732/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..441e291021
--- /dev/null
+++ b/data/as/30218732/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218732",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218732/ws-services-calculation/WCBillingSlab.json b/data/as/30218732/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bfbbb6a0d1
--- /dev/null
+++ b/data/as/30218732/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218732",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218733/BillingService/BusinessService.json b/data/as/30218733/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c7a895b150
--- /dev/null
+++ b/data/as/30218733/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218733",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218733/egov-location/boundary-data.json b/data/as/30218733/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6134b17d46
--- /dev/null
+++ b/data/as/30218733/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218733",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDOBA PWSS (NEW)",
+                "localname": "BORDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218733",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDOBA PWSS (NEW)",
+                        "localname": "BORDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORDOBA PWSS (NEW)",
+                "localname": "BORDOBA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218733",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORDOBA PWSS (NEW)",
+                        "localname": "BORDOBA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218733/ws-services-calculation/Penalty.json b/data/as/30218733/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ecf818847
--- /dev/null
+++ b/data/as/30218733/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218733",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218733/ws-services-calculation/WCBillingSlab.json b/data/as/30218733/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..42f0afbbcf
--- /dev/null
+++ b/data/as/30218733/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218733",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218734/BillingService/BusinessService.json b/data/as/30218734/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d58cb7613e
--- /dev/null
+++ b/data/as/30218734/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218734",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218734/egov-location/boundary-data.json b/data/as/30218734/egov-location/boundary-data.json
new file mode 100644
index 0000000000..192c0b3a80
--- /dev/null
+++ b/data/as/30218734/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218734",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALITAPARA PWSS",
+                "localname": "KALITAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218734",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALITAPARA PWSS",
+                        "localname": "KALITAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALITAPARA PWSS",
+                "localname": "KALITAPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218734",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALITAPARA PWSS",
+                        "localname": "KALITAPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218734/ws-services-calculation/Penalty.json b/data/as/30218734/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9f5b67cc03
--- /dev/null
+++ b/data/as/30218734/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218734",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218734/ws-services-calculation/WCBillingSlab.json b/data/as/30218734/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9831a0ddb9
--- /dev/null
+++ b/data/as/30218734/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218734",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218735/BillingService/BusinessService.json b/data/as/30218735/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fa345a79a1
--- /dev/null
+++ b/data/as/30218735/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218735",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218735/egov-location/boundary-data.json b/data/as/30218735/egov-location/boundary-data.json
new file mode 100644
index 0000000000..bbf1593de9
--- /dev/null
+++ b/data/as/30218735/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218735",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHONERPARA PWSS",
+                "localname": "KHONERPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218735",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHONERPARA PWSS",
+                        "localname": "KHONERPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHONERPARA PWSS",
+                "localname": "KHONERPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218735",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHONERPARA PWSS",
+                        "localname": "KHONERPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218735/ws-services-calculation/Penalty.json b/data/as/30218735/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d9cb61fa34
--- /dev/null
+++ b/data/as/30218735/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218735",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218735/ws-services-calculation/WCBillingSlab.json b/data/as/30218735/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..beba2bbd90
--- /dev/null
+++ b/data/as/30218735/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218735",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218736/BillingService/BusinessService.json b/data/as/30218736/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc12be5502
--- /dev/null
+++ b/data/as/30218736/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218736",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218736/egov-location/boundary-data.json b/data/as/30218736/egov-location/boundary-data.json
new file mode 100644
index 0000000000..87867f51dc
--- /dev/null
+++ b/data/as/30218736/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218736",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIHARTOLI PWSS (NEW)",
+                "localname": "BALIHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218736",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIHARTOLI PWSS (NEW)",
+                        "localname": "BALIHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALIHARTOLI PWSS (NEW)",
+                "localname": "BALIHARTOLI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218736",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALIHARTOLI PWSS (NEW)",
+                        "localname": "BALIHARTOLI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218736/ws-services-calculation/Penalty.json b/data/as/30218736/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..564a4d32e2
--- /dev/null
+++ b/data/as/30218736/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218736",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218736/ws-services-calculation/WCBillingSlab.json b/data/as/30218736/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2a7dd5ed3c
--- /dev/null
+++ b/data/as/30218736/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218736",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218737/BillingService/BusinessService.json b/data/as/30218737/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fe12070e4f
--- /dev/null
+++ b/data/as/30218737/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218737",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218737/egov-location/boundary-data.json b/data/as/30218737/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ba864a3d68
--- /dev/null
+++ b/data/as/30218737/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218737",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOJUARCHOR PT-II (NEW)",
+                "localname": "HOJUARCHOR PT-II (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218737",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOJUARCHOR PT-II (NEW)",
+                        "localname": "HOJUARCHOR PT-II (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HOJUARCHOR PT-II (NEW)",
+                "localname": "HOJUARCHOR PT-II (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218737",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HOJUARCHOR PT-II (NEW)",
+                        "localname": "HOJUARCHOR PT-II (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218737/ws-services-calculation/Penalty.json b/data/as/30218737/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..746f1f41e5
--- /dev/null
+++ b/data/as/30218737/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218737",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218737/ws-services-calculation/WCBillingSlab.json b/data/as/30218737/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f049e3a9b0
--- /dev/null
+++ b/data/as/30218737/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218737",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218738/BillingService/BusinessService.json b/data/as/30218738/BillingService/BusinessService.json
new file mode 100644
index 0000000000..22c053ab79
--- /dev/null
+++ b/data/as/30218738/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218738",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218738/egov-location/boundary-data.json b/data/as/30218738/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6c95456e87
--- /dev/null
+++ b/data/as/30218738/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218738",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLARCHARPARA PWSS",
+                "localname": "CHOLARCHARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLARCHARPARA PWSS",
+                        "localname": "CHOLARCHARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHOLARCHARPARA PWSS",
+                "localname": "CHOLARCHARPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218738",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHOLARCHARPARA PWSS",
+                        "localname": "CHOLARCHARPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218738/ws-services-calculation/Penalty.json b/data/as/30218738/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f6fa80bdbb
--- /dev/null
+++ b/data/as/30218738/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218738",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218738/ws-services-calculation/WCBillingSlab.json b/data/as/30218738/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8c14b910a6
--- /dev/null
+++ b/data/as/30218738/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218738",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218739/BillingService/BusinessService.json b/data/as/30218739/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9d3fa9e0a3
--- /dev/null
+++ b/data/as/30218739/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218739",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218739/egov-location/boundary-data.json b/data/as/30218739/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26b54f09f5
--- /dev/null
+++ b/data/as/30218739/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218739",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARAYAPARA PWSS (NEW)",
+                "localname": "KARAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARAYAPARA PWSS (NEW)",
+                        "localname": "KARAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KARAYAPARA PWSS (NEW)",
+                "localname": "KARAYAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218739",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KARAYAPARA PWSS (NEW)",
+                        "localname": "KARAYAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218739/ws-services-calculation/Penalty.json b/data/as/30218739/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..6d50f87cb6
--- /dev/null
+++ b/data/as/30218739/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218739",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218739/ws-services-calculation/WCBillingSlab.json b/data/as/30218739/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a6d5ec40f1
--- /dev/null
+++ b/data/as/30218739/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218739",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218740/BillingService/BusinessService.json b/data/as/30218740/BillingService/BusinessService.json
new file mode 100644
index 0000000000..169fa63a35
--- /dev/null
+++ b/data/as/30218740/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218740",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218740/egov-location/boundary-data.json b/data/as/30218740/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4c500540c1
--- /dev/null
+++ b/data/as/30218740/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218740",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RATANGAON PWSS (NEW)",
+                "localname": "RATANGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RATANGAON PWSS (NEW)",
+                        "localname": "RATANGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RATANGAON PWSS (NEW)",
+                "localname": "RATANGAON PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218740",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RATANGAON PWSS (NEW)",
+                        "localname": "RATANGAON PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218740/ws-services-calculation/Penalty.json b/data/as/30218740/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41212ce9b7
--- /dev/null
+++ b/data/as/30218740/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218740",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218740/ws-services-calculation/WCBillingSlab.json b/data/as/30218740/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..666e638464
--- /dev/null
+++ b/data/as/30218740/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218740",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218741/BillingService/BusinessService.json b/data/as/30218741/BillingService/BusinessService.json
new file mode 100644
index 0000000000..963cd33e98
--- /dev/null
+++ b/data/as/30218741/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218741",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218741/egov-location/boundary-data.json b/data/as/30218741/egov-location/boundary-data.json
new file mode 100644
index 0000000000..789d91eaf4
--- /dev/null
+++ b/data/as/30218741/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218741",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANGRPAR PWSS (NEW)",
+                "localname": "BHANGRPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218741",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANGRPAR PWSS (NEW)",
+                        "localname": "BHANGRPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHANGRPAR PWSS (NEW)",
+                "localname": "BHANGRPAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218741",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHANGRPAR PWSS (NEW)",
+                        "localname": "BHANGRPAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218741/ws-services-calculation/Penalty.json b/data/as/30218741/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f4bbcaf02
--- /dev/null
+++ b/data/as/30218741/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218741",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218741/ws-services-calculation/WCBillingSlab.json b/data/as/30218741/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba6728093a
--- /dev/null
+++ b/data/as/30218741/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218741",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218742/BillingService/BusinessService.json b/data/as/30218742/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9823d2bf9f
--- /dev/null
+++ b/data/as/30218742/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218742",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218742/egov-location/boundary-data.json b/data/as/30218742/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe36ae55a3
--- /dev/null
+++ b/data/as/30218742/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218742",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUMAIJHAR SASAN (NEW)",
+                "localname": "GUMAIJHAR SASAN (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218742",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUMAIJHAR SASAN (NEW)",
+                        "localname": "GUMAIJHAR SASAN (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUMAIJHAR SASAN (NEW)",
+                "localname": "GUMAIJHAR SASAN (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218742",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUMAIJHAR SASAN (NEW)",
+                        "localname": "GUMAIJHAR SASAN (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218742/ws-services-calculation/Penalty.json b/data/as/30218742/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f15561c29
--- /dev/null
+++ b/data/as/30218742/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218742",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218742/ws-services-calculation/WCBillingSlab.json b/data/as/30218742/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6f49f5064a
--- /dev/null
+++ b/data/as/30218742/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218742",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218743/BillingService/BusinessService.json b/data/as/30218743/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c4d91e710c
--- /dev/null
+++ b/data/as/30218743/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218743",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218743/egov-location/boundary-data.json b/data/as/30218743/egov-location/boundary-data.json
new file mode 100644
index 0000000000..89db5a14a3
--- /dev/null
+++ b/data/as/30218743/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218743",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROKHUTA PWSS (NEW)",
+                "localname": "GAROKHUTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROKHUTA PWSS (NEW)",
+                        "localname": "GAROKHUTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GAROKHUTA PWSS (NEW)",
+                "localname": "GAROKHUTA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218743",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GAROKHUTA PWSS (NEW)",
+                        "localname": "GAROKHUTA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218743/ws-services-calculation/Penalty.json b/data/as/30218743/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7d6ed7ef61
--- /dev/null
+++ b/data/as/30218743/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218743",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218743/ws-services-calculation/WCBillingSlab.json b/data/as/30218743/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c837b28bff
--- /dev/null
+++ b/data/as/30218743/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218743",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218744/BillingService/BusinessService.json b/data/as/30218744/BillingService/BusinessService.json
new file mode 100644
index 0000000000..eea588dbd5
--- /dev/null
+++ b/data/as/30218744/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218744",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218744/egov-location/boundary-data.json b/data/as/30218744/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f570756fda
--- /dev/null
+++ b/data/as/30218744/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218744",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB KATHURI PWSS (NEW)",
+                "localname": "PUB KATHURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218744",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB KATHURI PWSS (NEW)",
+                        "localname": "PUB KATHURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PUB KATHURI PWSS (NEW)",
+                "localname": "PUB KATHURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218744",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PUB KATHURI PWSS (NEW)",
+                        "localname": "PUB KATHURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218744/ws-services-calculation/Penalty.json b/data/as/30218744/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..61415297a0
--- /dev/null
+++ b/data/as/30218744/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218744",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218744/ws-services-calculation/WCBillingSlab.json b/data/as/30218744/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..534018f002
--- /dev/null
+++ b/data/as/30218744/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218744",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218745/BillingService/BusinessService.json b/data/as/30218745/BillingService/BusinessService.json
new file mode 100644
index 0000000000..76252f0cec
--- /dev/null
+++ b/data/as/30218745/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218745",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218745/egov-location/boundary-data.json b/data/as/30218745/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b9d96d0f2d
--- /dev/null
+++ b/data/as/30218745/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218745",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                "localname": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                        "localname": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                "localname": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218745",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                        "localname": "DHOBAKURA SANTIPUR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218745/ws-services-calculation/Penalty.json b/data/as/30218745/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e2dd927674
--- /dev/null
+++ b/data/as/30218745/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218745",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218745/ws-services-calculation/WCBillingSlab.json b/data/as/30218745/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba006cadeb
--- /dev/null
+++ b/data/as/30218745/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218745",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218812/BillingService/BusinessService.json b/data/as/30218812/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dfc5e72ec
--- /dev/null
+++ b/data/as/30218812/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218812",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218812/egov-location/boundary-data.json b/data/as/30218812/egov-location/boundary-data.json
new file mode 100644
index 0000000000..62057d9c01
--- /dev/null
+++ b/data/as/30218812/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218812",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOWALGURI SOLAR PWSS",
+                "localname": "BOWALGURI SOLAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOWALGURI SOLAR PWSS",
+                        "localname": "BOWALGURI SOLAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOWALGURI SOLAR PWSS",
+                "localname": "BOWALGURI SOLAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218812",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOWALGURI SOLAR PWSS",
+                        "localname": "BOWALGURI SOLAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218812/ws-services-calculation/Penalty.json b/data/as/30218812/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e9fc496e94
--- /dev/null
+++ b/data/as/30218812/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218812",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218812/ws-services-calculation/WCBillingSlab.json b/data/as/30218812/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..47d3a19960
--- /dev/null
+++ b/data/as/30218812/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218812",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218889/BillingService/BusinessService.json b/data/as/30218889/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9125dcd8e4
--- /dev/null
+++ b/data/as/30218889/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218889",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218889/egov-location/boundary-data.json b/data/as/30218889/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5344532716
--- /dev/null
+++ b/data/as/30218889/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218889",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JARANI SOLAR PWSS",
+                "localname": "JARANI SOLAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218889",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JARANI SOLAR PWSS",
+                        "localname": "JARANI SOLAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JARANI SOLAR PWSS",
+                "localname": "JARANI SOLAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218889",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JARANI SOLAR PWSS",
+                        "localname": "JARANI SOLAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218889/ws-services-calculation/Penalty.json b/data/as/30218889/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cbacfa632d
--- /dev/null
+++ b/data/as/30218889/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218889",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218889/ws-services-calculation/WCBillingSlab.json b/data/as/30218889/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cf5bac05b4
--- /dev/null
+++ b/data/as/30218889/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218889",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218974/BillingService/BusinessService.json b/data/as/30218974/BillingService/BusinessService.json
new file mode 100644
index 0000000000..12af0c7338
--- /dev/null
+++ b/data/as/30218974/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30218974",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218974/egov-location/boundary-data.json b/data/as/30218974/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d55af8ad7b
--- /dev/null
+++ b/data/as/30218974/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30218974",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PRIYANAGAR PWSS (NEW)",
+                "localname": "PRIYANAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PRIYANAGAR PWSS (NEW)",
+                        "localname": "PRIYANAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PRIYANAGAR PWSS (NEW)",
+                "localname": "PRIYANAGAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30218974",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PRIYANAGAR PWSS (NEW)",
+                        "localname": "PRIYANAGAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218974/ws-services-calculation/Penalty.json b/data/as/30218974/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..5577362c28
--- /dev/null
+++ b/data/as/30218974/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30218974",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30218974/ws-services-calculation/WCBillingSlab.json b/data/as/30218974/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..216406a229
--- /dev/null
+++ b/data/as/30218974/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30218974",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219042/BillingService/BusinessService.json b/data/as/30219042/BillingService/BusinessService.json
new file mode 100644
index 0000000000..26673eae72
--- /dev/null
+++ b/data/as/30219042/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219042",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219042/egov-location/boundary-data.json b/data/as/30219042/egov-location/boundary-data.json
new file mode 100644
index 0000000000..52cbf0344d
--- /dev/null
+++ b/data/as/30219042/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219042",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI PT-III PWSS (NEW)",
+                "localname": "BHALUKDUBI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219042",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI PT-III PWSS (NEW)",
+                        "localname": "BHALUKDUBI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHALUKDUBI PT-III PWSS (NEW)",
+                "localname": "BHALUKDUBI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219042",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHALUKDUBI PT-III PWSS (NEW)",
+                        "localname": "BHALUKDUBI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219042/ws-services-calculation/Penalty.json b/data/as/30219042/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..95e06e44a2
--- /dev/null
+++ b/data/as/30219042/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219042",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219042/ws-services-calculation/WCBillingSlab.json b/data/as/30219042/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..904ea598af
--- /dev/null
+++ b/data/as/30219042/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219042",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From 7bf577509e6eca19530f58b209ab5de58cb1916d Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 10:46:42 +0530
Subject: [PATCH 08/23] added rest 66 data folder wise

---
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219068/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219089/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219100/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219362/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219371/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219382/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219434/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219447/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219463/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219482/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219492/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219505/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219515/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219532/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30219544/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30220972/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221079/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221116/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221135/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221148/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221164/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221189/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221203/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221221/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221249/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221256/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221262/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221312/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221327/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221330/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221335/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221339/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221352/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221370/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221379/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221387/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221395/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221411/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221525/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221530/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221533/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221545/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221554/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221603/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221622/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30221636/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30222577/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30222595/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30222601/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224592/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224594/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224596/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224601/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224607/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224611/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224621/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224626/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224629/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224634/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224638/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30224681/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30226845/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30231032/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30235506/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30244996/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 .../BillingService/BusinessService.json       | 145 ++++++++++++++++++
 .../30245010/egov-location/boundary-data.json |  62 ++++++++
 .../ws-services-calculation/Penalty.json      |  17 ++
 .../WCBillingSlab.json                        | 118 ++++++++++++++
 264 files changed, 22572 insertions(+)
 create mode 100644 data/as/30219068/BillingService/BusinessService.json
 create mode 100644 data/as/30219068/egov-location/boundary-data.json
 create mode 100644 data/as/30219068/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219068/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219089/BillingService/BusinessService.json
 create mode 100644 data/as/30219089/egov-location/boundary-data.json
 create mode 100644 data/as/30219089/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219089/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219100/BillingService/BusinessService.json
 create mode 100644 data/as/30219100/egov-location/boundary-data.json
 create mode 100644 data/as/30219100/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219100/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219362/BillingService/BusinessService.json
 create mode 100644 data/as/30219362/egov-location/boundary-data.json
 create mode 100644 data/as/30219362/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219362/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219371/BillingService/BusinessService.json
 create mode 100644 data/as/30219371/egov-location/boundary-data.json
 create mode 100644 data/as/30219371/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219371/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219382/BillingService/BusinessService.json
 create mode 100644 data/as/30219382/egov-location/boundary-data.json
 create mode 100644 data/as/30219382/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219382/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219434/BillingService/BusinessService.json
 create mode 100644 data/as/30219434/egov-location/boundary-data.json
 create mode 100644 data/as/30219434/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219434/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219447/BillingService/BusinessService.json
 create mode 100644 data/as/30219447/egov-location/boundary-data.json
 create mode 100644 data/as/30219447/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219447/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219463/BillingService/BusinessService.json
 create mode 100644 data/as/30219463/egov-location/boundary-data.json
 create mode 100644 data/as/30219463/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219463/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219482/BillingService/BusinessService.json
 create mode 100644 data/as/30219482/egov-location/boundary-data.json
 create mode 100644 data/as/30219482/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219482/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219492/BillingService/BusinessService.json
 create mode 100644 data/as/30219492/egov-location/boundary-data.json
 create mode 100644 data/as/30219492/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219492/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219505/BillingService/BusinessService.json
 create mode 100644 data/as/30219505/egov-location/boundary-data.json
 create mode 100644 data/as/30219505/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219505/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219515/BillingService/BusinessService.json
 create mode 100644 data/as/30219515/egov-location/boundary-data.json
 create mode 100644 data/as/30219515/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219515/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219532/BillingService/BusinessService.json
 create mode 100644 data/as/30219532/egov-location/boundary-data.json
 create mode 100644 data/as/30219532/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219532/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30219544/BillingService/BusinessService.json
 create mode 100644 data/as/30219544/egov-location/boundary-data.json
 create mode 100644 data/as/30219544/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30219544/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30220972/BillingService/BusinessService.json
 create mode 100644 data/as/30220972/egov-location/boundary-data.json
 create mode 100644 data/as/30220972/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30220972/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221079/BillingService/BusinessService.json
 create mode 100644 data/as/30221079/egov-location/boundary-data.json
 create mode 100644 data/as/30221079/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221079/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221116/BillingService/BusinessService.json
 create mode 100644 data/as/30221116/egov-location/boundary-data.json
 create mode 100644 data/as/30221116/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221116/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221135/BillingService/BusinessService.json
 create mode 100644 data/as/30221135/egov-location/boundary-data.json
 create mode 100644 data/as/30221135/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221135/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221148/BillingService/BusinessService.json
 create mode 100644 data/as/30221148/egov-location/boundary-data.json
 create mode 100644 data/as/30221148/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221148/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221164/BillingService/BusinessService.json
 create mode 100644 data/as/30221164/egov-location/boundary-data.json
 create mode 100644 data/as/30221164/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221164/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221189/BillingService/BusinessService.json
 create mode 100644 data/as/30221189/egov-location/boundary-data.json
 create mode 100644 data/as/30221189/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221189/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221203/BillingService/BusinessService.json
 create mode 100644 data/as/30221203/egov-location/boundary-data.json
 create mode 100644 data/as/30221203/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221203/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221221/BillingService/BusinessService.json
 create mode 100644 data/as/30221221/egov-location/boundary-data.json
 create mode 100644 data/as/30221221/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221221/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221249/BillingService/BusinessService.json
 create mode 100644 data/as/30221249/egov-location/boundary-data.json
 create mode 100644 data/as/30221249/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221249/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221256/BillingService/BusinessService.json
 create mode 100644 data/as/30221256/egov-location/boundary-data.json
 create mode 100644 data/as/30221256/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221256/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221262/BillingService/BusinessService.json
 create mode 100644 data/as/30221262/egov-location/boundary-data.json
 create mode 100644 data/as/30221262/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221262/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221312/BillingService/BusinessService.json
 create mode 100644 data/as/30221312/egov-location/boundary-data.json
 create mode 100644 data/as/30221312/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221312/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221327/BillingService/BusinessService.json
 create mode 100644 data/as/30221327/egov-location/boundary-data.json
 create mode 100644 data/as/30221327/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221327/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221330/BillingService/BusinessService.json
 create mode 100644 data/as/30221330/egov-location/boundary-data.json
 create mode 100644 data/as/30221330/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221330/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221335/BillingService/BusinessService.json
 create mode 100644 data/as/30221335/egov-location/boundary-data.json
 create mode 100644 data/as/30221335/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221335/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221339/BillingService/BusinessService.json
 create mode 100644 data/as/30221339/egov-location/boundary-data.json
 create mode 100644 data/as/30221339/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221339/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221352/BillingService/BusinessService.json
 create mode 100644 data/as/30221352/egov-location/boundary-data.json
 create mode 100644 data/as/30221352/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221352/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221370/BillingService/BusinessService.json
 create mode 100644 data/as/30221370/egov-location/boundary-data.json
 create mode 100644 data/as/30221370/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221370/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221379/BillingService/BusinessService.json
 create mode 100644 data/as/30221379/egov-location/boundary-data.json
 create mode 100644 data/as/30221379/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221379/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221387/BillingService/BusinessService.json
 create mode 100644 data/as/30221387/egov-location/boundary-data.json
 create mode 100644 data/as/30221387/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221387/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221395/BillingService/BusinessService.json
 create mode 100644 data/as/30221395/egov-location/boundary-data.json
 create mode 100644 data/as/30221395/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221395/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221411/BillingService/BusinessService.json
 create mode 100644 data/as/30221411/egov-location/boundary-data.json
 create mode 100644 data/as/30221411/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221411/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221525/BillingService/BusinessService.json
 create mode 100644 data/as/30221525/egov-location/boundary-data.json
 create mode 100644 data/as/30221525/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221525/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221530/BillingService/BusinessService.json
 create mode 100644 data/as/30221530/egov-location/boundary-data.json
 create mode 100644 data/as/30221530/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221530/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221533/BillingService/BusinessService.json
 create mode 100644 data/as/30221533/egov-location/boundary-data.json
 create mode 100644 data/as/30221533/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221533/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221545/BillingService/BusinessService.json
 create mode 100644 data/as/30221545/egov-location/boundary-data.json
 create mode 100644 data/as/30221545/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221545/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221554/BillingService/BusinessService.json
 create mode 100644 data/as/30221554/egov-location/boundary-data.json
 create mode 100644 data/as/30221554/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221554/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221603/BillingService/BusinessService.json
 create mode 100644 data/as/30221603/egov-location/boundary-data.json
 create mode 100644 data/as/30221603/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221603/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221622/BillingService/BusinessService.json
 create mode 100644 data/as/30221622/egov-location/boundary-data.json
 create mode 100644 data/as/30221622/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221622/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30221636/BillingService/BusinessService.json
 create mode 100644 data/as/30221636/egov-location/boundary-data.json
 create mode 100644 data/as/30221636/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30221636/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30222577/BillingService/BusinessService.json
 create mode 100644 data/as/30222577/egov-location/boundary-data.json
 create mode 100644 data/as/30222577/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30222577/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30222595/BillingService/BusinessService.json
 create mode 100644 data/as/30222595/egov-location/boundary-data.json
 create mode 100644 data/as/30222595/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30222595/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30222601/BillingService/BusinessService.json
 create mode 100644 data/as/30222601/egov-location/boundary-data.json
 create mode 100644 data/as/30222601/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30222601/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224592/BillingService/BusinessService.json
 create mode 100644 data/as/30224592/egov-location/boundary-data.json
 create mode 100644 data/as/30224592/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224592/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224594/BillingService/BusinessService.json
 create mode 100644 data/as/30224594/egov-location/boundary-data.json
 create mode 100644 data/as/30224594/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224594/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224596/BillingService/BusinessService.json
 create mode 100644 data/as/30224596/egov-location/boundary-data.json
 create mode 100644 data/as/30224596/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224596/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224601/BillingService/BusinessService.json
 create mode 100644 data/as/30224601/egov-location/boundary-data.json
 create mode 100644 data/as/30224601/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224601/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224607/BillingService/BusinessService.json
 create mode 100644 data/as/30224607/egov-location/boundary-data.json
 create mode 100644 data/as/30224607/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224607/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224611/BillingService/BusinessService.json
 create mode 100644 data/as/30224611/egov-location/boundary-data.json
 create mode 100644 data/as/30224611/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224611/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224621/BillingService/BusinessService.json
 create mode 100644 data/as/30224621/egov-location/boundary-data.json
 create mode 100644 data/as/30224621/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224621/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224626/BillingService/BusinessService.json
 create mode 100644 data/as/30224626/egov-location/boundary-data.json
 create mode 100644 data/as/30224626/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224626/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224629/BillingService/BusinessService.json
 create mode 100644 data/as/30224629/egov-location/boundary-data.json
 create mode 100644 data/as/30224629/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224629/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224634/BillingService/BusinessService.json
 create mode 100644 data/as/30224634/egov-location/boundary-data.json
 create mode 100644 data/as/30224634/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224634/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224638/BillingService/BusinessService.json
 create mode 100644 data/as/30224638/egov-location/boundary-data.json
 create mode 100644 data/as/30224638/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224638/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30224681/BillingService/BusinessService.json
 create mode 100644 data/as/30224681/egov-location/boundary-data.json
 create mode 100644 data/as/30224681/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30224681/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30226845/BillingService/BusinessService.json
 create mode 100644 data/as/30226845/egov-location/boundary-data.json
 create mode 100644 data/as/30226845/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30226845/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30231032/BillingService/BusinessService.json
 create mode 100644 data/as/30231032/egov-location/boundary-data.json
 create mode 100644 data/as/30231032/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30231032/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30235506/BillingService/BusinessService.json
 create mode 100644 data/as/30235506/egov-location/boundary-data.json
 create mode 100644 data/as/30235506/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30235506/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30244996/BillingService/BusinessService.json
 create mode 100644 data/as/30244996/egov-location/boundary-data.json
 create mode 100644 data/as/30244996/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30244996/ws-services-calculation/WCBillingSlab.json
 create mode 100644 data/as/30245010/BillingService/BusinessService.json
 create mode 100644 data/as/30245010/egov-location/boundary-data.json
 create mode 100644 data/as/30245010/ws-services-calculation/Penalty.json
 create mode 100644 data/as/30245010/ws-services-calculation/WCBillingSlab.json

diff --git a/data/as/30219068/BillingService/BusinessService.json b/data/as/30219068/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9e8ee2ad3a
--- /dev/null
+++ b/data/as/30219068/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219068",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219068/egov-location/boundary-data.json b/data/as/30219068/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e6c7d3b1dd
--- /dev/null
+++ b/data/as/30219068/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219068",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOROMARI PWSS (NEW)",
+                "localname": "GOROMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOROMARI PWSS (NEW)",
+                        "localname": "GOROMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GOROMARI PWSS (NEW)",
+                "localname": "GOROMARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219068",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GOROMARI PWSS (NEW)",
+                        "localname": "GOROMARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219068/ws-services-calculation/Penalty.json b/data/as/30219068/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0b035f7f3f
--- /dev/null
+++ b/data/as/30219068/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219068",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219068/ws-services-calculation/WCBillingSlab.json b/data/as/30219068/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f2b315ddff
--- /dev/null
+++ b/data/as/30219068/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219068",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219089/BillingService/BusinessService.json b/data/as/30219089/BillingService/BusinessService.json
new file mode 100644
index 0000000000..aa6434b9f2
--- /dev/null
+++ b/data/as/30219089/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219089",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219089/egov-location/boundary-data.json b/data/as/30219089/egov-location/boundary-data.json
new file mode 100644
index 0000000000..18ec891e53
--- /dev/null
+++ b/data/as/30219089/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219089",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAICHAR PWSS",
+                "localname": "KALAICHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219089",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAICHAR PWSS",
+                        "localname": "KALAICHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALAICHAR PWSS",
+                "localname": "KALAICHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219089",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALAICHAR PWSS",
+                        "localname": "KALAICHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219089/ws-services-calculation/Penalty.json b/data/as/30219089/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a1413862e2
--- /dev/null
+++ b/data/as/30219089/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219089",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219089/ws-services-calculation/WCBillingSlab.json b/data/as/30219089/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0f341e15cf
--- /dev/null
+++ b/data/as/30219089/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219089",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219100/BillingService/BusinessService.json b/data/as/30219100/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d375ce2933
--- /dev/null
+++ b/data/as/30219100/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219100",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219100/egov-location/boundary-data.json b/data/as/30219100/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1f1f0b4279
--- /dev/null
+++ b/data/as/30219100/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219100",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWARVITA PWSS (NEW)",
+                "localname": "ROWARVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219100",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWARVITA PWSS (NEW)",
+                        "localname": "ROWARVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ROWARVITA PWSS (NEW)",
+                "localname": "ROWARVITA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219100",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ROWARVITA PWSS (NEW)",
+                        "localname": "ROWARVITA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219100/ws-services-calculation/Penalty.json b/data/as/30219100/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd9c34c053
--- /dev/null
+++ b/data/as/30219100/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219100",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219100/ws-services-calculation/WCBillingSlab.json b/data/as/30219100/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c6e09e1192
--- /dev/null
+++ b/data/as/30219100/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219100",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219362/BillingService/BusinessService.json b/data/as/30219362/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f9c880871a
--- /dev/null
+++ b/data/as/30219362/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219362",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219362/egov-location/boundary-data.json b/data/as/30219362/egov-location/boundary-data.json
new file mode 100644
index 0000000000..26c6ce3329
--- /dev/null
+++ b/data/as/30219362/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219362",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                "localname": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219362",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                        "localname": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                "localname": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219362",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                        "localname": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219362/ws-services-calculation/Penalty.json b/data/as/30219362/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..cd24177782
--- /dev/null
+++ b/data/as/30219362/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219362",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219362/ws-services-calculation/WCBillingSlab.json b/data/as/30219362/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..927c508b9b
--- /dev/null
+++ b/data/as/30219362/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219362",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219371/BillingService/BusinessService.json b/data/as/30219371/BillingService/BusinessService.json
new file mode 100644
index 0000000000..93ce64475c
--- /dev/null
+++ b/data/as/30219371/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219371",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219371/egov-location/boundary-data.json b/data/as/30219371/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8b786eb8c5
--- /dev/null
+++ b/data/as/30219371/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219371",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PUB PWSS (NEW)",
+                "localname": "KALYANPUR PUB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219371",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PUB PWSS (NEW)",
+                        "localname": "KALYANPUR PUB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALYANPUR PUB PWSS (NEW)",
+                "localname": "KALYANPUR PUB PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219371",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALYANPUR PUB PWSS (NEW)",
+                        "localname": "KALYANPUR PUB PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219371/ws-services-calculation/Penalty.json b/data/as/30219371/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1942b24898
--- /dev/null
+++ b/data/as/30219371/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219371",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219371/ws-services-calculation/WCBillingSlab.json b/data/as/30219371/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..8ef77f2972
--- /dev/null
+++ b/data/as/30219371/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219371",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219382/BillingService/BusinessService.json b/data/as/30219382/BillingService/BusinessService.json
new file mode 100644
index 0000000000..056eb44b1d
--- /dev/null
+++ b/data/as/30219382/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219382",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219382/egov-location/boundary-data.json b/data/as/30219382/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fff6035485
--- /dev/null
+++ b/data/as/30219382/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219382",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODALKATI PWSS (NEW)",
+                "localname": "KODALKATI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODALKATI PWSS (NEW)",
+                        "localname": "KODALKATI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KODALKATI PWSS (NEW)",
+                "localname": "KODALKATI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219382",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KODALKATI PWSS (NEW)",
+                        "localname": "KODALKATI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219382/ws-services-calculation/Penalty.json b/data/as/30219382/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..527729870f
--- /dev/null
+++ b/data/as/30219382/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219382",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219382/ws-services-calculation/WCBillingSlab.json b/data/as/30219382/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b55bc775f5
--- /dev/null
+++ b/data/as/30219382/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219382",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219434/BillingService/BusinessService.json b/data/as/30219434/BillingService/BusinessService.json
new file mode 100644
index 0000000000..795bf293c2
--- /dev/null
+++ b/data/as/30219434/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219434",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219434/egov-location/boundary-data.json b/data/as/30219434/egov-location/boundary-data.json
new file mode 100644
index 0000000000..48666cff60
--- /dev/null
+++ b/data/as/30219434/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219434",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LATIMA PWSS (NEW)",
+                "localname": "LATIMA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LATIMA PWSS (NEW)",
+                        "localname": "LATIMA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LATIMA PWSS (NEW)",
+                "localname": "LATIMA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219434",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LATIMA PWSS (NEW)",
+                        "localname": "LATIMA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219434/ws-services-calculation/Penalty.json b/data/as/30219434/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7ff16cc87b
--- /dev/null
+++ b/data/as/30219434/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219434",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219434/ws-services-calculation/WCBillingSlab.json b/data/as/30219434/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..293e1bf09e
--- /dev/null
+++ b/data/as/30219434/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219434",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219447/BillingService/BusinessService.json b/data/as/30219447/BillingService/BusinessService.json
new file mode 100644
index 0000000000..d73a6a94ef
--- /dev/null
+++ b/data/as/30219447/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219447",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219447/egov-location/boundary-data.json b/data/as/30219447/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0444442c3a
--- /dev/null
+++ b/data/as/30219447/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219447",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MURALIJHAR-1 PWSS (NEW)",
+                "localname": "MURALIJHAR-1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219447",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MURALIJHAR-1 PWSS (NEW)",
+                        "localname": "MURALIJHAR-1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MURALIJHAR-1 PWSS (NEW)",
+                "localname": "MURALIJHAR-1 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219447",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MURALIJHAR-1 PWSS (NEW)",
+                        "localname": "MURALIJHAR-1 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219447/ws-services-calculation/Penalty.json b/data/as/30219447/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..876e5d54a7
--- /dev/null
+++ b/data/as/30219447/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219447",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219447/ws-services-calculation/WCBillingSlab.json b/data/as/30219447/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..459a6bda31
--- /dev/null
+++ b/data/as/30219447/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219447",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219463/BillingService/BusinessService.json b/data/as/30219463/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0fe3c442a7
--- /dev/null
+++ b/data/as/30219463/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219463",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219463/egov-location/boundary-data.json b/data/as/30219463/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e858e88362
--- /dev/null
+++ b/data/as/30219463/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219463",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUJA CHAR PARA PWSS (NEW)",
+                "localname": "KHARMUJA CHAR PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219463",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUJA CHAR PARA PWSS (NEW)",
+                        "localname": "KHARMUJA CHAR PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KHARMUJA CHAR PARA PWSS (NEW)",
+                "localname": "KHARMUJA CHAR PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219463",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KHARMUJA CHAR PARA PWSS (NEW)",
+                        "localname": "KHARMUJA CHAR PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219463/ws-services-calculation/Penalty.json b/data/as/30219463/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dcc5c2d30a
--- /dev/null
+++ b/data/as/30219463/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219463",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219463/ws-services-calculation/WCBillingSlab.json b/data/as/30219463/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4a7b7397df
--- /dev/null
+++ b/data/as/30219463/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219463",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219482/BillingService/BusinessService.json b/data/as/30219482/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5ff53c3c13
--- /dev/null
+++ b/data/as/30219482/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219482",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219482/egov-location/boundary-data.json b/data/as/30219482/egov-location/boundary-data.json
new file mode 100644
index 0000000000..736a222213
--- /dev/null
+++ b/data/as/30219482/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219482",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                "localname": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                        "localname": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                "localname": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219482",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                        "localname": "BATABARI KONGKAIRPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219482/ws-services-calculation/Penalty.json b/data/as/30219482/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..9a60b8c60a
--- /dev/null
+++ b/data/as/30219482/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219482",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219482/ws-services-calculation/WCBillingSlab.json b/data/as/30219482/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..dbf14d94ab
--- /dev/null
+++ b/data/as/30219482/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219482",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219492/BillingService/BusinessService.json b/data/as/30219492/BillingService/BusinessService.json
new file mode 100644
index 0000000000..147dfb14e7
--- /dev/null
+++ b/data/as/30219492/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219492",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219492/egov-location/boundary-data.json b/data/as/30219492/egov-location/boundary-data.json
new file mode 100644
index 0000000000..69f85d9a03
--- /dev/null
+++ b/data/as/30219492/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219492",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDAGURI PWSS (NEW)",
+                "localname": "GENDAGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDAGURI PWSS (NEW)",
+                        "localname": "GENDAGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GENDAGURI PWSS (NEW)",
+                "localname": "GENDAGURI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219492",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GENDAGURI PWSS (NEW)",
+                        "localname": "GENDAGURI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219492/ws-services-calculation/Penalty.json b/data/as/30219492/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dbcbe5b575
--- /dev/null
+++ b/data/as/30219492/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219492",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219492/ws-services-calculation/WCBillingSlab.json b/data/as/30219492/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..15986db4ca
--- /dev/null
+++ b/data/as/30219492/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219492",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219505/BillingService/BusinessService.json b/data/as/30219505/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b324204173
--- /dev/null
+++ b/data/as/30219505/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219505",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219505/egov-location/boundary-data.json b/data/as/30219505/egov-location/boundary-data.json
new file mode 100644
index 0000000000..fe972e2dd1
--- /dev/null
+++ b/data/as/30219505/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219505",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                "localname": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219505",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                        "localname": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                "localname": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219505",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                        "localname": "BHOGDABLI RAVAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219505/ws-services-calculation/Penalty.json b/data/as/30219505/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1a8f10362a
--- /dev/null
+++ b/data/as/30219505/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219505",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219505/ws-services-calculation/WCBillingSlab.json b/data/as/30219505/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..574a5c5438
--- /dev/null
+++ b/data/as/30219505/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219505",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219515/BillingService/BusinessService.json b/data/as/30219515/BillingService/BusinessService.json
new file mode 100644
index 0000000000..090c36aaab
--- /dev/null
+++ b/data/as/30219515/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219515",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219515/egov-location/boundary-data.json b/data/as/30219515/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a999ba316b
--- /dev/null
+++ b/data/as/30219515/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219515",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENIMARI PT-III PWSS (NEW)",
+                "localname": "SENIMARI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENIMARI PT-III PWSS (NEW)",
+                        "localname": "SENIMARI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SENIMARI PT-III PWSS (NEW)",
+                "localname": "SENIMARI PT-III PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219515",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SENIMARI PT-III PWSS (NEW)",
+                        "localname": "SENIMARI PT-III PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219515/ws-services-calculation/Penalty.json b/data/as/30219515/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..afe9060fc1
--- /dev/null
+++ b/data/as/30219515/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219515",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219515/ws-services-calculation/WCBillingSlab.json b/data/as/30219515/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a1c983d64a
--- /dev/null
+++ b/data/as/30219515/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219515",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219532/BillingService/BusinessService.json b/data/as/30219532/BillingService/BusinessService.json
new file mode 100644
index 0000000000..fac694a50d
--- /dev/null
+++ b/data/as/30219532/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219532",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219532/egov-location/boundary-data.json b/data/as/30219532/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e475d61464
--- /dev/null
+++ b/data/as/30219532/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219532",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKUDHOWA PWSS (NEW)",
+                "localname": "SAKUDHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219532",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKUDHOWA PWSS (NEW)",
+                        "localname": "SAKUDHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SAKUDHOWA PWSS (NEW)",
+                "localname": "SAKUDHOWA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219532",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SAKUDHOWA PWSS (NEW)",
+                        "localname": "SAKUDHOWA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219532/ws-services-calculation/Penalty.json b/data/as/30219532/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..af5e78f3bb
--- /dev/null
+++ b/data/as/30219532/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219532",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219532/ws-services-calculation/WCBillingSlab.json b/data/as/30219532/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ca890ec81
--- /dev/null
+++ b/data/as/30219532/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219532",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219544/BillingService/BusinessService.json b/data/as/30219544/BillingService/BusinessService.json
new file mode 100644
index 0000000000..bc12c8b417
--- /dev/null
+++ b/data/as/30219544/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30219544",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219544/egov-location/boundary-data.json b/data/as/30219544/egov-location/boundary-data.json
new file mode 100644
index 0000000000..1dd7af8aef
--- /dev/null
+++ b/data/as/30219544/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30219544",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDARBORI PWSS (NEW)",
+                "localname": "CHANDARBORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219544",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDARBORI PWSS (NEW)",
+                        "localname": "CHANDARBORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHANDARBORI PWSS (NEW)",
+                "localname": "CHANDARBORI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30219544",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHANDARBORI PWSS (NEW)",
+                        "localname": "CHANDARBORI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219544/ws-services-calculation/Penalty.json b/data/as/30219544/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ef4eca005e
--- /dev/null
+++ b/data/as/30219544/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30219544",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30219544/ws-services-calculation/WCBillingSlab.json b/data/as/30219544/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4accffa858
--- /dev/null
+++ b/data/as/30219544/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30219544",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30220972/BillingService/BusinessService.json b/data/as/30220972/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac07ab9390
--- /dev/null
+++ b/data/as/30220972/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30220972",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30220972/egov-location/boundary-data.json b/data/as/30220972/egov-location/boundary-data.json
new file mode 100644
index 0000000000..e38c3487eb
--- /dev/null
+++ b/data/as/30220972/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30220972",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER KARKACHI PWSS (NEW)",
+                "localname": "UPPER KARKACHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30220972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER KARKACHI PWSS (NEW)",
+                        "localname": "UPPER KARKACHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "UPPER KARKACHI PWSS (NEW)",
+                "localname": "UPPER KARKACHI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30220972",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "UPPER KARKACHI PWSS (NEW)",
+                        "localname": "UPPER KARKACHI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30220972/ws-services-calculation/Penalty.json b/data/as/30220972/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..54c408d63c
--- /dev/null
+++ b/data/as/30220972/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30220972",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30220972/ws-services-calculation/WCBillingSlab.json b/data/as/30220972/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..11273e1a62
--- /dev/null
+++ b/data/as/30220972/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30220972",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221079/BillingService/BusinessService.json b/data/as/30221079/BillingService/BusinessService.json
new file mode 100644
index 0000000000..155f5ce1d9
--- /dev/null
+++ b/data/as/30221079/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221079",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221079/egov-location/boundary-data.json b/data/as/30221079/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8233287e17
--- /dev/null
+++ b/data/as/30221079/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221079",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                "localname": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221079",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                        "localname": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                "localname": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221079",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                        "localname": "KALPANI PT-I PWSS (DHAIGAON) (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221079/ws-services-calculation/Penalty.json b/data/as/30221079/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..c1e2f1efa9
--- /dev/null
+++ b/data/as/30221079/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221079",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221079/ws-services-calculation/WCBillingSlab.json b/data/as/30221079/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c4059d8b6f
--- /dev/null
+++ b/data/as/30221079/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221079",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221116/BillingService/BusinessService.json b/data/as/30221116/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3ec208d48f
--- /dev/null
+++ b/data/as/30221116/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221116",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221116/egov-location/boundary-data.json b/data/as/30221116/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a6ec60d4b2
--- /dev/null
+++ b/data/as/30221116/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221116",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO PAS PARA PWSS (NEW)",
+                "localname": "BORO PAS PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO PAS PARA PWSS (NEW)",
+                        "localname": "BORO PAS PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORO PAS PARA PWSS (NEW)",
+                "localname": "BORO PAS PARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221116",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORO PAS PARA PWSS (NEW)",
+                        "localname": "BORO PAS PARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221116/ws-services-calculation/Penalty.json b/data/as/30221116/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f2968a218
--- /dev/null
+++ b/data/as/30221116/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221116",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221116/ws-services-calculation/WCBillingSlab.json b/data/as/30221116/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e6183170cb
--- /dev/null
+++ b/data/as/30221116/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221116",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221135/BillingService/BusinessService.json b/data/as/30221135/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c507846d2a
--- /dev/null
+++ b/data/as/30221135/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221135",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221135/egov-location/boundary-data.json b/data/as/30221135/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5e703ff074
--- /dev/null
+++ b/data/as/30221135/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221135",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLLA NO. 2 PWSS (NEW)",
+                "localname": "BOLLA NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLLA NO. 2 PWSS (NEW)",
+                        "localname": "BOLLA NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BOLLA NO. 2 PWSS (NEW)",
+                "localname": "BOLLA NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221135",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BOLLA NO. 2 PWSS (NEW)",
+                        "localname": "BOLLA NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221135/ws-services-calculation/Penalty.json b/data/as/30221135/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d48fab6825
--- /dev/null
+++ b/data/as/30221135/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221135",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221135/ws-services-calculation/WCBillingSlab.json b/data/as/30221135/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bd39e547c9
--- /dev/null
+++ b/data/as/30221135/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221135",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221148/BillingService/BusinessService.json b/data/as/30221148/BillingService/BusinessService.json
new file mode 100644
index 0000000000..96e095e945
--- /dev/null
+++ b/data/as/30221148/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221148",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221148/egov-location/boundary-data.json b/data/as/30221148/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ff0a51af2f
--- /dev/null
+++ b/data/as/30221148/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221148",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAGUANG PWSS (NEW)",
+                "localname": "JAGUANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAGUANG PWSS (NEW)",
+                        "localname": "JAGUANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JAGUANG PWSS (NEW)",
+                "localname": "JAGUANG PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221148",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JAGUANG PWSS (NEW)",
+                        "localname": "JAGUANG PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221148/ws-services-calculation/Penalty.json b/data/as/30221148/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..e96eae7c80
--- /dev/null
+++ b/data/as/30221148/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221148",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221148/ws-services-calculation/WCBillingSlab.json b/data/as/30221148/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2d1add7f17
--- /dev/null
+++ b/data/as/30221148/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221148",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221164/BillingService/BusinessService.json b/data/as/30221164/BillingService/BusinessService.json
new file mode 100644
index 0000000000..a7c56b3039
--- /dev/null
+++ b/data/as/30221164/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221164",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221164/egov-location/boundary-data.json b/data/as/30221164/egov-location/boundary-data.json
new file mode 100644
index 0000000000..834d41cbcb
--- /dev/null
+++ b/data/as/30221164/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221164",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAIMARAI PWSS",
+                "localname": "KAIMARAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221164",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAIMARAI PWSS",
+                        "localname": "KAIMARAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KAIMARAI PWSS",
+                "localname": "KAIMARAI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221164",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KAIMARAI PWSS",
+                        "localname": "KAIMARAI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221164/ws-services-calculation/Penalty.json b/data/as/30221164/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2468cb72dd
--- /dev/null
+++ b/data/as/30221164/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221164",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221164/ws-services-calculation/WCBillingSlab.json b/data/as/30221164/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b1783bfa9f
--- /dev/null
+++ b/data/as/30221164/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221164",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221189/BillingService/BusinessService.json b/data/as/30221189/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cbc0816a20
--- /dev/null
+++ b/data/as/30221189/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221189",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221189/egov-location/boundary-data.json b/data/as/30221189/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6af087b5c3
--- /dev/null
+++ b/data/as/30221189/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221189",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOISKHULI KHAMAR PWSS (NEW)",
+                "localname": "MOISKHULI KHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOISKHULI KHAMAR PWSS (NEW)",
+                        "localname": "MOISKHULI KHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "MOISKHULI KHAMAR PWSS (NEW)",
+                "localname": "MOISKHULI KHAMAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221189",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "MOISKHULI KHAMAR PWSS (NEW)",
+                        "localname": "MOISKHULI KHAMAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221189/ws-services-calculation/Penalty.json b/data/as/30221189/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bcf979803d
--- /dev/null
+++ b/data/as/30221189/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221189",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221189/ws-services-calculation/WCBillingSlab.json b/data/as/30221189/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7cbf9f25e7
--- /dev/null
+++ b/data/as/30221189/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221189",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221203/BillingService/BusinessService.json b/data/as/30221203/BillingService/BusinessService.json
new file mode 100644
index 0000000000..f65133a00d
--- /dev/null
+++ b/data/as/30221203/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221203",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221203/egov-location/boundary-data.json b/data/as/30221203/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a18e2d27cf
--- /dev/null
+++ b/data/as/30221203/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221203",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                "localname": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                        "localname": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                "localname": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221203",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                        "localname": "THEKASHU PT-II  NO.4 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221203/ws-services-calculation/Penalty.json b/data/as/30221203/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7a1f2c6325
--- /dev/null
+++ b/data/as/30221203/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221203",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221203/ws-services-calculation/WCBillingSlab.json b/data/as/30221203/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..cc14ebcfa4
--- /dev/null
+++ b/data/as/30221203/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221203",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221221/BillingService/BusinessService.json b/data/as/30221221/BillingService/BusinessService.json
new file mode 100644
index 0000000000..08e4dff08f
--- /dev/null
+++ b/data/as/30221221/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221221",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221221/egov-location/boundary-data.json b/data/as/30221221/egov-location/boundary-data.json
new file mode 100644
index 0000000000..599f950920
--- /dev/null
+++ b/data/as/30221221/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221221",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASU PT-III NO.3 PWSS (NEW)",
+                "localname": "THEKASU PT-III NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221221",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASU PT-III NO.3 PWSS (NEW)",
+                        "localname": "THEKASU PT-III NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "THEKASU PT-III NO.3 PWSS (NEW)",
+                "localname": "THEKASU PT-III NO.3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221221",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "THEKASU PT-III NO.3 PWSS (NEW)",
+                        "localname": "THEKASU PT-III NO.3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221221/ws-services-calculation/Penalty.json b/data/as/30221221/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..756e348be1
--- /dev/null
+++ b/data/as/30221221/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221221",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221221/ws-services-calculation/WCBillingSlab.json b/data/as/30221221/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9fc8eaa299
--- /dev/null
+++ b/data/as/30221221/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221221",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221249/BillingService/BusinessService.json b/data/as/30221249/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b3c46140ba
--- /dev/null
+++ b/data/as/30221249/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221249",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221249/egov-location/boundary-data.json b/data/as/30221249/egov-location/boundary-data.json
new file mode 100644
index 0000000000..b36d287f34
--- /dev/null
+++ b/data/as/30221249/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221249",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOMONI PWSS (NEW)",
+                "localname": "DOMONI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOMONI PWSS (NEW)",
+                        "localname": "DOMONI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DOMONI PWSS (NEW)",
+                "localname": "DOMONI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221249",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DOMONI PWSS (NEW)",
+                        "localname": "DOMONI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221249/ws-services-calculation/Penalty.json b/data/as/30221249/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7eebf37746
--- /dev/null
+++ b/data/as/30221249/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221249",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221249/ws-services-calculation/WCBillingSlab.json b/data/as/30221249/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..77412f0071
--- /dev/null
+++ b/data/as/30221249/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221249",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221256/BillingService/BusinessService.json b/data/as/30221256/BillingService/BusinessService.json
new file mode 100644
index 0000000000..05eb2d0106
--- /dev/null
+++ b/data/as/30221256/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221256",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221256/egov-location/boundary-data.json b/data/as/30221256/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d99ba726ad
--- /dev/null
+++ b/data/as/30221256/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221256",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAULPARA PWSS (NEW)",
+                "localname": "PAULPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAULPARA PWSS (NEW)",
+                        "localname": "PAULPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PAULPARA PWSS (NEW)",
+                "localname": "PAULPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221256",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PAULPARA PWSS (NEW)",
+                        "localname": "PAULPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221256/ws-services-calculation/Penalty.json b/data/as/30221256/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ffebc41816
--- /dev/null
+++ b/data/as/30221256/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221256",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221256/ws-services-calculation/WCBillingSlab.json b/data/as/30221256/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..22ad61d634
--- /dev/null
+++ b/data/as/30221256/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221256",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221262/BillingService/BusinessService.json b/data/as/30221262/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3fff368185
--- /dev/null
+++ b/data/as/30221262/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221262",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221262/egov-location/boundary-data.json b/data/as/30221262/egov-location/boundary-data.json
new file mode 100644
index 0000000000..8e599502d2
--- /dev/null
+++ b/data/as/30221262/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221262",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEKORPARA PWSS (NEW)",
+                "localname": "TEKORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221262",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEKORPARA PWSS (NEW)",
+                        "localname": "TEKORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "TEKORPARA PWSS (NEW)",
+                "localname": "TEKORPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221262",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "TEKORPARA PWSS (NEW)",
+                        "localname": "TEKORPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221262/ws-services-calculation/Penalty.json b/data/as/30221262/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..598a8f1df8
--- /dev/null
+++ b/data/as/30221262/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221262",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221262/ws-services-calculation/WCBillingSlab.json b/data/as/30221262/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9ea5cfb06a
--- /dev/null
+++ b/data/as/30221262/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221262",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221312/BillingService/BusinessService.json b/data/as/30221312/BillingService/BusinessService.json
new file mode 100644
index 0000000000..73b0557653
--- /dev/null
+++ b/data/as/30221312/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221312",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221312/egov-location/boundary-data.json b/data/as/30221312/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4ae5923607
--- /dev/null
+++ b/data/as/30221312/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221312",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALGURIPARA PWSS (NEW)",
+                "localname": "BALGURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALGURIPARA PWSS (NEW)",
+                        "localname": "BALGURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BALGURIPARA PWSS (NEW)",
+                "localname": "BALGURIPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221312",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BALGURIPARA PWSS (NEW)",
+                        "localname": "BALGURIPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221312/ws-services-calculation/Penalty.json b/data/as/30221312/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..68ca41fcdb
--- /dev/null
+++ b/data/as/30221312/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221312",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221312/ws-services-calculation/WCBillingSlab.json b/data/as/30221312/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0c59fb5500
--- /dev/null
+++ b/data/as/30221312/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221312",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221327/BillingService/BusinessService.json b/data/as/30221327/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ae1b77824f
--- /dev/null
+++ b/data/as/30221327/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221327",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221327/egov-location/boundary-data.json b/data/as/30221327/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f4ca75c0a9
--- /dev/null
+++ b/data/as/30221327/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221327",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUNBASTI PWSS (NEW)",
+                "localname": "NATUNBASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221327",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUNBASTI PWSS (NEW)",
+                        "localname": "NATUNBASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUNBASTI PWSS (NEW)",
+                "localname": "NATUNBASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221327",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUNBASTI PWSS (NEW)",
+                        "localname": "NATUNBASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221327/ws-services-calculation/Penalty.json b/data/as/30221327/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7f29e87449
--- /dev/null
+++ b/data/as/30221327/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221327",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221327/ws-services-calculation/WCBillingSlab.json b/data/as/30221327/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ff17956f52
--- /dev/null
+++ b/data/as/30221327/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221327",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221330/BillingService/BusinessService.json b/data/as/30221330/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ad301a3f21
--- /dev/null
+++ b/data/as/30221330/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221330",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221330/egov-location/boundary-data.json b/data/as/30221330/egov-location/boundary-data.json
new file mode 100644
index 0000000000..354c1f4fec
--- /dev/null
+++ b/data/as/30221330/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221330",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                "localname": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                        "localname": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                "localname": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221330",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                        "localname": "DAKAIDOL NEW BASTI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221330/ws-services-calculation/Penalty.json b/data/as/30221330/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..27c31e2102
--- /dev/null
+++ b/data/as/30221330/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221330",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221330/ws-services-calculation/WCBillingSlab.json b/data/as/30221330/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..031f09e34b
--- /dev/null
+++ b/data/as/30221330/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221330",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221335/BillingService/BusinessService.json b/data/as/30221335/BillingService/BusinessService.json
new file mode 100644
index 0000000000..890a824c52
--- /dev/null
+++ b/data/as/30221335/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221335",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221335/egov-location/boundary-data.json b/data/as/30221335/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c2ac9f49c7
--- /dev/null
+++ b/data/as/30221335/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221335",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALUCAMP PWSS (NEW)",
+                "localname": "DALUCAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221335",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALUCAMP PWSS (NEW)",
+                        "localname": "DALUCAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DALUCAMP PWSS (NEW)",
+                "localname": "DALUCAMP PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221335",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DALUCAMP PWSS (NEW)",
+                        "localname": "DALUCAMP PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221335/ws-services-calculation/Penalty.json b/data/as/30221335/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..315dfdd391
--- /dev/null
+++ b/data/as/30221335/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221335",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221335/ws-services-calculation/WCBillingSlab.json b/data/as/30221335/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9087f5d5c6
--- /dev/null
+++ b/data/as/30221335/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221335",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221339/BillingService/BusinessService.json b/data/as/30221339/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c9b5731612
--- /dev/null
+++ b/data/as/30221339/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221339",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221339/egov-location/boundary-data.json b/data/as/30221339/egov-location/boundary-data.json
new file mode 100644
index 0000000000..419db8f64b
--- /dev/null
+++ b/data/as/30221339/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221339",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                "localname": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221339",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                        "localname": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                "localname": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221339",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                        "localname": "BAHATI RIVER BLOCK PT-I NO.2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221339/ws-services-calculation/Penalty.json b/data/as/30221339/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aab6af2dff
--- /dev/null
+++ b/data/as/30221339/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221339",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221339/ws-services-calculation/WCBillingSlab.json b/data/as/30221339/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..de4c5c2ad6
--- /dev/null
+++ b/data/as/30221339/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221339",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221352/BillingService/BusinessService.json b/data/as/30221352/BillingService/BusinessService.json
new file mode 100644
index 0000000000..776c314716
--- /dev/null
+++ b/data/as/30221352/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221352",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221352/egov-location/boundary-data.json b/data/as/30221352/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0fc33be020
--- /dev/null
+++ b/data/as/30221352/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221352",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR NO 3 PWSS (NEW)",
+                "localname": "BAHATI CHAR NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR NO 3 PWSS (NEW)",
+                        "localname": "BAHATI CHAR NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR NO 3 PWSS (NEW)",
+                "localname": "BAHATI CHAR NO 3 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221352",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR NO 3 PWSS (NEW)",
+                        "localname": "BAHATI CHAR NO 3 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221352/ws-services-calculation/Penalty.json b/data/as/30221352/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..91012ffd99
--- /dev/null
+++ b/data/as/30221352/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221352",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221352/ws-services-calculation/WCBillingSlab.json b/data/as/30221352/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9b6500d9df
--- /dev/null
+++ b/data/as/30221352/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221352",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221370/BillingService/BusinessService.json b/data/as/30221370/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7b552c20a2
--- /dev/null
+++ b/data/as/30221370/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221370",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221370/egov-location/boundary-data.json b/data/as/30221370/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7bf5143f44
--- /dev/null
+++ b/data/as/30221370/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221370",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRAMARI NC PWSS",
+                "localname": "SINGRAMARI NC PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221370",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRAMARI NC PWSS",
+                        "localname": "SINGRAMARI NC PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "SINGRAMARI NC PWSS",
+                "localname": "SINGRAMARI NC PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221370",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "SINGRAMARI NC PWSS",
+                        "localname": "SINGRAMARI NC PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221370/ws-services-calculation/Penalty.json b/data/as/30221370/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..11db1ef4df
--- /dev/null
+++ b/data/as/30221370/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221370",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221370/ws-services-calculation/WCBillingSlab.json b/data/as/30221370/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d301355aae
--- /dev/null
+++ b/data/as/30221370/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221370",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221379/BillingService/BusinessService.json b/data/as/30221379/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9f233d15a3
--- /dev/null
+++ b/data/as/30221379/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221379",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221379/egov-location/boundary-data.json b/data/as/30221379/egov-location/boundary-data.json
new file mode 100644
index 0000000000..cd0c5bbaa5
--- /dev/null
+++ b/data/as/30221379/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221379",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                "localname": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                        "localname": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                "localname": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221379",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                        "localname": "BAHATI CHAR PT-II RIVER BLOCK PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221379/ws-services-calculation/Penalty.json b/data/as/30221379/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dec65132c8
--- /dev/null
+++ b/data/as/30221379/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221379",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221379/ws-services-calculation/WCBillingSlab.json b/data/as/30221379/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3021a75b18
--- /dev/null
+++ b/data/as/30221379/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221379",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221387/BillingService/BusinessService.json b/data/as/30221387/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e16ce987d
--- /dev/null
+++ b/data/as/30221387/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221387",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221387/egov-location/boundary-data.json b/data/as/30221387/egov-location/boundary-data.json
new file mode 100644
index 0000000000..ace1059deb
--- /dev/null
+++ b/data/as/30221387/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221387",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARBARI NO. 2 PWSS (NEW)",
+                "localname": "BARBARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARBARI NO. 2 PWSS (NEW)",
+                        "localname": "BARBARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BARBARI NO. 2 PWSS (NEW)",
+                "localname": "BARBARI NO. 2 PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221387",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BARBARI NO. 2 PWSS (NEW)",
+                        "localname": "BARBARI NO. 2 PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221387/ws-services-calculation/Penalty.json b/data/as/30221387/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..65349380ec
--- /dev/null
+++ b/data/as/30221387/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221387",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221387/ws-services-calculation/WCBillingSlab.json b/data/as/30221387/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..b195946bf9
--- /dev/null
+++ b/data/as/30221387/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221387",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221395/BillingService/BusinessService.json b/data/as/30221395/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e54aa25b4d
--- /dev/null
+++ b/data/as/30221395/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221395",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221395/egov-location/boundary-data.json b/data/as/30221395/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7f5d3ffff4
--- /dev/null
+++ b/data/as/30221395/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221395",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDLUNG PAHAR PWSS (NEW)",
+                "localname": "BUDLUNG PAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDLUNG PAHAR PWSS (NEW)",
+                        "localname": "BUDLUNG PAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BUDLUNG PAHAR PWSS (NEW)",
+                "localname": "BUDLUNG PAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221395",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BUDLUNG PAHAR PWSS (NEW)",
+                        "localname": "BUDLUNG PAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221395/ws-services-calculation/Penalty.json b/data/as/30221395/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a640aae0c8
--- /dev/null
+++ b/data/as/30221395/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221395",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221395/ws-services-calculation/WCBillingSlab.json b/data/as/30221395/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6b62d35b04
--- /dev/null
+++ b/data/as/30221395/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221395",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221411/BillingService/BusinessService.json b/data/as/30221411/BillingService/BusinessService.json
new file mode 100644
index 0000000000..05d35ebf1c
--- /dev/null
+++ b/data/as/30221411/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221411",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221411/egov-location/boundary-data.json b/data/as/30221411/egov-location/boundary-data.json
new file mode 100644
index 0000000000..a09006e653
--- /dev/null
+++ b/data/as/30221411/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221411",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJHASALI PWSS (NEW)",
+                "localname": "RAJHASALI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJHASALI PWSS (NEW)",
+                        "localname": "RAJHASALI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJHASALI PWSS (NEW)",
+                "localname": "RAJHASALI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221411",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJHASALI PWSS (NEW)",
+                        "localname": "RAJHASALI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221411/ws-services-calculation/Penalty.json b/data/as/30221411/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7c90df26c3
--- /dev/null
+++ b/data/as/30221411/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221411",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221411/ws-services-calculation/WCBillingSlab.json b/data/as/30221411/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..33ab1a1a07
--- /dev/null
+++ b/data/as/30221411/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221411",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221525/BillingService/BusinessService.json b/data/as/30221525/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7508c0b803
--- /dev/null
+++ b/data/as/30221525/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221525",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221525/egov-location/boundary-data.json b/data/as/30221525/egov-location/boundary-data.json
new file mode 100644
index 0000000000..6e26cb1365
--- /dev/null
+++ b/data/as/30221525/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221525",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJAPARA PWSS (NEW)",
+                "localname": "RAJAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221525",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJAPARA PWSS (NEW)",
+                        "localname": "RAJAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RAJAPARA PWSS (NEW)",
+                "localname": "RAJAPARA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221525",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RAJAPARA PWSS (NEW)",
+                        "localname": "RAJAPARA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221525/ws-services-calculation/Penalty.json b/data/as/30221525/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..78e6875612
--- /dev/null
+++ b/data/as/30221525/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221525",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221525/ws-services-calculation/WCBillingSlab.json b/data/as/30221525/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d9f9865c00
--- /dev/null
+++ b/data/as/30221525/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221525",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221530/BillingService/BusinessService.json b/data/as/30221530/BillingService/BusinessService.json
new file mode 100644
index 0000000000..23eba229f8
--- /dev/null
+++ b/data/as/30221530/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221530",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221530/egov-location/boundary-data.json b/data/as/30221530/egov-location/boundary-data.json
new file mode 100644
index 0000000000..3ad84023e1
--- /dev/null
+++ b/data/as/30221530/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221530",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                "localname": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221530",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                        "localname": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                "localname": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221530",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                        "localname": "DWARKA KACHARIPARA PT-II PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221530/ws-services-calculation/Penalty.json b/data/as/30221530/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..dd7e59f171
--- /dev/null
+++ b/data/as/30221530/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221530",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221530/ws-services-calculation/WCBillingSlab.json b/data/as/30221530/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..80d91c8bba
--- /dev/null
+++ b/data/as/30221530/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221530",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221533/BillingService/BusinessService.json b/data/as/30221533/BillingService/BusinessService.json
new file mode 100644
index 0000000000..7ae64e5daa
--- /dev/null
+++ b/data/as/30221533/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221533",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221533/egov-location/boundary-data.json b/data/as/30221533/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c1af48bcd3
--- /dev/null
+++ b/data/as/30221533/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221533",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLANGKATA PWSS (NEW)",
+                "localname": "CHAPLANGKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLANGKATA PWSS (NEW)",
+                        "localname": "CHAPLANGKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAPLANGKATA PWSS (NEW)",
+                "localname": "CHAPLANGKATA PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221533",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAPLANGKATA PWSS (NEW)",
+                        "localname": "CHAPLANGKATA PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221533/ws-services-calculation/Penalty.json b/data/as/30221533/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d2990e06d2
--- /dev/null
+++ b/data/as/30221533/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221533",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221533/ws-services-calculation/WCBillingSlab.json b/data/as/30221533/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ee24375cd3
--- /dev/null
+++ b/data/as/30221533/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221533",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221545/BillingService/BusinessService.json b/data/as/30221545/BillingService/BusinessService.json
new file mode 100644
index 0000000000..c225dc15be
--- /dev/null
+++ b/data/as/30221545/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221545",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221545/egov-location/boundary-data.json b/data/as/30221545/egov-location/boundary-data.json
new file mode 100644
index 0000000000..007cf65378
--- /dev/null
+++ b/data/as/30221545/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221545",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUWABARI PWSS (NEW)",
+                "localname": "GUWABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUWABARI PWSS (NEW)",
+                        "localname": "GUWABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "GUWABARI PWSS (NEW)",
+                "localname": "GUWABARI PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221545",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "GUWABARI PWSS (NEW)",
+                        "localname": "GUWABARI PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221545/ws-services-calculation/Penalty.json b/data/as/30221545/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8304c4fff4
--- /dev/null
+++ b/data/as/30221545/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221545",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221545/ws-services-calculation/WCBillingSlab.json b/data/as/30221545/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..862a804be0
--- /dev/null
+++ b/data/as/30221545/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221545",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221554/BillingService/BusinessService.json b/data/as/30221554/BillingService/BusinessService.json
new file mode 100644
index 0000000000..9efe6ef2c9
--- /dev/null
+++ b/data/as/30221554/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221554",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221554/egov-location/boundary-data.json b/data/as/30221554/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d75919034b
--- /dev/null
+++ b/data/as/30221554/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221554",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AJAGAR PAHAR PWSS (NEW)",
+                "localname": "AJAGAR PAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AJAGAR PAHAR PWSS (NEW)",
+                        "localname": "AJAGAR PAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "AJAGAR PAHAR PWSS (NEW)",
+                "localname": "AJAGAR PAHAR PWSS (NEW)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221554",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "AJAGAR PAHAR PWSS (NEW)",
+                        "localname": "AJAGAR PAHAR PWSS (NEW)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221554/ws-services-calculation/Penalty.json b/data/as/30221554/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0417fa7b6b
--- /dev/null
+++ b/data/as/30221554/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221554",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221554/ws-services-calculation/WCBillingSlab.json b/data/as/30221554/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..d262f5003d
--- /dev/null
+++ b/data/as/30221554/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221554",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221603/BillingService/BusinessService.json b/data/as/30221603/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0b6d6c627c
--- /dev/null
+++ b/data/as/30221603/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221603",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221603/egov-location/boundary-data.json b/data/as/30221603/egov-location/boundary-data.json
new file mode 100644
index 0000000000..faa7ab4b22
--- /dev/null
+++ b/data/as/30221603/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221603",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PAKHRITARY PWSS",
+                "localname": "RETROFITTING OF PAKHRITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221603",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PAKHRITARY PWSS",
+                        "localname": "RETROFITTING OF PAKHRITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF PAKHRITARY PWSS",
+                "localname": "RETROFITTING OF PAKHRITARY PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221603",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF PAKHRITARY PWSS",
+                        "localname": "RETROFITTING OF PAKHRITARY PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221603/ws-services-calculation/Penalty.json b/data/as/30221603/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..b56905d7bb
--- /dev/null
+++ b/data/as/30221603/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221603",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221603/ws-services-calculation/WCBillingSlab.json b/data/as/30221603/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..614c0be604
--- /dev/null
+++ b/data/as/30221603/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221603",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221622/BillingService/BusinessService.json b/data/as/30221622/BillingService/BusinessService.json
new file mode 100644
index 0000000000..4dc406dc3a
--- /dev/null
+++ b/data/as/30221622/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221622",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221622/egov-location/boundary-data.json b/data/as/30221622/egov-location/boundary-data.json
new file mode 100644
index 0000000000..84f990dc4c
--- /dev/null
+++ b/data/as/30221622/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221622",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGAGORAH PWSS",
+                "localname": "RETROFITTING OF RANGAGORAH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221622",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGAGORAH PWSS",
+                        "localname": "RETROFITTING OF RANGAGORAH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF RANGAGORAH PWSS",
+                "localname": "RETROFITTING OF RANGAGORAH PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221622",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF RANGAGORAH PWSS",
+                        "localname": "RETROFITTING OF RANGAGORAH PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221622/ws-services-calculation/Penalty.json b/data/as/30221622/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a75ff17860
--- /dev/null
+++ b/data/as/30221622/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221622",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221622/ws-services-calculation/WCBillingSlab.json b/data/as/30221622/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1ebe75d4d1
--- /dev/null
+++ b/data/as/30221622/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221622",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221636/BillingService/BusinessService.json b/data/as/30221636/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6b4b1138eb
--- /dev/null
+++ b/data/as/30221636/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30221636",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221636/egov-location/boundary-data.json b/data/as/30221636/egov-location/boundary-data.json
new file mode 100644
index 0000000000..7c86c9c591
--- /dev/null
+++ b/data/as/30221636/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30221636",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NATUNPARA PWSS",
+                "localname": "RETROFITTING OF NATUNPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221636",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NATUNPARA PWSS",
+                        "localname": "RETROFITTING OF NATUNPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF NATUNPARA PWSS",
+                "localname": "RETROFITTING OF NATUNPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30221636",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF NATUNPARA PWSS",
+                        "localname": "RETROFITTING OF NATUNPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221636/ws-services-calculation/Penalty.json b/data/as/30221636/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..41408e1b32
--- /dev/null
+++ b/data/as/30221636/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30221636",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30221636/ws-services-calculation/WCBillingSlab.json b/data/as/30221636/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..3003091ac0
--- /dev/null
+++ b/data/as/30221636/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30221636",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222577/BillingService/BusinessService.json b/data/as/30222577/BillingService/BusinessService.json
new file mode 100644
index 0000000000..adabbd733e
--- /dev/null
+++ b/data/as/30222577/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30222577",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222577/egov-location/boundary-data.json b/data/as/30222577/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c3d3614868
--- /dev/null
+++ b/data/as/30222577/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30222577",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BESORKONA PWSS",
+                "localname": "RETROFITTING OF BESORKONA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30222577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BESORKONA PWSS",
+                        "localname": "RETROFITTING OF BESORKONA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BESORKONA PWSS",
+                "localname": "RETROFITTING OF BESORKONA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30222577",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BESORKONA PWSS",
+                        "localname": "RETROFITTING OF BESORKONA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222577/ws-services-calculation/Penalty.json b/data/as/30222577/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..ed70f139b2
--- /dev/null
+++ b/data/as/30222577/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30222577",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222577/ws-services-calculation/WCBillingSlab.json b/data/as/30222577/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..4f873e82f1
--- /dev/null
+++ b/data/as/30222577/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30222577",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222595/BillingService/BusinessService.json b/data/as/30222595/BillingService/BusinessService.json
new file mode 100644
index 0000000000..e523e2a555
--- /dev/null
+++ b/data/as/30222595/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30222595",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222595/egov-location/boundary-data.json b/data/as/30222595/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d4bcb6efac
--- /dev/null
+++ b/data/as/30222595/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30222595",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDOL PWSS",
+                "localname": "RETROFITTING OF BORDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30222595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDOL PWSS",
+                        "localname": "RETROFITTING OF BORDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF BORDOL PWSS",
+                "localname": "RETROFITTING OF BORDOL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30222595",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF BORDOL PWSS",
+                        "localname": "RETROFITTING OF BORDOL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222595/ws-services-calculation/Penalty.json b/data/as/30222595/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..a8d5e335b6
--- /dev/null
+++ b/data/as/30222595/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30222595",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222595/ws-services-calculation/WCBillingSlab.json b/data/as/30222595/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..a61fe4ff9a
--- /dev/null
+++ b/data/as/30222595/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30222595",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222601/BillingService/BusinessService.json b/data/as/30222601/BillingService/BusinessService.json
new file mode 100644
index 0000000000..2c3c766978
--- /dev/null
+++ b/data/as/30222601/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30222601",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222601/egov-location/boundary-data.json b/data/as/30222601/egov-location/boundary-data.json
new file mode 100644
index 0000000000..310574b6a2
--- /dev/null
+++ b/data/as/30222601/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30222601",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JHANJIPARA PWSS",
+                "localname": "RETROFITTING OF JHANJIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30222601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JHANJIPARA PWSS",
+                        "localname": "RETROFITTING OF JHANJIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "RETROFITTING OF JHANJIPARA PWSS",
+                "localname": "RETROFITTING OF JHANJIPARA PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30222601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "RETROFITTING OF JHANJIPARA PWSS",
+                        "localname": "RETROFITTING OF JHANJIPARA PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222601/ws-services-calculation/Penalty.json b/data/as/30222601/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..71adc34793
--- /dev/null
+++ b/data/as/30222601/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30222601",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30222601/ws-services-calculation/WCBillingSlab.json b/data/as/30222601/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..7bbaf67494
--- /dev/null
+++ b/data/as/30222601/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30222601",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224592/BillingService/BusinessService.json b/data/as/30224592/BillingService/BusinessService.json
new file mode 100644
index 0000000000..17ad24f45a
--- /dev/null
+++ b/data/as/30224592/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224592",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224592/egov-location/boundary-data.json b/data/as/30224592/egov-location/boundary-data.json
new file mode 100644
index 0000000000..005a17695b
--- /dev/null
+++ b/data/as/30224592/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224592",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAROKA PART 3 PWSS",
+                "localname": "BATIAROKA PART 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224592",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAROKA PART 3 PWSS",
+                        "localname": "BATIAROKA PART 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAROKA PART 3 PWSS",
+                "localname": "BATIAROKA PART 3 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224592",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAROKA PART 3 PWSS",
+                        "localname": "BATIAROKA PART 3 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224592/ws-services-calculation/Penalty.json b/data/as/30224592/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aefa7264f2
--- /dev/null
+++ b/data/as/30224592/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224592",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224592/ws-services-calculation/WCBillingSlab.json b/data/as/30224592/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5cf7dabe88
--- /dev/null
+++ b/data/as/30224592/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224592",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224594/BillingService/BusinessService.json b/data/as/30224594/BillingService/BusinessService.json
new file mode 100644
index 0000000000..242ba174be
--- /dev/null
+++ b/data/as/30224594/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224594",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224594/egov-location/boundary-data.json b/data/as/30224594/egov-location/boundary-data.json
new file mode 100644
index 0000000000..dee15abbcf
--- /dev/null
+++ b/data/as/30224594/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224594",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAROKA PART 2 PWSS",
+                "localname": "BATIAROKA PART 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224594",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAROKA PART 2 PWSS",
+                        "localname": "BATIAROKA PART 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAROKA PART 2 PWSS",
+                "localname": "BATIAROKA PART 2 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224594",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAROKA PART 2 PWSS",
+                        "localname": "BATIAROKA PART 2 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224594/ws-services-calculation/Penalty.json b/data/as/30224594/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..4d8fda79d8
--- /dev/null
+++ b/data/as/30224594/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224594",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224594/ws-services-calculation/WCBillingSlab.json b/data/as/30224594/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..0200206f4e
--- /dev/null
+++ b/data/as/30224594/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224594",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224596/BillingService/BusinessService.json b/data/as/30224596/BillingService/BusinessService.json
new file mode 100644
index 0000000000..3a12d1e251
--- /dev/null
+++ b/data/as/30224596/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224596",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224596/egov-location/boundary-data.json b/data/as/30224596/egov-location/boundary-data.json
new file mode 100644
index 0000000000..aa001a7c9d
--- /dev/null
+++ b/data/as/30224596/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224596",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAROKA PART 1 PWSS",
+                "localname": "BATIAROKA PART 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224596",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAROKA PART 1 PWSS",
+                        "localname": "BATIAROKA PART 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BATIAROKA PART 1 PWSS",
+                "localname": "BATIAROKA PART 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224596",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BATIAROKA PART 1 PWSS",
+                        "localname": "BATIAROKA PART 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224596/ws-services-calculation/Penalty.json b/data/as/30224596/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..d4875f7bd5
--- /dev/null
+++ b/data/as/30224596/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224596",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224596/ws-services-calculation/WCBillingSlab.json b/data/as/30224596/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..653c7cae3f
--- /dev/null
+++ b/data/as/30224596/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224596",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224601/BillingService/BusinessService.json b/data/as/30224601/BillingService/BusinessService.json
new file mode 100644
index 0000000000..95cddf31cf
--- /dev/null
+++ b/data/as/30224601/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224601",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224601/egov-location/boundary-data.json b/data/as/30224601/egov-location/boundary-data.json
new file mode 100644
index 0000000000..07a3a8d23e
--- /dev/null
+++ b/data/as/30224601/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224601",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABHETI PART 1 PWSS",
+                "localname": "ADABHETI PART 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABHETI PART 1 PWSS",
+                        "localname": "ADABHETI PART 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "ADABHETI PART 1 PWSS",
+                "localname": "ADABHETI PART 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224601",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "ADABHETI PART 1 PWSS",
+                        "localname": "ADABHETI PART 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224601/ws-services-calculation/Penalty.json b/data/as/30224601/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..2f076bde39
--- /dev/null
+++ b/data/as/30224601/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224601",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224601/ws-services-calculation/WCBillingSlab.json b/data/as/30224601/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..48a8c106b9
--- /dev/null
+++ b/data/as/30224601/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224601",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224607/BillingService/BusinessService.json b/data/as/30224607/BillingService/BusinessService.json
new file mode 100644
index 0000000000..5786af49ae
--- /dev/null
+++ b/data/as/30224607/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224607",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224607/egov-location/boundary-data.json b/data/as/30224607/egov-location/boundary-data.json
new file mode 100644
index 0000000000..5160e2d167
--- /dev/null
+++ b/data/as/30224607/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224607",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAMDHARA BRAHMAGAON PWSS",
+                "localname": "CHAMDHARA BRAHMAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAMDHARA BRAHMAGAON PWSS",
+                        "localname": "CHAMDHARA BRAHMAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAMDHARA BRAHMAGAON PWSS",
+                "localname": "CHAMDHARA BRAHMAGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224607",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAMDHARA BRAHMAGAON PWSS",
+                        "localname": "CHAMDHARA BRAHMAGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224607/ws-services-calculation/Penalty.json b/data/as/30224607/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..8e90086417
--- /dev/null
+++ b/data/as/30224607/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224607",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224607/ws-services-calculation/WCBillingSlab.json b/data/as/30224607/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..1f6c3c2493
--- /dev/null
+++ b/data/as/30224607/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224607",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224611/BillingService/BusinessService.json b/data/as/30224611/BillingService/BusinessService.json
new file mode 100644
index 0000000000..02928c9360
--- /dev/null
+++ b/data/as/30224611/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224611",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224611/egov-location/boundary-data.json b/data/as/30224611/egov-location/boundary-data.json
new file mode 100644
index 0000000000..32672442c3
--- /dev/null
+++ b/data/as/30224611/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224611",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAMDHARA MAJHIGAON PWSS",
+                "localname": "CHAMDHARA MAJHIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAMDHARA MAJHIGAON PWSS",
+                        "localname": "CHAMDHARA MAJHIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "CHAMDHARA MAJHIGAON PWSS",
+                "localname": "CHAMDHARA MAJHIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224611",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "CHAMDHARA MAJHIGAON PWSS",
+                        "localname": "CHAMDHARA MAJHIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224611/ws-services-calculation/Penalty.json b/data/as/30224611/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bff3060440
--- /dev/null
+++ b/data/as/30224611/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224611",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224611/ws-services-calculation/WCBillingSlab.json b/data/as/30224611/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..ba6551d539
--- /dev/null
+++ b/data/as/30224611/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224611",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224621/BillingService/BusinessService.json b/data/as/30224621/BillingService/BusinessService.json
new file mode 100644
index 0000000000..12b6cff8d5
--- /dev/null
+++ b/data/as/30224621/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224621",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224621/egov-location/boundary-data.json b/data/as/30224621/egov-location/boundary-data.json
new file mode 100644
index 0000000000..41c4a184c8
--- /dev/null
+++ b/data/as/30224621/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224621",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA BAGAN PWSS",
+                "localname": "DIPLONGA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224621",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA BAGAN PWSS",
+                        "localname": "DIPLONGA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA BAGAN PWSS",
+                "localname": "DIPLONGA BAGAN PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224621",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA BAGAN PWSS",
+                        "localname": "DIPLONGA BAGAN PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224621/ws-services-calculation/Penalty.json b/data/as/30224621/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe3ebe165d
--- /dev/null
+++ b/data/as/30224621/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224621",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224621/ws-services-calculation/WCBillingSlab.json b/data/as/30224621/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..2432198691
--- /dev/null
+++ b/data/as/30224621/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224621",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224626/BillingService/BusinessService.json b/data/as/30224626/BillingService/BusinessService.json
new file mode 100644
index 0000000000..ac508a126f
--- /dev/null
+++ b/data/as/30224626/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224626",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224626/egov-location/boundary-data.json b/data/as/30224626/egov-location/boundary-data.json
new file mode 100644
index 0000000000..4802fb261e
--- /dev/null
+++ b/data/as/30224626/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224626",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. NOTUN FARM PWSS",
+                "localname": "2 NO. NOTUN FARM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224626",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. NOTUN FARM PWSS",
+                        "localname": "2 NO. NOTUN FARM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "2 NO. NOTUN FARM PWSS",
+                "localname": "2 NO. NOTUN FARM PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224626",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "2 NO. NOTUN FARM PWSS",
+                        "localname": "2 NO. NOTUN FARM PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224626/ws-services-calculation/Penalty.json b/data/as/30224626/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..94e0629bd4
--- /dev/null
+++ b/data/as/30224626/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224626",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224626/ws-services-calculation/WCBillingSlab.json b/data/as/30224626/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..c651992312
--- /dev/null
+++ b/data/as/30224626/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224626",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224629/BillingService/BusinessService.json b/data/as/30224629/BillingService/BusinessService.json
new file mode 100644
index 0000000000..0e9441aab5
--- /dev/null
+++ b/data/as/30224629/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224629",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224629/egov-location/boundary-data.json b/data/as/30224629/egov-location/boundary-data.json
new file mode 100644
index 0000000000..c32a8a5fcb
--- /dev/null
+++ b/data/as/30224629/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224629",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOY SIDHI PWSS",
+                "localname": "JOY SIDHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOY SIDHI PWSS",
+                        "localname": "JOY SIDHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "JOY SIDHI PWSS",
+                "localname": "JOY SIDHI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224629",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "JOY SIDHI PWSS",
+                        "localname": "JOY SIDHI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224629/ws-services-calculation/Penalty.json b/data/as/30224629/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..f0930f249a
--- /dev/null
+++ b/data/as/30224629/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224629",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224629/ws-services-calculation/WCBillingSlab.json b/data/as/30224629/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..5c8bd9feda
--- /dev/null
+++ b/data/as/30224629/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224629",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224634/BillingService/BusinessService.json b/data/as/30224634/BillingService/BusinessService.json
new file mode 100644
index 0000000000..b541344af8
--- /dev/null
+++ b/data/as/30224634/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224634",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224634/egov-location/boundary-data.json b/data/as/30224634/egov-location/boundary-data.json
new file mode 100644
index 0000000000..92ebbbde8a
--- /dev/null
+++ b/data/as/30224634/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224634",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                "localname": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                        "localname": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                "localname": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224634",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                        "localname": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224634/ws-services-calculation/Penalty.json b/data/as/30224634/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..bd8eb23d18
--- /dev/null
+++ b/data/as/30224634/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224634",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224634/ws-services-calculation/WCBillingSlab.json b/data/as/30224634/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..f2ab94b1f7
--- /dev/null
+++ b/data/as/30224634/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224634",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224638/BillingService/BusinessService.json b/data/as/30224638/BillingService/BusinessService.json
new file mode 100644
index 0000000000..cc27f4f63f
--- /dev/null
+++ b/data/as/30224638/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224638",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224638/egov-location/boundary-data.json b/data/as/30224638/egov-location/boundary-data.json
new file mode 100644
index 0000000000..d1ee9d0411
--- /dev/null
+++ b/data/as/30224638/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224638",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                "localname": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224638",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                        "localname": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                "localname": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224638",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                        "localname": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224638/ws-services-calculation/Penalty.json b/data/as/30224638/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..08c0ef1a31
--- /dev/null
+++ b/data/as/30224638/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224638",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224638/ws-services-calculation/WCBillingSlab.json b/data/as/30224638/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..bb5cc57115
--- /dev/null
+++ b/data/as/30224638/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224638",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224681/BillingService/BusinessService.json b/data/as/30224681/BillingService/BusinessService.json
new file mode 100644
index 0000000000..6a3e4d20cb
--- /dev/null
+++ b/data/as/30224681/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30224681",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224681/egov-location/boundary-data.json b/data/as/30224681/egov-location/boundary-data.json
new file mode 100644
index 0000000000..9a804204f2
--- /dev/null
+++ b/data/as/30224681/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30224681",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LB ROADPUB MALOR PWSS",
+                "localname": "LB ROADPUB MALOR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LB ROADPUB MALOR PWSS",
+                        "localname": "LB ROADPUB MALOR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "LB ROADPUB MALOR PWSS",
+                "localname": "LB ROADPUB MALOR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30224681",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "LB ROADPUB MALOR PWSS",
+                        "localname": "LB ROADPUB MALOR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224681/ws-services-calculation/Penalty.json b/data/as/30224681/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..1601c93369
--- /dev/null
+++ b/data/as/30224681/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30224681",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30224681/ws-services-calculation/WCBillingSlab.json b/data/as/30224681/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..e5f68d7575
--- /dev/null
+++ b/data/as/30224681/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30224681",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30226845/BillingService/BusinessService.json b/data/as/30226845/BillingService/BusinessService.json
new file mode 100644
index 0000000000..de8fb53a98
--- /dev/null
+++ b/data/as/30226845/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30226845",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30226845/egov-location/boundary-data.json b/data/as/30226845/egov-location/boundary-data.json
new file mode 100644
index 0000000000..27826baba2
--- /dev/null
+++ b/data/as/30226845/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30226845",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                "localname": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30226845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                        "localname": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                "localname": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30226845",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                        "localname": "PHULAGURI NISHI -KACHARIGAON PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30226845/ws-services-calculation/Penalty.json b/data/as/30226845/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..7c874d2432
--- /dev/null
+++ b/data/as/30226845/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30226845",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30226845/ws-services-calculation/WCBillingSlab.json b/data/as/30226845/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..eb4cce7662
--- /dev/null
+++ b/data/as/30226845/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30226845",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30231032/BillingService/BusinessService.json b/data/as/30231032/BillingService/BusinessService.json
new file mode 100644
index 0000000000..07066099fc
--- /dev/null
+++ b/data/as/30231032/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30231032",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30231032/egov-location/boundary-data.json b/data/as/30231032/egov-location/boundary-data.json
new file mode 100644
index 0000000000..0839243f21
--- /dev/null
+++ b/data/as/30231032/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30231032",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                "localname": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30231032",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                        "localname": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                "localname": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30231032",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                        "localname": "NATUN JAMUGURI PART-A PWSS - (OLD NAME - MAJULI CHAR PWSS)",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30231032/ws-services-calculation/Penalty.json b/data/as/30231032/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..fe4ff2509d
--- /dev/null
+++ b/data/as/30231032/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30231032",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30231032/ws-services-calculation/WCBillingSlab.json b/data/as/30231032/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..6406f12279
--- /dev/null
+++ b/data/as/30231032/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30231032",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30235506/BillingService/BusinessService.json b/data/as/30235506/BillingService/BusinessService.json
new file mode 100644
index 0000000000..082c1a246c
--- /dev/null
+++ b/data/as/30235506/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30235506",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30235506/egov-location/boundary-data.json b/data/as/30235506/egov-location/boundary-data.json
new file mode 100644
index 0000000000..683b7750ce
--- /dev/null
+++ b/data/as/30235506/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30235506",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHETI 1 PWSS",
+                "localname": "BORBHETI 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30235506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHETI 1 PWSS",
+                        "localname": "BORBHETI 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "BORBHETI 1 PWSS",
+                "localname": "BORBHETI 1 PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30235506",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "BORBHETI 1 PWSS",
+                        "localname": "BORBHETI 1 PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30235506/ws-services-calculation/Penalty.json b/data/as/30235506/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..0c0749ed27
--- /dev/null
+++ b/data/as/30235506/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30235506",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30235506/ws-services-calculation/WCBillingSlab.json b/data/as/30235506/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..fc03e1d13c
--- /dev/null
+++ b/data/as/30235506/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30235506",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30244996/BillingService/BusinessService.json b/data/as/30244996/BillingService/BusinessService.json
new file mode 100644
index 0000000000..206297807b
--- /dev/null
+++ b/data/as/30244996/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30244996",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30244996/egov-location/boundary-data.json b/data/as/30244996/egov-location/boundary-data.json
new file mode 100644
index 0000000000..f4c306ae77
--- /dev/null
+++ b/data/as/30244996/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30244996",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALABIL PWSS",
+                "localname": "KALABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30244996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALABIL PWSS",
+                        "localname": "KALABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "KALABIL PWSS",
+                "localname": "KALABIL PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30244996",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "KALABIL PWSS",
+                        "localname": "KALABIL PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30244996/ws-services-calculation/Penalty.json b/data/as/30244996/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..aa375336fb
--- /dev/null
+++ b/data/as/30244996/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30244996",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30244996/ws-services-calculation/WCBillingSlab.json b/data/as/30244996/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..9424affb0e
--- /dev/null
+++ b/data/as/30244996/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30244996",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30245010/BillingService/BusinessService.json b/data/as/30245010/BillingService/BusinessService.json
new file mode 100644
index 0000000000..649a6f95ea
--- /dev/null
+++ b/data/as/30245010/BillingService/BusinessService.json
@@ -0,0 +1,145 @@
+{
+    "tenantId": "as.30245010",
+    "moduleName": "BillingService",
+    "BusinessService": [
+        {
+            "businessService": "EXPENSE.ELECTRICITY_BILL",
+            "code": "EXPENSE.ELECTRICITY_BILL",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.SALARY",
+            "code": "EXPENSE.SALARY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.MACHINERY_REPAIR",
+            "code": "EXPENSE.MACHINERY_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.OTHERS",
+            "code": "EXPENSE.OTHERS",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "ws-services-calculation",
+            "code": "WS",
+            "collectionModesNotAllowed": [
+                "DD",
+                "CHEQUE",
+                "CARD",
+                "OFFLINE_NEFT",
+                "OFFLINE_RTGS",
+                "POSTAL_ORDER",
+                "ONLINE"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": true,
+            "demandUpdateTime": 86400000,
+            "isVoucherCreationEnabled": false,
+            "billGineiURL": "egov-searcher/bill-genie/waterbills/_get",
+            "isBillAmendmentEnabled": true
+        },
+        {
+            "businessService": "EXPENSE.CHLORINATION",
+            "code": "EXPENSE.CHLORINATION",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.WATER_TREATMENT",
+            "code": "EXPENSE.WATER_TREATMENT",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.PIPELINE_REPAIR",
+            "code": "EXPENSE.PIPELINE_REPAIR",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_MACHINERY",
+            "code": "EXPENSE.NEW_MACHINERY",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.NEW_PIPELINE",
+            "code": "EXPENSE.NEW_PIPELINE",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        },
+        {
+            "businessService": "EXPENSE.INCENTIVES",
+            "code": "EXPENSE.INCENTIVES",
+            "collectionModesNotAllowed": [
+                "DD"
+            ],
+            "partPaymentAllowed": true,
+            "isAdvanceAllowed": false,
+            "isVoucherCreationEnabled": true,
+            "isActive": true,
+            "type": "Adhoc"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30245010/egov-location/boundary-data.json b/data/as/30245010/egov-location/boundary-data.json
new file mode 100644
index 0000000000..97a1eff3a7
--- /dev/null
+++ b/data/as/30245010/egov-location/boundary-data.json
@@ -0,0 +1,62 @@
+{
+    "tenantId": "as.30245010",
+    "moduleName": "egov-location",
+    "TenantBoundary": [
+        {
+            "hierarchyType": {
+                "code": "REVENUE",
+                "name": "REVENUE"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAFALA PATHAR PWSS",
+                "localname": "DAFALA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30245010",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAFALA PATHAR PWSS",
+                        "localname": "DAFALA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        },
+        {
+            "hierarchyType": {
+                "code": "ADMIN",
+                "name": "ADMIN"
+            },
+            "boundary": {
+                "id": 1,
+                "boundaryNum": 1,
+                "name": "DAFALA PATHAR PWSS",
+                "localname": "DAFALA PATHAR PWSS",
+                "longitude": null,
+                "latitude": null,
+                "label": "City",
+                "code": "as.30245010",
+                "children": [
+                    {
+                        "id": 1,
+                        "boundaryNum": 1,
+                        "name": "DAFALA PATHAR PWSS",
+                        "localname": "DAFALA PATHAR PWSS",
+                        "longitude": null,
+                        "latitude": null,
+                        "label": "Locality",
+                        "code": "WARD1"
+                    }
+                ]
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30245010/ws-services-calculation/Penalty.json b/data/as/30245010/ws-services-calculation/Penalty.json
new file mode 100644
index 0000000000..44f29acbaa
--- /dev/null
+++ b/data/as/30245010/ws-services-calculation/Penalty.json
@@ -0,0 +1,17 @@
+{
+    "tenantId": "as.30245010",
+    "moduleName": "ws-services-calculation",
+    "Penalty": [
+        {
+            "type": "Fixed",
+            "subType": "currentMonth",
+            "rate": 0,
+            "amount": null,
+            "minAmount": null,
+            "applicableAfterDays": 10,
+            "flatAmount": null,
+            "fromFY": "2023-24",
+            "startingDay": "1/04/2023"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/as/30245010/ws-services-calculation/WCBillingSlab.json b/data/as/30245010/ws-services-calculation/WCBillingSlab.json
new file mode 100644
index 0000000000..44c6e9a932
--- /dev/null
+++ b/data/as/30245010/ws-services-calculation/WCBillingSlab.json
@@ -0,0 +1,118 @@
+{
+    "tenantId": "as.30245010",
+    "moduleName": "ws-services-calculation",
+    "WCBillingSlab": [
+        {
+            "id": "1",
+            "buildingType": "RESIDENTIAL",
+            "connectionType": "Metered",
+            "calculationAttribute": "Water consumption",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": 3,
+            "buildingType": "MIXED",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "4",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Water consumption",
+            "connectionType": "Metered",
+            "minimumCharge": 100,
+            "slabs": [
+                {
+                    "from": 0,
+                    "to": 20,
+                    "charge": 0,
+                    "meterCharge": 0
+                },
+                {
+                    "from": 20,
+                    "to": 100000,
+                    "charge": 5,
+                    "meterCharge": 0
+                }
+            ]
+        },
+        {
+            "id": "5",
+            "buildingType": "RESIDENTIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "6",
+            "buildingType": "COMMERCIAL",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "7",
+            "buildingType": "MIXED",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        },
+        {
+            "id": "8",
+            "buildingType": "PUBLICSECTOR",
+            "calculationAttribute": "Flat",
+            "connectionType": "Non_Metered",
+            "minimumCharge": 0.0
+        }
+    ]
+}
\ No newline at end of file

From ba2cc969c32b64a6288a4308bfb4ae248ba81d5f Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Tue, 12 Nov 2024 13:05:10 +0530
Subject: [PATCH 09/23] Added districtCode,
 districtName,blockcode,blockname,panchayatcode,panchayatname,villageName and
 villageCode in tenants.json file

---
 data/as/tenant/tenants.json | 23815 +++++++++++++++++++++++++++++++++-
 1 file changed, 23375 insertions(+), 440 deletions(-)

diff --git a/data/as/tenant/tenants.json b/data/as/tenant/tenants.json
index 4477d16e9f..6d66c98c87 100644
--- a/data/as/tenant/tenants.json
+++ b/data/as/tenant/tenants.json
@@ -37,6 +37,533 @@
       "pdfHeader": "PB_PDF_HEADER",
       "pdfContactDetails": "PB_CONTACT_DETAILS"
     },
+    {
+      "code": "as.30176539",
+      "name": "BAPUJINAGAR PWSS",
+      "description": "BAPUJINAGAR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BAPUJINAGAR PWSS",
+        "localName": "BAPUJINAGAR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai ",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30176539",
+        "ddrName": "BAPUJINAGAR PWSS",
+        "projectId": "30176539",
+        "regionName": "1188",
+        "villageName": "Bamun Panikhowa",
+        "villageCode": "33304"
+      },
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai ",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BAPUJINAGAR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30177874",
+      "name": "BHEBHERI 2 PWSS",
+      "description": "BHEBHERI 2 PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BHEBHERI 2 PWSS",
+        "localName": "BHEBHERI 2 PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1188",
+        "blockname": "Krishnai ",
+        "panchayatcode": "22437",
+        "panchayatname": "Zira",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30177874",
+        "ddrName": "BHEBHERI 2 PWSS",
+        "projectId": "30177874",
+        "regionName": "1188",
+        "villageName": "Bamun Panikhowa",
+        "villageCode": "33304"
+      },
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai ",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BHEBHERI 2 PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30207980",
+      "name": "MUGALPARA PWSS",
+      "description": "MUGALPARA PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MUGALPARA PWSS",
+        "localName": "MUGALPARA PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1190",
+        "blockname": "Jaleswar",
+        "panchayatcode": "22463",
+        "panchayatname": "Rajmita",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30207980",
+        "ddrName": "MUGALPARA PWSS",
+        "projectId": "30207980",
+        "regionName": "1190",
+        "villageName": "Rajmitapantai",
+        "villageCode": "33507"
+      },
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Rajmitapantai",
+      "villageCode": "33507",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MUGALPARA PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30014441",
+      "name": "Shyamaguri PWSS",
+      "description": "Shyamaguri PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Shyamaguri PWSS",
+        "localName": "Shyamaguri PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22399",
+        "panchayatname": "Kalyanpur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30014441",
+        "ddrName": "Shyamaguri PWSS",
+        "projectId": "30014441",
+        "regionName": "1184",
+        "villageName": "Chamaguri",
+        "villageCode": "32953"
+      },
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Chamaguri",
+      "villageCode": "32953",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Shyamaguri PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.30046142",
+      "name": "TISIMPUR PWSS",
+      "description": "TISIMPUR PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "TISIMPUR PWSS",
+        "localName": "TISIMPUR PWSS",
+        "districtCode": "44",
+        "districtName": "Goalpara",
+        "blockcode": "1184",
+        "blockname": "Balijana",
+        "panchayatcode": "22400",
+        "panchayatname": "Agia",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "30046142",
+        "ddrName": "TISIMPUR PWSS",
+        "projectId": "30046142",
+        "regionName": "1184",
+        "villageName": "Tisimpur",
+        "villageCode": "32983"
+      },
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Tisimpur",
+      "villageCode": "32983",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "TISIMPUR PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8153399",
+      "name": "BARIKA CHUBURI PWSS",
+      "description": "BARIKA CHUBURI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "BARIKA CHUBURI PWSS",
+        "localName": "BARIKA CHUBURI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8153399",
+        "ddrName": "BARIKA CHUBURI PWSS",
+        "projectId": "8153399",
+        "regionName": "1245",
+        "villageName": "Barika Chuburi (ct)",
+        "villageCode": "38262"
+      },
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "BARIKA CHUBURI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192456",
+      "name": "DEORIGAON PWSS",
+      "description": "DEORIGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "DEORIGAON PWSS",
+        "localName": "DEORIGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192456",
+        "ddrName": "DEORIGAON PWSS",
+        "projectId": "8192456",
+        "regionName": "1245",
+        "villageName": "Majgaon (ct)",
+        "villageCode": "38253"
+      },
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "DEORIGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8192257",
+      "name": "MAZGAON PWSS",
+      "description": "MAZGAON PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "MAZGAON PWSS",
+        "localName": "MAZGAON PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23081",
+        "panchayatname": "Mazgaon",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8192257",
+        "ddrName": "MAZGAON PWSS",
+        "projectId": "8192257",
+        "regionName": "1245",
+        "villageName": "Majgaon (ct)",
+        "villageCode": "38253"
+      },
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "MAZGAON PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.8184281",
+      "name": "KALIBARI PWSS",
+      "description": "KALIBARI PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "KALIBARI PWSS",
+        "localName": "KALIBARI PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "8184281",
+        "ddrName": "KALIBARI PWSS",
+        "projectId": "8184281",
+        "regionName": "1245",
+        "villageName": "Kali Bari Rajah Chahar",
+        "villageCode": "38260"
+      },
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Kali Bari Rajah Chahar",
+      "villageCode": "38260",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "KALIBARI PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.1842301",
+      "name": "Balichapari PWSS",
+      "description": "Balichapari PWSS",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "Balichapari PWSS",
+        "localName": "Balichapari PWSS",
+        "districtCode": "49",
+        "districtName": "Sonitpur",
+        "blockcode": "1245",
+        "blockname": "Gabhoru",
+        "panchayatcode": "23082",
+        "panchayatname": "Ushapur",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "1842301",
+        "ddrName": "Balichapari PWSS",
+        "projectId": "1842301",
+        "regionName": "1245",
+        "villageName": "Bali Chapari",
+        "villageCode": "38265"
+      },
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Bali Chapari",
+      "villageCode": "38265",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "Balichapari PWSS",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
+    {
+      "code": "as.testing",
+      "name": "testing",
+      "description": "testing",
+      "logoId": "",
+      "imageId": null,
+      "domainUrl": "",
+      "city": {
+        "name": "testing",
+        "localName": "testing",
+        "districtCode": "204",
+        "districtName": "Shivamogga",
+        "blockcode": "2595",
+        "blockname": "Soraba",
+        "panchayatcode": "63625",
+        "panchayatname": "Udri",
+        "ulbGrade": "",
+        "longitude": null,
+        "latitude": null,
+        "captcha": null,
+        "shapeFileLocation": null,
+        "code": "testing",
+        "ddrName": "testing",
+        "projectId": "testing",
+        "regionName": "2595",
+        "villageName": "Bamun Panikhowa",
+        "villageCode": "33304"
+      },
+      "districtCode": "204",
+      "districtName": "Shivamogga",
+      "blockcode": "2595",
+      "blockname": "Soraba",
+      "panchayatcode": "63625",
+      "panchayatname": "Udri",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
+      "twitterUrl": null,
+      "facebookUrl": null,
+      "emailId": "",
+      "OfficeTimings": {
+        "Mon - Fri": "9.00 AM - 6.00 PM"
+      },
+      "address": "testing",
+      "pincode": [],
+      "contactNumber": "",
+      "pdfHeader": "",
+      "pdfContactDetails": ""
+    },
     {
       "code": "as.30224596",
       "name": "Batiaroka Part 1 PWSS",
@@ -72,6 +599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batiaroka Part 1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Batia Roka",
+      "villageCode": "587250",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112,6 +647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batiaroka Part 2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Batia Roka",
+      "villageCode": "587250",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -152,6 +695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batiaroka Part 3 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Batia Roka",
+      "villageCode": "587250",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -192,6 +743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bokabil PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Boka Bil",
+      "villageCode": "39228",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -232,6 +791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOMARDOLONI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Chamar Doloni",
+      "villageCode": "39227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -272,6 +839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chamardoloni-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Chamar Doloni",
+      "villageCode": "39227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -312,6 +887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Somordoloni PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Chamar Doloni",
+      "villageCode": "39227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -352,6 +935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAGSANKAR PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Nag-sankar Gaon",
+      "villageCode": "39229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -392,6 +983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAGSANKAR PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Nag-sankar Gaon",
+      "villageCode": "39229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -432,6 +1031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GOSSAICHUK PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Nag-sankar Gaon",
+      "villageCode": "39229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -472,6 +1079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mangalbaria Bazaar Multi Village PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "Nag-sankar Gaon",
+      "villageCode": "39229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -512,6 +1127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Gosain Chapori PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23185",
+      "panchayatname": "Dakhin Nagsankar",
+      "villageName": "No.1 Gosain Chapori",
+      "villageCode": "587243",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -552,6 +1175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BEBEJIA (SD II) PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Bebejia",
+      "villageCode": "39205",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -592,6 +1223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bebejia PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Bebejia",
+      "villageCode": "39205",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -632,6 +1271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHENGAMARI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Chengamari",
+      "villageCode": "39203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -672,6 +1319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chengamari-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Chengamari",
+      "villageCode": "39203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -712,6 +1367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chengamari PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Chengamari",
+      "villageCode": "39203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -752,6 +1415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dikoraipam PWSS (MNP)",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Dikarai Pam",
+      "villageCode": "586994",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -792,6 +1463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIKARAIPAM PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Dikarai Pam",
+      "villageCode": "586994",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -832,6 +1511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HABIDOLONI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Habidoloni",
+      "villageCode": "39200",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -872,6 +1559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HOKAJAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Metera",
+      "villageCode": "39199",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -912,6 +1607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hokajan",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Metera",
+      "villageCode": "39199",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -952,6 +1655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sadaibora Part-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "MADHYA NAGSANKAR",
+      "villageName": "Nal-Tali",
+      "villageCode": "39198",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -992,6 +1703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sadaibora Part-2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23182",
+      "panchayatname": "Madhya Nagsankar",
+      "villageName": "Sadai Bora",
+      "villageCode": "587037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1032,6 +1751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHANUPUR BISNUPOR / BHANUPUR_NO_2 HATHI POTHI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "PUB NAGSANKAR",
+      "villageName": "F.S. 14/9 Diplonga",
+      "villageCode": "39212",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1072,6 +1799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHELOGURI HANUPAM 2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "F.s. 14/9 Diplonga",
+      "villageCode": "39212",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1112,6 +1847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DIPLONGA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "F.s. 14/9 Diplonga",
+      "villageCode": "39212",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1152,6 +1895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MERENA BORABHUYAN PART 1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "F.s. 15/7 Diplonga",
+      "villageCode": "39215",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1192,6 +1943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIPLONGA TE PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "F.s. 33/3 Diplonga",
+      "villageCode": "648174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1232,6 +1991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Diplonga PWSS upgradation",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "F.s. 33/3 Diplonga",
+      "villageCode": "648174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1272,6 +2039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONAI TE PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "Nlr 17/56 M.c. Bagicha",
+      "villageCode": "587244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1312,6 +2087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONAI BAGAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "Nlr225/374monaibagisa(no.1jai-",
+      "villageCode": "39213",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1352,6 +2135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONAPUR PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "No. 2 Tongia",
+      "villageCode": "648214",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1392,6 +2183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHELUGIRI HANUPAM PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "No.1 Chenga Mari",
+      "villageCode": "587237",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1432,6 +2231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "2 No. Notun Farm PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "PUB NAGSANKAR",
+      "villageName": "No.1 Diplonga",
+      "villageCode": "587121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1472,6 +2279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIPLONGA BAGAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "PUB NAGSANKAR",
+      "villageName": "No.1 Diplonga",
+      "villageCode": "587121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1512,6 +2327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIPLONGA 15 NO./2-NO_DIPOLONG_SCHEME PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "No.1 Diplonga",
+      "villageCode": "587121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1552,6 +2375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAGPUR PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "No.2 Chenga Mari",
+      "villageCode": "587233",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1592,6 +2423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOY SIDHI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "PUB NAGSANKAR",
+      "villageName": "No.2 Diplonga",
+      "villageCode": "39209",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1632,6 +2471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATHI BARI / BHANUPUR NO_1 HATHI BARI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "No.2 Diplonga",
+      "villageCode": "39209",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1672,6 +2519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIPLONGA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "Pub Nagsankar",
+      "villageName": "No.2 Diplonga",
+      "villageCode": "39209",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1712,6 +2567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MERENA BORABHUYAN PART 2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23183",
+      "panchayatname": "PUB NAGSANKAR",
+      "villageName": "No.3 Diplonga",
+      "villageCode": "587241",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1752,6 +2615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adabheti Part 2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "SOOTEA NO.1",
+      "villageName": "Adabheti",
+      "villageCode": "39149",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1792,6 +2663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adabheti Part 1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "SOOTEA NO.1",
+      "villageName": "Adabheti",
+      "villageCode": "39149",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1832,6 +2711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adabheti Part 3 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "SOOTEA NO.1",
+      "villageName": "Adabheti",
+      "villageCode": "39149",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1872,6 +2759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghiladharimukh Part-2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "SOOTEA NO.1",
+      "villageName": "Adabheti",
+      "villageCode": "39149",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1912,6 +2807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghiladharimukh Part-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Ghiladhari Mukh",
+      "villageCode": "39150",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1952,6 +2855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghiladharimukh Part-3 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Ghiladhari Mukh",
+      "villageCode": "39150",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -1992,6 +2903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Bhojmari PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Kalakati",
+      "villageCode": "39147",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2032,6 +2951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalakati PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Kalakati",
+      "villageCode": "39147",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2072,6 +2999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 4 Bhojmari Part-2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Kalakati",
+      "villageCode": "39147",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2112,6 +3047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KOROIONI PWSS (SD II)",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Kalakati",
+      "villageCode": "39147",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2152,6 +3095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boralimora PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Koroini",
+      "villageCode": "649511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2192,6 +3143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOROIANI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Koroini",
+      "villageCode": "649511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2232,6 +3191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.4 Bhojmari Part -1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Koroini",
+      "villageCode": "649511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2272,6 +3239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Phulbari Pt WSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "No.4 Bhojmari",
+      "villageCode": "586539",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2312,6 +3287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ovota WSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23177",
+      "panchayatname": "Sootea No.1",
+      "villageName": "Obhota Bil",
+      "villageCode": "586548",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2352,6 +3335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Sootea No. 2 (SAGY)",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23178",
+      "panchayatname": "Sootea No.2",
+      "villageName": "Niz-gorpal",
+      "villageCode": "39155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2392,6 +3383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nizgorpal PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23178",
+      "panchayatname": "Sootea No.2",
+      "villageName": "Niz-gorpal",
+      "villageCode": "39155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2432,6 +3431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ GORPAL PWSS (UPGRADATION)",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23178",
+      "panchayatname": "Sootea No.2",
+      "villageName": "Niz-gorpal",
+      "villageCode": "39155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2472,6 +3479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHUYANPARA PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "SOOTEA NO.3",
+      "villageName": "Bhuyan Para",
+      "villageCode": "587043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2512,6 +3527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tezalpatty PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Chaporial",
+      "villageCode": "39166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2552,6 +3575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kartigaon PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Chaporial",
+      "villageCode": "39166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2592,6 +3623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pahuchowa PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Chaporial",
+      "villageCode": "39166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2632,6 +3671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF POHUSOWA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Chaporial",
+      "villageCode": "39166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2672,6 +3719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pochowa Gaon PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Chaporial",
+      "villageCode": "39166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2712,6 +3767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amiokhiati Malor Gaon PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Dakhin Dol",
+      "villageCode": "39171",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2752,6 +3815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Solar Sonar PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Dakhin Dol",
+      "villageCode": "39171",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2792,6 +3863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LB Roadpub Malor PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Niz-chatia",
+      "villageCode": "39170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2832,6 +3911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kacharigaon Bagalibari PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Niz-chatia",
+      "villageCode": "39170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2872,6 +3959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chatial Bahuabari PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "Sootea No.3",
+      "villageName": "Niz-chatia",
+      "villageCode": "39170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2912,6 +4007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chariania PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "SOOTEA NO.3",
+      "villageName": "Niz-Chatia",
+      "villageCode": "39170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2952,6 +4055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUMARGAON PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23179",
+      "panchayatname": "SOOTEA NO.3",
+      "villageName": "Pathaka Kuri (Pathor)",
+      "villageCode": "39202",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -2992,6 +4103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakarapattta PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Bakara Patta",
+      "villageCode": "39236",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3032,6 +4151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBHETI PWSS -QA",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Barbhati",
+      "villageCode": "39240",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3072,6 +4199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borbheti 1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Barbhati",
+      "villageCode": "39240",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3112,6 +4247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Joypur Gereki PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Gareki Grant",
+      "villageCode": "586706",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3152,6 +4295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gerekigrant PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Gareki Grant",
+      "villageCode": "586706",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3192,6 +4343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JOYPUR GEREKI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Gareki Grant",
+      "villageCode": "586706",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3232,6 +4391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KHATOWAL PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Khatowal",
+      "villageCode": "39233",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3272,6 +4439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khatowal 1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Khatowal",
+      "villageCode": "39233",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3312,6 +4487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kurhati PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Kurhati",
+      "villageCode": "39237",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3352,6 +4535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Nalbari WSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "No.1 Nalbari",
+      "villageCode": "39243",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3392,6 +4583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 3 Nalbari PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "No.3 Nalbari",
+      "villageCode": "586666",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3432,6 +4631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Palasoni PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Palasani",
+      "villageCode": "39234",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3472,6 +4679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Charaijania PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Sarai Jania",
+      "villageCode": "586804",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3512,6 +4727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHARAIJONIA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23186",
+      "panchayatname": "Sootea No.4",
+      "villageName": "Sarai Jania",
+      "villageCode": "586804",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3552,6 +4775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BEJARHOLA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Bajar Hola",
+      "villageCode": "39186",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3592,6 +4823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "2 NO BEJARHOLA PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Bajar Hola",
+      "villageCode": "39186",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3632,6 +4871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SAPEKHATI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Bajar Hola",
+      "villageCode": "39186",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3672,6 +4919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DOLONGURI BORPAM PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Barpam",
+      "villageCode": "39179",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3712,6 +4967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAJGAON PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Barpam",
+      "villageCode": "39179",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3752,6 +5015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KASITAR MINI PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Barpam",
+      "villageCode": "39179",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3792,6 +5063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SAMAGURI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Chamaguri",
+      "villageCode": "39175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3832,6 +5111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Samaguri PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Chamaguri",
+      "villageCode": "39175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3872,6 +5159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHILADHARI NEW LINE PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Ghiladhari Basti",
+      "villageCode": "648152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3912,6 +5207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghiladharigaon PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Ghiladhari Basti",
+      "villageCode": "648152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3952,6 +5255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NC GHILADHARI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Ghiladhari Gaon",
+      "villageCode": "39176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -3992,6 +5303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GHILADHARIGAON PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Ghiladhari Gaon",
+      "villageCode": "39176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4032,6 +5351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHILADHARI 6 NO LINE PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Ghiladhari Gaon",
+      "villageCode": "39176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4072,6 +5399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PHUKANSANG MINI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Ghiladhari Gaon",
+      "villageCode": "39176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4112,6 +5447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ALIGURI KURMIGAON PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Magurmara",
+      "villageCode": "39174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4152,6 +5495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "North Sootea PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Magurmara",
+      "villageCode": "39174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4192,6 +5543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of North Sootea PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Magurmara",
+      "villageCode": "39174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4232,6 +5591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAGURMARA PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Magurmara",
+      "villageCode": "39174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4272,6 +5639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDOL MINI PWSS",
+      "districtCode": "775",
+      "districtName": "BISWANATH",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "SOOTEA NO.5",
+      "villageName": "Magurmara",
+      "villageCode": "39174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4312,6 +5687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sapekhati PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Sapeichaiti",
+      "villageCode": "39181",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4352,6 +5735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sapekhati PWSS(Upgradation)",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23180",
+      "panchayatname": "Sootea No.5",
+      "villageName": "Sapeichaiti",
+      "villageCode": "39181",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4392,6 +5783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatisal PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Bora-bhuyan",
+      "villageCode": "39187",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4432,6 +5831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalita Keot Chuburi PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Bora-bhuyan",
+      "villageCode": "39187",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4472,6 +5879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORABHUYAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Bora-bhuyan",
+      "villageCode": "39187",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4512,6 +5927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAROBHUYAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Bora-bhuyan",
+      "villageCode": "39187",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4552,6 +5975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Choipur WSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Ghahi Gaon",
+      "villageCode": "39197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4592,6 +6023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghahi Tatipara WSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Ghahi Gaon",
+      "villageCode": "39197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4632,6 +6071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghahi Muslim Part-2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Ghahi Gaon",
+      "villageCode": "39197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4672,6 +6119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GHAHIGAON PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Ghahi Gaon",
+      "villageCode": "39197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4712,6 +6167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghahigaon-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Ghahi Gaon",
+      "villageCode": "39197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4752,6 +6215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghahi Muslim Part-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Ghahi Gaon",
+      "villageCode": "39197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4792,6 +6263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hokajan-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Hokajan",
+      "villageCode": "39195",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4832,6 +6311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHANGAMARI HOKAJAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23181",
+      "panchayatname": "Sootea No.6",
+      "villageName": "Hokajan",
+      "villageCode": "39195",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4872,6 +6359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DIKORAI TE NLR 4/6 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "F/s 4/6 D.c. Bagicha",
+      "villageCode": "590458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4912,6 +6407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dikorai T E NLR 4/6 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "F/s 4/6 D.c. Bagicha",
+      "villageCode": "590458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4952,6 +6455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIKORAI TE PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "Nlr 34/7 Dikari Bagicha",
+      "villageCode": "648206",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -4992,6 +6503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dikorai TE NLR 42/42 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "Nlr 42/42 Dikari Bagicha",
+      "villageCode": "590457",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5032,6 +6551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIKARAI TE NLR 42/42 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "Nlr 42/42 Dikari Bagicha",
+      "villageCode": "590457",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5072,6 +6599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GUTIBARI PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "Nlr365/639 Dikari Bagicha",
+      "villageCode": "39220",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5112,6 +6647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Itakhola-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "No.1 Itakhola",
+      "villageCode": "39224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5152,6 +6695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ITAKHOLA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "No.1 Itakhola",
+      "villageCode": "39224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5192,6 +6743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ITAKHALA PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "No.1 Itakhola",
+      "villageCode": "39224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5232,6 +6791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TEZALPATTY TE PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "UTTAR NAGSANKAR",
+      "villageName": "No.1 Tezalpati",
+      "villageCode": "587255",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5272,6 +6839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.3 Balijuri Part-1 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "No.2 Balijuri",
+      "villageCode": "39225",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5312,6 +6887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SANTIPOOR BAGAN PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "No.2 Itakhola",
+      "villageCode": "590456",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5352,6 +6935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 3 Balijuri Part-2 PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "No.3 Balijuri",
+      "villageCode": "39222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5392,6 +6983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tengabasti PWSS",
+      "districtCode": "775",
+      "districtName": "Biswanath",
+      "blockcode": "1254",
+      "blockname": "Sootea",
+      "panchayatcode": "23184",
+      "panchayatname": "Uttar Nagsankar",
+      "villageName": "Tengabasti",
+      "villageCode": "39219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5432,6 +7031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ADABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Adabari Gaon",
+      "villageCode": "38329",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5472,6 +7079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adabari TE No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Adabari Gaon",
+      "villageCode": "38329",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5512,6 +7127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adabarigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Adabari Gaon",
+      "villageCode": "38329",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5552,6 +7175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adabari",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Adabari Gaon",
+      "villageCode": "38329",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5592,6 +7223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAMGAON GHORAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bam Gaon",
+      "villageCode": "38335",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5632,6 +7271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "10 No Line PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bam Gaon No.1",
+      "villageCode": "38328",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5672,6 +7319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamgaon No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23090",
+      "panchayatname": "BALIPARA",
+      "villageName": "Bam Gaon No.1",
+      "villageCode": "38328",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5712,6 +7367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAMGAON BAGISHA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23090",
+      "panchayatname": "BALIPARA",
+      "villageName": "Bam Gaon No.1",
+      "villageCode": "38328",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5752,6 +7415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bam Gaon Ghoramari",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bam Gaon No.1",
+      "villageCode": "38328",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5792,6 +7463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamgaon No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bam Gaon No.2",
+      "villageCode": "647385",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5832,6 +7511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amaribari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bherbheri Gaon",
+      "villageCode": "38331",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5872,6 +7559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bherbheri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bherbheri Gaon",
+      "villageCode": "38331",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5912,6 +7607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHERBHERI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bherbheri Gaon",
+      "villageCode": "38331",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5952,6 +7655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Bherbheri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bherbheri Gaon",
+      "villageCode": "38331",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -5992,6 +7703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BOKAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bokagaon",
+      "villageCode": "38330",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6032,6 +7751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOKAGAON pwss",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Bokagaon",
+      "villageCode": "38330",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6072,6 +7799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upper Kachari East MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23090",
+      "panchayatname": "BALIPARA",
+      "villageName": "Bokagaon",
+      "villageCode": "38330",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6112,6 +7847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Molan Pukhuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Molan Pukhuri",
+      "villageCode": "38334",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6152,6 +7895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JANGAL BASTI MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Molan Pukhuri",
+      "villageCode": "38334",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6192,6 +7943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOLON PUKHURI -B PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Molan Pukhuri",
+      "villageCode": "38334",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6232,6 +7991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pak Bil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23090",
+      "panchayatname": "Balipara",
+      "villageName": "Pak Bil",
+      "villageCode": "38333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6272,6 +8039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KUNDARBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Deka Chuburi Kudar Bari Gaon",
+      "villageCode": "38477",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6312,6 +8087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dihingia Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dihingia Gaon",
+      "villageCode": "38479",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6352,6 +8135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DIPOTA HATKHOLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dihingia Gaon",
+      "villageCode": "38479",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6392,6 +8183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DEKACHUBURI KUNDARBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dihingia Gaon",
+      "villageCode": "38479",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6432,6 +8231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dipota PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dipotahat Khola",
+      "villageCode": "38475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6472,6 +8279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Depota Hatkhola PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dipotahat Khola",
+      "villageCode": "38475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6512,6 +8327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Gatanga Kahdol PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dipotahat Khola",
+      "villageCode": "38475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6552,6 +8375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MODOPI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dipotahat Khola",
+      "villageCode": "38475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6592,6 +8423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MODOPI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Dipotahat Khola",
+      "villageCode": "38475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6632,6 +8471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Gatanga Kahdol PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Gatanga Kahdol",
+      "villageCode": "38476",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6672,6 +8519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Balipukhuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Gatanga Kahdol",
+      "villageCode": "38476",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6712,6 +8567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOTONGA KAHDOL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "Gatanga Kahdol",
+      "villageCode": "38476",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6752,6 +8615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Madapi TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23106",
+      "panchayatname": "Balipukhuri",
+      "villageName": "No.2 Madapi T.e.",
+      "villageCode": "647860",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6792,6 +8663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ARALILOGA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Araliloga",
+      "villageCode": "38378",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6832,6 +8711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Mari Gaon",
+      "villageCode": "647446",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6872,6 +8759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHALUKMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Mari Gaon",
+      "villageCode": "647446",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6912,6 +8807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhalukmari Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Mari Gaon",
+      "villageCode": "647446",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6952,6 +8855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Samlaga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Mari Pathar No.2",
+      "villageCode": "647841",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -6992,6 +8903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhalukpung Nigam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Pung No.1",
+      "villageCode": "38382",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7032,6 +8951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKPUNG NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Pung No.2",
+      "villageCode": "38379",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7072,6 +8999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHALUKPONG NO. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk Pung No.2",
+      "villageCode": "38379",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7112,6 +9047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "North Bhalukpong PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Bhaluk-pung Nigam",
+      "villageCode": "647840",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7152,6 +9095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHARIKATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Dharikati",
+      "villageCode": "38376",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7192,6 +9143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Dharikati PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Dharikati",
+      "villageCode": "38376",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7232,6 +9191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dharikati  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Dharikati",
+      "villageCode": "38376",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7272,6 +9239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DOLONGBASTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Dolang Basti F.v.",
+      "villageCode": "586663",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7312,6 +9287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gamani Ban Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Gamani Ban Gaon",
+      "villageCode": "38381",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7352,6 +9335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sotai Bongaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Satai Ban Gaon",
+      "villageCode": "38380",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7392,6 +9383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rihaljuli Koch Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Satai Ban Gaon",
+      "villageCode": "38380",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7432,6 +9431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Satai Namile PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Satai Namile",
+      "villageCode": "649494",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7472,6 +9479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopaloga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Sopaloga",
+      "villageCode": "38383",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7512,6 +9527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajan Mekhani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Tarajan Mekhani",
+      "villageCode": "649496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7552,6 +9575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajan Bongaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23096",
+      "panchayatname": "Bhalukmari",
+      "villageName": "Tarajan Mekhani",
+      "villageCode": "649496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7592,6 +9623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PAKHIAJHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Barpakhia Jhar",
+      "villageCode": "586918",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7632,6 +9671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAKHIAJHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Bindukuri Gaon",
+      "villageCode": "38402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7672,6 +9719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bindukuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Bindukuri Gaon",
+      "villageCode": "38402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7712,6 +9767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bindukuri No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Bindukuri T.e.(grant)",
+      "villageCode": "647770",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7752,6 +9815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Kathalguri TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Kathal Guri",
+      "villageCode": "586919",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7792,6 +9863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kathal Guri TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Kathal Guri T.e.",
+      "villageCode": "647820",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7832,6 +9911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kenduguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Kenduguri",
+      "villageCode": "38401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7872,6 +9959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khola Guti Kachari Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Khola Guti Kachari Gaon",
+      "villageCode": "38406",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7912,6 +10007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uhanipathar No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Lihani Pathar",
+      "villageCode": "586920",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7952,6 +10055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 2 KATHALGURI MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "No.2 Kathalguri T.e.",
+      "villageCode": "647821",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -7992,6 +10103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uhani Pathar No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Saikia Chuburi Barjhar",
+      "villageCode": "38397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8032,6 +10151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DEKARGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Saikia Chuburi Teleria",
+      "villageCode": "38399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8072,6 +10199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Saikia Chuburi Teleria PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23098",
+      "panchayatname": "Bindukuri",
+      "villageName": "Saikia Chuburi Teleria",
+      "villageCode": "38399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8112,6 +10247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMLOGA PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Amloga No.1",
+      "villageCode": "38432",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8152,6 +10295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amloga No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Amloga No.2",
+      "villageCode": "647463",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8192,6 +10343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHARIDUAR EAST WEST PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Bakola Gaon",
+      "villageCode": "38435",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8232,6 +10391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakola Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Bakola Gaon",
+      "villageCode": "38435",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8272,6 +10439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakula Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Bakola Pathar",
+      "villageCode": "647457",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8312,6 +10487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Charduar Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Chari Duar Gaon",
+      "villageCode": "38429",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8352,6 +10535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHARIDUAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Chari Duar Gaon",
+      "villageCode": "38429",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8392,6 +10583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHARIDUAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Chari Duar Gaon",
+      "villageCode": "38429",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8432,6 +10631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chengelimari Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Chengeli Mari Pathar",
+      "villageCode": "647794",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8472,6 +10679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Chengelimara RF PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23101",
+      "panchayatname": "CHARIDUAR",
+      "villageName": "Chengelimari R.F.",
+      "villageCode": "586705",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8512,6 +10727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jayanta Pur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Jayanta Pur",
+      "villageCode": "647801",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8552,6 +10775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kacharigaon Pambasti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Kachari Gaon Pambasti",
+      "villageCode": "649474",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8592,6 +10823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pub Phuloguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Phulaguri Garo Gaon",
+      "villageCode": "647458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8632,6 +10871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Phuloguri Garogaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Phulaguri Garo Gaon",
+      "villageCode": "647458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8672,6 +10919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Phulaguri Nishi -Kacharigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23101",
+      "panchayatname": "Chariduar",
+      "villageName": "Phulaguri Kachari No.2",
+      "villageCode": "647461",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8712,6 +10967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Deka Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Deka Chuburi",
+      "villageCode": "647495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8752,6 +11015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Patiachuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Deka Chuburi",
+      "villageCode": "647495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8792,6 +11063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PATIACHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Deka Chuburi",
+      "villageCode": "647495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8832,6 +11111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Dekargaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Dekar Gaon",
+      "villageCode": "647541",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8872,6 +11159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Harigaon No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Hari Gaon",
+      "villageCode": "38438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8912,6 +11207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Harigaon No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Hari Gaon",
+      "villageCode": "38438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8952,6 +11255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORTOL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Hari Gaon",
+      "villageCode": "38438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -8992,6 +11303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HARIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Hari Gaon",
+      "villageCode": "38438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9032,6 +11351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Harigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Hari Gaon",
+      "villageCode": "38438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9072,6 +11399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Parowa Bagicha No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Parowa Bagicha",
+      "villageCode": "38443",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9112,6 +11447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Parowa Bagicha No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Puthi Khati Gaon",
+      "villageCode": "38442",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9152,6 +11495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PUTHIKHATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Puthi Khati Gaon",
+      "villageCode": "38442",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9192,6 +11543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Saikia Chuburi Dekar Gaon No. 3 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Saikia Chuburi Dekar Gaon",
+      "villageCode": "38481",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9232,6 +11591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Saikia Chuburi Dekar Gaon No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Saikia Chuburi Dekar Gaon",
+      "villageCode": "38481",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9272,6 +11639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Saikia Chuburi Dekar Gaon No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Saikia Chuburi Dekar Gaon",
+      "villageCode": "38481",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9312,6 +11687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Udmari Barjhar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23102",
+      "panchayatname": "Dekargaon",
+      "villageName": "Udmari Barjhar",
+      "villageCode": "38441",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9352,6 +11735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baitha Bhanga Bangali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Baitha Bhanga Bangali",
+      "villageCode": "587009",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9392,6 +11783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barpat Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Barpat Gaon",
+      "villageCode": "586969",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9432,6 +11831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dhekidol PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Bata Bari No.1",
+      "villageCode": "38462",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9472,6 +11879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NO. 1 BATABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Bata Bari No.1",
+      "villageCode": "38462",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9512,6 +11927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHEKIDOL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Bata Bari No.1",
+      "villageCode": "38462",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9552,6 +11975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Batabari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Bata Bari No.1",
+      "villageCode": "38462",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9592,6 +12023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHAPAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Chapaguri",
+      "villageCode": "38463",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9632,6 +12071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hahchora PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Chapaguri",
+      "villageCode": "38463",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9672,6 +12119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HAHCHURA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Chapaguri",
+      "villageCode": "38463",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9712,6 +12167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghoramora PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Ghoramora",
+      "villageCode": "38467",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9752,6 +12215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Panbari",
+      "villageCode": "38460",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9792,6 +12263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sarupatgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Sarupat Gaon",
+      "villageCode": "38465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9832,6 +12311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tubukijhar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Tubuki Jar",
+      "villageCode": "38464",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9872,6 +12359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uhani Pathar Batabari No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Uhani Pathar Batabari",
+      "villageCode": "647785",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9912,6 +12407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uhani Pathar Batabari No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Uhani Pathar Batabari",
+      "villageCode": "647785",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9952,6 +12455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uhani Pathar Dhekidal PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23104",
+      "panchayatname": "Ghoramari",
+      "villageName": "Uhani Pathar Dhekidal",
+      "villageCode": "647786",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -9992,6 +12503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Azarbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Azar Bari",
+      "villageCode": "593896",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10032,6 +12551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALAPARA NO.1 MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Balapara (a) No.1",
+      "villageCode": "587139",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10072,6 +12599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barkhapur MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Barkhapur",
+      "villageCode": "649469",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10112,6 +12647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Bogibil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Bogibil",
+      "villageCode": "38473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10152,6 +12695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pachim Bogibil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Bogibil",
+      "villageCode": "38473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10192,6 +12743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pub Bogibil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Bogibil",
+      "villageCode": "38473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10232,6 +12791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bogijuli No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Bongijuli No.1",
+      "villageCode": "586800",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10272,6 +12839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dafala Bil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Dafala Bil",
+      "villageCode": "587189",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10312,6 +12887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dipanjali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Dipanjali Part (a)",
+      "villageCode": "587167",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10352,6 +12935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DOPDOPI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Dopdopi",
+      "villageCode": "38471",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10392,6 +12983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DOPDOPI RANGPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Dopdopi Rangapur (a)",
+      "villageCode": "647813",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10432,6 +13031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GANESHPUR MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Ganesh Pur",
+      "villageCode": "593899",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10472,6 +13079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GANESHPUR NO.4 MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Ganeshpur No.4",
+      "villageCode": "647810",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10512,6 +13127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gaonjan Bil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Gaor Jan Bil",
+      "villageCode": "587173",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10552,6 +13175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gerjuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Gergua Juli No.3",
+      "villageCode": "647818",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10592,6 +13223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 GERGUAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Gerjuli No.1",
+      "villageCode": "647817",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10632,6 +13271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GOTAMORA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Gor Mara Gaon",
+      "villageCode": "38472",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10672,6 +13319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "2 No. Gormora PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Gor Mara Gaon",
+      "villageCode": "38472",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10712,6 +13367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOTAMORA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Gor Mara Gaon",
+      "villageCode": "38472",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10752,6 +13415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GORMORA JOYPUR MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Joy Pur",
+      "villageCode": "649473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10792,6 +13463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalabil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Kalabil No.2",
+      "villageCode": "647638",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10832,6 +13511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalany TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Kalany T.e. (1)",
+      "villageCode": "647788",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10872,6 +13559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Kalani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Kalany T.e. (1)",
+      "villageCode": "647788",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10912,6 +13607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kailajuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Kaliajuli No.1",
+      "villageCode": "587236",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10952,6 +13655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kerimari MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Kerimari Betbari",
+      "villageCode": "587176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -10992,6 +13703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LAIGANGPARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Laigang Para",
+      "villageCode": "587168",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11032,6 +13751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Lal Barahi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Lal-barahi",
+      "villageCode": "587144",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11072,6 +13799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Lal Barahi No.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Lal-barahi No.1",
+      "villageCode": "647632",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11112,6 +13847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MILANPUR No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Milan Pur",
+      "villageCode": "587155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11152,6 +13895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MILANPUR No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Milan Pur",
+      "villageCode": "587155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11192,6 +13943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uttar Molan Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Molan Gaon",
+      "villageCode": "38470",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11232,6 +13991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.12 Molangaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Molan Gaon No.12",
+      "villageCode": "647631",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11272,6 +14039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dakhin Molan Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Molan Gaon No.12",
+      "villageCode": "647631",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11312,6 +14087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nalghagari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Nalghagari",
+      "villageCode": "587060",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11352,6 +14135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Oujuli Rangagora PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Oujuli Rangagora",
+      "villageCode": "587145",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11392,6 +14183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mansiri Sonapur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Pachim Mansiri",
+      "villageCode": "593897",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11432,6 +14231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sourangjuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Sourang Juli",
+      "villageCode": "587172",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11472,6 +14279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarabari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Tara Bari (a)",
+      "villageCode": "647811",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11512,6 +14327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dholkoba Line No. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Tenga Bil",
+      "villageCode": "587177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11552,6 +14375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tenga bil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Tenga Bil",
+      "villageCode": "587177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11592,6 +14423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dholkoba Line 9 MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Tenga Bil",
+      "villageCode": "587177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11632,6 +14471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thaigir Bari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Thaighir Bori (a.b.c.)",
+      "villageCode": "587137",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11672,6 +14519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thekeraloga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Thekeraloga",
+      "villageCode": "38431",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11712,6 +14567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uppar Molagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Uppar Molan Gaon",
+      "villageCode": "647807",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11752,6 +14615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGIBIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Urohiloga Ban Gaon",
+      "villageCode": "622873",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11792,6 +14663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JOGIBIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Urohiloga Ban Gaon",
+      "villageCode": "622873",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11832,6 +14711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uttar Mansiri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23105",
+      "panchayatname": "Gormara",
+      "villageName": "Uttar Niansiri",
+      "villageCode": "649467",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11872,6 +14759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Betani Jhar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Betani Jhar",
+      "villageCode": "38425",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11912,6 +14807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chitabosti  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Betani Jhar",
+      "villageCode": "38425",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11952,6 +14855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GOROIMARI BORPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Goroi Mari Borpukhuri",
+      "villageCode": "38420",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -11992,6 +14903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Renganijar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Goroi Mari Borpukhuri",
+      "villageCode": "38420",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12032,6 +14951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOROIMARI BORPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Goroi Mari Borpukhuri",
+      "villageCode": "38420",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12072,6 +14999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Niz Haleswar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Holeswar Devalaya",
+      "villageCode": "38422",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12112,6 +15047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NIZ HALESWAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Holeswar Devalaya",
+      "villageCode": "38422",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12152,6 +15095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Haleswar",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Niz-haleswar",
+      "villageCode": "38424",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12192,6 +15143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Ghogora T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "No.1 Ghogora T.e.",
+      "villageCode": "647543",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12232,6 +15191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NO.2 GHOGRA TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "No.2 Ghogora T.e.",
+      "villageCode": "38426",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12272,6 +15239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Ghogora T.E.(East) PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "No.2 Ghogra R.g.",
+      "villageCode": "648219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12312,6 +15287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RENGANIJHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23100",
+      "panchayatname": "Haleswar",
+      "villageName": "Rengani Jhar",
+      "villageCode": "38418",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12352,6 +15335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dolongbasti Dafala PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Dalang Basti Dafala",
+      "villageCode": "649387",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12392,6 +15383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dafala Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23095",
+      "panchayatname": "LOKRA",
+      "villageName": "Dofala Pathar",
+      "villageCode": "647837",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12432,6 +15431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dolongbasti FV PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Dowang Bari Dafala",
+      "villageCode": "38372",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12472,6 +15479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF LAKHRA DAFALA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Lokra Dafala Gaon",
+      "villageCode": "647605",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12512,6 +15527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LAKHRA DAFOLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Lokra Dafala Gaon",
+      "villageCode": "647605",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12552,6 +15575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Meherbasti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Meher Basti Forest",
+      "villageCode": "649478",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12592,6 +15623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonai Miri Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Sonai Miri Gaon",
+      "villageCode": "586650",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12632,6 +15671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonai Nepali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Sonai Nepali",
+      "villageCode": "647838",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12672,6 +15719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonai Pam Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23095",
+      "panchayatname": "Lokra",
+      "villageName": "Sonai Pam Gaon",
+      "villageCode": "38375",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12712,6 +15767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MANSIRI BHAITHABHANGA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Baitha Bhanga Gaon",
+      "villageCode": "38358",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12752,6 +15815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORGHULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Barghuli",
+      "villageCode": "38360",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12792,6 +15863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kachu Bil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Kachu Bil",
+      "villageCode": "38356",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12832,6 +15911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KALIABHATA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Mansiri",
+      "villageCode": "38357",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12872,6 +15959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kaliabhata PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Mansiri",
+      "villageCode": "38357",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12912,6 +16007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pubmansiri MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Pubmansiri",
+      "villageCode": "647863",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12952,6 +16055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Berajan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Pubmansiri",
+      "villageCode": "647863",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -12992,6 +16103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ran Gajan Miri Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Ran Gajan Miri Pathar",
+      "villageCode": "38359",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13032,6 +16151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rangajan Miri Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23093",
+      "panchayatname": "MANSIRI",
+      "villageName": "Ranga Jan Miri Gaon",
+      "villageCode": "647616",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13072,6 +16199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Raumari Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Raumari Pathar",
+      "villageCode": "647823",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13112,6 +16247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Roumari Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Roumari Gaon",
+      "villageCode": "38361",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13152,6 +16295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SILGHAGARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Silghagari Gaon",
+      "villageCode": "38355",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13192,6 +16343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Silghagari Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23093",
+      "panchayatname": "Mansiri",
+      "villageName": "Silghagari Pathar",
+      "villageCode": "647824",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13232,6 +16391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ahata Guri Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Ahata Guri Gaon",
+      "villageCode": "586947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13272,6 +16439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAGHSUNG BALITIKA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Ahata Guri Gaon",
+      "villageCode": "586947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13312,6 +16487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGHSUNG BALITIKA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Ahata Guri Gaon",
+      "villageCode": "586947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13352,6 +16535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF AMOLAPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Amola Pam Gaon",
+      "villageCode": "38450",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13392,6 +16583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhaluk Jharani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Bhaluk Jharani",
+      "villageCode": "586926",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13432,6 +16631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JUGLONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23103",
+      "panchayatname": "NAPAM",
+      "villageName": "Bhaluk Jharani",
+      "villageCode": "586926",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13472,6 +16679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhitor Parowa Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Bhitor Parowa Gaon",
+      "villageCode": "38439",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13512,6 +16727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Borguri Gaon",
+      "villageCode": "38455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13552,6 +16775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boraguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Borguri Gaon",
+      "villageCode": "38455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13592,6 +16823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JUGLANI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Jaglowani",
+      "villageCode": "38459",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13632,6 +16871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kasha Kani Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Kasha Kani Gaon",
+      "villageCode": "38457",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13672,6 +16919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Na-pam Gaon",
+      "villageCode": "38449",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13712,6 +16967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Na-pam Gaon",
+      "villageCode": "38449",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13752,6 +17015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Napam North PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Na-pam Gaon",
+      "villageCode": "38449",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13792,6 +17063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Parmaighuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Parmai Gauli Gaon",
+      "villageCode": "38454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13832,6 +17111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Parmaighuli South PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Parmai Gauli Gaon",
+      "villageCode": "38454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13872,6 +17159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bam Parowa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Parowa Gaon",
+      "villageCode": "38453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13912,6 +17207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Parowa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Parowa Gaon",
+      "villageCode": "38453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13952,6 +17255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New  P u n i o n i  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Puniani Gaon",
+      "villageCode": "38451",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -13992,6 +17303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUNIONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Puniani Gaon",
+      "villageCode": "38451",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14032,6 +17351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PUNIONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Puniani Gaon",
+      "villageCode": "38451",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14072,6 +17399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rupkuria No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Rupkuria Gaon",
+      "villageCode": "38456",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14112,6 +17447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rupkuria PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Rupkuria Gaon",
+      "villageCode": "38456",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14152,6 +17495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Salmara Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23103",
+      "panchayatname": "Napam",
+      "villageName": "Salmara Gaon",
+      "villageCode": "38458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14192,6 +17543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bokajan No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Bokajan",
+      "villageCode": "38321",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14232,6 +17591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bokajan No 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Bokajan",
+      "villageCode": "38321",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14272,6 +17639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Malijan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Bokajan",
+      "villageCode": "38321",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14312,6 +17687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MALIJAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Bokajan",
+      "villageCode": "38321",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14352,6 +17735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SONABIL TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Bokajan",
+      "villageCode": "38321",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14392,6 +17783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chala TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Chala T.e.",
+      "villageCode": "647628",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14432,6 +17831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chalabasti Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Chalabasti Gaon",
+      "villageCode": "38327",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14472,6 +17879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHALAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Chalabasti Gaon",
+      "villageCode": "38327",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14512,6 +17927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHITABASTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Chalabasti Gaon",
+      "villageCode": "38327",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14552,6 +17975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chalagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Chola Gaon",
+      "villageCode": "647627",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14592,6 +18023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chola Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Chola Gaon",
+      "villageCode": "647627",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14632,6 +18071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonabil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Goraimari (niz)",
+      "villageCode": "38323",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14672,6 +18119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Goraimari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "Goraimari (niz)",
+      "villageCode": "38323",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14712,6 +18167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Malijan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23089",
+      "panchayatname": "Niz-goroimari",
+      "villageName": "No.1 Malijan",
+      "villageCode": "647625",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14752,6 +18215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Akabasti Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Akabasti Bangali",
+      "villageCode": "38341",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14792,6 +18263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF AKABASTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Akabasti Bangali",
+      "villageCode": "38341",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14832,6 +18311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Akabasti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Akabasti Gaon",
+      "villageCode": "38415",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14872,6 +18359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bokagaon Chapori PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Boka Gaon Chapari",
+      "villageCode": "647389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14912,6 +18407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gorali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Gorali",
+      "villageCode": "38346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14952,6 +18455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GUDAMGHAT PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Gudamghat Gaon",
+      "villageCode": "38339",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -14992,6 +18503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GUDAMGHAT PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Gudamghat Gaon",
+      "villageCode": "38339",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15032,6 +18551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gudamghat Kachari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Gudamghat Gaon Kachari",
+      "villageCode": "647610",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15072,6 +18599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gudamghat Miri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Gudamghat Miri",
+      "villageCode": "38345",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15112,6 +18647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kanyaghat PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Gudamghat P.g.r.",
+      "villageCode": "647609",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15152,6 +18695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KEKAKULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Kekokali Miri",
+      "villageCode": "38343",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15192,6 +18743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kekokoli Nepali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Kekokali Nepali",
+      "villageCode": "38348",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15232,6 +18791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dakhin Khanamukh PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Khonamukh",
+      "villageCode": "38338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15272,6 +18839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khanamukh PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Khonamukh",
+      "villageCode": "38338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15312,6 +18887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KHANAMUKH PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Khonamukh",
+      "villageCode": "38338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15352,6 +18935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Miri Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "No.2 Miri Pathar",
+      "villageCode": "38340",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15392,6 +18983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Miri pathar (Rajgarh) PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "No.2 Miri Pathar",
+      "villageCode": "38340",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15432,6 +19031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rangajan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23091",
+      "panchayatname": "Rangajan",
+      "villageName": "Rangajan",
+      "villageCode": "38347",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15472,6 +19079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barghat PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Barghat",
+      "villageCode": "647444",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15512,6 +19127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bihia Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Bihia Gaon",
+      "villageCode": "38352",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15552,6 +19175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAMDHARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Cham Dhara",
+      "villageCode": "38351",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15592,6 +19223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Chamdhara PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Cham Dhara",
+      "villageCode": "38351",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15632,6 +19271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DIKORAIJAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Dikrai Jan",
+      "villageCode": "38349",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15672,6 +19319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIKORAIJAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Dikrai Jan",
+      "villageCode": "38349",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15712,6 +19367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Korokani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23092",
+      "panchayatname": "Samdhara",
+      "villageName": "Korokani",
+      "villageCode": "38350",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15752,6 +19415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Akabasti Miri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Akabasti Miri",
+      "villageCode": "647608",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15792,6 +19463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bali Gaon Miri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Bali Gaon Miri",
+      "villageCode": "38410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15832,6 +19511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SILONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Bali Gaon Miri",
+      "villageCode": "38410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15872,6 +19559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": " Bharali Chapori No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Bharali Chapari No.1",
+      "villageCode": "647448",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15912,6 +19607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Bharali Chapori PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "BALIPARA",
+      "panchayatcode": "23099",
+      "panchayatname": "SILONI",
+      "villageName": "Bharali Chapari No.2",
+      "villageCode": "647449",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15952,6 +19655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boka Gaon Miri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Boka Gaon Miri",
+      "villageCode": "586991",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -15992,6 +19703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Buragaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Bura Gaon No.2",
+      "villageCode": "647603",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16032,6 +19751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BURAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Bura Gaon No.2",
+      "villageCode": "647603",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16072,6 +19799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BURAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Bura Gaon No.2",
+      "villageCode": "647603",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16112,6 +19847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Buragaon No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Buragaon No.1",
+      "villageCode": "647602",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16152,6 +19895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Buragaon T.E PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Buragaon T.e.",
+      "villageCode": "38412",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16192,6 +19943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Chillani Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Chilani Bengali",
+      "villageCode": "647606",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16232,6 +19991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Siloni PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Chilani Bengali",
+      "villageCode": "647606",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16272,6 +20039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chiloni Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Chilani Bengali",
+      "villageCode": "647606",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16312,6 +20087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chilanigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Chilani Gaon",
+      "villageCode": "38408",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16352,6 +20135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chillani Nepali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Chilani Nepali",
+      "villageCode": "38413",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16392,6 +20183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dowang Bari Dafala PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Ghoramari Bura Gaon",
+      "villageCode": "586923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16432,6 +20231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GORMORA BURAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Ghoramari Bura Gaon",
+      "villageCode": "586923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16472,6 +20279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kolabari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "Kolabari",
+      "villageCode": "38414",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16512,6 +20327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Miri Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23099",
+      "panchayatname": "Siloni",
+      "villageName": "No.1 Miri Pathar",
+      "villageCode": "38417",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16552,6 +20375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BERAJAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Berajan",
+      "villageCode": "586604",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16592,6 +20423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khaliha Mari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Khaliha Mari",
+      "villageCode": "38365",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16632,6 +20471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pung Pani Bangali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Pung Pani Bangali",
+      "villageCode": "38368",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16672,6 +20519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rajgor PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Rajgor",
+      "villageCode": "38362",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16712,6 +20567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": " Rajgorh Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Rajgorh Gaon",
+      "villageCode": "647825",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16752,6 +20615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SINGRITOLI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Singitali Gaon",
+      "villageCode": "38366",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16792,6 +20663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRITOLI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Singitali Gaon",
+      "villageCode": "38366",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16832,6 +20711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tinikhari Miri Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23094",
+      "panchayatname": "Singitoli",
+      "villageName": "Tinikhari Miri Gaon",
+      "villageCode": "38364",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16872,6 +20759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Eragaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Ara Gaon",
+      "villageCode": "38387",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16912,6 +20807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ERAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Ara Gaon",
+      "villageCode": "38387",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16952,6 +20855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Aragaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Ara Gaon",
+      "villageCode": "38387",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -16992,6 +20903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF UDMARI BALIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Ara Gaon",
+      "villageCode": "38387",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17032,6 +20951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhobolagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Bhobola Gaon",
+      "villageCode": "38395",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17072,6 +20999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhobolagaon Bangali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Bhobola Gaon Bangali",
+      "villageCode": "647392",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17112,6 +21047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHEKERIGAON NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Dhekeri Gaon",
+      "villageCode": "38392",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17152,6 +21095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Dighaligaon MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Dighali Gaon",
+      "villageCode": "38388",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17192,6 +21143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dighali Balijan MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Dighali Gaon",
+      "villageCode": "38388",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17232,6 +21191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dighaligaon East PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Dighali Gaon",
+      "villageCode": "38388",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17272,6 +21239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DIGHALIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Dighali Gaon",
+      "villageCode": "38388",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17312,6 +21287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Molan Gaon Kachari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Molan Gaon Kachari",
+      "villageCode": "38396",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17352,6 +21335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "OUHOLA GAON B MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Ouhola Gaon",
+      "villageCode": "38386",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17392,6 +21383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ouhola Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Ouhola Gaon",
+      "villageCode": "38386",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17432,6 +21431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Udmari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Udmari Gaon (1)",
+      "villageCode": "38389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17472,6 +21479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UDMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Udmari Gaon (1)",
+      "villageCode": "38389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17512,6 +21527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF UDMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Udmari Gaon (1)",
+      "villageCode": "38389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17552,6 +21575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHAKATGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1246",
+      "blockname": "Balipara",
+      "panchayatcode": "23097",
+      "panchayatname": "Udmari",
+      "villageName": "Udmari Gaon (2)",
+      "villageCode": "38390",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17592,6 +21623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BEBEJIA (SD I) PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Bebezia Gaon",
+      "villageCode": "38306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17632,6 +21671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bebejia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Bebezia Gaon",
+      "villageCode": "38306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17672,6 +21719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Singia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Bebezia Gaon",
+      "villageCode": "38306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17712,6 +21767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SINGIA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Bebezia Gaon",
+      "villageCode": "38306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17752,6 +21815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Da Besseria PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Da-gaon Pukhuria",
+      "villageCode": "38307",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17792,6 +21863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baga Bora Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Da-gaon Pukhuria",
+      "villageCode": "38307",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17832,6 +21911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KALITA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Da-gaon Pukhuria",
+      "villageCode": "38307",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17872,6 +21959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Katanatika PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Sopora Chuburi",
+      "villageCode": "38305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17912,6 +22007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KATANATIKA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Sopora Chuburi",
+      "villageCode": "38305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17952,6 +22055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bam Besseria PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Sopora Chuburi",
+      "villageCode": "38305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -17992,6 +22103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOPORA CHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Sopora Chuburi",
+      "villageCode": "38305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18032,6 +22151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Sopora Chuburi",
+      "villageCode": "38305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18072,6 +22199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sapora Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23087",
+      "panchayatname": "Beseria",
+      "villageName": "Sopora Chuburi",
+      "villageCode": "38305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18112,6 +22247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BATAMARIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Batamari",
+      "villageCode": "38280",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18152,6 +22295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batamarigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Batamari",
+      "villageCode": "38280",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18192,6 +22343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batamari-B PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Batamari",
+      "villageCode": "38280",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18232,6 +22391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhojkhowa Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhoj Khowa Gaon",
+      "villageCode": "38281",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18272,6 +22439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Bhojkhowa Chapori PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhojkhowa Chapari",
+      "villageCode": "38288",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18312,6 +22487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHOJKHOWA CHAPORI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhojkhowa Chapari",
+      "villageCode": "38288",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18352,6 +22535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOJKHOWA CHAPORI (ARP QUALITY)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhojkhowa Chapari",
+      "villageCode": "38288",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18392,6 +22583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhomoraguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhomoraguri",
+      "villageCode": "38285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18432,6 +22631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHOMORAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhomoraguri",
+      "villageCode": "38285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18472,6 +22679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Bhomoraguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhomoraguri",
+      "villageCode": "38285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18512,6 +22727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhomoraguri RF MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Bhomoraguri R.f.",
+      "villageCode": "38282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18552,6 +22775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHATAI CHAPORI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Chatai Chapari Gaon",
+      "villageCode": "38287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18592,6 +22823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chatai Chapori F AWC",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Chatai Chapari Gaon",
+      "villageCode": "38287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18632,6 +22871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAJBHARAL KACHARIPAM PWSS (ARP QUALITY)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Kachari Pam",
+      "villageCode": "38286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18672,6 +22919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kacharipam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Kachari Pam",
+      "villageCode": "38286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18712,6 +22967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RAJBHARAL KACHARIPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23084",
+      "panchayatname": "Bhomoraguri",
+      "villageName": "Kachari Pam",
+      "villageCode": "38286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18752,6 +23015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sutichuk PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Bhito Suti Gaon",
+      "villageCode": "38295",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18792,6 +23063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHITORSUTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Bhito Suti Gaon",
+      "villageCode": "38295",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18832,6 +23111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhitarsuti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Bhito Suti Gaon",
+      "villageCode": "38295",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18872,6 +23159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gandhinagar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Gutlong Gaon (ct)",
+      "villageCode": "38290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18912,6 +23207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nayabasti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Gutlong Gaon (ct)",
+      "villageCode": "38290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18952,6 +23255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GOTLONG PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Gutlong Gaon (ct)",
+      "villageCode": "38290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -18992,6 +23303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gotlong PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Gutlong Gaon (ct)",
+      "villageCode": "38290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19032,6 +23351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Santipara PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Gutlong Gaon (ct)",
+      "villageCode": "38290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19072,6 +23399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jahajdoba PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Jahajduba Gaon",
+      "villageCode": "38291",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19112,6 +23447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khanamukh New PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Khanamukh Gaon",
+      "villageCode": "38293",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19152,6 +23495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mazartika PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "Khanamukh Gaon",
+      "villageCode": "38293",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19192,6 +23543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF 1 NO. DOLABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "No.1 Dolabari",
+      "villageCode": "38292",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19232,6 +23591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No1 Dolabari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "No.1 Dolabari",
+      "villageCode": "38292",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19272,6 +23639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DOLABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "No.2 Dolabari",
+      "villageCode": "38296",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19312,6 +23687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DOLABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "No.2 Dolabari",
+      "villageCode": "38296",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19352,6 +23735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Suraj PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23085",
+      "panchayatname": "Dolabari",
+      "villageName": "No.2 Dolabari",
+      "villageCode": "38296",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19392,6 +23783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HAZARAPAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Dekargaon",
+      "villageCode": "668078",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19432,46 +23831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KETEKIBARI PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.8192456",
-      "name": "RETROFITTING OF DEORIGAON PWSS",
-      "description": "RETROFITTING OF DEORIGAON PWSS",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "RETROFITTING OF DEORIGAON PWSS",
-        "localName": "RETROFITTING OF DEORIGAON PWSS",
-        "districtCode": "49",
-        "districtName": "Sonitpur",
-        "blockcode": "1245",
-        "blockname": "Gabhoru",
-        "panchayatcode": "23081",
-        "panchayatname": "Mazgaon",
-        "villageCode": "38258",
-        "villageName": "Kumar Gaon",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "8192456",
-        "ddrName": "RETROFITTING OF DEORIGAON PWSS",
-        "projectId": "8192456",
-        "regionName": "1245"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "RETROFITTING OF DEORIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Dekargaon",
+      "villageCode": "668078",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19512,6 +23879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Deorigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Kumar Gaon",
+      "villageCode": "38258",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19552,6 +23927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF USHA NAGAR MURHATETELI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19592,6 +23975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MARABHARALIPAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19632,6 +24023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mazgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19672,6 +24071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Marabharalipar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19712,6 +24119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Marabharalipar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19752,46 +24167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BASANTIPUR PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.8192257",
-      "name": "RETROFITTING OF MAZGAON PWSS",
-      "description": "RETROFITTING OF MAZGAON PWSS",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "RETROFITTING OF MAZGAON PWSS",
-        "localName": "RETROFITTING OF MAZGAON PWSS",
-        "districtCode": "49",
-        "districtName": "Sonitpur",
-        "blockcode": "1245",
-        "blockname": "Gabhoru",
-        "panchayatcode": "23081",
-        "panchayatname": "Mazgaon",
-        "villageCode": "38253",
-        "villageName": "Majgaon (ct)",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "8192257",
-        "ddrName": "RETROFITTING OF MAZGAON PWSS",
-        "projectId": "8192257",
-        "regionName": "1245"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "RETROFITTING OF MAZGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19832,6 +24215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mission Chariali MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19872,6 +24263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Mazgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19912,6 +24311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mazgaon PWSS(Upgradation)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19952,6 +24359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Usha Nagar-Murha Teteli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23081",
+      "panchayatname": "Mazgaon",
+      "villageName": "Majgaon (ct)",
+      "villageCode": "38253",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -19992,6 +24407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panchmile MVS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Ali Singa Urium Guri",
+      "villageCode": "38277",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20032,6 +24455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panchmile PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Ali Singa Urium Guri",
+      "villageCode": "38277",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20072,6 +24503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ali Singa Urium Guri",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Ali Singa Urium Guri",
+      "villageCode": "38277",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20112,6 +24551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PURONI ALIMUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Alisinga Gaon",
+      "villageCode": "38274",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20152,6 +24599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Makua Chapari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "No.1 Makua Chapari",
+      "villageCode": "586393",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20192,6 +24647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BIHIYA GAON TINI ALI LPS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "No.1 Makua Chapari",
+      "villageCode": "586393",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20232,6 +24695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Purani Alimur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Purani Alimur",
+      "villageCode": "38276",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20272,6 +24743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tinimile PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Urium Guri Gaon",
+      "villageCode": "38271",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20312,6 +24791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF TINIMILE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Urium Guri Gaon",
+      "villageCode": "38271",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20352,6 +24839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF URIAMGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Urium Guri Gaon",
+      "villageCode": "38271",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20392,6 +24887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "URIUMGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Urium Guri Gaon",
+      "villageCode": "38271",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20432,6 +24935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "1 NO URIAMGURI LPS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23083",
+      "panchayatname": "Panch Mile",
+      "villageName": "Urium Guri Gaon",
+      "villageCode": "38271",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20472,6 +24983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DA ATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-ati Gaon",
+      "villageCode": "38304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20512,6 +25031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonarigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-ati Gaon",
+      "villageCode": "38304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20552,6 +25079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DA-ATI",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-ati Gaon",
+      "villageCode": "38304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20592,6 +25127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAM PARBATIA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20632,6 +25175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Bam Parbatia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20672,6 +25223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bam Parbatia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20712,6 +25271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NEW DA-ATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20752,6 +25319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Deuri Chuk PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20792,6 +25367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF LACHIT NAGAR RUDRAPATH PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20832,6 +25415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Lachitnagar-Rudrapath PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20872,6 +25463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajan Kumargaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23086",
+      "panchayatname": "Parbatia",
+      "villageName": "Da-parbatia Gaon",
+      "villageCode": "38297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20912,6 +25511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JORGARH PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "Jorgarh",
+      "villageCode": "38311",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20952,6 +25559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JORGARH PWSS (ARP)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "Jorgarh",
+      "villageCode": "38311",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -20992,6 +25607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KOROIONI PWSS (SD I)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "Karaiani Bangali Gaon",
+      "villageCode": "38315",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21032,6 +25655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAROINI PWSS (MNP)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "Karaiani Bangali Gaon",
+      "villageCode": "38315",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21072,6 +25703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Islampur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "Karaiani Nepali Gaon",
+      "villageCode": "38313",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21112,6 +25751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Siruani MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "No.1 Siruani",
+      "villageCode": "38312",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21152,46 +25799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 4 Siruani PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.1842301",
-      "name": "Balichapari PWSS",
-      "description": "Balichapari PWSS",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "Balichapari PWSS",
-        "localName": "Balichapari PWSS",
-        "districtCode": "49",
-        "districtName": "Sonitpur",
-        "blockcode": "1245",
-        "blockname": "Gabhoru",
-        "panchayatcode": "23082",
-        "panchayatname": "Ushapur",
-        "villageCode": "38265",
-        "villageName": "Bali Chapari",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "1842301",
-        "ddrName": "Balichapari PWSS",
-        "projectId": "1842301",
-        "regionName": "1245"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "Balichapari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23088",
+      "panchayatname": "Rajgarh",
+      "villageName": "No.4 Siruani",
+      "villageCode": "38314",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21232,6 +25847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BURACHAPORI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Bali Chapari",
+      "villageCode": "38265",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21272,46 +25895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Balichapori PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.8153399",
-      "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
-      "description": "RETROFITTING OF BARIKA CHUBURI PWSS",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "RETROFITTING OF BARIKA CHUBURI PWSS",
-        "localName": "RETROFITTING OF BARIKA CHUBURI PWSS",
-        "districtCode": "49",
-        "districtName": "Sonitpur",
-        "blockcode": "1245",
-        "blockname": "Gabhoru",
-        "panchayatcode": "23082",
-        "panchayatname": "Ushapur",
-        "villageCode": "38262",
-        "villageName": "Barika Chuburi (ct)",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "8153399",
-        "ddrName": "RETROFITTING OF BARIKA CHUBURI PWSS",
-        "projectId": "8153399",
-        "regionName": "1245"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "RETROFITTING OF BARIKA CHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Bali Chapari",
+      "villageCode": "38265",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21352,6 +25943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamungaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21392,6 +25991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barika Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21432,6 +26039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Darikial Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21472,6 +26087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RUBBER BAGAN INDIRA NAGAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21512,6 +26135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rubber Bagan-Indira Nagar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21552,46 +26183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Muslim Gaon PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.8184281",
-      "name": "RETROFITTING OF NEW KALIBARI PWSS",
-      "description": "RETROFITTING OF NEW KALIBARI PWSS",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "RETROFITTING OF NEW KALIBARI PWSS",
-        "localName": "RETROFITTING OF NEW KALIBARI PWSS",
-        "districtCode": "49",
-        "districtName": "Sonitpur",
-        "blockcode": "1245",
-        "blockname": "Gabhoru",
-        "panchayatcode": "23082",
-        "panchayatname": "Ushapur",
-        "villageCode": "38260",
-        "villageName": "Kali Bari Rajah Chahar",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "8184281",
-        "ddrName": "RETROFITTING OF NEW KALIBARI PWSS",
-        "projectId": "8184281",
-        "regionName": "1245"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "RETROFITTING OF NEW KALIBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Barika Chuburi (ct)",
+      "villageCode": "38262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21632,6 +26231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upper Gereki MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Kali Bari Rajah Chahar",
+      "villageCode": "38260",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21672,6 +26279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kolibari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1245",
+      "blockname": "Gabhoru",
+      "panchayatcode": "23082",
+      "panchayatname": "Ushapur",
+      "villageName": "Kali Bari Rajah Chahar",
+      "villageCode": "38260",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21712,6 +26327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batiamari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "BATIAMARI",
+      "villageCode": "38601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21752,6 +26375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BATIAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "BATIAMARI",
+      "villageCode": "38601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21792,6 +26423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BATIAMARI BHAIRABI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "BATIAMARI",
+      "villageCode": "38601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21832,6 +26471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chaki Ghat PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "CHAKI GHAT",
+      "villageCode": "647382",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21872,6 +26519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHITOLMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "CHITAL MARI",
+      "villageCode": "586856",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21912,6 +26567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chitolmari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "CHITAL MARI",
+      "villageCode": "586856",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21952,6 +26615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ARABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "GOAL GAON",
+      "villageCode": "38606",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -21992,6 +26663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUAMARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "GOAL GAON",
+      "villageCode": "38606",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22032,6 +26711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Goal Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "HATBOR",
+      "villageCode": "38604",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22072,6 +26759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatbor PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "HATBOR",
+      "villageCode": "38604",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22112,6 +26807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hokoma PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "HOKOMA",
+      "villageCode": "38594",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22152,6 +26855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thuletika PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "KHALIHAMARI",
+      "villageCode": "38599",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22192,6 +26903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khalihamari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "KHALIHAMARI",
+      "villageCode": "38599",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22232,6 +26951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KHALIHAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "KHALIHAMARI",
+      "villageCode": "38599",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22272,6 +26999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Lal Tapu PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "LAL TAPU",
+      "villageCode": "586780",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22312,6 +27047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panpur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "No.4 PANPUR GHAT",
+      "villageCode": "38595",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22352,6 +27095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chutium PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23116",
+      "panchayatname": "DAKHIN CHILABANDHA",
+      "villageName": "SOTIAM",
+      "villageCode": "38602",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22392,6 +27143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORMOTA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Bormota",
+      "villageCode": "38488",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22432,6 +27191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bormota A PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Bormota",
+      "villageCode": "38488",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22472,6 +27239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bormota PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Bormota",
+      "villageCode": "38488",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22512,6 +27287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dharmapur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Dhalai Bil",
+      "villageCode": "38491",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22552,6 +27335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHOLAIBIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Dhalai Bil",
+      "villageCode": "38491",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22592,6 +27383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dholaibil PWss",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Dhalai Bil",
+      "villageCode": "38491",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22632,6 +27431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Banga Basti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Na-bil",
+      "villageCode": "38492",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22672,6 +27479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nabil Boro Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Na-bil",
+      "villageCode": "38492",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22712,6 +27527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF TOUBHANGA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Na-bil",
+      "villageCode": "38492",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22752,6 +27575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Toubhanga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Na-bil",
+      "villageCode": "38492",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22792,6 +27623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Barpathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "No.1 Barpathar",
+      "villageCode": "38484",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22832,6 +27671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Barpathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "No.2 Barpathar",
+      "villageCode": "38490",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22872,6 +27719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pachim Towbhanga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tou Bhanga",
+      "villageCode": "38485",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22912,6 +27767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tou Bhanga Missing PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tou Bhanga",
+      "villageCode": "38485",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22952,6 +27815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Tupia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tupia Gaon",
+      "villageCode": "38486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -22992,6 +27863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tupia Gaon West PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tupia Gaon",
+      "villageCode": "38486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23032,6 +27911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF TUPIA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tupia Gaon",
+      "villageCode": "38486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23072,6 +27959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tupia Grant",
+      "villageCode": "38489",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23112,6 +28007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tupia Grant PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23107",
+      "panchayatname": "Dakhin Murhadol",
+      "villageName": "Tupia Grant",
+      "villageCode": "38489",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23152,6 +28055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gerelua Chuk PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "Garikuri",
+      "villageCode": "38552",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23192,6 +28103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nandikeswar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "Garikuri",
+      "villageCode": "38552",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23232,6 +28151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Majorchuk PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "MAJOR CHUK",
+      "villageCode": "586454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23272,6 +28199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MAJORCHUK PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "MAJOR CHUK",
+      "villageCode": "586454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23312,6 +28247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KAMARCHUK PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "MAJOR CHUK",
+      "villageCode": "586454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23352,6 +28295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NANDIKESWAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "Nandikeswar",
+      "villageCode": "38555",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23392,6 +28343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bharali Chapori PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "Niz-Chilabandha",
+      "villageCode": "38551",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23432,6 +28391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHAMDHARA PANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "Niz-Chilabandha",
+      "villageCode": "38551",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23472,6 +28439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gataimara No 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "NO.1 GATAIMARI",
+      "villageCode": "38354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23512,6 +28487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gataimara No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23112",
+      "panchayatname": "MADHYA CHILABANDHA",
+      "villageName": "NO.2 GATAIMARI",
+      "villageCode": "38553",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23552,6 +28535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chengelimara Bishnupur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23113",
+      "panchayatname": "PACHIM BORBHAGIA",
+      "villageName": "Chengeli Mara",
+      "villageCode": "38559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23592,6 +28583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mallo Basti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Chengeli Mara",
+      "villageCode": "38559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23632,6 +28631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHENGELIMORA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Chengeli Mara",
+      "villageCode": "38559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23672,6 +28679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENGELIMORA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Chengeli Mara",
+      "villageCode": "38559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23712,6 +28727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHEKIAL MAZGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Deka Sundar",
+      "villageCode": "38562",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23752,6 +28775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PASSIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Deka Sundar",
+      "villageCode": "38562",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23792,6 +28823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PASSIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Deka Sundar",
+      "villageCode": "38562",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23832,6 +28871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Passigaon Mohmora PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23113",
+      "panchayatname": "Pachim Borbhagia",
+      "villageName": "Pachi Gaon",
+      "villageCode": "38596",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23872,6 +28919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF AGRIPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Agripam",
+      "villageCode": "38501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23912,6 +28967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AGRIPAM PWSS (STATE PLAN)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Agripam",
+      "villageCode": "38501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23952,6 +29015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNIPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Bamunipam",
+      "villageCode": "38500",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -23992,6 +29063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bar Dikarai Bali Chapori MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Bar Dikarai Miri",
+      "villageCode": "38495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24032,6 +29111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORDIKORAI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Bar Dikarai Miri",
+      "villageCode": "38495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24072,6 +29159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bar Dikarai Miri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Bar Dikarai Miri",
+      "villageCode": "38495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24112,6 +29207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bordikarai PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Bar Dikarai Miri",
+      "villageCode": "38495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24152,6 +29255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chari Pukhuri Dakhin MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Chari Pukhuri",
+      "villageCode": "590466",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24192,6 +29303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batamari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Chari Pukhuri",
+      "villageCode": "590466",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24232,6 +29351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GADERIJAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Gederijan",
+      "villageCode": "590467",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24272,6 +29399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gorbil Silonipam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Gorbil",
+      "villageCode": "648037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24312,6 +29447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GORBIL SILONIPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Gorbil",
+      "villageCode": "648037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24352,6 +29495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Batamari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "No.1 Batamari",
+      "villageCode": "38494",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24392,6 +29543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BATAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "No.1 Batamari",
+      "villageCode": "38494",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24432,6 +29591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Batamari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "No.2 Batamari",
+      "villageCode": "648151",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24472,6 +29639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Pat Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Pat Gaon",
+      "villageCode": "38497",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24512,6 +29687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AUHOLAGAON MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Ranga Chakua",
+      "villageCode": "38499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24552,6 +29735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SANTIPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Ranga Chakua",
+      "villageCode": "38499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24592,6 +29783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RANGACHAKUWA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Ranga Chakua",
+      "villageCode": "38499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24632,6 +29831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGACHAKUWA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Ranga Chakua",
+      "villageCode": "38499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24672,6 +29879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Randupam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Ranga Chakua",
+      "villageCode": "38499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24712,6 +29927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAK BASTI MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23108",
+      "panchayatname": "Pachim Murhadol",
+      "villageName": "Ranga Chakua",
+      "villageCode": "38499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24752,6 +29975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORPUKHURIPAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Hukai Gaon",
+      "villageCode": "647560",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24792,6 +30023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hukain Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Hukai Gaon",
+      "villageCode": "647560",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24832,6 +30071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KORSONTOLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Karchan Tola",
+      "villageCode": "38584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24872,6 +30119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KORSONTOLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Karchan Tola",
+      "villageCode": "38584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24912,6 +30167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PITHAGURIDOL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Karchan Tola",
+      "villageCode": "38584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24952,6 +30215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pithaguridol PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Karchan Tola",
+      "villageCode": "38584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -24992,6 +30263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gomiripal PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Kumar Gaon",
+      "villageCode": "586611",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25032,6 +30311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GAMIRIPAL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Kumar Gaon",
+      "villageCode": "586611",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25072,6 +30359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Kumar Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Kumar Gaon",
+      "villageCode": "586611",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25112,6 +30407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mohmara PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Mohmara",
+      "villageCode": "38561",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25152,6 +30455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upar Talakabari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talaka Bari",
+      "villageCode": "38585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25192,6 +30503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF TALAKABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talaka Bari",
+      "villageCode": "38585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25232,6 +30551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORPUKHURIPAR",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talaka Bari",
+      "villageCode": "38585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25272,6 +30599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TALAKABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talaka Bari",
+      "villageCode": "38585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25312,6 +30647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nadidhar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talaka Bari Pathar",
+      "villageCode": "647558",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25352,6 +30695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF TALAKABARI BENGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talakabari Bangali",
+      "villageCode": "38592",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25392,6 +30743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sensuwa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talakabari Bangali",
+      "villageCode": "38592",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25432,6 +30791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Talakabari Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23115",
+      "panchayatname": "Pub Borbhagia",
+      "villageName": "Talakabari Bangali",
+      "villageCode": "38592",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25472,6 +30839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakola PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25512,6 +30887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAKOLA WEST PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25552,6 +30935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MURHADOL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25592,6 +30983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhubighat Khilkowari MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25632,6 +31031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JOYPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25672,6 +31079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Holakan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25712,6 +31127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAIBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bakola",
+      "villageCode": "38503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25752,6 +31175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHAIBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bangali Gaon",
+      "villageCode": "586383",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25792,6 +31223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bangali Gaon",
+      "villageCode": "586383",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25832,6 +31271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATINGA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Bangali Gaon",
+      "villageCode": "586383",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25872,6 +31319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GELAHATINGA TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Gelahatinga Te",
+      "villageCode": "38511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25912,6 +31367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Line No. 8/16 Gelahatinga TE MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Gelahatinga Te",
+      "villageCode": "38511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25952,6 +31415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BURBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Gelahatinga Te",
+      "villageCode": "38511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -25992,6 +31463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kharbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Gelahatinga Te",
+      "villageCode": "38511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26032,6 +31511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SHANTIPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Hatinga Gaon",
+      "villageCode": "38510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26072,6 +31559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HATINGA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Hatinga Gaon",
+      "villageCode": "38510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26112,6 +31607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Silkowari Khanda PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Hatinga Gaon",
+      "villageCode": "38510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26152,6 +31655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Choibaribengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Maz-gaon",
+      "villageCode": "38506",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26192,6 +31703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kathabari MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Maz-gaon",
+      "villageCode": "38506",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26232,6 +31751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIALMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Maz-gaon",
+      "villageCode": "38506",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26272,6 +31799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MURHADOL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Murha Dal",
+      "villageCode": "38509",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26312,6 +31847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baruah Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Murha Dal",
+      "villageCode": "38509",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26352,6 +31895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAHARBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Murha Dal",
+      "villageCode": "38509",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26392,6 +31943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Murha Dal",
+      "villageCode": "38509",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26432,6 +31991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Padumani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Padumani",
+      "villageCode": "38504",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26472,6 +32039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RATNAPUR MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23109",
+      "panchayatname": "Pub Murhadol",
+      "villageName": "Ratnapur",
+      "villageCode": "38505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26512,6 +32087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PADMAPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Bori Gaon",
+      "villageCode": "38577",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26552,6 +32135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borigaon Siva Mandir Borigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Bori Gaon",
+      "villageCode": "38577",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26592,6 +32183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KORSONTOLA BORIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Bori Gaon",
+      "villageCode": "38577",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26632,6 +32231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Korsontola Borigaon",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Bori Gaon",
+      "villageCode": "38577",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26672,6 +32279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamunbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26712,6 +32327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHOIBARI BENGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26752,6 +32375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAMUNBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26792,6 +32423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barfalia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26832,6 +32471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORACHUK PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26872,6 +32519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHOBAKATA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26912,6 +32567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhobakata PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26952,6 +32615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Keranipam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Choibari",
+      "villageCode": "38571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -26992,6 +32663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHEKERIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Dhakarigaon",
+      "villageCode": "38579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27032,6 +32711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHEKERIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Dhakarigaon",
+      "villageCode": "38579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27072,6 +32759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kathobari Bhagowatichuk PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Madhav Barhampur",
+      "villageCode": "647548",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27112,6 +32807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KATHABARI BHAGAWATI CHUK PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Madhav Barhampur",
+      "villageCode": "647548",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27152,6 +32855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOLOGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Uparkuri",
+      "villageCode": "38578",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27192,6 +32903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sologuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23114",
+      "panchayatname": "Uttar Borbhagia",
+      "villageName": "Uparkuri",
+      "villageCode": "38578",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27232,6 +32951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BOGABIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Bogabil",
+      "villageCode": "38530",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27272,6 +32999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGIBIL PWSS (QA)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Bogabil",
+      "villageCode": "38530",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27312,6 +33047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bill Donga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Bogabil",
+      "villageCode": "38530",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27352,6 +33095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chamdhara Brahmagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Chamdhara",
+      "villageCode": "38533",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27392,6 +33143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAMDHARA MAJHIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Chamdhara",
+      "villageCode": "38533",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27432,6 +33191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonarigaon PWSS.",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Chilabandha Sonari",
+      "villageCode": "38543",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27472,6 +33239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SONARIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Chilabandha Sonari",
+      "villageCode": "38543",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27512,6 +33287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nabapur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Moronakuri",
+      "villageCode": "38535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27552,6 +33335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upor Moronakuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Moronakuri",
+      "villageCode": "38535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27592,6 +33383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Moronakuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Moronakuri",
+      "villageCode": "38535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27632,6 +33431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Maranakuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Moronakuri",
+      "villageCode": "38535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27672,6 +33479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Panigaon",
+      "villageCode": "38532",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27712,6 +33527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Extention of PANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Panigaon",
+      "villageCode": "38532",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27752,6 +33575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kochgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Sangia Major Chuk",
+      "villageCode": "586453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27792,6 +33623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KOCHGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Sangia Major Chuk",
+      "villageCode": "586453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27832,6 +33671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Madhupur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Sangia Major Chuk",
+      "villageCode": "586453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27872,6 +33719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Herapuwa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Solaguri",
+      "villageCode": "38542",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27912,6 +33767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "NADUAR",
+      "panchayatcode": "23111",
+      "panchayatname": "UTTAR CHILABANDHA",
+      "villageName": "Tarajan",
+      "villageCode": "38536",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27952,6 +33815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAFLA CHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Balijuri",
+      "villageCode": "38522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -27992,6 +33863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BALIJURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Balijuri",
+      "villageCode": "38522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28032,6 +33911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MASKIGON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Balijuri",
+      "villageCode": "38522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28072,6 +33959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Balijuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Balijuri",
+      "villageCode": "38522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28112,6 +34007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARAITAPU MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28152,6 +34055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ANADIKORAI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28192,6 +34103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LAKHIPATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28232,6 +34151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MILANPUR MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28272,6 +34199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAN PUR MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28312,6 +34247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 1 JOYPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28352,6 +34295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 2 & 3 JOYPAM PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28392,6 +34343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 4,5 & 6 JOYPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Bordikarai Balichapori",
+      "villageCode": "648204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28432,6 +34391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bang Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Christan Basti No.1",
+      "villageCode": "38520",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28472,6 +34439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Christan Basti No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Christan Basti No.1",
+      "villageCode": "38520",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28512,6 +34487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHRISTIAN BASTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Christan Basti No.1",
+      "villageCode": "38520",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28552,6 +34535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Christian Bosti PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Christan Basti No.1",
+      "villageCode": "38520",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28592,6 +34583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHUBIKHOLA MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Dhubikhola",
+      "villageCode": "38524",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28632,6 +34631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHMUKH MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Dhubikhola",
+      "villageCode": "38524",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28672,6 +34679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Morisuti Topubasti MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28712,6 +34727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Morisuti Thakurbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28752,6 +34775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MORISUTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28792,6 +34823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MORISUTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28832,6 +34871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Morisuti Khergola PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28872,6 +34919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Morisuti Gopsar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28912,6 +34967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Munda Basti MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "Morisuti No.1",
+      "villageCode": "38516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28952,6 +35015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New No.1 Bar Dikarai PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.1 Bordikarai",
+      "villageCode": "38521",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -28992,6 +35063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDIKORAI -I  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.1 Bordikarai",
+      "villageCode": "38521",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29032,6 +35111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORDIKORAI NO. 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.1 Bordikarai",
+      "villageCode": "38521",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29072,6 +35159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tamang Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.1 Bordikarai",
+      "villageCode": "38521",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29112,6 +35207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adibashi Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29152,6 +35255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gouripam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29192,6 +35303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORDIKORAI NO. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29232,6 +35351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDIKORAI NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29272,6 +35399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Missing Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29312,6 +35447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nepali Chuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29352,6 +35495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Raigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1247",
+      "blockname": "Naduar",
+      "panchayatcode": "23110",
+      "panchayatname": "Uttar Murhadol",
+      "villageName": "No.2 Bordikarai",
+      "villageCode": "590465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29392,6 +35543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhuyan Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli Sonajuli Req Grant",
+      "villageCode": "39133",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29432,6 +35591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONAJULI TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli Sonajuli Req Grant",
+      "villageCode": "39133",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29472,6 +35639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SONAJULI TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli Sonajuli Req Grant",
+      "villageCode": "39133",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29512,6 +35687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Buragaon T.E PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli Sonajuli Req Grant",
+      "villageCode": "39133",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29552,6 +35735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barjuli TE No. 17 Line PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli T.e.",
+      "villageCode": "39134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29592,6 +35783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARJULI HAT KHOLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli T.e.",
+      "villageCode": "39134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29632,6 +35831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARJULI TE NO. 5 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli T.e.",
+      "villageCode": "39134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29672,6 +35879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barjuli TE Dhipa Line PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Barjuli T.e.",
+      "villageCode": "39134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29712,6 +35927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dholkoba TE. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "Dholkoba T.e.",
+      "villageCode": "39129",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29752,6 +35975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhelatar gaon MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "No.1 Bhelatar Gaon",
+      "villageCode": "586459",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29792,6 +36023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARJULI TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "No.1 Bhelatar Gaon",
+      "villageCode": "586459",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29832,6 +36071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Rangapara TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23175",
+      "panchayatname": "Barjuli",
+      "villageName": "No.2 Rangapara T.e.",
+      "villageCode": "647828",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29872,6 +36119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Harchura Reo Grant PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "Harchura Reo Grant",
+      "villageCode": "39113",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29912,6 +36167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Namgaon T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "Nam Gaon T.e.",
+      "villageCode": "39116",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29952,6 +36215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HARCHURA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.1 Harchura T.e.",
+      "villageCode": "39114",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -29992,6 +36263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Harchura PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.1 Harchura T.e.",
+      "villageCode": "39114",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30032,6 +36311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Hatibari TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.1 Hatibari T.e.",
+      "villageCode": "39112",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30072,6 +36359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Namgaon TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.1 Nam Gaon",
+      "villageCode": "647864",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30112,6 +36407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Hatibari T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.2 Hatibari T.e.",
+      "villageCode": "647768",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30152,6 +36455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Namgaon T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.2 Namgaon T.e.",
+      "villageCode": "647865",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30192,6 +36503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 3 Hatibari T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.3 Hatibari T.e.",
+      "villageCode": "39118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30232,6 +36551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 4 Hatibari T.E. MPWS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "No.4 Hatibari T.e.",
+      "villageCode": "647767",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30272,6 +36599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Harchura Patgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23173",
+      "panchayatname": "Hatibari",
+      "villageName": "Patgaon T.e. (harchura)",
+      "villageCode": "39115",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30312,6 +36647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Kacharigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Kachari Gaon T.e.",
+      "villageCode": "647826",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30352,6 +36695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kacharigaon TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Kachari Gaon T.e.",
+      "villageCode": "647826",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30392,6 +36743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KACHARIGAON TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Kachari Gaon T.e.",
+      "villageCode": "647826",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30432,6 +36791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharanigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Kachari Gaon T.e.",
+      "villageCode": "647826",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30472,6 +36839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pachim  Naharani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Naharani Gaon",
+      "villageCode": "586371",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30512,6 +36887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uttar Naharani T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Naharani Gaon",
+      "villageCode": "586371",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30552,6 +36935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Naharani T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Naharani Gaon",
+      "villageCode": "586371",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30592,6 +36983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharani Reserve Grant PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Naharani Reserve Grant",
+      "villageCode": "39079",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30632,6 +37031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Amaribari TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "No.1 Amaribari T.e.",
+      "villageCode": "39083",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30672,6 +37079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tin Line PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "No.1 Amaribari T.e.",
+      "villageCode": "39083",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30712,6 +37127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pub Naharani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "No.1 Naharani T.e.",
+      "villageCode": "39082",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30752,6 +37175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 3 Naharani TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "No.3 Naharani T.e.",
+      "villageCode": "647769",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30792,6 +37223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upar Kachari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Upar Kachari",
+      "villageCode": "39080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30832,6 +37271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upor Kochari",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23169",
+      "panchayatname": "Naharani",
+      "villageName": "Upar Kachari",
+      "villageCode": "39080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30872,6 +37319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhulapadung Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Dhula Padung Gaon",
+      "villageCode": "39123",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30912,6 +37367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHULAPADUNG PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Dhula Padung Gaon",
+      "villageCode": "39123",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30952,6 +37415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORO KACHUMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23174",
+      "panchayatname": "NAMANIGAON",
+      "villageName": "DURUNG  T.E",
+      "villageCode": "39122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -30992,6 +37463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DURUNG TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23174",
+      "panchayatname": "NAMANIGAON",
+      "villageName": "DURUNG  T.E",
+      "villageCode": "39122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31032,6 +37511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Namani Gaon No.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23174",
+      "panchayatname": "NAMANIGAON",
+      "villageName": "DURUNG  T.E",
+      "villageCode": "39122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31072,6 +37559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAMGAON TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23174",
+      "panchayatname": "NAMANIGAON",
+      "villageName": "DURUNG  T.E",
+      "villageCode": "39122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31112,6 +37607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Namanigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23174",
+      "panchayatname": "NAMANIGAON",
+      "villageName": "DURUNG  T.E",
+      "villageCode": "39122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31152,6 +37655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nagapathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Nagapathar",
+      "villageCode": "39127",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31192,6 +37703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Sessa TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Nagapathar",
+      "villageCode": "39127",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31232,6 +37751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SESSA TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Nagapathar",
+      "villageCode": "39127",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31272,6 +37799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Namani Gaon No.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Namani Gaon No.1",
+      "villageCode": "39128",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31312,6 +37847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAMANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Namani Gaon No.1",
+      "villageCode": "39128",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31352,6 +37895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sessa TE No 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Sessa T.e. No.1",
+      "villageCode": "590453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31392,6 +37943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sessa TE No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Sessa T.e. No.2",
+      "villageCode": "39121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31432,6 +37991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SESSA PANBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Sessa T.e. No.2",
+      "villageCode": "39121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31472,6 +38039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sessa Panbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Sessa T.e. No.2",
+      "villageCode": "39121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31512,6 +38087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sessa TE No 3 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Sessa T.e. No.3",
+      "villageCode": "39124",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31552,6 +38135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sessa TE No. 4 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Sessa T.e. No.4",
+      "villageCode": "590452",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31592,6 +38183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Singrijan TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Singari Jan T.e.",
+      "villageCode": "39119",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31632,6 +38231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SINGRIJAN TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23174",
+      "panchayatname": "Namanigaon",
+      "villageName": "Singari Jan T.e.",
+      "villageCode": "39119",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31672,6 +38279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Adabari TE PWSS (Zone-I)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Adabari T.e.",
+      "villageCode": "39092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31712,6 +38327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Natun Adabari TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Natun Adabari T.e.",
+      "villageCode": "39091",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31752,6 +38375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Panipota TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "No.1 Panipota T.e.",
+      "villageCode": "647819",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31792,6 +38423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PHULBARI PANIPOTA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "No.2 Panipota T.e.",
+      "villageCode": "39087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31832,6 +38471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Panipota PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "No.2 Panipota T.e.",
+      "villageCode": "39087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31872,6 +38519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panipota 10 No. Line MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Panipota T.e.",
+      "villageCode": "39089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31912,6 +38567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panipota T.E. 18306120212",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Panipota T.e.",
+      "villageCode": "39089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31952,6 +38615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Panipota TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Panipota T.e.",
+      "villageCode": "39089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -31992,6 +38663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Phulbari TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Phulbari T.e.",
+      "villageCode": "39085",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32032,6 +38711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Phulbari Railgate MPWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23170",
+      "panchayatname": "Phulbari",
+      "villageName": "Phulbari T.e.",
+      "villageCode": "39085",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32072,6 +38759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amtal Benagali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Aamtal Bangali",
+      "villageCode": "39105",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32112,6 +38807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatidubi Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Hatidubi Gaon",
+      "villageCode": "39101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32152,6 +38855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PHULAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Hatidubi Gaon",
+      "villageCode": "39101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32192,6 +38903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Phulaguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Hatidubi Gaon",
+      "villageCode": "39101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32232,6 +38951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatipukhuri North PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Hatipukhuri",
+      "villageCode": "39106",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32272,6 +38999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HATIPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Hatipukhuri",
+      "villageCode": "39106",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32312,6 +39047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatipukhuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Hatipukhuri",
+      "villageCode": "39106",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32352,6 +39095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Bahumari Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "No.1 Bahumari Gaon",
+      "villageCode": "647831",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32392,6 +39143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAHUMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "No.2 Bahumari Gaon",
+      "villageCode": "39103",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32432,6 +39191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHUMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "No.2 Bahumari Gaon",
+      "villageCode": "39103",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32472,6 +39239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Dhulapadung TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23172",
+      "panchayatname": "PHULGURI",
+      "villageName": "No.2 Dhulapadung T.E.",
+      "villageCode": "39104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32512,6 +39287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHULAPADUNG GARDEN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23172",
+      "panchayatname": "PHULGURI",
+      "villageName": "No.2 Dhulapadung T.E.",
+      "villageCode": "39104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32552,6 +39335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Const. of Dhulapadung PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23172",
+      "panchayatname": "PHULGURI",
+      "villageName": "No.2 Dhulapadung T.E.",
+      "villageCode": "39104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32592,6 +39383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Mainajuli TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "No.2 Mainajuli T.e.",
+      "villageCode": "39102",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32632,6 +39431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHANA PHULAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Phulguri Nepali",
+      "villageCode": "647832",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32672,6 +39479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Phulaguri Nepali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Phulguri Nepali",
+      "villageCode": "647832",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32712,6 +39527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Samukia Kachari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23172",
+      "panchayatname": "Phulguri",
+      "villageName": "Samukia Kachari",
+      "villageCode": "39109",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32752,6 +39575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHENDAI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.1 Dhendai T.e.",
+      "villageCode": "39095",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32792,6 +39623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Palang PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.1 Sonajuli T E",
+      "villageCode": "39097",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32832,6 +39671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Sonajuli TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.1 Sonajuli T E",
+      "villageCode": "39097",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32872,6 +39719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajuli TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.1 Tarajuli T.e.",
+      "villageCode": "39098",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32912,6 +39767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pub Tarajuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.1 Tarajuli T.e.",
+      "villageCode": "39098",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32952,6 +39815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Tarajuli T.E. PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.1 Tarajuli T.e.",
+      "villageCode": "39098",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -32992,6 +39863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhendai TE No. 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.2 Dhendai T.e.",
+      "villageCode": "39094",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33032,6 +39911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Sonajuli T E PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.2 Sonajuli T E",
+      "villageCode": "39096",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33072,6 +39959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Tarajuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.2 Tarajuli",
+      "villageCode": "649398",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33112,6 +40007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 3 Sonajuli TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "No.3 Sonajuli T E",
+      "villageCode": "39099",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33152,6 +40055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Tarajuligaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "Tarajuli Gaon",
+      "villageCode": "647827",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33192,6 +40103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajuli Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23171",
+      "panchayatname": "Sonajuli",
+      "villageName": "Tarajuli Gaon",
+      "villageCode": "647827",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33232,6 +40151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kachamari Grant PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "Kachamari Grant",
+      "villageCode": "647861",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33272,6 +40199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kachamari Madapi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "RANGAPARA",
+      "panchayatcode": "23176",
+      "panchayatname": "THAKURBARI",
+      "villageName": "Kachamari Under Madapi",
+      "villageCode": "647862",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33312,6 +40247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mainajuli Grant PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "Mainajuli Grant",
+      "villageCode": "647830",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33352,6 +40295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Dhulapadung TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.1 Dhulapadung T.e.",
+      "villageCode": "39144",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33392,6 +40343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghoirali TE No.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.1 Ghoirali T.e.",
+      "villageCode": "39141",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33432,6 +40391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Mainajuli TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.1 Mainajuli T.e.",
+      "villageCode": "39146",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33472,6 +40439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF THAKURBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.1 Thakurbari T.e.",
+      "villageCode": "39145",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33512,6 +40487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhelowater Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.2 Bhelowater Gaon",
+      "villageCode": "39140",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33552,6 +40535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 2 Ghoirali TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.2 Gorali T.e.",
+      "villageCode": "647833",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33592,6 +40583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "New Thakurbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.2 Thakurbari T.e.",
+      "villageCode": "39138",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33632,6 +40631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 3 Dhulapadung TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "No.3 Dhulapadung T.e.",
+      "villageCode": "647835",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33672,6 +40679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pogola Bil",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "Pagala Bil Gaon",
+      "villageCode": "39142",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33712,6 +40727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pagla Bil Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1253",
+      "blockname": "Rangapara",
+      "panchayatcode": "23176",
+      "panchayatname": "Thakurbari",
+      "villageName": "Pagala Bil Gaon",
+      "villageCode": "39142",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33752,6 +40775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHBARI BAGISA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Bahabari Bagisa",
+      "villageCode": "39077",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33792,6 +40823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Niz Bahbari  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Bahbari Gaon",
+      "villageCode": "39075",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33832,6 +40871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Niz Bahbari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Bahbari Gaon",
+      "villageCode": "39075",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33872,6 +40919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Barson PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Barson Gaon",
+      "villageCode": "39076",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33912,6 +40967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARSON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Barson Gaon",
+      "villageCode": "39076",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33952,6 +41015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GANDURA BIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Gandura Bil",
+      "villageCode": "39072",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -33992,6 +41063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Manijarani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Manijarani",
+      "villageCode": "39069",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34032,6 +41111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Manijarani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Manijarani",
+      "villageCode": "39069",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34072,6 +41159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAHARANI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Naharani Pathar",
+      "villageCode": "647836",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34112,6 +41207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Naharani Pathar",
+      "villageCode": "647836",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34152,6 +41255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHBARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "Niz-bahbari",
+      "villageCode": "586711",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34192,6 +41303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Ghagra TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "No.1 Ghogora Req Grant",
+      "villageCode": "647507",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34232,6 +41351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Old Ghagra PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "No.1 Ghogora Req Grant",
+      "villageCode": "647507",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34272,6 +41399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NEW GHOGRA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "No.1 Ghogora Req Grant",
+      "villageCode": "647507",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34312,6 +41447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Old  Ghogra  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "No.1 Ghogora Req Grant",
+      "villageCode": "647507",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34352,6 +41495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RUPAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "No.1 Rupajuli T.e.",
+      "villageCode": "39074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34392,6 +41543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RUPAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23168",
+      "panchayatname": "Bahbari",
+      "villageName": "No.1 Rupajuli T.e.",
+      "villageCode": "39074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34432,6 +41591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALISIHA KACHARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Balisiha Kachari",
+      "villageCode": "39045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34472,6 +41639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BANDARMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Bandar Mari",
+      "villageCode": "650892",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34512,6 +41687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANDARMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Bandarmari Gaon",
+      "villageCode": "39042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34552,6 +41735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borghop PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Borghop",
+      "villageCode": "39052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34592,6 +41783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARAKHIYA PUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Garakhia Pukhuri",
+      "villageCode": "39046",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34632,6 +41831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHATUA CHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Ghatua Chuburi",
+      "villageCode": "39049",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34672,6 +41879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KAKALBHANGI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Kakal Bhagi",
+      "villageCode": "39044",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34712,6 +41927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAKALBHAGHI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Kakal Bhagi",
+      "villageCode": "39044",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34752,6 +41975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Saraka PWSS ( NQ )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Kakal Bhagi",
+      "villageCode": "39044",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34792,6 +42023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "2 NO KAKALBHAGI AWC",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Kakal Bhagi",
+      "villageCode": "39044",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34832,6 +42071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAZOR HOLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Majar Hola",
+      "villageCode": "39051",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34872,6 +42119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIRAIATI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23165",
+      "panchayatname": "BANDARMARI",
+      "villageName": "Niraiati Gaon",
+      "villageCode": "586728",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34912,6 +42167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GABHARU GRANT NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "No.1 Gabharu T.e. (grant)",
+      "villageCode": "586684",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34952,6 +42215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GABHARU GRANT NO 2",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "No.2 Gabharu T.e.",
+      "villageCode": "653614",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -34992,6 +42263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Samukia PWSS ( NQ ) (Pertaining to Court Case)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23165",
+      "panchayatname": "Bandarmari",
+      "villageName": "Samukia Gaon",
+      "villageCode": "39047",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35032,6 +42311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ERASUTI JUNGLE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Arasuti Janghal",
+      "villageCode": "39056",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35072,6 +42359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ERASUTI JUNGLE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Arasuti Janghal",
+      "villageCode": "39056",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35112,6 +42407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PATIAPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Arasuti Janghal",
+      "villageCode": "39056",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35152,6 +42455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ERASUTI JUNGLE NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Arasuti Janghal",
+      "villageCode": "39056",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35192,6 +42503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOWALGURI SOLAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Arasuti Janghal",
+      "villageCode": "39056",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35232,6 +42551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Bargon Chapari",
+      "villageCode": "39055",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35272,6 +42599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORIGAON NO. 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Bargon Chapari",
+      "villageCode": "39055",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35312,6 +42647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HOZAI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Hozai Gaon",
+      "villageCode": "39057",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35352,6 +42695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIJ BARGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Nij Bargaon",
+      "villageCode": "39053",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35392,6 +42743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SIPORIA BATABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23166",
+      "panchayatname": "BARGAON",
+      "villageName": "Nij Bargaon",
+      "villageCode": "39053",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35432,6 +42791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIPORIA BATABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Siparia Batabari Gaon",
+      "villageCode": "586712",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35472,6 +42839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TELIAGAON NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Telia Gaon",
+      "villageCode": "39054",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35512,6 +42887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF TELIAGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Telia Gaon",
+      "villageCode": "39054",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35552,6 +42935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Teliagaon",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23166",
+      "panchayatname": "Bargaon",
+      "villageName": "Telia Gaon",
+      "villageCode": "39054",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35592,6 +42983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bahbari No.3 PWSS - (Old Name - Arimara Pathar PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Arimara Pathar",
+      "villageCode": "647834",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35632,6 +43031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHINGA CHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Chinga Chuburi Gaon",
+      "villageCode": "39009",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35672,6 +43079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Niz Bihaguri No.2 PWSS - (Old Name - Dui Depota maz Pathar PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Duidi Pota Maz-pathar",
+      "villageCode": "39006",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35712,6 +43127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MUWAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Kalita Gaon",
+      "villageCode": "39010",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35752,6 +43175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOWAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Kalita Gaon",
+      "villageCode": "39010",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35792,6 +43223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALITA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Kalita Gaon",
+      "villageCode": "39010",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35832,6 +43271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Niz Bihaguri No.3 PWSS - (Old Name - Latiamari PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Latia Mari",
+      "villageCode": "650885",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35872,6 +43319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JARANI SOLAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "No.1 Jhaxwani",
+      "villageCode": "39008",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35912,6 +43367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGAMATI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23160",
+      "panchayatname": "Bihaguri No.1",
+      "villageName": "Rangamati Gaon",
+      "villageCode": "39015",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35952,6 +43415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHALUKEKHOWA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Bhaluke Khowa Gaon",
+      "villageCode": "39016",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -35992,6 +43463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhalukekhowa Kamarchuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Bhaluke Khowa Gaon",
+      "villageCode": "39016",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36032,6 +43511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhalukekhowa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Bhaluke Khowa Gaon",
+      "villageCode": "39016",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36072,6 +43559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKEHOWA BORDUBI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Bhaluke Khowa Gaon",
+      "villageCode": "39016",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36112,6 +43607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOILA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Maila Gaon",
+      "villageCode": "39031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36152,6 +43655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF LIKHAKGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Maila Gaon",
+      "villageCode": "39031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36192,6 +43703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAGALI CHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Niz-bihaguri Gaon",
+      "villageCode": "39019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36232,6 +43751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDUBIA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Niz-bihaguri Gaon",
+      "villageCode": "39019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36272,6 +43799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ-BIHAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Niz-bihaguri Gaon",
+      "villageCode": "39019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36312,6 +43847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ-BIHAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Niz-bihaguri Gaon",
+      "villageCode": "39019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36352,6 +43895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NIZ BIHAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23161",
+      "panchayatname": "Bihaguri No.2",
+      "villageName": "Niz-bihaguri Gaon",
+      "villageCode": "39019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36392,6 +43943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMGURI CHAPARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Amaguri Chapari",
+      "villageCode": "39060",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36432,6 +43991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dhekerigaon PWSS,Bihaguri",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Amaguri Chapari",
+      "villageCode": "39060",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36472,6 +44039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SILIKHABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23167",
+      "panchayatname": "PACHIM BARGAON",
+      "villageName": "BAGHE TAPO",
+      "villageCode": "586674",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36512,6 +44087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batalapam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Batala Gaon",
+      "villageCode": "39065",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36552,6 +44135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHARASINGRI JUNGLE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Bhara Singari Janghal",
+      "villageCode": "39059",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36592,6 +44183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bura Garuduba No 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Bura Garu Duba",
+      "villageCode": "39058",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36632,6 +44231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Buragaruduba PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Bura Garu Duba",
+      "villageCode": "39058",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36672,6 +44279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BuraGaruduba PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Bura Garu Duba",
+      "villageCode": "39058",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36712,6 +44327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Buragaruduba PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Bura Garu Duba",
+      "villageCode": "39058",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36752,6 +44375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BURA GARUDUBA NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Bura Garu Duba",
+      "villageCode": "39058",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36792,6 +44423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENGA HILOI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Changa Hiloi Gaon",
+      "villageCode": "39066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36832,6 +44471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILIKHABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Changa Hiloi Gaon",
+      "villageCode": "39066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36872,6 +44519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhekerigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Dhekeri Gaon",
+      "villageCode": "39063",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36912,6 +44567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Simaluguri Colony PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Silikha Bari Gaon",
+      "villageCode": "39061",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36952,6 +44615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SIMALUGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Simalu Guri Gaon",
+      "villageCode": "39062",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -36992,6 +44663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Simuluguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23167",
+      "panchayatname": "Pachim Bargaon",
+      "villageName": "Simalu Guri Gaon",
+      "villageCode": "39062",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37032,6 +44711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bogapani PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Bagapani Gaon",
+      "villageCode": "39034",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37072,6 +44759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAHAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Bagapani Gaon",
+      "villageCode": "39034",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37112,6 +44807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORATI  NAPAM  PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Barati Gaon",
+      "villageCode": "39038",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37152,6 +44855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Borpukhuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Barpukhuri Gaon",
+      "villageCode": "39036",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37192,6 +44903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Kawaimari PWSS (NQ) (Pertaining to Court Case)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Barpukhuri Gaon",
+      "villageCode": "39036",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37232,6 +44951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borpukhuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Barpukhuri Gaon",
+      "villageCode": "39036",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37272,6 +44999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBIL MORIONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23164",
+      "panchayatname": "PUB BARGAON",
+      "villageName": "BORBIL MARIANI",
+      "villageCode": "586726",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37312,6 +45047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gayia Gaon ",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Gayia Gaon",
+      "villageCode": "39040",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37352,6 +45095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1  NABIL KACHARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "No.1 Nabil Kachari Gaon",
+      "villageCode": "39037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37392,6 +45143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nabil Kachari AWC",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "No.1 Nabil Kachari Gaon",
+      "villageCode": "39037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37432,6 +45191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 NABIL KACHARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "No.2 Nabil Kachari Gaon",
+      "villageCode": "39039",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37472,6 +45239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PUNIANI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23164",
+      "panchayatname": "PUB BARGAON",
+      "villageName": "Puniani Gaon",
+      "villageCode": "39041",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37512,6 +45287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUNIONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23164",
+      "panchayatname": "Pub Bargaon",
+      "villageName": "Puniani Gaon",
+      "villageCode": "39041",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37552,6 +45335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAPUBHETI P.W.S.S.",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Bapu Bheti Gaon",
+      "villageCode": "39023",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37592,6 +45383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAPUBHETI  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Bapu Bheti Gaon",
+      "villageCode": "39023",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37632,6 +45431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITING OF BARUADOLONI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Barua Doloni",
+      "villageCode": "650878",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37672,6 +45479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boruadoloni PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Barua Doloni Gaon",
+      "villageCode": "39022",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37712,6 +45527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boruadoloni PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Barua Doloni Gaon",
+      "villageCode": "39022",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37752,6 +45575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PUTHIMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23162",
+      "panchayatname": "PUTHIMARI",
+      "villageName": "GADHARU MUKH CHAPARI GAON",
+      "villageCode": "586729",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37792,6 +45623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Geruagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Gerua Gaon",
+      "villageCode": "39032",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37832,6 +45671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUTHIMARY P.W.S.S.",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "Gerua Gaon",
+      "villageCode": "39032",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37872,6 +45719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No 3 Puthimari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "No.3 Puthimari",
+      "villageCode": "39026",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37912,6 +45767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Garuagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23162",
+      "panchayatname": "Puthimari",
+      "villageName": "No.3 Puthimari",
+      "villageCode": "39026",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37952,6 +45815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUTHIMARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "BIHAGURI",
+      "panchayatcode": "23162",
+      "panchayatname": "PUTHIMARI",
+      "villageName": "Puthimari Gaon",
+      "villageCode": "39024",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -37992,6 +45863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Bali Gaon",
+      "villageCode": "39033",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38032,6 +45911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GERUA PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Gerua Pathar",
+      "villageCode": "586655",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38072,6 +45959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LIKHAKGAON NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Likhak Gaon",
+      "villageCode": "39030",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38112,6 +46007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Tumuki PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Likhak Gaon",
+      "villageCode": "39030",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38152,6 +46055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Likhokgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Likhak Gaon",
+      "villageCode": "39030",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38192,6 +46103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIRAI ATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Nirai Ati",
+      "villageCode": "39029",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38232,6 +46151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PITHAKHOWA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Pitha Khowa Gaon",
+      "villageCode": "39028",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38272,6 +46199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TUMUKI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Pitha Khowa Gaon",
+      "villageCode": "39028",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38312,6 +46247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PITHAKHOWA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1252",
+      "blockname": "Bihaguri",
+      "panchayatcode": "23163",
+      "panchayatname": "Tumuki",
+      "villageName": "Pitha Khowa Gaon",
+      "villageCode": "39028",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38352,6 +46295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBHOGIA NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Bar Bhagia Gaon",
+      "villageCode": "38999",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38392,6 +46343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORBHOGIA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Bar Bhagia Gaon",
+      "villageCode": "38999",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38432,6 +46391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBHOGIA NO.1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Bar Bhagia Gaon",
+      "villageCode": "38999",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38472,6 +46439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBHOGIA NO 3 WSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Bar Bhagia Gaon",
+      "villageCode": "38999",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38512,6 +46487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nichala Mari PWSS (NQ)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Bar Bhagia Gaon",
+      "villageCode": "38999",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38552,6 +46535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Puroni jamuguri Part-A PWSS - (Old Name - Hatibarijan PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Belsiri Chapari Gaon",
+      "villageCode": "586644",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38592,6 +46583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Nichalamari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "Nichala Mari Chapari",
+      "villageCode": "39004",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38632,6 +46631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 BOCHASIMALU GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23159",
+      "panchayatname": "Borbhagia Belsiri",
+      "villageName": "No.2 Bochasimalu Gaon",
+      "villageCode": "586746",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38672,6 +46679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SITALMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "No.1 Sitalmari Gaon",
+      "villageCode": "586737",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38712,6 +46727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sitalmari Gopchar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "No.1 Sitalmari Gaon",
+      "villageCode": "586737",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38752,6 +46775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SITALMARI GOPCHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "No.1 Sitalmari Gaon",
+      "villageCode": "586737",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38792,6 +46823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 CHITALMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "No.2 Sitalmari Gaon",
+      "villageCode": "586740",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38832,6 +46871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SITALMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "No.2 Sitalmari Gaon",
+      "villageCode": "586740",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38872,6 +46919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 CHITALMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "No.3 Sitalmari Gaon",
+      "villageCode": "586742",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38912,6 +46967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Singri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Singari Bangali Gaon",
+      "villageCode": "586733",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38952,6 +47015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRI-2 PART-1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Singari Bangali Gaon",
+      "villageCode": "586733",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -38992,6 +47063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRI BANGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Singari Bangali Gaon",
+      "villageCode": "586733",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39032,6 +47111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Singri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Singari Bangali Gaon",
+      "villageCode": "586733",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39072,6 +47159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRI-2 PART-2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Singari Bangali Gaon",
+      "villageCode": "586733",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39112,6 +47207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRI TUTULA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Singari Tutala Gaon",
+      "villageCode": "650938",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39152,6 +47255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SITALMARI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Sital Mari Pathar",
+      "villageCode": "586951",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39192,6 +47303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SITALMARI CHAPORI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "236224",
+      "panchayatname": "Dakhin Singri",
+      "villageName": "Sitalmari Chapari",
+      "villageCode": "586743",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39232,6 +47351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIJAN BENGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Balijan Bangali",
+      "villageCode": "38957",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39272,6 +47399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIJAN GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "DHALAGURI",
+      "villageName": "Balijan Gaon",
+      "villageCode": "38954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39312,6 +47447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIJAN KACHARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Balijan Kachari",
+      "villageCode": "586569",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39352,6 +47495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIJAN PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Balijan Pathar",
+      "villageCode": "38964",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39392,6 +47543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhangamandir PWSS (QA)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Bhanga Mandir Gaon",
+      "villageCode": "38953",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39432,6 +47591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHANGAMANDIR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Bhanga Mandir Gaon",
+      "villageCode": "38953",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39472,6 +47639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHANGA MANDIR ANGANWADI",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Bhanga Mandir Gaon",
+      "villageCode": "38953",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39512,6 +47687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Satipukhuri PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Bhanga Mandir Gaon",
+      "villageCode": "38953",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39552,6 +47735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING of LIMBU GAON PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Doul Guri Pathar",
+      "villageCode": "38960",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39592,6 +47783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Moukhuwajan PWSS ( QA ) (Pertaining to Court Case)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Mohkhua Gaon",
+      "villageCode": "586563",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39632,6 +47831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MORA BELSIRI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Mora Belsiri Gaon",
+      "villageCode": "650940",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39672,6 +47879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHALAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "No.1 Doul Guri Gaon",
+      "villageCode": "38961",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39712,6 +47927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PADUMPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23154",
+      "panchayatname": "Dhalaguri",
+      "villageName": "Padum Pukhuri Gaon",
+      "villageCode": "38962",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39752,6 +47975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ALIMABAD PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Bhoira Guri Bangali",
+      "villageCode": "586561",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39792,6 +48023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHAIRAGURI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Bhoira Guri Pathar",
+      "villageCode": "38916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39832,6 +48071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DOOMDOMA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Dumduma Gaon",
+      "villageCode": "38917",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39872,6 +48119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RAHMANPUR  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "No.3 Tiulip Bagan(rahmanpu",
+      "villageCode": "586555",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39912,6 +48167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TULIP KULLIE LINE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "No.3 Tiulip Bagan(rahmanpu",
+      "villageCode": "586555",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39952,6 +48215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TUILIP NO.3 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "No.3 Tiulip Bagan(rahmanpu",
+      "villageCode": "586555",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -39992,6 +48263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Singimari Bangali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Singimari Bangali Gaon",
+      "villageCode": "587077",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40032,6 +48311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Singimari Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Singimari Bangali Gaon",
+      "villageCode": "587077",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40072,6 +48359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITING OF NATUNPAMGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Singimari Kuch Gaon",
+      "villageCode": "650939",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40112,6 +48407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGIMARI KUCH GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Singimari Kuch Gaon",
+      "villageCode": "650939",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40152,6 +48455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Natunpam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23150",
+      "panchayatname": "Dumdooma",
+      "villageName": "Singimari Kuch Gaon",
+      "villageCode": "650939",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40192,6 +48503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHIRAI JARANI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "Dhirai Jarani",
+      "villageCode": "586579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40232,6 +48551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.5 SINGRI BAGAN PART-B PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "GUPTESWAR",
+      "villageName": "Ghoramora",
+      "villageCode": "38987",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40272,6 +48599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Singri Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "Ghuramara Gaon",
+      "villageCode": "38985",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40312,6 +48647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HORA MARA PATHAR GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "Hora Mara Pathar Gaon",
+      "villageCode": "650902",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40352,6 +48695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Singri TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "No.1 Singari Bagan",
+      "villageCode": "38981",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40392,6 +48743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Singari Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "No.2 Singari Bagan",
+      "villageCode": "38983",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40432,6 +48791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.4 Singri Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "No.4 Singari Bagan Gaon",
+      "villageCode": "586574",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40472,6 +48839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.5 Singri Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "No.5 Singari Bagan",
+      "villageCode": "38984",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40512,6 +48887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRI NEPALI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23157",
+      "panchayatname": "Gupteswar",
+      "villageName": "Singari Nepali Gaon",
+      "villageCode": "38988",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40552,6 +48935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bher Nepali PWSS (QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Bher Gaon",
+      "villageCode": "38924",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40592,6 +48983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Rowmari PWSS QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Bher Gaon",
+      "villageCode": "38924",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40632,6 +49031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHAIRAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Bhoira Guri Gaon",
+      "villageCode": "38929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40672,6 +49079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhairaguri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Bhoira Guri Gaon",
+      "villageCode": "38929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40712,6 +49127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOIRAGURI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "NATUN PAM",
+      "villageName": "Bhoira Guri Gaon",
+      "villageCode": "38929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40752,6 +49175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOLANPUKHURI-A PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Molan Pukhuri Gaon",
+      "villageCode": "38926",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40792,6 +49223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOLANPUKHURI-B PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Molan Pukhuri Gaon",
+      "villageCode": "38926",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40832,6 +49271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAPAM PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Napam Pathar",
+      "villageCode": "586586",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40872,6 +49319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 NURPURJUTE PART A PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "NATUN PAM",
+      "villageName": "No.1 Noorpur Jut",
+      "villageCode": "38923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40912,6 +49367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 NOORPUR JUTE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.1 Noorpur Jut",
+      "villageCode": "38923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40952,6 +49415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NOORPURJUT PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.1 Noorpur Jut",
+      "villageCode": "38923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -40992,6 +49463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Noorpurjute PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.1 Noorpur Jut",
+      "villageCode": "38923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41032,6 +49511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTONG OF TULIP TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.1 Tiulip Bagan",
+      "villageCode": "38932",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41072,6 +49559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tulip TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.1 Tiulip Bagan",
+      "villageCode": "38932",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41112,6 +49607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tulip TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.1 Tiulip Bagan",
+      "villageCode": "38932",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41152,6 +49655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Tiulip Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "No.2 Tiulip Bagan",
+      "villageCode": "38933",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41192,6 +49703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMNATHPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23151",
+      "panchayatname": "Natun Pam",
+      "villageName": "Ramnathpur",
+      "villageCode": "650936",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41232,6 +49751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGARI BARI GAON",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Bagari Bari Gaon",
+      "villageCode": "38996",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41272,6 +49799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RATANJALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Bagari Bari Gaon",
+      "villageCode": "38996",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41312,6 +49847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RATANJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Bagari Bari Gaon",
+      "villageCode": "38996",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41352,6 +49895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Chirjuli Bagan PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Chirajuli Bagan Gaon",
+      "villageCode": "38976",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41392,6 +49943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHEKIAJULI BAGAN NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Dhekiajuli Bagan No.1",
+      "villageCode": "586456",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41432,6 +49991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No 1 Arun TE ",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.1 Arun Bagan",
+      "villageCode": "650913",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41472,6 +50039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 1 NATUN SIRAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.1 Natun Chirajuli Gaon",
+      "villageCode": "38972",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41512,6 +50087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF ARUN TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.2 Arun Bagan (bernath)",
+      "villageCode": "38980",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41552,6 +50135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Arun T.E  P.W.S.S",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.2 Arun Bagan (bernath)",
+      "villageCode": "38980",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41592,6 +50183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No 2 Natun Sirajuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.2 Natun Chirajuli Gaon",
+      "villageCode": "38977",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41632,6 +50231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 ARUN TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.3 Arun Bagan",
+      "villageCode": "38973",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41672,6 +50279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.4 ARUN TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "No.4 Arun Bagan (rampukhri",
+      "villageCode": "586558",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41712,6 +50327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAM BOGORIBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Num Bagari Bari Gaon",
+      "villageCode": "38974",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41752,6 +50375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAM BAGARI BARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23156",
+      "panchayatname": "Natun Sirajuli",
+      "villageName": "Num Bagari Bari Gaon",
+      "villageCode": "38974",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41792,6 +50423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARJHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Barjhar Gaon",
+      "villageCode": "38948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41832,6 +50471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DALBARI KACHARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Dala Bari Kachari",
+      "villageCode": "38946",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41872,6 +50519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DURABARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "NIZ-BORCHOLA",
+      "villageName": "Durabori Gaon",
+      "villageCode": "38943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41912,6 +50567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Turipam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "NIZ-BORCHOLA",
+      "villageName": "Durabori Gaon",
+      "villageCode": "38943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41952,6 +50615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DURABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "NIZ-BORCHOLA",
+      "villageName": "Durabori Gaon",
+      "villageCode": "38943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -41992,6 +50663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOROIMARI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Goroi Mari Pathar",
+      "villageCode": "38941",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42032,6 +50711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JOORPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Goroi Mari Pathar",
+      "villageCode": "38941",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42072,6 +50759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOORPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Joor Pukhuri Gaon",
+      "villageCode": "38945",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42112,6 +50807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAR HANGA  GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "NIZ-BORCHOLA",
+      "villageName": "Kar Hanga Gaon",
+      "villageCode": "38952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42152,6 +50855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Karhana Pathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Kar Hanga Pathar",
+      "villageCode": "650908",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42192,6 +50903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Natun jamuguri Part-A PWSS - (Old Name - Majuli Char PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "NIZ-BORCHOLA",
+      "villageName": "Majuli Sar",
+      "villageCode": "39000",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42232,6 +50951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ-BORCHALA-II PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Nij Bor Chola Gaon",
+      "villageCode": "38947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42272,6 +50999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NIZ BORCHALLA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Nij Bor Chola Gaon",
+      "villageCode": "38947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42312,6 +51047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ-BORCHALA 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Nij Bor Chola Gaon",
+      "villageCode": "38947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42352,6 +51095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Niz Borchalla PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Nij Bor Chola Gaon",
+      "villageCode": "38947",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42392,6 +51143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Toripam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23153",
+      "panchayatname": "Niz-borchola",
+      "villageName": "Turipum Gaon",
+      "villageCode": "38949",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42432,6 +51191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BHAKUAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Bhokua Mari Gaon",
+      "villageCode": "38937",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42472,6 +51239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Alisinga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Bhokua Mari Gaon",
+      "villageCode": "38937",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42512,6 +51287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dhekiajuli TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Dhekiajuli Bagan",
+      "villageCode": "38975",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42552,6 +51335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHEKIAJULI NO-1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Dhekiajuli Bagan",
+      "villageCode": "38975",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42592,6 +51383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHEKIAJULI TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Dhekiajuli Bagan",
+      "villageCode": "38975",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42632,6 +51431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhekiajuli Bagan Line No 5",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Dhekiajuli Bagan",
+      "villageCode": "38975",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42672,6 +51479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF JOYNAGAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "No.1 Joynagar Gaon",
+      "villageCode": "38931",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42712,6 +51527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOYNAGAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "No.1 Joynagar Gaon",
+      "villageCode": "38931",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42752,6 +51575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ORIANTOLI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "No.1 Oriontali Gaon",
+      "villageCode": "38934",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42792,6 +51623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Oriontoli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "No.1 Oriontali Gaon",
+      "villageCode": "38934",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42832,6 +51671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Palashbasti No.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "No.1 Palash Basti Gaon",
+      "villageCode": "650921",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42872,6 +51719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOYNAGAR NO-2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "No.2 Joynagar Gaon",
+      "villageCode": "38935",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42912,6 +51767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DAKHINPAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Palasbasti No.2",
+      "villageCode": "38936",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42952,6 +51815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PALASHBASTI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Palash Pather Gaon",
+      "villageCode": "38940",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -42992,6 +51863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PALASHBASTI PATHAR-A PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Palash Pather Gaon",
+      "villageCode": "38940",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43032,6 +51911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PALASBASTI PATHAR",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Palash Pather Gaon",
+      "villageCode": "38940",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43072,6 +51959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Polashbosti Pather PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23152",
+      "panchayatname": "Palas Basti",
+      "villageName": "Palash Pather Gaon",
+      "villageCode": "38940",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43112,6 +52007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Benchimari Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "Benchimari Gaon",
+      "villageCode": "38998",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43152,6 +52055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BONDAI JARANI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "Bodaijaroni",
+      "villageCode": "38992",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43192,6 +52103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHIRAI MAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "Dherai Majuli",
+      "villageCode": "38989",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43232,6 +52151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHIRAIATI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "Dhiraiati Gaon",
+      "villageCode": "586971",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43272,6 +52199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF LULUKAI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "Lulukai Gaon",
+      "villageCode": "38990",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43312,6 +52247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Pirakata Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "No.1 Pirakata Bangali",
+      "villageCode": "586549",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43352,6 +52295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Pirakata Kachari PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "No.1 Pirakata Bangali",
+      "villageCode": "586549",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43392,6 +52343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PIRAKATA NO 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "No.2 Pirakata Bangali Gaon",
+      "villageCode": "38997",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43432,6 +52391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Pirakata PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "No.2 Pirakata Bangali Gaon",
+      "villageCode": "38997",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43472,6 +52439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pirakata PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "Pirakata",
+      "villageName": "No.2 Pirakata Bangali Gaon",
+      "villageCode": "38997",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43512,6 +52487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 SINGARI BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "PIRAKATA",
+      "villageName": "No.3 Singari Bagan",
+      "villageCode": "38982",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43552,6 +52535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.6 SINGRI BAGAN",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "PIRAKATA",
+      "villageName": "No.6 Singari Bagan Gaon",
+      "villageCode": "650935",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43592,6 +52583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGARI ATI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23158",
+      "panchayatname": "PIRAKATA",
+      "villageName": "Singari Ati Gaon",
+      "villageCode": "586939",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43632,6 +52631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BALISIHA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Bali Siha Gaon",
+      "villageCode": "38970",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43672,6 +52679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Balisiha PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Bali Siha Gaon",
+      "villageCode": "38970",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43712,6 +52727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UPPER BALISIHA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Bali Siha Gaon",
+      "villageCode": "38970",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43752,6 +52775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKDHARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Bhaluk Dhara",
+      "villageCode": "38969",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43792,6 +52823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHIRAJULI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Chirajuli Gaon",
+      "villageCode": "38968",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43832,6 +52871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIRAJULI PATHAR NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Chirajuli Pathar Gaon",
+      "villageCode": "38967",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43872,6 +52919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SIRAJULI PATHER  GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Chirajuli Pathar Gaon",
+      "villageCode": "38967",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43912,6 +52967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KEHERU KHANDA PATHER GAON PART-1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Keheru Khanda Pather Gaon",
+      "villageCode": "38966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43952,6 +53015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KEHERU KHANDA PATHER GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Keheru Khanda Pather Gaon",
+      "villageCode": "38966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -43992,6 +53063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Medhichuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Keheru Khanda Pather Gaon",
+      "villageCode": "38966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44032,6 +53111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEDHI CHUBURI  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Keheru Khanda Pather Gaon",
+      "villageCode": "38966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44072,6 +53159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Medhichuburi No 1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Medhi Chuburi Gaon",
+      "villageCode": "38971",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44112,6 +53207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEDHICHUBURI GADAHAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "Sirajuli",
+      "villageName": "Medhi Chuburi Gaon",
+      "villageCode": "38971",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44152,6 +53255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 RANGA GARA BIL GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "SIRAJULI",
+      "villageName": "No.1 Ranga Gara Bil Gaon",
+      "villageCode": "38965",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44192,6 +53303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 RANGAGARA BIL GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "SIRAJULI",
+      "villageName": "No.1 Ranga Gara Bil Gaon",
+      "villageCode": "38965",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44232,6 +53351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF RANGAGARABIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "SIRAJULI",
+      "villageName": "No.2 Ranga Gara Bil Gaon",
+      "villageCode": "650928",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44272,6 +53399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 RANGA GARA BIL GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1251",
+      "blockname": "Borchala",
+      "panchayatcode": "23155",
+      "panchayatname": "SIRAJULI",
+      "villageName": "No.3 Ranga Gara Bil Gaon",
+      "villageCode": "650929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44312,6 +53447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Sopai Rowmari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Chapai Roumari Gaon",
+      "villageCode": "38216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44352,6 +53495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAPAI ROUMARI PATHAR",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Chapai Roumari Pathar",
+      "villageCode": "586724",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44392,6 +53543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MADHUPUR BANGAON",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Madhupur Ban Gaon",
+      "villageCode": "38218",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44432,6 +53591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAZ BALI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Majbali Gaon",
+      "villageCode": "38217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44472,6 +53639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAZGAON PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Majgaon Pathar",
+      "villageCode": "38215",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44512,6 +53687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NARAYANKATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Narayan Kati Bangali Gaon",
+      "villageCode": "38219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44552,6 +53735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NARENKATI BENGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Narayan Kati Bangali Gaon",
+      "villageCode": "38219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44592,6 +53783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Narengkati PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Narayan Kati Bangali Gaon",
+      "villageCode": "38219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44632,6 +53831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NARENKATI KACHARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Narayan Kati Kachari Gaon",
+      "villageCode": "38220",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44672,6 +53879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHA BASTI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23077",
+      "panchayatname": "AMIYOPUR",
+      "villageName": "Pacha Bast Gaon",
+      "villageCode": "38214",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44712,6 +53927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHNOI BANGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Pachnoi Bangali",
+      "villageCode": "38213",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44752,6 +53975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHNOI NEPALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Pachnoi Nepali",
+      "villageCode": "38212",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44792,6 +54023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PRAJABASTI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23077",
+      "panchayatname": "Amiyopur",
+      "villageName": "Praja Basti Gaon",
+      "villageCode": "586703",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44832,6 +54071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Arabari Gaon",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Arabari Gaon",
+      "villageCode": "38108",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44872,6 +54119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BAHBERA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Bahbera Gaon",
+      "villageCode": "38103",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44912,6 +54167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SOUTH BAHBERA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Bahbera Gaon",
+      "villageCode": "38103",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44952,6 +54215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bangalgaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Bangal Gaon",
+      "villageCode": "38106",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -44992,6 +54263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dighaldal PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Dighal Dal Gaon",
+      "villageCode": "38099",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45032,6 +54311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIGHAL DAL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Dighal Dal Gaon",
+      "villageCode": "38099",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45072,6 +54359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalakuchi Bagicha Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Kalakuchi Bagicha Gaon",
+      "villageCode": "38109",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45112,6 +54407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHARIDUAR T.E. A",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Kalakuchi Bagicha Gaon",
+      "villageCode": "38109",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45152,6 +54455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KALAKUCHI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Kalakuchi Gaon",
+      "villageCode": "38101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45192,6 +54503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BONGALGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Kalakuchi Gaon",
+      "villageCode": "38101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45232,6 +54551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALAKUCHI NO 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Kalakuchi Gaon",
+      "villageCode": "38101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45272,6 +54599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Madhuribil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Khutaputa Gaon",
+      "villageCode": "38107",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45312,6 +54647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Madhuribil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Khutaputa Gaon",
+      "villageCode": "38107",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45352,6 +54695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF LAKHUPARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Lakhupara Gaon",
+      "villageCode": "38105",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45392,6 +54743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LUHARDUNG PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23066",
+      "panchayatname": "Bahbera",
+      "villageName": "Luhardung",
+      "villageCode": "38102",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45432,6 +54791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mitham Bangali PWSS - (Old Name - Habigaon PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23066",
+      "panchayatname": "BAHBERA",
+      "villageName": "Siyalmari Gaon",
+      "villageCode": "38104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45472,6 +54839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIYALMARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23066",
+      "panchayatname": "BAHBERA",
+      "villageName": "Siyalmari Gaon",
+      "villageCode": "38104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45512,6 +54887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF THEKERAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23066",
+      "panchayatname": "BAHBERA",
+      "villageName": "Thekarajuli Gaon",
+      "villageCode": "38100",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45552,6 +54935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKERAJULI NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23066",
+      "panchayatname": "BAHBERA",
+      "villageName": "Thekarajuli Gaon",
+      "villageCode": "38100",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45592,6 +54983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Borbil Kachari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Barbil Kachari Gaon",
+      "villageCode": "586643",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45632,6 +55031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBIL KACHARI (Bamunpukhuri) PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Barbil Kachari Gaon",
+      "villageCode": "586643",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45672,6 +55079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBIL PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Barbil Pathar Gaon",
+      "villageCode": "38166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45712,6 +55127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dagaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Da Gaon",
+      "villageCode": "38159",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45752,6 +55175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GABHARUPAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Gabharupar Gaon",
+      "villageCode": "38170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45792,6 +55223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BORATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Ghatua Pathar Gaon",
+      "villageCode": "38169",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45832,6 +55271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHATUA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Ghatua Pathar Gaon",
+      "villageCode": "38169",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45872,6 +55319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bamunpukhuri PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Habi Gaon",
+      "villageCode": "38165",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45912,6 +55367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KACHARIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Kachari Gaon",
+      "villageCode": "38171",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45952,6 +55415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Meghaijarani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23071",
+      "panchayatname": "BAMUN PUKHURI",
+      "villageName": "MEGAI PATHAR",
+      "villageCode": "38163",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -45992,6 +55463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MEGHAIATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Meghaiati Gaon",
+      "villageCode": "38164",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46032,6 +55511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEGHAI ATI  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Meghaiati Gaon",
+      "villageCode": "38164",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46072,6 +55559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Natun Ghatua PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Natun Ghatua",
+      "villageCode": "39048",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46112,6 +55607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNPUKHURI NO.1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "No.1 Bamun Pukhuri",
+      "villageCode": "38168",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46152,6 +55655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUN PUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "No.1 Bamun Pukhuri",
+      "villageCode": "38168",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46192,6 +55703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamunpukhuri No 2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "No.2 Bamun Pukuri",
+      "villageCode": "38167",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46232,6 +55751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORATI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "No.2 Bamun Pukuri",
+      "villageCode": "38167",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46272,6 +55799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "OUBARI NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Oubari Pathar",
+      "villageCode": "38158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46312,6 +55847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF OUBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Oubari Pathar",
+      "villageCode": "38158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46352,6 +55895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Oubari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Oubari Pathar",
+      "villageCode": "38158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46392,6 +55943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Oubari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23071",
+      "panchayatname": "Bamun Pukhuri",
+      "villageName": "Oubari Pathar",
+      "villageCode": "38158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46432,6 +55991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batachipur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "Batachi Pur",
+      "villageCode": "38191",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46472,6 +56039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BATACHIPUR NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "Batachi Pur",
+      "villageCode": "38191",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46512,6 +56087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFFITTING OF BATACHIPUR  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "Batachi Pur",
+      "villageCode": "38191",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46552,6 +56135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MADHUPUR GAON F.V PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "Madhupur Gaon F.v.",
+      "villageCode": "38192",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46592,6 +56183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Chamaguri Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Chamaguri Bagan",
+      "villageCode": "650914",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46632,6 +56231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SHYMAGURI ",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Chamaguri Bagan",
+      "villageCode": "650914",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46672,6 +56279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SHYMGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Chamaguri Bagan",
+      "villageCode": "650914",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46712,6 +56327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Dibru Darrang(Part-A) PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Dibru Darrang",
+      "villageCode": "38188",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46752,6 +56375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 DIBRU DARRANG (PART-B) PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Dibru Darrang",
+      "villageCode": "38188",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46792,6 +56423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dibru Darang PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Dibru Darrang",
+      "villageCode": "38188",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46832,6 +56471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Man Muhinipur  PWSS (NQ)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.1 Man Muhinipur Bagan",
+      "villageCode": "38189",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46872,6 +56519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 DIBRUDARRANG BAGAN (PART-B)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.2 Dibrudarang Bagan",
+      "villageCode": "650926",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46912,6 +56567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO 2 DIBRUDARANG BAGAN (Part - A)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.2 Dibrudarang Bagan",
+      "villageCode": "650926",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46952,6 +56615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 MANMUHINIPUR BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.2 Man Muhinipur Bagan",
+      "villageCode": "38190",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -46992,6 +56663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 CHAMAGURI BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "No.3 Chamaguri Bagan",
+      "villageCode": "650933",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47032,6 +56711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SHYAMGURI NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23074",
+      "panchayatname": "Batachipur",
+      "villageName": "Shyamguri Tea Estate",
+      "villageCode": "38187",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47072,6 +56759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Alisinga PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "Bhotpara Gaon",
+      "villageCode": "38200",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47112,6 +56807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOTPARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "Bhotpara Gaon",
+      "villageCode": "38200",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47152,6 +56855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borchalla Bagicha A PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "Bhotpara Pathar",
+      "villageCode": "38199",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47192,6 +56903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhekiajuli Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "Dhekiajuli Gaon",
+      "villageCode": "38202",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47232,6 +56951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Manujuli Pathar Gaon",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "Manujuli Pathar Gaon",
+      "villageCode": "38194",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47272,6 +56999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOINAJULI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "Moinajuli Gaon",
+      "villageCode": "38197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47312,6 +57047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 BAGIPUKHURI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23075",
+      "panchayatname": "BHOTPARA",
+      "villageName": "No.1 Bagipukhuri Gaon",
+      "villageCode": "38198",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47352,6 +57095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Surjyapur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.1 Surjyapur",
+      "villageCode": "38195",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47392,6 +57143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SURYAPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.1 Surjyapur",
+      "villageCode": "38195",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47432,6 +57191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TINSORIA BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.1 Tinisoria Bagan",
+      "villageCode": "38193",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47472,6 +57239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Tinkharia PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.1 Tinisoria Bagan",
+      "villageCode": "38193",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47512,6 +57287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO 2 BAGIPUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.2 Bagipukhuri",
+      "villageCode": "586638",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47552,6 +57335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 SURJYAPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.2 Surjyapur",
+      "villageCode": "38196",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47592,6 +57383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Tinsoria Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.2 Tinikhoria Bagan",
+      "villageCode": "586645",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47632,6 +57431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 TINISARIA BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.3 Tinisaria Bagan",
+      "villageCode": "586651",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47672,6 +57479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 4 Tinkharia",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.4 Tinkharia",
+      "villageCode": "586657",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47712,6 +57527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TINKHARIA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.4 Tinkharia",
+      "villageCode": "586657",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47752,6 +57575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.5 Tinikhoria PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23075",
+      "panchayatname": "Bhotpara",
+      "villageName": "No.5 Tinikhoria",
+      "villageCode": "586667",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47792,6 +57623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENIMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Barpeta Gaon",
+      "villageCode": "38173",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47832,6 +57671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARPETA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Barpeta Gaon",
+      "villageCode": "38173",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47872,6 +57719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORCHOLA BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Borchola Bagan",
+      "villageCode": "38201",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47912,6 +57767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Garpara PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Garpara Gaon",
+      "villageCode": "586652",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47952,6 +57815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GARPARA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Garpara Gaon",
+      "villageCode": "586652",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -47992,6 +57863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARPARA PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Garpara Pathar",
+      "villageCode": "38175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48032,6 +57911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GHAGRA KACHARI",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Ghagra Kachari Gaon",
+      "villageCode": "38174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48072,6 +57959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghagra Kachari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Ghagra Kachari Gaon",
+      "villageCode": "38174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48112,6 +58007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Julia Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Julia Bagan",
+      "villageCode": "612686",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48152,6 +58055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONUJULI NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Monujuli Gaon",
+      "villageCode": "586649",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48192,6 +58103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONUJULI NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Monujuli Gaon",
+      "villageCode": "586649",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48232,6 +58151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Monojuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Monujuli Gaon",
+      "villageCode": "586649",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48272,6 +58199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Monojuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "Monujuli Gaon",
+      "villageCode": "586649",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48312,6 +58247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF CHENIMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23072",
+      "panchayatname": "Chenimari",
+      "villageName": "No.1 Cheni Mari Gaon",
+      "villageCode": "38172",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48352,6 +58295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BARBIL KACHARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Akabil Gaon",
+      "villageCode": "586935",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48392,6 +58343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Dhekipelowa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Dheki Peluya Bangali",
+      "villageCode": "38098",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48432,6 +58391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhekipelowa PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Dheki Peluya Bangali",
+      "villageCode": "38098",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48472,6 +58439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PATIDOI BHERELA  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Dheki Peluya Kachari Gaon",
+      "villageCode": "650897",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48512,6 +58487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITING OF MEJENGJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Megeng Juli",
+      "villageCode": "38093",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48552,6 +58535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NIZ GARUBANDHA  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Nij-garubandha",
+      "villageCode": "38092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48592,6 +58583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No. 1 Dhanmara Gaon",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23065",
+      "panchayatname": "GARUBANDHA",
+      "villageName": "No.1 Dhanmara Gaon",
+      "villageCode": "38110",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48632,6 +58631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHANMORA NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "No.2 Dhanmara Gaon",
+      "villageCode": "38097",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48672,6 +58679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAKARIGURI PATHAR GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Pakariguri Pathar Gaon",
+      "villageCode": "38096",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48712,6 +58727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Patidoibherla Center",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Patidoi Bherala Gaon",
+      "villageCode": "38095",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48752,6 +58775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PATIDOI BHERLA NO 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Patidoi Bherala Gaon",
+      "villageCode": "38095",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48792,6 +58823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Patidoi Bherla PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23065",
+      "panchayatname": "Garubandha",
+      "villageName": "Patidoi Bherala Gaon",
+      "villageCode": "38095",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48832,6 +58871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BELSIRI TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Belsiri Gaon",
+      "villageCode": "586642",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48872,6 +58919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARMARA BENGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Garmara Bangali Gaon",
+      "villageCode": "650899",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48912,6 +58967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Garmora PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Garmara Gaon",
+      "villageCode": "38148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48952,6 +59015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Gormora Jorpukhuri PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Garmara Gaon",
+      "villageCode": "38148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -48992,6 +59063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GORMORA KACHARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Garmara Kachari Gaon",
+      "villageCode": "38151",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49032,6 +59111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GORMARA KACHARI",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Garmara Pathar Gaon",
+      "villageCode": "38146",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49072,6 +59159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GARMORA SESABIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Gormara Sesa Bil Gaon",
+      "villageCode": "38149",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49112,6 +59207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Pub Madhuribil PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Maduribil Gaon",
+      "villageCode": "38142",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49152,6 +59255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MADHURIBIL PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Maduribil Pathar",
+      "villageCode": "588674",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49192,6 +59303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Matikhunda PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Matikhunda Gaon",
+      "villageCode": "38144",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49232,6 +59351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Matikhunda Medhipam",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Matikhunda Gaon",
+      "villageCode": "38144",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49272,6 +59399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Matikhunda Medhipam PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Matikhunda Gaon",
+      "villageCode": "38144",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49312,6 +59447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No 2. Belsiri Bagan",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "No.2 Belsiri Bagan",
+      "villageCode": "586823",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49352,6 +59495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 GARMARA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "No.2 Garmara Gaon",
+      "villageCode": "650927",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49392,6 +59543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 BELSIRI BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "No.3 Belsiri Bagan",
+      "villageCode": "38156",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49432,6 +59591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO 4 BELSIRI BAGAN",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "No.4 Belsiri Bagan",
+      "villageCode": "38141",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49472,6 +59639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.6 JURUKHI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "No.6 Jurukhri",
+      "villageCode": "586805",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49512,6 +59687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OG PAVAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23070",
+      "panchayatname": "Gorhmara",
+      "villageName": "Pabhamari No.1",
+      "villageCode": "38152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49552,6 +59735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITING OF BENGENAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Bengana Juli Gaon",
+      "villageCode": "38072",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49592,6 +59783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BENGENAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Bengana Juli Gaon",
+      "villageCode": "38072",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49632,6 +59831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF  BHERBHERIBIL PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Dighaljuli Gaon",
+      "villageCode": "38073",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49672,6 +59879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATHALGURI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Kathalguri Gaon",
+      "villageCode": "38076",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49712,6 +59927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Naharani PWSS(Jia Gabharu)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Naharani Basti Gaon",
+      "villageCode": "38071",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49752,6 +59975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharani PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Naharani Basti Gaon",
+      "villageCode": "38071",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49792,6 +60023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MISSAMARI  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Nepali Basti Gaon",
+      "villageCode": "38079",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49832,6 +60071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MISSAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Nepali Basti Gaon",
+      "villageCode": "38079",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49872,6 +60119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OG JIAGABHARU PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "No.1 Giya-gabharu",
+      "villageCode": "38077",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49912,6 +60167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JIAGABHARU NO.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "No.1 Giya-gabharu",
+      "villageCode": "38077",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49952,6 +60215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF REKAMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Rekamari Gaon",
+      "villageCode": "38080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -49992,6 +60263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajan Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Rekamari Gaon",
+      "villageCode": "38080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50032,6 +60311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TATSAL GAON",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23063",
+      "panchayatname": "Jia-gabharu",
+      "villageName": "Tatsal Gaon",
+      "villageCode": "38081",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50072,6 +60359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATHALUDUB GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Katalu Pathar",
+      "villageCode": "38140",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50112,6 +60407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kathalupather PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Katalu Pathar",
+      "villageCode": "38140",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50152,6 +60455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Kathalupathar PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Katalu Pathar",
+      "villageCode": "38140",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50192,6 +60503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Keherukhanda GP Multi Village PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Kataludub Gaon",
+      "villageCode": "38139",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50232,6 +60551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KEHRUKHANDA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Keheru Khanda Gaon",
+      "villageCode": "38137",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50272,6 +60599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Keherukhanda PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Keheru Khanda Gaon",
+      "villageCode": "38137",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50312,6 +60647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAMCHUBURI PANBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Numchuburi Panbari Gaon",
+      "villageCode": "38134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50352,6 +60695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Namchuburi Panbari NO 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Numchuburi Panbari Gaon",
+      "villageCode": "38134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50392,6 +60743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAM CHUBURI  PANBARI ( 88) AWC",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Numchuburi Panbari Gaon",
+      "villageCode": "38134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50432,6 +60791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PANBARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23069",
+      "panchayatname": "KEHERUKHUNDA",
+      "villageName": "Panbari Gaon",
+      "villageCode": "38136",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50472,6 +60839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarajan Bengali",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23069",
+      "panchayatname": "Keherukhunda",
+      "villageName": "Tarajan Bangali",
+      "villageCode": "38133",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50512,6 +60887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amtal Bali Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Amtal Bali Gaon",
+      "villageCode": "38223",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50552,6 +60935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amtol Bengali Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Amtal Bangali Gaon",
+      "villageCode": "586725",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50592,6 +60983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF GEJENGAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Amtal Bher Gaon",
+      "villageCode": "38222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50632,6 +61031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Balisuti Bengali Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Balisuti Bangali",
+      "villageCode": "38233",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50672,6 +61079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GABHARUPAR GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Gabharupar Gaon",
+      "villageCode": "38234",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50712,6 +61127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GERUJULI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Gerujuli Gaon",
+      "villageCode": "38226",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50752,6 +61175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOHAIN ALI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Gohain Ali Gaon",
+      "villageCode": "38232",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50792,6 +61223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOHAI BHETI GAON",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Gohain Bheti Gaon",
+      "villageCode": "38230",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50832,6 +61271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Labarigaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Labari Gaon",
+      "villageCode": "38228",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50872,6 +61319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Labarigaon P,w.S.S",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Labari Gaon",
+      "villageCode": "38228",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50912,6 +61367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Labarigaon P.W.S.S",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Labari Gaon",
+      "villageCode": "38228",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50952,6 +61415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAJ ROUMARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Majroumari Bangali Gaon",
+      "villageCode": "38224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -50992,6 +61463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mazrowmari Bangali (Part-A) PWSS - (Old Name - Mazrowmari Bangalligaon PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Majroumari Bangali Gaon",
+      "villageCode": "38224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51032,6 +61511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Majroumari Bangali Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23078",
+      "panchayatname": "MAZ-ROWMARI",
+      "villageName": "MAJROUMARI GAON",
+      "villageCode": "703561",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51072,6 +61559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharbari Bengali P.W.S.S",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23078",
+      "panchayatname": "MAZ-ROWMARI",
+      "villageName": "MAJROUMARI GAON",
+      "villageCode": "703561",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51112,6 +61607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAJROWMAMARI KACHARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Majroumari Kachari Gaon",
+      "villageCode": "38235",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51152,6 +61655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAZBAT GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Mazbat Gaon",
+      "villageCode": "38231",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51192,6 +61703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Naharbari Bengali PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Nahar Bari Bangali Gaon",
+      "villageCode": "38227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51232,6 +61751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAHAR BARI BANGALI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "Nahar Bari Bangali Gaon",
+      "villageCode": "38227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51272,6 +61799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 SINGIMARI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23078",
+      "panchayatname": "Maz-rowmari",
+      "villageName": "No.2 Singimari Gaon",
+      "villageCode": "38229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51312,6 +61847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF BANDARHAGI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Bandarhagi Gaon",
+      "villageCode": "38084",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51352,6 +61895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHERBHERI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Bherbheri Gaon",
+      "villageCode": "586708",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51392,6 +61943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF DHANKHANABARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Dhan Khana Bari Gaon",
+      "villageCode": "38090",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51432,6 +61991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Michamari Gaon (Pt-A)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Michamari Gaon",
+      "villageCode": "38087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51472,6 +62039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Michamari Gaon (Pt-B)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Michamari Gaon",
+      "villageCode": "38087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51512,6 +62087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Michamari Gaon (Pt-C)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Michamari Gaon",
+      "villageCode": "38087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51552,6 +62135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NABIL PATHER PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Nabil Pathar",
+      "villageCode": "38091",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51592,6 +62183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NABIL KISAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Nabil Pathar",
+      "villageCode": "38091",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51632,6 +62231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAGA PARHAR GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23064",
+      "panchayatname": "Missamari",
+      "villageName": "Naga Pathar Gaon",
+      "villageCode": "38089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51672,6 +62279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALI PUKHURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Bali Pukhuri",
+      "villageCode": "38186",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51712,6 +62327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhirai Bagan",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Dhirai Bagan",
+      "villageCode": "38184",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51752,6 +62375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GEJENGAGURI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Gazanga Guri",
+      "villageCode": "38176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51792,6 +62423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Goorbasti Gaon",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Goor Basti Gaon",
+      "villageCode": "38185",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51832,6 +62471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHRISTANPARA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Khristanpara Gaon",
+      "villageCode": "38178",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51872,6 +62519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Mizibari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Mijibari Bangali",
+      "villageCode": "586744",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51912,6 +62567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mizibari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Mijibari Gaon",
+      "villageCode": "38179",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51952,6 +62615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOILAALI NO.1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Moila Ali Gaon",
+      "villageCode": "38177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -51992,6 +62663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF MOILAALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Moila Ali Gaon",
+      "villageCode": "38177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52032,6 +62711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NARAYANPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Narayanpur Gaon (285619)",
+      "villageCode": "38182",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52072,6 +62759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of No.2 Narayanpur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Narayanpur Gaon (285663)",
+      "villageCode": "586881",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52112,6 +62807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MIZIBARI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23073",
+      "panchayatname": "MIZIBARI",
+      "villageName": "No.1 Mizibari Pathar",
+      "villageCode": "38180",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52152,6 +62855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Narayanpur Bagan PWSS (NQ)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23073",
+      "panchayatname": "MIZIBARI",
+      "villageName": "No.1 Narayanpur Pathar",
+      "villageCode": "38183",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52192,6 +62903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 NARAYANPUR PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23073",
+      "panchayatname": "MIZIBARI",
+      "villageName": "No.1 Narayanpur Pathar",
+      "villageCode": "38183",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52232,6 +62951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 MIJIBARI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "No.2 Mijibari Pathar",
+      "villageCode": "586752",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52272,6 +62999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 NARAYANPUR BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "No.2 Narayanpur Bagan",
+      "villageCode": "586758",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52312,6 +63047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 3 NARAYANPUR BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23073",
+      "panchayatname": "MIZIBARI",
+      "villageName": "No.3 Narayanpur Bagan",
+      "villageCode": "586755",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52352,6 +63095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAIKIA CHUBURI  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23073",
+      "panchayatname": "Mizibari",
+      "villageName": "Saikia Chuburi",
+      "villageCode": "38181",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52392,6 +63143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ARASUTI PATHER PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Arasuti Pather",
+      "villageCode": "38128",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52432,6 +63191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGHMARA GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Baghmara Gaon",
+      "villageCode": "38124",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52472,6 +63239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Baligaon PWSS ( NQ )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Bali Gaon",
+      "villageCode": "38122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52512,6 +63287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baligaon Part PWSS - (Old Name - PANBARI GAON PWSS)",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23068",
+      "panchayatname": "NAHARBARI",
+      "villageName": "Baligaon Bangali",
+      "villageCode": "38123",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52552,6 +63335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIGAON BANGALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23068",
+      "panchayatname": "NAHARBARI",
+      "villageName": "Baligaon Bangali",
+      "villageCode": "38123",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52592,6 +63383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARDUBI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Bardubi",
+      "villageCode": "38129",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52632,6 +63431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bhergaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Bher Gaon",
+      "villageCode": "38126",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52672,6 +63479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHERGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Bher Gaon",
+      "villageCode": "38126",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52712,6 +63527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAHIKUCHI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Kahi Kuchi Gaon",
+      "villageCode": "38127",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52752,6 +63575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHALAHU BARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Khalahu Bari",
+      "villageCode": "38131",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52792,6 +63623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharbari No.1 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Naharbari Gaon",
+      "villageCode": "38130",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52832,6 +63671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naharbari",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Naharbari Gaon",
+      "villageCode": "38130",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52872,6 +63719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NAHARBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Naharbari Gaon",
+      "villageCode": "38130",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52912,6 +63767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 ULUBARI",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "No.1 Ulubari",
+      "villageCode": "587322",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52952,6 +63815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 ULUBARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "No.2 Ulubari",
+      "villageCode": "38125",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -52992,6 +63863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PATALIA KHOWA PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Patalia Khowa",
+      "villageCode": "38120",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53032,6 +63911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23068",
+      "panchayatname": "Naharbari",
+      "villageName": "Salmari",
+      "villageCode": "38121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53072,6 +63959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Garjuli Gaon PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "Garjuli Gaon",
+      "villageCode": "588676",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53112,6 +64007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Gorjuli Pather PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "Garjuli Pathar Gaon",
+      "villageCode": "38208",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53152,6 +64055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHOGRA NEW PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "Ghagra Gaon",
+      "villageCode": "38210",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53192,6 +64103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.1 Faijabad Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Faijabad Bagan",
+      "villageCode": "650918",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53232,6 +64151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANOBAG CHARCHOBARI LPS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Faijabad Bagan",
+      "villageCode": "650918",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53272,6 +64199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 GANGAPUR F.V.PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Gangapur F.v.",
+      "villageCode": "650915",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53312,6 +64247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SANTIPUR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Gangapur F.v.",
+      "villageCode": "650915",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53352,6 +64295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Hirajuli Bagan",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Hirajuli Bagan",
+      "villageCode": "38203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53392,6 +64343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HIRAJULI TE II PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Hirajuli Bagan",
+      "villageCode": "38203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53432,6 +64391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hirajuli TE_II PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Hirajuli Bagan",
+      "villageCode": "38203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53472,6 +64439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.3 Panbari Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Panbari Bagan",
+      "villageCode": "650923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53512,6 +64487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Santipur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.1 Santipur F.v.",
+      "villageCode": "586827",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53552,6 +64535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No.2 Faizabad PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.2 Faijabad Bagan",
+      "villageCode": "650917",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53592,6 +64583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 GANGAPUR FV PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.2 Gangapur F.v.",
+      "villageCode": "613286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53632,6 +64631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.2 PANBARI BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.2 Panbari Bagan",
+      "villageCode": "38209",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53672,6 +64679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF PANBARI BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.2 Panbari Bagan",
+      "villageCode": "38209",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53712,6 +64727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Santipur PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.2 Santipur F.v.",
+      "villageCode": "38206",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53752,6 +64775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.4 FAIZABAD BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.3 Faijabad Bagan",
+      "villageCode": "650916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53792,6 +64823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 FAIJABAD BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.3 Faijabad Bagan",
+      "villageCode": "650916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53832,6 +64871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "No 3 Hirajuli Bagan PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23076",
+      "panchayatname": "Panbari",
+      "villageName": "No.3 Hirajuli Bagan",
+      "villageCode": "38204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53872,6 +64919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "1 NO. HUGRAJULI BAGAN",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "1.no. Hugrajuli Bagan",
+      "villageCode": "38221",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53912,6 +64967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOLAGURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Bholaguri Gaon",
+      "villageCode": "38243",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53952,6 +65015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHUTIA ALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Bhutiaali Gaon",
+      "villageCode": "38236",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -53992,6 +65063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF HUGRAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Hugrajuli Gaon",
+      "villageCode": "38246",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54032,6 +65111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hugrajuli PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Hukurajilu",
+      "villageCode": "650905",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54072,6 +65159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NATUN BASTI GAON",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Natun Basti Gaon",
+      "villageCode": "38237",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54112,6 +65207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO. 1 CHARIALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "No.1 Chariali Gaon",
+      "villageCode": "38242",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54152,6 +65255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.1 SANMILANI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "No.1 Sanmilani",
+      "villageCode": "38240",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54192,6 +65303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO 2 HUGRAJULI BAGAN",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "No.2 Hugajuli Bagan",
+      "villageCode": "38245",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54232,6 +65351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO 2 SANMILANI",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "No.2 Sanmilani",
+      "villageCode": "38241",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54272,6 +65399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF NO.2 CHARIALI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "No.2 Sanmilani",
+      "villageCode": "38241",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54312,6 +65447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO.3 HUGRAJULI BAGAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "No.3 Hugrajuli Bagan Gaon",
+      "villageCode": "651029",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54352,6 +65495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF OSURMARI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Osurmari Gaon",
+      "villageCode": "38239",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54392,6 +65543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Assumari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Osurmari Gaon",
+      "villageCode": "38239",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54432,6 +65591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "OSURMARI PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Osurmari Pathar",
+      "villageCode": "650934",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54472,6 +65639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SEMRAJULI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23079",
+      "panchayatname": "Rakhashmari",
+      "villageName": "Samarajuli Gaon",
+      "villageCode": "38244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54512,6 +65687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOPAI TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23079",
+      "panchayatname": "RAKHASHMARI",
+      "villageName": "Samarajuli Gaon",
+      "villageCode": "38244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54552,6 +65735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopai No.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23079",
+      "panchayatname": "RAKHASHMARI",
+      "villageName": "Samarajuli Gaon",
+      "villageCode": "38244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54592,6 +65783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopai TE  PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "DHEKIAJULI",
+      "panchayatcode": "23079",
+      "panchayatname": "RAKHASHMARI",
+      "villageName": "Samarajuli Gaon",
+      "villageCode": "38244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54632,6 +65831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOPAI NO.2 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "2.no. Chapai Bagan",
+      "villageCode": "586685",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54672,6 +65879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JARGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "Chapai Bali Gaon",
+      "villageCode": "38247",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54712,6 +65927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Sopai Baligaon PWSS ( QA )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "Chapai Bali Gaon",
+      "villageCode": "38247",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54752,6 +65975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopai TE Kalghar Line",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.1 Chapai Bagan",
+      "villageCode": "38250",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54792,6 +66023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SOPAI TE NO.1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.1 Chapai Bagan",
+      "villageCode": "38250",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54832,6 +66071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopai No 3 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.3 Chapai Bagan",
+      "villageCode": "586692",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54872,6 +66119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOPAI NO.3 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.3 Chapai Bagan",
+      "villageCode": "586692",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54912,6 +66167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopai 3-A",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.3 Chapai Bagan",
+      "villageCode": "586692",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54952,6 +66215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sopai TE PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.3 Chariali",
+      "villageCode": "586668",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -54992,6 +66263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NO 3 CHARIALI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "No.3 Chariali",
+      "villageCode": "586668",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55032,6 +66311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF SOPAI NO.4 PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23080",
+      "panchayatname": "Sopai",
+      "villageName": "Sapoi T.e. No.4",
+      "villageCode": "586701",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55072,6 +66359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ARASUTI GAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Arasuti Gaon",
+      "villageCode": "38112",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55112,6 +66407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAMARCHUBURI NO.1 ",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Kamar Chuburi Gaon",
+      "villageCode": "38117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55152,6 +66455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Kamarchuburi PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Kamar Chuburi Gaon",
+      "villageCode": "38117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55192,6 +66503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAMARCHUBURI PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Kamar Chuburi Gaon",
+      "villageCode": "38117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55232,6 +66551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KAMARPATHER PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Kamar Pathar Gaon",
+      "villageCode": "38118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55272,6 +66599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAMAR PATHAR PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Kamar Pathar Gaon",
+      "villageCode": "38118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55312,6 +66647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kathanibari PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Katani Bari",
+      "villageCode": "38111",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55352,6 +66695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Katani Gaon No 1",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Katani Gaon",
+      "villageCode": "586550",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55392,6 +66743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATANIGAON NO-II PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Katani Gaon",
+      "villageCode": "586550",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55432,6 +66791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF KATANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Katani Gaon",
+      "villageCode": "586550",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55472,6 +66839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATANIGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Katani Gaon",
+      "villageCode": "586550",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55512,6 +66887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAGARIJAN PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Khagarijan Gaon",
+      "villageCode": "38113",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55552,6 +66935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naliniduba PWSS ( NQ )",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Khagarijan Gaon",
+      "villageCode": "38113",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55592,6 +66983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Naliniduba PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Khagarijan Gaon",
+      "villageCode": "38113",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55632,6 +67031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOCHGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Kuch Gaon",
+      "villageCode": "38116",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55672,6 +67079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rohinibil PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Rahani Bil Pathar",
+      "villageCode": "586559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55712,6 +67127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THELAMARGHATGAON PWSS",
+      "districtCode": "49",
+      "districtName": "Sonitpur",
+      "blockcode": "1244",
+      "blockname": "Dhekiajuli",
+      "panchayatcode": "23067",
+      "panchayatname": "Thelamara",
+      "villageName": "Thalamara Ghat Gaon",
+      "villageCode": "38119",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55752,6 +67175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAHARKATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agia Part-ii",
+      "villageCode": "32968",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55792,6 +67223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AGIA II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agia Part-ii",
+      "villageCode": "32968",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55832,6 +67271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Agia Pt II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agia Part-ii",
+      "villageCode": "32968",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55872,6 +67319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHENDERA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agni Part-i",
+      "villageCode": "32967",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55912,6 +67367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AGIA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agni Part-i",
+      "villageCode": "32967",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55952,6 +67415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Agia PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agni Part-i",
+      "villageCode": "32967",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -55992,6 +67463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AGIA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Agni Part-i",
+      "villageCode": "32967",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56032,6 +67511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AJAGAR PAHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "AJAGAR PAHAR  N.C.",
+      "villageCode": "32969",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56072,6 +67559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chaplangkata PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Chaplongkata",
+      "villageCode": "32972",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56112,6 +67607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chaplangkata M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Chaplongkata",
+      "villageCode": "32972",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56152,6 +67655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DALOK PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "DALOK",
+      "villageCode": "32973",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56192,6 +67703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEULI IZARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "DEWLIJARA",
+      "villageCode": "32974",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56232,6 +67751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOSAI GA DHAWA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Gosai Gadhowa",
+      "villageCode": "32975",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56272,6 +67799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOSAI GA DHAWA II M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Gosai Gadhowa",
+      "villageCode": "32975",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56312,6 +67847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGNA RAJBANSHIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "JAGNA RAJBANGSIPARA",
+      "villageCode": "32978",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56352,6 +67895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGNA RAJBANSHIPARA II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "JAGNA RAJBANGSIPARA",
+      "villageCode": "32978",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56392,6 +67943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGNAPARA DEREK PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "JOGGAPARA DEREK",
+      "villageCode": "32977",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56432,6 +67991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGNAPARA DEREK II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "JOGGAPARA DEREK",
+      "villageCode": "32977",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56472,6 +68039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KEOTPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Keotpara",
+      "villageCode": "32979",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56512,6 +68087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KESHORIDOBI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "KISORDUBI",
+      "villageCode": "32980",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56552,6 +68135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KESHORIDOBI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22400",
+      "panchayatname": "AGIA",
+      "villageName": "KISORDUBI",
+      "villageCode": "32980",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56592,6 +68183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rajapara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Rajapara",
+      "villageCode": "32981",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56632,6 +68231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAKMARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Rajapara",
+      "villageCode": "32981",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56672,6 +68279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakmara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Rajapara",
+      "villageCode": "32981",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56712,6 +68327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SILSAK DAMAS PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Silchak Domal",
+      "villageCode": "32982",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56752,6 +68375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILSAK DOMAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Silchak Domal",
+      "villageCode": "32982",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56792,46 +68423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Silsak Damas PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.30046142",
-      "name": "TISIMPUR PWSS (NEW)",
-      "description": "TISIMPUR PWSS (NEW)",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "TISIMPUR PWSS (NEW)",
-        "localName": "TISIMPUR PWSS (NEW)",
-        "districtCode": "44",
-        "districtName": "Goalpara",
-        "blockcode": "1184",
-        "blockname": "BALIJANA",
-        "panchayatcode": "22400",
-        "panchayatname": "AGIA",
-        "villageCode": "32983",
-        "villageName": "TISIMPUR",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "30046142",
-        "ddrName": "TISIMPUR PWSS (NEW)",
-        "projectId": "30046142",
-        "regionName": "1184"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "TISIMPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22400",
+      "panchayatname": "Agia",
+      "villageName": "Silchak Domal",
+      "villageCode": "32982",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56872,6 +68471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MARIYOMNAGAR PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Boladmari",
+      "villageCode": "32951",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56912,6 +68519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MARIAM NAGAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Boladmari",
+      "villageCode": "32951",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56952,6 +68567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOBINDAPUR M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -56992,6 +68615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHALLA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57032,6 +68663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Challa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57072,6 +68711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khograrpar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57112,6 +68759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOGULAMARI  PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57152,6 +68807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOBINDOPUR PT-II PWSS(KHONGRAPARA) (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57192,6 +68855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GOBINDAPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57232,6 +68903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UTTAR GOBINDOPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57272,6 +68951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gobindapur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57312,6 +68999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ALINAGAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57352,6 +69047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HASILABEEL NOTUN BASTI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57392,6 +69095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "REHMATPUR TILA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57432,6 +69143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dorarpar PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57472,6 +69191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Rangagorah PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57512,6 +69239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rongagorah PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57552,6 +69287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Gobindapur (ct)",
+      "villageCode": "32952",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57592,6 +69335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALADMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Hasila Bill",
+      "villageCode": "32948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57632,6 +69383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HASILABEEL PUBPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Hasila Bill",
+      "villageCode": "32948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57672,6 +69431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HASILA BEEL PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Hasila Bill",
+      "villageCode": "32948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57712,6 +69479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hasila Beel PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Hasila Bill",
+      "villageCode": "32948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57752,6 +69527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HASILAPARA M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Hasila Bill",
+      "villageCode": "32948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57792,6 +69575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HASILABEEL TILAPARA M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22398",
+      "panchayatname": "Baladmari",
+      "villageName": "Hasila Bill",
+      "villageCode": "32948",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57832,6 +69623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NARAYANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Baikunthapur",
+      "villageCode": "32899",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57872,6 +69671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAPUPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Balijana",
+      "villageCode": "32903",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57912,6 +69719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of FATEHPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Balijana",
+      "villageCode": "32903",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57952,6 +69767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGSAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Bhetaipara",
+      "villageCode": "32897",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -57992,6 +69815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Budhipara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Budhipara",
+      "villageCode": "32895",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58032,6 +69863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Debattar Bapupara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Debattar Bapupara Pt-i",
+      "villageCode": "32901",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58072,6 +69911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DEBOTTAR BAPUPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Debattar Bapupara Pt-i",
+      "villageCode": "32901",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58112,6 +69959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Debattar Bapupara Pt-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Debattar Bapupara Pt-ii",
+      "villageCode": "32900",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58152,6 +70007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dorapara Pt-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Dorapara",
+      "villageCode": "32902",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58192,6 +70055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DORAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Dorapara",
+      "villageCode": "32902",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58232,6 +70103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dorapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Dorapara",
+      "villageCode": "32902",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58272,6 +70151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TOKRAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Jokrapara",
+      "villageCode": "32898",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58312,6 +70199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SARAPARA (BALIJANA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Kochpara",
+      "villageCode": "32893",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58352,6 +70247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHOLBHANGA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Nichinta",
+      "villageCode": "32894",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58392,6 +70295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "207 NO NICHINTA LPS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Nichinta",
+      "villageCode": "32894",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58432,6 +70343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NICHINTA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Nichinta",
+      "villageCode": "32894",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58472,6 +70391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROKHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22393",
+      "panchayatname": "Balijana",
+      "villageName": "Rakhapara",
+      "villageCode": "32896",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58512,6 +70439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BENGKANDA M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Bang Kanda",
+      "villageCode": "32924",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58552,6 +70487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARDAMAL PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Bardamal",
+      "villageCode": "32923",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58592,6 +70535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOISKHULI PT-II M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Bhaiskhuli",
+      "villageCode": "32922",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58632,6 +70583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhoiskhuli PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Bhaiskhuli",
+      "villageCode": "32922",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58672,6 +70631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bhoiskhuli PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Bhaiskhuli",
+      "villageCode": "32922",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58712,6 +70679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHENGAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Bhaiskhuli",
+      "villageCode": "32922",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58752,6 +70727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATHALGURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Kathalguri",
+      "villageCode": "32920",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58792,6 +70775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MATIA M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Matia",
+      "villageCode": "32919",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58832,6 +70823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MATIA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Matia Garo Para Pt-ii",
+      "villageCode": "622670",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58872,6 +70871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rampur Pt-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Rampur",
+      "villageCode": "32927",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58912,6 +70919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rampur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Rampur",
+      "villageCode": "32927",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58952,6 +70967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RAMPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Rampur",
+      "villageCode": "32927",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -58992,6 +71015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAHARIA A PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Saharia",
+      "villageCode": "32928",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59032,6 +71063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SAHARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Saharia",
+      "villageCode": "32928",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59072,6 +71111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sahari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Saharia",
+      "villageCode": "32928",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59112,6 +71159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SHILDANGA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Saharia",
+      "villageCode": "32928",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59152,6 +71207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORJULI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Telipara",
+      "villageCode": "32929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59192,6 +71255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TELIPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Telipara",
+      "villageCode": "32929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59232,6 +71303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TELIPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Telipara",
+      "villageCode": "32929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59272,6 +71351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Telipara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22395",
+      "panchayatname": "Bardamal",
+      "villageName": "Telipara",
+      "villageCode": "32929",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59312,6 +71399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALGURIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Badhapur",
+      "villageCode": "32995",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59352,6 +71447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BODAHPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Badhapur",
+      "villageCode": "32995",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59392,6 +71495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAGOLAKONAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Badhapur",
+      "villageCode": "32995",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59432,6 +71543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAIJURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Baijuri",
+      "villageCode": "32997",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59472,6 +71591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JARENGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Barduk",
+      "villageCode": "32998",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59512,6 +71639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GENDRABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Gendabari",
+      "villageCode": "33001",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59552,6 +71687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Geradubi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Geradubi",
+      "villageCode": "33002",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59592,6 +71735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Geradubi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Geradubi",
+      "villageCode": "33002",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59632,6 +71783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HATIGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Hati Gaon",
+      "villageCode": "33003",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59672,6 +71831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATASIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Katasibari",
+      "villageCode": "33005",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59712,6 +71879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHUKSIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Khakshipara",
+      "villageCode": "33004",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59752,6 +71927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEGADAM PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Megh Dam",
+      "villageCode": "33006",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59792,6 +71975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONGRAI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Mongrai",
+      "villageCode": "33007",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59832,6 +72023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAKRIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Rangchai",
+      "villageCode": "33008",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59872,6 +72071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Rangchai",
+      "villageCode": "33008",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59912,6 +72119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIJUKONA MINI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Sijukona",
+      "villageCode": "33009",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59952,6 +72167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KASHIKHAGRA WEST PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22402",
+      "panchayatname": "Bodahapur",
+      "villageName": "Soto Kashi Khagra",
+      "villageCode": "33000",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -59992,6 +72215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ SATRAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Bamirampara",
+      "villageCode": "32941",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60032,6 +72263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNGHOPA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Dakur Vita",
+      "villageCode": "32933",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60072,6 +72311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNGHOPA PT-II M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "BALIJANA",
+      "panchayatcode": "22396",
+      "panchayatname": "DARIDURI",
+      "villageName": "DAKUR VITA",
+      "villageCode": "32933",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60112,6 +72359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MAKRI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Dakur Vita",
+      "villageCode": "32933",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60152,6 +72407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAKURBHITA NC PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Dakur Vita N.c.",
+      "villageCode": "650762",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60192,6 +72455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dariduri PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Dari Duri",
+      "villageCode": "32934",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60232,6 +72503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DARIDURI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Dari Duri",
+      "villageCode": "32934",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60272,6 +72551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dariduri Uzanpara Tilapara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Dari Duri",
+      "villageCode": "32934",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60312,6 +72599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Makri PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Makri",
+      "villageCode": "32931",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60352,6 +72647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boro Makri M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Makri",
+      "villageCode": "32931",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60392,6 +72695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Niz Barbhita PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Munsirvita",
+      "villageCode": "32932",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60432,6 +72743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Niz  Barbhita PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Munsirvita",
+      "villageCode": "32932",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60472,6 +72791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Paglat Tek PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Paglar Tag N.c.",
+      "villageCode": "32938",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60512,6 +72839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAKURBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Sal Forest(dakur Vita)",
+      "villageCode": "622672",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60552,6 +72887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chutki AWC",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Sutki",
+      "villageCode": "32939",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60592,6 +72935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUTKI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Sutki N.c.",
+      "villageCode": "32940",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60632,6 +72983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Taraibari PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22396",
+      "panchayatname": "Dariduri",
+      "villageName": "Tarai Bari",
+      "villageCode": "32937",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60672,6 +73031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bairang PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bairang",
+      "villageCode": "32918",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60712,6 +73079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamundanga Pt-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bamundanga Pt-ii",
+      "villageCode": "32916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60752,6 +73127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAMUNDANGA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bamundanga Pt-ii",
+      "villageCode": "32916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60792,6 +73175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamundanga PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bamundanga Pt-ii",
+      "villageCode": "32916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60832,6 +73223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamundanga PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bamundanga Pt-ii",
+      "villageCode": "32916",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60872,6 +73271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHIPIN CHALA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bamundonga Pt-i",
+      "villageCode": "32917",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60912,6 +73319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNDANGA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Bamundonga Pt-i",
+      "villageCode": "32917",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60952,6 +73367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Borjhora PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Barjora No.1",
+      "villageCode": "32915",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -60992,6 +73415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dwarka Kacharipara Pt-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Dark Kacharipara Pt-ii",
+      "villageCode": "32909",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61032,6 +73463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DWARKA RABHAPARA PT-II M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Dark Rabhapara Pt-ii",
+      "villageCode": "32910",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61072,6 +73511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DWARKA RABHAPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Dark Rabhapara Pt-ii",
+      "villageCode": "32910",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61112,6 +73559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DWARKA KACHARIPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Darka Kacharipara Pt-i",
+      "villageCode": "32911",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61152,6 +73607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEULI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Deauli",
+      "villageCode": "32908",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61192,6 +73655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEULI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Deauli",
+      "villageCode": "32908",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61232,6 +73703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ketkibari PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Ketkibari",
+      "villageCode": "32907",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61272,6 +73751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LAMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Lampara",
+      "villageCode": "32906",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61312,6 +73799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mojai Garopara/Rabhapara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Mojai Garopara",
+      "villageCode": "32904",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61352,6 +73847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thakurbilla M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22394",
+      "panchayatname": "Dwarka",
+      "villageName": "Thakur Billa",
+      "villageCode": "650761",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61392,6 +73895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARVITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Bar Vita",
+      "villageCode": "32984",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61432,6 +73943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAT BAINI PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Chandamari Sat Baini",
+      "villageCode": "32985",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61472,6 +73991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sat Baini PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Chandamari Sat Baini",
+      "villageCode": "32985",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61512,6 +74039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAT BAINI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Chandamari Sat Baini",
+      "villageCode": "32985",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61552,6 +74087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHANDAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kal Pani Chandamari",
+      "villageCode": "32989",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61592,6 +74135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "URPAD BEEL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kal Pani Chandamari",
+      "villageCode": "32989",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61632,6 +74183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chandamri Pt-II PWSS NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kal Pani Chandamari",
+      "villageCode": "32989",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61672,6 +74231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALPANI GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kalapani",
+      "villageCode": "32990",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61712,6 +74279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALAPANI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kalapani",
+      "villageCode": "32990",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61752,6 +74327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KALPANI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kalapani",
+      "villageCode": "32990",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61792,6 +74375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALAPANI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kalapani",
+      "villageCode": "32990",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61832,6 +74423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALINDI DOBA PWSS (NEW) PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kalindi Doba",
+      "villageCode": "32986",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61872,6 +74471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KOKIRA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kukuria Pt-i",
+      "villageCode": "32987",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61912,6 +74519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUKURIA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kukuria Pt-ii",
+      "villageCode": "32988",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61952,6 +74567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUKURIA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Kukuria Pt-ii",
+      "villageCode": "32988",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -61992,6 +74615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA (Balijana) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22401",
+      "panchayatname": "Kalpani Chandamari",
+      "villageName": "Tilapara",
+      "villageCode": "32992",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62032,6 +74663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOISKHULI KALYANPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhaiskhuli",
+      "villageCode": "32955",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62072,6 +74711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gendra PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhaiskhuli",
+      "villageCode": "32955",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62112,6 +74759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKDUBI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62152,6 +74807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BHALUKDUBI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62192,6 +74855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhalukdubi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62232,6 +74903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKDUBI EAST PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62272,6 +74951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORPAHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62312,6 +74999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jungle Block Pt II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62352,6 +75047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JYOTINAGAR LACHITNAGAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62392,6 +75095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Milan Nagar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62432,6 +75143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MILAN NAGAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62472,6 +75191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhalukdubi PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62512,46 +75239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PRIYANAGAR PWSS (NEW)",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.30014441",
-      "name": "Shyamaguri PWSS (NEW)",
-      "description": "Shyamaguri PWSS (NEW)",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "Shyamaguri PWSS (NEW)",
-        "localName": "Shyamaguri PWSS (NEW)",
-        "districtCode": "44",
-        "districtName": "Goalpara",
-        "blockcode": "1184",
-        "blockname": "Balijana",
-        "panchayatcode": "22399",
-        "panchayatname": "Kalyanpur",
-        "villageCode": "32953",
-        "villageName": "Chamaguri",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "30014441",
-        "ddrName": "Shyamaguri PWSS (NEW)",
-        "projectId": "30014441",
-        "regionName": "1184"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "Shyamaguri PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Bhalukdubi (ct)",
+      "villageCode": "32954",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62592,6 +75287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Anand Bazar M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Dasarapara Matia",
+      "villageCode": "32956",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62632,6 +75335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DOSORA MATIA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Dasarapara Matia",
+      "villageCode": "32956",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62672,6 +75383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GENDRA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Garo Kuta",
+      "villageCode": "32959",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62712,6 +75431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GENDRA NC PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Gendera",
+      "villageCode": "32957",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62752,6 +75479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GORAIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Goraimari",
+      "villageCode": "32960",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62792,6 +75527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jungle Block Pt-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Jungle Block No-1",
+      "villageCode": "32961",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62832,6 +75575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "J. BLOCK (II) M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Jungle Block No-2",
+      "villageCode": "32962",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62872,6 +75623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HADLAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kalyanpur",
+      "villageCode": "32964",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62912,6 +75671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalyanpur Pt-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kalyanpur",
+      "villageCode": "32964",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62952,6 +75719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALYANPUR PT-II M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kalyanpur",
+      "villageCode": "32964",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -62992,6 +75767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "208 NO HADLAPARA LP.",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kalyanpur",
+      "villageCode": "32964",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63032,6 +75815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KURUABHASHA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kurowa Bhasa",
+      "villageCode": "32965",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63072,6 +75863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KURUABHASA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kurowa Bhasa",
+      "villageCode": "32965",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63112,6 +75911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kuruabhasa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Kurowa Bhasa",
+      "villageCode": "32965",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63152,6 +75959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofiting of SOLMARI KALYANPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Solmari",
+      "villageCode": "32966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63192,6 +76007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Soulmari Kalyanpur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Solmari",
+      "villageCode": "32966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63232,6 +76055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SOLMARI TILAPARA M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22399",
+      "panchayatname": "Kalyanpur",
+      "villageName": "Solmari",
+      "villageCode": "32966",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63272,6 +76103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HURKAKUCHI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Hurpakuchi",
+      "villageCode": "32942",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63312,6 +76151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kumri Pt-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Khar Boja",
+      "villageCode": "32944",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63352,6 +76199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHUTAMARI WEST PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Khutamari",
+      "villageCode": "32943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63392,6 +76247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khutamari East PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Khutamari",
+      "villageCode": "32943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63432,6 +76295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHUTAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Khutamari",
+      "villageCode": "32943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63472,6 +76343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KUMRI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Khutamari",
+      "villageCode": "32943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63512,6 +76391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamuntila M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Khutamari",
+      "villageCode": "32943",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63552,6 +76439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pancharatna PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Pancha Ratna",
+      "villageCode": "32945",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63592,6 +76487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PANCHARATNA NC PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1184",
+      "blockname": "Balijana",
+      "panchayatcode": "22397",
+      "panchayatname": "Kumri",
+      "villageName": "Pancha Ratna N.c.",
+      "villageCode": "32946",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63632,6 +76535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARMANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Bausatari",
+      "villageCode": "33432",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63672,6 +76583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAUCHERTARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Bausatari",
+      "villageCode": "33432",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63712,6 +76631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAKLI DAMRIBHASA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Bausatari",
+      "villageCode": "33432",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63752,6 +76679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUKULIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Dharai",
+      "villageCode": "33433",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63792,6 +76727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HARUAFUTA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Dharai",
+      "villageCode": "33433",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63832,6 +76775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHARAI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Dharai",
+      "villageCode": "33433",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63872,6 +76823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BATAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Gosaidubi Hindupara",
+      "villageCode": "33434",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63912,6 +76871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FALIMARI SASAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Gosaidubi Hindupara",
+      "villageCode": "33434",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63952,6 +76919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOSAIDUBI HINDUPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Gosaidubi Hindupara",
+      "villageCode": "33434",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -63992,6 +76967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KACHIARTARY PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Gosaidubi Hindupara",
+      "villageCode": "33434",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64032,6 +77015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOSAIDUBI MUSLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Gosaidubi Muslimpara",
+      "villageCode": "33435",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64072,6 +77063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORMAHARU PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22451",
+      "panchayatname": "Gossaidubi",
+      "villageName": "Haruaphuta",
+      "villageCode": "33436",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64112,6 +77111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOWKATOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Choukatola",
+      "villageCode": "33503",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64152,6 +77159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HOLDIBARI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Holdibari Pt-ii",
+      "villageCode": "33504",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64192,6 +77207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Koimari",
+      "villageCode": "33506",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64232,6 +77255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALBARI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Salbari Pt-i",
+      "villageCode": "33505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64272,6 +77303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALBARI PT-I CHAIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Salbari Pt-i",
+      "villageCode": "33505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64312,6 +77351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DASPARA (JALESWAR) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Salbari Pt-i",
+      "villageCode": "33505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64352,6 +77399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GAURNAGAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Salbari Pt-i",
+      "villageCode": "33505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64392,6 +77447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gour Nagar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Salbari Pt-i",
+      "villageCode": "33505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64432,6 +77495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Salbari Pt-i",
+      "villageCode": "33505",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64472,6 +77543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALDHOWA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22462",
+      "panchayatname": "Gour Nagar",
+      "villageName": "Saldhowa",
+      "villageCode": "33502",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64512,6 +77591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HOLDIBARI DAMRIBHASA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Holdibari No.1",
+      "villageCode": "33437",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64552,6 +77639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NEW HOLDIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Holdibari No.1",
+      "villageCode": "33437",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64592,6 +77687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOLOKERPAM PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Kartimari",
+      "villageCode": "33438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64632,6 +77735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KARTIMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Kartimari",
+      "villageCode": "33438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64672,6 +77783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANDIRPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Kartimari",
+      "villageCode": "33438",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64712,6 +77831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Andurber PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64752,6 +77879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of ANDURBBER PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64792,6 +77927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANSIR CHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64832,6 +77975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARMANPARA DASPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64872,6 +78023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Morishbari Ferrarjhar PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64912,6 +78071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhumer Ghat PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64952,6 +78119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHERER CHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -64992,6 +78167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MORISHBARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22452",
+      "panchayatname": "Guriadhap",
+      "villageName": "Morichbari Reserve",
+      "villageCode": "33440",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65032,6 +78215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHULKANIPARA (GOLARPAM) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22460",
+      "panchayatname": "HAGURIPARA",
+      "villageName": "CHULKANI",
+      "villageCode": "33493",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65072,6 +78263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HAGURIPARA(SILAPANI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22460",
+      "panchayatname": "Haguripara",
+      "villageName": "Haguripara",
+      "villageCode": "33495",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65112,6 +78311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHULKANIPARA (GOLARPAM BEELPARA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22460",
+      "panchayatname": "Haguripara",
+      "villageName": "Thongpara",
+      "villageCode": "650774",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65152,6 +78359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ANGTHIHARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Bandormatha",
+      "villageCode": "33517",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65192,6 +78407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANDARMATHA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Bandormatha",
+      "villageCode": "33517",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65232,6 +78455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATIMURA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Hatimura",
+      "villageCode": "33518",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65272,6 +78503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORO HASHDOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Hosdoba",
+      "villageCode": "33512",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65312,6 +78551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HASHDOBA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Hosdoba",
+      "villageCode": "33512",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65352,6 +78599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hashdoba PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Hosdoba",
+      "villageCode": "33512",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65392,6 +78647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kantapur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kantapur",
+      "villageCode": "33511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65432,6 +78695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANTAPUR CHAKADOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kantapur",
+      "villageCode": "33511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65472,6 +78743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANTAPUR NAMAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kantapur",
+      "villageCode": "33511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65512,6 +78791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMZADIA ME MADRASSA",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kantapur",
+      "villageCode": "33511",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65552,6 +78839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIGRISALHANA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Khurshapakhiri Pt-ii",
+      "villageCode": "33515",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65592,6 +78887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KURSHAPAKHIRI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Khurshapakhiri Pt-ii",
+      "villageCode": "33515",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65632,6 +78935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hurkasingi PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Khurshapakhiri Pt-iii",
+      "villageCode": "33516",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65672,6 +78983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOLABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kolabari",
+      "villageCode": "33513",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65712,6 +79031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofiting of KURSHAPAKHIRI PT I PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kursapakhri Pt-i",
+      "villageCode": "33514",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65752,6 +79079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KURSAPAKHRI NALJHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22464",
+      "panchayatname": "Hashdoba",
+      "villageName": "Kursapakhri Pt-i",
+      "villageCode": "33514",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65792,6 +79127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNER BHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bamunervita",
+      "villageCode": "33461",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65832,6 +79175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SHIALKANDA PWSS ( SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bamunervita",
+      "villageCode": "33461",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65872,6 +79223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHARAKPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bamunervita",
+      "villageCode": "33461",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65912,6 +79271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Banyaguri PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bannyguri",
+      "villageCode": "33469",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65952,6 +79319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANYAGURI BAZAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bannyguri",
+      "villageCode": "33469",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -65992,6 +79367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BANYAGURI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bannyguri",
+      "villageCode": "33469",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66032,6 +79415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANYAGURI BEPARIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bannyguri",
+      "villageCode": "33469",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66072,6 +79463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOTO TANGBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Barotang Vita",
+      "villageCode": "33464",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66112,6 +79511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Bhalukmari",
+      "villageCode": "33457",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66152,6 +79559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOTO UDMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Chatoudmari",
+      "villageCode": "33467",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66192,6 +79607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FASHERTARY, KODOMTOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Fashartari",
+      "villageCode": "33470",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66232,6 +79655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JALESWAR BEEL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Jaleswar Bill",
+      "villageCode": "33456",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66272,6 +79703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JALESWAR BEEL PUBPARA (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Jaleswar Bill",
+      "villageCode": "33456",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66312,6 +79751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROWARVITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Rowarvita",
+      "villageCode": "33465",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66352,6 +79799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHORPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Shialkanda",
+      "villageCode": "33458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66392,6 +79847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SHIALKANDA DAKHINPUB PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Shialkanda",
+      "villageCode": "33458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66432,6 +79895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIAL KANDA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Shialkanda",
+      "villageCode": "33458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66472,6 +79943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TOKPARA M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Shialkanda",
+      "villageCode": "33458",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66512,6 +79991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JALESWAR TAKIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Takimari",
+      "villageCode": "33459",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66552,6 +80039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JALESWAR TAKIMARI NORTH PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Takimari",
+      "villageCode": "33459",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66592,6 +80087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TARIARBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Tariar Vita",
+      "villageCode": "33460",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66632,6 +80135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UTTAR SATVENDI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22455",
+      "panchayatname": "Jaleswar",
+      "villageName": "Uttar Satvendi",
+      "villageCode": "33466",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66672,6 +80183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORO UDMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Baroudmari",
+      "villageCode": "33468",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66712,6 +80231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jaleswar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Basmura",
+      "villageCode": "33497",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66752,6 +80279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bashmura PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Basmura",
+      "villageCode": "33497",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66792,6 +80327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PASCHIM BASHMURA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Basmura",
+      "villageCode": "33497",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66832,6 +80375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Damribhasa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Damribhasa",
+      "villageCode": "33498",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66872,6 +80423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Binyachal PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Damribhasa",
+      "villageCode": "33498",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66912,6 +80471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMRIBHASA TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Damribhasa",
+      "villageCode": "33498",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66952,6 +80519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DAMRIBHASA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Damribhasa",
+      "villageCode": "33498",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -66992,6 +80567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMRIBHASA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22461",
+      "panchayatname": "KATARIHARA",
+      "villageName": "DAMRIBHASA",
+      "villageCode": "33498",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67032,6 +80615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BELAPURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67072,6 +80663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHALAKURA PWSS (SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67112,6 +80711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67152,6 +80759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ghugudoba PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67192,6 +80807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GHUGUDOBA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67232,6 +80855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HARIBHANGA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67272,6 +80903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOLABARI JINJIRAMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67312,6 +80951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THANGURIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Ghugudoba",
+      "villageCode": "33501",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67352,6 +80999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATARIHARA SARAKPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Katarihara",
+      "villageCode": "33496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67392,6 +81047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATARIHARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Katarihara",
+      "villageCode": "33496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67432,6 +81095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGAHARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Katarihara",
+      "villageCode": "33496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67472,6 +81143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB KATARIHARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Katarihara",
+      "villageCode": "33496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67512,6 +81191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM KATARIHARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Katarihara",
+      "villageCode": "33496",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67552,6 +81239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TEKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22461",
+      "panchayatname": "Katarihara",
+      "villageName": "Tekona",
+      "villageCode": "33499",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67592,6 +81287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATHURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22459",
+      "panchayatname": "Kathuri",
+      "villageName": "Kathuri",
+      "villageCode": "33489",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67632,6 +81335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB KATHURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22459",
+      "panchayatname": "Kathuri",
+      "villageName": "Kathuri",
+      "villageCode": "33489",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67672,6 +81383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM KATHURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22459",
+      "panchayatname": "Kathuri",
+      "villageName": "Kathuri",
+      "villageCode": "33489",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67712,6 +81431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUTHIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Bherveri",
+      "villageCode": "33447",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67752,6 +81479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BHERBHERY PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Bherveri",
+      "villageCode": "33447",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67792,6 +81527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHERBHERI PACHIM GAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Bherveri",
+      "villageCode": "33447",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67832,6 +81575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOTIKHOWA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Bhimkhaj",
+      "villageCode": "33441",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67872,6 +81623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhimkhoj PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Bhimkhaj",
+      "villageCode": "33441",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67912,6 +81671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KURARPAR PWSS (SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Bhimkhaj",
+      "villageCode": "33441",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67952,6 +81719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUKURAKATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Charaljhar",
+      "villageCode": "33442",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -67992,6 +81767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JHARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Charaljhar",
+      "villageCode": "33442",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68032,6 +81815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHARALJHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Charaljhar",
+      "villageCode": "33442",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68072,6 +81863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NATUNGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Dapkarvita",
+      "villageCode": "33443",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68112,6 +81911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANDALPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Dapkarvita",
+      "villageCode": "33443",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68152,6 +81959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAKARBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Dapkarvita",
+      "villageCode": "33443",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68192,6 +82007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATLAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Katlamari",
+      "villageCode": "33444",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68232,6 +82055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHALISABHITA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Khalisavita Hindupara",
+      "villageCode": "33445",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68272,6 +82103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHALISAVITA MUSLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Khalisavita Muslimpara",
+      "villageCode": "33446",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68312,6 +82151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHALISAVITA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Khalisavita Muslimpara",
+      "villageCode": "33446",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68352,6 +82199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SATSIAKHAMAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Satsia Khamar",
+      "villageCode": "33448",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68392,6 +82247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAMER BOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22453",
+      "panchayatname": "Kholisarbhita",
+      "villageName": "Satsia Khamar",
+      "villageCode": "33448",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68432,6 +82295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOKPARA DINER ALGA SPB M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Bakpara Dineralga Pt-i",
+      "villageCode": "33482",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68472,6 +82343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHIALDHORA SPB M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Chaildhara",
+      "villageCode": "33480",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68512,6 +82391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHERGERALGA SPB M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Chergeralga",
+      "villageCode": "33479",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68552,6 +82439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FULKAKATA SPB M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Fulkakata",
+      "villageCode": "33481",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68592,6 +82487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHUNIMARI PT-I SPB M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Ghunimari Pt-i",
+      "villageCode": "33483",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68632,6 +82535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PATAKATA PT-I SPB PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Pathakata Pt-i",
+      "villageCode": "33485",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68672,6 +82583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAYCHANDCHAR SPB PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22457",
+      "panchayatname": "Monkala Chaildhara",
+      "villageName": "Raichander Char",
+      "villageCode": "33484",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68712,6 +82631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhobakura PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Dhobakura",
+      "villageCode": "33508",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68752,6 +82679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHOBAKURA SANTIPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Dhobakura",
+      "villageCode": "33508",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68792,6 +82727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAWRA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Dhobakura",
+      "villageCode": "33508",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68832,6 +82775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHOBAKURA PACHIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Dhobakura",
+      "villageCode": "33508",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68872,6 +82823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhubakura Pubpara PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Dhobakura",
+      "villageCode": "33508",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68912,6 +82871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KESARAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kesarapara",
+      "villageCode": "33509",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68952,6 +82919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUN TULI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -68992,6 +82967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAISA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69032,6 +83015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KASHIKATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69072,6 +83063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kharubhaj Bazar PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69112,6 +83111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NALGARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69152,6 +83159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAMA FALIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69192,6 +83207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALPARA PWSS (SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Kharuvas",
+      "villageCode": "33510",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69232,6 +83255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOLARCHARPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Rajmitapantai",
+      "villageCode": "33507",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69272,46 +83303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rajmita PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.30207980",
-      "name": "MUGALPARA PWSS (NEW)",
-      "description": "MUGALPARA PWSS (NEW)",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "MUGALPARA PWSS (NEW)",
-        "localName": "MUGALPARA PWSS (NEW)",
-        "districtCode": "44",
-        "districtName": "Goalpara",
-        "blockcode": "1190",
-        "blockname": "Jaleswar",
-        "panchayatcode": "22463",
-        "panchayatname": "Rajmita",
-        "villageCode": "33507",
-        "villageName": "Rajmitapantai",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "30207980",
-        "ddrName": "MUGALPARA PWSS (NEW)",
-        "projectId": "30207980",
-        "regionName": "1190"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "MUGALPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22463",
+      "panchayatname": "Rajmita",
+      "villageName": "Rajmitapantai",
+      "villageCode": "33507",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69352,6 +83351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHATAIMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Chataimari",
+      "villageCode": "33449",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69392,6 +83399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chataimari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Chataimari",
+      "villageCode": "33449",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69432,6 +83447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "EKLA SALBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Eklasalbari",
+      "villageCode": "33450",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69472,6 +83495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHPARA PWSS (SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Eklasalbari",
+      "villageCode": "33450",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69512,6 +83543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROJAN NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22454",
+      "panchayatname": "SIMLABARI",
+      "villageName": "GAROJAN",
+      "villageCode": "33451",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69552,6 +83591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Garojan No.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22454",
+      "panchayatname": "SIMLABARI",
+      "villageName": "GAROJAN",
+      "villageCode": "33451",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69592,6 +83639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROJAN NO.1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Garojan",
+      "villageCode": "33451",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69632,6 +83687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHUNGHUNIRBHITA M PWSS (NEW) (Simlabari)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Ghunghunivita",
+      "villageCode": "33453",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69672,6 +83735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GUMAIJHAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Gumaijhar",
+      "villageCode": "33452",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69712,6 +83783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gumaijhar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Gumaijhar",
+      "villageCode": "33452",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69752,6 +83831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GUMAIJHAR PUB MATHA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Gumaijhar",
+      "villageCode": "33452",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69792,6 +83879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GUMAIJHAR SASAN (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22454",
+      "panchayatname": "SIMLABARI",
+      "villageName": "GUMAIJHAR",
+      "villageCode": "33452",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69832,6 +83927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROKHUTA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22454",
+      "panchayatname": "SIMLABARI",
+      "villageName": "RAKHALKILLAH",
+      "villageCode": "33454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69872,6 +83975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PASERGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Rakhalkillah",
+      "villageCode": "33454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69912,6 +84023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKHALKILLAH PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Rakhalkillah",
+      "villageCode": "33454",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69952,6 +84071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FULGASA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Simlabari",
+      "villageCode": "33455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -69992,6 +84119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HALOIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Simlabari",
+      "villageCode": "33455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70032,6 +84167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHANGRPAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22454",
+      "panchayatname": "SIMLABARI",
+      "villageName": "SIMLABARI",
+      "villageCode": "33455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70072,6 +84215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHERBARI (Jaleswar) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Simlabari",
+      "villageCode": "33455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70112,6 +84263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOLABORI PWSS (Simlabari) (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Simlabari",
+      "villageCode": "33455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70152,6 +84311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Simlabari Bazar PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22454",
+      "panchayatname": "Simlabari",
+      "villageName": "Simlabari",
+      "villageCode": "33455",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70192,6 +84359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANASPARA RESERVE PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Manaspara Reserve",
+      "villageCode": "33487",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70232,6 +84407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANASPARA SALAKURA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Manaspara Reserve",
+      "villageCode": "33487",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70272,6 +84455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANASPARA SIMULKANDI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Manaspara Reserve",
+      "villageCode": "33487",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70312,6 +84503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Simulkandi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Simulkandi",
+      "villageCode": "33488",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70352,6 +84551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BIDYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70392,6 +84599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORBILA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70432,6 +84647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HAJONGPARA (TAKIMARI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70472,6 +84695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SIMULKANDI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70512,6 +84743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TAKIMARI RESERVE PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70552,6 +84791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARAYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70592,6 +84839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARMAKARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70632,6 +84887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mothabari PWSS (NEW) (Takimari)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70672,6 +84935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RATANGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22458",
+      "panchayatname": "Takimari",
+      "villageName": "Takimari Reserve",
+      "villageCode": "33486",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70712,6 +84983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHILARBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Chilarvita",
+      "villageCode": "33474",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70752,6 +85031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TARANGAPUR BAZAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Chotogandua",
+      "villageCode": "33475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70792,6 +85079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarangapur Bazar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Chotogandua",
+      "villageCode": "33475",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70832,6 +85127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mowamari PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Moamari",
+      "villageCode": "33472",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70872,6 +85175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SARDARBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "JALESWAR",
+      "panchayatcode": "22456",
+      "panchayatname": "TARANGAPUR",
+      "villageName": "SARDARVITA",
+      "villageCode": "33500",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70912,6 +85223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FEISHERTARY PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Superivita",
+      "villageCode": "33471",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70952,6 +85271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Superibhita PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Superivita",
+      "villageCode": "33471",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -70992,6 +85319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAKHIN TARANGAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Tarangapur",
+      "villageCode": "33473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71032,6 +85367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB TARANGAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Tarangapur",
+      "villageCode": "33473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71072,6 +85415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Uttar Tarangapur PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Tarangapur",
+      "villageCode": "33473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71112,6 +85463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jobdarvita PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Tarangapur",
+      "villageCode": "33473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71152,6 +85511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tarangapur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Tarangapur",
+      "villageCode": "33473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71192,6 +85559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM TARANGAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1190",
+      "blockname": "Jaleswar",
+      "panchayatcode": "22456",
+      "panchayatname": "Tarangapur",
+      "villageName": "Tarangapur",
+      "villageCode": "33473",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71232,6 +85607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KONAICHAPARA PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari",
+      "villageCode": "33355",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71272,6 +85655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMBARI PACHIM PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari",
+      "villageCode": "33355",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71312,6 +85703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AMBARI BAGUAN PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari",
+      "villageCode": "33355",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71352,6 +85751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ambari Baguan PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari",
+      "villageCode": "33355",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71392,6 +85799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMBARI PUB PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari",
+      "villageCode": "33355",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71432,6 +85847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KADOTIKA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kadotika",
+      "villageCode": "33361",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71472,6 +85895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KADOTIKA PATHALIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kadotika",
+      "villageCode": "33361",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71512,6 +85943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALYANPUR PACHIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kalyanpur",
+      "villageCode": "33356",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71552,6 +85991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalyanpur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kalyanpur",
+      "villageCode": "33356",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71592,6 +86039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalyanpur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kalyanpur",
+      "villageCode": "33356",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71632,6 +86087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KALYANPUR pwss",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kalyanpur",
+      "villageCode": "33356",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71672,6 +86135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalyanpur Pub PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kalyanpur",
+      "villageCode": "33356",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71712,6 +86183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KONGAIR PACHIMPAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kangai Pashimpar",
+      "villageCode": "33360",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71752,6 +86231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kodalkati PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Kangai Pashimpar",
+      "villageCode": "33360",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71792,6 +86279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATILAR TARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Katilar Tari",
+      "villageCode": "33359",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71832,6 +86327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SOULMARI PWSS (Kharmuza)(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22442",
+      "panchayatname": "Ambari",
+      "villageName": "Soulmari",
+      "villageCode": "33357",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71872,6 +86375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORO BOGUAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Boro Boguan",
+      "villageCode": "33418",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71912,6 +86423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALURTARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Chatamari",
+      "villageCode": "33415",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71952,6 +86471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HALDIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Chatamari",
+      "villageCode": "33415",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -71992,6 +86519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHATAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Chatamari",
+      "villageCode": "33415",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72032,6 +86567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARO BHAT KHAWA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Garo Bhat Khawa",
+      "villageCode": "33414",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72072,6 +86615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HARIDRA  BAGUAN PWSS SWAJAL",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Haridar Boguan",
+      "villageCode": "33416",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72112,6 +86663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HARIDAR BOGUAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Haridar Boguan",
+      "villageCode": "33416",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72152,6 +86711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Latima PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Latima",
+      "villageCode": "33425",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72192,6 +86759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MURALIJHAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Muralijhar",
+      "villageCode": "33424",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72232,6 +86807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Muralijhar-1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Muralijhar",
+      "villageCode": "33424",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72272,6 +86855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Muralijhar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Muralijhar",
+      "villageCode": "33424",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72312,6 +86903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TARIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Muralijhar",
+      "villageCode": "33424",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72352,6 +86951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NARANGABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Narangabari",
+      "villageCode": "33413",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72392,6 +86999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NARANGABARI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Narangabari",
+      "villageCode": "33413",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72432,6 +87047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PALASHBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Palasbari",
+      "villageCode": "33419",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72472,6 +87095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PALASHBARI MADHYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Palasbari",
+      "villageCode": "33419",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72512,6 +87143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SABAJI BAGUAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Sabaji Baguan",
+      "villageCode": "33420",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72552,6 +87191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Sinabari",
+      "villageCode": "33421",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72592,6 +87239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sinabari Nayapara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22449",
+      "panchayatname": "Baguan",
+      "villageName": "Sinabari",
+      "villageCode": "33421",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72632,6 +87287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ARABANDHA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Ara Bhandha",
+      "villageCode": "33403",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72672,6 +87335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ARABANDHA BILPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Ara Bhandha",
+      "villageCode": "33403",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72712,6 +87383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bangaljhar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Bangaljar",
+      "villageCode": "33405",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72752,6 +87431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANGALJHAR DESIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Bangaljar",
+      "villageCode": "33405",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72792,6 +87479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANGALJHAR DEVIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Bangaljar",
+      "villageCode": "33405",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72832,6 +87527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Chakla Gaon",
+      "villageCode": "33407",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72872,6 +87575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DHUMBANDHA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Chakla Gaon",
+      "villageCode": "33407",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72912,6 +87623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAKLA GAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Chakla Gaon",
+      "villageCode": "33407",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72952,6 +87671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhumbandha PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Chakla Gaon",
+      "villageCode": "33407",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -72992,6 +87719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENGPATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Darirpar",
+      "villageCode": "33402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73032,6 +87767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DARIARPAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Darirpar",
+      "villageCode": "33402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73072,6 +87815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DARIRPAR(A) (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Darirpar",
+      "villageCode": "33402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73112,6 +87863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DARIARPAR UTTAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Darirpar",
+      "villageCode": "33402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73152,6 +87911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOTILAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Darirpar",
+      "villageCode": "33402",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73192,6 +87959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB DHUMBANDHA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Dhum Bandha",
+      "villageCode": "33406",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73232,6 +88007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHUMBANDHA (D) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Dhum Bandha",
+      "villageCode": "33406",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73272,6 +88055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAKHRITARI TITAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Phakritari",
+      "villageCode": "33404",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73312,6 +88103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pakhritary  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Phakritari",
+      "villageCode": "33404",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73352,6 +88151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Pakhritary PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22447",
+      "panchayatname": "Bashbari",
+      "villageName": "Phakritari",
+      "villageCode": "33404",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73392,6 +88199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BIRSINGH HALENGACHAR PT-II DAKHINPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22444",
+      "panchayatname": "Khankhowa",
+      "villageName": "Birsing Halang Char Pt-ii",
+      "villageCode": "33372",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73432,6 +88247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BIRSING PT I MPWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22444",
+      "panchayatname": "Khankhowa",
+      "villageName": "Birsing Halanga Char Pt-i",
+      "villageCode": "33373",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73472,6 +88295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BIRSING PT I MPWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22444",
+      "panchayatname": "Khankhowa",
+      "villageName": "Birsing Halanga Char Pt-i",
+      "villageCode": "33373",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73512,6 +88343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NUNKHOWAPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22444",
+      "panchayatname": "Khankhowa",
+      "villageName": "Nun Khawa Pt-ii",
+      "villageCode": "33382",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73552,6 +88391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Deodhuturi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Deo Dhuturi",
+      "villageCode": "33390",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73592,6 +88439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEODHUTURI PANIKHAITI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Deo Dhuturi",
+      "villageCode": "33390",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73632,6 +88487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DEODHUTURI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Deo Dhuturi",
+      "villageCode": "33390",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73672,6 +88535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HARIPUR KOROIKHOWA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Haripur Kawan Khawa",
+      "villageCode": "33391",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73712,6 +88583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NALBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Haripur Kawan Khawa",
+      "villageCode": "33391",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73752,6 +88631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KATLAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Katlamari",
+      "villageCode": "33394",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73792,6 +88679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHARMUZA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Kharmuja",
+      "villageCode": "33397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73832,6 +88727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kharmuza PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Kharmuja",
+      "villageCode": "33397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73872,6 +88775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARMUJA UJANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Kharmuja",
+      "villageCode": "33397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73912,6 +88823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARMUJA GHANAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Kharmuja",
+      "villageCode": "33397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73952,6 +88871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHARMUJA 2 NO GHAT PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Kharmuja",
+      "villageCode": "33397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -73992,6 +88919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARMUJA CHAR PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "KHARMUJA",
+      "villageName": "KHARMUJA",
+      "villageCode": "33397",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74032,6 +88967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMHARIR CHAR PURNA NAGAR PACHIM PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Ramhari Char No-i",
+      "villageCode": "33392",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74072,6 +89015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HOJUARCHOR PT-II (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Ramhari Char No-i",
+      "villageCode": "33392",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74112,6 +89063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAKALIA PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Ramhari Char Pt-ii",
+      "villageCode": "33393",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74152,6 +89111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMHARIR CHAR PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Ramhari Char Pt-ii",
+      "villageCode": "33393",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74192,6 +89159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kharmuza Charpara A AWC",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Ramhari Char Pt-ii",
+      "villageCode": "33393",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74232,6 +89207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONEHERA PACHIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Sonahara",
+      "villageCode": "33389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74272,6 +89255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONAHARA PART PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Sonahara",
+      "villageCode": "33389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74312,6 +89303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONEHERA UTTARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22445",
+      "panchayatname": "Kharmuja",
+      "villageName": "Sonahara",
+      "villageCode": "33389",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74352,6 +89351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ANGULKATI BATABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74392,6 +89399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BATABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74432,6 +89447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Batabari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74472,6 +89495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BATABARI KONGKAIRPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74512,6 +89543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Karirchala Batabari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74552,6 +89591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KORIRCHALA BATABARI A PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74592,6 +89639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAS BATABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Batabari",
+      "villageCode": "33401",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74632,6 +89687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MADHYA KANGKAI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Kangair Pubpar",
+      "villageCode": "33400",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74672,6 +89735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Konkair Pubpar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Kangair Pubpar",
+      "villageCode": "33400",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74712,6 +89783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KANGKAI PUBPAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Kangair Pubpar",
+      "villageCode": "33400",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74752,6 +89831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MARKULA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Markula",
+      "villageCode": "33399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74792,6 +89879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UTTAR MARKHULA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Markula",
+      "villageCode": "33399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74832,6 +89927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MARKULA GAROPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Markula",
+      "villageCode": "33399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74872,6 +89975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Markula Garopara  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Markula",
+      "villageCode": "33399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74912,6 +90023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MARKULA PAHARTOLI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Markula",
+      "villageCode": "33399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74952,6 +90071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Markula PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Markula",
+      "villageCode": "33399",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -74992,6 +90119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM PANDOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Pandoba",
+      "villageCode": "33398",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75032,6 +90167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of PANDOBA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Pandoba",
+      "villageCode": "33398",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75072,6 +90215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB PANDOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "MARKULA",
+      "villageName": "PANDOBA",
+      "villageCode": "33398",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75112,6 +90263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PANDOBA GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Pandoba",
+      "villageCode": "33398",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75152,6 +90311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pandoba PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22446",
+      "panchayatname": "Markula",
+      "villageName": "Pandoba",
+      "villageCode": "33398",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75192,6 +90359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NALANGA UJANPARA PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "NALANGA",
+      "villageName": "NALANGA",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75232,6 +90407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JUMKAIPARA PART PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalanga",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75272,6 +90455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NALANGA MAJERPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalanga",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75312,6 +90503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NALANGA RAWMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalanga",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75352,6 +90551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nalanga Singimari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalanga",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75392,6 +90599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NALANGA RABHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalanga",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75432,6 +90647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NALANGA SINGIMARI  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalanga",
+      "villageCode": "33410",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75472,6 +90695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NALANGA PAHARTOLI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalonga Pahartoli",
+      "villageCode": "33409",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75512,6 +90743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAlanga Pahartoli PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalonga Pahartoli",
+      "villageCode": "33409",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75552,6 +90791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RESERVE DAKHINPARA PWSS SWAJAL",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalonga Pahartoli",
+      "villageCode": "33409",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75592,6 +90839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RESERVE MADHYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalonga Pahartoli",
+      "villageCode": "33409",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75632,6 +90887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RESERVE UTTARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Nalonga Pahartoli",
+      "villageCode": "33409",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75672,6 +90935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM SIMLABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Simlabari",
+      "villageCode": "33412",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75712,6 +90983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Simlabari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Simlabari",
+      "villageCode": "33412",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75752,6 +91031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB SIMLABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Simlabari",
+      "villageCode": "33412",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75792,6 +91079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SIMLABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Simlabari",
+      "villageCode": "33412",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75832,6 +91127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIMLABARI-A PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Simlabari",
+      "villageCode": "33412",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75872,6 +91175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOPATOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Thepkai",
+      "villageCode": "33411",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75912,6 +91223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of THEPKAI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Thepkai",
+      "villageCode": "33411",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75952,6 +91271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEPKAI PAHARTOLI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22448",
+      "panchayatname": "Nalanga",
+      "villageName": "Thepkai",
+      "villageCode": "33411",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -75992,6 +91319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GENDAGURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Hajua Char No-1",
+      "villageCode": "33367",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76032,6 +91367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALODANGACHAR MADHYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Hajua Char No-2",
+      "villageCode": "33366",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76072,6 +91415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMHARIRCHAR SONERCHALA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "RAM HARIR CHAR",
+      "villageName": "RAM HARI CHAR PT-III",
+      "villageCode": "33364",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76112,6 +91463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAMADARPARA PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Ram Hari Char Pt-iii",
+      "villageCode": "33364",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76152,6 +91511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMHARIRCHAR ROSHIDPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Ram Hari Char Pt-iii",
+      "villageCode": "33364",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76192,6 +91559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMHARI CHAR PT ROWKHOWA PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Ram Hari Char Pt-iii",
+      "villageCode": "33364",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76232,6 +91607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TIAPARA MADHYA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Tiapara",
+      "villageCode": "33362",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76272,6 +91655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TIAPARACHAR PURBAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22443",
+      "panchayatname": "Ram Harir Char",
+      "villageName": "Tiapara",
+      "villageCode": "33362",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76312,6 +91703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ABRAR BHITA MADHYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Abrar Vita",
+      "villageCode": "33429",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76352,6 +91751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALARBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Balar Vita",
+      "villageCode": "33427",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76392,6 +91799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHATYATARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Khateya Tari",
+      "villageCode": "33428",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76432,6 +91847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKHALDUBI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Rakhal Dubi",
+      "villageCode": "33430",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76472,6 +91895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RAKHALDUBI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Rakhal Dubi",
+      "villageCode": "33430",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76512,6 +91943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKHALDUBI MADHYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Rakhal Dubi",
+      "villageCode": "33430",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76552,6 +91991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKHALDUBI UTTARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Rakhal Dubi",
+      "villageCode": "33430",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76592,6 +92039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rowmari Bazar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Roumari",
+      "villageCode": "33431",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76632,6 +92087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROWMARI BHUYANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Roumari",
+      "villageCode": "33431",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76672,6 +92135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROWMARI KALIPUR (Kharmuza) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Roumari",
+      "villageCode": "33431",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76712,6 +92183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TAPARBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1189",
+      "blockname": "Kharmuza",
+      "panchayatcode": "22450",
+      "panchayatname": "Rowmari",
+      "villageName": "Tapar Vita",
+      "villageCode": "33426",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76752,6 +92231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOLLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Dhaigaon",
+      "villageCode": "33294",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76792,6 +92279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bolla No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Dhaigaon",
+      "villageCode": "33294",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76832,6 +92327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHAIGOAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Dhaigaon",
+      "villageCode": "33294",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76872,6 +92375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SOULMARI PWSS  (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Dhaigaon",
+      "villageCode": "33294",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76912,6 +92423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA PWSS (Krishnai) NEW",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Dhaigaon",
+      "villageCode": "33294",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76952,6 +92471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DHAIGAON DAMAS PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Dhaigaon Damas",
+      "villageCode": "33295",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -76992,6 +92519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALPANI GHILAJANI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Kalpani Ghilajani",
+      "villageCode": "33302",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77032,6 +92567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalpani Pt-I PWSS (Dhaigaon) (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Kalpani Ghilajani",
+      "villageCode": "33302",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77072,6 +92615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KARKACHI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Karkashi",
+      "villageCode": "33296",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77112,6 +92663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ASSAM PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Karkashi",
+      "villageCode": "33296",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77152,6 +92711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Upper Karkachi PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Karkashi",
+      "villageCode": "33296",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77192,6 +92759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARKASI DAMAS PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Karkasi Damas",
+      "villageCode": "33297",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77232,6 +92807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAIRAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Khairapara",
+      "villageCode": "33299",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77272,6 +92855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHILASASTRA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Khilasastra",
+      "villageCode": "33301",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77312,6 +92903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAHIDAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Pahidal",
+      "villageCode": "33298",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77352,6 +92951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHIRUPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Sardarpara",
+      "villageCode": "33300",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77392,6 +92999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "REFUGIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22436",
+      "panchayatname": "Dhaigaon",
+      "villageName": "Sardarpara",
+      "villageCode": "33300",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77432,6 +93047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENIMARI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Chenimari Pt-ii",
+      "villageCode": "33320",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77472,6 +93095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DARAPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Darapara Pt-i",
+      "villageCode": "33314",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77512,6 +93143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DARAPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Darapara Pt-ii",
+      "villageCode": "33315",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77552,6 +93191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GHORAPUTA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Ghoraputa",
+      "villageCode": "33323",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77592,6 +93239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMGURIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Ghoraputa",
+      "villageCode": "33323",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77632,6 +93287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BELDENGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Hatimura Pt-i",
+      "villageCode": "33317",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77672,6 +93335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HATIMURA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Hatimura Pt-i",
+      "villageCode": "33317",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77712,6 +93383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHORAGOAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Hatimura Pt-i",
+      "villageCode": "33317",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77752,6 +93431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATIMURA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Hatimura Pt-ii",
+      "villageCode": "33318",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77792,6 +93479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Khamari",
+      "villageCode": "33322",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77832,6 +93527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HIRAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Krishnai Guria Pt-ii",
+      "villageCode": "33313",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77872,6 +93575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhogdabli Ravapara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Krishnai Guria Pt-ii",
+      "villageCode": "33313",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77912,6 +93623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KRISHNAI GURIA PT II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Krishnai Guria Pt-ii",
+      "villageCode": "33313",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77952,6 +93671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Krishnai Guria Pt-II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Krishnai Guria Pt-ii",
+      "villageCode": "33313",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -77992,6 +93719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SALPARA MOLANDUBI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Salpara Molandubi Pt-ii",
+      "villageCode": "33316",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78032,6 +93767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JILIKAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Salpara Molandubi Pt-ii",
+      "villageCode": "33316",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78072,6 +93815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Salpara Molandubi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Salpara Molandubi Pt-ii",
+      "villageCode": "33316",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78112,6 +93863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SENIMARI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Senimari Pt-i",
+      "villageCode": "33319",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78152,6 +93911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Senimari Pt-iii PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22438",
+      "panchayatname": "Dirma Jakhili Salpara",
+      "villageName": "Senimari Pt-iii",
+      "villageCode": "33321",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78192,6 +93959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BENGULIPARA, Garovita, Majipara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-i",
+      "villageCode": "33344",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78232,6 +94007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FAFANGA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-i",
+      "villageCode": "33344",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78272,6 +94055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Natunpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-i",
+      "villageCode": "33344",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78312,6 +94103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FAFANGA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-ii",
+      "villageCode": "33345",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78352,6 +94151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATI CAMP PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "KRISHNAI",
+      "panchayatcode": "22440",
+      "panchayatname": "FAFANGA",
+      "villageName": "FOFANGA PT-II",
+      "villageCode": "33345",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78392,6 +94199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FAFANGA PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-iii",
+      "villageCode": "33346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78432,6 +94247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Fafanga PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-iii",
+      "villageCode": "33346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78472,6 +94295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Godharbori AWC",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-iii",
+      "villageCode": "33346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78512,6 +94343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HADIAPARA FAFANGA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "KRISHNAI",
+      "panchayatcode": "22440",
+      "panchayatname": "FAFANGA",
+      "villageName": "FOFANGA PT-III",
+      "villageCode": "33346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78552,6 +94391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of FAFANGA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Fofanga Pt-iii",
+      "villageCode": "33346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78592,6 +94439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MUSLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "KRISHNAI",
+      "panchayatcode": "22440",
+      "panchayatname": "FAFANGA",
+      "villageName": "FOFANGA PT-III",
+      "villageCode": "33346",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78632,6 +94487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAGRABARI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Khagrabari",
+      "villageCode": "33348",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78672,6 +94535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TUKURA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Tukura Pt-i",
+      "villageCode": "33347",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78712,6 +94583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "VERVERI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Tukura Pt-ii",
+      "villageCode": "33349",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78752,6 +94631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TUKURA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Tukura Pt-ii",
+      "villageCode": "33349",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78792,6 +94679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOALPARIA GAON LPS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22440",
+      "panchayatname": "Fafanga",
+      "villageName": "Tukura Pt-ii",
+      "villageCode": "33349",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78832,6 +94727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Asudubi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Asudubi (ct)",
+      "villageCode": "33283",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78872,6 +94775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of ASUDUBI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Asudubi (ct)",
+      "villageCode": "33283",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78912,6 +94823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KARMAKARPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Asudubi (ct)",
+      "villageCode": "33283",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78952,6 +94871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAMBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Asudubi (ct)",
+      "villageCode": "33283",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -78992,6 +94919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sakudhowa PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Asudubi (ct)",
+      "villageCode": "33283",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79032,6 +94967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KRISHNAI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Kharijapikon (ct)",
+      "villageCode": "33282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79072,6 +95015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chandarbori PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Kharijapikon (ct)",
+      "villageCode": "33282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79112,6 +95063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Restoration of Krishnai PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Kharijapikon (ct)",
+      "villageCode": "33282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79152,6 +95111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Krishnai PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Kharijapikon (ct)",
+      "villageCode": "33282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79192,6 +95159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Karmakarpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Kharijapikon (ct)",
+      "villageCode": "33282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79232,6 +95207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARIJAPIKAN PURAN GOAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Kharijapikon (ct)",
+      "villageCode": "33282",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79272,6 +95255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORJULI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-i",
+      "villageCode": "33284",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79312,6 +95303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAKRIBORI PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-i",
+      "villageCode": "33284",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79352,6 +95351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MADAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-i",
+      "villageCode": "33284",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79392,6 +95399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAMAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-i",
+      "villageCode": "33284",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79432,6 +95447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of PAIKAN PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-i",
+      "villageCode": "33284",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79472,6 +95495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Paikan PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-i",
+      "villageCode": "33284",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79512,6 +95543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMBARI (KRISHNAI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79552,6 +95591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Paikan Pt II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79592,6 +95639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ARIMARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79632,6 +95687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JHORABORI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79672,6 +95735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TULTULIAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79712,6 +95783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bujruk Manikpur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79752,6 +95831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BUJRUK MANIKPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22433",
+      "panchayatname": "Krishnai",
+      "villageName": "Paikan Pt-ii",
+      "villageCode": "33285",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79792,6 +95879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PASHIM BORVITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Barvita",
+      "villageCode": "33292",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79832,6 +95927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARVITA (Manikpur) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Barvita",
+      "villageCode": "33292",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79872,6 +95975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM BHELAKHAMAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Bhela Khamar",
+      "villageCode": "33288",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79912,6 +96023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHELAKHAMAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Bhela Khamar",
+      "villageCode": "33288",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79952,6 +96071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHAMAR MANIKPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Bujruk Manikpur",
+      "villageCode": "33290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -79992,6 +96119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BUJRUKGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Bujruk Manikpur",
+      "villageCode": "33290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80032,6 +96167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUJARIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Bujruk Manikpur",
+      "villageCode": "33290",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80072,6 +96215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KULIYA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Jatsorabdi",
+      "villageCode": "33293",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80112,6 +96263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAJGAON (MANIKPUR) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Jatsorabdi",
+      "villageCode": "33293",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80152,6 +96311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIGHALIBORI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Khamar Manikpur",
+      "villageCode": "33289",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80192,6 +96359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANIKPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Khamar Manikpur",
+      "villageCode": "33289",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80232,6 +96407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAKKOMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Khamar Manikpur",
+      "villageCode": "33289",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80272,6 +96455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARIJA MANIKPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22435",
+      "panchayatname": "Manikpur Bhelakhamar",
+      "villageName": "Kharija Manikpur",
+      "villageCode": "33291",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80312,6 +96503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMJONGA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Amjonga Pt-i",
+      "villageCode": "33324",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80352,6 +96551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMJONGA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Amjonga Pt-ii",
+      "villageCode": "33325",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80392,6 +96599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOLDHAPARA (Messelkhowa) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Amjonga Pt-ii",
+      "villageCode": "33325",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80432,6 +96647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAIDA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Baida",
+      "villageCode": "33326",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80472,6 +96695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Berubari Pt-I PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Berubari Pt-i",
+      "villageCode": "33327",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80512,6 +96743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENGMARI (MESSELKHOWA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Changmari",
+      "villageCode": "33329",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80552,6 +96791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DARAKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Darakona",
+      "villageCode": "33331",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80592,6 +96839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HALOWAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Halowapara",
+      "villageCode": "33332",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80632,6 +96887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIHARTOLI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "KRISHNAI",
+      "panchayatcode": "22439",
+      "panchayatname": "MESSELKHOWA",
+      "villageName": "KACHUMARI",
+      "villageCode": "33333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80672,6 +96935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KASUMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kachumari",
+      "villageCode": "33333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80712,6 +96983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KASUMARI NOABARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kachumari",
+      "villageCode": "33333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80752,6 +97031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Messelkhowa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kachumari",
+      "villageCode": "33333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80792,6 +97079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MESSELKHOWA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kachumari",
+      "villageCode": "33333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80832,6 +97127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Messelkhowa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kachumari",
+      "villageCode": "33333",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80872,6 +97175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAIMARAI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kaimari Pt-ii",
+      "villageCode": "33337",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80912,6 +97223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ACHONGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Khankhal",
+      "villageCode": "33334",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80952,6 +97271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHANGKHAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Khankhal",
+      "villageCode": "33334",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -80992,6 +97319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUKURKATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kukurkata",
+      "villageCode": "33335",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81032,6 +97367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BESAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Kukurkata",
+      "villageCode": "33335",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81072,6 +97415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEGHRI PASCIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Mechelkhowa",
+      "villageCode": "33338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81112,6 +97463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HADAKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Mechelkhowa",
+      "villageCode": "33338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81152,6 +97511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIB BARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Mechelkhowa",
+      "villageCode": "33338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81192,6 +97559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALGODA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Mechelkhowa",
+      "villageCode": "33338",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81232,6 +97607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Naya Gaon",
+      "villageCode": "33339",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81272,6 +97655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Rangdam",
+      "villageCode": "33342",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81312,6 +97703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGDARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Rangdam",
+      "villageCode": "33342",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81352,6 +97751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "WANGNANG PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Rangdam",
+      "villageCode": "33342",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81392,6 +97799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KACHARIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22439",
+      "panchayatname": "Messelkhowa",
+      "villageName": "Taranti",
+      "villageCode": "33343",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81432,6 +97847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bheltarghat PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81472,6 +97895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHONAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81512,6 +97943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81552,6 +97991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Guria PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81592,6 +98039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GURIA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81632,6 +98087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAMAPARA EAST PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81672,6 +98135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PEKPEKI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Krishnai Guria Pt-i",
+      "villageCode": "33287",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81712,6 +98183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BEKIPOOL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81752,6 +98231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Siali PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81792,6 +98279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARO SICHA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81832,6 +98327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JYOTINAGAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81872,6 +98375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOLANDUBI MUSLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81912,6 +98423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARIDHORA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81952,6 +98471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MOLANDUBI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -81992,6 +98519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOlandubi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82032,6 +98567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82072,6 +98615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAKHIRIGURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22434",
+      "panchayatname": "Molandubi",
+      "villageName": "Salpara Molandubi Pt.-i (ct)",
+      "villageCode": "33286",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82112,6 +98663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barmohra PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Barmohara Pt-i",
+      "villageCode": "33350",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82152,6 +98711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BARMOHRA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Barmohara Pt-i",
+      "villageCode": "33350",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82192,6 +98759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Barmohara Pt-i",
+      "villageCode": "33350",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82232,6 +98807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORMOHRA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Barmohara Pt-ii",
+      "villageCode": "33351",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82272,6 +98855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MUSLIMPARA-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Hadigaon",
+      "villageCode": "33352",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82312,6 +98903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khermohra PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Kharmohara",
+      "villageCode": "33353",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82352,6 +98951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khermohra PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Kharmohara",
+      "villageCode": "33353",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82392,6 +98999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROPARA (Tukura) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Kharmohara",
+      "villageCode": "33353",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82432,6 +99047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHERMOHRA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Kharmohara",
+      "villageCode": "33353",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82472,6 +99095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHIMAJULI GAROPARA, BORAKHAWA, LOWER KHERMOHORA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "KRISHNAI",
+      "panchayatcode": "22441",
+      "panchayatname": "TUKURA BORMOHRA",
+      "villageName": "TUKURA PT-III",
+      "villageCode": "33354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82512,6 +99143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGESWARI BHIMAJULI MUSLIMPARA, BHIMAJULI RABHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "KRISHNAI",
+      "panchayatcode": "22441",
+      "panchayatname": "TUKURA BORMOHRA",
+      "villageName": "TUKURA PT-III",
+      "villageCode": "33354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82552,6 +99191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HINDPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Tukura Pt-iii",
+      "villageCode": "33354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82592,6 +99239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TUKURA HADIGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Tukura Pt-iii",
+      "villageCode": "33354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82632,6 +99287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tukura Hadigaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Tukura Pt-iii",
+      "villageCode": "33354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82672,46 +99335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tukura Hadigaon PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.30176539",
-      "name": "BAPUJINAGAR PWSS (NEW)",
-      "description": "BAPUJINAGAR PWSS (NEW)",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "BAPUJINAGAR PWSS (NEW)",
-        "localName": "BAPUJINAGAR PWSS (NEW)",
-        "districtCode": "44",
-        "districtName": "Goalpara",
-        "blockcode": "1188",
-        "blockname": "Krishnai",
-        "panchayatcode": "22437",
-        "panchayatname": "Zira",
-        "villageCode": "33304",
-        "villageName": "Bamun Panikhowa",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "30176539",
-        "ddrName": "BAPUJINAGAR PWSS (NEW)",
-        "projectId": "30176539",
-        "regionName": "1188"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "BAPUJINAGAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22441",
+      "panchayatname": "Tukura Bormohra",
+      "villageName": "Tukura Pt-iii",
+      "villageCode": "33354",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82752,6 +99383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamunipanikhowa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82792,46 +99431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAMUNIPANIKHOWA PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.30177874",
-      "name": "BHEBHERI 2 PWSS (NEW)",
-      "description": "BHEBHERI 2 PWSS (NEW)",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "BHEBHERI 2 PWSS (NEW)",
-        "localName": "BHEBHERI 2 PWSS (NEW)",
-        "districtCode": "44",
-        "districtName": "Goalpara",
-        "blockcode": "1188",
-        "blockname": "Krishnai",
-        "panchayatcode": "22437",
-        "panchayatname": "Zira",
-        "villageCode": "33304",
-        "villageName": "Bamun Panikhowa",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "30177874",
-        "ddrName": "BHEBHERI 2 PWSS (NEW)",
-        "projectId": "30177874",
-        "regionName": "1188"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "BHEBHERI 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82872,6 +99479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHUBHERI-1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82912,6 +99527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOLDAMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82952,6 +99575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GANAKGREY PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -82992,6 +99623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAMABASTI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Bamun Panikhowa",
+      "villageCode": "33304",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83032,6 +99671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAPUKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Belpara Pt-i",
+      "villageCode": "33306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83072,6 +99719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BELGURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Belpara Pt-i",
+      "villageCode": "33306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83112,6 +99767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DANGAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Belpara Pt-i",
+      "villageCode": "33306",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83152,6 +99815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BELPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Belpara Pt-ii",
+      "villageCode": "33307",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83192,6 +99863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DALUPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Khardang Pt-i",
+      "villageCode": "33308",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83232,6 +99911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SARAKPURA 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Khardang Pt-i",
+      "villageCode": "33308",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83272,6 +99959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Khardang Pt-ii",
+      "villageCode": "33309",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83312,6 +100007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHARDANG PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Khardang Pt-ii",
+      "villageCode": "33309",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83352,6 +100055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHARAKPARA 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Khardang Pt-ii",
+      "villageCode": "33309",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83392,6 +100103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOCHPARA PWSS (NEW) (Zira)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Khardang Pt-ii",
+      "villageCode": "33309",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83432,6 +100151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HASTINAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pachim Dairang",
+      "villageCode": "33312",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83472,6 +100199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHERBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pachim Dairang",
+      "villageCode": "33312",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83512,6 +100247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM JIRA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pachimjira",
+      "villageCode": "622667",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83552,6 +100295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RONGAPANI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-dairang",
+      "villageCode": "33305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83592,6 +100343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FALGOMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-dairang",
+      "villageCode": "33305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83632,6 +100391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GARO BAHAMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-dairang",
+      "villageCode": "33305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83672,6 +100439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAGUANG PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-dairang",
+      "villageCode": "33305",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83712,6 +100487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of ZIRA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-jira",
+      "villageCode": "33303",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83752,6 +100535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Zira PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-jira",
+      "villageCode": "33303",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83792,6 +100583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB-ZIRA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-jira",
+      "villageCode": "33303",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83832,6 +100631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROKETKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Pub-jira",
+      "villageCode": "33303",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83872,6 +100679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SELAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Selapara",
+      "villageCode": "33311",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83912,6 +100727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DAIRANG SELAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Selapara",
+      "villageCode": "33311",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83952,6 +100775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dairong Celapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Selapara",
+      "villageCode": "33311",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -83992,6 +100823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THERATHOP PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1188",
+      "blockname": "Krishnai",
+      "panchayatcode": "22437",
+      "panchayatname": "Zira",
+      "villageName": "Tarathop",
+      "villageCode": "33310",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84032,6 +100871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUAN PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Baguan Pt-ii",
+      "villageCode": "33278",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84072,6 +100919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUAN PT-III NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Baguan Pt-iii",
+      "villageCode": "33279",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84112,6 +100967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUAN PT-III NO 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Baguan Pt-iii",
+      "villageCode": "33279",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84152,6 +101015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUAN PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Baguan Pt-iii",
+      "villageCode": "33279",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84192,6 +101063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUAN PT-IV No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Baguan Pt-iv",
+      "villageCode": "33280",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84232,6 +101111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGUAN PT-IV PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Baguan Pt-iv",
+      "villageCode": "33280",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84272,6 +101159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TOPLAKHOWA No. 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Toplakhowa",
+      "villageCode": "33281",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84312,6 +101207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sardarpara Baguan PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22432",
+      "panchayatname": "Baguan Kathalbari",
+      "villageName": "Toplakhowa",
+      "villageCode": "33281",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84352,6 +101255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LASKARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Chituk",
+      "villageCode": "33220",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84392,6 +101303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMRA PATPARA NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84432,6 +101351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMRA PATPARA NO.5 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84472,6 +101399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMRA PATPARA NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84512,6 +101447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Damra Patpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84552,6 +101495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROPARA (DAMRA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84592,6 +101543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMRA PATPARA NO. 4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84632,6 +101591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Patpara PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84672,6 +101639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DAMRA PATPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Damara Patpara (ct)",
+      "villageCode": "33222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84712,6 +101687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIGHALI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Dighali",
+      "villageCode": "33223",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84752,6 +101735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HABANGGIRI No.4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Habanggiri",
+      "villageCode": "33219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84792,6 +101783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HABANGGIRI NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Habanggiri",
+      "villageCode": "33219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84832,6 +101831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HABANGIRI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Habanggiri",
+      "villageCode": "33219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84872,6 +101879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HABANGGIRI NO.3 PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Habanggiri",
+      "villageCode": "33219",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84912,6 +101927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAGLAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Nakma Kundi",
+      "villageCode": "33225",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84952,6 +101975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KACHOMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Nakma Kundi",
+      "villageCode": "33225",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -84992,6 +102023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kachomari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Nakma Kundi",
+      "villageCode": "33225",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85032,6 +102071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NISHANGRAM No.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Nishangram",
+      "villageCode": "33221",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85072,6 +102119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NISHANGRAM PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Nishangram",
+      "villageCode": "33221",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85112,6 +102167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BALASARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85152,6 +102215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Balasara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85192,6 +102263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85232,6 +102311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.III No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85272,6 +102359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thekasu Pt-III No.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85312,6 +102407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Shantinagar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85352,6 +102455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of THEKASU PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85392,6 +102503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thekashu PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22427",
+      "panchayatname": "Damara",
+      "villageName": "Thekashu Pt.iii",
+      "villageCode": "33224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85432,6 +102551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOWKAKATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Chouka-kata",
+      "villageCode": "33268",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85472,6 +102599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GANDIMPATHAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Gadim Pathar",
+      "villageCode": "33271",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85512,6 +102647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naba Salpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Hajaripara",
+      "villageCode": "33255",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85552,6 +102695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NABA SALPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Hajaripara",
+      "villageCode": "33255",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85592,6 +102743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JHAKOWAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Jakhowapara",
+      "villageCode": "33264",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85632,6 +102791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAMAGADIM PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Jakhowapara",
+      "villageCode": "33264",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85672,6 +102839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TENGABARI (DARRANGIRI) PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Jakhowapara",
+      "villageCode": "33264",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85712,6 +102887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHEKOSAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Kachari Para",
+      "villageCode": "33259",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85752,6 +102935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KACHARIPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Kachari Para",
+      "villageCode": "33259",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85792,6 +102983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANYAKUCHI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Kanyakuchi Pahar",
+      "villageCode": "33267",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85832,6 +103031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KUCHDHOWA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Kuchdhowapara Pt-i",
+      "villageCode": "33265",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85872,6 +103079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KUCHDHOWA RANGANPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Kuchdhowapara Pt-i",
+      "villageCode": "33265",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85912,6 +103127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUCHDHOWAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Kushdhowa Para Pt-ii",
+      "villageCode": "33266",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85952,6 +103175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KACHOMARI 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Melopara Pt-i",
+      "villageCode": "33535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -85992,6 +103223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Melopara",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Melopara Pt-i",
+      "villageCode": "33535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86032,6 +103271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RAWMARI MELOPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Melopara Pt-i",
+      "villageCode": "33535",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86072,6 +103319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MOISKHULI GAROPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Moish Khulipara",
+      "villageCode": "33273",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86112,6 +103367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Moiskhuli Garopara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Moish Khulipara",
+      "villageCode": "33273",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86152,6 +103415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA KAMARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Moish Khulipara",
+      "villageCode": "33273",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86192,6 +103463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOISKHULIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Moish Khulipara",
+      "villageCode": "33273",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86232,6 +103511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANIAPARA THAKURIYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Moishkhuli Khamar",
+      "villageCode": "33274",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86272,6 +103559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOISKHULI KHAMAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Moishkhuli Khamar",
+      "villageCode": "33274",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86312,6 +103607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PATIARPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Patiarpara Pt-i",
+      "villageCode": "33257",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86352,6 +103655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KACHADOL PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Prithupara",
+      "villageCode": "33272",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86392,6 +103703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SENGADING LETKUBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Prithupara",
+      "villageCode": "33272",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86432,6 +103751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kachadol PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Prithupara",
+      "villageCode": "33272",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86472,6 +103799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGPATHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Rang Pathar",
+      "villageCode": "33270",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86512,6 +103847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RANGRANGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Rang Rongpara",
+      "villageCode": "33262",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86552,6 +103895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAWMARI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Rowmari Pt-ii",
+      "villageCode": "33537",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86592,6 +103943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TARAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Tarapara",
+      "villageCode": "33258",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86632,6 +103991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAHARTOLI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22431",
+      "panchayatname": "Darranggiri",
+      "villageName": "Tarapara",
+      "villageCode": "33258",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86672,6 +104039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARA MEDHIPARA NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Khara Medhipara",
+      "villageCode": "33215",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86712,6 +104087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARA MEDHIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Khara Medhipara",
+      "villageCode": "33215",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86752,6 +104135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARA PT -II NO. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Khara Pt -ii",
+      "villageCode": "33214",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86792,6 +104183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARA PT -II NO. 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Khara Pt -ii",
+      "villageCode": "33214",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86832,6 +104231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHARA PT II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Khara Pt -ii",
+      "villageCode": "33214",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86872,6 +104279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHARA (OLD) PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Khara Pt-i",
+      "villageCode": "33213",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86912,6 +104327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TANGABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Tangabari",
+      "villageCode": "33218",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86952,6 +104375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TANGABARI NO. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Tangabari",
+      "villageCode": "33218",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -86992,6 +104423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.-I NO.1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt-i (ct)",
+      "villageCode": "33216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87032,6 +104471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT-I NO.5 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt-i (ct)",
+      "villageCode": "33216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87072,6 +104519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.-I NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt-i (ct)",
+      "villageCode": "33216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87112,6 +104567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.-I NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt-i (ct)",
+      "villageCode": "33216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87152,6 +104615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.-I NO.4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt-i (ct)",
+      "villageCode": "33216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87192,6 +104663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Babupara (BTC, Dudhnoi) PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87232,6 +104711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thekasu PT II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87272,6 +104759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DUdhnoi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87312,6 +104807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT-II  No.4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87352,6 +104855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.-II NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87392,6 +104903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SHANTINAGAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87432,6 +104951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Shantinagar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87472,6 +104999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THEKASHU PT.-II NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22426",
+      "panchayatname": "Dudhnoi",
+      "villageName": "Thekashu Pt.-ii (ct)",
+      "villageCode": "33217",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87512,6 +105047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DARAKH NEW PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Darakhpara",
+      "villageCode": "33254",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87552,6 +105095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DARAKH PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Darakhpara",
+      "villageCode": "33254",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87592,6 +105143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Darakh PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Darakhpara",
+      "villageCode": "33254",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87632,6 +105191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LATAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Darakhpara",
+      "villageCode": "33254",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87672,6 +105239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEULGURI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Deulguri Pt-i",
+      "villageCode": "33252",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87712,6 +105287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Deulguri PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Deulguri Pt-i",
+      "villageCode": "33252",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87752,6 +105335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHESAPANI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Kuchdhowa Chechapani Pt-i",
+      "villageCode": "33263",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87792,6 +105383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUCHDHOWA CHESAPANI Pt-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Kuchdhowa Chechapani Pt-iii",
+      "villageCode": "33275",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87832,6 +105431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANUPARA 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Manupara",
+      "villageCode": "33251",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87872,6 +105479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MANUPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Manupara",
+      "villageCode": "33251",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87912,6 +105527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANUPARA 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Manupara",
+      "villageCode": "33251",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87952,6 +105575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Manupara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Manupara",
+      "villageCode": "33251",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -87992,6 +105623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAHARTULI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Manupara",
+      "villageCode": "33251",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88032,6 +105671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANUPARA TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22430",
+      "panchayatname": "Kuchdhowa",
+      "villageName": "Manupara",
+      "villageCode": "33251",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88072,6 +105719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAGULAMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bagulamari",
+      "villageCode": "33237",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88112,6 +105767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAGULAMARI NO. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bagulamari",
+      "villageCode": "33237",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88152,6 +105815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bagulamari No. 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bagulamari",
+      "villageCode": "33237",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88192,6 +105863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baje Mondal Sialmari PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Baje Mandal Sialmari",
+      "villageCode": "33249",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88232,6 +105911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAJE MANDAL SIALMARI NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Baje Mandal Sialmari",
+      "villageCode": "33249",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88272,6 +105959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BANDARSHREE NEW PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bandar Shee Pt-i",
+      "villageCode": "33240",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88312,6 +106007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bandarshree New PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bandar Shee Pt-i",
+      "villageCode": "33240",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88352,6 +106055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANDARSHRI PT-I M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bandar Shee Pt-i",
+      "villageCode": "33240",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88392,6 +106103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANDARSHREE PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bandar Shee Pt-ii",
+      "villageCode": "33241",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88432,6 +106151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bandarshree Pt-III PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bandar Shee Pt-iii",
+      "villageCode": "33242",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88472,6 +106199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BANDARSHREE PT III PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bandar Shee Pt-iii",
+      "villageCode": "33242",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88512,6 +106247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAR MATIA PT-II No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bar Matia Pt-ii",
+      "villageCode": "33246",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88552,6 +106295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAR MATIA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bar Matia Pt-ii",
+      "villageCode": "33246",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88592,6 +106343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAR PATHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Bar Pathar",
+      "villageCode": "33239",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88632,6 +106391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARMATIA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Barmatia Pt-i",
+      "villageCode": "33245",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88672,6 +106439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARMATIA PT-I NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Barmatia Pt-i",
+      "villageCode": "33245",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88712,6 +106487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GUABARI MANDAL GRAM HILLS PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Guabari Mandal Gram Hills",
+      "villageCode": "33250",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88752,6 +106535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mandalgram PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lakheraj Mandal Gram Pt-ii",
+      "villageCode": "33248",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88792,6 +106583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MANDALGRAM PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lakheraj Mandal Gram Pt-ii",
+      "villageCode": "33248",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88832,6 +106631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANDALGRAM PT-I NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lakheraj Mandalgram Pt-i",
+      "villageCode": "33247",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88872,6 +106679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MANDALGRAM PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lakheraj Mandalgram Pt-i",
+      "villageCode": "33247",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88912,6 +106727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baniapara No I PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lela",
+      "villageCode": "33236",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88952,6 +106775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LELA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lela",
+      "villageCode": "33236",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -88992,6 +106823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROWMARI KALIPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Lela",
+      "villageCode": "33236",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89032,6 +106871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MOWAMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Mowamari",
+      "villageCode": "33238",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89072,6 +106919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mowamari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Mowamari",
+      "villageCode": "33238",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89112,6 +106967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAMBUK PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Rambuk",
+      "villageCode": "33244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89152,6 +107015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rambuk No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Rambuk",
+      "villageCode": "33244",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89192,6 +107063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROWMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22429",
+      "panchayatname": "Lela",
+      "villageName": "Rowmari",
+      "villageCode": "33243",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89232,6 +107111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARIGOAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Barigaon",
+      "villageCode": "33211",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89272,6 +107159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DABLI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dabli",
+      "villageCode": "33208",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89312,6 +107207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AMGURI PURANPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89352,6 +107255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Amguri Puranpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89392,6 +107303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DOHELA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89432,6 +107351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dohela PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89472,6 +107399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dohela PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89512,6 +107447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boro Pas Para PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89552,6 +107495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHADARJAN PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89592,6 +107543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILOBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Dahela",
+      "villageCode": "33207",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89632,6 +107591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GUWABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Guwabari",
+      "villageCode": "33212",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89672,6 +107639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JANAIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Guwabari",
+      "villageCode": "33212",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89712,6 +107687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MUJGURI MV PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Mujguri",
+      "villageCode": "33209",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89752,6 +107735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ISLAMPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "MAJ JAKHILI",
+      "villageName": "MUJGURI ISLAMPUR",
+      "villageCode": "33210",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89792,6 +107783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGIJANI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Singijani",
+      "villageCode": "33206",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89832,6 +107831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UPPERTOLA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Upartola Pt-i",
+      "villageCode": "33203",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89872,6 +107879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UPPERTOLA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Upartola Pt-ii",
+      "villageCode": "33204",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89912,6 +107927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NATHPARA (MAJJAKHLI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Upartola Pt-iii",
+      "villageCode": "33205",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89952,6 +107975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UPPERTOLA KALITAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22425",
+      "panchayatname": "Maj Jakhili",
+      "villageName": "Upartola Pt-iii",
+      "villageCode": "33205",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -89992,6 +108023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHARAIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Charaimari",
+      "villageCode": "33227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90032,6 +108071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Charaimari No.2 PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Charaimari",
+      "villageCode": "33227",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90072,6 +108119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of FAFAL PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Fafal",
+      "villageCode": "33230",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90112,6 +108167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Fafal No 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Fafal",
+      "villageCode": "33230",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90152,6 +108215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Fafal No 4 PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Fafal",
+      "villageCode": "33230",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90192,6 +108263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARA BAGARIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Khara Bagaribari",
+      "villageCode": "33231",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90232,6 +108311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHARA BAGARIBARI No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Khara Bagaribari",
+      "villageCode": "33231",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90272,6 +108359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NABAGRAM PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Nabagram",
+      "villageCode": "33232",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90312,6 +108407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PURANI BHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Purani Bhita",
+      "villageCode": "33226",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90352,6 +108455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PURANI BHITA NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Purani Bhita",
+      "villageCode": "33226",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90392,6 +108503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILUK PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Siluk Pt-i",
+      "villageCode": "33228",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90432,6 +108551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILUK PT-II No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Siluk Pt-ii",
+      "villageCode": "33229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90472,6 +108599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SILUK PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Siluk Pt-ii",
+      "villageCode": "33229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90512,6 +108647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILUK PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Siluk Pt-ii",
+      "villageCode": "33229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90552,6 +108695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SUCIA PAHAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Suchia",
+      "villageCode": "33234",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90592,6 +108743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Suchia Pahar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Suchia",
+      "villageCode": "33234",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90632,6 +108791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUCHIA PAHAR PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Suchia Pahar Pt-i",
+      "villageCode": "33233",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90672,6 +108839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUCHIA PAHAR PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1187",
+      "blockname": "Kuchdhowa",
+      "panchayatcode": "22428",
+      "panchayatname": "Puranibhita",
+      "villageName": "Suchia Pahar Pt-ii",
+      "villageCode": "33235",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90712,6 +108887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AOLATOLI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90752,6 +108935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Aolatoli PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90792,6 +108983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BANIYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22421",
+      "panchayatname": "AOLATOLI",
+      "villageName": "AOLATOLI",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90832,6 +109031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAJIPUTA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90872,6 +109079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MESERVITA NORTH PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90912,6 +109127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Machervita PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90952,6 +109175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAMUDPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -90992,6 +109223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Pub Simulbari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91032,6 +109271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONARURTAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91072,6 +109319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONAMOYEE PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Aolatoli",
+      "villageCode": "33175",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91112,6 +109367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22421",
+      "panchayatname": "AOLATOLI",
+      "villageName": "BORDOL",
+      "villageCode": "33162",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91152,6 +109415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KURSAKATI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Kursakati",
+      "villageCode": "33174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91192,6 +109463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHONERPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22421",
+      "panchayatname": "AOLATOLI",
+      "villageName": "KURSAKATI",
+      "villageCode": "33174",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91232,6 +109511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIZ KURSAKATI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22421",
+      "panchayatname": "Aolatoli",
+      "villageName": "Nizkusakati",
+      "villageCode": "33173",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91272,6 +109559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bapurbhita Pt-I PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-i",
+      "villageCode": "33154",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91312,6 +109607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bapurbhita PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-i",
+      "villageCode": "33154",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91352,6 +109655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ADORSOPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-ii",
+      "villageCode": "33155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91392,6 +109703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAPURBHITA PT II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-ii",
+      "villageCode": "33155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91432,6 +109751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bapurbhita PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-ii",
+      "villageCode": "33155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91472,6 +109799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BOSKOPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-ii",
+      "villageCode": "33155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91512,6 +109847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boskopara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-ii",
+      "villageCode": "33155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91552,6 +109895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAKPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-ii",
+      "villageCode": "33155",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91592,6 +109943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAPURBHITA PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-iii",
+      "villageCode": "33156",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91632,6 +109991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MIAPARA EAST PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22418",
+      "panchayatname": "BAPURBHITA JURIGAON",
+      "villageName": "BAPURVITA PT-III",
+      "villageCode": "33156",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91672,6 +110039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nalagapara PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bapurvita Pt-iii",
+      "villageCode": "33156",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91712,6 +110087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOWALMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bowalmari",
+      "villageCode": "33157",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91752,6 +110135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOWALMARI NO-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Bowalmari",
+      "villageCode": "33157",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91792,6 +110183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHONAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Hatisila Muslimpara",
+      "villageCode": "33153",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91832,6 +110231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatisila PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Hatisila Muslimpara",
+      "villageCode": "33153",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91872,6 +110279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HATISILA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Hatisila Muslimpara",
+      "villageCode": "33153",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91912,6 +110327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JURIGAON BARMANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91952,6 +110375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of JURIGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -91992,6 +110423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JURIGAON GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92032,6 +110471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Jurigaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92072,6 +110519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JURIGAON KANDAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92112,6 +110567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KONDAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92152,6 +110615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MUSLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22418",
+      "panchayatname": "BAPURBHITA JURIGAON",
+      "villageName": "JURIGAON",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92192,6 +110663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JURIGAON TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22418",
+      "panchayatname": "Bapurbhita Jurigaon",
+      "villageName": "Jurigaon",
+      "villageCode": "33158",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92232,6 +110711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of JOYBHUM PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Jaybhum",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92272,6 +110759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PADDAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Jaybhum",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92312,6 +110807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kamakhyabari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Jaybhum",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92352,6 +110855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOIULEAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Jaybhum",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92392,6 +110903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KAMAKHYABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Jaybhum",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92432,6 +110951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PURANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Jaybhum",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92472,6 +110999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOYBHUM DESIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22419",
+      "panchayatname": "CHUNARI",
+      "villageName": "JAYBHUM",
+      "villageCode": "33160",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92512,6 +111047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KASIMA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Kasima",
+      "villageCode": "33163",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92552,6 +111095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHUDRAPOITARY NORTH PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Khudra Paitori",
+      "villageCode": "33165",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92592,6 +111143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHUDRAPOITARY SOUTH PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22419",
+      "panchayatname": "CHUNARI",
+      "villageName": "KHUDRA PAITORI",
+      "villageCode": "33165",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92632,6 +111191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHUDRA POITARY BUND SITE PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Khudra Paitori",
+      "villageCode": "33165",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92672,6 +111239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LEZAM PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Lejam",
+      "villageCode": "33164",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92712,6 +111287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NATHPARA (CHUNARI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Lejam",
+      "villageCode": "33164",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92752,6 +111335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BEPARIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Puthimari",
+      "villageCode": "33159",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92792,6 +111383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUTHIMARI (CHUNARI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22419",
+      "panchayatname": "Chunari",
+      "villageName": "Puthimari",
+      "villageCode": "33159",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92832,6 +111431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAIDA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Baida Pt-i",
+      "villageCode": "33136",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92872,6 +111479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAIDA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Baida Pt-ii",
+      "villageCode": "33137",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92912,6 +111527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAPURKHARA KHERKHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Baida Pt-ii",
+      "villageCode": "33137",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92952,6 +111575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORJANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Baida Pt-ii",
+      "villageCode": "33137",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -92992,6 +111623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALASARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Balachari",
+      "villageCode": "33125",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93032,6 +111671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALASARI AMGURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Balachari Amguri",
+      "villageCode": "33124",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93072,6 +111719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORJHORA (Dadan) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Borjora No-2",
+      "villageCode": "33145",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93112,6 +111767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHATABARI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Chatabari Pt-i",
+      "villageCode": "33141",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93152,6 +111815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHATABARI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Chatabari Pt-ii",
+      "villageCode": "33142",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93192,6 +111863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JONGSIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22416",
+      "panchayatname": "DADAN",
+      "villageName": "CHATABARI PT-II",
+      "villageCode": "33142",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93232,6 +111911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEPALCHANG PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Depalchang",
+      "villageCode": "33123",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93272,6 +111959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SANTAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22416",
+      "panchayatname": "DADAN",
+      "villageName": "DEPALCHANG",
+      "villageCode": "33123",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93312,6 +112007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIPKAI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Dipkai Pt-i",
+      "villageCode": "33134",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93352,6 +112055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIPKAI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Dipkai Pt-ii",
+      "villageCode": "33135",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93392,6 +112103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FAKIRMARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Fakirmara Pt-i",
+      "villageCode": "33130",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93432,6 +112151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATISHILA RABHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Hatisila Ravapara",
+      "villageCode": "33144",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93472,6 +112199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KURUNG PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Kurung",
+      "villageCode": "33132",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93512,6 +112247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM LEMAKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Lemakona",
+      "villageCode": "33129",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93552,6 +112295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB LEMAKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Lemakona",
+      "villageCode": "33129",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93592,6 +112343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MOGHO PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Magho Pt-i",
+      "villageCode": "33126",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93632,6 +112391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Mogho PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Magho Pt-i",
+      "villageCode": "33126",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93672,6 +112439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MALADHARA GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Maladhara Pt-i",
+      "villageCode": "33121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93712,6 +112487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MALADHARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Maladhara Pt-i",
+      "villageCode": "33121",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93752,6 +112535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Maladhara Pt-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Maladhara Pt-ii",
+      "villageCode": "33122",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93792,6 +112583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOGHO HATISILA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Mogho Hatisila",
+      "villageCode": "33133",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93832,6 +112631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHATRYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Mogho Pt-iii",
+      "villageCode": "33127",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93872,6 +112679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOGHO PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Mogho Pt-iii",
+      "villageCode": "33127",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93912,6 +112727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIHALIRBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Nahalirvita",
+      "villageCode": "33138",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93952,6 +112775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAMFANG PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Nahalirvita",
+      "villageCode": "33138",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -93992,6 +112823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SALPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Salpara",
+      "villageCode": "33143",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94032,6 +112871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Salpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Salpara",
+      "villageCode": "33143",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94072,6 +112919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TRICHIMKALI PANDOBA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Trichimkali Pandoba Pt-i",
+      "villageCode": "33139",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94112,6 +112967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JONGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Trichimkalipandoba Pt-ii",
+      "villageCode": "33140",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94152,6 +113015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TICHIMKALI PANDOBA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22416",
+      "panchayatname": "Dadan",
+      "villageName": "Trichimkalipandoba Pt-ii",
+      "villageCode": "33140",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94192,6 +113063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHAMAR BEEL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Dhamar Bill",
+      "villageCode": "33149",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94232,6 +113111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DHAMAR RESERVE PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Dhamar Reserve",
+      "villageCode": "33148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94272,6 +113159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Dhamar Reserve",
+      "villageCode": "33148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94312,6 +113207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHAMAR RESERVE 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Dhamar Reserve",
+      "villageCode": "33148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94352,6 +113255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhamar Reserve PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Dhamar Reserve",
+      "villageCode": "33148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94392,6 +113303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RUPAKURA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22417",
+      "panchayatname": "DHAMAR",
+      "villageName": "DHAMAR RESERVE",
+      "villageCode": "33148",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94432,6 +113351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATOGAON PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Hatogaon Pt-i",
+      "villageCode": "33146",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94472,6 +113399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HATOGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Hatogaon Pt-i",
+      "villageCode": "33146",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94512,6 +113447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hatogaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Hatogaon Pt-i",
+      "villageCode": "33146",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94552,6 +113495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATOGAON BARMANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22417",
+      "panchayatname": "DHAMAR",
+      "villageName": "HATOGAON PT-II",
+      "villageCode": "33147",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94592,6 +113543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEDHIPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Medhipara Pt-i",
+      "villageCode": "33150",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94632,6 +113591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEDHIPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Medhipara Pt-ii",
+      "villageCode": "33151",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94672,6 +113639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BEELPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22417",
+      "panchayatname": "DHAMAR",
+      "villageName": "NIDANPUR PT-II (CT)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94712,6 +113687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHAI BHANI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94752,6 +113735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOCHPARA PWSS (Lakhipur) (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94792,6 +113783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nidanpur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94832,6 +113831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NIDANPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94872,6 +113879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rishipara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94912,6 +113927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RISHIPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94952,6 +113975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUNDARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22417",
+      "panchayatname": "Dhamar",
+      "villageName": "Nidanpur Pt-ii (ct)",
+      "villageCode": "33152",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -94992,6 +114023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95032,6 +114071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Domoni PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95072,6 +114119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Faringapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95112,6 +114167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FARINGAPARA TALTOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95152,6 +114215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MODHYA SIMULBARI, PACHIM SIMULBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95192,6 +114263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PALASH KANDI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95232,6 +114311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DONGERPAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Faringapara",
+      "villageCode": "33176",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95272,6 +114359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LIKIRI PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Likiri Para",
+      "villageCode": "33178",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95312,6 +114407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DASPARA SILAPANI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Silapani",
+      "villageCode": "33177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95352,6 +114455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DASPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22422",
+      "panchayatname": "Faringapara",
+      "villageName": "Silapani",
+      "villageCode": "33177",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95392,6 +114503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ABHIRAMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Abhirampara",
+      "villageCode": "33113",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95432,6 +114551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNDOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Bamundoba",
+      "villageCode": "33109",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95472,6 +114599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TOPAJULI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Bamundoba",
+      "villageCode": "33109",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95512,6 +114647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Boistompara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Boistompara",
+      "villageCode": "33117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95552,6 +114695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RABHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Boistompara",
+      "villageCode": "33117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95592,6 +114743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BOISTOMPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Boistompara",
+      "villageCode": "33117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95632,6 +114791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAKCHIGIRI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22415",
+      "panchayatname": "JAYRAM KUCHI",
+      "villageName": "BOISTOMPARA",
+      "villageCode": "33117",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95672,6 +114839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARMANPARA (CHOIBARI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Chaibari",
+      "villageCode": "33110",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95712,6 +114887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHOIBARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Chaibari",
+      "villageCode": "33110",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95752,6 +114935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Choibari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Chaibari",
+      "villageCode": "33110",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95792,6 +114983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAYRAMKUCHI TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Goyram Kushi",
+      "villageCode": "33111",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95832,6 +115031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAYRAMKUCHI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Goyram Kushi",
+      "villageCode": "33111",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95872,6 +115079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KRISHNAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Janjipara Pt-i",
+      "villageCode": "33116",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95912,6 +115127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANGKONGPARA, LOWER THORKO PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22415",
+      "panchayatname": "JAYRAM KUCHI",
+      "villageName": "JANJIPARA PT-I",
+      "villageCode": "33116",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95952,6 +115175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BATAPARA TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Krishapur",
+      "villageCode": "33112",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -95992,6 +115223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KULAMUWA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Kulamuwa",
+      "villageCode": "33120",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96032,6 +115271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Jhanjipara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Nalbari",
+      "villageCode": "33119",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96072,6 +115319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JANJIPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Nalbari",
+      "villageCode": "33119",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96112,6 +115367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA (Lakhipur) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Nayapara",
+      "villageCode": "33114",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96152,6 +115415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAKIABHASA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Panisali",
+      "villageCode": "33118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96192,6 +115463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PANISALI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Panisali",
+      "villageCode": "33118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96232,6 +115511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "INDIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Panisali",
+      "villageCode": "33118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96272,6 +115559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LALUPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Panisali",
+      "villageCode": "33118",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96312,6 +115607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RONGADOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Rongadoba",
+      "villageCode": "33108",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96352,6 +115655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "THORKO GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Tharka",
+      "villageCode": "33115",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96392,6 +115703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of THORKO PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Tharka",
+      "villageCode": "33115",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96432,6 +115751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Thorko PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22415",
+      "panchayatname": "Jayram Kuchi",
+      "villageName": "Tharka",
+      "villageCode": "33115",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96472,6 +115799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNER ALGA PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22424",
+      "panchayatname": "Kalshabhanga",
+      "villageName": "Bamuner Alga Pt-iii",
+      "villageCode": "33196",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96512,6 +115847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNER ALGA PT- IV PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22424",
+      "panchayatname": "Kalshabhanga",
+      "villageName": "Bamuner Alga Pt-iv",
+      "villageCode": "33197",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96552,6 +115895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOLAKURA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22424",
+      "panchayatname": "Kalshabhanga",
+      "villageName": "Cholakura Pt-1",
+      "villageCode": "33193",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96592,6 +115943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOLAKURA PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22424",
+      "panchayatname": "Kalshabhanga",
+      "villageName": "Cholakura Pt-iii",
+      "villageCode": "627229",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96632,6 +115991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KILLHARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22424",
+      "panchayatname": "Kalshabhanga",
+      "villageName": "Killahara Pt-i",
+      "villageCode": "33199",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96672,6 +116039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BOLAIKHAMAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Balaikhamar",
+      "villageCode": "33096",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96712,6 +116087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bolaikhamar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Balaikhamar",
+      "villageCode": "33096",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96752,6 +116135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Besarkona",
+      "villageCode": "33101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96792,6 +116183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "2 NO. PUKHURIPARA BESORKONA MVS PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Besarkona",
+      "villageCode": "33101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96832,6 +116231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Besorkona PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Besarkona",
+      "villageCode": "33101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96872,6 +116279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BESARKONA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Besarkona",
+      "villageCode": "33101",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96912,6 +116327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEONAPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Deonapara Pt-i",
+      "villageCode": "33103",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96952,6 +116375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDOL PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Deonapara Pt-ii",
+      "villageCode": "33104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -96992,6 +116423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDAL L.P.S.",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Deonapara Pt-ii",
+      "villageCode": "33104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97032,6 +116471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEONAPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Deonapara Pt-ii",
+      "villageCode": "33104",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97072,6 +116519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHOKAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Dhokapara",
+      "villageCode": "33105",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97112,6 +116567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of Bordol PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Ghunghunivita",
+      "villageCode": "33107",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97152,6 +116615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHUNGHUNIRBHITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Ghunghunivita",
+      "villageCode": "33107",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97192,6 +116663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOBAL, TIKRIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Gobal",
+      "villageCode": "33099",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97232,6 +116711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SIGRI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Gobal",
+      "villageCode": "33099",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97272,6 +116759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JHANJIPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Janjipara Pt-ii",
+      "villageCode": "33106",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97312,6 +116807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BATAPARA (LAKHIPUR) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Lahapara",
+      "villageCode": "33100",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97352,6 +116855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LAHAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Lahapara",
+      "villageCode": "33100",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97392,6 +116903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIGRI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Lambupara",
+      "villageCode": "33102",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97432,6 +116951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sigri Pt-I Lambupara MVS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Lambupara",
+      "villageCode": "33102",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97472,6 +116999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sigri PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22414",
+      "panchayatname": "Pukhuripara",
+      "villageName": "Sigri Pt-ii",
+      "villageCode": "33098",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97512,6 +117047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORARCHAR PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22423",
+      "panchayatname": "Rowkhowa",
+      "villageName": "Borar Char Pt-i",
+      "villageCode": "33183",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97552,6 +117095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHULARCHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22423",
+      "panchayatname": "Rowkhowa",
+      "villageName": "Chular Char",
+      "villageCode": "33191",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97592,6 +117143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ROWKHOWA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22423",
+      "panchayatname": "Rowkhowa",
+      "villageName": "Rowkhowa Pt-ii",
+      "villageCode": "627235",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97632,6 +117191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SALMARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22423",
+      "panchayatname": "Rowkhowa",
+      "villageName": "Salmara",
+      "villageCode": "33186",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97672,6 +117239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOISMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "BHOISMARI",
+      "villageCode": "33167",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97712,6 +117287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOROPOITARY PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "BORO PAITARI",
+      "villageCode": "33168",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97752,6 +117335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khudrapoitary PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "BORO PAITARI",
+      "villageCode": "33168",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97792,6 +117383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHUDRAPOITARY PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "BORO PAITARI",
+      "villageCode": "33168",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97832,6 +117431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAKLA MOTHABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Chakbabill",
+      "villageCode": "33172",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97872,6 +117479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chakla Billpara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Chakbabill",
+      "villageCode": "33172",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97912,6 +117527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHONAR PUBPAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Khonar Pubpar",
+      "villageCode": "33171",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97952,6 +117575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khonar Pubpar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Khonar Pubpar",
+      "villageCode": "33171",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -97992,6 +117623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MOTHABARI (LAKHIPUR) PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "MOTHABARI",
+      "villageCode": "33169",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98032,6 +117671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAWAIRARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "MOTHABARI",
+      "villageCode": "33169",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98072,6 +117719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUKRADANGA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Saktola",
+      "villageCode": "33170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98112,6 +117767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Saktola PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Saktola",
+      "villageCode": "33170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98152,6 +117815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SAKTOLA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Saktola",
+      "villageCode": "33170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98192,6 +117863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Saktola PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Saktola",
+      "villageCode": "33170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98232,6 +117911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAKTOLA [ A ] PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Saktola",
+      "villageCode": "33170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98272,6 +117959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAKTOLA [ B ] PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "Lakhipur",
+      "panchayatcode": "22420",
+      "panchayatname": "Saktola",
+      "villageName": "Saktola",
+      "villageCode": "33170",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98312,6 +118007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SOWARI POITARY PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1186",
+      "blockname": "LAKHIPUR",
+      "panchayatcode": "22420",
+      "panchayatname": "SAKTOLA",
+      "villageName": "SWARI PAITARI",
+      "villageCode": "33166",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98352,6 +118055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF 8 No Camp PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22411",
+      "panchayatname": "BAKAITARY",
+      "villageName": "BAKAITARI PT-I",
+      "villageCode": "33074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98392,6 +118103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakaitary PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-i",
+      "villageCode": "33074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98432,6 +118151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of 9 No. Camp PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-i",
+      "villageCode": "33074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98472,6 +118199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAKAITARY PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-i",
+      "villageCode": "33074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98512,6 +118247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NOBILA BORI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-i",
+      "villageCode": "33074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98552,6 +118295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Nigam PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-i",
+      "villageCode": "33074",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98592,6 +118343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHAKATPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-ii",
+      "villageCode": "33075",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98632,6 +118391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "COLLEGEPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-ii",
+      "villageCode": "33075",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98672,6 +118439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAYATPARA PURANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-ii",
+      "villageCode": "33075",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98712,6 +118487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "9 No.  Camp PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22411",
+      "panchayatname": "BAKAITARY",
+      "villageName": "BAKAITARI PT-III",
+      "villageCode": "33076",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98752,6 +118535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAKAITARY KHALAIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-iii",
+      "villageCode": "33076",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98792,6 +118583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GANAKPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Bakaitari Pt-iii",
+      "villageCode": "33076",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98832,6 +118631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAGANNATHPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22411",
+      "panchayatname": "Bakaitary",
+      "villageName": "Gunialguri",
+      "villageCode": "33073",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98872,6 +118679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Baladmari Char Pt I PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-i",
+      "villageCode": "33010",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98912,6 +118727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "1 No Baladmari Char PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-i",
+      "villageCode": "33010",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98952,6 +118775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "2 NO. BALADMARI CHAR (NATUN BASTI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -98992,6 +118823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalu Bazar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99032,6 +118871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KALUBAZAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99072,6 +118919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAKHINPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99112,6 +118967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Santipur PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99152,6 +119015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99192,6 +119063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UTTARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-ii",
+      "villageCode": "33011",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99232,6 +119111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAM HARIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-iii",
+      "villageCode": "33012",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99272,6 +119159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALAVITA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-iii",
+      "villageCode": "33012",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99312,6 +119207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HATKHOLA (BALADMARI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-iv",
+      "villageCode": "33013",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99352,6 +119255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALADMARI CHAR PT-IV UTTARKHANDA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Baladmari Char Pt-iv",
+      "villageCode": "33013",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99392,6 +119303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Helapakhiri PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Helapakhri",
+      "villageCode": "33015",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99432,6 +119351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HELAPAKHRI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Helapakhri",
+      "villageCode": "33015",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99472,6 +119399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAMABHAGINPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Helapakhri",
+      "villageCode": "33015",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99512,6 +119447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HELAPAKHRI TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Helapakhri",
+      "villageCode": "33015",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99552,6 +119495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAKHIURA CHAR BEHARFULY PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22403",
+      "panchayatname": "Baladmari Char",
+      "villageName": "Pakhiura Char",
+      "villageCode": "33016",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99592,6 +119543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARBALUPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Borobalupara (banbabu Para)",
+      "villageCode": "33060",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99632,6 +119591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORKANDA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Borobalupara (banbabu Para)",
+      "villageCode": "33060",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99672,6 +119639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Buduchar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar",
+      "villageCode": "33052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99712,6 +119687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BUDUCHAR MILANPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar",
+      "villageCode": "33052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99752,6 +119735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JAYANTIPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar",
+      "villageCode": "33052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99792,6 +119783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MUSHLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar",
+      "villageCode": "33052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99832,6 +119831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SUNDARPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar",
+      "villageCode": "33052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99872,6 +119879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUNDARPUR NC PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar",
+      "villageCode": "33052",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99912,6 +119927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BUDUCHAR NC, SINGIMARI CHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Buduchar N.c.",
+      "villageCode": "33054",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99952,6 +119975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHALAIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Khalaipara",
+      "villageCode": "33056",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -99992,6 +120023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAMUDPUR PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22408",
+      "panchayatname": "BUDUCHAR",
+      "villageName": "MAMUDPUR PT-I",
+      "villageCode": "33061",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100032,6 +120071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MAMUDPUR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22408",
+      "panchayatname": "BUDUCHAR",
+      "villageName": "MAMUDPUR PT-I",
+      "villageCode": "33061",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100072,6 +120119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PURANPARA TELIPARA PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Mamudpur Pt-i",
+      "villageCode": "33061",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100112,6 +120167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hathkhola PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Mamudpur Pt.-ii",
+      "villageCode": "33063",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100152,6 +120215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NATUNBASTI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Mamudpur Pt.-ii",
+      "villageCode": "33063",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100192,6 +120263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TEKORPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22408",
+      "panchayatname": "Buduchar",
+      "villageName": "Mamudpur Pt.-ii",
+      "villageCode": "33063",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100232,6 +120311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DALGOMA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Dalgoma",
+      "villageCode": "33048",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100272,6 +120359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "COLLAGEPARA NORTH , COLLEGEPARA SOUTH PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Dalgoma",
+      "villageCode": "33048",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100312,6 +120407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAULPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Dalgoma",
+      "villageCode": "33048",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100352,6 +120455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAGUNBAHI REFUGICAMP PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Dalgoma",
+      "villageCode": "33048",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100392,6 +120503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KADOMTOLA CAMP PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Dalgoma",
+      "villageCode": "33048",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100432,6 +120551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOSSAIBORI MILANPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Gosaibori",
+      "villageCode": "33051",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100472,6 +120599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RETROFITTING OF Gossaibori PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Gosaibori",
+      "villageCode": "33051",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100512,6 +120647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HIRAPARA (DALGOMA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Gosaibori",
+      "villageCode": "33051",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100552,6 +120695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "182 no. Gosaibori Pub Milanpur AWC",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Gosaibori",
+      "villageCode": "33051",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100592,6 +120743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KODOMTOLA DAKHINPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Kodamtola Gopalpur",
+      "villageCode": "33049",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100632,6 +120791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KODOMTOLA NO.2. CAMP PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22407",
+      "panchayatname": "Dalgoma",
+      "villageName": "Kodamtola Gopalpur",
+      "villageCode": "33049",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100672,6 +120839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "FUTURIPARA 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Futuripara",
+      "villageCode": "33022",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100712,6 +120887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SAGRADHORA JALUAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Futuripara",
+      "villageCode": "33022",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100752,6 +120935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOCHPARA REFUJIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Futuripara",
+      "villageCode": "33022",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100792,6 +120983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHENGMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Harimura",
+      "villageCode": "33023",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100832,6 +121031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HARIMURA  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Harimura",
+      "villageCode": "33023",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100872,6 +121079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAGURMARI M PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Harimura",
+      "villageCode": "33023",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100912,6 +121127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "UDAYPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Harimura",
+      "villageCode": "33023",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100952,6 +121175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHAMAR PAKHRIGURI DHUNDIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22404",
+      "panchayatname": "HARIMURA",
+      "villageName": "KHAMAR PAKHIRIGURI DHUNDIPARA",
+      "villageCode": "622669",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -100992,6 +121223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of LALABORI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Lalabori",
+      "villageCode": "33025",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101032,6 +121271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOUDHURIPARA DHARAMPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Lalabori",
+      "villageCode": "33025",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101072,6 +121319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BELBORI NAYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Lalabori",
+      "villageCode": "33025",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101112,6 +121367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LALABORI KODOMTOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Lalabori",
+      "villageCode": "33025",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101152,6 +121415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Lalabori PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Lalabori",
+      "villageCode": "33025",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101192,6 +121463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Moijonga PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Moijonga",
+      "villageCode": "33024",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101232,6 +121511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MOIJONGA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Moijonga",
+      "villageCode": "33024",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101272,6 +121559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HARIMURA T.E. MPWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22404",
+      "panchayatname": "HARIMURA",
+      "villageName": "MOIJONGA",
+      "villageCode": "33024",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101312,6 +121607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of HARIMURA T E PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22404",
+      "panchayatname": "HARIMURA",
+      "villageName": "MOIJONGA",
+      "villageCode": "33024",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101352,6 +121655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LEWABARI MADHYAPARA PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Garopara Pt-i",
+      "villageCode": "33018",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101392,6 +121703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOUTARABORI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Garopara Pt-i",
+      "villageCode": "33018",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101432,6 +121751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rakhyasini Garopara Pt I PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Garopara Pt-i",
+      "villageCode": "33018",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101472,6 +121799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RAKHYASINI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Garopara Pt-i",
+      "villageCode": "33018",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101512,6 +121847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Milanpur Garopara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Jangle Block",
+      "villageCode": "33019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101552,6 +121895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKHYASINI MVS PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Jangle Block",
+      "villageCode": "33019",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101592,6 +121943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rakshasini PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Jhar Pt-i",
+      "villageCode": "33020",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101632,6 +121991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKSHASINIJHAR PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Jhar Pt-ii",
+      "villageCode": "33021",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101672,6 +122039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKSHASINI PAHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Rakhyasini Pahar",
+      "villageCode": "33028",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101712,6 +122087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DANAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Tengabari",
+      "villageCode": "33026",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101752,6 +122135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PETKATA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Tengabari",
+      "villageCode": "33026",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101792,6 +122183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "143 NO. MAZGAON AWC",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Tengabari",
+      "villageCode": "33026",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101832,6 +122231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TENGABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22404",
+      "panchayatname": "Harimura",
+      "villageName": "Tengabari",
+      "villageCode": "33026",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101872,6 +122279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-i",
+      "villageCode": "33068",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101912,6 +122327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DABPARA BORIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-ii",
+      "villageCode": "33069",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101952,6 +122375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARIPARA KALITAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-iii",
+      "villageCode": "33070",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -101992,6 +122423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARIPARA PT-IV PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-iv",
+      "villageCode": "33071",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102032,6 +122471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARIPARA PT-IV RABHAPARA (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-iv",
+      "villageCode": "33071",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102072,6 +122519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KARIPARA MEDHIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-iv",
+      "villageCode": "33071",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102112,6 +122567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PHULGURI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Karipara Pt-iv",
+      "villageCode": "33071",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102152,6 +122615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SARAPARA NAYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Sarapara",
+      "villageCode": "33072",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102192,6 +122663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SARAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22410",
+      "panchayatname": "Karipara",
+      "villageName": "Sarapara",
+      "villageCode": "33072",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102232,6 +122711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bamunpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Bamunpara",
+      "villageCode": "33067",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102272,6 +122759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of 5 NO SARANARTHI CAMP PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102312,6 +122807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "5 No. Saranarthi Camp PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102352,6 +122855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAMANI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102392,6 +122903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HAJONGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102432,6 +122951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of PACHIM MATIA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102472,6 +122999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MATIA GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102512,6 +123047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NANDESWAR GAROPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102552,6 +123095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DOMONI BORIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102592,6 +123143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PACHIM MATIA SANTIPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pachim Matia",
+      "villageCode": "33066",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102632,6 +123191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHANDRAPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pub Matia",
+      "villageCode": "33065",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102672,6 +123239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of PUB MATIA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Pub Matia",
+      "villageCode": "33065",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102712,6 +123287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Matia Rabhapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22409",
+      "panchayatname": "Matia",
+      "villageName": "Rabhapara",
+      "villageCode": "622668",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102752,6 +123335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAJGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Bhojmala Pt-i(mornoi)",
+      "villageCode": "33047",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102792,6 +123383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GAJIAJANI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Bhojmala Pt-i(mornoi)",
+      "villageCode": "33047",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102832,6 +123431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHOJMALA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Bhojmala Pt-ii",
+      "villageCode": "33044",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102872,6 +123479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DAHIKATA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dahikata",
+      "villageCode": "33045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102912,6 +123527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dahikata PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dahikata",
+      "villageCode": "33045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102952,6 +123575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAHIKATA KODOMTALA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dahikata",
+      "villageCode": "33045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -102992,6 +123623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RAJAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dahikata",
+      "villageCode": "33045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103032,6 +123671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIMNA RAJAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dahikata",
+      "villageCode": "33045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103072,6 +123719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rajapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dahikata",
+      "villageCode": "33045",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103112,6 +123767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kodaldhowa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dakaidal",
+      "villageCode": "33043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103152,6 +123815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DAKAIDAL PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dakaidal",
+      "villageCode": "33043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103192,6 +123863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DAKAIDAL KODOMER TOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dakaidal",
+      "villageCode": "33043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103232,6 +123911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dakaidal PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dakaidal",
+      "villageCode": "33043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103272,6 +123959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dakaidal PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Dakaidal",
+      "villageCode": "33043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103312,6 +124007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dakaidol New Basti PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22406",
+      "panchayatname": "MORNAI",
+      "villageName": "DAKAIDAL",
+      "villageCode": "33043",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103352,6 +124055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MONAKASA BELTOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Monakasa",
+      "villageCode": "33040",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103392,6 +124103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MONAKOCHA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Monakasa",
+      "villageCode": "33040",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103432,6 +124151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Monakocha PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Monakasa",
+      "villageCode": "33040",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103472,6 +124199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA NOLDOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Monakasa",
+      "villageCode": "33040",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103512,6 +124247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NEPALIKHUTI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Monakasa",
+      "villageCode": "33040",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103552,6 +124295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BABUPARA UJANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Mornai",
+      "villageCode": "33042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103592,6 +124343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOUDHURIPARA BANIKAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Mornai",
+      "villageCode": "33042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103632,6 +124391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NEW MORNAI FIELDPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Mornai",
+      "villageCode": "33042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103672,6 +124439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HIRAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Mornai",
+      "villageCode": "33042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103712,6 +124487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MORNOI MAJORPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Mornai",
+      "villageCode": "33042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103752,6 +124535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MORNOI PACHIMAPARA PWSS (New)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22406",
+      "panchayatname": "Mornai",
+      "villageName": "Mornai",
+      "villageCode": "33042",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103792,6 +124583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI CHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22413",
+      "panchayatname": "NABAGOTA SIMLITOLA",
+      "villageName": "BAHATI CHAR",
+      "villageCode": "33089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103832,6 +124631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bahati River Block Pt-I No.2 PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "MATIA",
+      "panchayatcode": "22413",
+      "panchayatname": "NABAGOTA SIMLITOLA",
+      "villageName": "BAHATI CHAR",
+      "villageCode": "33089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103872,6 +124679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI CHAR NO 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bahati Char",
+      "villageCode": "33089",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103912,6 +124727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI RIVER BLOCK PT I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bahati River Block - Pt-i",
+      "villageCode": "627228",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103952,6 +124775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bahati Char Pt-II River Block PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bahati River Pt-ii Pt-ii",
+      "villageCode": "33090",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -103992,6 +124823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI CHAR PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bahati River Pt-ii Pt-ii",
+      "villageCode": "33090",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104032,6 +124871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI CHAR PT-II NO 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bahati River Pt-ii Pt-ii",
+      "villageCode": "33090",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104072,6 +124919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Balapara",
+      "villageCode": "653619",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104112,6 +124967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHARBARI NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bherveri",
+      "villageCode": "33087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104152,6 +125015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHARBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bherveri",
+      "villageCode": "33087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104192,6 +125063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Singramari NC PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bherveri",
+      "villageCode": "33087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104232,6 +125111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHARBARI NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Bherveri",
+      "villageCode": "33087",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104272,6 +125159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GOROMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Goromari",
+      "villageCode": "33088",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104312,6 +125207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kalaichar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Goromari",
+      "villageCode": "33088",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104352,6 +125255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NOBAGATA SIMLITOLA NO. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Nobagata Simlitola",
+      "villageCode": "33092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104392,6 +125303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NOBAGATA SIMLITOLA NO.5 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Nobagata Simlitola",
+      "villageCode": "33092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104432,6 +125351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NOBAGATA SIMLITOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Nobagata Simlitola",
+      "villageCode": "33092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104472,6 +125399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NOBAGATA SIMLITOLA NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Nobagata Simlitola",
+      "villageCode": "33092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104512,6 +125447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NOBAGATA SIMLITOLA NO.4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Nobagata Simlitola",
+      "villageCode": "33092",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104552,6 +125495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "POKALAGI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Pokalagi",
+      "villageCode": "33085",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104592,6 +125543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GARUPURATARY PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Singramari",
+      "villageCode": "33062",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104632,6 +125591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SINGRAMARI RIVER BLOCK (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Singramari River Block",
+      "villageCode": "33086",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104672,6 +125639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Garupurartary PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Singramari River Block",
+      "villageCode": "33086",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104712,6 +125687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUTARPARA CHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Sutarpara",
+      "villageCode": "33094",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104752,6 +125735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SUTARPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Sutarpara",
+      "villageCode": "33094",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104792,6 +125783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUTARPARA NO 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Sutarpara Char",
+      "villageCode": "33091",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104832,6 +125831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SUTARPARA NO 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22413",
+      "panchayatname": "Nabagota Simlitola",
+      "villageName": "Sutarpara Char",
+      "villageCode": "33091",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104872,6 +125879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI PT-1 (NO.2) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Bahati Pt-1",
+      "villageCode": "33078",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104912,6 +125927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI PT-1 (NO 3) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Bahati Pt-1",
+      "villageCode": "33078",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104952,6 +125975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI PT-I (NO.3)( Faitapara) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Bahati Pt-1",
+      "villageCode": "33078",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -104992,6 +126023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI PT-1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Bahati Pt-1",
+      "villageCode": "33078",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105032,6 +126071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Bahati Pt-ii",
+      "villageCode": "33079",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105072,6 +126119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAHATI PT-II NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Bahati Pt-ii",
+      "villageCode": "33079",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105112,6 +126167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-I NO 4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-i",
+      "villageCode": "33080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105152,6 +126215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-I NO. 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-i",
+      "villageCode": "33080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105192,6 +126263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-i",
+      "villageCode": "33080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105232,6 +126311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-I NO. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-i",
+      "villageCode": "33080",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105272,6 +126359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-II NO. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-ii",
+      "villageCode": "33081",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105312,6 +126407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-II NO. 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-ii",
+      "villageCode": "33081",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105352,6 +126455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAYAPARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Nayapara Pt-ii",
+      "villageCode": "33081",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105392,6 +126503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RONUA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Ronua",
+      "villageCode": "33084",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105432,6 +126551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RONUA NO 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Ronua",
+      "villageCode": "33084",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105472,6 +126599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RONUA NO 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Ronua",
+      "villageCode": "33084",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105512,6 +126647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIDHABARI PT-I NO. 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-i",
+      "villageCode": "33082",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105552,6 +126695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIDHABARI PT-I NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-i",
+      "villageCode": "33082",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105592,6 +126743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "193 no. Sidhabari Saranarthi Sibir  9 AWC",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-i",
+      "villageCode": "33082",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105632,6 +126791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIDHABARI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-i",
+      "villageCode": "33082",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105672,6 +126839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIDHABARI PT-II No.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-ii",
+      "villageCode": "33083",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105712,6 +126887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIDHABARI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-ii",
+      "villageCode": "33083",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105752,6 +126935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SIDHABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-ii",
+      "villageCode": "33083",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105792,6 +126983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIDHABARI PT-II NO 3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22412",
+      "panchayatname": "Sidhabari",
+      "villageName": "Sidhabari Pt-ii",
+      "villageCode": "33083",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105832,6 +127031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bhatipara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Bhatiapara",
+      "villageCode": "33039",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105872,6 +127079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BHATIPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Bhatiapara",
+      "villageCode": "33039",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105912,6 +127127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHATIPARA MAJORPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Bhatiapara",
+      "villageCode": "33039",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105952,6 +127175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HAJONGPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Bhatiapara",
+      "villageCode": "33039",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -105992,6 +127223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dalucamp PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dashabhuja Debasthan",
+      "villageCode": "33037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106032,6 +127271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DASABHUJA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dashabhuja Debasthan",
+      "villageCode": "33037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106072,6 +127319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dasabhuja Devasthan PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dashabhuja Debasthan",
+      "villageCode": "33037",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106112,6 +127367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEKDHOWA TALTOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dekdhowa",
+      "villageCode": "33029",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106152,6 +127415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dekdhowa PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dekdhowa",
+      "villageCode": "33029",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106192,6 +127463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PUB DEKDHOWA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dekdhowa",
+      "villageCode": "33029",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106232,6 +127511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NAIDALPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara",
+      "villageCode": "33035",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106272,6 +127559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DUBAPARA KALITA PARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara",
+      "villageCode": "33035",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106312,6 +127607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DUBAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara",
+      "villageCode": "33035",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106352,6 +127655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DUBAPARA NAMABASTI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara",
+      "villageCode": "33035",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106392,6 +127703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dubapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara",
+      "villageCode": "33035",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106432,6 +127751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NATUN DUBAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara",
+      "villageCode": "33035",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106472,6 +127799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DUBAPARA LUPTA CHAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara Lupta Char",
+      "villageCode": "33034",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106512,6 +127847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SONAPUR 1 PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara Lupta Char",
+      "villageCode": "33034",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106552,6 +127895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SONAPUR NAYAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara Lupta Char",
+      "villageCode": "33034",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106592,6 +127943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sonapur-1 PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Dubapara Lupta Char",
+      "villageCode": "33034",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106632,6 +127991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KUMARPARA PATIARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Paharsing Para",
+      "villageCode": "33031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106672,6 +128039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAHARSINGPARA MUSLIMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Paharsing Para",
+      "villageCode": "33031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106712,6 +128087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PAHASING 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Paharsing Para",
+      "villageCode": "33031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106752,6 +128135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAKSHASINI PAHAR [SRI SURYAGIRI] PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Paharsing Para",
+      "villageCode": "33031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106792,6 +128183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TILAPARA[SRI SURYAGIRI] PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Paharsing Para",
+      "villageCode": "33031",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106832,6 +128231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TINKONIAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Tinkoniapara",
+      "villageCode": "33036",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106872,6 +128279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TINKONIAPARA UJANPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1185",
+      "blockname": "Matia",
+      "panchayatcode": "22405",
+      "panchayatname": "Sri Suryagiri",
+      "villageName": "Tinkoniapara",
+      "villageCode": "33036",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106912,6 +128327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ambari Pt-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-i",
+      "villageCode": "33606",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106952,6 +128375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dudhkonwar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-ii",
+      "villageCode": "33599",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -106992,6 +128423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BOETARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107032,6 +128471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CELABORI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107072,6 +128519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Celabori PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107112,6 +128567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AMBARI DUMPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107152,6 +128615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMBARI SIMLABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107192,6 +128663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AMBARI PT III PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107232,6 +128711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Padupara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107272,6 +128759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ambari Pt-III PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107312,6 +128807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of PADUPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ambari Pt-iii",
+      "villageCode": "33601",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107352,6 +128855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bijoypur Bongaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Bijoypur Bangaon",
+      "villageCode": "33607",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107392,6 +128903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DHANTOLA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Dhantola Pt-ii",
+      "villageCode": "625679",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107432,6 +128951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KATHALMURI ( SANPARA)PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Dhontola Pt-i",
+      "villageCode": "33608",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107472,6 +128999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of FAKIRPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Dhontola Pt-i",
+      "villageCode": "33608",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107512,6 +129047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORSIMLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Dhontola Pt-i",
+      "villageCode": "33608",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107552,6 +129095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KHEKAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Khekapara",
+      "villageCode": "627221",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107592,6 +129143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHAMAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Palsa",
+      "villageCode": "627222",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107632,6 +129191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ULUBARI CHOITARA NAITARA BEEL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ullubari Choutra Naitarabeel",
+      "villageCode": "33560",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107672,6 +129239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ULUBARI CHOITARA NAITARA BEEL [SOUTH] PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22472",
+      "panchayatname": "Ambari",
+      "villageName": "Ullubari Choutra Naitarabeel",
+      "villageCode": "33560",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107712,6 +129287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DHANUBHANGA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Aoimari",
+      "villageCode": "669583",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107752,6 +129335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AOIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Aoimari",
+      "villageCode": "669583",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107792,6 +129383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MEDHIKONA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Athiabari",
+      "villageCode": "33598",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107832,6 +129431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "RAJHASALI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Athiabari",
+      "villageCode": "33598",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107872,6 +129479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GATHIAPARA  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Gathiapara",
+      "villageCode": "33595",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107912,6 +129527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GATHIAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Gathiapara",
+      "villageCode": "33595",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107952,6 +129575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Gathiapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Gathiapara",
+      "villageCode": "33595",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -107992,6 +129623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GATHIAPARA(1) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Gathiapara",
+      "villageCode": "33595",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108032,6 +129671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MADANG PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-i",
+      "villageCode": "33592",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108072,6 +129719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MADANG  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-ii",
+      "villageCode": "33597",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108112,6 +129767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NALDOBA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-ii",
+      "villageCode": "33597",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108152,6 +129815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHANUBHANGA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-ii",
+      "villageCode": "33597",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108192,6 +129863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Naldoba PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-ii",
+      "villageCode": "33597",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108232,6 +129911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Madang PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-ii",
+      "villageCode": "33597",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108272,6 +129959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAKHARAPARA GULIAMPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-iii",
+      "villageCode": "33596",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108312,6 +130007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GOREMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-iii",
+      "villageCode": "33596",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108352,6 +130055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MADANG PT III PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-iii",
+      "villageCode": "33596",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108392,6 +130103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Madang Pt-III PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-iii",
+      "villageCode": "33596",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108432,6 +130151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DAKUAKATA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Madang Pt-iii",
+      "villageCode": "33596",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108472,6 +130199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILDUBI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-i",
+      "villageCode": "33591",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108512,6 +130247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Goremari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-i",
+      "villageCode": "33591",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108552,6 +130295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BALBOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-ii",
+      "villageCode": "33593",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108592,6 +130343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHESAJHARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-ii",
+      "villageCode": "33593",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108632,6 +130391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chechajhara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-ii",
+      "villageCode": "33593",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108672,6 +130439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILDUBI PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-ii",
+      "villageCode": "33593",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108712,6 +130487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SILDUBI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saldubi Pt-ii",
+      "villageCode": "33593",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108752,6 +130535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DEUSILA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22471",
+      "panchayatname": "Dhanubhanga",
+      "villageName": "Saljhar Block",
+      "villageCode": "627224",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108792,6 +130583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KALITAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Ambari Pt-iv",
+      "villageCode": "33604",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108832,6 +130631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHASIBORI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Ambari Pt-iv",
+      "villageCode": "33604",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108872,6 +130679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BANIAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dhupdhara Pt-i",
+      "villageCode": "33581",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108912,6 +130727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHUPDHARA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dhupdhara Pt-i",
+      "villageCode": "33581",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108952,6 +130775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DHUPDHARA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dhupdhara Pt-ii",
+      "villageCode": "33574",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -108992,6 +130823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dhupdhara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dhupdhara Pt-ii",
+      "villageCode": "33574",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109032,6 +130871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "HASARIBORI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dhupdhara Pt-ii",
+      "villageCode": "33574",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109072,6 +130919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DHUPDHARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dhupdhara Pt-ii",
+      "villageCode": "33574",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109112,6 +130967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIGHALI I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dighali Pt-i",
+      "villageCode": "33577",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109152,6 +131015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DIGHELI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dighali Pt-i",
+      "villageCode": "33577",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109192,6 +131063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIGHALI II (DHUPDHARA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dighali Pt-ii",
+      "villageCode": "33578",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109232,6 +131111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DIGHALI II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dighali Pt-ii",
+      "villageCode": "33578",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109272,6 +131159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dighali Pt-III PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Dighali Pt-iii",
+      "villageCode": "33576",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109312,6 +131207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bagdoba PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-i",
+      "villageCode": "33579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109352,6 +131255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAGDOBA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-i",
+      "villageCode": "33579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109392,6 +131303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGIPARA I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-i",
+      "villageCode": "33579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109432,6 +131351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of JOGIPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-i",
+      "villageCode": "33579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109472,6 +131399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Oxybari PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-i",
+      "villageCode": "33579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109512,6 +131447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGIPARA II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-i",
+      "villageCode": "33579",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109552,6 +131495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JOGIPARA III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Jogipara Pt-iii",
+      "villageCode": "627214",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109592,6 +131543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MASLAM PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Maslam Pt-ii",
+      "villageCode": "33580",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109632,6 +131591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ULMAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Maslam Pt-ii",
+      "villageCode": "33580",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109672,6 +131639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PIPLIBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22469",
+      "panchayatname": "Dhupdhara",
+      "villageName": "Piplibari",
+      "villageCode": "627223",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109712,6 +131687,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kahibari Alibari PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Allibari",
+      "villageCode": "33526",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109752,6 +131735,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKJULI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Bhalukjuli",
+      "villageCode": "33525",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109792,6 +131783,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHALUKJULI BUDLUNG PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Bhalukjuli",
+      "villageCode": "33525",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109832,6 +131831,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Budlung Chanchalipara PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Budlung Chanchali Para",
+      "villageCode": "33529",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109872,6 +131879,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Budlung Pahar PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Budlung Pahar",
+      "villageCode": "650758",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109912,6 +131927,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHATABARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Chatabari",
+      "villageCode": "33532",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109952,6 +131975,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIKIAJULI GHAGRA MAWAMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Ghagra Saljhar",
+      "villageCode": "625698",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -109992,6 +132023,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kahibari Garopara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Kahibari Garopara",
+      "villageCode": "625699",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110032,6 +132071,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SIKIAJULI KAHIBARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Kahibari Garopara",
+      "villageCode": "625699",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110072,6 +132119,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Sikiajuli Kahibari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Kahibari Garopara",
+      "villageCode": "625699",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110112,6 +132167,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANKATA PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Kankata Pt-ii",
+      "villageCode": "33566",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110152,6 +132215,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KANYAKUCHI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Kanyakuchi",
+      "villageCode": "33530",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110192,6 +132263,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kanyakuchi PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Kanyakuchi",
+      "villageCode": "33530",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110232,6 +132311,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KUHIARBARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Sikajuli Kuhiarbari",
+      "villageCode": "33522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110272,6 +132359,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kuhiarbari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Sikajuli Kuhiarbari",
+      "villageCode": "33522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110312,6 +132407,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIKIAJULI KUHIARBARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Sikajuli Kuhiarbari",
+      "villageCode": "33522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110352,6 +132455,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "NIDANPUR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Sikajuli Kuhiarbari",
+      "villageCode": "33522",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110392,6 +132503,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Simlitola Tea Estate PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Simlitola T.e.",
+      "villageCode": "33524",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110432,6 +132551,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIMLITOLA SAH BAGAN MPWSS (LABOUR COLONY WEST)(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "KAHIBARI",
+      "villageName": "SIMLITOLA T.E.",
+      "villageCode": "33524",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110472,6 +132599,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SIMLITOLA TEA ESTATE PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22465",
+      "panchayatname": "Kahibari",
+      "villageName": "Simlitola T.e.",
+      "villageCode": "33524",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110512,6 +132647,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BHAKATPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "KHUTABARI",
+      "villageName": "BARDAL  PT-I",
+      "villageCode": "33590",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110552,6 +132695,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BARDAL PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "KHUTABARI",
+      "villageName": "BARDAL  PT-I",
+      "villageCode": "33590",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110592,6 +132743,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BATHRUSAN (BAKSABARI BAMUNPARA)PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Chaplai Pt-i",
+      "villageCode": "33589",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110632,6 +132791,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of  CHAPLAI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Chaplai Pt-i",
+      "villageCode": "33589",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110672,6 +132839,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chaplai PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Chaplai Pt-i",
+      "villageCode": "33589",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110712,6 +132887,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of DOLAGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Chaplai Pt-ii",
+      "villageCode": "33584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110752,6 +132935,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHAPLAI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Chaplai Pt-ii",
+      "villageCode": "33584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110792,6 +132983,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dolagaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Chaplai Pt-ii",
+      "villageCode": "33584",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110832,6 +133031,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GHILABORI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Ghilabari",
+      "villageCode": "650807",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110872,6 +133079,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BALASARA 1 PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110912,6 +133127,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Balasara-  1 PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110952,6 +133175,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Laudoba PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -110992,6 +133223,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RANGAJAN PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111032,6 +133271,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of LAUDOBA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111072,6 +133319,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Khutabari  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111112,6 +133367,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of MATIHOLA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111152,6 +133415,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rongajan PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-i",
+      "villageCode": "33585",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111192,6 +133463,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHUTABARI PT II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-ii",
+      "villageCode": "33587",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111232,6 +133511,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHUTABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-iii",
+      "villageCode": "33588",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111272,6 +133559,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of NADIRPAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-iii",
+      "villageCode": "33588",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111312,6 +133607,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAURIDUBI TELIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-iv",
+      "villageCode": "33582",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111352,6 +133655,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KHUTABARI PT V PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22470",
+      "panchayatname": "Khutabari",
+      "villageName": "Khutabari Pt-v",
+      "villageCode": "33586",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111392,6 +133703,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of AMBUK PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Ambuk Pt-i",
+      "villageCode": "33610",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111432,6 +133751,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ambuk Hakojuli PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Ambuk Pt-ii",
+      "villageCode": "650802",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111472,6 +133799,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "AMBUK PT-I (KOTHALMURI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Ambuk Pt-iii",
+      "villageCode": "33613",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111512,6 +133847,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Ambuk PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Ambuk Pt-iii",
+      "villageCode": "33613",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111552,6 +133895,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of ATHIABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Bardamal Athiabari",
+      "villageCode": "33609",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111592,6 +133943,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BARDAMAL PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Bardamal Athiabari",
+      "villageCode": "33609",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111632,6 +133991,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ATHIABARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Bardamal Athiabari",
+      "villageCode": "33609",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111672,6 +134039,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Chekowari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Chekowari Pt-i",
+      "villageCode": "33618",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111712,6 +134087,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHEKOWARI PWSS (NEW) (Kothakuthi)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Chekowari Pt-i",
+      "villageCode": "33618",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111752,6 +134135,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHEKOWARI PT-III (BAKHRAPARA) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Chekowari Pt-ii",
+      "villageCode": "650803",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111792,6 +134183,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of CHEKOWARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Chekowari Pt-ii",
+      "villageCode": "650803",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111832,6 +134231,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHEKOWARI PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Chekowari Pt-iii",
+      "villageCode": "650804",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111872,6 +134279,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHEKOWARI PT-II PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Chekowari Pt-iii",
+      "villageCode": "650804",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111912,6 +134327,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DUMAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Dumapara Pt-i",
+      "villageCode": "33616",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111952,6 +134375,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAKRAKHUTI PWSS (SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-i",
+      "villageCode": "33612",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -111992,6 +134423,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kothakuthi PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-i",
+      "villageCode": "33612",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112032,6 +134471,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kothakuthi Pt-I PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-i",
+      "villageCode": "33612",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112072,6 +134519,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kurihamari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-ii",
+      "villageCode": "33615",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112112,6 +134567,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KOTHKUTHI PT-III PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-iii",
+      "villageCode": "33614",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112152,6 +134615,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "CHOUDHURIPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-iv",
+      "villageCode": "627216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112192,6 +134663,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of SHYAMAGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Kathakuthi Pt-iv",
+      "villageCode": "627216",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112232,6 +134711,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MASLOM PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Maslam Pt-i",
+      "villageCode": "33617",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112272,6 +134759,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Shyamagaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22473",
+      "panchayatname": "Kothakuthi",
+      "villageName": "Shyama Gaon Pt-i",
+      "villageCode": "33611",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112312,6 +134807,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adopara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Adopara",
+      "villageCode": "33553",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112352,6 +134855,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of ADOPARA SARDARPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Adopara",
+      "villageCode": "33553",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112392,6 +134903,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BADIARPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Badiarpara",
+      "villageCode": "33554",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112432,6 +134951,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Badiarpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Badiarpara",
+      "villageCode": "33554",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112472,6 +134999,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "JALDHAPARA BADIARPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Badiarpara",
+      "villageCode": "33554",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112512,6 +135047,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakrapara 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Bakrapara Pt-i",
+      "villageCode": "33547",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112552,6 +135095,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BAKHRAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Bakrapara Pt-i",
+      "villageCode": "33547",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112592,6 +135143,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bakhrapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Bakrapara Pt-ii",
+      "villageCode": "33549",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112632,6 +135191,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GAROPARA BAKRAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Bakrapara Pt-ii",
+      "villageCode": "33549",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112672,6 +135239,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BHAMRAPATHAR PWSS (SWAJAL)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Hadipara Bhamra Pathar",
+      "villageCode": "33533",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112712,6 +135287,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Hadipara Garopara PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Hadipara Bhamra Pathar",
+      "villageCode": "33533",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112752,6 +135335,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rawmari PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Hadipara Bhamra Pathar",
+      "villageCode": "33533",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112792,6 +135383,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kayasthapara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Kayashthapara",
+      "villageCode": "33548",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112832,6 +135431,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KAYASTHAPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Kayashthapara",
+      "villageCode": "33548",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112872,6 +135479,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RANGJULI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Mahajanpara",
+      "villageCode": "33545",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112912,6 +135527,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Rangjuli PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Mahajanpara",
+      "villageCode": "33545",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112952,6 +135575,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "MAJPARA KHAMAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Majpara Khamar",
+      "villageCode": "33542",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -112992,6 +135623,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SARAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Panditpara",
+      "villageCode": "33546",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113032,6 +135671,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GAROPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Rongjuli Garopara",
+      "villageCode": "33551",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113072,6 +135719,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Garopara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Rongjuli Garopara",
+      "villageCode": "33551",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113112,6 +135767,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "LASKARPARA (RANGJULI) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Rongjuli Garopara",
+      "villageCode": "33551",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113152,6 +135815,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "PENCHIMARI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Rowmari Pt-i",
+      "villageCode": "33539",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113192,6 +135863,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of RAWMARI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Rowmari Pt-i",
+      "villageCode": "33539",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113232,6 +135911,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Adopara Sardarpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22466",
+      "panchayatname": "Rangjuli",
+      "villageName": "Sardarpara",
+      "villageCode": "33552",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113272,6 +135959,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barbari No. 2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Barbari",
+      "villageCode": "33571",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113312,6 +136007,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BORBORI PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Domnapara Pt-i",
+      "villageCode": "33570",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113352,6 +136055,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "DOMNAPARA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Domnapara Pt-i",
+      "villageCode": "33570",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113392,6 +136103,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GERUA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Gerua",
+      "villageCode": "33569",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113432,6 +136151,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GERUA NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Gerua",
+      "villageCode": "33569",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113472,6 +136199,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAMAR POTA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kamar Pota",
+      "villageCode": "33568",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113512,6 +136247,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of KAMARPUTA  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kamar Pota",
+      "villageCode": "33568",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113552,6 +136295,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KAMAR POTA NO.2 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kamar Pota",
+      "villageCode": "33568",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113592,6 +136343,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANKATA PT-I PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kankata Pt-i",
+      "villageCode": "33565",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113632,6 +136391,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANKATA PT-I (NO 2) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kankata Pt-i",
+      "villageCode": "33565",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113672,6 +136439,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANKATA PT-I (NO 4) PWSS (New)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kankata Pt-i",
+      "villageCode": "33565",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113712,6 +136487,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "KANKATA PT-I (No 3) PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kankata Pt-i",
+      "villageCode": "33565",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113752,6 +136535,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Fakirpara Pukhuripara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kuchdhowa Chechapani Pt-ii",
+      "villageCode": "33260",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113792,6 +136583,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Kuchdhowa Chesapani Pt II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Kuchdhowa Chechapani Pt-ii",
+      "villageCode": "33260",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113832,6 +136631,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIMLITOLA NO.4 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Simlitola",
+      "villageCode": "33567",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113872,6 +136679,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIMLITOLA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Simlitola",
+      "villageCode": "33567",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113912,6 +136727,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIMLITOLA NO.3 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Simlitola",
+      "villageCode": "33567",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113952,6 +136775,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "SIMLITOLA No.2 PWSS(NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22468",
+      "panchayatname": "Simlitola",
+      "villageName": "Simlitola",
+      "villageCode": "33567",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -113992,6 +136823,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BAMUNIGAON PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Bamuni Gaon Pt-i",
+      "villageCode": "33564",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114032,6 +136871,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TPLAI PT II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Bamuni Gaon Pt-ii",
+      "villageCode": "33563",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114072,6 +136919,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Patpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Bamuni Gaon Pt-ii",
+      "villageCode": "33563",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114112,6 +136967,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BANGAON PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Bangaon",
+      "villageCode": "33562",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114152,6 +137015,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Bangaon PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Bangaon",
+      "villageCode": "33562",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114192,6 +137063,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "GURUCHATKA 1 PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Garuchatka",
+      "villageCode": "33559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114232,6 +137111,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of GARUCHUTKA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Garuchatka",
+      "villageCode": "33559",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114272,6 +137159,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "ENGLISH BAZAR PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Patpara Pt-i",
+      "villageCode": "33561",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114312,6 +137207,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of PATPARA PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Patpara Pt-i",
+      "villageCode": "33561",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114352,6 +137255,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "TIPLAI PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-i",
+      "villageCode": "33556",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114392,6 +137303,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "BORDOBA PWSS (NEW)",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-i",
+      "villageCode": "33556",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114432,6 +137351,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Barpathar PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-i",
+      "villageCode": "33556",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114472,6 +137399,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of BARPATHAR PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-i",
+      "villageCode": "33556",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114512,6 +137447,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Dighalibori  PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-ii",
+      "villageCode": "33558",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114552,6 +137495,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tiplai PT-II PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-ii",
+      "villageCode": "33558",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114592,6 +137543,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tiplai Bhakatpara PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tiplai Pt-ii",
+      "villageCode": "33558",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114632,6 +137591,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Tiplai Pt I PWSS",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tipli Pt-iii",
+      "villageCode": "33557",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",
@@ -114672,46 +137639,14 @@
         "Mon - Fri": "9.00 AM - 6.00 PM"
       },
       "address": "Retrofitting of TIPLAI BHAKATPARA PWSS",
-      "pincode": [],
-      "contactNumber": "",
-      "pdfHeader": "",
-      "pdfContactDetails": ""
-    },
-    {
-      "code": "as.testing",
-      "name": "testing",
-      "description": "testing",
-      "logoId": "",
-      "imageId": null,
-      "domainUrl": "",
-      "city": {
-        "name": "testing",
-        "localName": "testing",
-        "districtCode": "204",
-        "districtName": "Shivamogga",
-        "blockcode": "2595",
-        "blockname": "Soraba",
-        "panchayatcode": "63625",
-        "panchayatname": "Udri",
-        "ulbGrade": "",
-        "longitude": null,
-        "latitude": null,
-        "captcha": null,
-        "shapeFileLocation": null,
-        "code": "testing",
-        "ddrName": "testing",
-        "projectId": "testing",
-        "regionName": "2595",
-        "villageName": "Bamun Panikhowa",
-        "villageCode": "33304"
-      },
-      "twitterUrl": null,
-      "facebookUrl": null,
-      "emailId": "",
-      "OfficeTimings": {
-        "Mon - Fri": "9.00 AM - 6.00 PM"
-      },
-      "address": "testing",
+      "districtCode": "44",
+      "districtName": "Goalpara",
+      "blockcode": "1191",
+      "blockname": "Rongjuli",
+      "panchayatcode": "22467",
+      "panchayatname": "Tiplai",
+      "villageName": "Tipli Pt-iii",
+      "villageCode": "33557",
       "pincode": [],
       "contactNumber": "",
       "pdfHeader": "",

From 5fd78a87eb0840cc29f05535c847b8dc2be3defa Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 15:51:29 +0530
Subject: [PATCH 10/23] Updated folder wise data from 50796 to 5547843

---
 data/as/1050454/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1429340/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1432067/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1439931/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1441030/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1450901/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1758972/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1759034/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1761428/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1763377/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1764917/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1769128/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1769703/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1770771/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1770808/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1771140/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1774472/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1774711/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1774890/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1775011/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1779266/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1783019/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1783754/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1784430/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1784527/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1784979/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1803054/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1812780/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1817138/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1817302/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1819835/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1830310/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1841150/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1842161/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1842244/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1842301/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       | 12 ++++++------
 data/as/1842378/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1842423/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1842653/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1842776/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1843088/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1843358/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1843430/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1844212/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1844228/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1844235/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1845373/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1845703/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1845765/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1845900/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1846063/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1846172/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1846500/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1846605/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1846743/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1852364/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1852774/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1852987/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1853306/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1853326/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1853350/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1853501/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1853696/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1854331/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1854436/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1858924/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1859895/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1860965/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1861320/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1861420/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1872281/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1872304/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1872337/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1936743/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937513/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937533/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937549/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937556/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937635/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937654/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937787/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937816/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937849/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937917/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937928/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937948/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1937960/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1941516/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1941535/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1941750/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1941769/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1941788/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1941850/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/1970469/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2404395/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2404401/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2404437/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2405228/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2406004/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2421895/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2421903/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2421911/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2421922/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2423434/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2426035/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2429111/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2433896/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2443383/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2480357/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2480363/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2484676/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2484678/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2486691/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2491893/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2495922/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2496124/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2496136/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2497758/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2515923/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2515942/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2515998/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516005/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516013/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516019/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516135/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516159/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516189/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516326/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516787/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516881/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2516940/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2517189/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2517201/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2517213/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2517242/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2517248/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2517256/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2520036/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2520181/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2581909/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2582386/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2582460/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/2615100/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3164535/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3319750/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3321276/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3321879/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3327425/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3328455/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3328647/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3328767/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3328873/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3333586/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3359758/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3370880/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3372158/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3373443/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3374529/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3375170/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3375765/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3378587/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3384885/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3384921/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3385844/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3385946/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3385982/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386123/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386146/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386204/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386236/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386289/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386322/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386356/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386386/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386407/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386435/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386445/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386466/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386515/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386526/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386540/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386544/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386664/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3386695/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/3800160/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4516012/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4516046/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4516419/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/452628/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/452685/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/452697/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/453185/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/454276/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/455214/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/455219/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/455220/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/455374/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4566832/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567143/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567157/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567167/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567203/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567253/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567258/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567264/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4567271/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4627074/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4627137/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4637354/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4637711/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4637724/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4637728/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4638859/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4639802/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4639900/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4639926/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4639994/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4640433/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4640480/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4642317/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4642337/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4651600/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4652293/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4653590/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4654670/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4655460/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4655542/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4655617/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4656070/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4656202/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4656990/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4657126/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4657150/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4657189/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4657198/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4657250/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4658923/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4658962/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4659024/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4659210/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4668398/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4869442/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4870166/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4870229/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4870250/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4870307/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872574/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872595/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872646/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872699/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872806/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872849/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4872988/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873102/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873166/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873607/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873634/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873695/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873715/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873739/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873771/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873867/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4873898/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4887720/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4887740/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4887755/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4887898/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4887947/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4888080/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4888114/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4888263/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4888294/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492155/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492158/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492161/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492165/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492168/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492177/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/492182/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/4963515/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5072706/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5072752/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5072807/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5072821/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5072838/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5072844/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5073321/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5073330/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5073372/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5073861/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5073879/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5073951/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5074126/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5074129/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5074133/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/50796/ws-services-calculation/Penalty.json   |  2 +-
 .../50796/ws-services-calculation/WCBillingSlab.json |  4 ++--
 data/as/5102401/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5102996/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5103007/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/51526/ws-services-calculation/Penalty.json   |  2 +-
 .../51526/ws-services-calculation/WCBillingSlab.json |  4 ++--
 data/as/51536/ws-services-calculation/Penalty.json   |  2 +-
 .../51536/ws-services-calculation/WCBillingSlab.json |  4 ++--
 data/as/5182812/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5183548/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5183964/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5184373/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185351/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185356/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185535/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185541/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185549/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185556/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185570/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185575/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185587/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185591/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185615/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185635/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185650/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185655/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185659/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185665/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185685/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185693/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185707/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185717/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5185887/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186387/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186420/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186446/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186457/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186463/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186493/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186499/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186506/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5186513/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5206914/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5230312/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5230346/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5230398/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/52793/ws-services-calculation/Penalty.json   |  2 +-
 .../52793/ws-services-calculation/WCBillingSlab.json |  4 ++--
 data/as/5344027/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5349626/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5349656/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5349682/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5357091/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5362300/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5362332/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5379654/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5379810/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5404892/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5404904/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5404932/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5407809/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5407828/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5407846/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5407857/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408096/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408108/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408187/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408224/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408248/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408300/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408316/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408332/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408704/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408793/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408854/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5408891/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5464190/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5464241/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5464278/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5464342/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5464413/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5464439/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5475220/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5519133/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5519203/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5523260/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5527478/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5528384/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5531603/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5532932/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5533989/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5534043/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5534657/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5544794/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5547805/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5547815/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5547824/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5547832/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/5547843/ws-services-calculation/Penalty.json |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/600587/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/603120/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/603277/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/603538/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/729083/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/729086/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/874344/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/877925/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 data/as/877934/ws-services-calculation/Penalty.json  |  2 +-
 .../ws-services-calculation/WCBillingSlab.json       |  4 ++--
 800 files changed, 1204 insertions(+), 1204 deletions(-)

diff --git a/data/as/1050454/ws-services-calculation/Penalty.json b/data/as/1050454/ws-services-calculation/Penalty.json
index 3f0408eda7..ed0db5ab57 100644
--- a/data/as/1050454/ws-services-calculation/Penalty.json
+++ b/data/as/1050454/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1050454/ws-services-calculation/WCBillingSlab.json b/data/as/1050454/ws-services-calculation/WCBillingSlab.json
index 2d717a95ba..68ddfefb1c 100644
--- a/data/as/1050454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1050454/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1429340/ws-services-calculation/Penalty.json b/data/as/1429340/ws-services-calculation/Penalty.json
index a288c93935..1c070a2672 100644
--- a/data/as/1429340/ws-services-calculation/Penalty.json
+++ b/data/as/1429340/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1429340/ws-services-calculation/WCBillingSlab.json b/data/as/1429340/ws-services-calculation/WCBillingSlab.json
index a154976e9f..091f6891ac 100644
--- a/data/as/1429340/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1429340/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1432067/ws-services-calculation/Penalty.json b/data/as/1432067/ws-services-calculation/Penalty.json
index 9cb1e9c2ee..d68749136c 100644
--- a/data/as/1432067/ws-services-calculation/Penalty.json
+++ b/data/as/1432067/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1432067/ws-services-calculation/WCBillingSlab.json b/data/as/1432067/ws-services-calculation/WCBillingSlab.json
index 1ec4fa381b..0bc6f75581 100644
--- a/data/as/1432067/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1432067/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1439931/ws-services-calculation/Penalty.json b/data/as/1439931/ws-services-calculation/Penalty.json
index b8d0544b8b..52468efafa 100644
--- a/data/as/1439931/ws-services-calculation/Penalty.json
+++ b/data/as/1439931/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1439931/ws-services-calculation/WCBillingSlab.json b/data/as/1439931/ws-services-calculation/WCBillingSlab.json
index 5b38c9c8ea..3d72ed099b 100644
--- a/data/as/1439931/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1439931/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1441030/ws-services-calculation/Penalty.json b/data/as/1441030/ws-services-calculation/Penalty.json
index f84b869922..a4de09b249 100644
--- a/data/as/1441030/ws-services-calculation/Penalty.json
+++ b/data/as/1441030/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1441030/ws-services-calculation/WCBillingSlab.json b/data/as/1441030/ws-services-calculation/WCBillingSlab.json
index bcfd9108d5..2689d67045 100644
--- a/data/as/1441030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1441030/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1450901/ws-services-calculation/Penalty.json b/data/as/1450901/ws-services-calculation/Penalty.json
index 9c015d895d..4911ca0fd9 100644
--- a/data/as/1450901/ws-services-calculation/Penalty.json
+++ b/data/as/1450901/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1450901/ws-services-calculation/WCBillingSlab.json b/data/as/1450901/ws-services-calculation/WCBillingSlab.json
index 7399c9077f..83effe8d9b 100644
--- a/data/as/1450901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1450901/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1758972/ws-services-calculation/Penalty.json b/data/as/1758972/ws-services-calculation/Penalty.json
index 3de597b000..f97d956080 100644
--- a/data/as/1758972/ws-services-calculation/Penalty.json
+++ b/data/as/1758972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1758972/ws-services-calculation/WCBillingSlab.json b/data/as/1758972/ws-services-calculation/WCBillingSlab.json
index 3c9139eae4..e9da285dfa 100644
--- a/data/as/1758972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1758972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1759034/ws-services-calculation/Penalty.json b/data/as/1759034/ws-services-calculation/Penalty.json
index 0b5c57e662..b6320dfe3f 100644
--- a/data/as/1759034/ws-services-calculation/Penalty.json
+++ b/data/as/1759034/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1759034/ws-services-calculation/WCBillingSlab.json b/data/as/1759034/ws-services-calculation/WCBillingSlab.json
index e26dfa9edb..70acc0a531 100644
--- a/data/as/1759034/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1759034/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1761428/ws-services-calculation/Penalty.json b/data/as/1761428/ws-services-calculation/Penalty.json
index f5519ff180..569bc93545 100644
--- a/data/as/1761428/ws-services-calculation/Penalty.json
+++ b/data/as/1761428/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1761428/ws-services-calculation/WCBillingSlab.json b/data/as/1761428/ws-services-calculation/WCBillingSlab.json
index df5ece2d08..25b0371ddc 100644
--- a/data/as/1761428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1761428/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1763377/ws-services-calculation/Penalty.json b/data/as/1763377/ws-services-calculation/Penalty.json
index 85bbf57bb8..0fa197d390 100644
--- a/data/as/1763377/ws-services-calculation/Penalty.json
+++ b/data/as/1763377/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1763377/ws-services-calculation/WCBillingSlab.json b/data/as/1763377/ws-services-calculation/WCBillingSlab.json
index 4b2c13690d..25738c86d4 100644
--- a/data/as/1763377/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1763377/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1764917/ws-services-calculation/Penalty.json b/data/as/1764917/ws-services-calculation/Penalty.json
index 4f2d71ae38..b3f5ef8f1c 100644
--- a/data/as/1764917/ws-services-calculation/Penalty.json
+++ b/data/as/1764917/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1764917/ws-services-calculation/WCBillingSlab.json b/data/as/1764917/ws-services-calculation/WCBillingSlab.json
index 25c1cb4e9b..1324e107e1 100644
--- a/data/as/1764917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1764917/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1769128/ws-services-calculation/Penalty.json b/data/as/1769128/ws-services-calculation/Penalty.json
index 15f4649d65..4d3abe9cc9 100644
--- a/data/as/1769128/ws-services-calculation/Penalty.json
+++ b/data/as/1769128/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1769128/ws-services-calculation/WCBillingSlab.json b/data/as/1769128/ws-services-calculation/WCBillingSlab.json
index ec7e8af21c..a9c1e6997c 100644
--- a/data/as/1769128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1769128/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1769703/ws-services-calculation/Penalty.json b/data/as/1769703/ws-services-calculation/Penalty.json
index 18c62240d3..89a6cd183b 100644
--- a/data/as/1769703/ws-services-calculation/Penalty.json
+++ b/data/as/1769703/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1769703/ws-services-calculation/WCBillingSlab.json b/data/as/1769703/ws-services-calculation/WCBillingSlab.json
index ac8d4ddab6..20a4593eca 100644
--- a/data/as/1769703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1769703/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1770771/ws-services-calculation/Penalty.json b/data/as/1770771/ws-services-calculation/Penalty.json
index 7ce8bb9a38..19b02f5ac7 100644
--- a/data/as/1770771/ws-services-calculation/Penalty.json
+++ b/data/as/1770771/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1770771/ws-services-calculation/WCBillingSlab.json b/data/as/1770771/ws-services-calculation/WCBillingSlab.json
index 00947ad61e..8f00ad23fe 100644
--- a/data/as/1770771/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1770771/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1770808/ws-services-calculation/Penalty.json b/data/as/1770808/ws-services-calculation/Penalty.json
index d72b171c2f..5e599dc678 100644
--- a/data/as/1770808/ws-services-calculation/Penalty.json
+++ b/data/as/1770808/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1770808/ws-services-calculation/WCBillingSlab.json b/data/as/1770808/ws-services-calculation/WCBillingSlab.json
index 0467e5bbdd..b77efb0c24 100644
--- a/data/as/1770808/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1770808/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1771140/ws-services-calculation/Penalty.json b/data/as/1771140/ws-services-calculation/Penalty.json
index b92bc420de..86def1fdd1 100644
--- a/data/as/1771140/ws-services-calculation/Penalty.json
+++ b/data/as/1771140/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1771140/ws-services-calculation/WCBillingSlab.json b/data/as/1771140/ws-services-calculation/WCBillingSlab.json
index c06c0f39f0..3c8a09bd00 100644
--- a/data/as/1771140/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1771140/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1774472/ws-services-calculation/Penalty.json b/data/as/1774472/ws-services-calculation/Penalty.json
index fe4a8c1f46..d58af5ae56 100644
--- a/data/as/1774472/ws-services-calculation/Penalty.json
+++ b/data/as/1774472/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1774472/ws-services-calculation/WCBillingSlab.json b/data/as/1774472/ws-services-calculation/WCBillingSlab.json
index c6250ed6a2..2434e820b4 100644
--- a/data/as/1774472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1774472/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1774711/ws-services-calculation/Penalty.json b/data/as/1774711/ws-services-calculation/Penalty.json
index c1a2db7ac7..611e6c25e3 100644
--- a/data/as/1774711/ws-services-calculation/Penalty.json
+++ b/data/as/1774711/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1774711/ws-services-calculation/WCBillingSlab.json b/data/as/1774711/ws-services-calculation/WCBillingSlab.json
index 4a0a40019d..7efd7faeb7 100644
--- a/data/as/1774711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1774711/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1774890/ws-services-calculation/Penalty.json b/data/as/1774890/ws-services-calculation/Penalty.json
index 261e0dd75c..4e45f39f2b 100644
--- a/data/as/1774890/ws-services-calculation/Penalty.json
+++ b/data/as/1774890/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1774890/ws-services-calculation/WCBillingSlab.json b/data/as/1774890/ws-services-calculation/WCBillingSlab.json
index a2c5de80ce..73204fd142 100644
--- a/data/as/1774890/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1774890/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1775011/ws-services-calculation/Penalty.json b/data/as/1775011/ws-services-calculation/Penalty.json
index 83f0b6399b..3bebd321ea 100644
--- a/data/as/1775011/ws-services-calculation/Penalty.json
+++ b/data/as/1775011/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1775011/ws-services-calculation/WCBillingSlab.json b/data/as/1775011/ws-services-calculation/WCBillingSlab.json
index b022a3ec7b..8a5813bd66 100644
--- a/data/as/1775011/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1775011/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1779266/ws-services-calculation/Penalty.json b/data/as/1779266/ws-services-calculation/Penalty.json
index 2f7e075ed3..84b26ecdb7 100644
--- a/data/as/1779266/ws-services-calculation/Penalty.json
+++ b/data/as/1779266/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1779266/ws-services-calculation/WCBillingSlab.json b/data/as/1779266/ws-services-calculation/WCBillingSlab.json
index 3717ea5da3..1e663a0c1b 100644
--- a/data/as/1779266/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1779266/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1783019/ws-services-calculation/Penalty.json b/data/as/1783019/ws-services-calculation/Penalty.json
index fcda8dd1ef..18f686d6d0 100644
--- a/data/as/1783019/ws-services-calculation/Penalty.json
+++ b/data/as/1783019/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1783019/ws-services-calculation/WCBillingSlab.json b/data/as/1783019/ws-services-calculation/WCBillingSlab.json
index 2fd44ca10b..ce07ea17ae 100644
--- a/data/as/1783019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1783019/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1783754/ws-services-calculation/Penalty.json b/data/as/1783754/ws-services-calculation/Penalty.json
index c39ca90cf3..ca9cd2382d 100644
--- a/data/as/1783754/ws-services-calculation/Penalty.json
+++ b/data/as/1783754/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1783754/ws-services-calculation/WCBillingSlab.json b/data/as/1783754/ws-services-calculation/WCBillingSlab.json
index 8ed2dfb2e8..f7fdf99e1c 100644
--- a/data/as/1783754/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1783754/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1784430/ws-services-calculation/Penalty.json b/data/as/1784430/ws-services-calculation/Penalty.json
index 1e56d81cad..bc5db00aa9 100644
--- a/data/as/1784430/ws-services-calculation/Penalty.json
+++ b/data/as/1784430/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1784430/ws-services-calculation/WCBillingSlab.json b/data/as/1784430/ws-services-calculation/WCBillingSlab.json
index 1d0d5182f0..1a3dddb6a7 100644
--- a/data/as/1784430/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1784430/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1784527/ws-services-calculation/Penalty.json b/data/as/1784527/ws-services-calculation/Penalty.json
index 776de7c8e8..b4f74b68b3 100644
--- a/data/as/1784527/ws-services-calculation/Penalty.json
+++ b/data/as/1784527/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1784527/ws-services-calculation/WCBillingSlab.json b/data/as/1784527/ws-services-calculation/WCBillingSlab.json
index 348b903349..0734fbbb17 100644
--- a/data/as/1784527/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1784527/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1784979/ws-services-calculation/Penalty.json b/data/as/1784979/ws-services-calculation/Penalty.json
index 4fcc293b8e..345e00faa1 100644
--- a/data/as/1784979/ws-services-calculation/Penalty.json
+++ b/data/as/1784979/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1784979/ws-services-calculation/WCBillingSlab.json b/data/as/1784979/ws-services-calculation/WCBillingSlab.json
index c7a70e19fb..ce2b54a232 100644
--- a/data/as/1784979/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1784979/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1803054/ws-services-calculation/Penalty.json b/data/as/1803054/ws-services-calculation/Penalty.json
index c9deb708ec..0a45877826 100644
--- a/data/as/1803054/ws-services-calculation/Penalty.json
+++ b/data/as/1803054/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1803054/ws-services-calculation/WCBillingSlab.json b/data/as/1803054/ws-services-calculation/WCBillingSlab.json
index 4dbe940e97..170c0bce43 100644
--- a/data/as/1803054/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1803054/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1812780/ws-services-calculation/Penalty.json b/data/as/1812780/ws-services-calculation/Penalty.json
index ad3c66e39b..dd94bbdd59 100644
--- a/data/as/1812780/ws-services-calculation/Penalty.json
+++ b/data/as/1812780/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1812780/ws-services-calculation/WCBillingSlab.json b/data/as/1812780/ws-services-calculation/WCBillingSlab.json
index 539f274474..e572da9fb2 100644
--- a/data/as/1812780/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1812780/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1817138/ws-services-calculation/Penalty.json b/data/as/1817138/ws-services-calculation/Penalty.json
index bae169932b..dc3f9a5d8a 100644
--- a/data/as/1817138/ws-services-calculation/Penalty.json
+++ b/data/as/1817138/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1817138/ws-services-calculation/WCBillingSlab.json b/data/as/1817138/ws-services-calculation/WCBillingSlab.json
index 935a6f9f25..e9c95339c6 100644
--- a/data/as/1817138/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1817138/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1817302/ws-services-calculation/Penalty.json b/data/as/1817302/ws-services-calculation/Penalty.json
index 5df00a4aca..fd862cb819 100644
--- a/data/as/1817302/ws-services-calculation/Penalty.json
+++ b/data/as/1817302/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1817302/ws-services-calculation/WCBillingSlab.json b/data/as/1817302/ws-services-calculation/WCBillingSlab.json
index 8ea4c342df..5717dfcbb0 100644
--- a/data/as/1817302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1817302/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1819835/ws-services-calculation/Penalty.json b/data/as/1819835/ws-services-calculation/Penalty.json
index 52da2796e7..efb24613df 100644
--- a/data/as/1819835/ws-services-calculation/Penalty.json
+++ b/data/as/1819835/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1819835/ws-services-calculation/WCBillingSlab.json b/data/as/1819835/ws-services-calculation/WCBillingSlab.json
index b2611c43c8..281f71be01 100644
--- a/data/as/1819835/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1819835/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1830310/ws-services-calculation/Penalty.json b/data/as/1830310/ws-services-calculation/Penalty.json
index 2e391ea899..23d6c1ffb8 100644
--- a/data/as/1830310/ws-services-calculation/Penalty.json
+++ b/data/as/1830310/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1830310/ws-services-calculation/WCBillingSlab.json b/data/as/1830310/ws-services-calculation/WCBillingSlab.json
index 193f3005af..d2109b3768 100644
--- a/data/as/1830310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1830310/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1841150/ws-services-calculation/Penalty.json b/data/as/1841150/ws-services-calculation/Penalty.json
index 0a5e469a1f..9faf0f4529 100644
--- a/data/as/1841150/ws-services-calculation/Penalty.json
+++ b/data/as/1841150/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1841150/ws-services-calculation/WCBillingSlab.json b/data/as/1841150/ws-services-calculation/WCBillingSlab.json
index 035b4e0523..7a825827e4 100644
--- a/data/as/1841150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1841150/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1842161/ws-services-calculation/Penalty.json b/data/as/1842161/ws-services-calculation/Penalty.json
index c17515adb5..3a6f9e39d6 100644
--- a/data/as/1842161/ws-services-calculation/Penalty.json
+++ b/data/as/1842161/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842161/ws-services-calculation/WCBillingSlab.json b/data/as/1842161/ws-services-calculation/WCBillingSlab.json
index 7191819976..59c16d94e0 100644
--- a/data/as/1842161/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842161/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1842244/ws-services-calculation/Penalty.json b/data/as/1842244/ws-services-calculation/Penalty.json
index 94401965a1..a2ed27fc4a 100644
--- a/data/as/1842244/ws-services-calculation/Penalty.json
+++ b/data/as/1842244/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842244/ws-services-calculation/WCBillingSlab.json b/data/as/1842244/ws-services-calculation/WCBillingSlab.json
index cb8c952d96..28113b3576 100644
--- a/data/as/1842244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842244/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1842301/ws-services-calculation/Penalty.json b/data/as/1842301/ws-services-calculation/Penalty.json
index 977409df6b..865cbc725b 100644
--- a/data/as/1842301/ws-services-calculation/Penalty.json
+++ b/data/as/1842301/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842301/ws-services-calculation/WCBillingSlab.json b/data/as/1842301/ws-services-calculation/WCBillingSlab.json
index dadee7dd94..3bb4f8f29d 100644
--- a/data/as/1842301/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842301/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 100.0
+            "minimumCharge": 0.0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842378/ws-services-calculation/Penalty.json b/data/as/1842378/ws-services-calculation/Penalty.json
index 208a624e9d..5587bd9d57 100644
--- a/data/as/1842378/ws-services-calculation/Penalty.json
+++ b/data/as/1842378/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842378/ws-services-calculation/WCBillingSlab.json b/data/as/1842378/ws-services-calculation/WCBillingSlab.json
index b724ae3bac..78971d9019 100644
--- a/data/as/1842378/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842378/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1842423/ws-services-calculation/Penalty.json b/data/as/1842423/ws-services-calculation/Penalty.json
index 32a521e15a..dc9c325de5 100644
--- a/data/as/1842423/ws-services-calculation/Penalty.json
+++ b/data/as/1842423/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842423/ws-services-calculation/WCBillingSlab.json b/data/as/1842423/ws-services-calculation/WCBillingSlab.json
index 52fca68b6b..08be916e61 100644
--- a/data/as/1842423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842423/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1842653/ws-services-calculation/Penalty.json b/data/as/1842653/ws-services-calculation/Penalty.json
index 1c2afd0c34..933e8ba121 100644
--- a/data/as/1842653/ws-services-calculation/Penalty.json
+++ b/data/as/1842653/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842653/ws-services-calculation/WCBillingSlab.json b/data/as/1842653/ws-services-calculation/WCBillingSlab.json
index e310ec6c12..a4a76635bd 100644
--- a/data/as/1842653/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842653/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1842776/ws-services-calculation/Penalty.json b/data/as/1842776/ws-services-calculation/Penalty.json
index e1354b59d0..d32e2816a3 100644
--- a/data/as/1842776/ws-services-calculation/Penalty.json
+++ b/data/as/1842776/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842776/ws-services-calculation/WCBillingSlab.json b/data/as/1842776/ws-services-calculation/WCBillingSlab.json
index 1b91e23a37..2068b9ce03 100644
--- a/data/as/1842776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842776/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1843088/ws-services-calculation/Penalty.json b/data/as/1843088/ws-services-calculation/Penalty.json
index 52809d1c6d..539c6d3acd 100644
--- a/data/as/1843088/ws-services-calculation/Penalty.json
+++ b/data/as/1843088/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1843088/ws-services-calculation/WCBillingSlab.json b/data/as/1843088/ws-services-calculation/WCBillingSlab.json
index 48ad81e3ed..7dc37559b9 100644
--- a/data/as/1843088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1843088/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1843358/ws-services-calculation/Penalty.json b/data/as/1843358/ws-services-calculation/Penalty.json
index 2536c19745..c57e1fb25c 100644
--- a/data/as/1843358/ws-services-calculation/Penalty.json
+++ b/data/as/1843358/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1843358/ws-services-calculation/WCBillingSlab.json b/data/as/1843358/ws-services-calculation/WCBillingSlab.json
index a1d08ae657..2dd2a37fbd 100644
--- a/data/as/1843358/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1843358/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1843430/ws-services-calculation/Penalty.json b/data/as/1843430/ws-services-calculation/Penalty.json
index 2f060a07d5..4c92dd330c 100644
--- a/data/as/1843430/ws-services-calculation/Penalty.json
+++ b/data/as/1843430/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1843430/ws-services-calculation/WCBillingSlab.json b/data/as/1843430/ws-services-calculation/WCBillingSlab.json
index 3e7fdfc900..b0bb063edd 100644
--- a/data/as/1843430/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1843430/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1844212/ws-services-calculation/Penalty.json b/data/as/1844212/ws-services-calculation/Penalty.json
index 4e4d6d0598..0b2deabbda 100644
--- a/data/as/1844212/ws-services-calculation/Penalty.json
+++ b/data/as/1844212/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1844212/ws-services-calculation/WCBillingSlab.json b/data/as/1844212/ws-services-calculation/WCBillingSlab.json
index e9b3ef7493..3b133cc330 100644
--- a/data/as/1844212/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1844212/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1844228/ws-services-calculation/Penalty.json b/data/as/1844228/ws-services-calculation/Penalty.json
index 89bc107ca8..58e40640a3 100644
--- a/data/as/1844228/ws-services-calculation/Penalty.json
+++ b/data/as/1844228/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1844228/ws-services-calculation/WCBillingSlab.json b/data/as/1844228/ws-services-calculation/WCBillingSlab.json
index d0970c53c7..8875252ef5 100644
--- a/data/as/1844228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1844228/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1844235/ws-services-calculation/Penalty.json b/data/as/1844235/ws-services-calculation/Penalty.json
index 2b089ebd6a..450495c2a4 100644
--- a/data/as/1844235/ws-services-calculation/Penalty.json
+++ b/data/as/1844235/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1844235/ws-services-calculation/WCBillingSlab.json b/data/as/1844235/ws-services-calculation/WCBillingSlab.json
index 62879b5907..f73ea92001 100644
--- a/data/as/1844235/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1844235/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1845373/ws-services-calculation/Penalty.json b/data/as/1845373/ws-services-calculation/Penalty.json
index 93115a38b5..0e8c3021bf 100644
--- a/data/as/1845373/ws-services-calculation/Penalty.json
+++ b/data/as/1845373/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845373/ws-services-calculation/WCBillingSlab.json b/data/as/1845373/ws-services-calculation/WCBillingSlab.json
index 170b8f8bc0..0a9ae6fe8c 100644
--- a/data/as/1845373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845373/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1845703/ws-services-calculation/Penalty.json b/data/as/1845703/ws-services-calculation/Penalty.json
index 3ea09a1512..b927e220c6 100644
--- a/data/as/1845703/ws-services-calculation/Penalty.json
+++ b/data/as/1845703/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845703/ws-services-calculation/WCBillingSlab.json b/data/as/1845703/ws-services-calculation/WCBillingSlab.json
index b256093d7d..f5bbc93099 100644
--- a/data/as/1845703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845703/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1845765/ws-services-calculation/Penalty.json b/data/as/1845765/ws-services-calculation/Penalty.json
index 9ae26625c4..5016a69b27 100644
--- a/data/as/1845765/ws-services-calculation/Penalty.json
+++ b/data/as/1845765/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845765/ws-services-calculation/WCBillingSlab.json b/data/as/1845765/ws-services-calculation/WCBillingSlab.json
index 0047d9e859..e30d97e110 100644
--- a/data/as/1845765/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845765/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1845900/ws-services-calculation/Penalty.json b/data/as/1845900/ws-services-calculation/Penalty.json
index cdb99db422..56380682a3 100644
--- a/data/as/1845900/ws-services-calculation/Penalty.json
+++ b/data/as/1845900/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845900/ws-services-calculation/WCBillingSlab.json b/data/as/1845900/ws-services-calculation/WCBillingSlab.json
index be0ed8baa2..bafac3f0b0 100644
--- a/data/as/1845900/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845900/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1846063/ws-services-calculation/Penalty.json b/data/as/1846063/ws-services-calculation/Penalty.json
index e5b2c9a7f1..1da82f1eff 100644
--- a/data/as/1846063/ws-services-calculation/Penalty.json
+++ b/data/as/1846063/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846063/ws-services-calculation/WCBillingSlab.json b/data/as/1846063/ws-services-calculation/WCBillingSlab.json
index 2a095db5c6..0752fc76f2 100644
--- a/data/as/1846063/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846063/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1846172/ws-services-calculation/Penalty.json b/data/as/1846172/ws-services-calculation/Penalty.json
index 8c384e26fd..7be614182e 100644
--- a/data/as/1846172/ws-services-calculation/Penalty.json
+++ b/data/as/1846172/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846172/ws-services-calculation/WCBillingSlab.json b/data/as/1846172/ws-services-calculation/WCBillingSlab.json
index 94a4294aea..b36e99a93b 100644
--- a/data/as/1846172/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846172/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1846500/ws-services-calculation/Penalty.json b/data/as/1846500/ws-services-calculation/Penalty.json
index 04345bc7a8..ebc23b3d89 100644
--- a/data/as/1846500/ws-services-calculation/Penalty.json
+++ b/data/as/1846500/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846500/ws-services-calculation/WCBillingSlab.json b/data/as/1846500/ws-services-calculation/WCBillingSlab.json
index 5a5f4d7657..3111fd3555 100644
--- a/data/as/1846500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846500/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1846605/ws-services-calculation/Penalty.json b/data/as/1846605/ws-services-calculation/Penalty.json
index 2e35dd5591..121577595b 100644
--- a/data/as/1846605/ws-services-calculation/Penalty.json
+++ b/data/as/1846605/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846605/ws-services-calculation/WCBillingSlab.json b/data/as/1846605/ws-services-calculation/WCBillingSlab.json
index fcdd7cd4b6..4fa1ea7b91 100644
--- a/data/as/1846605/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846605/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1846743/ws-services-calculation/Penalty.json b/data/as/1846743/ws-services-calculation/Penalty.json
index 440026ca92..b0458c2e57 100644
--- a/data/as/1846743/ws-services-calculation/Penalty.json
+++ b/data/as/1846743/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846743/ws-services-calculation/WCBillingSlab.json b/data/as/1846743/ws-services-calculation/WCBillingSlab.json
index d56beee6eb..431d656cb8 100644
--- a/data/as/1846743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846743/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1852364/ws-services-calculation/Penalty.json b/data/as/1852364/ws-services-calculation/Penalty.json
index 29a50a7814..f34a5c05b6 100644
--- a/data/as/1852364/ws-services-calculation/Penalty.json
+++ b/data/as/1852364/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1852364/ws-services-calculation/WCBillingSlab.json b/data/as/1852364/ws-services-calculation/WCBillingSlab.json
index c65de91014..e84ebe31d3 100644
--- a/data/as/1852364/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1852364/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1852774/ws-services-calculation/Penalty.json b/data/as/1852774/ws-services-calculation/Penalty.json
index 22f5a38a9f..6a7d246606 100644
--- a/data/as/1852774/ws-services-calculation/Penalty.json
+++ b/data/as/1852774/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1852774/ws-services-calculation/WCBillingSlab.json b/data/as/1852774/ws-services-calculation/WCBillingSlab.json
index 9529805645..0a9713ac00 100644
--- a/data/as/1852774/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1852774/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1852987/ws-services-calculation/Penalty.json b/data/as/1852987/ws-services-calculation/Penalty.json
index 00961df80a..5f2454ce3a 100644
--- a/data/as/1852987/ws-services-calculation/Penalty.json
+++ b/data/as/1852987/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1852987/ws-services-calculation/WCBillingSlab.json b/data/as/1852987/ws-services-calculation/WCBillingSlab.json
index bd692a624e..8d61bea731 100644
--- a/data/as/1852987/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1852987/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1853306/ws-services-calculation/Penalty.json b/data/as/1853306/ws-services-calculation/Penalty.json
index 4bb6bf7430..5fe494ac07 100644
--- a/data/as/1853306/ws-services-calculation/Penalty.json
+++ b/data/as/1853306/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853306/ws-services-calculation/WCBillingSlab.json b/data/as/1853306/ws-services-calculation/WCBillingSlab.json
index a70ddccd86..3e5bf71085 100644
--- a/data/as/1853306/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853306/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1853326/ws-services-calculation/Penalty.json b/data/as/1853326/ws-services-calculation/Penalty.json
index 71ebbb698d..fc7358f0d5 100644
--- a/data/as/1853326/ws-services-calculation/Penalty.json
+++ b/data/as/1853326/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853326/ws-services-calculation/WCBillingSlab.json b/data/as/1853326/ws-services-calculation/WCBillingSlab.json
index b61f2cb5f5..ec96075da4 100644
--- a/data/as/1853326/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853326/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1853350/ws-services-calculation/Penalty.json b/data/as/1853350/ws-services-calculation/Penalty.json
index 41af06f26f..47d12dc515 100644
--- a/data/as/1853350/ws-services-calculation/Penalty.json
+++ b/data/as/1853350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853350/ws-services-calculation/WCBillingSlab.json b/data/as/1853350/ws-services-calculation/WCBillingSlab.json
index 3b7ff0daea..b9e98a5384 100644
--- a/data/as/1853350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1853501/ws-services-calculation/Penalty.json b/data/as/1853501/ws-services-calculation/Penalty.json
index 0b50a2def2..ab37974146 100644
--- a/data/as/1853501/ws-services-calculation/Penalty.json
+++ b/data/as/1853501/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853501/ws-services-calculation/WCBillingSlab.json b/data/as/1853501/ws-services-calculation/WCBillingSlab.json
index aa88979d16..1cdda7cb9c 100644
--- a/data/as/1853501/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853501/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1853696/ws-services-calculation/Penalty.json b/data/as/1853696/ws-services-calculation/Penalty.json
index 6cff12ed3f..2844f6f919 100644
--- a/data/as/1853696/ws-services-calculation/Penalty.json
+++ b/data/as/1853696/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853696/ws-services-calculation/WCBillingSlab.json b/data/as/1853696/ws-services-calculation/WCBillingSlab.json
index 690f38e452..3f3b99ace8 100644
--- a/data/as/1853696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853696/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1854331/ws-services-calculation/Penalty.json b/data/as/1854331/ws-services-calculation/Penalty.json
index 7d2df95ff8..720cf89cc8 100644
--- a/data/as/1854331/ws-services-calculation/Penalty.json
+++ b/data/as/1854331/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1854331/ws-services-calculation/WCBillingSlab.json b/data/as/1854331/ws-services-calculation/WCBillingSlab.json
index 7430d30327..d1d3888581 100644
--- a/data/as/1854331/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1854331/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1854436/ws-services-calculation/Penalty.json b/data/as/1854436/ws-services-calculation/Penalty.json
index 9535423f55..b22390921f 100644
--- a/data/as/1854436/ws-services-calculation/Penalty.json
+++ b/data/as/1854436/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1854436/ws-services-calculation/WCBillingSlab.json b/data/as/1854436/ws-services-calculation/WCBillingSlab.json
index b64ac7e192..21845fdd9e 100644
--- a/data/as/1854436/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1854436/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1858924/ws-services-calculation/Penalty.json b/data/as/1858924/ws-services-calculation/Penalty.json
index d10223af1a..b6a050ddf7 100644
--- a/data/as/1858924/ws-services-calculation/Penalty.json
+++ b/data/as/1858924/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1858924/ws-services-calculation/WCBillingSlab.json b/data/as/1858924/ws-services-calculation/WCBillingSlab.json
index ca78d869e8..c6aa46f653 100644
--- a/data/as/1858924/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1858924/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1859895/ws-services-calculation/Penalty.json b/data/as/1859895/ws-services-calculation/Penalty.json
index ce949d7d80..d63dc0574a 100644
--- a/data/as/1859895/ws-services-calculation/Penalty.json
+++ b/data/as/1859895/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1859895/ws-services-calculation/WCBillingSlab.json b/data/as/1859895/ws-services-calculation/WCBillingSlab.json
index 6c6b3085c7..65c078ea87 100644
--- a/data/as/1859895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1859895/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1860965/ws-services-calculation/Penalty.json b/data/as/1860965/ws-services-calculation/Penalty.json
index 843bf64427..380db7ba5c 100644
--- a/data/as/1860965/ws-services-calculation/Penalty.json
+++ b/data/as/1860965/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1860965/ws-services-calculation/WCBillingSlab.json b/data/as/1860965/ws-services-calculation/WCBillingSlab.json
index e90f82336d..ca944ce81e 100644
--- a/data/as/1860965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1860965/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1861320/ws-services-calculation/Penalty.json b/data/as/1861320/ws-services-calculation/Penalty.json
index fdcffcbcf5..81245695f0 100644
--- a/data/as/1861320/ws-services-calculation/Penalty.json
+++ b/data/as/1861320/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1861320/ws-services-calculation/WCBillingSlab.json b/data/as/1861320/ws-services-calculation/WCBillingSlab.json
index c923ddfc4b..b39b826b0c 100644
--- a/data/as/1861320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1861320/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1861420/ws-services-calculation/Penalty.json b/data/as/1861420/ws-services-calculation/Penalty.json
index 7d5d278c8d..954d26ed5f 100644
--- a/data/as/1861420/ws-services-calculation/Penalty.json
+++ b/data/as/1861420/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1861420/ws-services-calculation/WCBillingSlab.json b/data/as/1861420/ws-services-calculation/WCBillingSlab.json
index 20bda88140..36f08d3b62 100644
--- a/data/as/1861420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1861420/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1872281/ws-services-calculation/Penalty.json b/data/as/1872281/ws-services-calculation/Penalty.json
index c5a2c54f42..0e0b6e5a86 100644
--- a/data/as/1872281/ws-services-calculation/Penalty.json
+++ b/data/as/1872281/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1872281/ws-services-calculation/WCBillingSlab.json b/data/as/1872281/ws-services-calculation/WCBillingSlab.json
index 2f86d796f3..450714002f 100644
--- a/data/as/1872281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1872281/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1872304/ws-services-calculation/Penalty.json b/data/as/1872304/ws-services-calculation/Penalty.json
index 9c71766c0a..9a04a28426 100644
--- a/data/as/1872304/ws-services-calculation/Penalty.json
+++ b/data/as/1872304/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1872304/ws-services-calculation/WCBillingSlab.json b/data/as/1872304/ws-services-calculation/WCBillingSlab.json
index 00aa4dc989..b0fc719bce 100644
--- a/data/as/1872304/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1872304/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1872337/ws-services-calculation/Penalty.json b/data/as/1872337/ws-services-calculation/Penalty.json
index 65a217fbcd..62a855d976 100644
--- a/data/as/1872337/ws-services-calculation/Penalty.json
+++ b/data/as/1872337/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1872337/ws-services-calculation/WCBillingSlab.json b/data/as/1872337/ws-services-calculation/WCBillingSlab.json
index 9c0f74d4b5..dd5d3c9a80 100644
--- a/data/as/1872337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1872337/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1936743/ws-services-calculation/Penalty.json b/data/as/1936743/ws-services-calculation/Penalty.json
index 9b8d0863c3..4602fe7c88 100644
--- a/data/as/1936743/ws-services-calculation/Penalty.json
+++ b/data/as/1936743/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1936743/ws-services-calculation/WCBillingSlab.json b/data/as/1936743/ws-services-calculation/WCBillingSlab.json
index de8a63a888..5c07b2c16c 100644
--- a/data/as/1936743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1936743/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937513/ws-services-calculation/Penalty.json b/data/as/1937513/ws-services-calculation/Penalty.json
index a82f5eab11..9bf0c9fa94 100644
--- a/data/as/1937513/ws-services-calculation/Penalty.json
+++ b/data/as/1937513/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937513/ws-services-calculation/WCBillingSlab.json b/data/as/1937513/ws-services-calculation/WCBillingSlab.json
index 03afa7ca2a..ae5afbf1c4 100644
--- a/data/as/1937513/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937513/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937533/ws-services-calculation/Penalty.json b/data/as/1937533/ws-services-calculation/Penalty.json
index 7df5be6b9a..8e30ddfeca 100644
--- a/data/as/1937533/ws-services-calculation/Penalty.json
+++ b/data/as/1937533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937533/ws-services-calculation/WCBillingSlab.json b/data/as/1937533/ws-services-calculation/WCBillingSlab.json
index 6d2da1fa67..459173a3d1 100644
--- a/data/as/1937533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937549/ws-services-calculation/Penalty.json b/data/as/1937549/ws-services-calculation/Penalty.json
index bc1469f0d2..99e5cb8e2d 100644
--- a/data/as/1937549/ws-services-calculation/Penalty.json
+++ b/data/as/1937549/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937549/ws-services-calculation/WCBillingSlab.json b/data/as/1937549/ws-services-calculation/WCBillingSlab.json
index b98a643107..06670c15d9 100644
--- a/data/as/1937549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937549/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937556/ws-services-calculation/Penalty.json b/data/as/1937556/ws-services-calculation/Penalty.json
index 2370c5285f..875bc2f6a1 100644
--- a/data/as/1937556/ws-services-calculation/Penalty.json
+++ b/data/as/1937556/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937556/ws-services-calculation/WCBillingSlab.json b/data/as/1937556/ws-services-calculation/WCBillingSlab.json
index 43392eb167..8ec51aa7ab 100644
--- a/data/as/1937556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937556/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937635/ws-services-calculation/Penalty.json b/data/as/1937635/ws-services-calculation/Penalty.json
index aa21056d66..bbaa4d57be 100644
--- a/data/as/1937635/ws-services-calculation/Penalty.json
+++ b/data/as/1937635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937635/ws-services-calculation/WCBillingSlab.json b/data/as/1937635/ws-services-calculation/WCBillingSlab.json
index 581d35fc74..5a61ffb99b 100644
--- a/data/as/1937635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937654/ws-services-calculation/Penalty.json b/data/as/1937654/ws-services-calculation/Penalty.json
index 6a3e757434..44f949ff34 100644
--- a/data/as/1937654/ws-services-calculation/Penalty.json
+++ b/data/as/1937654/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937654/ws-services-calculation/WCBillingSlab.json b/data/as/1937654/ws-services-calculation/WCBillingSlab.json
index e865dec9ec..eef8f24c08 100644
--- a/data/as/1937654/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937654/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937787/ws-services-calculation/Penalty.json b/data/as/1937787/ws-services-calculation/Penalty.json
index 2a57001e71..9738ebfea3 100644
--- a/data/as/1937787/ws-services-calculation/Penalty.json
+++ b/data/as/1937787/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937787/ws-services-calculation/WCBillingSlab.json b/data/as/1937787/ws-services-calculation/WCBillingSlab.json
index 9c4ded7abb..b2ee0ee3de 100644
--- a/data/as/1937787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937787/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937816/ws-services-calculation/Penalty.json b/data/as/1937816/ws-services-calculation/Penalty.json
index c1e476fad5..bedd60efc4 100644
--- a/data/as/1937816/ws-services-calculation/Penalty.json
+++ b/data/as/1937816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937816/ws-services-calculation/WCBillingSlab.json b/data/as/1937816/ws-services-calculation/WCBillingSlab.json
index 09e42b6e3c..5f08b84c5d 100644
--- a/data/as/1937816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937849/ws-services-calculation/Penalty.json b/data/as/1937849/ws-services-calculation/Penalty.json
index 4047fc4796..8844496df6 100644
--- a/data/as/1937849/ws-services-calculation/Penalty.json
+++ b/data/as/1937849/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937849/ws-services-calculation/WCBillingSlab.json b/data/as/1937849/ws-services-calculation/WCBillingSlab.json
index d863b86450..5265a2b613 100644
--- a/data/as/1937849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937849/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937917/ws-services-calculation/Penalty.json b/data/as/1937917/ws-services-calculation/Penalty.json
index 12faecf485..baccda32e8 100644
--- a/data/as/1937917/ws-services-calculation/Penalty.json
+++ b/data/as/1937917/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937917/ws-services-calculation/WCBillingSlab.json b/data/as/1937917/ws-services-calculation/WCBillingSlab.json
index 48b3fdc81e..1bc46b8a90 100644
--- a/data/as/1937917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937917/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937928/ws-services-calculation/Penalty.json b/data/as/1937928/ws-services-calculation/Penalty.json
index e5cd795ed3..487514ab28 100644
--- a/data/as/1937928/ws-services-calculation/Penalty.json
+++ b/data/as/1937928/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937928/ws-services-calculation/WCBillingSlab.json b/data/as/1937928/ws-services-calculation/WCBillingSlab.json
index e48218fd4c..626400869b 100644
--- a/data/as/1937928/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937928/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937948/ws-services-calculation/Penalty.json b/data/as/1937948/ws-services-calculation/Penalty.json
index f974ec7784..966d4ba0ac 100644
--- a/data/as/1937948/ws-services-calculation/Penalty.json
+++ b/data/as/1937948/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937948/ws-services-calculation/WCBillingSlab.json b/data/as/1937948/ws-services-calculation/WCBillingSlab.json
index 28e585fe56..cc543e02bb 100644
--- a/data/as/1937948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937948/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1937960/ws-services-calculation/Penalty.json b/data/as/1937960/ws-services-calculation/Penalty.json
index e7711ee1cd..64a20ee964 100644
--- a/data/as/1937960/ws-services-calculation/Penalty.json
+++ b/data/as/1937960/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937960/ws-services-calculation/WCBillingSlab.json b/data/as/1937960/ws-services-calculation/WCBillingSlab.json
index 35b0c7c717..7f8629e918 100644
--- a/data/as/1937960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937960/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1941516/ws-services-calculation/Penalty.json b/data/as/1941516/ws-services-calculation/Penalty.json
index 9720ae7f10..ffbfed9d74 100644
--- a/data/as/1941516/ws-services-calculation/Penalty.json
+++ b/data/as/1941516/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941516/ws-services-calculation/WCBillingSlab.json b/data/as/1941516/ws-services-calculation/WCBillingSlab.json
index 933878d9eb..555bec7959 100644
--- a/data/as/1941516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941516/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1941535/ws-services-calculation/Penalty.json b/data/as/1941535/ws-services-calculation/Penalty.json
index 1d1deb176d..ca1c13f142 100644
--- a/data/as/1941535/ws-services-calculation/Penalty.json
+++ b/data/as/1941535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941535/ws-services-calculation/WCBillingSlab.json b/data/as/1941535/ws-services-calculation/WCBillingSlab.json
index 48a274ec7a..6830f39f52 100644
--- a/data/as/1941535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1941750/ws-services-calculation/Penalty.json b/data/as/1941750/ws-services-calculation/Penalty.json
index 6fc4f8056e..41ea58ddbb 100644
--- a/data/as/1941750/ws-services-calculation/Penalty.json
+++ b/data/as/1941750/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941750/ws-services-calculation/WCBillingSlab.json b/data/as/1941750/ws-services-calculation/WCBillingSlab.json
index 7e87b85936..fe27063921 100644
--- a/data/as/1941750/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941750/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1941769/ws-services-calculation/Penalty.json b/data/as/1941769/ws-services-calculation/Penalty.json
index 50db05a526..103c358bf0 100644
--- a/data/as/1941769/ws-services-calculation/Penalty.json
+++ b/data/as/1941769/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941769/ws-services-calculation/WCBillingSlab.json b/data/as/1941769/ws-services-calculation/WCBillingSlab.json
index 75040a3585..8ed6c8c608 100644
--- a/data/as/1941769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941769/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1941788/ws-services-calculation/Penalty.json b/data/as/1941788/ws-services-calculation/Penalty.json
index 8660dd051f..06f8c6e2d4 100644
--- a/data/as/1941788/ws-services-calculation/Penalty.json
+++ b/data/as/1941788/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941788/ws-services-calculation/WCBillingSlab.json b/data/as/1941788/ws-services-calculation/WCBillingSlab.json
index d3cb315a71..4713dffcf9 100644
--- a/data/as/1941788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941788/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1941850/ws-services-calculation/Penalty.json b/data/as/1941850/ws-services-calculation/Penalty.json
index 62676e5cf7..8e7810c1c8 100644
--- a/data/as/1941850/ws-services-calculation/Penalty.json
+++ b/data/as/1941850/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941850/ws-services-calculation/WCBillingSlab.json b/data/as/1941850/ws-services-calculation/WCBillingSlab.json
index 73133bc566..16bbafd23d 100644
--- a/data/as/1941850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941850/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/1970469/ws-services-calculation/Penalty.json b/data/as/1970469/ws-services-calculation/Penalty.json
index 4d12f4792d..24441272bc 100644
--- a/data/as/1970469/ws-services-calculation/Penalty.json
+++ b/data/as/1970469/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1970469/ws-services-calculation/WCBillingSlab.json b/data/as/1970469/ws-services-calculation/WCBillingSlab.json
index d9fe875be5..c8b9e92d0c 100644
--- a/data/as/1970469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1970469/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2404395/ws-services-calculation/Penalty.json b/data/as/2404395/ws-services-calculation/Penalty.json
index fa8fb5e4ad..a2af5d6ff0 100644
--- a/data/as/2404395/ws-services-calculation/Penalty.json
+++ b/data/as/2404395/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2404395/ws-services-calculation/WCBillingSlab.json b/data/as/2404395/ws-services-calculation/WCBillingSlab.json
index 1a81cc5284..3b452b5c62 100644
--- a/data/as/2404395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2404395/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2404401/ws-services-calculation/Penalty.json b/data/as/2404401/ws-services-calculation/Penalty.json
index a15bf39f60..6c9749973a 100644
--- a/data/as/2404401/ws-services-calculation/Penalty.json
+++ b/data/as/2404401/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2404401/ws-services-calculation/WCBillingSlab.json b/data/as/2404401/ws-services-calculation/WCBillingSlab.json
index 3843dd75d6..3534322daf 100644
--- a/data/as/2404401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2404401/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2404437/ws-services-calculation/Penalty.json b/data/as/2404437/ws-services-calculation/Penalty.json
index ba0eb661e2..825998bcaa 100644
--- a/data/as/2404437/ws-services-calculation/Penalty.json
+++ b/data/as/2404437/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2404437/ws-services-calculation/WCBillingSlab.json b/data/as/2404437/ws-services-calculation/WCBillingSlab.json
index 75167efbca..d3523f0237 100644
--- a/data/as/2404437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2404437/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2405228/ws-services-calculation/Penalty.json b/data/as/2405228/ws-services-calculation/Penalty.json
index 707168f7de..2e3dd11334 100644
--- a/data/as/2405228/ws-services-calculation/Penalty.json
+++ b/data/as/2405228/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2405228/ws-services-calculation/WCBillingSlab.json b/data/as/2405228/ws-services-calculation/WCBillingSlab.json
index 36aa683e29..5756a73cca 100644
--- a/data/as/2405228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2405228/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2406004/ws-services-calculation/Penalty.json b/data/as/2406004/ws-services-calculation/Penalty.json
index d3804379b9..90a7b70014 100644
--- a/data/as/2406004/ws-services-calculation/Penalty.json
+++ b/data/as/2406004/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2406004/ws-services-calculation/WCBillingSlab.json b/data/as/2406004/ws-services-calculation/WCBillingSlab.json
index b03f8e9531..87349c4a29 100644
--- a/data/as/2406004/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2406004/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2421895/ws-services-calculation/Penalty.json b/data/as/2421895/ws-services-calculation/Penalty.json
index a06c2802d1..4ebe6364b8 100644
--- a/data/as/2421895/ws-services-calculation/Penalty.json
+++ b/data/as/2421895/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421895/ws-services-calculation/WCBillingSlab.json b/data/as/2421895/ws-services-calculation/WCBillingSlab.json
index 63e41f9e87..69cef68dbd 100644
--- a/data/as/2421895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421895/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2421903/ws-services-calculation/Penalty.json b/data/as/2421903/ws-services-calculation/Penalty.json
index d65642489c..491291bffc 100644
--- a/data/as/2421903/ws-services-calculation/Penalty.json
+++ b/data/as/2421903/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421903/ws-services-calculation/WCBillingSlab.json b/data/as/2421903/ws-services-calculation/WCBillingSlab.json
index 678abea77c..bbc545c3d8 100644
--- a/data/as/2421903/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421903/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2421911/ws-services-calculation/Penalty.json b/data/as/2421911/ws-services-calculation/Penalty.json
index 0bb2d6b6f7..3e3a4f9ebc 100644
--- a/data/as/2421911/ws-services-calculation/Penalty.json
+++ b/data/as/2421911/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421911/ws-services-calculation/WCBillingSlab.json b/data/as/2421911/ws-services-calculation/WCBillingSlab.json
index b13ab7922e..b435639854 100644
--- a/data/as/2421911/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421911/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2421922/ws-services-calculation/Penalty.json b/data/as/2421922/ws-services-calculation/Penalty.json
index 40ddbe3d61..fc87810ecb 100644
--- a/data/as/2421922/ws-services-calculation/Penalty.json
+++ b/data/as/2421922/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421922/ws-services-calculation/WCBillingSlab.json b/data/as/2421922/ws-services-calculation/WCBillingSlab.json
index 628b6b9b90..9388e9187c 100644
--- a/data/as/2421922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421922/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2423434/ws-services-calculation/Penalty.json b/data/as/2423434/ws-services-calculation/Penalty.json
index 322ab78879..1475921e4c 100644
--- a/data/as/2423434/ws-services-calculation/Penalty.json
+++ b/data/as/2423434/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2423434/ws-services-calculation/WCBillingSlab.json b/data/as/2423434/ws-services-calculation/WCBillingSlab.json
index 5facc45329..22fe74e59b 100644
--- a/data/as/2423434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2423434/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2426035/ws-services-calculation/Penalty.json b/data/as/2426035/ws-services-calculation/Penalty.json
index bdbff77397..016dbd8366 100644
--- a/data/as/2426035/ws-services-calculation/Penalty.json
+++ b/data/as/2426035/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2426035/ws-services-calculation/WCBillingSlab.json b/data/as/2426035/ws-services-calculation/WCBillingSlab.json
index 22fd113993..8117bca70a 100644
--- a/data/as/2426035/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2426035/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2429111/ws-services-calculation/Penalty.json b/data/as/2429111/ws-services-calculation/Penalty.json
index 81fcd6556e..44e228e2ed 100644
--- a/data/as/2429111/ws-services-calculation/Penalty.json
+++ b/data/as/2429111/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2429111/ws-services-calculation/WCBillingSlab.json b/data/as/2429111/ws-services-calculation/WCBillingSlab.json
index 26901789a5..76af6fc02c 100644
--- a/data/as/2429111/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2429111/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2433896/ws-services-calculation/Penalty.json b/data/as/2433896/ws-services-calculation/Penalty.json
index 235b3df577..6a813194a3 100644
--- a/data/as/2433896/ws-services-calculation/Penalty.json
+++ b/data/as/2433896/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2433896/ws-services-calculation/WCBillingSlab.json b/data/as/2433896/ws-services-calculation/WCBillingSlab.json
index 570d67699c..0071ce36a1 100644
--- a/data/as/2433896/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2433896/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2443383/ws-services-calculation/Penalty.json b/data/as/2443383/ws-services-calculation/Penalty.json
index 127b67033e..699743bb3a 100644
--- a/data/as/2443383/ws-services-calculation/Penalty.json
+++ b/data/as/2443383/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2443383/ws-services-calculation/WCBillingSlab.json b/data/as/2443383/ws-services-calculation/WCBillingSlab.json
index f3c18b3dc0..edb34e8671 100644
--- a/data/as/2443383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2443383/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2480357/ws-services-calculation/Penalty.json b/data/as/2480357/ws-services-calculation/Penalty.json
index 4e38b10475..e93f66c68f 100644
--- a/data/as/2480357/ws-services-calculation/Penalty.json
+++ b/data/as/2480357/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2480357/ws-services-calculation/WCBillingSlab.json b/data/as/2480357/ws-services-calculation/WCBillingSlab.json
index 7c094c2a41..4e8d11feff 100644
--- a/data/as/2480357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2480357/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2480363/ws-services-calculation/Penalty.json b/data/as/2480363/ws-services-calculation/Penalty.json
index 4b6f232a8e..29a99d1b9e 100644
--- a/data/as/2480363/ws-services-calculation/Penalty.json
+++ b/data/as/2480363/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2480363/ws-services-calculation/WCBillingSlab.json b/data/as/2480363/ws-services-calculation/WCBillingSlab.json
index bf0b0ca2ee..ea638262a0 100644
--- a/data/as/2480363/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2480363/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2484676/ws-services-calculation/Penalty.json b/data/as/2484676/ws-services-calculation/Penalty.json
index 4d004d4b6f..eb8d4f2b63 100644
--- a/data/as/2484676/ws-services-calculation/Penalty.json
+++ b/data/as/2484676/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2484676/ws-services-calculation/WCBillingSlab.json b/data/as/2484676/ws-services-calculation/WCBillingSlab.json
index 83c42e38a3..d63278dc61 100644
--- a/data/as/2484676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2484676/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2484678/ws-services-calculation/Penalty.json b/data/as/2484678/ws-services-calculation/Penalty.json
index a77d78de0e..e2b25fce73 100644
--- a/data/as/2484678/ws-services-calculation/Penalty.json
+++ b/data/as/2484678/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2484678/ws-services-calculation/WCBillingSlab.json b/data/as/2484678/ws-services-calculation/WCBillingSlab.json
index efd1b17897..491fb0ea44 100644
--- a/data/as/2484678/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2484678/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2486691/ws-services-calculation/Penalty.json b/data/as/2486691/ws-services-calculation/Penalty.json
index 1db44252fc..5c3f66dd0f 100644
--- a/data/as/2486691/ws-services-calculation/Penalty.json
+++ b/data/as/2486691/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2486691/ws-services-calculation/WCBillingSlab.json b/data/as/2486691/ws-services-calculation/WCBillingSlab.json
index 985e02c398..e49fffc435 100644
--- a/data/as/2486691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2486691/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2491893/ws-services-calculation/Penalty.json b/data/as/2491893/ws-services-calculation/Penalty.json
index 6c4c62b020..888f18b0b0 100644
--- a/data/as/2491893/ws-services-calculation/Penalty.json
+++ b/data/as/2491893/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2491893/ws-services-calculation/WCBillingSlab.json b/data/as/2491893/ws-services-calculation/WCBillingSlab.json
index 32b3d716f0..cbffb55b95 100644
--- a/data/as/2491893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2491893/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2495922/ws-services-calculation/Penalty.json b/data/as/2495922/ws-services-calculation/Penalty.json
index ae78b95460..88e526f4a2 100644
--- a/data/as/2495922/ws-services-calculation/Penalty.json
+++ b/data/as/2495922/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2495922/ws-services-calculation/WCBillingSlab.json b/data/as/2495922/ws-services-calculation/WCBillingSlab.json
index 3bc19442e9..96d1aa2d13 100644
--- a/data/as/2495922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2495922/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2496124/ws-services-calculation/Penalty.json b/data/as/2496124/ws-services-calculation/Penalty.json
index a9aaab19a1..d5cc15129b 100644
--- a/data/as/2496124/ws-services-calculation/Penalty.json
+++ b/data/as/2496124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2496124/ws-services-calculation/WCBillingSlab.json b/data/as/2496124/ws-services-calculation/WCBillingSlab.json
index d4ae978aea..4944adb61c 100644
--- a/data/as/2496124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2496124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2496136/ws-services-calculation/Penalty.json b/data/as/2496136/ws-services-calculation/Penalty.json
index 516b7f9e08..b72dc7494f 100644
--- a/data/as/2496136/ws-services-calculation/Penalty.json
+++ b/data/as/2496136/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2496136/ws-services-calculation/WCBillingSlab.json b/data/as/2496136/ws-services-calculation/WCBillingSlab.json
index 7afdba7868..b7efe608a1 100644
--- a/data/as/2496136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2496136/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2497758/ws-services-calculation/Penalty.json b/data/as/2497758/ws-services-calculation/Penalty.json
index d0182876bb..ff800904c4 100644
--- a/data/as/2497758/ws-services-calculation/Penalty.json
+++ b/data/as/2497758/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2497758/ws-services-calculation/WCBillingSlab.json b/data/as/2497758/ws-services-calculation/WCBillingSlab.json
index ffdb68f929..46bae0cefe 100644
--- a/data/as/2497758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2497758/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2515923/ws-services-calculation/Penalty.json b/data/as/2515923/ws-services-calculation/Penalty.json
index 19cffbe74d..857d5f098c 100644
--- a/data/as/2515923/ws-services-calculation/Penalty.json
+++ b/data/as/2515923/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2515923/ws-services-calculation/WCBillingSlab.json b/data/as/2515923/ws-services-calculation/WCBillingSlab.json
index 5e5bcaaf97..6ddcba46c8 100644
--- a/data/as/2515923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2515923/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2515942/ws-services-calculation/Penalty.json b/data/as/2515942/ws-services-calculation/Penalty.json
index feec5d4e70..d6cb4f3da4 100644
--- a/data/as/2515942/ws-services-calculation/Penalty.json
+++ b/data/as/2515942/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2515942/ws-services-calculation/WCBillingSlab.json b/data/as/2515942/ws-services-calculation/WCBillingSlab.json
index c7dae9192a..23fe406c82 100644
--- a/data/as/2515942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2515942/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2515998/ws-services-calculation/Penalty.json b/data/as/2515998/ws-services-calculation/Penalty.json
index 9f42620104..6295cad2be 100644
--- a/data/as/2515998/ws-services-calculation/Penalty.json
+++ b/data/as/2515998/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2515998/ws-services-calculation/WCBillingSlab.json b/data/as/2515998/ws-services-calculation/WCBillingSlab.json
index 9a33b28620..76177c03ca 100644
--- a/data/as/2515998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2515998/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516005/ws-services-calculation/Penalty.json b/data/as/2516005/ws-services-calculation/Penalty.json
index ca3563c96f..a1d83f6523 100644
--- a/data/as/2516005/ws-services-calculation/Penalty.json
+++ b/data/as/2516005/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516005/ws-services-calculation/WCBillingSlab.json b/data/as/2516005/ws-services-calculation/WCBillingSlab.json
index d040c30a76..a85a3c900e 100644
--- a/data/as/2516005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516005/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516013/ws-services-calculation/Penalty.json b/data/as/2516013/ws-services-calculation/Penalty.json
index 47c9017c23..dd20a1d4f9 100644
--- a/data/as/2516013/ws-services-calculation/Penalty.json
+++ b/data/as/2516013/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516013/ws-services-calculation/WCBillingSlab.json b/data/as/2516013/ws-services-calculation/WCBillingSlab.json
index b6230cf2be..4eba1aa10c 100644
--- a/data/as/2516013/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516013/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516019/ws-services-calculation/Penalty.json b/data/as/2516019/ws-services-calculation/Penalty.json
index 9b00bf7464..99af0b4499 100644
--- a/data/as/2516019/ws-services-calculation/Penalty.json
+++ b/data/as/2516019/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516019/ws-services-calculation/WCBillingSlab.json b/data/as/2516019/ws-services-calculation/WCBillingSlab.json
index b12f4268b7..0711088ee7 100644
--- a/data/as/2516019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516019/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516135/ws-services-calculation/Penalty.json b/data/as/2516135/ws-services-calculation/Penalty.json
index ec04462eb9..83e8e92e26 100644
--- a/data/as/2516135/ws-services-calculation/Penalty.json
+++ b/data/as/2516135/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516135/ws-services-calculation/WCBillingSlab.json b/data/as/2516135/ws-services-calculation/WCBillingSlab.json
index 160a8f76c2..9cc3735e50 100644
--- a/data/as/2516135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516135/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516159/ws-services-calculation/Penalty.json b/data/as/2516159/ws-services-calculation/Penalty.json
index 3dbb4dee61..b2de704ede 100644
--- a/data/as/2516159/ws-services-calculation/Penalty.json
+++ b/data/as/2516159/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516159/ws-services-calculation/WCBillingSlab.json b/data/as/2516159/ws-services-calculation/WCBillingSlab.json
index f066a99487..0ab735a03b 100644
--- a/data/as/2516159/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516159/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516189/ws-services-calculation/Penalty.json b/data/as/2516189/ws-services-calculation/Penalty.json
index 083c10167a..b33afb3d08 100644
--- a/data/as/2516189/ws-services-calculation/Penalty.json
+++ b/data/as/2516189/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516189/ws-services-calculation/WCBillingSlab.json b/data/as/2516189/ws-services-calculation/WCBillingSlab.json
index 07ba1cbe13..a585ca8e74 100644
--- a/data/as/2516189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516189/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516326/ws-services-calculation/Penalty.json b/data/as/2516326/ws-services-calculation/Penalty.json
index e084e43799..af4b77ac9b 100644
--- a/data/as/2516326/ws-services-calculation/Penalty.json
+++ b/data/as/2516326/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516326/ws-services-calculation/WCBillingSlab.json b/data/as/2516326/ws-services-calculation/WCBillingSlab.json
index cb76d002fa..047fc487d5 100644
--- a/data/as/2516326/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516326/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516787/ws-services-calculation/Penalty.json b/data/as/2516787/ws-services-calculation/Penalty.json
index 7ceede6ea6..b4b36e9529 100644
--- a/data/as/2516787/ws-services-calculation/Penalty.json
+++ b/data/as/2516787/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516787/ws-services-calculation/WCBillingSlab.json b/data/as/2516787/ws-services-calculation/WCBillingSlab.json
index 5b20123ff2..e59d257a98 100644
--- a/data/as/2516787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516787/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516881/ws-services-calculation/Penalty.json b/data/as/2516881/ws-services-calculation/Penalty.json
index 8e4e372641..3b62897551 100644
--- a/data/as/2516881/ws-services-calculation/Penalty.json
+++ b/data/as/2516881/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516881/ws-services-calculation/WCBillingSlab.json b/data/as/2516881/ws-services-calculation/WCBillingSlab.json
index 44120781bd..aff5e1d0f6 100644
--- a/data/as/2516881/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516881/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2516940/ws-services-calculation/Penalty.json b/data/as/2516940/ws-services-calculation/Penalty.json
index f131e8af3b..1aeb9016de 100644
--- a/data/as/2516940/ws-services-calculation/Penalty.json
+++ b/data/as/2516940/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516940/ws-services-calculation/WCBillingSlab.json b/data/as/2516940/ws-services-calculation/WCBillingSlab.json
index 17c932f126..219d2433de 100644
--- a/data/as/2516940/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516940/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2517189/ws-services-calculation/Penalty.json b/data/as/2517189/ws-services-calculation/Penalty.json
index 69ec25ff52..cf8bacd7ec 100644
--- a/data/as/2517189/ws-services-calculation/Penalty.json
+++ b/data/as/2517189/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517189/ws-services-calculation/WCBillingSlab.json b/data/as/2517189/ws-services-calculation/WCBillingSlab.json
index a13892a2a2..0e83fbf72a 100644
--- a/data/as/2517189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517189/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2517201/ws-services-calculation/Penalty.json b/data/as/2517201/ws-services-calculation/Penalty.json
index df5667a4f0..a72a289ab3 100644
--- a/data/as/2517201/ws-services-calculation/Penalty.json
+++ b/data/as/2517201/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517201/ws-services-calculation/WCBillingSlab.json b/data/as/2517201/ws-services-calculation/WCBillingSlab.json
index ad47575fdb..725a4acdfb 100644
--- a/data/as/2517201/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517201/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2517213/ws-services-calculation/Penalty.json b/data/as/2517213/ws-services-calculation/Penalty.json
index 13974fafdb..a28309a3ba 100644
--- a/data/as/2517213/ws-services-calculation/Penalty.json
+++ b/data/as/2517213/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517213/ws-services-calculation/WCBillingSlab.json b/data/as/2517213/ws-services-calculation/WCBillingSlab.json
index 8868bdc301..2f7b536af4 100644
--- a/data/as/2517213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517213/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2517242/ws-services-calculation/Penalty.json b/data/as/2517242/ws-services-calculation/Penalty.json
index d7a0d17da7..6e7dac7138 100644
--- a/data/as/2517242/ws-services-calculation/Penalty.json
+++ b/data/as/2517242/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517242/ws-services-calculation/WCBillingSlab.json b/data/as/2517242/ws-services-calculation/WCBillingSlab.json
index 6123618204..f0453847a4 100644
--- a/data/as/2517242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517242/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2517248/ws-services-calculation/Penalty.json b/data/as/2517248/ws-services-calculation/Penalty.json
index cc620851b6..ecef60a1c4 100644
--- a/data/as/2517248/ws-services-calculation/Penalty.json
+++ b/data/as/2517248/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517248/ws-services-calculation/WCBillingSlab.json b/data/as/2517248/ws-services-calculation/WCBillingSlab.json
index 0741db4cc3..90b9b60b47 100644
--- a/data/as/2517248/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517248/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2517256/ws-services-calculation/Penalty.json b/data/as/2517256/ws-services-calculation/Penalty.json
index 15635e90ad..f0758d780a 100644
--- a/data/as/2517256/ws-services-calculation/Penalty.json
+++ b/data/as/2517256/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517256/ws-services-calculation/WCBillingSlab.json b/data/as/2517256/ws-services-calculation/WCBillingSlab.json
index 57e87d04bd..6ce94bbf71 100644
--- a/data/as/2517256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517256/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2520036/ws-services-calculation/Penalty.json b/data/as/2520036/ws-services-calculation/Penalty.json
index 8ba8765902..08fb4241b5 100644
--- a/data/as/2520036/ws-services-calculation/Penalty.json
+++ b/data/as/2520036/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2520036/ws-services-calculation/WCBillingSlab.json b/data/as/2520036/ws-services-calculation/WCBillingSlab.json
index 9762e16e09..ee5a0a971b 100644
--- a/data/as/2520036/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2520036/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2520181/ws-services-calculation/Penalty.json b/data/as/2520181/ws-services-calculation/Penalty.json
index 98c06bf599..4e1412df9e 100644
--- a/data/as/2520181/ws-services-calculation/Penalty.json
+++ b/data/as/2520181/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2520181/ws-services-calculation/WCBillingSlab.json b/data/as/2520181/ws-services-calculation/WCBillingSlab.json
index 56c1d8d059..7a408648b6 100644
--- a/data/as/2520181/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2520181/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2581909/ws-services-calculation/Penalty.json b/data/as/2581909/ws-services-calculation/Penalty.json
index 89d4878729..1ecacbefb2 100644
--- a/data/as/2581909/ws-services-calculation/Penalty.json
+++ b/data/as/2581909/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2581909/ws-services-calculation/WCBillingSlab.json b/data/as/2581909/ws-services-calculation/WCBillingSlab.json
index b265eba567..3fab30d894 100644
--- a/data/as/2581909/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2581909/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2582386/ws-services-calculation/Penalty.json b/data/as/2582386/ws-services-calculation/Penalty.json
index 4d910691ee..e46a6bff4c 100644
--- a/data/as/2582386/ws-services-calculation/Penalty.json
+++ b/data/as/2582386/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2582386/ws-services-calculation/WCBillingSlab.json b/data/as/2582386/ws-services-calculation/WCBillingSlab.json
index 61bd14d911..e9b0ce9968 100644
--- a/data/as/2582386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2582386/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2582460/ws-services-calculation/Penalty.json b/data/as/2582460/ws-services-calculation/Penalty.json
index 75c0083e2a..15bac6a0e9 100644
--- a/data/as/2582460/ws-services-calculation/Penalty.json
+++ b/data/as/2582460/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2582460/ws-services-calculation/WCBillingSlab.json b/data/as/2582460/ws-services-calculation/WCBillingSlab.json
index a62d0a2663..a898d3390a 100644
--- a/data/as/2582460/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2582460/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/2615100/ws-services-calculation/Penalty.json b/data/as/2615100/ws-services-calculation/Penalty.json
index 4826777038..26095e6d41 100644
--- a/data/as/2615100/ws-services-calculation/Penalty.json
+++ b/data/as/2615100/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2615100/ws-services-calculation/WCBillingSlab.json b/data/as/2615100/ws-services-calculation/WCBillingSlab.json
index edc812f6cb..d40e2700bf 100644
--- a/data/as/2615100/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2615100/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3164535/ws-services-calculation/Penalty.json b/data/as/3164535/ws-services-calculation/Penalty.json
index 4b1f6f3cc9..b34f7d1366 100644
--- a/data/as/3164535/ws-services-calculation/Penalty.json
+++ b/data/as/3164535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3164535/ws-services-calculation/WCBillingSlab.json b/data/as/3164535/ws-services-calculation/WCBillingSlab.json
index 287b21bf1e..59024df306 100644
--- a/data/as/3164535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3164535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3319750/ws-services-calculation/Penalty.json b/data/as/3319750/ws-services-calculation/Penalty.json
index 6502b8c323..5d18af38b3 100644
--- a/data/as/3319750/ws-services-calculation/Penalty.json
+++ b/data/as/3319750/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3319750/ws-services-calculation/WCBillingSlab.json b/data/as/3319750/ws-services-calculation/WCBillingSlab.json
index 6008d419ed..41b1840f9a 100644
--- a/data/as/3319750/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3319750/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3321276/ws-services-calculation/Penalty.json b/data/as/3321276/ws-services-calculation/Penalty.json
index b33b401ee7..263f64c4ab 100644
--- a/data/as/3321276/ws-services-calculation/Penalty.json
+++ b/data/as/3321276/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3321276/ws-services-calculation/WCBillingSlab.json b/data/as/3321276/ws-services-calculation/WCBillingSlab.json
index c6b760b876..1fbc85e394 100644
--- a/data/as/3321276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3321276/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3321879/ws-services-calculation/Penalty.json b/data/as/3321879/ws-services-calculation/Penalty.json
index 37081b2f79..0cbeadd2a6 100644
--- a/data/as/3321879/ws-services-calculation/Penalty.json
+++ b/data/as/3321879/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3321879/ws-services-calculation/WCBillingSlab.json b/data/as/3321879/ws-services-calculation/WCBillingSlab.json
index 427905f3ce..5f51a17d14 100644
--- a/data/as/3321879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3321879/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3327425/ws-services-calculation/Penalty.json b/data/as/3327425/ws-services-calculation/Penalty.json
index 4b11674699..a57fb8a212 100644
--- a/data/as/3327425/ws-services-calculation/Penalty.json
+++ b/data/as/3327425/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3327425/ws-services-calculation/WCBillingSlab.json b/data/as/3327425/ws-services-calculation/WCBillingSlab.json
index 74e7ed9cc0..7d668f6a5e 100644
--- a/data/as/3327425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3327425/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3328455/ws-services-calculation/Penalty.json b/data/as/3328455/ws-services-calculation/Penalty.json
index 0b98b04eaa..6781076434 100644
--- a/data/as/3328455/ws-services-calculation/Penalty.json
+++ b/data/as/3328455/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328455/ws-services-calculation/WCBillingSlab.json b/data/as/3328455/ws-services-calculation/WCBillingSlab.json
index 430f2fedae..9481bf45c7 100644
--- a/data/as/3328455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328455/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3328647/ws-services-calculation/Penalty.json b/data/as/3328647/ws-services-calculation/Penalty.json
index 3440be8760..7e313a4586 100644
--- a/data/as/3328647/ws-services-calculation/Penalty.json
+++ b/data/as/3328647/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328647/ws-services-calculation/WCBillingSlab.json b/data/as/3328647/ws-services-calculation/WCBillingSlab.json
index e483d45566..7fb13e44a9 100644
--- a/data/as/3328647/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328647/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3328767/ws-services-calculation/Penalty.json b/data/as/3328767/ws-services-calculation/Penalty.json
index 7201023b33..7975d0ffe3 100644
--- a/data/as/3328767/ws-services-calculation/Penalty.json
+++ b/data/as/3328767/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328767/ws-services-calculation/WCBillingSlab.json b/data/as/3328767/ws-services-calculation/WCBillingSlab.json
index da89328bfe..7e03162026 100644
--- a/data/as/3328767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328767/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3328873/ws-services-calculation/Penalty.json b/data/as/3328873/ws-services-calculation/Penalty.json
index 8f0a1725e5..86371031e0 100644
--- a/data/as/3328873/ws-services-calculation/Penalty.json
+++ b/data/as/3328873/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328873/ws-services-calculation/WCBillingSlab.json b/data/as/3328873/ws-services-calculation/WCBillingSlab.json
index ace867c5da..d2e14c006c 100644
--- a/data/as/3328873/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328873/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3333586/ws-services-calculation/Penalty.json b/data/as/3333586/ws-services-calculation/Penalty.json
index 5a66a61e7e..cfcd707161 100644
--- a/data/as/3333586/ws-services-calculation/Penalty.json
+++ b/data/as/3333586/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3333586/ws-services-calculation/WCBillingSlab.json b/data/as/3333586/ws-services-calculation/WCBillingSlab.json
index 074b5e8699..548d8e670c 100644
--- a/data/as/3333586/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3333586/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3359758/ws-services-calculation/Penalty.json b/data/as/3359758/ws-services-calculation/Penalty.json
index ee3d38b8f4..cd2830e094 100644
--- a/data/as/3359758/ws-services-calculation/Penalty.json
+++ b/data/as/3359758/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3359758/ws-services-calculation/WCBillingSlab.json b/data/as/3359758/ws-services-calculation/WCBillingSlab.json
index dfb65bc723..affe85a3db 100644
--- a/data/as/3359758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3359758/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3370880/ws-services-calculation/Penalty.json b/data/as/3370880/ws-services-calculation/Penalty.json
index 151ecc9a32..31af4060df 100644
--- a/data/as/3370880/ws-services-calculation/Penalty.json
+++ b/data/as/3370880/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3370880/ws-services-calculation/WCBillingSlab.json b/data/as/3370880/ws-services-calculation/WCBillingSlab.json
index a8d7ecec73..1aaabe77e8 100644
--- a/data/as/3370880/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3370880/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3372158/ws-services-calculation/Penalty.json b/data/as/3372158/ws-services-calculation/Penalty.json
index 73e86c4f14..a5c4d9a558 100644
--- a/data/as/3372158/ws-services-calculation/Penalty.json
+++ b/data/as/3372158/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3372158/ws-services-calculation/WCBillingSlab.json b/data/as/3372158/ws-services-calculation/WCBillingSlab.json
index 5ea32ee463..4d6a645036 100644
--- a/data/as/3372158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3372158/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3373443/ws-services-calculation/Penalty.json b/data/as/3373443/ws-services-calculation/Penalty.json
index 3f0cf17a7c..cfdb14d7a8 100644
--- a/data/as/3373443/ws-services-calculation/Penalty.json
+++ b/data/as/3373443/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3373443/ws-services-calculation/WCBillingSlab.json b/data/as/3373443/ws-services-calculation/WCBillingSlab.json
index 1e6d2f6746..bfd3023685 100644
--- a/data/as/3373443/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3373443/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3374529/ws-services-calculation/Penalty.json b/data/as/3374529/ws-services-calculation/Penalty.json
index fbbadb5289..850b431258 100644
--- a/data/as/3374529/ws-services-calculation/Penalty.json
+++ b/data/as/3374529/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3374529/ws-services-calculation/WCBillingSlab.json b/data/as/3374529/ws-services-calculation/WCBillingSlab.json
index 396a4b6b28..c86716a449 100644
--- a/data/as/3374529/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3374529/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3375170/ws-services-calculation/Penalty.json b/data/as/3375170/ws-services-calculation/Penalty.json
index e0acb4e149..e7dadfe11e 100644
--- a/data/as/3375170/ws-services-calculation/Penalty.json
+++ b/data/as/3375170/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3375170/ws-services-calculation/WCBillingSlab.json b/data/as/3375170/ws-services-calculation/WCBillingSlab.json
index 09bae18b8c..20f54974a3 100644
--- a/data/as/3375170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3375170/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3375765/ws-services-calculation/Penalty.json b/data/as/3375765/ws-services-calculation/Penalty.json
index c0c4b30c9f..8a0b929dde 100644
--- a/data/as/3375765/ws-services-calculation/Penalty.json
+++ b/data/as/3375765/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3375765/ws-services-calculation/WCBillingSlab.json b/data/as/3375765/ws-services-calculation/WCBillingSlab.json
index 4eec5b9799..8b9950d415 100644
--- a/data/as/3375765/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3375765/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3378587/ws-services-calculation/Penalty.json b/data/as/3378587/ws-services-calculation/Penalty.json
index 0aaea78f28..d3a05acd06 100644
--- a/data/as/3378587/ws-services-calculation/Penalty.json
+++ b/data/as/3378587/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3378587/ws-services-calculation/WCBillingSlab.json b/data/as/3378587/ws-services-calculation/WCBillingSlab.json
index 4444cfe3ca..57eb587981 100644
--- a/data/as/3378587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3378587/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3384885/ws-services-calculation/Penalty.json b/data/as/3384885/ws-services-calculation/Penalty.json
index dfdb98a8f2..2ef9f1f1b6 100644
--- a/data/as/3384885/ws-services-calculation/Penalty.json
+++ b/data/as/3384885/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3384885/ws-services-calculation/WCBillingSlab.json b/data/as/3384885/ws-services-calculation/WCBillingSlab.json
index ca58657172..ced805dbcb 100644
--- a/data/as/3384885/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3384885/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3384921/ws-services-calculation/Penalty.json b/data/as/3384921/ws-services-calculation/Penalty.json
index eeba9e530b..d6732db47a 100644
--- a/data/as/3384921/ws-services-calculation/Penalty.json
+++ b/data/as/3384921/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3384921/ws-services-calculation/WCBillingSlab.json b/data/as/3384921/ws-services-calculation/WCBillingSlab.json
index 57bdf09d17..54c9164ccf 100644
--- a/data/as/3384921/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3384921/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3385844/ws-services-calculation/Penalty.json b/data/as/3385844/ws-services-calculation/Penalty.json
index 3ab0b0e3cf..39da657ac8 100644
--- a/data/as/3385844/ws-services-calculation/Penalty.json
+++ b/data/as/3385844/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3385844/ws-services-calculation/WCBillingSlab.json b/data/as/3385844/ws-services-calculation/WCBillingSlab.json
index df6fe285c4..eeabf5751a 100644
--- a/data/as/3385844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3385844/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3385946/ws-services-calculation/Penalty.json b/data/as/3385946/ws-services-calculation/Penalty.json
index e5dfa01b05..697772cb24 100644
--- a/data/as/3385946/ws-services-calculation/Penalty.json
+++ b/data/as/3385946/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3385946/ws-services-calculation/WCBillingSlab.json b/data/as/3385946/ws-services-calculation/WCBillingSlab.json
index d8f1b3da60..c47ce0d2cd 100644
--- a/data/as/3385946/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3385946/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3385982/ws-services-calculation/Penalty.json b/data/as/3385982/ws-services-calculation/Penalty.json
index cdd2cfa9e7..337cbdfb50 100644
--- a/data/as/3385982/ws-services-calculation/Penalty.json
+++ b/data/as/3385982/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3385982/ws-services-calculation/WCBillingSlab.json b/data/as/3385982/ws-services-calculation/WCBillingSlab.json
index 7c7e573679..da53afcf19 100644
--- a/data/as/3385982/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3385982/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386123/ws-services-calculation/Penalty.json b/data/as/3386123/ws-services-calculation/Penalty.json
index fc6baaf32a..05dabe6a00 100644
--- a/data/as/3386123/ws-services-calculation/Penalty.json
+++ b/data/as/3386123/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386123/ws-services-calculation/WCBillingSlab.json b/data/as/3386123/ws-services-calculation/WCBillingSlab.json
index fbeed2b0be..ebc17ae498 100644
--- a/data/as/3386123/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386123/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386146/ws-services-calculation/Penalty.json b/data/as/3386146/ws-services-calculation/Penalty.json
index 5f0adc90b9..51997084ab 100644
--- a/data/as/3386146/ws-services-calculation/Penalty.json
+++ b/data/as/3386146/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386146/ws-services-calculation/WCBillingSlab.json b/data/as/3386146/ws-services-calculation/WCBillingSlab.json
index d169a2e80a..28da8f55b2 100644
--- a/data/as/3386146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386146/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386204/ws-services-calculation/Penalty.json b/data/as/3386204/ws-services-calculation/Penalty.json
index fce34903f2..d4748f0bea 100644
--- a/data/as/3386204/ws-services-calculation/Penalty.json
+++ b/data/as/3386204/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386204/ws-services-calculation/WCBillingSlab.json b/data/as/3386204/ws-services-calculation/WCBillingSlab.json
index 9fe9f48dd0..9c8d165804 100644
--- a/data/as/3386204/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386204/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386236/ws-services-calculation/Penalty.json b/data/as/3386236/ws-services-calculation/Penalty.json
index ce528b9bb9..7c09befa2f 100644
--- a/data/as/3386236/ws-services-calculation/Penalty.json
+++ b/data/as/3386236/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386236/ws-services-calculation/WCBillingSlab.json b/data/as/3386236/ws-services-calculation/WCBillingSlab.json
index ce53e93a71..4e63e0eb9d 100644
--- a/data/as/3386236/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386236/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386289/ws-services-calculation/Penalty.json b/data/as/3386289/ws-services-calculation/Penalty.json
index 0dad51541a..5f75da5b10 100644
--- a/data/as/3386289/ws-services-calculation/Penalty.json
+++ b/data/as/3386289/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386289/ws-services-calculation/WCBillingSlab.json b/data/as/3386289/ws-services-calculation/WCBillingSlab.json
index 1b453b9c62..9ee9375749 100644
--- a/data/as/3386289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386289/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386322/ws-services-calculation/Penalty.json b/data/as/3386322/ws-services-calculation/Penalty.json
index 3ead0af0cb..7565f571e4 100644
--- a/data/as/3386322/ws-services-calculation/Penalty.json
+++ b/data/as/3386322/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386322/ws-services-calculation/WCBillingSlab.json b/data/as/3386322/ws-services-calculation/WCBillingSlab.json
index 155834ca7a..f3bbb767de 100644
--- a/data/as/3386322/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386322/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386356/ws-services-calculation/Penalty.json b/data/as/3386356/ws-services-calculation/Penalty.json
index 5c085cf5f3..e538567cdb 100644
--- a/data/as/3386356/ws-services-calculation/Penalty.json
+++ b/data/as/3386356/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386356/ws-services-calculation/WCBillingSlab.json b/data/as/3386356/ws-services-calculation/WCBillingSlab.json
index f0f6126e75..c2d6404d5a 100644
--- a/data/as/3386356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386356/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386386/ws-services-calculation/Penalty.json b/data/as/3386386/ws-services-calculation/Penalty.json
index 5401b4c3b8..c2627997d3 100644
--- a/data/as/3386386/ws-services-calculation/Penalty.json
+++ b/data/as/3386386/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386386/ws-services-calculation/WCBillingSlab.json b/data/as/3386386/ws-services-calculation/WCBillingSlab.json
index 24f9a08822..e998c3c19f 100644
--- a/data/as/3386386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386386/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386407/ws-services-calculation/Penalty.json b/data/as/3386407/ws-services-calculation/Penalty.json
index a9fcbf31f5..5654cd32b8 100644
--- a/data/as/3386407/ws-services-calculation/Penalty.json
+++ b/data/as/3386407/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386407/ws-services-calculation/WCBillingSlab.json b/data/as/3386407/ws-services-calculation/WCBillingSlab.json
index a6d09ead21..8c0901fa51 100644
--- a/data/as/3386407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386407/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386435/ws-services-calculation/Penalty.json b/data/as/3386435/ws-services-calculation/Penalty.json
index ba7072d774..1c7f868f37 100644
--- a/data/as/3386435/ws-services-calculation/Penalty.json
+++ b/data/as/3386435/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386435/ws-services-calculation/WCBillingSlab.json b/data/as/3386435/ws-services-calculation/WCBillingSlab.json
index df3eda61bf..d9a84c5aff 100644
--- a/data/as/3386435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386435/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386445/ws-services-calculation/Penalty.json b/data/as/3386445/ws-services-calculation/Penalty.json
index 51311d3b9a..842f8e05ab 100644
--- a/data/as/3386445/ws-services-calculation/Penalty.json
+++ b/data/as/3386445/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386445/ws-services-calculation/WCBillingSlab.json b/data/as/3386445/ws-services-calculation/WCBillingSlab.json
index 8bdde11324..6ed82cf772 100644
--- a/data/as/3386445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386445/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386466/ws-services-calculation/Penalty.json b/data/as/3386466/ws-services-calculation/Penalty.json
index 83b180d4f5..f5448b060b 100644
--- a/data/as/3386466/ws-services-calculation/Penalty.json
+++ b/data/as/3386466/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386466/ws-services-calculation/WCBillingSlab.json b/data/as/3386466/ws-services-calculation/WCBillingSlab.json
index ed53d218e8..a7f80ae63b 100644
--- a/data/as/3386466/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386466/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386515/ws-services-calculation/Penalty.json b/data/as/3386515/ws-services-calculation/Penalty.json
index 624f7d8c34..4be79597e9 100644
--- a/data/as/3386515/ws-services-calculation/Penalty.json
+++ b/data/as/3386515/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386515/ws-services-calculation/WCBillingSlab.json b/data/as/3386515/ws-services-calculation/WCBillingSlab.json
index 1d96e27b0d..d96160d229 100644
--- a/data/as/3386515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386515/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386526/ws-services-calculation/Penalty.json b/data/as/3386526/ws-services-calculation/Penalty.json
index 1857d3dc1c..8507c622fc 100644
--- a/data/as/3386526/ws-services-calculation/Penalty.json
+++ b/data/as/3386526/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386526/ws-services-calculation/WCBillingSlab.json b/data/as/3386526/ws-services-calculation/WCBillingSlab.json
index 2511c88b8b..2dd2fda703 100644
--- a/data/as/3386526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386526/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386540/ws-services-calculation/Penalty.json b/data/as/3386540/ws-services-calculation/Penalty.json
index 1d9b2974d6..36686b4cf4 100644
--- a/data/as/3386540/ws-services-calculation/Penalty.json
+++ b/data/as/3386540/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386540/ws-services-calculation/WCBillingSlab.json b/data/as/3386540/ws-services-calculation/WCBillingSlab.json
index 8f82d7edea..4b30835aa1 100644
--- a/data/as/3386540/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386540/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386544/ws-services-calculation/Penalty.json b/data/as/3386544/ws-services-calculation/Penalty.json
index bfc79c11c8..b53f7115c5 100644
--- a/data/as/3386544/ws-services-calculation/Penalty.json
+++ b/data/as/3386544/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386544/ws-services-calculation/WCBillingSlab.json b/data/as/3386544/ws-services-calculation/WCBillingSlab.json
index 6a4845451e..4828edc9ad 100644
--- a/data/as/3386544/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386544/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386664/ws-services-calculation/Penalty.json b/data/as/3386664/ws-services-calculation/Penalty.json
index f789a224d4..9dfd80f9e8 100644
--- a/data/as/3386664/ws-services-calculation/Penalty.json
+++ b/data/as/3386664/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386664/ws-services-calculation/WCBillingSlab.json b/data/as/3386664/ws-services-calculation/WCBillingSlab.json
index 795711ceca..0c071b9794 100644
--- a/data/as/3386664/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386664/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3386695/ws-services-calculation/Penalty.json b/data/as/3386695/ws-services-calculation/Penalty.json
index 5c316be6d5..95ed00a39e 100644
--- a/data/as/3386695/ws-services-calculation/Penalty.json
+++ b/data/as/3386695/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386695/ws-services-calculation/WCBillingSlab.json b/data/as/3386695/ws-services-calculation/WCBillingSlab.json
index 10a4aa5185..e7a428f003 100644
--- a/data/as/3386695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386695/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/3800160/ws-services-calculation/Penalty.json b/data/as/3800160/ws-services-calculation/Penalty.json
index 04ea0e53ae..8732d264a0 100644
--- a/data/as/3800160/ws-services-calculation/Penalty.json
+++ b/data/as/3800160/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3800160/ws-services-calculation/WCBillingSlab.json b/data/as/3800160/ws-services-calculation/WCBillingSlab.json
index c8f58a513f..369a7d1cf8 100644
--- a/data/as/3800160/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3800160/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4516012/ws-services-calculation/Penalty.json b/data/as/4516012/ws-services-calculation/Penalty.json
index ab4a704e78..461ac3b68c 100644
--- a/data/as/4516012/ws-services-calculation/Penalty.json
+++ b/data/as/4516012/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4516012/ws-services-calculation/WCBillingSlab.json b/data/as/4516012/ws-services-calculation/WCBillingSlab.json
index 7a539e4aff..c4c778eb7d 100644
--- a/data/as/4516012/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4516012/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4516046/ws-services-calculation/Penalty.json b/data/as/4516046/ws-services-calculation/Penalty.json
index 314c366fa4..381b4ebc16 100644
--- a/data/as/4516046/ws-services-calculation/Penalty.json
+++ b/data/as/4516046/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4516046/ws-services-calculation/WCBillingSlab.json b/data/as/4516046/ws-services-calculation/WCBillingSlab.json
index 8d6117a3d9..914ca45e18 100644
--- a/data/as/4516046/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4516046/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4516419/ws-services-calculation/Penalty.json b/data/as/4516419/ws-services-calculation/Penalty.json
index 0c1ee13a58..917637a3bd 100644
--- a/data/as/4516419/ws-services-calculation/Penalty.json
+++ b/data/as/4516419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4516419/ws-services-calculation/WCBillingSlab.json b/data/as/4516419/ws-services-calculation/WCBillingSlab.json
index ef4cc9d413..f5d7d711ee 100644
--- a/data/as/4516419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4516419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/452628/ws-services-calculation/Penalty.json b/data/as/452628/ws-services-calculation/Penalty.json
index 26908c85b3..b0a7a07a27 100644
--- a/data/as/452628/ws-services-calculation/Penalty.json
+++ b/data/as/452628/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/452628/ws-services-calculation/WCBillingSlab.json b/data/as/452628/ws-services-calculation/WCBillingSlab.json
index 86ad596e8d..01efe20212 100644
--- a/data/as/452628/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/452628/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/452685/ws-services-calculation/Penalty.json b/data/as/452685/ws-services-calculation/Penalty.json
index e9c550981d..bf81610a9e 100644
--- a/data/as/452685/ws-services-calculation/Penalty.json
+++ b/data/as/452685/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/452685/ws-services-calculation/WCBillingSlab.json b/data/as/452685/ws-services-calculation/WCBillingSlab.json
index c501cd731a..206080de35 100644
--- a/data/as/452685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/452685/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/452697/ws-services-calculation/Penalty.json b/data/as/452697/ws-services-calculation/Penalty.json
index 39e87e75ef..39241a2e25 100644
--- a/data/as/452697/ws-services-calculation/Penalty.json
+++ b/data/as/452697/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/452697/ws-services-calculation/WCBillingSlab.json b/data/as/452697/ws-services-calculation/WCBillingSlab.json
index d94a9b3147..7ddf4613b9 100644
--- a/data/as/452697/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/452697/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/453185/ws-services-calculation/Penalty.json b/data/as/453185/ws-services-calculation/Penalty.json
index f014ad8420..1ababdd721 100644
--- a/data/as/453185/ws-services-calculation/Penalty.json
+++ b/data/as/453185/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/453185/ws-services-calculation/WCBillingSlab.json b/data/as/453185/ws-services-calculation/WCBillingSlab.json
index 49c3519a3d..595bd5e9a5 100644
--- a/data/as/453185/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/453185/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/454276/ws-services-calculation/Penalty.json b/data/as/454276/ws-services-calculation/Penalty.json
index c3fde2063f..ca27ef4750 100644
--- a/data/as/454276/ws-services-calculation/Penalty.json
+++ b/data/as/454276/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/454276/ws-services-calculation/WCBillingSlab.json b/data/as/454276/ws-services-calculation/WCBillingSlab.json
index e4a52d67be..1f48d53485 100644
--- a/data/as/454276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/454276/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/455214/ws-services-calculation/Penalty.json b/data/as/455214/ws-services-calculation/Penalty.json
index 3ff64d45ac..7fcae568f4 100644
--- a/data/as/455214/ws-services-calculation/Penalty.json
+++ b/data/as/455214/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455214/ws-services-calculation/WCBillingSlab.json b/data/as/455214/ws-services-calculation/WCBillingSlab.json
index 53ab546fb0..3262cc0bb4 100644
--- a/data/as/455214/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455214/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/455219/ws-services-calculation/Penalty.json b/data/as/455219/ws-services-calculation/Penalty.json
index 98518f36e5..bd10d42e1c 100644
--- a/data/as/455219/ws-services-calculation/Penalty.json
+++ b/data/as/455219/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455219/ws-services-calculation/WCBillingSlab.json b/data/as/455219/ws-services-calculation/WCBillingSlab.json
index bd2ceaacd0..430416d827 100644
--- a/data/as/455219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455219/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/455220/ws-services-calculation/Penalty.json b/data/as/455220/ws-services-calculation/Penalty.json
index 85c5152b5f..ac8631697f 100644
--- a/data/as/455220/ws-services-calculation/Penalty.json
+++ b/data/as/455220/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455220/ws-services-calculation/WCBillingSlab.json b/data/as/455220/ws-services-calculation/WCBillingSlab.json
index 6416de92f2..dcfd3d3e72 100644
--- a/data/as/455220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455220/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/455374/ws-services-calculation/Penalty.json b/data/as/455374/ws-services-calculation/Penalty.json
index 08d34bee7a..d7700cf3ad 100644
--- a/data/as/455374/ws-services-calculation/Penalty.json
+++ b/data/as/455374/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455374/ws-services-calculation/WCBillingSlab.json b/data/as/455374/ws-services-calculation/WCBillingSlab.json
index 933129c979..2061e04d30 100644
--- a/data/as/455374/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455374/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4566832/ws-services-calculation/Penalty.json b/data/as/4566832/ws-services-calculation/Penalty.json
index 9f1c3a488c..a334a25845 100644
--- a/data/as/4566832/ws-services-calculation/Penalty.json
+++ b/data/as/4566832/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4566832/ws-services-calculation/WCBillingSlab.json b/data/as/4566832/ws-services-calculation/WCBillingSlab.json
index cf8a86811d..94814a5260 100644
--- a/data/as/4566832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4566832/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567143/ws-services-calculation/Penalty.json b/data/as/4567143/ws-services-calculation/Penalty.json
index acc8b20b09..4891536151 100644
--- a/data/as/4567143/ws-services-calculation/Penalty.json
+++ b/data/as/4567143/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567143/ws-services-calculation/WCBillingSlab.json b/data/as/4567143/ws-services-calculation/WCBillingSlab.json
index 5d697561f3..9318e3673c 100644
--- a/data/as/4567143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567143/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567157/ws-services-calculation/Penalty.json b/data/as/4567157/ws-services-calculation/Penalty.json
index 4f8fdaec8a..04fe80aaf8 100644
--- a/data/as/4567157/ws-services-calculation/Penalty.json
+++ b/data/as/4567157/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567157/ws-services-calculation/WCBillingSlab.json b/data/as/4567157/ws-services-calculation/WCBillingSlab.json
index f8049778fc..e982b35bc2 100644
--- a/data/as/4567157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567157/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567167/ws-services-calculation/Penalty.json b/data/as/4567167/ws-services-calculation/Penalty.json
index c5bc8f2d55..a3f3a38ab5 100644
--- a/data/as/4567167/ws-services-calculation/Penalty.json
+++ b/data/as/4567167/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567167/ws-services-calculation/WCBillingSlab.json b/data/as/4567167/ws-services-calculation/WCBillingSlab.json
index e2b5f768ad..0dfc71e0fb 100644
--- a/data/as/4567167/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567167/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567203/ws-services-calculation/Penalty.json b/data/as/4567203/ws-services-calculation/Penalty.json
index e174f41b94..7d2c22397c 100644
--- a/data/as/4567203/ws-services-calculation/Penalty.json
+++ b/data/as/4567203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567203/ws-services-calculation/WCBillingSlab.json b/data/as/4567203/ws-services-calculation/WCBillingSlab.json
index 32b0b7de7c..bbc4ff5f25 100644
--- a/data/as/4567203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567253/ws-services-calculation/Penalty.json b/data/as/4567253/ws-services-calculation/Penalty.json
index de30a34b8e..91a861b352 100644
--- a/data/as/4567253/ws-services-calculation/Penalty.json
+++ b/data/as/4567253/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567253/ws-services-calculation/WCBillingSlab.json b/data/as/4567253/ws-services-calculation/WCBillingSlab.json
index 8ac5c7e930..c43634cab7 100644
--- a/data/as/4567253/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567253/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567258/ws-services-calculation/Penalty.json b/data/as/4567258/ws-services-calculation/Penalty.json
index 89d2c2822e..81ef0bb31b 100644
--- a/data/as/4567258/ws-services-calculation/Penalty.json
+++ b/data/as/4567258/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567258/ws-services-calculation/WCBillingSlab.json b/data/as/4567258/ws-services-calculation/WCBillingSlab.json
index 8844bdddfb..2c165ea849 100644
--- a/data/as/4567258/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567258/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567264/ws-services-calculation/Penalty.json b/data/as/4567264/ws-services-calculation/Penalty.json
index a442f5bac7..9097cbd377 100644
--- a/data/as/4567264/ws-services-calculation/Penalty.json
+++ b/data/as/4567264/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567264/ws-services-calculation/WCBillingSlab.json b/data/as/4567264/ws-services-calculation/WCBillingSlab.json
index e05b7c843a..2f52d6bd42 100644
--- a/data/as/4567264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567264/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4567271/ws-services-calculation/Penalty.json b/data/as/4567271/ws-services-calculation/Penalty.json
index a790db5a51..85fe5ac90b 100644
--- a/data/as/4567271/ws-services-calculation/Penalty.json
+++ b/data/as/4567271/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567271/ws-services-calculation/WCBillingSlab.json b/data/as/4567271/ws-services-calculation/WCBillingSlab.json
index c0ae4a9fd2..b3b8a4af4b 100644
--- a/data/as/4567271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567271/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4627074/ws-services-calculation/Penalty.json b/data/as/4627074/ws-services-calculation/Penalty.json
index 762e544f34..82d2fdb203 100644
--- a/data/as/4627074/ws-services-calculation/Penalty.json
+++ b/data/as/4627074/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4627074/ws-services-calculation/WCBillingSlab.json b/data/as/4627074/ws-services-calculation/WCBillingSlab.json
index 45447e519c..88b3517c99 100644
--- a/data/as/4627074/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4627074/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4627137/ws-services-calculation/Penalty.json b/data/as/4627137/ws-services-calculation/Penalty.json
index aef0134e14..67b7bf9269 100644
--- a/data/as/4627137/ws-services-calculation/Penalty.json
+++ b/data/as/4627137/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4627137/ws-services-calculation/WCBillingSlab.json b/data/as/4627137/ws-services-calculation/WCBillingSlab.json
index b39962e6e3..58bcba2f1f 100644
--- a/data/as/4627137/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4627137/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4637354/ws-services-calculation/Penalty.json b/data/as/4637354/ws-services-calculation/Penalty.json
index d8f436f272..ba6e6628c0 100644
--- a/data/as/4637354/ws-services-calculation/Penalty.json
+++ b/data/as/4637354/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637354/ws-services-calculation/WCBillingSlab.json b/data/as/4637354/ws-services-calculation/WCBillingSlab.json
index 80db9d0320..974555b3ba 100644
--- a/data/as/4637354/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637354/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4637711/ws-services-calculation/Penalty.json b/data/as/4637711/ws-services-calculation/Penalty.json
index 68d36f4b92..7b0632cdf0 100644
--- a/data/as/4637711/ws-services-calculation/Penalty.json
+++ b/data/as/4637711/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637711/ws-services-calculation/WCBillingSlab.json b/data/as/4637711/ws-services-calculation/WCBillingSlab.json
index 36ad473c94..e1e1c1d2ec 100644
--- a/data/as/4637711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637711/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4637724/ws-services-calculation/Penalty.json b/data/as/4637724/ws-services-calculation/Penalty.json
index b05f0f7c89..55f1a836fa 100644
--- a/data/as/4637724/ws-services-calculation/Penalty.json
+++ b/data/as/4637724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637724/ws-services-calculation/WCBillingSlab.json b/data/as/4637724/ws-services-calculation/WCBillingSlab.json
index ddde4d53ec..fb838c943a 100644
--- a/data/as/4637724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4637728/ws-services-calculation/Penalty.json b/data/as/4637728/ws-services-calculation/Penalty.json
index 02f3fbc48f..4791d75004 100644
--- a/data/as/4637728/ws-services-calculation/Penalty.json
+++ b/data/as/4637728/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637728/ws-services-calculation/WCBillingSlab.json b/data/as/4637728/ws-services-calculation/WCBillingSlab.json
index 85f8aefb8c..fc6035d243 100644
--- a/data/as/4637728/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637728/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4638859/ws-services-calculation/Penalty.json b/data/as/4638859/ws-services-calculation/Penalty.json
index 2ea23df9a1..cc7ecdb28b 100644
--- a/data/as/4638859/ws-services-calculation/Penalty.json
+++ b/data/as/4638859/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4638859/ws-services-calculation/WCBillingSlab.json b/data/as/4638859/ws-services-calculation/WCBillingSlab.json
index 1282165227..46c78c2a78 100644
--- a/data/as/4638859/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4638859/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4639802/ws-services-calculation/Penalty.json b/data/as/4639802/ws-services-calculation/Penalty.json
index 518676b801..56879a0791 100644
--- a/data/as/4639802/ws-services-calculation/Penalty.json
+++ b/data/as/4639802/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639802/ws-services-calculation/WCBillingSlab.json b/data/as/4639802/ws-services-calculation/WCBillingSlab.json
index d652ba3d95..f87555111b 100644
--- a/data/as/4639802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639802/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4639900/ws-services-calculation/Penalty.json b/data/as/4639900/ws-services-calculation/Penalty.json
index c605ef26c7..e42404c046 100644
--- a/data/as/4639900/ws-services-calculation/Penalty.json
+++ b/data/as/4639900/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639900/ws-services-calculation/WCBillingSlab.json b/data/as/4639900/ws-services-calculation/WCBillingSlab.json
index 622a19ca9f..b8dbe807d7 100644
--- a/data/as/4639900/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639900/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4639926/ws-services-calculation/Penalty.json b/data/as/4639926/ws-services-calculation/Penalty.json
index d45eca862e..0228ea7b27 100644
--- a/data/as/4639926/ws-services-calculation/Penalty.json
+++ b/data/as/4639926/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639926/ws-services-calculation/WCBillingSlab.json b/data/as/4639926/ws-services-calculation/WCBillingSlab.json
index 92e6a2067c..ec2c0c2949 100644
--- a/data/as/4639926/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639926/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4639994/ws-services-calculation/Penalty.json b/data/as/4639994/ws-services-calculation/Penalty.json
index 4d4909e1c5..bf604de486 100644
--- a/data/as/4639994/ws-services-calculation/Penalty.json
+++ b/data/as/4639994/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639994/ws-services-calculation/WCBillingSlab.json b/data/as/4639994/ws-services-calculation/WCBillingSlab.json
index a62f1ece37..d9ea6fb6a4 100644
--- a/data/as/4639994/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639994/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4640433/ws-services-calculation/Penalty.json b/data/as/4640433/ws-services-calculation/Penalty.json
index 9d3c905370..45b969055b 100644
--- a/data/as/4640433/ws-services-calculation/Penalty.json
+++ b/data/as/4640433/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4640433/ws-services-calculation/WCBillingSlab.json b/data/as/4640433/ws-services-calculation/WCBillingSlab.json
index 8e86b01a8d..2c342c5833 100644
--- a/data/as/4640433/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4640433/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4640480/ws-services-calculation/Penalty.json b/data/as/4640480/ws-services-calculation/Penalty.json
index f1fb6f84f2..6eb8109171 100644
--- a/data/as/4640480/ws-services-calculation/Penalty.json
+++ b/data/as/4640480/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4640480/ws-services-calculation/WCBillingSlab.json b/data/as/4640480/ws-services-calculation/WCBillingSlab.json
index 56ae9ca4f1..26bf309f5f 100644
--- a/data/as/4640480/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4640480/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4642317/ws-services-calculation/Penalty.json b/data/as/4642317/ws-services-calculation/Penalty.json
index b0febef1c4..11c58d224a 100644
--- a/data/as/4642317/ws-services-calculation/Penalty.json
+++ b/data/as/4642317/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4642317/ws-services-calculation/WCBillingSlab.json b/data/as/4642317/ws-services-calculation/WCBillingSlab.json
index e1290383d4..e3304aff4a 100644
--- a/data/as/4642317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4642317/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4642337/ws-services-calculation/Penalty.json b/data/as/4642337/ws-services-calculation/Penalty.json
index 8d1669a612..cb987ed0f1 100644
--- a/data/as/4642337/ws-services-calculation/Penalty.json
+++ b/data/as/4642337/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4642337/ws-services-calculation/WCBillingSlab.json b/data/as/4642337/ws-services-calculation/WCBillingSlab.json
index 136e76b250..4cb6fe4f84 100644
--- a/data/as/4642337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4642337/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4651600/ws-services-calculation/Penalty.json b/data/as/4651600/ws-services-calculation/Penalty.json
index 840a353098..18e2d82430 100644
--- a/data/as/4651600/ws-services-calculation/Penalty.json
+++ b/data/as/4651600/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4651600/ws-services-calculation/WCBillingSlab.json b/data/as/4651600/ws-services-calculation/WCBillingSlab.json
index 6f0094d417..1b8b097ba2 100644
--- a/data/as/4651600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4651600/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4652293/ws-services-calculation/Penalty.json b/data/as/4652293/ws-services-calculation/Penalty.json
index 06cbdeac01..14ceea08c5 100644
--- a/data/as/4652293/ws-services-calculation/Penalty.json
+++ b/data/as/4652293/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4652293/ws-services-calculation/WCBillingSlab.json b/data/as/4652293/ws-services-calculation/WCBillingSlab.json
index 000c93602a..e85e4289e9 100644
--- a/data/as/4652293/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4652293/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4653590/ws-services-calculation/Penalty.json b/data/as/4653590/ws-services-calculation/Penalty.json
index 3f7d68a098..891038d94a 100644
--- a/data/as/4653590/ws-services-calculation/Penalty.json
+++ b/data/as/4653590/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4653590/ws-services-calculation/WCBillingSlab.json b/data/as/4653590/ws-services-calculation/WCBillingSlab.json
index b03b0f1a57..8bf6632fe8 100644
--- a/data/as/4653590/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4653590/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4654670/ws-services-calculation/Penalty.json b/data/as/4654670/ws-services-calculation/Penalty.json
index 3914a719c8..fd8bd4cc8d 100644
--- a/data/as/4654670/ws-services-calculation/Penalty.json
+++ b/data/as/4654670/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4654670/ws-services-calculation/WCBillingSlab.json b/data/as/4654670/ws-services-calculation/WCBillingSlab.json
index 2e15e990a0..e317a8f440 100644
--- a/data/as/4654670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4654670/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4655460/ws-services-calculation/Penalty.json b/data/as/4655460/ws-services-calculation/Penalty.json
index bca8ca514d..578d758c56 100644
--- a/data/as/4655460/ws-services-calculation/Penalty.json
+++ b/data/as/4655460/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4655460/ws-services-calculation/WCBillingSlab.json b/data/as/4655460/ws-services-calculation/WCBillingSlab.json
index 4d00e8b726..2eb50c1655 100644
--- a/data/as/4655460/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4655460/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4655542/ws-services-calculation/Penalty.json b/data/as/4655542/ws-services-calculation/Penalty.json
index 2860e9025b..a4ce6a4910 100644
--- a/data/as/4655542/ws-services-calculation/Penalty.json
+++ b/data/as/4655542/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4655542/ws-services-calculation/WCBillingSlab.json b/data/as/4655542/ws-services-calculation/WCBillingSlab.json
index d0b5b5c601..d0a70f62d5 100644
--- a/data/as/4655542/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4655542/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4655617/ws-services-calculation/Penalty.json b/data/as/4655617/ws-services-calculation/Penalty.json
index 05645a335d..072432a34f 100644
--- a/data/as/4655617/ws-services-calculation/Penalty.json
+++ b/data/as/4655617/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4655617/ws-services-calculation/WCBillingSlab.json b/data/as/4655617/ws-services-calculation/WCBillingSlab.json
index 9ddafc847c..29acdef764 100644
--- a/data/as/4655617/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4655617/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4656070/ws-services-calculation/Penalty.json b/data/as/4656070/ws-services-calculation/Penalty.json
index bded1f50e5..6933674b86 100644
--- a/data/as/4656070/ws-services-calculation/Penalty.json
+++ b/data/as/4656070/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4656070/ws-services-calculation/WCBillingSlab.json b/data/as/4656070/ws-services-calculation/WCBillingSlab.json
index a502790c77..cd9dbfca78 100644
--- a/data/as/4656070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4656070/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4656202/ws-services-calculation/Penalty.json b/data/as/4656202/ws-services-calculation/Penalty.json
index f64c7a7e38..d310ac58d3 100644
--- a/data/as/4656202/ws-services-calculation/Penalty.json
+++ b/data/as/4656202/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4656202/ws-services-calculation/WCBillingSlab.json b/data/as/4656202/ws-services-calculation/WCBillingSlab.json
index b5883fca07..cd6ad4b89b 100644
--- a/data/as/4656202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4656202/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4656990/ws-services-calculation/Penalty.json b/data/as/4656990/ws-services-calculation/Penalty.json
index 56aa736072..1e455cd739 100644
--- a/data/as/4656990/ws-services-calculation/Penalty.json
+++ b/data/as/4656990/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4656990/ws-services-calculation/WCBillingSlab.json b/data/as/4656990/ws-services-calculation/WCBillingSlab.json
index 8bbfde4f0b..aa114c2cae 100644
--- a/data/as/4656990/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4656990/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4657126/ws-services-calculation/Penalty.json b/data/as/4657126/ws-services-calculation/Penalty.json
index 605340139e..e39b7dfb3f 100644
--- a/data/as/4657126/ws-services-calculation/Penalty.json
+++ b/data/as/4657126/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657126/ws-services-calculation/WCBillingSlab.json b/data/as/4657126/ws-services-calculation/WCBillingSlab.json
index c50f1cf9fa..b2d2abe01f 100644
--- a/data/as/4657126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657126/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4657150/ws-services-calculation/Penalty.json b/data/as/4657150/ws-services-calculation/Penalty.json
index b6ab68e16c..b76a3474e1 100644
--- a/data/as/4657150/ws-services-calculation/Penalty.json
+++ b/data/as/4657150/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657150/ws-services-calculation/WCBillingSlab.json b/data/as/4657150/ws-services-calculation/WCBillingSlab.json
index 27ecffaaa5..5838f8c84c 100644
--- a/data/as/4657150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657150/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4657189/ws-services-calculation/Penalty.json b/data/as/4657189/ws-services-calculation/Penalty.json
index a6f923295d..87f2666cc0 100644
--- a/data/as/4657189/ws-services-calculation/Penalty.json
+++ b/data/as/4657189/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657189/ws-services-calculation/WCBillingSlab.json b/data/as/4657189/ws-services-calculation/WCBillingSlab.json
index 70e5a3b36b..a70188a8e9 100644
--- a/data/as/4657189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657189/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4657198/ws-services-calculation/Penalty.json b/data/as/4657198/ws-services-calculation/Penalty.json
index b5851402cf..96e9fe125b 100644
--- a/data/as/4657198/ws-services-calculation/Penalty.json
+++ b/data/as/4657198/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657198/ws-services-calculation/WCBillingSlab.json b/data/as/4657198/ws-services-calculation/WCBillingSlab.json
index 07a46dc304..da33aa5cc1 100644
--- a/data/as/4657198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657198/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4657250/ws-services-calculation/Penalty.json b/data/as/4657250/ws-services-calculation/Penalty.json
index 05bacc254c..7235e55ebf 100644
--- a/data/as/4657250/ws-services-calculation/Penalty.json
+++ b/data/as/4657250/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657250/ws-services-calculation/WCBillingSlab.json b/data/as/4657250/ws-services-calculation/WCBillingSlab.json
index 112b94cd2f..4fbb482d4e 100644
--- a/data/as/4657250/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657250/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4658923/ws-services-calculation/Penalty.json b/data/as/4658923/ws-services-calculation/Penalty.json
index df74871314..92055507da 100644
--- a/data/as/4658923/ws-services-calculation/Penalty.json
+++ b/data/as/4658923/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4658923/ws-services-calculation/WCBillingSlab.json b/data/as/4658923/ws-services-calculation/WCBillingSlab.json
index 389b617100..e1d6680c4e 100644
--- a/data/as/4658923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4658923/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4658962/ws-services-calculation/Penalty.json b/data/as/4658962/ws-services-calculation/Penalty.json
index e91ca35302..7b74d131fd 100644
--- a/data/as/4658962/ws-services-calculation/Penalty.json
+++ b/data/as/4658962/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4658962/ws-services-calculation/WCBillingSlab.json b/data/as/4658962/ws-services-calculation/WCBillingSlab.json
index e128a396dd..af91f601e3 100644
--- a/data/as/4658962/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4658962/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4659024/ws-services-calculation/Penalty.json b/data/as/4659024/ws-services-calculation/Penalty.json
index 40a9fed60c..c990c33f90 100644
--- a/data/as/4659024/ws-services-calculation/Penalty.json
+++ b/data/as/4659024/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4659024/ws-services-calculation/WCBillingSlab.json b/data/as/4659024/ws-services-calculation/WCBillingSlab.json
index a31da86422..c44318188b 100644
--- a/data/as/4659024/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4659024/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4659210/ws-services-calculation/Penalty.json b/data/as/4659210/ws-services-calculation/Penalty.json
index be09fed0b5..18a41dcea0 100644
--- a/data/as/4659210/ws-services-calculation/Penalty.json
+++ b/data/as/4659210/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4659210/ws-services-calculation/WCBillingSlab.json b/data/as/4659210/ws-services-calculation/WCBillingSlab.json
index 47bccea7cc..f9cee57f70 100644
--- a/data/as/4659210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4659210/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4668398/ws-services-calculation/Penalty.json b/data/as/4668398/ws-services-calculation/Penalty.json
index 069e0acad1..be6991fa06 100644
--- a/data/as/4668398/ws-services-calculation/Penalty.json
+++ b/data/as/4668398/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4668398/ws-services-calculation/WCBillingSlab.json b/data/as/4668398/ws-services-calculation/WCBillingSlab.json
index e6cae845da..284ed7c807 100644
--- a/data/as/4668398/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4668398/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4869442/ws-services-calculation/Penalty.json b/data/as/4869442/ws-services-calculation/Penalty.json
index 08cf426af9..7f176b232f 100644
--- a/data/as/4869442/ws-services-calculation/Penalty.json
+++ b/data/as/4869442/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4869442/ws-services-calculation/WCBillingSlab.json b/data/as/4869442/ws-services-calculation/WCBillingSlab.json
index 56b71cfacc..befbdca0f6 100644
--- a/data/as/4869442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4869442/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4870166/ws-services-calculation/Penalty.json b/data/as/4870166/ws-services-calculation/Penalty.json
index f57fdeb464..1e7b2313f4 100644
--- a/data/as/4870166/ws-services-calculation/Penalty.json
+++ b/data/as/4870166/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870166/ws-services-calculation/WCBillingSlab.json b/data/as/4870166/ws-services-calculation/WCBillingSlab.json
index 175754cf97..b7e63bff08 100644
--- a/data/as/4870166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870166/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4870229/ws-services-calculation/Penalty.json b/data/as/4870229/ws-services-calculation/Penalty.json
index 78b0bb0d2c..f24945b674 100644
--- a/data/as/4870229/ws-services-calculation/Penalty.json
+++ b/data/as/4870229/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870229/ws-services-calculation/WCBillingSlab.json b/data/as/4870229/ws-services-calculation/WCBillingSlab.json
index fb05b2ad72..8e5b158190 100644
--- a/data/as/4870229/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870229/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4870250/ws-services-calculation/Penalty.json b/data/as/4870250/ws-services-calculation/Penalty.json
index d916b0ef66..3f4f59e0ee 100644
--- a/data/as/4870250/ws-services-calculation/Penalty.json
+++ b/data/as/4870250/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870250/ws-services-calculation/WCBillingSlab.json b/data/as/4870250/ws-services-calculation/WCBillingSlab.json
index 215e1d5a62..05813db4ab 100644
--- a/data/as/4870250/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870250/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4870307/ws-services-calculation/Penalty.json b/data/as/4870307/ws-services-calculation/Penalty.json
index d9ef54b838..dcbfd62782 100644
--- a/data/as/4870307/ws-services-calculation/Penalty.json
+++ b/data/as/4870307/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870307/ws-services-calculation/WCBillingSlab.json b/data/as/4870307/ws-services-calculation/WCBillingSlab.json
index bbe434d02f..ad99b716fd 100644
--- a/data/as/4870307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870307/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872574/ws-services-calculation/Penalty.json b/data/as/4872574/ws-services-calculation/Penalty.json
index 956d71ab81..69e71f5d32 100644
--- a/data/as/4872574/ws-services-calculation/Penalty.json
+++ b/data/as/4872574/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872574/ws-services-calculation/WCBillingSlab.json b/data/as/4872574/ws-services-calculation/WCBillingSlab.json
index 3bcffd02c5..47037cccbd 100644
--- a/data/as/4872574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872574/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872595/ws-services-calculation/Penalty.json b/data/as/4872595/ws-services-calculation/Penalty.json
index 5423b4b267..31ea1fb7d0 100644
--- a/data/as/4872595/ws-services-calculation/Penalty.json
+++ b/data/as/4872595/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872595/ws-services-calculation/WCBillingSlab.json b/data/as/4872595/ws-services-calculation/WCBillingSlab.json
index 31ffcec7c5..3e92cf3c81 100644
--- a/data/as/4872595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872595/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872646/ws-services-calculation/Penalty.json b/data/as/4872646/ws-services-calculation/Penalty.json
index 27724bc3a4..c33fb3b75f 100644
--- a/data/as/4872646/ws-services-calculation/Penalty.json
+++ b/data/as/4872646/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872646/ws-services-calculation/WCBillingSlab.json b/data/as/4872646/ws-services-calculation/WCBillingSlab.json
index 52b7d2a86e..8eab10d41d 100644
--- a/data/as/4872646/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872646/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872699/ws-services-calculation/Penalty.json b/data/as/4872699/ws-services-calculation/Penalty.json
index 42a543cb76..e9b5b60bc0 100644
--- a/data/as/4872699/ws-services-calculation/Penalty.json
+++ b/data/as/4872699/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872699/ws-services-calculation/WCBillingSlab.json b/data/as/4872699/ws-services-calculation/WCBillingSlab.json
index 3eced6545d..91d4397367 100644
--- a/data/as/4872699/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872699/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872806/ws-services-calculation/Penalty.json b/data/as/4872806/ws-services-calculation/Penalty.json
index 42c5971514..ac80a98a9b 100644
--- a/data/as/4872806/ws-services-calculation/Penalty.json
+++ b/data/as/4872806/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872806/ws-services-calculation/WCBillingSlab.json b/data/as/4872806/ws-services-calculation/WCBillingSlab.json
index 08f0696b10..938f812e40 100644
--- a/data/as/4872806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872806/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872849/ws-services-calculation/Penalty.json b/data/as/4872849/ws-services-calculation/Penalty.json
index 6316008673..980bbfdc96 100644
--- a/data/as/4872849/ws-services-calculation/Penalty.json
+++ b/data/as/4872849/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872849/ws-services-calculation/WCBillingSlab.json b/data/as/4872849/ws-services-calculation/WCBillingSlab.json
index abe4e3e3fe..a2d2853a67 100644
--- a/data/as/4872849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872849/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4872988/ws-services-calculation/Penalty.json b/data/as/4872988/ws-services-calculation/Penalty.json
index c8583e592d..03fd8f936e 100644
--- a/data/as/4872988/ws-services-calculation/Penalty.json
+++ b/data/as/4872988/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872988/ws-services-calculation/WCBillingSlab.json b/data/as/4872988/ws-services-calculation/WCBillingSlab.json
index c6d5ffe291..a497923066 100644
--- a/data/as/4872988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872988/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873102/ws-services-calculation/Penalty.json b/data/as/4873102/ws-services-calculation/Penalty.json
index 4e4076f43f..cb41d39db3 100644
--- a/data/as/4873102/ws-services-calculation/Penalty.json
+++ b/data/as/4873102/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873102/ws-services-calculation/WCBillingSlab.json b/data/as/4873102/ws-services-calculation/WCBillingSlab.json
index 85826648f2..82bce495a7 100644
--- a/data/as/4873102/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873102/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873166/ws-services-calculation/Penalty.json b/data/as/4873166/ws-services-calculation/Penalty.json
index 56ec0e3a43..c756a8b2d1 100644
--- a/data/as/4873166/ws-services-calculation/Penalty.json
+++ b/data/as/4873166/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873166/ws-services-calculation/WCBillingSlab.json b/data/as/4873166/ws-services-calculation/WCBillingSlab.json
index 7b6fe85f97..abfb185528 100644
--- a/data/as/4873166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873166/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873607/ws-services-calculation/Penalty.json b/data/as/4873607/ws-services-calculation/Penalty.json
index 6101d08f67..36fd09252f 100644
--- a/data/as/4873607/ws-services-calculation/Penalty.json
+++ b/data/as/4873607/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873607/ws-services-calculation/WCBillingSlab.json b/data/as/4873607/ws-services-calculation/WCBillingSlab.json
index e33ef1963b..4146663d74 100644
--- a/data/as/4873607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873607/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873634/ws-services-calculation/Penalty.json b/data/as/4873634/ws-services-calculation/Penalty.json
index c5565abd83..ed72d894c4 100644
--- a/data/as/4873634/ws-services-calculation/Penalty.json
+++ b/data/as/4873634/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873634/ws-services-calculation/WCBillingSlab.json b/data/as/4873634/ws-services-calculation/WCBillingSlab.json
index ac2b6c362b..d6462e18ed 100644
--- a/data/as/4873634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873634/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873695/ws-services-calculation/Penalty.json b/data/as/4873695/ws-services-calculation/Penalty.json
index 6d7e5e9149..ae9e5f72c5 100644
--- a/data/as/4873695/ws-services-calculation/Penalty.json
+++ b/data/as/4873695/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873695/ws-services-calculation/WCBillingSlab.json b/data/as/4873695/ws-services-calculation/WCBillingSlab.json
index b2617f802a..b17402085d 100644
--- a/data/as/4873695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873695/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873715/ws-services-calculation/Penalty.json b/data/as/4873715/ws-services-calculation/Penalty.json
index ec1613197d..19b2fdff0d 100644
--- a/data/as/4873715/ws-services-calculation/Penalty.json
+++ b/data/as/4873715/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873715/ws-services-calculation/WCBillingSlab.json b/data/as/4873715/ws-services-calculation/WCBillingSlab.json
index 6f209fc18c..22258dec44 100644
--- a/data/as/4873715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873715/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873739/ws-services-calculation/Penalty.json b/data/as/4873739/ws-services-calculation/Penalty.json
index 088c49c651..a5011dd6ef 100644
--- a/data/as/4873739/ws-services-calculation/Penalty.json
+++ b/data/as/4873739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873739/ws-services-calculation/WCBillingSlab.json b/data/as/4873739/ws-services-calculation/WCBillingSlab.json
index 84c4b13d0e..046e4f01ea 100644
--- a/data/as/4873739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873771/ws-services-calculation/Penalty.json b/data/as/4873771/ws-services-calculation/Penalty.json
index 59ddf791a9..3825ff6ead 100644
--- a/data/as/4873771/ws-services-calculation/Penalty.json
+++ b/data/as/4873771/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873771/ws-services-calculation/WCBillingSlab.json b/data/as/4873771/ws-services-calculation/WCBillingSlab.json
index 10caa411ae..d51cb188c6 100644
--- a/data/as/4873771/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873771/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873867/ws-services-calculation/Penalty.json b/data/as/4873867/ws-services-calculation/Penalty.json
index ae1bf2c156..981e8d747d 100644
--- a/data/as/4873867/ws-services-calculation/Penalty.json
+++ b/data/as/4873867/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873867/ws-services-calculation/WCBillingSlab.json b/data/as/4873867/ws-services-calculation/WCBillingSlab.json
index 2c84649c04..308fb1ae95 100644
--- a/data/as/4873867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873867/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4873898/ws-services-calculation/Penalty.json b/data/as/4873898/ws-services-calculation/Penalty.json
index b7df092790..25aa4c47c9 100644
--- a/data/as/4873898/ws-services-calculation/Penalty.json
+++ b/data/as/4873898/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873898/ws-services-calculation/WCBillingSlab.json b/data/as/4873898/ws-services-calculation/WCBillingSlab.json
index 7cf4293144..a14a207c2e 100644
--- a/data/as/4873898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873898/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4887720/ws-services-calculation/Penalty.json b/data/as/4887720/ws-services-calculation/Penalty.json
index b1db72daa4..eaf77ec40b 100644
--- a/data/as/4887720/ws-services-calculation/Penalty.json
+++ b/data/as/4887720/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887720/ws-services-calculation/WCBillingSlab.json b/data/as/4887720/ws-services-calculation/WCBillingSlab.json
index 6da315435e..3b116b0a8e 100644
--- a/data/as/4887720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887720/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4887740/ws-services-calculation/Penalty.json b/data/as/4887740/ws-services-calculation/Penalty.json
index 53dbdfb893..7d037399f7 100644
--- a/data/as/4887740/ws-services-calculation/Penalty.json
+++ b/data/as/4887740/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887740/ws-services-calculation/WCBillingSlab.json b/data/as/4887740/ws-services-calculation/WCBillingSlab.json
index d4a399f27c..f10d3da73c 100644
--- a/data/as/4887740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887740/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4887755/ws-services-calculation/Penalty.json b/data/as/4887755/ws-services-calculation/Penalty.json
index 19f0aa890e..2a312dcc36 100644
--- a/data/as/4887755/ws-services-calculation/Penalty.json
+++ b/data/as/4887755/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887755/ws-services-calculation/WCBillingSlab.json b/data/as/4887755/ws-services-calculation/WCBillingSlab.json
index 71a8766fbc..a091d222e4 100644
--- a/data/as/4887755/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887755/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4887898/ws-services-calculation/Penalty.json b/data/as/4887898/ws-services-calculation/Penalty.json
index d131533bb5..c4354cbf03 100644
--- a/data/as/4887898/ws-services-calculation/Penalty.json
+++ b/data/as/4887898/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887898/ws-services-calculation/WCBillingSlab.json b/data/as/4887898/ws-services-calculation/WCBillingSlab.json
index 433e2bbb33..776cca19be 100644
--- a/data/as/4887898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887898/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4887947/ws-services-calculation/Penalty.json b/data/as/4887947/ws-services-calculation/Penalty.json
index 5492a09738..166bb57bd8 100644
--- a/data/as/4887947/ws-services-calculation/Penalty.json
+++ b/data/as/4887947/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887947/ws-services-calculation/WCBillingSlab.json b/data/as/4887947/ws-services-calculation/WCBillingSlab.json
index ccb73ae60c..e1fc6092bd 100644
--- a/data/as/4887947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887947/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4888080/ws-services-calculation/Penalty.json b/data/as/4888080/ws-services-calculation/Penalty.json
index 18d6f4df49..20ab5f0fc4 100644
--- a/data/as/4888080/ws-services-calculation/Penalty.json
+++ b/data/as/4888080/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888080/ws-services-calculation/WCBillingSlab.json b/data/as/4888080/ws-services-calculation/WCBillingSlab.json
index 49c0c68927..227005d31e 100644
--- a/data/as/4888080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888080/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4888114/ws-services-calculation/Penalty.json b/data/as/4888114/ws-services-calculation/Penalty.json
index 9ac44f25d1..e0672cc3b9 100644
--- a/data/as/4888114/ws-services-calculation/Penalty.json
+++ b/data/as/4888114/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888114/ws-services-calculation/WCBillingSlab.json b/data/as/4888114/ws-services-calculation/WCBillingSlab.json
index 33ff849f52..bae25e505f 100644
--- a/data/as/4888114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888114/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4888263/ws-services-calculation/Penalty.json b/data/as/4888263/ws-services-calculation/Penalty.json
index cbc54d160b..522b6b206b 100644
--- a/data/as/4888263/ws-services-calculation/Penalty.json
+++ b/data/as/4888263/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888263/ws-services-calculation/WCBillingSlab.json b/data/as/4888263/ws-services-calculation/WCBillingSlab.json
index d6c7f9ade1..ea57325dc4 100644
--- a/data/as/4888263/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888263/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4888294/ws-services-calculation/Penalty.json b/data/as/4888294/ws-services-calculation/Penalty.json
index d489b02eb6..5190b108b3 100644
--- a/data/as/4888294/ws-services-calculation/Penalty.json
+++ b/data/as/4888294/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888294/ws-services-calculation/WCBillingSlab.json b/data/as/4888294/ws-services-calculation/WCBillingSlab.json
index d68f13cc31..82f485cb7f 100644
--- a/data/as/4888294/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888294/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492155/ws-services-calculation/Penalty.json b/data/as/492155/ws-services-calculation/Penalty.json
index 98f0d350c8..50a6ff20f5 100644
--- a/data/as/492155/ws-services-calculation/Penalty.json
+++ b/data/as/492155/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492155/ws-services-calculation/WCBillingSlab.json b/data/as/492155/ws-services-calculation/WCBillingSlab.json
index f9dd4d02bc..9ac7a0220e 100644
--- a/data/as/492155/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492155/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492158/ws-services-calculation/Penalty.json b/data/as/492158/ws-services-calculation/Penalty.json
index 53c375d65c..16c4752c77 100644
--- a/data/as/492158/ws-services-calculation/Penalty.json
+++ b/data/as/492158/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492158/ws-services-calculation/WCBillingSlab.json b/data/as/492158/ws-services-calculation/WCBillingSlab.json
index b4bd2cd661..17a73da5ba 100644
--- a/data/as/492158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492158/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492161/ws-services-calculation/Penalty.json b/data/as/492161/ws-services-calculation/Penalty.json
index bb60b9f323..57467870ed 100644
--- a/data/as/492161/ws-services-calculation/Penalty.json
+++ b/data/as/492161/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492161/ws-services-calculation/WCBillingSlab.json b/data/as/492161/ws-services-calculation/WCBillingSlab.json
index 12ee33b489..e27f3eb9df 100644
--- a/data/as/492161/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492161/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492165/ws-services-calculation/Penalty.json b/data/as/492165/ws-services-calculation/Penalty.json
index cc4e25cb27..b6eda85a87 100644
--- a/data/as/492165/ws-services-calculation/Penalty.json
+++ b/data/as/492165/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492165/ws-services-calculation/WCBillingSlab.json b/data/as/492165/ws-services-calculation/WCBillingSlab.json
index 2a4a3a771d..293d45e13b 100644
--- a/data/as/492165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492165/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492168/ws-services-calculation/Penalty.json b/data/as/492168/ws-services-calculation/Penalty.json
index 0a5a549d91..3d70ea79c3 100644
--- a/data/as/492168/ws-services-calculation/Penalty.json
+++ b/data/as/492168/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492168/ws-services-calculation/WCBillingSlab.json b/data/as/492168/ws-services-calculation/WCBillingSlab.json
index d6911ba260..e04a105f87 100644
--- a/data/as/492168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492168/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492177/ws-services-calculation/Penalty.json b/data/as/492177/ws-services-calculation/Penalty.json
index af591f7b35..fb39c13347 100644
--- a/data/as/492177/ws-services-calculation/Penalty.json
+++ b/data/as/492177/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492177/ws-services-calculation/WCBillingSlab.json b/data/as/492177/ws-services-calculation/WCBillingSlab.json
index 5dc3651a03..270b61a1db 100644
--- a/data/as/492177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492177/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/492182/ws-services-calculation/Penalty.json b/data/as/492182/ws-services-calculation/Penalty.json
index d12b5440ed..8edec0ea91 100644
--- a/data/as/492182/ws-services-calculation/Penalty.json
+++ b/data/as/492182/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492182/ws-services-calculation/WCBillingSlab.json b/data/as/492182/ws-services-calculation/WCBillingSlab.json
index dc25bd35f1..2cbc2f78d3 100644
--- a/data/as/492182/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492182/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/4963515/ws-services-calculation/Penalty.json b/data/as/4963515/ws-services-calculation/Penalty.json
index 39add5981d..746bb88b61 100644
--- a/data/as/4963515/ws-services-calculation/Penalty.json
+++ b/data/as/4963515/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4963515/ws-services-calculation/WCBillingSlab.json b/data/as/4963515/ws-services-calculation/WCBillingSlab.json
index cf3c134b99..4eced1821b 100644
--- a/data/as/4963515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4963515/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5072706/ws-services-calculation/Penalty.json b/data/as/5072706/ws-services-calculation/Penalty.json
index 92d376c8e5..c691fe5335 100644
--- a/data/as/5072706/ws-services-calculation/Penalty.json
+++ b/data/as/5072706/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072706/ws-services-calculation/WCBillingSlab.json b/data/as/5072706/ws-services-calculation/WCBillingSlab.json
index 9aa772656c..3cf4ab7afb 100644
--- a/data/as/5072706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072706/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5072752/ws-services-calculation/Penalty.json b/data/as/5072752/ws-services-calculation/Penalty.json
index 0d92a53429..b031d34cdc 100644
--- a/data/as/5072752/ws-services-calculation/Penalty.json
+++ b/data/as/5072752/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072752/ws-services-calculation/WCBillingSlab.json b/data/as/5072752/ws-services-calculation/WCBillingSlab.json
index 21a5808065..cd6aca02e9 100644
--- a/data/as/5072752/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072752/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5072807/ws-services-calculation/Penalty.json b/data/as/5072807/ws-services-calculation/Penalty.json
index f268b08210..4425617613 100644
--- a/data/as/5072807/ws-services-calculation/Penalty.json
+++ b/data/as/5072807/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072807/ws-services-calculation/WCBillingSlab.json b/data/as/5072807/ws-services-calculation/WCBillingSlab.json
index 07f15748d7..f83b577b0b 100644
--- a/data/as/5072807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072807/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5072821/ws-services-calculation/Penalty.json b/data/as/5072821/ws-services-calculation/Penalty.json
index 818a894aed..a251a0ecef 100644
--- a/data/as/5072821/ws-services-calculation/Penalty.json
+++ b/data/as/5072821/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072821/ws-services-calculation/WCBillingSlab.json b/data/as/5072821/ws-services-calculation/WCBillingSlab.json
index 33b3e07ca5..ca495bb937 100644
--- a/data/as/5072821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072821/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5072838/ws-services-calculation/Penalty.json b/data/as/5072838/ws-services-calculation/Penalty.json
index 0137a73e9a..99a2f42309 100644
--- a/data/as/5072838/ws-services-calculation/Penalty.json
+++ b/data/as/5072838/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072838/ws-services-calculation/WCBillingSlab.json b/data/as/5072838/ws-services-calculation/WCBillingSlab.json
index 5d2450abd0..b077cc4c7f 100644
--- a/data/as/5072838/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072838/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5072844/ws-services-calculation/Penalty.json b/data/as/5072844/ws-services-calculation/Penalty.json
index f5ecb20097..4dd6783171 100644
--- a/data/as/5072844/ws-services-calculation/Penalty.json
+++ b/data/as/5072844/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072844/ws-services-calculation/WCBillingSlab.json b/data/as/5072844/ws-services-calculation/WCBillingSlab.json
index 7a5cd72839..6858b6a325 100644
--- a/data/as/5072844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072844/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5073321/ws-services-calculation/Penalty.json b/data/as/5073321/ws-services-calculation/Penalty.json
index f92efea59a..0f5625c022 100644
--- a/data/as/5073321/ws-services-calculation/Penalty.json
+++ b/data/as/5073321/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073321/ws-services-calculation/WCBillingSlab.json b/data/as/5073321/ws-services-calculation/WCBillingSlab.json
index acca6d6df1..3fab316551 100644
--- a/data/as/5073321/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073321/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5073330/ws-services-calculation/Penalty.json b/data/as/5073330/ws-services-calculation/Penalty.json
index 4ebd44737f..42dcab27df 100644
--- a/data/as/5073330/ws-services-calculation/Penalty.json
+++ b/data/as/5073330/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073330/ws-services-calculation/WCBillingSlab.json b/data/as/5073330/ws-services-calculation/WCBillingSlab.json
index 1f0d286176..159d0c6211 100644
--- a/data/as/5073330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073330/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5073372/ws-services-calculation/Penalty.json b/data/as/5073372/ws-services-calculation/Penalty.json
index 633705250d..4f6a750505 100644
--- a/data/as/5073372/ws-services-calculation/Penalty.json
+++ b/data/as/5073372/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073372/ws-services-calculation/WCBillingSlab.json b/data/as/5073372/ws-services-calculation/WCBillingSlab.json
index c011da6e6c..e678172d48 100644
--- a/data/as/5073372/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073372/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5073861/ws-services-calculation/Penalty.json b/data/as/5073861/ws-services-calculation/Penalty.json
index 4224ecbe82..27fdcba0a7 100644
--- a/data/as/5073861/ws-services-calculation/Penalty.json
+++ b/data/as/5073861/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073861/ws-services-calculation/WCBillingSlab.json b/data/as/5073861/ws-services-calculation/WCBillingSlab.json
index a310d34158..98357863d2 100644
--- a/data/as/5073861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073861/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5073879/ws-services-calculation/Penalty.json b/data/as/5073879/ws-services-calculation/Penalty.json
index 7403386d67..55e881db35 100644
--- a/data/as/5073879/ws-services-calculation/Penalty.json
+++ b/data/as/5073879/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073879/ws-services-calculation/WCBillingSlab.json b/data/as/5073879/ws-services-calculation/WCBillingSlab.json
index 639b3cdbb5..6fe51a694b 100644
--- a/data/as/5073879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073879/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5073951/ws-services-calculation/Penalty.json b/data/as/5073951/ws-services-calculation/Penalty.json
index 15d9d52c20..dedd0a2947 100644
--- a/data/as/5073951/ws-services-calculation/Penalty.json
+++ b/data/as/5073951/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073951/ws-services-calculation/WCBillingSlab.json b/data/as/5073951/ws-services-calculation/WCBillingSlab.json
index f8efb1ac25..b348bdfd7f 100644
--- a/data/as/5073951/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073951/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5074126/ws-services-calculation/Penalty.json b/data/as/5074126/ws-services-calculation/Penalty.json
index c0ae2b4708..81d25b06fd 100644
--- a/data/as/5074126/ws-services-calculation/Penalty.json
+++ b/data/as/5074126/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5074126/ws-services-calculation/WCBillingSlab.json b/data/as/5074126/ws-services-calculation/WCBillingSlab.json
index 49beb2f257..69c79c13c6 100644
--- a/data/as/5074126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5074126/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5074129/ws-services-calculation/Penalty.json b/data/as/5074129/ws-services-calculation/Penalty.json
index 2b221e23e5..3b0c280f01 100644
--- a/data/as/5074129/ws-services-calculation/Penalty.json
+++ b/data/as/5074129/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5074129/ws-services-calculation/WCBillingSlab.json b/data/as/5074129/ws-services-calculation/WCBillingSlab.json
index ef6e711092..cf76da1df8 100644
--- a/data/as/5074129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5074129/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5074133/ws-services-calculation/Penalty.json b/data/as/5074133/ws-services-calculation/Penalty.json
index 3c7b5db58f..0ab3f1ac00 100644
--- a/data/as/5074133/ws-services-calculation/Penalty.json
+++ b/data/as/5074133/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5074133/ws-services-calculation/WCBillingSlab.json b/data/as/5074133/ws-services-calculation/WCBillingSlab.json
index 69be34ea03..add1607e6f 100644
--- a/data/as/5074133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5074133/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/50796/ws-services-calculation/Penalty.json b/data/as/50796/ws-services-calculation/Penalty.json
index 632b5422d8..012881ed40 100644
--- a/data/as/50796/ws-services-calculation/Penalty.json
+++ b/data/as/50796/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/50796/ws-services-calculation/WCBillingSlab.json b/data/as/50796/ws-services-calculation/WCBillingSlab.json
index 50425ff22a..16799faf81 100644
--- a/data/as/50796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/50796/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5102401/ws-services-calculation/Penalty.json b/data/as/5102401/ws-services-calculation/Penalty.json
index 2dbcf58397..fb81618c70 100644
--- a/data/as/5102401/ws-services-calculation/Penalty.json
+++ b/data/as/5102401/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5102401/ws-services-calculation/WCBillingSlab.json b/data/as/5102401/ws-services-calculation/WCBillingSlab.json
index f159065d3f..a6eda05272 100644
--- a/data/as/5102401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5102401/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5102996/ws-services-calculation/Penalty.json b/data/as/5102996/ws-services-calculation/Penalty.json
index c7b58888e5..3d57dad379 100644
--- a/data/as/5102996/ws-services-calculation/Penalty.json
+++ b/data/as/5102996/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5102996/ws-services-calculation/WCBillingSlab.json b/data/as/5102996/ws-services-calculation/WCBillingSlab.json
index 17023fd6f2..3083c3597c 100644
--- a/data/as/5102996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5102996/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5103007/ws-services-calculation/Penalty.json b/data/as/5103007/ws-services-calculation/Penalty.json
index 3327cbe399..19aca9fcd1 100644
--- a/data/as/5103007/ws-services-calculation/Penalty.json
+++ b/data/as/5103007/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5103007/ws-services-calculation/WCBillingSlab.json b/data/as/5103007/ws-services-calculation/WCBillingSlab.json
index eea76b108c..4d6ee4a6a0 100644
--- a/data/as/5103007/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5103007/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/51526/ws-services-calculation/Penalty.json b/data/as/51526/ws-services-calculation/Penalty.json
index 768137ad25..e13535493f 100644
--- a/data/as/51526/ws-services-calculation/Penalty.json
+++ b/data/as/51526/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/51526/ws-services-calculation/WCBillingSlab.json b/data/as/51526/ws-services-calculation/WCBillingSlab.json
index 06717babeb..f8b1aa1c23 100644
--- a/data/as/51526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/51526/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/51536/ws-services-calculation/Penalty.json b/data/as/51536/ws-services-calculation/Penalty.json
index a0ae7f8840..4f5d0eaf3e 100644
--- a/data/as/51536/ws-services-calculation/Penalty.json
+++ b/data/as/51536/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/51536/ws-services-calculation/WCBillingSlab.json b/data/as/51536/ws-services-calculation/WCBillingSlab.json
index 6f36ffa35b..aab6205429 100644
--- a/data/as/51536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/51536/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5182812/ws-services-calculation/Penalty.json b/data/as/5182812/ws-services-calculation/Penalty.json
index 32471f674e..a302a9c53c 100644
--- a/data/as/5182812/ws-services-calculation/Penalty.json
+++ b/data/as/5182812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5182812/ws-services-calculation/WCBillingSlab.json b/data/as/5182812/ws-services-calculation/WCBillingSlab.json
index d1746885aa..54ae8648b4 100644
--- a/data/as/5182812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5182812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5183548/ws-services-calculation/Penalty.json b/data/as/5183548/ws-services-calculation/Penalty.json
index aed32a7d2e..cbfaee5745 100644
--- a/data/as/5183548/ws-services-calculation/Penalty.json
+++ b/data/as/5183548/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5183548/ws-services-calculation/WCBillingSlab.json b/data/as/5183548/ws-services-calculation/WCBillingSlab.json
index c864eeed39..e48de759c6 100644
--- a/data/as/5183548/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5183548/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5183964/ws-services-calculation/Penalty.json b/data/as/5183964/ws-services-calculation/Penalty.json
index 01497a9763..834a6a1fdf 100644
--- a/data/as/5183964/ws-services-calculation/Penalty.json
+++ b/data/as/5183964/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5183964/ws-services-calculation/WCBillingSlab.json b/data/as/5183964/ws-services-calculation/WCBillingSlab.json
index 210c5637fa..443f6b1cf2 100644
--- a/data/as/5183964/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5183964/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5184373/ws-services-calculation/Penalty.json b/data/as/5184373/ws-services-calculation/Penalty.json
index 5a1e414211..e1d75ae9df 100644
--- a/data/as/5184373/ws-services-calculation/Penalty.json
+++ b/data/as/5184373/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5184373/ws-services-calculation/WCBillingSlab.json b/data/as/5184373/ws-services-calculation/WCBillingSlab.json
index ef5fb983ce..46dce7bf73 100644
--- a/data/as/5184373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5184373/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185351/ws-services-calculation/Penalty.json b/data/as/5185351/ws-services-calculation/Penalty.json
index c9d82e205e..27c8ad4167 100644
--- a/data/as/5185351/ws-services-calculation/Penalty.json
+++ b/data/as/5185351/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185351/ws-services-calculation/WCBillingSlab.json b/data/as/5185351/ws-services-calculation/WCBillingSlab.json
index 9e9eb67fc2..7e90a82b26 100644
--- a/data/as/5185351/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185351/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185356/ws-services-calculation/Penalty.json b/data/as/5185356/ws-services-calculation/Penalty.json
index 0eb00ae984..a80eed85cf 100644
--- a/data/as/5185356/ws-services-calculation/Penalty.json
+++ b/data/as/5185356/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185356/ws-services-calculation/WCBillingSlab.json b/data/as/5185356/ws-services-calculation/WCBillingSlab.json
index a4311572d9..101075886a 100644
--- a/data/as/5185356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185356/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185535/ws-services-calculation/Penalty.json b/data/as/5185535/ws-services-calculation/Penalty.json
index 451a34fbbf..9f14e5bab9 100644
--- a/data/as/5185535/ws-services-calculation/Penalty.json
+++ b/data/as/5185535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185535/ws-services-calculation/WCBillingSlab.json b/data/as/5185535/ws-services-calculation/WCBillingSlab.json
index a7db9ff7d8..507a92c2ef 100644
--- a/data/as/5185535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185541/ws-services-calculation/Penalty.json b/data/as/5185541/ws-services-calculation/Penalty.json
index 89bcfea7ff..087591b4d2 100644
--- a/data/as/5185541/ws-services-calculation/Penalty.json
+++ b/data/as/5185541/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185541/ws-services-calculation/WCBillingSlab.json b/data/as/5185541/ws-services-calculation/WCBillingSlab.json
index 4cb42a9e2f..e9965b3506 100644
--- a/data/as/5185541/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185541/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185549/ws-services-calculation/Penalty.json b/data/as/5185549/ws-services-calculation/Penalty.json
index 43f4d1fae1..2ffe999027 100644
--- a/data/as/5185549/ws-services-calculation/Penalty.json
+++ b/data/as/5185549/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185549/ws-services-calculation/WCBillingSlab.json b/data/as/5185549/ws-services-calculation/WCBillingSlab.json
index 4a78e3e5bd..e2339cc0a4 100644
--- a/data/as/5185549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185549/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185556/ws-services-calculation/Penalty.json b/data/as/5185556/ws-services-calculation/Penalty.json
index ffe848b105..e226bbaf7f 100644
--- a/data/as/5185556/ws-services-calculation/Penalty.json
+++ b/data/as/5185556/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185556/ws-services-calculation/WCBillingSlab.json b/data/as/5185556/ws-services-calculation/WCBillingSlab.json
index 3000badf5f..def5201ed1 100644
--- a/data/as/5185556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185556/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185570/ws-services-calculation/Penalty.json b/data/as/5185570/ws-services-calculation/Penalty.json
index 973bcd1531..80048037ec 100644
--- a/data/as/5185570/ws-services-calculation/Penalty.json
+++ b/data/as/5185570/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185570/ws-services-calculation/WCBillingSlab.json b/data/as/5185570/ws-services-calculation/WCBillingSlab.json
index f12c0196c5..d0475c74c8 100644
--- a/data/as/5185570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185570/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185575/ws-services-calculation/Penalty.json b/data/as/5185575/ws-services-calculation/Penalty.json
index 13f01dbec0..2c0c7653c9 100644
--- a/data/as/5185575/ws-services-calculation/Penalty.json
+++ b/data/as/5185575/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185575/ws-services-calculation/WCBillingSlab.json b/data/as/5185575/ws-services-calculation/WCBillingSlab.json
index 6044fea89f..7e21ee0e7d 100644
--- a/data/as/5185575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185575/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185587/ws-services-calculation/Penalty.json b/data/as/5185587/ws-services-calculation/Penalty.json
index b061a74327..f06e659905 100644
--- a/data/as/5185587/ws-services-calculation/Penalty.json
+++ b/data/as/5185587/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185587/ws-services-calculation/WCBillingSlab.json b/data/as/5185587/ws-services-calculation/WCBillingSlab.json
index e4987a69f7..4a737adf0a 100644
--- a/data/as/5185587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185587/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185591/ws-services-calculation/Penalty.json b/data/as/5185591/ws-services-calculation/Penalty.json
index 59383f8ee7..b4a087fd15 100644
--- a/data/as/5185591/ws-services-calculation/Penalty.json
+++ b/data/as/5185591/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185591/ws-services-calculation/WCBillingSlab.json b/data/as/5185591/ws-services-calculation/WCBillingSlab.json
index 279f6e84b4..ca54a5f08a 100644
--- a/data/as/5185591/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185591/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185615/ws-services-calculation/Penalty.json b/data/as/5185615/ws-services-calculation/Penalty.json
index 41f45655f3..516cbbcc07 100644
--- a/data/as/5185615/ws-services-calculation/Penalty.json
+++ b/data/as/5185615/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185615/ws-services-calculation/WCBillingSlab.json b/data/as/5185615/ws-services-calculation/WCBillingSlab.json
index bc96c90a49..814ae358d1 100644
--- a/data/as/5185615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185615/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185635/ws-services-calculation/Penalty.json b/data/as/5185635/ws-services-calculation/Penalty.json
index d16dd02e38..131d9825d2 100644
--- a/data/as/5185635/ws-services-calculation/Penalty.json
+++ b/data/as/5185635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185635/ws-services-calculation/WCBillingSlab.json b/data/as/5185635/ws-services-calculation/WCBillingSlab.json
index c3c705c3a4..3467adc150 100644
--- a/data/as/5185635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185650/ws-services-calculation/Penalty.json b/data/as/5185650/ws-services-calculation/Penalty.json
index dae6dba9c6..2ed0b1cc48 100644
--- a/data/as/5185650/ws-services-calculation/Penalty.json
+++ b/data/as/5185650/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185650/ws-services-calculation/WCBillingSlab.json b/data/as/5185650/ws-services-calculation/WCBillingSlab.json
index 4d715a97dd..ca06152e28 100644
--- a/data/as/5185650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185650/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185655/ws-services-calculation/Penalty.json b/data/as/5185655/ws-services-calculation/Penalty.json
index 1582651a81..3c46e525f7 100644
--- a/data/as/5185655/ws-services-calculation/Penalty.json
+++ b/data/as/5185655/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185655/ws-services-calculation/WCBillingSlab.json b/data/as/5185655/ws-services-calculation/WCBillingSlab.json
index a1d99e9333..04f0c0f51f 100644
--- a/data/as/5185655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185655/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185659/ws-services-calculation/Penalty.json b/data/as/5185659/ws-services-calculation/Penalty.json
index 97058c3cd2..77760850e3 100644
--- a/data/as/5185659/ws-services-calculation/Penalty.json
+++ b/data/as/5185659/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185659/ws-services-calculation/WCBillingSlab.json b/data/as/5185659/ws-services-calculation/WCBillingSlab.json
index de6d39b10a..50d772dd27 100644
--- a/data/as/5185659/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185659/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185665/ws-services-calculation/Penalty.json b/data/as/5185665/ws-services-calculation/Penalty.json
index a4f525af9d..f4674aa9f8 100644
--- a/data/as/5185665/ws-services-calculation/Penalty.json
+++ b/data/as/5185665/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185665/ws-services-calculation/WCBillingSlab.json b/data/as/5185665/ws-services-calculation/WCBillingSlab.json
index 33deda4517..80439b2065 100644
--- a/data/as/5185665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185665/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185685/ws-services-calculation/Penalty.json b/data/as/5185685/ws-services-calculation/Penalty.json
index e9c25efd31..d4f09858d3 100644
--- a/data/as/5185685/ws-services-calculation/Penalty.json
+++ b/data/as/5185685/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185685/ws-services-calculation/WCBillingSlab.json b/data/as/5185685/ws-services-calculation/WCBillingSlab.json
index 356102b265..d9cdbc9861 100644
--- a/data/as/5185685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185685/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185693/ws-services-calculation/Penalty.json b/data/as/5185693/ws-services-calculation/Penalty.json
index 7da75d5f68..c0d77805b4 100644
--- a/data/as/5185693/ws-services-calculation/Penalty.json
+++ b/data/as/5185693/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185693/ws-services-calculation/WCBillingSlab.json b/data/as/5185693/ws-services-calculation/WCBillingSlab.json
index f4bf67b646..94d6ff8100 100644
--- a/data/as/5185693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185693/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185707/ws-services-calculation/Penalty.json b/data/as/5185707/ws-services-calculation/Penalty.json
index bcae40efba..5a9b9b8859 100644
--- a/data/as/5185707/ws-services-calculation/Penalty.json
+++ b/data/as/5185707/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185707/ws-services-calculation/WCBillingSlab.json b/data/as/5185707/ws-services-calculation/WCBillingSlab.json
index 634eb2bf3e..cab9903386 100644
--- a/data/as/5185707/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185707/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185717/ws-services-calculation/Penalty.json b/data/as/5185717/ws-services-calculation/Penalty.json
index 9de6197138..3f5b6faaa7 100644
--- a/data/as/5185717/ws-services-calculation/Penalty.json
+++ b/data/as/5185717/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185717/ws-services-calculation/WCBillingSlab.json b/data/as/5185717/ws-services-calculation/WCBillingSlab.json
index 0fea52d10a..3e52e83596 100644
--- a/data/as/5185717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185717/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5185887/ws-services-calculation/Penalty.json b/data/as/5185887/ws-services-calculation/Penalty.json
index df6e8a8adb..ea1fa4a977 100644
--- a/data/as/5185887/ws-services-calculation/Penalty.json
+++ b/data/as/5185887/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185887/ws-services-calculation/WCBillingSlab.json b/data/as/5185887/ws-services-calculation/WCBillingSlab.json
index 5e78b0872a..b73cdb5003 100644
--- a/data/as/5185887/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185887/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186387/ws-services-calculation/Penalty.json b/data/as/5186387/ws-services-calculation/Penalty.json
index a315c57035..0b3cddae2d 100644
--- a/data/as/5186387/ws-services-calculation/Penalty.json
+++ b/data/as/5186387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186387/ws-services-calculation/WCBillingSlab.json b/data/as/5186387/ws-services-calculation/WCBillingSlab.json
index 7e1eb6be73..ac8d38b6da 100644
--- a/data/as/5186387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186420/ws-services-calculation/Penalty.json b/data/as/5186420/ws-services-calculation/Penalty.json
index 2d8fc58345..0912338576 100644
--- a/data/as/5186420/ws-services-calculation/Penalty.json
+++ b/data/as/5186420/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186420/ws-services-calculation/WCBillingSlab.json b/data/as/5186420/ws-services-calculation/WCBillingSlab.json
index 43a6cca9de..41e7a9f407 100644
--- a/data/as/5186420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186420/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186446/ws-services-calculation/Penalty.json b/data/as/5186446/ws-services-calculation/Penalty.json
index ce02662736..651f960f4f 100644
--- a/data/as/5186446/ws-services-calculation/Penalty.json
+++ b/data/as/5186446/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186446/ws-services-calculation/WCBillingSlab.json b/data/as/5186446/ws-services-calculation/WCBillingSlab.json
index 34cea43aeb..30191d73f2 100644
--- a/data/as/5186446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186446/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186457/ws-services-calculation/Penalty.json b/data/as/5186457/ws-services-calculation/Penalty.json
index 8dc53f5bab..7a1c2790f8 100644
--- a/data/as/5186457/ws-services-calculation/Penalty.json
+++ b/data/as/5186457/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186457/ws-services-calculation/WCBillingSlab.json b/data/as/5186457/ws-services-calculation/WCBillingSlab.json
index 79e19fdad8..0b03f30191 100644
--- a/data/as/5186457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186457/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186463/ws-services-calculation/Penalty.json b/data/as/5186463/ws-services-calculation/Penalty.json
index d8158f5109..d3b7b167b9 100644
--- a/data/as/5186463/ws-services-calculation/Penalty.json
+++ b/data/as/5186463/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186463/ws-services-calculation/WCBillingSlab.json b/data/as/5186463/ws-services-calculation/WCBillingSlab.json
index 89517adde6..ed2e85ca92 100644
--- a/data/as/5186463/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186463/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186493/ws-services-calculation/Penalty.json b/data/as/5186493/ws-services-calculation/Penalty.json
index 6e02d8f4d8..e9e48d0368 100644
--- a/data/as/5186493/ws-services-calculation/Penalty.json
+++ b/data/as/5186493/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186493/ws-services-calculation/WCBillingSlab.json b/data/as/5186493/ws-services-calculation/WCBillingSlab.json
index b9c02999b4..dbcb926d6e 100644
--- a/data/as/5186493/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186493/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186499/ws-services-calculation/Penalty.json b/data/as/5186499/ws-services-calculation/Penalty.json
index ce5143965d..a674cd62c1 100644
--- a/data/as/5186499/ws-services-calculation/Penalty.json
+++ b/data/as/5186499/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186499/ws-services-calculation/WCBillingSlab.json b/data/as/5186499/ws-services-calculation/WCBillingSlab.json
index ed958f9765..98826af57a 100644
--- a/data/as/5186499/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186499/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186506/ws-services-calculation/Penalty.json b/data/as/5186506/ws-services-calculation/Penalty.json
index 2a82268d23..dfca284a6a 100644
--- a/data/as/5186506/ws-services-calculation/Penalty.json
+++ b/data/as/5186506/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186506/ws-services-calculation/WCBillingSlab.json b/data/as/5186506/ws-services-calculation/WCBillingSlab.json
index cab93b15f0..f30ee9496b 100644
--- a/data/as/5186506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186506/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5186513/ws-services-calculation/Penalty.json b/data/as/5186513/ws-services-calculation/Penalty.json
index ec9cee11b0..c65dc99501 100644
--- a/data/as/5186513/ws-services-calculation/Penalty.json
+++ b/data/as/5186513/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186513/ws-services-calculation/WCBillingSlab.json b/data/as/5186513/ws-services-calculation/WCBillingSlab.json
index 0cb5bc4abd..0cb4142bdb 100644
--- a/data/as/5186513/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186513/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5206914/ws-services-calculation/Penalty.json b/data/as/5206914/ws-services-calculation/Penalty.json
index a0c26afc65..dbd90c136b 100644
--- a/data/as/5206914/ws-services-calculation/Penalty.json
+++ b/data/as/5206914/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5206914/ws-services-calculation/WCBillingSlab.json b/data/as/5206914/ws-services-calculation/WCBillingSlab.json
index a8e0aa1fda..0258cd910b 100644
--- a/data/as/5206914/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5206914/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5230312/ws-services-calculation/Penalty.json b/data/as/5230312/ws-services-calculation/Penalty.json
index 81edba151c..e6710625e8 100644
--- a/data/as/5230312/ws-services-calculation/Penalty.json
+++ b/data/as/5230312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5230312/ws-services-calculation/WCBillingSlab.json b/data/as/5230312/ws-services-calculation/WCBillingSlab.json
index c0947add06..422462699d 100644
--- a/data/as/5230312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5230312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5230346/ws-services-calculation/Penalty.json b/data/as/5230346/ws-services-calculation/Penalty.json
index d9e109a385..051b97df80 100644
--- a/data/as/5230346/ws-services-calculation/Penalty.json
+++ b/data/as/5230346/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5230346/ws-services-calculation/WCBillingSlab.json b/data/as/5230346/ws-services-calculation/WCBillingSlab.json
index 6468f03c0e..1dae4a7756 100644
--- a/data/as/5230346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5230346/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5230398/ws-services-calculation/Penalty.json b/data/as/5230398/ws-services-calculation/Penalty.json
index f9bd07bb19..ff76f5c212 100644
--- a/data/as/5230398/ws-services-calculation/Penalty.json
+++ b/data/as/5230398/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5230398/ws-services-calculation/WCBillingSlab.json b/data/as/5230398/ws-services-calculation/WCBillingSlab.json
index ba7c13ca4e..5e8df6dc59 100644
--- a/data/as/5230398/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5230398/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/52793/ws-services-calculation/Penalty.json b/data/as/52793/ws-services-calculation/Penalty.json
index b69ad973b9..880b025984 100644
--- a/data/as/52793/ws-services-calculation/Penalty.json
+++ b/data/as/52793/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/52793/ws-services-calculation/WCBillingSlab.json b/data/as/52793/ws-services-calculation/WCBillingSlab.json
index 1b056bcebe..941b1d6da2 100644
--- a/data/as/52793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/52793/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5344027/ws-services-calculation/Penalty.json b/data/as/5344027/ws-services-calculation/Penalty.json
index f1b681e14f..02294e5eba 100644
--- a/data/as/5344027/ws-services-calculation/Penalty.json
+++ b/data/as/5344027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5344027/ws-services-calculation/WCBillingSlab.json b/data/as/5344027/ws-services-calculation/WCBillingSlab.json
index b82834449e..fc1c8bb1d2 100644
--- a/data/as/5344027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5344027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5349626/ws-services-calculation/Penalty.json b/data/as/5349626/ws-services-calculation/Penalty.json
index d597751d86..96beefaf41 100644
--- a/data/as/5349626/ws-services-calculation/Penalty.json
+++ b/data/as/5349626/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5349626/ws-services-calculation/WCBillingSlab.json b/data/as/5349626/ws-services-calculation/WCBillingSlab.json
index c6d765233b..9e8afe6ca3 100644
--- a/data/as/5349626/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5349626/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5349656/ws-services-calculation/Penalty.json b/data/as/5349656/ws-services-calculation/Penalty.json
index 39042f4743..7d7410d84a 100644
--- a/data/as/5349656/ws-services-calculation/Penalty.json
+++ b/data/as/5349656/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5349656/ws-services-calculation/WCBillingSlab.json b/data/as/5349656/ws-services-calculation/WCBillingSlab.json
index e1ccdade17..b828367c1a 100644
--- a/data/as/5349656/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5349656/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5349682/ws-services-calculation/Penalty.json b/data/as/5349682/ws-services-calculation/Penalty.json
index a4c28b2f54..14ac303ff2 100644
--- a/data/as/5349682/ws-services-calculation/Penalty.json
+++ b/data/as/5349682/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5349682/ws-services-calculation/WCBillingSlab.json b/data/as/5349682/ws-services-calculation/WCBillingSlab.json
index 1405244c99..170f277d50 100644
--- a/data/as/5349682/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5349682/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5357091/ws-services-calculation/Penalty.json b/data/as/5357091/ws-services-calculation/Penalty.json
index f4bd36e862..893c44e95d 100644
--- a/data/as/5357091/ws-services-calculation/Penalty.json
+++ b/data/as/5357091/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5357091/ws-services-calculation/WCBillingSlab.json b/data/as/5357091/ws-services-calculation/WCBillingSlab.json
index 3e345ffef0..c9c8ed10eb 100644
--- a/data/as/5357091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5357091/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5362300/ws-services-calculation/Penalty.json b/data/as/5362300/ws-services-calculation/Penalty.json
index 26b10f3653..18093a3d82 100644
--- a/data/as/5362300/ws-services-calculation/Penalty.json
+++ b/data/as/5362300/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5362300/ws-services-calculation/WCBillingSlab.json b/data/as/5362300/ws-services-calculation/WCBillingSlab.json
index 02dab7c048..bbdd29e769 100644
--- a/data/as/5362300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5362300/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5362332/ws-services-calculation/Penalty.json b/data/as/5362332/ws-services-calculation/Penalty.json
index c032d3307a..c4d90ea27f 100644
--- a/data/as/5362332/ws-services-calculation/Penalty.json
+++ b/data/as/5362332/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5362332/ws-services-calculation/WCBillingSlab.json b/data/as/5362332/ws-services-calculation/WCBillingSlab.json
index 69ab032c25..5b92f58ad1 100644
--- a/data/as/5362332/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5362332/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5379654/ws-services-calculation/Penalty.json b/data/as/5379654/ws-services-calculation/Penalty.json
index c9197053ba..2f9c286e07 100644
--- a/data/as/5379654/ws-services-calculation/Penalty.json
+++ b/data/as/5379654/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5379654/ws-services-calculation/WCBillingSlab.json b/data/as/5379654/ws-services-calculation/WCBillingSlab.json
index 67bfae53cc..61a132d8c0 100644
--- a/data/as/5379654/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5379654/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5379810/ws-services-calculation/Penalty.json b/data/as/5379810/ws-services-calculation/Penalty.json
index 34c2767f60..ae28b86f84 100644
--- a/data/as/5379810/ws-services-calculation/Penalty.json
+++ b/data/as/5379810/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5379810/ws-services-calculation/WCBillingSlab.json b/data/as/5379810/ws-services-calculation/WCBillingSlab.json
index 49ca47953b..17fe5b58aa 100644
--- a/data/as/5379810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5379810/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5404892/ws-services-calculation/Penalty.json b/data/as/5404892/ws-services-calculation/Penalty.json
index 63cdfdee81..acb33d60b9 100644
--- a/data/as/5404892/ws-services-calculation/Penalty.json
+++ b/data/as/5404892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5404892/ws-services-calculation/WCBillingSlab.json b/data/as/5404892/ws-services-calculation/WCBillingSlab.json
index 9db157bfff..1c72ad5c35 100644
--- a/data/as/5404892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5404892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5404904/ws-services-calculation/Penalty.json b/data/as/5404904/ws-services-calculation/Penalty.json
index a4a14c9e4d..4008165984 100644
--- a/data/as/5404904/ws-services-calculation/Penalty.json
+++ b/data/as/5404904/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5404904/ws-services-calculation/WCBillingSlab.json b/data/as/5404904/ws-services-calculation/WCBillingSlab.json
index 1edd220b2a..11b10da0e7 100644
--- a/data/as/5404904/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5404904/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5404932/ws-services-calculation/Penalty.json b/data/as/5404932/ws-services-calculation/Penalty.json
index 8ee96e5498..e9abb6e988 100644
--- a/data/as/5404932/ws-services-calculation/Penalty.json
+++ b/data/as/5404932/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5404932/ws-services-calculation/WCBillingSlab.json b/data/as/5404932/ws-services-calculation/WCBillingSlab.json
index af88895f63..697f9db08f 100644
--- a/data/as/5404932/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5404932/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5407809/ws-services-calculation/Penalty.json b/data/as/5407809/ws-services-calculation/Penalty.json
index d3c7076b8a..0491f7785a 100644
--- a/data/as/5407809/ws-services-calculation/Penalty.json
+++ b/data/as/5407809/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407809/ws-services-calculation/WCBillingSlab.json b/data/as/5407809/ws-services-calculation/WCBillingSlab.json
index 4927d3673e..da53237544 100644
--- a/data/as/5407809/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407809/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5407828/ws-services-calculation/Penalty.json b/data/as/5407828/ws-services-calculation/Penalty.json
index 066d50e18e..dc1bb69a5b 100644
--- a/data/as/5407828/ws-services-calculation/Penalty.json
+++ b/data/as/5407828/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407828/ws-services-calculation/WCBillingSlab.json b/data/as/5407828/ws-services-calculation/WCBillingSlab.json
index 9f4d72644e..b784604536 100644
--- a/data/as/5407828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407828/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5407846/ws-services-calculation/Penalty.json b/data/as/5407846/ws-services-calculation/Penalty.json
index fae30facc7..5a5a55790b 100644
--- a/data/as/5407846/ws-services-calculation/Penalty.json
+++ b/data/as/5407846/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407846/ws-services-calculation/WCBillingSlab.json b/data/as/5407846/ws-services-calculation/WCBillingSlab.json
index 3cbbb6a4c6..24c07b8c34 100644
--- a/data/as/5407846/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407846/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5407857/ws-services-calculation/Penalty.json b/data/as/5407857/ws-services-calculation/Penalty.json
index c405b7e05f..241d3900f7 100644
--- a/data/as/5407857/ws-services-calculation/Penalty.json
+++ b/data/as/5407857/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407857/ws-services-calculation/WCBillingSlab.json b/data/as/5407857/ws-services-calculation/WCBillingSlab.json
index 3b9e158397..1a41b39c59 100644
--- a/data/as/5407857/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407857/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408096/ws-services-calculation/Penalty.json b/data/as/5408096/ws-services-calculation/Penalty.json
index f2e34299f0..9b996ec6d3 100644
--- a/data/as/5408096/ws-services-calculation/Penalty.json
+++ b/data/as/5408096/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408096/ws-services-calculation/WCBillingSlab.json b/data/as/5408096/ws-services-calculation/WCBillingSlab.json
index f0688cbc94..3889789a67 100644
--- a/data/as/5408096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408096/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408108/ws-services-calculation/Penalty.json b/data/as/5408108/ws-services-calculation/Penalty.json
index 55f3b99ada..98e5543fcd 100644
--- a/data/as/5408108/ws-services-calculation/Penalty.json
+++ b/data/as/5408108/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408108/ws-services-calculation/WCBillingSlab.json b/data/as/5408108/ws-services-calculation/WCBillingSlab.json
index 911b29296d..c09f4c7651 100644
--- a/data/as/5408108/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408108/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408187/ws-services-calculation/Penalty.json b/data/as/5408187/ws-services-calculation/Penalty.json
index 7f441b1a7a..f5917e9337 100644
--- a/data/as/5408187/ws-services-calculation/Penalty.json
+++ b/data/as/5408187/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408187/ws-services-calculation/WCBillingSlab.json b/data/as/5408187/ws-services-calculation/WCBillingSlab.json
index 434785a419..e8ded96f2d 100644
--- a/data/as/5408187/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408187/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408224/ws-services-calculation/Penalty.json b/data/as/5408224/ws-services-calculation/Penalty.json
index 26c4640aa9..4a887b9496 100644
--- a/data/as/5408224/ws-services-calculation/Penalty.json
+++ b/data/as/5408224/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408224/ws-services-calculation/WCBillingSlab.json b/data/as/5408224/ws-services-calculation/WCBillingSlab.json
index 685eb9140f..723b8dce17 100644
--- a/data/as/5408224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408224/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408248/ws-services-calculation/Penalty.json b/data/as/5408248/ws-services-calculation/Penalty.json
index 9a2f2f258d..fe079af7be 100644
--- a/data/as/5408248/ws-services-calculation/Penalty.json
+++ b/data/as/5408248/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408248/ws-services-calculation/WCBillingSlab.json b/data/as/5408248/ws-services-calculation/WCBillingSlab.json
index debc2ba100..d1b5c661e9 100644
--- a/data/as/5408248/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408248/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408300/ws-services-calculation/Penalty.json b/data/as/5408300/ws-services-calculation/Penalty.json
index 307d048d1f..0f1fcfd3dd 100644
--- a/data/as/5408300/ws-services-calculation/Penalty.json
+++ b/data/as/5408300/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408300/ws-services-calculation/WCBillingSlab.json b/data/as/5408300/ws-services-calculation/WCBillingSlab.json
index acb6a9bdfa..0e6bbe2e11 100644
--- a/data/as/5408300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408300/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408316/ws-services-calculation/Penalty.json b/data/as/5408316/ws-services-calculation/Penalty.json
index 4fdb47f95b..202528ced9 100644
--- a/data/as/5408316/ws-services-calculation/Penalty.json
+++ b/data/as/5408316/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408316/ws-services-calculation/WCBillingSlab.json b/data/as/5408316/ws-services-calculation/WCBillingSlab.json
index e33c9f54ca..f8903d059f 100644
--- a/data/as/5408316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408316/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408332/ws-services-calculation/Penalty.json b/data/as/5408332/ws-services-calculation/Penalty.json
index 7456c61452..c268450e77 100644
--- a/data/as/5408332/ws-services-calculation/Penalty.json
+++ b/data/as/5408332/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408332/ws-services-calculation/WCBillingSlab.json b/data/as/5408332/ws-services-calculation/WCBillingSlab.json
index 2b96a0f563..73eda5ea54 100644
--- a/data/as/5408332/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408332/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408704/ws-services-calculation/Penalty.json b/data/as/5408704/ws-services-calculation/Penalty.json
index 37de2bbe37..f67951c6af 100644
--- a/data/as/5408704/ws-services-calculation/Penalty.json
+++ b/data/as/5408704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408704/ws-services-calculation/WCBillingSlab.json b/data/as/5408704/ws-services-calculation/WCBillingSlab.json
index 02f182bccd..7ce8f090be 100644
--- a/data/as/5408704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408793/ws-services-calculation/Penalty.json b/data/as/5408793/ws-services-calculation/Penalty.json
index 93c21759b0..24858289f1 100644
--- a/data/as/5408793/ws-services-calculation/Penalty.json
+++ b/data/as/5408793/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408793/ws-services-calculation/WCBillingSlab.json b/data/as/5408793/ws-services-calculation/WCBillingSlab.json
index d89cce27d2..f5a4465843 100644
--- a/data/as/5408793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408793/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408854/ws-services-calculation/Penalty.json b/data/as/5408854/ws-services-calculation/Penalty.json
index d3d08b634e..1b6a26ed8a 100644
--- a/data/as/5408854/ws-services-calculation/Penalty.json
+++ b/data/as/5408854/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408854/ws-services-calculation/WCBillingSlab.json b/data/as/5408854/ws-services-calculation/WCBillingSlab.json
index cb97d98fd1..0576377855 100644
--- a/data/as/5408854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408854/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5408891/ws-services-calculation/Penalty.json b/data/as/5408891/ws-services-calculation/Penalty.json
index 575bf018a2..55ed0b01ed 100644
--- a/data/as/5408891/ws-services-calculation/Penalty.json
+++ b/data/as/5408891/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408891/ws-services-calculation/WCBillingSlab.json b/data/as/5408891/ws-services-calculation/WCBillingSlab.json
index df632f2b35..a069f0d941 100644
--- a/data/as/5408891/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408891/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5464190/ws-services-calculation/Penalty.json b/data/as/5464190/ws-services-calculation/Penalty.json
index 3ec62f2cbd..14dadc19b7 100644
--- a/data/as/5464190/ws-services-calculation/Penalty.json
+++ b/data/as/5464190/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464190/ws-services-calculation/WCBillingSlab.json b/data/as/5464190/ws-services-calculation/WCBillingSlab.json
index 7389f75693..9622999b49 100644
--- a/data/as/5464190/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464190/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5464241/ws-services-calculation/Penalty.json b/data/as/5464241/ws-services-calculation/Penalty.json
index 9f1e2299c3..c482e1f65c 100644
--- a/data/as/5464241/ws-services-calculation/Penalty.json
+++ b/data/as/5464241/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464241/ws-services-calculation/WCBillingSlab.json b/data/as/5464241/ws-services-calculation/WCBillingSlab.json
index a22d415f93..ef8518f6ba 100644
--- a/data/as/5464241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464241/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5464278/ws-services-calculation/Penalty.json b/data/as/5464278/ws-services-calculation/Penalty.json
index 084c09b0ad..15822115d3 100644
--- a/data/as/5464278/ws-services-calculation/Penalty.json
+++ b/data/as/5464278/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464278/ws-services-calculation/WCBillingSlab.json b/data/as/5464278/ws-services-calculation/WCBillingSlab.json
index 9cad884d85..63e711c1ed 100644
--- a/data/as/5464278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464278/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5464342/ws-services-calculation/Penalty.json b/data/as/5464342/ws-services-calculation/Penalty.json
index eb848b4ebb..8a1ab0893c 100644
--- a/data/as/5464342/ws-services-calculation/Penalty.json
+++ b/data/as/5464342/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464342/ws-services-calculation/WCBillingSlab.json b/data/as/5464342/ws-services-calculation/WCBillingSlab.json
index 95c1fd1735..45ebabdf7a 100644
--- a/data/as/5464342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464342/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5464413/ws-services-calculation/Penalty.json b/data/as/5464413/ws-services-calculation/Penalty.json
index 6851ad13ab..46dec559a7 100644
--- a/data/as/5464413/ws-services-calculation/Penalty.json
+++ b/data/as/5464413/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464413/ws-services-calculation/WCBillingSlab.json b/data/as/5464413/ws-services-calculation/WCBillingSlab.json
index 0e15cae866..60d31a78d0 100644
--- a/data/as/5464413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464413/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5464439/ws-services-calculation/Penalty.json b/data/as/5464439/ws-services-calculation/Penalty.json
index a1794c246e..e06cd08e66 100644
--- a/data/as/5464439/ws-services-calculation/Penalty.json
+++ b/data/as/5464439/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464439/ws-services-calculation/WCBillingSlab.json b/data/as/5464439/ws-services-calculation/WCBillingSlab.json
index 2e6958b128..a6432ad1e9 100644
--- a/data/as/5464439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464439/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5475220/ws-services-calculation/Penalty.json b/data/as/5475220/ws-services-calculation/Penalty.json
index bb20f39136..059c7fd525 100644
--- a/data/as/5475220/ws-services-calculation/Penalty.json
+++ b/data/as/5475220/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5475220/ws-services-calculation/WCBillingSlab.json b/data/as/5475220/ws-services-calculation/WCBillingSlab.json
index d2643a4c43..4cc6d519f7 100644
--- a/data/as/5475220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5475220/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5519133/ws-services-calculation/Penalty.json b/data/as/5519133/ws-services-calculation/Penalty.json
index 357304bd58..ce9164d2a2 100644
--- a/data/as/5519133/ws-services-calculation/Penalty.json
+++ b/data/as/5519133/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5519133/ws-services-calculation/WCBillingSlab.json b/data/as/5519133/ws-services-calculation/WCBillingSlab.json
index 6df4c665b1..c2f8938ece 100644
--- a/data/as/5519133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5519133/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5519203/ws-services-calculation/Penalty.json b/data/as/5519203/ws-services-calculation/Penalty.json
index a58f9ead6f..0686d03890 100644
--- a/data/as/5519203/ws-services-calculation/Penalty.json
+++ b/data/as/5519203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5519203/ws-services-calculation/WCBillingSlab.json b/data/as/5519203/ws-services-calculation/WCBillingSlab.json
index fc2f5b55a2..1f7d153ed2 100644
--- a/data/as/5519203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5519203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5523260/ws-services-calculation/Penalty.json b/data/as/5523260/ws-services-calculation/Penalty.json
index 2c50f975c2..98db66441d 100644
--- a/data/as/5523260/ws-services-calculation/Penalty.json
+++ b/data/as/5523260/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5523260/ws-services-calculation/WCBillingSlab.json b/data/as/5523260/ws-services-calculation/WCBillingSlab.json
index a1bd8175fb..a7ea730804 100644
--- a/data/as/5523260/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5523260/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5527478/ws-services-calculation/Penalty.json b/data/as/5527478/ws-services-calculation/Penalty.json
index 7ba5cdfe36..4efe59b2a9 100644
--- a/data/as/5527478/ws-services-calculation/Penalty.json
+++ b/data/as/5527478/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5527478/ws-services-calculation/WCBillingSlab.json b/data/as/5527478/ws-services-calculation/WCBillingSlab.json
index a541dc72a4..822f630fec 100644
--- a/data/as/5527478/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5527478/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5528384/ws-services-calculation/Penalty.json b/data/as/5528384/ws-services-calculation/Penalty.json
index 991c377ad5..e3961cdf3a 100644
--- a/data/as/5528384/ws-services-calculation/Penalty.json
+++ b/data/as/5528384/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5528384/ws-services-calculation/WCBillingSlab.json b/data/as/5528384/ws-services-calculation/WCBillingSlab.json
index ed3ca0d17c..eff9499f05 100644
--- a/data/as/5528384/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5528384/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5531603/ws-services-calculation/Penalty.json b/data/as/5531603/ws-services-calculation/Penalty.json
index 00280c0f8a..41cc4c75e7 100644
--- a/data/as/5531603/ws-services-calculation/Penalty.json
+++ b/data/as/5531603/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5531603/ws-services-calculation/WCBillingSlab.json b/data/as/5531603/ws-services-calculation/WCBillingSlab.json
index db71f15642..fe2d302b77 100644
--- a/data/as/5531603/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5531603/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5532932/ws-services-calculation/Penalty.json b/data/as/5532932/ws-services-calculation/Penalty.json
index 2f920284f0..be970a79c1 100644
--- a/data/as/5532932/ws-services-calculation/Penalty.json
+++ b/data/as/5532932/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5532932/ws-services-calculation/WCBillingSlab.json b/data/as/5532932/ws-services-calculation/WCBillingSlab.json
index 30005907f1..0a037da622 100644
--- a/data/as/5532932/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5532932/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5533989/ws-services-calculation/Penalty.json b/data/as/5533989/ws-services-calculation/Penalty.json
index 9d922a24f2..f853fe6d20 100644
--- a/data/as/5533989/ws-services-calculation/Penalty.json
+++ b/data/as/5533989/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5533989/ws-services-calculation/WCBillingSlab.json b/data/as/5533989/ws-services-calculation/WCBillingSlab.json
index 0eae275999..c9deacf884 100644
--- a/data/as/5533989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5533989/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5534043/ws-services-calculation/Penalty.json b/data/as/5534043/ws-services-calculation/Penalty.json
index 9777428fa2..8cbcfea06c 100644
--- a/data/as/5534043/ws-services-calculation/Penalty.json
+++ b/data/as/5534043/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5534043/ws-services-calculation/WCBillingSlab.json b/data/as/5534043/ws-services-calculation/WCBillingSlab.json
index 14fbafdcd2..8763bee531 100644
--- a/data/as/5534043/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5534043/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5534657/ws-services-calculation/Penalty.json b/data/as/5534657/ws-services-calculation/Penalty.json
index 3a7cd16e48..0739e75de1 100644
--- a/data/as/5534657/ws-services-calculation/Penalty.json
+++ b/data/as/5534657/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5534657/ws-services-calculation/WCBillingSlab.json b/data/as/5534657/ws-services-calculation/WCBillingSlab.json
index 9a3f809774..76dbb1faa9 100644
--- a/data/as/5534657/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5534657/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5544794/ws-services-calculation/Penalty.json b/data/as/5544794/ws-services-calculation/Penalty.json
index 2edf4da7b1..12f8fd6fb3 100644
--- a/data/as/5544794/ws-services-calculation/Penalty.json
+++ b/data/as/5544794/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5544794/ws-services-calculation/WCBillingSlab.json b/data/as/5544794/ws-services-calculation/WCBillingSlab.json
index 4b5d62f3b2..363647550f 100644
--- a/data/as/5544794/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5544794/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547805/ws-services-calculation/Penalty.json b/data/as/5547805/ws-services-calculation/Penalty.json
index b00e654d40..1eaa3d64b0 100644
--- a/data/as/5547805/ws-services-calculation/Penalty.json
+++ b/data/as/5547805/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547805/ws-services-calculation/WCBillingSlab.json b/data/as/5547805/ws-services-calculation/WCBillingSlab.json
index a8828ef132..50d0512dbb 100644
--- a/data/as/5547805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547805/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547815/ws-services-calculation/Penalty.json b/data/as/5547815/ws-services-calculation/Penalty.json
index 00ff5fa087..9fdcfb3b0b 100644
--- a/data/as/5547815/ws-services-calculation/Penalty.json
+++ b/data/as/5547815/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547815/ws-services-calculation/WCBillingSlab.json b/data/as/5547815/ws-services-calculation/WCBillingSlab.json
index 6026642863..e27383669d 100644
--- a/data/as/5547815/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547815/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547824/ws-services-calculation/Penalty.json b/data/as/5547824/ws-services-calculation/Penalty.json
index a8db4d9d86..7d519c1da4 100644
--- a/data/as/5547824/ws-services-calculation/Penalty.json
+++ b/data/as/5547824/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547824/ws-services-calculation/WCBillingSlab.json b/data/as/5547824/ws-services-calculation/WCBillingSlab.json
index ce43ab9edc..09d6cf5f30 100644
--- a/data/as/5547824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547824/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547832/ws-services-calculation/Penalty.json b/data/as/5547832/ws-services-calculation/Penalty.json
index f3a3fc23cd..44d11ba70b 100644
--- a/data/as/5547832/ws-services-calculation/Penalty.json
+++ b/data/as/5547832/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547832/ws-services-calculation/WCBillingSlab.json b/data/as/5547832/ws-services-calculation/WCBillingSlab.json
index 2623e0bf50..86236433e9 100644
--- a/data/as/5547832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547832/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547843/ws-services-calculation/Penalty.json b/data/as/5547843/ws-services-calculation/Penalty.json
index a6211818f7..c5dd0203e4 100644
--- a/data/as/5547843/ws-services-calculation/Penalty.json
+++ b/data/as/5547843/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547843/ws-services-calculation/WCBillingSlab.json b/data/as/5547843/ws-services-calculation/WCBillingSlab.json
index e94b0bc16a..4583204b49 100644
--- a/data/as/5547843/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547843/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/600587/ws-services-calculation/Penalty.json b/data/as/600587/ws-services-calculation/Penalty.json
index eb7ac00c06..f789ce1b20 100644
--- a/data/as/600587/ws-services-calculation/Penalty.json
+++ b/data/as/600587/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/600587/ws-services-calculation/WCBillingSlab.json b/data/as/600587/ws-services-calculation/WCBillingSlab.json
index a4e4c3dbe3..812d9b0f3f 100644
--- a/data/as/600587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/600587/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/603120/ws-services-calculation/Penalty.json b/data/as/603120/ws-services-calculation/Penalty.json
index 5c81feb1e1..4d06b9ad52 100644
--- a/data/as/603120/ws-services-calculation/Penalty.json
+++ b/data/as/603120/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/603120/ws-services-calculation/WCBillingSlab.json b/data/as/603120/ws-services-calculation/WCBillingSlab.json
index 736b98c7c8..41273bf3cd 100644
--- a/data/as/603120/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/603120/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/603277/ws-services-calculation/Penalty.json b/data/as/603277/ws-services-calculation/Penalty.json
index 23bf700e1e..9c33df8b38 100644
--- a/data/as/603277/ws-services-calculation/Penalty.json
+++ b/data/as/603277/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/603277/ws-services-calculation/WCBillingSlab.json b/data/as/603277/ws-services-calculation/WCBillingSlab.json
index d4716a4b46..8af793b5da 100644
--- a/data/as/603277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/603277/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/603538/ws-services-calculation/Penalty.json b/data/as/603538/ws-services-calculation/Penalty.json
index 6af27a6a1a..406619e9af 100644
--- a/data/as/603538/ws-services-calculation/Penalty.json
+++ b/data/as/603538/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/603538/ws-services-calculation/WCBillingSlab.json b/data/as/603538/ws-services-calculation/WCBillingSlab.json
index cc37ad1b37..50664e2d5f 100644
--- a/data/as/603538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/603538/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/729083/ws-services-calculation/Penalty.json b/data/as/729083/ws-services-calculation/Penalty.json
index 4d44ed1018..2b5a12f032 100644
--- a/data/as/729083/ws-services-calculation/Penalty.json
+++ b/data/as/729083/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/729083/ws-services-calculation/WCBillingSlab.json b/data/as/729083/ws-services-calculation/WCBillingSlab.json
index 351bdbd80b..e5afa70a3c 100644
--- a/data/as/729083/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/729083/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/729086/ws-services-calculation/Penalty.json b/data/as/729086/ws-services-calculation/Penalty.json
index f98a100ed2..796b1861af 100644
--- a/data/as/729086/ws-services-calculation/Penalty.json
+++ b/data/as/729086/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/729086/ws-services-calculation/WCBillingSlab.json b/data/as/729086/ws-services-calculation/WCBillingSlab.json
index 32bfdbd4f2..4441bcab5b 100644
--- a/data/as/729086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/729086/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/874344/ws-services-calculation/Penalty.json b/data/as/874344/ws-services-calculation/Penalty.json
index 78db849ab0..ea1436545f 100644
--- a/data/as/874344/ws-services-calculation/Penalty.json
+++ b/data/as/874344/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/874344/ws-services-calculation/WCBillingSlab.json b/data/as/874344/ws-services-calculation/WCBillingSlab.json
index db37036b28..79d3258055 100644
--- a/data/as/874344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/874344/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/877925/ws-services-calculation/Penalty.json b/data/as/877925/ws-services-calculation/Penalty.json
index a1f0b39f3e..3590655ff7 100644
--- a/data/as/877925/ws-services-calculation/Penalty.json
+++ b/data/as/877925/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/877925/ws-services-calculation/WCBillingSlab.json b/data/as/877925/ws-services-calculation/WCBillingSlab.json
index d08009da77..c177075678 100644
--- a/data/as/877925/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/877925/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/877934/ws-services-calculation/Penalty.json b/data/as/877934/ws-services-calculation/Penalty.json
index 10037d9cab..587601d2e9 100644
--- a/data/as/877934/ws-services-calculation/Penalty.json
+++ b/data/as/877934/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/877934/ws-services-calculation/WCBillingSlab.json b/data/as/877934/ws-services-calculation/WCBillingSlab.json
index e46f58985b..9cf21fc66a 100644
--- a/data/as/877934/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/877934/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From 61532792f66b408c3e6c9a7577b6ac433fd85b57 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 15:54:40 +0530
Subject: [PATCH 11/23] Updated folder wise data from 5547867 to 8187165

---
 data/as/5547867/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5547867/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5547870/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5547870/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5547877/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5547877/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5547899/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5547899/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5548125/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5548125/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5548175/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5548175/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5548215/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5548215/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5548227/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5548227/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5548257/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5548257/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5548360/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5548360/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5550489/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5550489/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5550585/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5550585/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5552472/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5552472/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5552515/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5552515/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5552526/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5552526/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5552540/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5552540/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5557007/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5557007/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5568316/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5568316/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5569781/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5569781/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5569877/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5569877/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5571455/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5571455/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5571465/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5571465/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5571476/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5571476/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5571515/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5571515/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5573206/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5573206/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5573300/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5573300/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5599446/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5599446/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5641311/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5641311/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5803027/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5803027/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/5849473/ws-services-calculation/Penalty.json       | 2 +-
 data/as/5849473/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6054046/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6054046/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6054138/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6054138/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6054477/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6054477/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6054503/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6054503/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6055529/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6055529/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6055543/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6055543/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6055984/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6055984/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6136397/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6136397/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6136635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6136635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6136706/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6136706/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6145361/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6145361/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6145500/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6145500/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6145716/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6145716/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6149983/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6149983/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6150005/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6150005/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6150033/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6150033/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6150048/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6150048/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6151001/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6151001/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6166571/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6166571/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6166583/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6166583/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6173095/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6173095/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175393/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175393/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175413/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175413/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175518/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175518/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175537/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175537/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175631/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175631/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175645/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175645/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6175650/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6175650/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6189857/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6189857/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6189867/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6189867/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6233420/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6233420/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6234085/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6234085/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6241704/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6241704/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6241823/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6241823/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6241939/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6241939/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6242561/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6242561/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6242604/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6242604/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6242836/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6242836/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6242875/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6242875/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6242892/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6242892/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259479/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259479/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259651/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259651/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259713/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259713/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259850/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259850/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259888/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259888/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259908/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259908/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259933/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259933/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6259975/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6259975/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6260027/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6260027/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6260773/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6260773/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6260844/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6260844/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6260923/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6260923/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6347427/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6347427/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6349286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6349286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6350831/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6350831/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6350854/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6350854/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385531/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385531/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385536/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385536/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385545/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385545/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385554/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385554/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385567/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385567/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385905/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385905/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385915/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385915/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6385925/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6385925/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6502957/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6502957/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6503042/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6503042/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6515973/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6515973/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6516224/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6516224/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6517821/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6517821/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6520124/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6520124/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6524893/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6524893/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6524935/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6524935/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6526507/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6526507/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6526593/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6526593/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6526646/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6526646/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6852674/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6852674/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6858112/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6858112/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6858114/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6858114/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6861545/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6861545/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6861639/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6861639/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/6861642/ws-services-calculation/Penalty.json       | 2 +-
 data/as/6861642/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7341547/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7341547/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7343676/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7343676/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7347016/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7347016/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7347032/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7347032/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7347122/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7347122/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7637384/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7637384/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7893876/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7893876/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7894596/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7894596/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898565/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898565/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898568/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898568/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898570/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898570/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898571/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898571/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898573/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898573/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898574/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898574/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7898575/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7898575/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7971619/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7971619/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/7971866/ws-services-calculation/Penalty.json       | 2 +-
 data/as/7971866/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8036124/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8036124/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8036130/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8036130/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8131608/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8131608/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132115/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132115/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132124/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132124/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132128/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132128/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132750/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132750/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132803/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132803/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132805/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132805/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132840/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132840/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132845/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132845/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132847/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132847/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132850/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132850/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132861/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132861/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132866/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132866/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132870/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132870/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8132892/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8132892/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8137635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8137635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8138120/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8138120/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8138164/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8138164/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8140993/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8140993/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141044/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141044/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141062/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141062/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141109/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141109/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141554/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141554/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141566/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141566/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141583/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141583/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141619/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141619/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141631/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141631/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141643/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141643/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141666/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141666/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141686/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141686/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141704/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141704/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141716/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141716/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141733/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141733/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141761/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141761/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141785/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141785/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141831/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141831/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141923/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141923/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8141972/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8141972/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148068/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148068/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148081/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148081/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148097/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148097/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148105/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148105/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148116/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148116/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148125/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148125/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148137/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148137/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148159/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148159/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148173/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148173/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148181/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148181/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148193/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148193/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148198/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148198/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8148257/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8148257/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153195/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153195/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153198/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153198/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153201/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153201/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153205/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153205/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153209/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153209/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153214/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153214/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153219/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153219/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153224/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153224/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153228/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153228/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153230/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153230/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153234/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153234/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153241/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153241/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153248/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153248/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153287/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153287/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153302/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153302/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153320/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153320/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153337/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153337/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153355/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153355/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153374/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153374/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153399/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153399/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153482/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153482/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153639/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153639/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153665/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153665/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153690/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153690/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153703/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153703/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153723/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153723/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153746/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153746/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153766/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153766/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153777/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153777/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153800/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153800/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153823/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153823/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8153844/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8153844/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8154251/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8154251/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155025/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155025/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155026/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155026/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155041/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155041/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155049/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155049/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155055/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155055/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155070/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155070/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155090/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155090/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155168/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155168/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155206/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155206/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155271/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155271/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155279/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155279/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8155344/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8155344/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156157/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156157/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156180/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156180/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156193/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156193/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156216/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156216/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156220/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156220/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156231/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156231/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156241/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156241/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156244/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156244/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156253/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156253/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156257/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156257/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156263/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156263/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156271/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156271/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156274/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156274/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156288/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156288/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156289/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156289/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156315/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156315/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156393/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156393/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156410/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156410/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156419/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156419/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156424/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156424/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156430/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156430/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8156440/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8156440/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8157519/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8157519/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8157593/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8157593/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8157595/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8157595/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8157600/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8157600/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8157602/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8157602/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8157739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8157739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159295/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159295/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159645/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159645/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159671/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159671/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159680/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159680/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159691/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159691/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159704/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159704/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159717/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159717/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159727/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159727/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159738/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159738/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159747/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159747/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159851/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159851/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159874/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159874/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159939/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159939/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159954/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159954/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8159963/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8159963/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160000/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160000/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160005/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160005/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160019/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160019/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160027/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160027/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160039/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160039/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160338/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160338/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160353/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160353/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160367/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160367/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160379/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160379/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160387/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160387/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160400/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160400/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160409/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160409/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160417/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160417/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160423/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160423/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160451/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160451/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160455/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160455/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160460/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160460/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160467/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160467/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160474/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160474/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160796/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160796/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160817/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160817/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160827/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160827/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160840/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160840/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160852/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160852/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160864/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160864/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160875/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160875/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160897/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160897/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8160910/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8160910/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161016/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161016/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161774/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161774/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161776/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161776/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161778/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161778/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161779/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161779/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161782/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161782/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161786/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161786/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161790/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161790/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161794/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161794/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161801/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161801/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161808/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161808/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161819/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161819/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161828/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161828/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161841/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161841/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161861/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161861/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161882/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161882/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161897/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161897/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161907/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161907/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161918/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161918/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161943/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161943/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161960/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161960/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161985/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161985/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8161998/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8161998/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8162013/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8162013/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8162057/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8162057/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8162079/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8162079/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8162125/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8162125/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8162166/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8162166/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171324/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171324/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171366/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171366/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171388/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171388/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171415/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171415/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171462/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171462/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171475/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171475/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171505/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171505/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171518/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171518/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171531/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171531/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171572/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171572/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171735/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171735/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171834/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171834/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171872/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171872/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171904/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171904/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171945/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171945/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171970/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171970/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8171989/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8171989/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8172016/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8172016/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8172071/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8172071/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175220/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175220/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175227/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175227/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175232/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175232/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175237/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175237/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175241/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175241/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175267/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175267/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8175588/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8175588/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8176558/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8176558/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8176578/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8176578/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8176607/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8176607/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8176627/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8176627/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8177941/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8177941/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178172/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178172/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178282/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178282/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178343/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178343/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178428/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178428/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178783/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178783/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178821/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178821/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178861/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178861/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178895/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178895/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8178929/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8178929/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8181830/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8181830/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8181848/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8181848/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8181875/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8181875/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8181912/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8181912/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8183542/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8183542/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8183933/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8183933/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8184246/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8184246/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8184256/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8184256/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8184281/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8184281/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8184539/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8184539/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185128/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185128/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185176/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185176/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185212/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185212/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185242/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185242/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185270/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185270/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185317/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185317/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185354/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185354/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185387/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185387/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185418/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185418/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185772/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185772/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185789/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185789/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185807/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185807/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8185824/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8185824/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8186783/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8186783/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8186803/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8186803/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187077/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187077/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187090/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187090/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187146/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187146/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187153/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187153/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187157/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187157/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187165/ws-services-calculation/Penalty.json       | 2 +-
 data/as/8187165/ws-services-calculation/WCBillingSlab.json | 4 ++--
 800 files changed, 1200 insertions(+), 1200 deletions(-)

diff --git a/data/as/5547867/ws-services-calculation/Penalty.json b/data/as/5547867/ws-services-calculation/Penalty.json
index 58cc535c79..7df6eb2d5f 100644
--- a/data/as/5547867/ws-services-calculation/Penalty.json
+++ b/data/as/5547867/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547867/ws-services-calculation/WCBillingSlab.json b/data/as/5547867/ws-services-calculation/WCBillingSlab.json
index 7922c4520b..977f64e15a 100644
--- a/data/as/5547867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547867/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547870/ws-services-calculation/Penalty.json b/data/as/5547870/ws-services-calculation/Penalty.json
index b10e5093af..dd65b0738e 100644
--- a/data/as/5547870/ws-services-calculation/Penalty.json
+++ b/data/as/5547870/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547870/ws-services-calculation/WCBillingSlab.json b/data/as/5547870/ws-services-calculation/WCBillingSlab.json
index bc056a96d2..2da992281f 100644
--- a/data/as/5547870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547870/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547877/ws-services-calculation/Penalty.json b/data/as/5547877/ws-services-calculation/Penalty.json
index f8ecb64903..00d9ca9fb5 100644
--- a/data/as/5547877/ws-services-calculation/Penalty.json
+++ b/data/as/5547877/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547877/ws-services-calculation/WCBillingSlab.json b/data/as/5547877/ws-services-calculation/WCBillingSlab.json
index fb064f9ed0..cc87ec6353 100644
--- a/data/as/5547877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547877/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5547899/ws-services-calculation/Penalty.json b/data/as/5547899/ws-services-calculation/Penalty.json
index ffe2a68767..1160343910 100644
--- a/data/as/5547899/ws-services-calculation/Penalty.json
+++ b/data/as/5547899/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547899/ws-services-calculation/WCBillingSlab.json b/data/as/5547899/ws-services-calculation/WCBillingSlab.json
index a08b7bae69..fda57e80fd 100644
--- a/data/as/5547899/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547899/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5548125/ws-services-calculation/Penalty.json b/data/as/5548125/ws-services-calculation/Penalty.json
index 4babfe3d55..a50813b9ca 100644
--- a/data/as/5548125/ws-services-calculation/Penalty.json
+++ b/data/as/5548125/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548125/ws-services-calculation/WCBillingSlab.json b/data/as/5548125/ws-services-calculation/WCBillingSlab.json
index a0ba22173b..7aa0ef0023 100644
--- a/data/as/5548125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548125/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5548175/ws-services-calculation/Penalty.json b/data/as/5548175/ws-services-calculation/Penalty.json
index f3e979fa31..04dcd96af9 100644
--- a/data/as/5548175/ws-services-calculation/Penalty.json
+++ b/data/as/5548175/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548175/ws-services-calculation/WCBillingSlab.json b/data/as/5548175/ws-services-calculation/WCBillingSlab.json
index f5e3ab71e0..5ec3fed604 100644
--- a/data/as/5548175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548175/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5548215/ws-services-calculation/Penalty.json b/data/as/5548215/ws-services-calculation/Penalty.json
index 36409fdab9..f158c0355c 100644
--- a/data/as/5548215/ws-services-calculation/Penalty.json
+++ b/data/as/5548215/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548215/ws-services-calculation/WCBillingSlab.json b/data/as/5548215/ws-services-calculation/WCBillingSlab.json
index ea8f3f4291..f6f6daf570 100644
--- a/data/as/5548215/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548215/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5548227/ws-services-calculation/Penalty.json b/data/as/5548227/ws-services-calculation/Penalty.json
index 1564573908..b4ad732c4b 100644
--- a/data/as/5548227/ws-services-calculation/Penalty.json
+++ b/data/as/5548227/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548227/ws-services-calculation/WCBillingSlab.json b/data/as/5548227/ws-services-calculation/WCBillingSlab.json
index 26e69a5d06..1ca0ab0960 100644
--- a/data/as/5548227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548227/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5548257/ws-services-calculation/Penalty.json b/data/as/5548257/ws-services-calculation/Penalty.json
index 07a8f10c0d..cc62652215 100644
--- a/data/as/5548257/ws-services-calculation/Penalty.json
+++ b/data/as/5548257/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548257/ws-services-calculation/WCBillingSlab.json b/data/as/5548257/ws-services-calculation/WCBillingSlab.json
index 10f8bcb12f..0d790f34c2 100644
--- a/data/as/5548257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548257/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5548360/ws-services-calculation/Penalty.json b/data/as/5548360/ws-services-calculation/Penalty.json
index 22cdc6806d..eff2e63c40 100644
--- a/data/as/5548360/ws-services-calculation/Penalty.json
+++ b/data/as/5548360/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548360/ws-services-calculation/WCBillingSlab.json b/data/as/5548360/ws-services-calculation/WCBillingSlab.json
index 35ddccc03b..91d364c713 100644
--- a/data/as/5548360/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548360/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5550489/ws-services-calculation/Penalty.json b/data/as/5550489/ws-services-calculation/Penalty.json
index 6be25f2e4b..ecbe7ec58f 100644
--- a/data/as/5550489/ws-services-calculation/Penalty.json
+++ b/data/as/5550489/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5550489/ws-services-calculation/WCBillingSlab.json b/data/as/5550489/ws-services-calculation/WCBillingSlab.json
index ba8a8aa9c0..d16746a1f6 100644
--- a/data/as/5550489/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5550489/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5550585/ws-services-calculation/Penalty.json b/data/as/5550585/ws-services-calculation/Penalty.json
index 785af25bd7..cb37567b36 100644
--- a/data/as/5550585/ws-services-calculation/Penalty.json
+++ b/data/as/5550585/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5550585/ws-services-calculation/WCBillingSlab.json b/data/as/5550585/ws-services-calculation/WCBillingSlab.json
index 8971776aa3..92ec15e021 100644
--- a/data/as/5550585/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5550585/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5552472/ws-services-calculation/Penalty.json b/data/as/5552472/ws-services-calculation/Penalty.json
index 192d2a1310..ac5968ffa4 100644
--- a/data/as/5552472/ws-services-calculation/Penalty.json
+++ b/data/as/5552472/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552472/ws-services-calculation/WCBillingSlab.json b/data/as/5552472/ws-services-calculation/WCBillingSlab.json
index e5a53f8f2e..383a023fd8 100644
--- a/data/as/5552472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552472/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5552515/ws-services-calculation/Penalty.json b/data/as/5552515/ws-services-calculation/Penalty.json
index c9707852ab..4ab81a3a1e 100644
--- a/data/as/5552515/ws-services-calculation/Penalty.json
+++ b/data/as/5552515/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552515/ws-services-calculation/WCBillingSlab.json b/data/as/5552515/ws-services-calculation/WCBillingSlab.json
index cd214fcf43..bbd014fff8 100644
--- a/data/as/5552515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552515/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5552526/ws-services-calculation/Penalty.json b/data/as/5552526/ws-services-calculation/Penalty.json
index b981999ede..c5d43d5f33 100644
--- a/data/as/5552526/ws-services-calculation/Penalty.json
+++ b/data/as/5552526/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552526/ws-services-calculation/WCBillingSlab.json b/data/as/5552526/ws-services-calculation/WCBillingSlab.json
index e369ab2365..1c8c3edabf 100644
--- a/data/as/5552526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552526/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5552540/ws-services-calculation/Penalty.json b/data/as/5552540/ws-services-calculation/Penalty.json
index 3a9bac26b7..27e0377e2c 100644
--- a/data/as/5552540/ws-services-calculation/Penalty.json
+++ b/data/as/5552540/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552540/ws-services-calculation/WCBillingSlab.json b/data/as/5552540/ws-services-calculation/WCBillingSlab.json
index 2a940dd7c7..ac29bfaee9 100644
--- a/data/as/5552540/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552540/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5557007/ws-services-calculation/Penalty.json b/data/as/5557007/ws-services-calculation/Penalty.json
index e5ed35c392..d34673b59a 100644
--- a/data/as/5557007/ws-services-calculation/Penalty.json
+++ b/data/as/5557007/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5557007/ws-services-calculation/WCBillingSlab.json b/data/as/5557007/ws-services-calculation/WCBillingSlab.json
index f9e1888c65..2a36308d38 100644
--- a/data/as/5557007/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5557007/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5568316/ws-services-calculation/Penalty.json b/data/as/5568316/ws-services-calculation/Penalty.json
index 22b213e8ee..216928e1d1 100644
--- a/data/as/5568316/ws-services-calculation/Penalty.json
+++ b/data/as/5568316/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5568316/ws-services-calculation/WCBillingSlab.json b/data/as/5568316/ws-services-calculation/WCBillingSlab.json
index 1e3c80e036..9fa43696d9 100644
--- a/data/as/5568316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5568316/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5569781/ws-services-calculation/Penalty.json b/data/as/5569781/ws-services-calculation/Penalty.json
index 235697d72e..3c28a194ec 100644
--- a/data/as/5569781/ws-services-calculation/Penalty.json
+++ b/data/as/5569781/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5569781/ws-services-calculation/WCBillingSlab.json b/data/as/5569781/ws-services-calculation/WCBillingSlab.json
index 473519c362..b2d5320ff2 100644
--- a/data/as/5569781/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5569781/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5569877/ws-services-calculation/Penalty.json b/data/as/5569877/ws-services-calculation/Penalty.json
index 726d5f6f41..fa9169a0e8 100644
--- a/data/as/5569877/ws-services-calculation/Penalty.json
+++ b/data/as/5569877/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5569877/ws-services-calculation/WCBillingSlab.json b/data/as/5569877/ws-services-calculation/WCBillingSlab.json
index 6b4ba74928..519da59a14 100644
--- a/data/as/5569877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5569877/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5571455/ws-services-calculation/Penalty.json b/data/as/5571455/ws-services-calculation/Penalty.json
index 3e4730fde8..27dee06a1a 100644
--- a/data/as/5571455/ws-services-calculation/Penalty.json
+++ b/data/as/5571455/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571455/ws-services-calculation/WCBillingSlab.json b/data/as/5571455/ws-services-calculation/WCBillingSlab.json
index b9b1985cde..c041766888 100644
--- a/data/as/5571455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571455/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5571465/ws-services-calculation/Penalty.json b/data/as/5571465/ws-services-calculation/Penalty.json
index f0ca0f0f29..49517c3654 100644
--- a/data/as/5571465/ws-services-calculation/Penalty.json
+++ b/data/as/5571465/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571465/ws-services-calculation/WCBillingSlab.json b/data/as/5571465/ws-services-calculation/WCBillingSlab.json
index 2997cce024..53e7f94c42 100644
--- a/data/as/5571465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571465/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5571476/ws-services-calculation/Penalty.json b/data/as/5571476/ws-services-calculation/Penalty.json
index d1b34847cb..89d180477a 100644
--- a/data/as/5571476/ws-services-calculation/Penalty.json
+++ b/data/as/5571476/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571476/ws-services-calculation/WCBillingSlab.json b/data/as/5571476/ws-services-calculation/WCBillingSlab.json
index 4f23a94379..0c30c92a49 100644
--- a/data/as/5571476/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571476/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5571515/ws-services-calculation/Penalty.json b/data/as/5571515/ws-services-calculation/Penalty.json
index 46056a57ca..472d52eaef 100644
--- a/data/as/5571515/ws-services-calculation/Penalty.json
+++ b/data/as/5571515/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571515/ws-services-calculation/WCBillingSlab.json b/data/as/5571515/ws-services-calculation/WCBillingSlab.json
index 488b53f619..894bed56d4 100644
--- a/data/as/5571515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571515/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5573206/ws-services-calculation/Penalty.json b/data/as/5573206/ws-services-calculation/Penalty.json
index 5b9a49f93d..24da1d9883 100644
--- a/data/as/5573206/ws-services-calculation/Penalty.json
+++ b/data/as/5573206/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5573206/ws-services-calculation/WCBillingSlab.json b/data/as/5573206/ws-services-calculation/WCBillingSlab.json
index dee66ef1d8..295b25dd1c 100644
--- a/data/as/5573206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5573206/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5573300/ws-services-calculation/Penalty.json b/data/as/5573300/ws-services-calculation/Penalty.json
index 37fa441d90..c4bdd3a8cd 100644
--- a/data/as/5573300/ws-services-calculation/Penalty.json
+++ b/data/as/5573300/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5573300/ws-services-calculation/WCBillingSlab.json b/data/as/5573300/ws-services-calculation/WCBillingSlab.json
index e63fef40db..5dc2e64076 100644
--- a/data/as/5573300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5573300/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5599446/ws-services-calculation/Penalty.json b/data/as/5599446/ws-services-calculation/Penalty.json
index fc0d4a5e50..d146e5112e 100644
--- a/data/as/5599446/ws-services-calculation/Penalty.json
+++ b/data/as/5599446/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5599446/ws-services-calculation/WCBillingSlab.json b/data/as/5599446/ws-services-calculation/WCBillingSlab.json
index 64fda2aa4b..7fdefc3770 100644
--- a/data/as/5599446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5599446/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5641311/ws-services-calculation/Penalty.json b/data/as/5641311/ws-services-calculation/Penalty.json
index 963feec236..43e9139d73 100644
--- a/data/as/5641311/ws-services-calculation/Penalty.json
+++ b/data/as/5641311/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5641311/ws-services-calculation/WCBillingSlab.json b/data/as/5641311/ws-services-calculation/WCBillingSlab.json
index 566816c27e..755f456e40 100644
--- a/data/as/5641311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5641311/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5803027/ws-services-calculation/Penalty.json b/data/as/5803027/ws-services-calculation/Penalty.json
index e55561bacb..82e0dec6a5 100644
--- a/data/as/5803027/ws-services-calculation/Penalty.json
+++ b/data/as/5803027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5803027/ws-services-calculation/WCBillingSlab.json b/data/as/5803027/ws-services-calculation/WCBillingSlab.json
index c8b9bc5b7e..f493270550 100644
--- a/data/as/5803027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5803027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/5849473/ws-services-calculation/Penalty.json b/data/as/5849473/ws-services-calculation/Penalty.json
index 9e009ac49c..6af9a2d1e8 100644
--- a/data/as/5849473/ws-services-calculation/Penalty.json
+++ b/data/as/5849473/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5849473/ws-services-calculation/WCBillingSlab.json b/data/as/5849473/ws-services-calculation/WCBillingSlab.json
index 7b516e5703..d63aa48cd4 100644
--- a/data/as/5849473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5849473/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6054046/ws-services-calculation/Penalty.json b/data/as/6054046/ws-services-calculation/Penalty.json
index 064650c573..4c9e94a1b8 100644
--- a/data/as/6054046/ws-services-calculation/Penalty.json
+++ b/data/as/6054046/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054046/ws-services-calculation/WCBillingSlab.json b/data/as/6054046/ws-services-calculation/WCBillingSlab.json
index bbe75a014e..5fc9532a3f 100644
--- a/data/as/6054046/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054046/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6054138/ws-services-calculation/Penalty.json b/data/as/6054138/ws-services-calculation/Penalty.json
index 2fd7a72e34..bbee9adf83 100644
--- a/data/as/6054138/ws-services-calculation/Penalty.json
+++ b/data/as/6054138/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054138/ws-services-calculation/WCBillingSlab.json b/data/as/6054138/ws-services-calculation/WCBillingSlab.json
index fbdeb6fcef..6b279cdc4b 100644
--- a/data/as/6054138/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054138/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6054477/ws-services-calculation/Penalty.json b/data/as/6054477/ws-services-calculation/Penalty.json
index 0edc31ca19..0818a42334 100644
--- a/data/as/6054477/ws-services-calculation/Penalty.json
+++ b/data/as/6054477/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054477/ws-services-calculation/WCBillingSlab.json b/data/as/6054477/ws-services-calculation/WCBillingSlab.json
index 8bb88b25b2..15ca44105f 100644
--- a/data/as/6054477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054477/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6054503/ws-services-calculation/Penalty.json b/data/as/6054503/ws-services-calculation/Penalty.json
index cebb4ec769..1334dac921 100644
--- a/data/as/6054503/ws-services-calculation/Penalty.json
+++ b/data/as/6054503/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054503/ws-services-calculation/WCBillingSlab.json b/data/as/6054503/ws-services-calculation/WCBillingSlab.json
index d850f701e8..79d4469cd5 100644
--- a/data/as/6054503/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054503/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6055529/ws-services-calculation/Penalty.json b/data/as/6055529/ws-services-calculation/Penalty.json
index bc50ec2c8a..f498292f3f 100644
--- a/data/as/6055529/ws-services-calculation/Penalty.json
+++ b/data/as/6055529/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6055529/ws-services-calculation/WCBillingSlab.json b/data/as/6055529/ws-services-calculation/WCBillingSlab.json
index 45e2e874cd..170c369915 100644
--- a/data/as/6055529/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6055529/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6055543/ws-services-calculation/Penalty.json b/data/as/6055543/ws-services-calculation/Penalty.json
index ba1e609e49..c3319ff50d 100644
--- a/data/as/6055543/ws-services-calculation/Penalty.json
+++ b/data/as/6055543/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6055543/ws-services-calculation/WCBillingSlab.json b/data/as/6055543/ws-services-calculation/WCBillingSlab.json
index 3f2fc05051..758c2d2007 100644
--- a/data/as/6055543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6055543/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6055984/ws-services-calculation/Penalty.json b/data/as/6055984/ws-services-calculation/Penalty.json
index 8ead4b0a59..65e43a08c1 100644
--- a/data/as/6055984/ws-services-calculation/Penalty.json
+++ b/data/as/6055984/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6055984/ws-services-calculation/WCBillingSlab.json b/data/as/6055984/ws-services-calculation/WCBillingSlab.json
index 43533740d7..dfa2bff699 100644
--- a/data/as/6055984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6055984/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6136397/ws-services-calculation/Penalty.json b/data/as/6136397/ws-services-calculation/Penalty.json
index 458f27c266..ccbf3f09bd 100644
--- a/data/as/6136397/ws-services-calculation/Penalty.json
+++ b/data/as/6136397/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6136397/ws-services-calculation/WCBillingSlab.json b/data/as/6136397/ws-services-calculation/WCBillingSlab.json
index 8581ae009f..e067411eac 100644
--- a/data/as/6136397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6136397/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6136635/ws-services-calculation/Penalty.json b/data/as/6136635/ws-services-calculation/Penalty.json
index 5bd76c519d..db4f4491ec 100644
--- a/data/as/6136635/ws-services-calculation/Penalty.json
+++ b/data/as/6136635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6136635/ws-services-calculation/WCBillingSlab.json b/data/as/6136635/ws-services-calculation/WCBillingSlab.json
index 32932ad5ad..5378df51a6 100644
--- a/data/as/6136635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6136635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6136706/ws-services-calculation/Penalty.json b/data/as/6136706/ws-services-calculation/Penalty.json
index fffff10d34..2d23a6a49c 100644
--- a/data/as/6136706/ws-services-calculation/Penalty.json
+++ b/data/as/6136706/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6136706/ws-services-calculation/WCBillingSlab.json b/data/as/6136706/ws-services-calculation/WCBillingSlab.json
index 37bf6f1fff..d0c2d249c0 100644
--- a/data/as/6136706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6136706/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6145361/ws-services-calculation/Penalty.json b/data/as/6145361/ws-services-calculation/Penalty.json
index 4122f27db6..f8dab9159c 100644
--- a/data/as/6145361/ws-services-calculation/Penalty.json
+++ b/data/as/6145361/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6145361/ws-services-calculation/WCBillingSlab.json b/data/as/6145361/ws-services-calculation/WCBillingSlab.json
index 03e99458ed..22ff419b8a 100644
--- a/data/as/6145361/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6145361/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6145500/ws-services-calculation/Penalty.json b/data/as/6145500/ws-services-calculation/Penalty.json
index 623f74817c..c363301824 100644
--- a/data/as/6145500/ws-services-calculation/Penalty.json
+++ b/data/as/6145500/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6145500/ws-services-calculation/WCBillingSlab.json b/data/as/6145500/ws-services-calculation/WCBillingSlab.json
index 200af31cba..d084eee39e 100644
--- a/data/as/6145500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6145500/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6145716/ws-services-calculation/Penalty.json b/data/as/6145716/ws-services-calculation/Penalty.json
index 3cc407ece2..159328aaa2 100644
--- a/data/as/6145716/ws-services-calculation/Penalty.json
+++ b/data/as/6145716/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6145716/ws-services-calculation/WCBillingSlab.json b/data/as/6145716/ws-services-calculation/WCBillingSlab.json
index 26774d5ac0..b49898b132 100644
--- a/data/as/6145716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6145716/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6149983/ws-services-calculation/Penalty.json b/data/as/6149983/ws-services-calculation/Penalty.json
index aa8c53de61..9af0c92962 100644
--- a/data/as/6149983/ws-services-calculation/Penalty.json
+++ b/data/as/6149983/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6149983/ws-services-calculation/WCBillingSlab.json b/data/as/6149983/ws-services-calculation/WCBillingSlab.json
index fe360b6330..da0dd05e06 100644
--- a/data/as/6149983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6149983/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6150005/ws-services-calculation/Penalty.json b/data/as/6150005/ws-services-calculation/Penalty.json
index 61a73e5e36..64f1110623 100644
--- a/data/as/6150005/ws-services-calculation/Penalty.json
+++ b/data/as/6150005/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6150005/ws-services-calculation/WCBillingSlab.json b/data/as/6150005/ws-services-calculation/WCBillingSlab.json
index 01a84f316f..824d839d82 100644
--- a/data/as/6150005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6150005/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6150033/ws-services-calculation/Penalty.json b/data/as/6150033/ws-services-calculation/Penalty.json
index f2b969a71b..9ad620d761 100644
--- a/data/as/6150033/ws-services-calculation/Penalty.json
+++ b/data/as/6150033/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6150033/ws-services-calculation/WCBillingSlab.json b/data/as/6150033/ws-services-calculation/WCBillingSlab.json
index 94d68f7c2b..20c3f39f24 100644
--- a/data/as/6150033/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6150033/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6150048/ws-services-calculation/Penalty.json b/data/as/6150048/ws-services-calculation/Penalty.json
index f27b8f9ed3..f0c9a78d33 100644
--- a/data/as/6150048/ws-services-calculation/Penalty.json
+++ b/data/as/6150048/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6150048/ws-services-calculation/WCBillingSlab.json b/data/as/6150048/ws-services-calculation/WCBillingSlab.json
index f347dcfb1d..ab2b1520c2 100644
--- a/data/as/6150048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6150048/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6151001/ws-services-calculation/Penalty.json b/data/as/6151001/ws-services-calculation/Penalty.json
index 69d9992740..aff761c52b 100644
--- a/data/as/6151001/ws-services-calculation/Penalty.json
+++ b/data/as/6151001/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6151001/ws-services-calculation/WCBillingSlab.json b/data/as/6151001/ws-services-calculation/WCBillingSlab.json
index 86afdfe94f..a769879741 100644
--- a/data/as/6151001/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6151001/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6166571/ws-services-calculation/Penalty.json b/data/as/6166571/ws-services-calculation/Penalty.json
index d90dbdc349..1c7dea9341 100644
--- a/data/as/6166571/ws-services-calculation/Penalty.json
+++ b/data/as/6166571/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6166571/ws-services-calculation/WCBillingSlab.json b/data/as/6166571/ws-services-calculation/WCBillingSlab.json
index 9bd7987d20..2534a60047 100644
--- a/data/as/6166571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6166571/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6166583/ws-services-calculation/Penalty.json b/data/as/6166583/ws-services-calculation/Penalty.json
index 28ccb54c37..d468220060 100644
--- a/data/as/6166583/ws-services-calculation/Penalty.json
+++ b/data/as/6166583/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6166583/ws-services-calculation/WCBillingSlab.json b/data/as/6166583/ws-services-calculation/WCBillingSlab.json
index efd37e4011..08ce8781de 100644
--- a/data/as/6166583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6166583/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6173095/ws-services-calculation/Penalty.json b/data/as/6173095/ws-services-calculation/Penalty.json
index c06ab1b56b..b742ce23ae 100644
--- a/data/as/6173095/ws-services-calculation/Penalty.json
+++ b/data/as/6173095/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6173095/ws-services-calculation/WCBillingSlab.json b/data/as/6173095/ws-services-calculation/WCBillingSlab.json
index cf34934918..c5da0df473 100644
--- a/data/as/6173095/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6173095/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175393/ws-services-calculation/Penalty.json b/data/as/6175393/ws-services-calculation/Penalty.json
index 57894efae9..c95e9ac32e 100644
--- a/data/as/6175393/ws-services-calculation/Penalty.json
+++ b/data/as/6175393/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175393/ws-services-calculation/WCBillingSlab.json b/data/as/6175393/ws-services-calculation/WCBillingSlab.json
index cbb6f6979b..daf9bfe2bb 100644
--- a/data/as/6175393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175393/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175413/ws-services-calculation/Penalty.json b/data/as/6175413/ws-services-calculation/Penalty.json
index a862c7ed33..7e40828a7d 100644
--- a/data/as/6175413/ws-services-calculation/Penalty.json
+++ b/data/as/6175413/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175413/ws-services-calculation/WCBillingSlab.json b/data/as/6175413/ws-services-calculation/WCBillingSlab.json
index 4d20acdbf5..3dd2296fb2 100644
--- a/data/as/6175413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175413/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175518/ws-services-calculation/Penalty.json b/data/as/6175518/ws-services-calculation/Penalty.json
index e86a6462d4..c30e96a42e 100644
--- a/data/as/6175518/ws-services-calculation/Penalty.json
+++ b/data/as/6175518/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175518/ws-services-calculation/WCBillingSlab.json b/data/as/6175518/ws-services-calculation/WCBillingSlab.json
index d228ea6327..6eefd517a0 100644
--- a/data/as/6175518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175518/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175537/ws-services-calculation/Penalty.json b/data/as/6175537/ws-services-calculation/Penalty.json
index 77849389fa..b6bfce3911 100644
--- a/data/as/6175537/ws-services-calculation/Penalty.json
+++ b/data/as/6175537/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175537/ws-services-calculation/WCBillingSlab.json b/data/as/6175537/ws-services-calculation/WCBillingSlab.json
index 9e45f0f6f1..e620496daf 100644
--- a/data/as/6175537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175537/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175631/ws-services-calculation/Penalty.json b/data/as/6175631/ws-services-calculation/Penalty.json
index aab8e0821d..11e9280738 100644
--- a/data/as/6175631/ws-services-calculation/Penalty.json
+++ b/data/as/6175631/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175631/ws-services-calculation/WCBillingSlab.json b/data/as/6175631/ws-services-calculation/WCBillingSlab.json
index 06ae3f07f7..11543ee1ce 100644
--- a/data/as/6175631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175631/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175645/ws-services-calculation/Penalty.json b/data/as/6175645/ws-services-calculation/Penalty.json
index 716cbce285..87498320e0 100644
--- a/data/as/6175645/ws-services-calculation/Penalty.json
+++ b/data/as/6175645/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175645/ws-services-calculation/WCBillingSlab.json b/data/as/6175645/ws-services-calculation/WCBillingSlab.json
index 489fcdda7e..a18b4c7d34 100644
--- a/data/as/6175645/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175645/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6175650/ws-services-calculation/Penalty.json b/data/as/6175650/ws-services-calculation/Penalty.json
index 9515395c8e..fc563a3cbc 100644
--- a/data/as/6175650/ws-services-calculation/Penalty.json
+++ b/data/as/6175650/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175650/ws-services-calculation/WCBillingSlab.json b/data/as/6175650/ws-services-calculation/WCBillingSlab.json
index 3673f2d9e2..c1f90a310c 100644
--- a/data/as/6175650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175650/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6189857/ws-services-calculation/Penalty.json b/data/as/6189857/ws-services-calculation/Penalty.json
index cf9c7e4136..e77a64dcd8 100644
--- a/data/as/6189857/ws-services-calculation/Penalty.json
+++ b/data/as/6189857/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6189857/ws-services-calculation/WCBillingSlab.json b/data/as/6189857/ws-services-calculation/WCBillingSlab.json
index b6a95d87de..2de32acdef 100644
--- a/data/as/6189857/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6189857/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6189867/ws-services-calculation/Penalty.json b/data/as/6189867/ws-services-calculation/Penalty.json
index b41c532712..8e8df0bd06 100644
--- a/data/as/6189867/ws-services-calculation/Penalty.json
+++ b/data/as/6189867/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6189867/ws-services-calculation/WCBillingSlab.json b/data/as/6189867/ws-services-calculation/WCBillingSlab.json
index bf3fbd0289..a7d9f6afc6 100644
--- a/data/as/6189867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6189867/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6233420/ws-services-calculation/Penalty.json b/data/as/6233420/ws-services-calculation/Penalty.json
index e7d269900b..e7a0bc2a62 100644
--- a/data/as/6233420/ws-services-calculation/Penalty.json
+++ b/data/as/6233420/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6233420/ws-services-calculation/WCBillingSlab.json b/data/as/6233420/ws-services-calculation/WCBillingSlab.json
index b25b3f8fe2..1eecc51bae 100644
--- a/data/as/6233420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6233420/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6234085/ws-services-calculation/Penalty.json b/data/as/6234085/ws-services-calculation/Penalty.json
index 20714bdeab..f18d59e8f0 100644
--- a/data/as/6234085/ws-services-calculation/Penalty.json
+++ b/data/as/6234085/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6234085/ws-services-calculation/WCBillingSlab.json b/data/as/6234085/ws-services-calculation/WCBillingSlab.json
index 3210537101..a921b4c40e 100644
--- a/data/as/6234085/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6234085/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6241704/ws-services-calculation/Penalty.json b/data/as/6241704/ws-services-calculation/Penalty.json
index 0b2cc8236c..2083337f59 100644
--- a/data/as/6241704/ws-services-calculation/Penalty.json
+++ b/data/as/6241704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6241704/ws-services-calculation/WCBillingSlab.json b/data/as/6241704/ws-services-calculation/WCBillingSlab.json
index 35d4624b72..dd109ace39 100644
--- a/data/as/6241704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6241704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6241823/ws-services-calculation/Penalty.json b/data/as/6241823/ws-services-calculation/Penalty.json
index f39455d8cc..4aa7b8b59a 100644
--- a/data/as/6241823/ws-services-calculation/Penalty.json
+++ b/data/as/6241823/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6241823/ws-services-calculation/WCBillingSlab.json b/data/as/6241823/ws-services-calculation/WCBillingSlab.json
index 932973d2eb..5af171ad4e 100644
--- a/data/as/6241823/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6241823/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6241939/ws-services-calculation/Penalty.json b/data/as/6241939/ws-services-calculation/Penalty.json
index b7fa4a123b..9fd6ae958a 100644
--- a/data/as/6241939/ws-services-calculation/Penalty.json
+++ b/data/as/6241939/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6241939/ws-services-calculation/WCBillingSlab.json b/data/as/6241939/ws-services-calculation/WCBillingSlab.json
index ccda4f2143..3163bfe10f 100644
--- a/data/as/6241939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6241939/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6242561/ws-services-calculation/Penalty.json b/data/as/6242561/ws-services-calculation/Penalty.json
index bb3b984555..b7dd47a79a 100644
--- a/data/as/6242561/ws-services-calculation/Penalty.json
+++ b/data/as/6242561/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242561/ws-services-calculation/WCBillingSlab.json b/data/as/6242561/ws-services-calculation/WCBillingSlab.json
index 45278cf7e9..8dd79d8f12 100644
--- a/data/as/6242561/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242561/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6242604/ws-services-calculation/Penalty.json b/data/as/6242604/ws-services-calculation/Penalty.json
index b771f170ee..b9085ac903 100644
--- a/data/as/6242604/ws-services-calculation/Penalty.json
+++ b/data/as/6242604/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242604/ws-services-calculation/WCBillingSlab.json b/data/as/6242604/ws-services-calculation/WCBillingSlab.json
index 1e901ca65e..b19ded478f 100644
--- a/data/as/6242604/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242604/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6242836/ws-services-calculation/Penalty.json b/data/as/6242836/ws-services-calculation/Penalty.json
index b8602a149d..ede70823e0 100644
--- a/data/as/6242836/ws-services-calculation/Penalty.json
+++ b/data/as/6242836/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242836/ws-services-calculation/WCBillingSlab.json b/data/as/6242836/ws-services-calculation/WCBillingSlab.json
index 9bb7fbd452..9177e44bbd 100644
--- a/data/as/6242836/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242836/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6242875/ws-services-calculation/Penalty.json b/data/as/6242875/ws-services-calculation/Penalty.json
index 450b377da6..9e119df1e6 100644
--- a/data/as/6242875/ws-services-calculation/Penalty.json
+++ b/data/as/6242875/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242875/ws-services-calculation/WCBillingSlab.json b/data/as/6242875/ws-services-calculation/WCBillingSlab.json
index 9ca3de3bcb..9a018faf2e 100644
--- a/data/as/6242875/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242875/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6242892/ws-services-calculation/Penalty.json b/data/as/6242892/ws-services-calculation/Penalty.json
index 6b932cfd1b..93168ee7ca 100644
--- a/data/as/6242892/ws-services-calculation/Penalty.json
+++ b/data/as/6242892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242892/ws-services-calculation/WCBillingSlab.json b/data/as/6242892/ws-services-calculation/WCBillingSlab.json
index 07767e9fe3..8d1c9f8a13 100644
--- a/data/as/6242892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259479/ws-services-calculation/Penalty.json b/data/as/6259479/ws-services-calculation/Penalty.json
index b798a8d7d2..aa7321a841 100644
--- a/data/as/6259479/ws-services-calculation/Penalty.json
+++ b/data/as/6259479/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259479/ws-services-calculation/WCBillingSlab.json b/data/as/6259479/ws-services-calculation/WCBillingSlab.json
index 9c1767e158..4f3fbc621f 100644
--- a/data/as/6259479/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259479/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259651/ws-services-calculation/Penalty.json b/data/as/6259651/ws-services-calculation/Penalty.json
index 29854a2371..872abf2003 100644
--- a/data/as/6259651/ws-services-calculation/Penalty.json
+++ b/data/as/6259651/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259651/ws-services-calculation/WCBillingSlab.json b/data/as/6259651/ws-services-calculation/WCBillingSlab.json
index 161e5a311b..6deffeb544 100644
--- a/data/as/6259651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259651/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259713/ws-services-calculation/Penalty.json b/data/as/6259713/ws-services-calculation/Penalty.json
index 8274b20b1b..c123026403 100644
--- a/data/as/6259713/ws-services-calculation/Penalty.json
+++ b/data/as/6259713/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259713/ws-services-calculation/WCBillingSlab.json b/data/as/6259713/ws-services-calculation/WCBillingSlab.json
index 294c581eba..92cb2e51ee 100644
--- a/data/as/6259713/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259713/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259850/ws-services-calculation/Penalty.json b/data/as/6259850/ws-services-calculation/Penalty.json
index 4eb0b9cf4d..4988b75af1 100644
--- a/data/as/6259850/ws-services-calculation/Penalty.json
+++ b/data/as/6259850/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259850/ws-services-calculation/WCBillingSlab.json b/data/as/6259850/ws-services-calculation/WCBillingSlab.json
index 97d98889dd..553a4dae5f 100644
--- a/data/as/6259850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259850/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259888/ws-services-calculation/Penalty.json b/data/as/6259888/ws-services-calculation/Penalty.json
index fe1dd04b5a..ff0c1ccf60 100644
--- a/data/as/6259888/ws-services-calculation/Penalty.json
+++ b/data/as/6259888/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259888/ws-services-calculation/WCBillingSlab.json b/data/as/6259888/ws-services-calculation/WCBillingSlab.json
index 5531c9473b..b412e7b659 100644
--- a/data/as/6259888/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259888/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259908/ws-services-calculation/Penalty.json b/data/as/6259908/ws-services-calculation/Penalty.json
index 86e224a3ef..9021237f55 100644
--- a/data/as/6259908/ws-services-calculation/Penalty.json
+++ b/data/as/6259908/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259908/ws-services-calculation/WCBillingSlab.json b/data/as/6259908/ws-services-calculation/WCBillingSlab.json
index df0201536f..253660f8a7 100644
--- a/data/as/6259908/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259908/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259933/ws-services-calculation/Penalty.json b/data/as/6259933/ws-services-calculation/Penalty.json
index 56b35c98e0..a94c676a05 100644
--- a/data/as/6259933/ws-services-calculation/Penalty.json
+++ b/data/as/6259933/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259933/ws-services-calculation/WCBillingSlab.json b/data/as/6259933/ws-services-calculation/WCBillingSlab.json
index 6e6e7300fb..00abf493f1 100644
--- a/data/as/6259933/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259933/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6259975/ws-services-calculation/Penalty.json b/data/as/6259975/ws-services-calculation/Penalty.json
index 49f7cca560..5cf9f5ec05 100644
--- a/data/as/6259975/ws-services-calculation/Penalty.json
+++ b/data/as/6259975/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259975/ws-services-calculation/WCBillingSlab.json b/data/as/6259975/ws-services-calculation/WCBillingSlab.json
index 4581853ff6..60f43c7252 100644
--- a/data/as/6259975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259975/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6260027/ws-services-calculation/Penalty.json b/data/as/6260027/ws-services-calculation/Penalty.json
index 398abcd6f8..65890f6b86 100644
--- a/data/as/6260027/ws-services-calculation/Penalty.json
+++ b/data/as/6260027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260027/ws-services-calculation/WCBillingSlab.json b/data/as/6260027/ws-services-calculation/WCBillingSlab.json
index 93b896ab10..e42335c8c4 100644
--- a/data/as/6260027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6260773/ws-services-calculation/Penalty.json b/data/as/6260773/ws-services-calculation/Penalty.json
index 8a9ed1f0af..161c2a749e 100644
--- a/data/as/6260773/ws-services-calculation/Penalty.json
+++ b/data/as/6260773/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260773/ws-services-calculation/WCBillingSlab.json b/data/as/6260773/ws-services-calculation/WCBillingSlab.json
index 787ab11670..68b5986a21 100644
--- a/data/as/6260773/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260773/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6260844/ws-services-calculation/Penalty.json b/data/as/6260844/ws-services-calculation/Penalty.json
index 6404eb1f16..646a184397 100644
--- a/data/as/6260844/ws-services-calculation/Penalty.json
+++ b/data/as/6260844/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260844/ws-services-calculation/WCBillingSlab.json b/data/as/6260844/ws-services-calculation/WCBillingSlab.json
index 74f1595056..0ae06dac3b 100644
--- a/data/as/6260844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260844/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6260923/ws-services-calculation/Penalty.json b/data/as/6260923/ws-services-calculation/Penalty.json
index f6ca55bf35..da6d3f52c8 100644
--- a/data/as/6260923/ws-services-calculation/Penalty.json
+++ b/data/as/6260923/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260923/ws-services-calculation/WCBillingSlab.json b/data/as/6260923/ws-services-calculation/WCBillingSlab.json
index c07f62231d..f52f3b492c 100644
--- a/data/as/6260923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260923/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6347427/ws-services-calculation/Penalty.json b/data/as/6347427/ws-services-calculation/Penalty.json
index e5320eed7c..d25df58399 100644
--- a/data/as/6347427/ws-services-calculation/Penalty.json
+++ b/data/as/6347427/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6347427/ws-services-calculation/WCBillingSlab.json b/data/as/6347427/ws-services-calculation/WCBillingSlab.json
index e90c8a7fbb..b1607c8570 100644
--- a/data/as/6347427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6347427/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6349286/ws-services-calculation/Penalty.json b/data/as/6349286/ws-services-calculation/Penalty.json
index 5a4d1edc39..3b28b06a8b 100644
--- a/data/as/6349286/ws-services-calculation/Penalty.json
+++ b/data/as/6349286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6349286/ws-services-calculation/WCBillingSlab.json b/data/as/6349286/ws-services-calculation/WCBillingSlab.json
index fd3e820bac..27661d9c94 100644
--- a/data/as/6349286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6349286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6350831/ws-services-calculation/Penalty.json b/data/as/6350831/ws-services-calculation/Penalty.json
index 7ebcf59510..0d6e4fe11b 100644
--- a/data/as/6350831/ws-services-calculation/Penalty.json
+++ b/data/as/6350831/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6350831/ws-services-calculation/WCBillingSlab.json b/data/as/6350831/ws-services-calculation/WCBillingSlab.json
index cb123d90af..3845621857 100644
--- a/data/as/6350831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6350831/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6350854/ws-services-calculation/Penalty.json b/data/as/6350854/ws-services-calculation/Penalty.json
index c3766b479f..e77efa2018 100644
--- a/data/as/6350854/ws-services-calculation/Penalty.json
+++ b/data/as/6350854/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6350854/ws-services-calculation/WCBillingSlab.json b/data/as/6350854/ws-services-calculation/WCBillingSlab.json
index 7fc512b7e7..b97d86ee35 100644
--- a/data/as/6350854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6350854/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385531/ws-services-calculation/Penalty.json b/data/as/6385531/ws-services-calculation/Penalty.json
index 6e1d3cdacd..461d616513 100644
--- a/data/as/6385531/ws-services-calculation/Penalty.json
+++ b/data/as/6385531/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385531/ws-services-calculation/WCBillingSlab.json b/data/as/6385531/ws-services-calculation/WCBillingSlab.json
index 6cad319132..db202025e1 100644
--- a/data/as/6385531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385531/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385536/ws-services-calculation/Penalty.json b/data/as/6385536/ws-services-calculation/Penalty.json
index 1a2d6f934a..66550aae3d 100644
--- a/data/as/6385536/ws-services-calculation/Penalty.json
+++ b/data/as/6385536/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385536/ws-services-calculation/WCBillingSlab.json b/data/as/6385536/ws-services-calculation/WCBillingSlab.json
index b205db98fb..1b98fbc005 100644
--- a/data/as/6385536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385536/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385545/ws-services-calculation/Penalty.json b/data/as/6385545/ws-services-calculation/Penalty.json
index 901edf0bf4..c8c53b395a 100644
--- a/data/as/6385545/ws-services-calculation/Penalty.json
+++ b/data/as/6385545/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385545/ws-services-calculation/WCBillingSlab.json b/data/as/6385545/ws-services-calculation/WCBillingSlab.json
index ad88c76345..1c95b5372a 100644
--- a/data/as/6385545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385545/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385554/ws-services-calculation/Penalty.json b/data/as/6385554/ws-services-calculation/Penalty.json
index 07060293e0..4805beeecc 100644
--- a/data/as/6385554/ws-services-calculation/Penalty.json
+++ b/data/as/6385554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385554/ws-services-calculation/WCBillingSlab.json b/data/as/6385554/ws-services-calculation/WCBillingSlab.json
index 606ad8d141..15a0dff521 100644
--- a/data/as/6385554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385567/ws-services-calculation/Penalty.json b/data/as/6385567/ws-services-calculation/Penalty.json
index c3d0a1644c..de1f0e6349 100644
--- a/data/as/6385567/ws-services-calculation/Penalty.json
+++ b/data/as/6385567/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385567/ws-services-calculation/WCBillingSlab.json b/data/as/6385567/ws-services-calculation/WCBillingSlab.json
index f105100152..8be578f9dc 100644
--- a/data/as/6385567/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385567/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385905/ws-services-calculation/Penalty.json b/data/as/6385905/ws-services-calculation/Penalty.json
index 4dd4e3def2..7dc54e16a5 100644
--- a/data/as/6385905/ws-services-calculation/Penalty.json
+++ b/data/as/6385905/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385905/ws-services-calculation/WCBillingSlab.json b/data/as/6385905/ws-services-calculation/WCBillingSlab.json
index 9916a197c9..dff254e21d 100644
--- a/data/as/6385905/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385905/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385915/ws-services-calculation/Penalty.json b/data/as/6385915/ws-services-calculation/Penalty.json
index d706e34a9b..729d468620 100644
--- a/data/as/6385915/ws-services-calculation/Penalty.json
+++ b/data/as/6385915/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385915/ws-services-calculation/WCBillingSlab.json b/data/as/6385915/ws-services-calculation/WCBillingSlab.json
index 916225f619..fdd97fe01c 100644
--- a/data/as/6385915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385915/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6385925/ws-services-calculation/Penalty.json b/data/as/6385925/ws-services-calculation/Penalty.json
index bae810d65d..4c4536170b 100644
--- a/data/as/6385925/ws-services-calculation/Penalty.json
+++ b/data/as/6385925/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385925/ws-services-calculation/WCBillingSlab.json b/data/as/6385925/ws-services-calculation/WCBillingSlab.json
index c5cede3578..0eea2e4d7e 100644
--- a/data/as/6385925/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385925/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6502957/ws-services-calculation/Penalty.json b/data/as/6502957/ws-services-calculation/Penalty.json
index d3f1ef32e6..b9ffc1d0a4 100644
--- a/data/as/6502957/ws-services-calculation/Penalty.json
+++ b/data/as/6502957/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6502957/ws-services-calculation/WCBillingSlab.json b/data/as/6502957/ws-services-calculation/WCBillingSlab.json
index 89217a8db7..3a9c20da1a 100644
--- a/data/as/6502957/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6502957/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6503042/ws-services-calculation/Penalty.json b/data/as/6503042/ws-services-calculation/Penalty.json
index abeb2e5f1b..e334fc3195 100644
--- a/data/as/6503042/ws-services-calculation/Penalty.json
+++ b/data/as/6503042/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6503042/ws-services-calculation/WCBillingSlab.json b/data/as/6503042/ws-services-calculation/WCBillingSlab.json
index 775d7db8e8..22e74b48da 100644
--- a/data/as/6503042/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6503042/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6515973/ws-services-calculation/Penalty.json b/data/as/6515973/ws-services-calculation/Penalty.json
index 7a66d52977..dbec3b3658 100644
--- a/data/as/6515973/ws-services-calculation/Penalty.json
+++ b/data/as/6515973/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6515973/ws-services-calculation/WCBillingSlab.json b/data/as/6515973/ws-services-calculation/WCBillingSlab.json
index a342330218..13bd37e004 100644
--- a/data/as/6515973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6515973/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6516224/ws-services-calculation/Penalty.json b/data/as/6516224/ws-services-calculation/Penalty.json
index c55008258d..39a48e9bd9 100644
--- a/data/as/6516224/ws-services-calculation/Penalty.json
+++ b/data/as/6516224/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6516224/ws-services-calculation/WCBillingSlab.json b/data/as/6516224/ws-services-calculation/WCBillingSlab.json
index 155695f975..e4610fb16c 100644
--- a/data/as/6516224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6516224/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6517821/ws-services-calculation/Penalty.json b/data/as/6517821/ws-services-calculation/Penalty.json
index ada8c8d0df..04a783e6f5 100644
--- a/data/as/6517821/ws-services-calculation/Penalty.json
+++ b/data/as/6517821/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6517821/ws-services-calculation/WCBillingSlab.json b/data/as/6517821/ws-services-calculation/WCBillingSlab.json
index 14914c1f6a..2c727a5043 100644
--- a/data/as/6517821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6517821/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6520124/ws-services-calculation/Penalty.json b/data/as/6520124/ws-services-calculation/Penalty.json
index bdc94d1717..4b0cd9db91 100644
--- a/data/as/6520124/ws-services-calculation/Penalty.json
+++ b/data/as/6520124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6520124/ws-services-calculation/WCBillingSlab.json b/data/as/6520124/ws-services-calculation/WCBillingSlab.json
index 084ef92b9f..9559395310 100644
--- a/data/as/6520124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6520124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6524893/ws-services-calculation/Penalty.json b/data/as/6524893/ws-services-calculation/Penalty.json
index 3dbb3b7ca5..debe7aca54 100644
--- a/data/as/6524893/ws-services-calculation/Penalty.json
+++ b/data/as/6524893/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6524893/ws-services-calculation/WCBillingSlab.json b/data/as/6524893/ws-services-calculation/WCBillingSlab.json
index cc805cc00e..58f284123b 100644
--- a/data/as/6524893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6524893/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6524935/ws-services-calculation/Penalty.json b/data/as/6524935/ws-services-calculation/Penalty.json
index 595b2dfd3b..b7aa8b889f 100644
--- a/data/as/6524935/ws-services-calculation/Penalty.json
+++ b/data/as/6524935/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6524935/ws-services-calculation/WCBillingSlab.json b/data/as/6524935/ws-services-calculation/WCBillingSlab.json
index 8340f0137c..f62b300b5b 100644
--- a/data/as/6524935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6524935/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6526507/ws-services-calculation/Penalty.json b/data/as/6526507/ws-services-calculation/Penalty.json
index 87e80f2166..54016c4899 100644
--- a/data/as/6526507/ws-services-calculation/Penalty.json
+++ b/data/as/6526507/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6526507/ws-services-calculation/WCBillingSlab.json b/data/as/6526507/ws-services-calculation/WCBillingSlab.json
index ad6dd87b46..e2187410b3 100644
--- a/data/as/6526507/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6526507/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6526593/ws-services-calculation/Penalty.json b/data/as/6526593/ws-services-calculation/Penalty.json
index c9b7c50c51..fab7173402 100644
--- a/data/as/6526593/ws-services-calculation/Penalty.json
+++ b/data/as/6526593/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6526593/ws-services-calculation/WCBillingSlab.json b/data/as/6526593/ws-services-calculation/WCBillingSlab.json
index 3f056a5275..dee42ff26d 100644
--- a/data/as/6526593/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6526593/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6526646/ws-services-calculation/Penalty.json b/data/as/6526646/ws-services-calculation/Penalty.json
index 05d51ad408..56a86f3214 100644
--- a/data/as/6526646/ws-services-calculation/Penalty.json
+++ b/data/as/6526646/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6526646/ws-services-calculation/WCBillingSlab.json b/data/as/6526646/ws-services-calculation/WCBillingSlab.json
index 51877667e5..4a4f45c4dd 100644
--- a/data/as/6526646/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6526646/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6852674/ws-services-calculation/Penalty.json b/data/as/6852674/ws-services-calculation/Penalty.json
index 752f765fd8..1c33f3d7fc 100644
--- a/data/as/6852674/ws-services-calculation/Penalty.json
+++ b/data/as/6852674/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6852674/ws-services-calculation/WCBillingSlab.json b/data/as/6852674/ws-services-calculation/WCBillingSlab.json
index 79f2df6e5e..4aa1f43b8c 100644
--- a/data/as/6852674/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6852674/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6858112/ws-services-calculation/Penalty.json b/data/as/6858112/ws-services-calculation/Penalty.json
index cf43669996..e6707717b6 100644
--- a/data/as/6858112/ws-services-calculation/Penalty.json
+++ b/data/as/6858112/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6858112/ws-services-calculation/WCBillingSlab.json b/data/as/6858112/ws-services-calculation/WCBillingSlab.json
index a94deb0d81..73de1afc8d 100644
--- a/data/as/6858112/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6858112/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6858114/ws-services-calculation/Penalty.json b/data/as/6858114/ws-services-calculation/Penalty.json
index 912eb0626f..3111f7cd20 100644
--- a/data/as/6858114/ws-services-calculation/Penalty.json
+++ b/data/as/6858114/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6858114/ws-services-calculation/WCBillingSlab.json b/data/as/6858114/ws-services-calculation/WCBillingSlab.json
index c31776f1fd..00b411a276 100644
--- a/data/as/6858114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6858114/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6861545/ws-services-calculation/Penalty.json b/data/as/6861545/ws-services-calculation/Penalty.json
index b32cab7fff..43377fbb4b 100644
--- a/data/as/6861545/ws-services-calculation/Penalty.json
+++ b/data/as/6861545/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6861545/ws-services-calculation/WCBillingSlab.json b/data/as/6861545/ws-services-calculation/WCBillingSlab.json
index ae31105449..10a28d546e 100644
--- a/data/as/6861545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6861545/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6861639/ws-services-calculation/Penalty.json b/data/as/6861639/ws-services-calculation/Penalty.json
index f1c89897a6..87c65e177b 100644
--- a/data/as/6861639/ws-services-calculation/Penalty.json
+++ b/data/as/6861639/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6861639/ws-services-calculation/WCBillingSlab.json b/data/as/6861639/ws-services-calculation/WCBillingSlab.json
index 798409b777..ad83600484 100644
--- a/data/as/6861639/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6861639/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/6861642/ws-services-calculation/Penalty.json b/data/as/6861642/ws-services-calculation/Penalty.json
index 175b4ca8de..18d8e410da 100644
--- a/data/as/6861642/ws-services-calculation/Penalty.json
+++ b/data/as/6861642/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6861642/ws-services-calculation/WCBillingSlab.json b/data/as/6861642/ws-services-calculation/WCBillingSlab.json
index 07949bbadc..a4905f44e6 100644
--- a/data/as/6861642/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6861642/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7341547/ws-services-calculation/Penalty.json b/data/as/7341547/ws-services-calculation/Penalty.json
index d50085818d..df8bc36967 100644
--- a/data/as/7341547/ws-services-calculation/Penalty.json
+++ b/data/as/7341547/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7341547/ws-services-calculation/WCBillingSlab.json b/data/as/7341547/ws-services-calculation/WCBillingSlab.json
index adbcf139c4..cc34f7e524 100644
--- a/data/as/7341547/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7341547/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7343676/ws-services-calculation/Penalty.json b/data/as/7343676/ws-services-calculation/Penalty.json
index 6f5df6c4ab..bb76f89758 100644
--- a/data/as/7343676/ws-services-calculation/Penalty.json
+++ b/data/as/7343676/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7343676/ws-services-calculation/WCBillingSlab.json b/data/as/7343676/ws-services-calculation/WCBillingSlab.json
index 9eaf9148ad..5ad85a8f17 100644
--- a/data/as/7343676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7343676/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7347016/ws-services-calculation/Penalty.json b/data/as/7347016/ws-services-calculation/Penalty.json
index da9f31de14..daca9402c9 100644
--- a/data/as/7347016/ws-services-calculation/Penalty.json
+++ b/data/as/7347016/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7347016/ws-services-calculation/WCBillingSlab.json b/data/as/7347016/ws-services-calculation/WCBillingSlab.json
index 7c43e23fd6..e5ff16f30d 100644
--- a/data/as/7347016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7347016/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7347032/ws-services-calculation/Penalty.json b/data/as/7347032/ws-services-calculation/Penalty.json
index 3c7e866e16..f90eb06bfc 100644
--- a/data/as/7347032/ws-services-calculation/Penalty.json
+++ b/data/as/7347032/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7347032/ws-services-calculation/WCBillingSlab.json b/data/as/7347032/ws-services-calculation/WCBillingSlab.json
index d387ea777f..ff6df45594 100644
--- a/data/as/7347032/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7347032/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7347122/ws-services-calculation/Penalty.json b/data/as/7347122/ws-services-calculation/Penalty.json
index 62754f4da8..b96f897c2f 100644
--- a/data/as/7347122/ws-services-calculation/Penalty.json
+++ b/data/as/7347122/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7347122/ws-services-calculation/WCBillingSlab.json b/data/as/7347122/ws-services-calculation/WCBillingSlab.json
index 768351c1fe..c17cef58a2 100644
--- a/data/as/7347122/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7347122/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7637384/ws-services-calculation/Penalty.json b/data/as/7637384/ws-services-calculation/Penalty.json
index a11a10f7ea..ac8974650a 100644
--- a/data/as/7637384/ws-services-calculation/Penalty.json
+++ b/data/as/7637384/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7637384/ws-services-calculation/WCBillingSlab.json b/data/as/7637384/ws-services-calculation/WCBillingSlab.json
index 8734cf89c6..bc348900f5 100644
--- a/data/as/7637384/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7637384/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7893876/ws-services-calculation/Penalty.json b/data/as/7893876/ws-services-calculation/Penalty.json
index 58297b4493..7b9fee0cc6 100644
--- a/data/as/7893876/ws-services-calculation/Penalty.json
+++ b/data/as/7893876/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7893876/ws-services-calculation/WCBillingSlab.json b/data/as/7893876/ws-services-calculation/WCBillingSlab.json
index 4b3a97eea1..2d2e8a5e77 100644
--- a/data/as/7893876/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7893876/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7894596/ws-services-calculation/Penalty.json b/data/as/7894596/ws-services-calculation/Penalty.json
index 9b2ea400be..8168437328 100644
--- a/data/as/7894596/ws-services-calculation/Penalty.json
+++ b/data/as/7894596/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7894596/ws-services-calculation/WCBillingSlab.json b/data/as/7894596/ws-services-calculation/WCBillingSlab.json
index 9683b79ef9..3fb31a2edd 100644
--- a/data/as/7894596/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7894596/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898565/ws-services-calculation/Penalty.json b/data/as/7898565/ws-services-calculation/Penalty.json
index bd2daa866f..bb02f71b8c 100644
--- a/data/as/7898565/ws-services-calculation/Penalty.json
+++ b/data/as/7898565/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898565/ws-services-calculation/WCBillingSlab.json b/data/as/7898565/ws-services-calculation/WCBillingSlab.json
index 9af3766710..6e3b7edf99 100644
--- a/data/as/7898565/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898565/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898568/ws-services-calculation/Penalty.json b/data/as/7898568/ws-services-calculation/Penalty.json
index 5c624bbc59..f6af0742e2 100644
--- a/data/as/7898568/ws-services-calculation/Penalty.json
+++ b/data/as/7898568/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898568/ws-services-calculation/WCBillingSlab.json b/data/as/7898568/ws-services-calculation/WCBillingSlab.json
index db28e68c7a..b1c019390b 100644
--- a/data/as/7898568/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898568/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898570/ws-services-calculation/Penalty.json b/data/as/7898570/ws-services-calculation/Penalty.json
index 3fd069cd78..ff6a1ccf8d 100644
--- a/data/as/7898570/ws-services-calculation/Penalty.json
+++ b/data/as/7898570/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898570/ws-services-calculation/WCBillingSlab.json b/data/as/7898570/ws-services-calculation/WCBillingSlab.json
index febc2fa019..72ffc68e34 100644
--- a/data/as/7898570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898570/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898571/ws-services-calculation/Penalty.json b/data/as/7898571/ws-services-calculation/Penalty.json
index d5bfe160ba..3098cf54fd 100644
--- a/data/as/7898571/ws-services-calculation/Penalty.json
+++ b/data/as/7898571/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898571/ws-services-calculation/WCBillingSlab.json b/data/as/7898571/ws-services-calculation/WCBillingSlab.json
index f7ee2abc9b..18e3b69273 100644
--- a/data/as/7898571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898571/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898573/ws-services-calculation/Penalty.json b/data/as/7898573/ws-services-calculation/Penalty.json
index 33011098d6..46fcd6fb6f 100644
--- a/data/as/7898573/ws-services-calculation/Penalty.json
+++ b/data/as/7898573/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898573/ws-services-calculation/WCBillingSlab.json b/data/as/7898573/ws-services-calculation/WCBillingSlab.json
index 59adf11b8e..2a474a57e5 100644
--- a/data/as/7898573/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898573/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898574/ws-services-calculation/Penalty.json b/data/as/7898574/ws-services-calculation/Penalty.json
index 87ac744faf..0aa2e31fb4 100644
--- a/data/as/7898574/ws-services-calculation/Penalty.json
+++ b/data/as/7898574/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898574/ws-services-calculation/WCBillingSlab.json b/data/as/7898574/ws-services-calculation/WCBillingSlab.json
index 247cfb17b4..3e21b49f54 100644
--- a/data/as/7898574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898574/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7898575/ws-services-calculation/Penalty.json b/data/as/7898575/ws-services-calculation/Penalty.json
index c0015c1978..8f9d9bfcaa 100644
--- a/data/as/7898575/ws-services-calculation/Penalty.json
+++ b/data/as/7898575/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898575/ws-services-calculation/WCBillingSlab.json b/data/as/7898575/ws-services-calculation/WCBillingSlab.json
index a42ba5b12d..fbf04a34ca 100644
--- a/data/as/7898575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898575/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7971619/ws-services-calculation/Penalty.json b/data/as/7971619/ws-services-calculation/Penalty.json
index 21e7c25a7f..fa18c39676 100644
--- a/data/as/7971619/ws-services-calculation/Penalty.json
+++ b/data/as/7971619/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7971619/ws-services-calculation/WCBillingSlab.json b/data/as/7971619/ws-services-calculation/WCBillingSlab.json
index f41d1ab786..edb0ea3cd9 100644
--- a/data/as/7971619/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7971619/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/7971866/ws-services-calculation/Penalty.json b/data/as/7971866/ws-services-calculation/Penalty.json
index 1b48dd3469..9b4260cb7f 100644
--- a/data/as/7971866/ws-services-calculation/Penalty.json
+++ b/data/as/7971866/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7971866/ws-services-calculation/WCBillingSlab.json b/data/as/7971866/ws-services-calculation/WCBillingSlab.json
index 6c9d3ef16f..c7c600526b 100644
--- a/data/as/7971866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7971866/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8036124/ws-services-calculation/Penalty.json b/data/as/8036124/ws-services-calculation/Penalty.json
index c5aa77d577..76b07d49c7 100644
--- a/data/as/8036124/ws-services-calculation/Penalty.json
+++ b/data/as/8036124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8036124/ws-services-calculation/WCBillingSlab.json b/data/as/8036124/ws-services-calculation/WCBillingSlab.json
index 31ffc80c91..0839aaa02d 100644
--- a/data/as/8036124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8036124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8036130/ws-services-calculation/Penalty.json b/data/as/8036130/ws-services-calculation/Penalty.json
index f587528bdb..ffb75031cc 100644
--- a/data/as/8036130/ws-services-calculation/Penalty.json
+++ b/data/as/8036130/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8036130/ws-services-calculation/WCBillingSlab.json b/data/as/8036130/ws-services-calculation/WCBillingSlab.json
index 6bb15a091a..8f94458ca1 100644
--- a/data/as/8036130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8036130/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8131608/ws-services-calculation/Penalty.json b/data/as/8131608/ws-services-calculation/Penalty.json
index 163adb3c93..e496a245a1 100644
--- a/data/as/8131608/ws-services-calculation/Penalty.json
+++ b/data/as/8131608/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8131608/ws-services-calculation/WCBillingSlab.json b/data/as/8131608/ws-services-calculation/WCBillingSlab.json
index 175640d183..9b9fdcf479 100644
--- a/data/as/8131608/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8131608/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132115/ws-services-calculation/Penalty.json b/data/as/8132115/ws-services-calculation/Penalty.json
index bf97a9e3fb..586689fe43 100644
--- a/data/as/8132115/ws-services-calculation/Penalty.json
+++ b/data/as/8132115/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132115/ws-services-calculation/WCBillingSlab.json b/data/as/8132115/ws-services-calculation/WCBillingSlab.json
index b95175a6db..144562e122 100644
--- a/data/as/8132115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132115/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132124/ws-services-calculation/Penalty.json b/data/as/8132124/ws-services-calculation/Penalty.json
index 2a72a8a839..70ce68d6d4 100644
--- a/data/as/8132124/ws-services-calculation/Penalty.json
+++ b/data/as/8132124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132124/ws-services-calculation/WCBillingSlab.json b/data/as/8132124/ws-services-calculation/WCBillingSlab.json
index b7a23340b7..25d57f18a0 100644
--- a/data/as/8132124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132128/ws-services-calculation/Penalty.json b/data/as/8132128/ws-services-calculation/Penalty.json
index 82eac397ce..defbc4a1a0 100644
--- a/data/as/8132128/ws-services-calculation/Penalty.json
+++ b/data/as/8132128/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132128/ws-services-calculation/WCBillingSlab.json b/data/as/8132128/ws-services-calculation/WCBillingSlab.json
index 9fce6f0b79..b031d734ac 100644
--- a/data/as/8132128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132128/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132750/ws-services-calculation/Penalty.json b/data/as/8132750/ws-services-calculation/Penalty.json
index 1cb3cfdf33..f97407d895 100644
--- a/data/as/8132750/ws-services-calculation/Penalty.json
+++ b/data/as/8132750/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132750/ws-services-calculation/WCBillingSlab.json b/data/as/8132750/ws-services-calculation/WCBillingSlab.json
index 51fd012078..fdad344f21 100644
--- a/data/as/8132750/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132750/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132803/ws-services-calculation/Penalty.json b/data/as/8132803/ws-services-calculation/Penalty.json
index c1962cbb55..3d51580d7a 100644
--- a/data/as/8132803/ws-services-calculation/Penalty.json
+++ b/data/as/8132803/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132803/ws-services-calculation/WCBillingSlab.json b/data/as/8132803/ws-services-calculation/WCBillingSlab.json
index a6d909624b..1676c73ce6 100644
--- a/data/as/8132803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132803/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132805/ws-services-calculation/Penalty.json b/data/as/8132805/ws-services-calculation/Penalty.json
index 76c633c6d9..f933965294 100644
--- a/data/as/8132805/ws-services-calculation/Penalty.json
+++ b/data/as/8132805/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132805/ws-services-calculation/WCBillingSlab.json b/data/as/8132805/ws-services-calculation/WCBillingSlab.json
index 2ce3dd34ad..d3fab1b0f1 100644
--- a/data/as/8132805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132805/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132840/ws-services-calculation/Penalty.json b/data/as/8132840/ws-services-calculation/Penalty.json
index 47d35078a8..fbabae42de 100644
--- a/data/as/8132840/ws-services-calculation/Penalty.json
+++ b/data/as/8132840/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132840/ws-services-calculation/WCBillingSlab.json b/data/as/8132840/ws-services-calculation/WCBillingSlab.json
index 0c04649e75..82e437513e 100644
--- a/data/as/8132840/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132840/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132845/ws-services-calculation/Penalty.json b/data/as/8132845/ws-services-calculation/Penalty.json
index 9062c1cc63..eaf76a755a 100644
--- a/data/as/8132845/ws-services-calculation/Penalty.json
+++ b/data/as/8132845/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132845/ws-services-calculation/WCBillingSlab.json b/data/as/8132845/ws-services-calculation/WCBillingSlab.json
index 3216e3572f..d1fddbc55d 100644
--- a/data/as/8132845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132845/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132847/ws-services-calculation/Penalty.json b/data/as/8132847/ws-services-calculation/Penalty.json
index 92e7ff97fb..a3f3528fbf 100644
--- a/data/as/8132847/ws-services-calculation/Penalty.json
+++ b/data/as/8132847/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132847/ws-services-calculation/WCBillingSlab.json b/data/as/8132847/ws-services-calculation/WCBillingSlab.json
index 8a0dc6d5c9..9d68fbd28d 100644
--- a/data/as/8132847/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132847/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132850/ws-services-calculation/Penalty.json b/data/as/8132850/ws-services-calculation/Penalty.json
index c07efda633..3ebb960fd0 100644
--- a/data/as/8132850/ws-services-calculation/Penalty.json
+++ b/data/as/8132850/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132850/ws-services-calculation/WCBillingSlab.json b/data/as/8132850/ws-services-calculation/WCBillingSlab.json
index 639078bb18..f3d4ba2f18 100644
--- a/data/as/8132850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132850/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132861/ws-services-calculation/Penalty.json b/data/as/8132861/ws-services-calculation/Penalty.json
index 8c6f8b2710..9b292c1abf 100644
--- a/data/as/8132861/ws-services-calculation/Penalty.json
+++ b/data/as/8132861/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132861/ws-services-calculation/WCBillingSlab.json b/data/as/8132861/ws-services-calculation/WCBillingSlab.json
index 98bd41b933..55e3ff80cd 100644
--- a/data/as/8132861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132861/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132866/ws-services-calculation/Penalty.json b/data/as/8132866/ws-services-calculation/Penalty.json
index 4c99e1348f..3d51a7114b 100644
--- a/data/as/8132866/ws-services-calculation/Penalty.json
+++ b/data/as/8132866/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132866/ws-services-calculation/WCBillingSlab.json b/data/as/8132866/ws-services-calculation/WCBillingSlab.json
index 122ad99b08..40ccf2042f 100644
--- a/data/as/8132866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132866/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132870/ws-services-calculation/Penalty.json b/data/as/8132870/ws-services-calculation/Penalty.json
index f7c205fcfb..14742cefa2 100644
--- a/data/as/8132870/ws-services-calculation/Penalty.json
+++ b/data/as/8132870/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132870/ws-services-calculation/WCBillingSlab.json b/data/as/8132870/ws-services-calculation/WCBillingSlab.json
index 7e83b61b46..dc7eb13cb2 100644
--- a/data/as/8132870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132870/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8132892/ws-services-calculation/Penalty.json b/data/as/8132892/ws-services-calculation/Penalty.json
index ee63c4994f..170350549b 100644
--- a/data/as/8132892/ws-services-calculation/Penalty.json
+++ b/data/as/8132892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132892/ws-services-calculation/WCBillingSlab.json b/data/as/8132892/ws-services-calculation/WCBillingSlab.json
index 1dd150dfe4..91f3578290 100644
--- a/data/as/8132892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8137635/ws-services-calculation/Penalty.json b/data/as/8137635/ws-services-calculation/Penalty.json
index 09da931bf4..502ba1854b 100644
--- a/data/as/8137635/ws-services-calculation/Penalty.json
+++ b/data/as/8137635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8137635/ws-services-calculation/WCBillingSlab.json b/data/as/8137635/ws-services-calculation/WCBillingSlab.json
index cf24594d6a..4fe55e1bbc 100644
--- a/data/as/8137635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8137635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8138120/ws-services-calculation/Penalty.json b/data/as/8138120/ws-services-calculation/Penalty.json
index 0c4cb0d1a2..956d81aaa7 100644
--- a/data/as/8138120/ws-services-calculation/Penalty.json
+++ b/data/as/8138120/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8138120/ws-services-calculation/WCBillingSlab.json b/data/as/8138120/ws-services-calculation/WCBillingSlab.json
index 5237b0caa4..0615bcfcab 100644
--- a/data/as/8138120/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8138120/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8138164/ws-services-calculation/Penalty.json b/data/as/8138164/ws-services-calculation/Penalty.json
index 0ae18a1582..c6710e8e61 100644
--- a/data/as/8138164/ws-services-calculation/Penalty.json
+++ b/data/as/8138164/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8138164/ws-services-calculation/WCBillingSlab.json b/data/as/8138164/ws-services-calculation/WCBillingSlab.json
index e26ec7fd52..1fbf25dc84 100644
--- a/data/as/8138164/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8138164/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8140993/ws-services-calculation/Penalty.json b/data/as/8140993/ws-services-calculation/Penalty.json
index 803bc9ac65..a5d96ceb17 100644
--- a/data/as/8140993/ws-services-calculation/Penalty.json
+++ b/data/as/8140993/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8140993/ws-services-calculation/WCBillingSlab.json b/data/as/8140993/ws-services-calculation/WCBillingSlab.json
index 7947dda9a1..aabaa83145 100644
--- a/data/as/8140993/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8140993/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141044/ws-services-calculation/Penalty.json b/data/as/8141044/ws-services-calculation/Penalty.json
index 8eccd63201..8ea6683f19 100644
--- a/data/as/8141044/ws-services-calculation/Penalty.json
+++ b/data/as/8141044/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141044/ws-services-calculation/WCBillingSlab.json b/data/as/8141044/ws-services-calculation/WCBillingSlab.json
index c723d9020f..c9f086e61f 100644
--- a/data/as/8141044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141044/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141062/ws-services-calculation/Penalty.json b/data/as/8141062/ws-services-calculation/Penalty.json
index 11f008b752..758eebaf32 100644
--- a/data/as/8141062/ws-services-calculation/Penalty.json
+++ b/data/as/8141062/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141062/ws-services-calculation/WCBillingSlab.json b/data/as/8141062/ws-services-calculation/WCBillingSlab.json
index 0026ff6cc1..fda7a684c9 100644
--- a/data/as/8141062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141062/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141109/ws-services-calculation/Penalty.json b/data/as/8141109/ws-services-calculation/Penalty.json
index bf46acc314..a6a94bf3ec 100644
--- a/data/as/8141109/ws-services-calculation/Penalty.json
+++ b/data/as/8141109/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141109/ws-services-calculation/WCBillingSlab.json b/data/as/8141109/ws-services-calculation/WCBillingSlab.json
index 876238493b..a6d3f1a021 100644
--- a/data/as/8141109/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141109/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141554/ws-services-calculation/Penalty.json b/data/as/8141554/ws-services-calculation/Penalty.json
index 13b6935aee..1ac2ee6e3f 100644
--- a/data/as/8141554/ws-services-calculation/Penalty.json
+++ b/data/as/8141554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141554/ws-services-calculation/WCBillingSlab.json b/data/as/8141554/ws-services-calculation/WCBillingSlab.json
index d5914c402d..15b6fa74e0 100644
--- a/data/as/8141554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141566/ws-services-calculation/Penalty.json b/data/as/8141566/ws-services-calculation/Penalty.json
index 956008c260..c8f19aba24 100644
--- a/data/as/8141566/ws-services-calculation/Penalty.json
+++ b/data/as/8141566/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141566/ws-services-calculation/WCBillingSlab.json b/data/as/8141566/ws-services-calculation/WCBillingSlab.json
index a486436bee..e8578e7520 100644
--- a/data/as/8141566/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141566/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141583/ws-services-calculation/Penalty.json b/data/as/8141583/ws-services-calculation/Penalty.json
index a22500e94e..93ffa2ca12 100644
--- a/data/as/8141583/ws-services-calculation/Penalty.json
+++ b/data/as/8141583/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141583/ws-services-calculation/WCBillingSlab.json b/data/as/8141583/ws-services-calculation/WCBillingSlab.json
index 0f36c6bd16..1a7c09dc11 100644
--- a/data/as/8141583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141583/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141619/ws-services-calculation/Penalty.json b/data/as/8141619/ws-services-calculation/Penalty.json
index faefc8f42f..5bd42733f2 100644
--- a/data/as/8141619/ws-services-calculation/Penalty.json
+++ b/data/as/8141619/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141619/ws-services-calculation/WCBillingSlab.json b/data/as/8141619/ws-services-calculation/WCBillingSlab.json
index ae5fe0ff52..b462f96e69 100644
--- a/data/as/8141619/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141619/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141631/ws-services-calculation/Penalty.json b/data/as/8141631/ws-services-calculation/Penalty.json
index 354f4f210e..5c3c625478 100644
--- a/data/as/8141631/ws-services-calculation/Penalty.json
+++ b/data/as/8141631/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141631/ws-services-calculation/WCBillingSlab.json b/data/as/8141631/ws-services-calculation/WCBillingSlab.json
index ae8a2342b0..d769f7ba57 100644
--- a/data/as/8141631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141631/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141643/ws-services-calculation/Penalty.json b/data/as/8141643/ws-services-calculation/Penalty.json
index 5f6c678b3a..428b76c533 100644
--- a/data/as/8141643/ws-services-calculation/Penalty.json
+++ b/data/as/8141643/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141643/ws-services-calculation/WCBillingSlab.json b/data/as/8141643/ws-services-calculation/WCBillingSlab.json
index 57ee55e79b..71b62f9f2d 100644
--- a/data/as/8141643/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141643/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141666/ws-services-calculation/Penalty.json b/data/as/8141666/ws-services-calculation/Penalty.json
index a5a4d5b8c3..eb0944596e 100644
--- a/data/as/8141666/ws-services-calculation/Penalty.json
+++ b/data/as/8141666/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141666/ws-services-calculation/WCBillingSlab.json b/data/as/8141666/ws-services-calculation/WCBillingSlab.json
index 9c361fbda1..33909fe530 100644
--- a/data/as/8141666/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141666/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141686/ws-services-calculation/Penalty.json b/data/as/8141686/ws-services-calculation/Penalty.json
index e600f7ad51..218c6ed109 100644
--- a/data/as/8141686/ws-services-calculation/Penalty.json
+++ b/data/as/8141686/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141686/ws-services-calculation/WCBillingSlab.json b/data/as/8141686/ws-services-calculation/WCBillingSlab.json
index 4acb43aa39..71c05050a1 100644
--- a/data/as/8141686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141686/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141704/ws-services-calculation/Penalty.json b/data/as/8141704/ws-services-calculation/Penalty.json
index 0265536402..0d98121565 100644
--- a/data/as/8141704/ws-services-calculation/Penalty.json
+++ b/data/as/8141704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141704/ws-services-calculation/WCBillingSlab.json b/data/as/8141704/ws-services-calculation/WCBillingSlab.json
index 41afb87bfc..679c7c1067 100644
--- a/data/as/8141704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141716/ws-services-calculation/Penalty.json b/data/as/8141716/ws-services-calculation/Penalty.json
index a2eabee4ac..ff836380e6 100644
--- a/data/as/8141716/ws-services-calculation/Penalty.json
+++ b/data/as/8141716/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141716/ws-services-calculation/WCBillingSlab.json b/data/as/8141716/ws-services-calculation/WCBillingSlab.json
index 4ff2d77bf7..a3cac30d51 100644
--- a/data/as/8141716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141716/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141733/ws-services-calculation/Penalty.json b/data/as/8141733/ws-services-calculation/Penalty.json
index f1ed3466da..20206ba201 100644
--- a/data/as/8141733/ws-services-calculation/Penalty.json
+++ b/data/as/8141733/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141733/ws-services-calculation/WCBillingSlab.json b/data/as/8141733/ws-services-calculation/WCBillingSlab.json
index b311effff4..f95347892a 100644
--- a/data/as/8141733/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141733/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141761/ws-services-calculation/Penalty.json b/data/as/8141761/ws-services-calculation/Penalty.json
index ff1182f377..065d75ed6c 100644
--- a/data/as/8141761/ws-services-calculation/Penalty.json
+++ b/data/as/8141761/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141761/ws-services-calculation/WCBillingSlab.json b/data/as/8141761/ws-services-calculation/WCBillingSlab.json
index c5a5ce786a..cbddad5bb5 100644
--- a/data/as/8141761/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141761/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141785/ws-services-calculation/Penalty.json b/data/as/8141785/ws-services-calculation/Penalty.json
index ec1d78bea6..18ece21d27 100644
--- a/data/as/8141785/ws-services-calculation/Penalty.json
+++ b/data/as/8141785/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141785/ws-services-calculation/WCBillingSlab.json b/data/as/8141785/ws-services-calculation/WCBillingSlab.json
index cc9803833d..07cca69642 100644
--- a/data/as/8141785/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141785/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141831/ws-services-calculation/Penalty.json b/data/as/8141831/ws-services-calculation/Penalty.json
index 04a6a0eb7b..3188888501 100644
--- a/data/as/8141831/ws-services-calculation/Penalty.json
+++ b/data/as/8141831/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141831/ws-services-calculation/WCBillingSlab.json b/data/as/8141831/ws-services-calculation/WCBillingSlab.json
index 66a70244b4..707f34debb 100644
--- a/data/as/8141831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141831/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141923/ws-services-calculation/Penalty.json b/data/as/8141923/ws-services-calculation/Penalty.json
index 26feeb7cae..3a29bbcad8 100644
--- a/data/as/8141923/ws-services-calculation/Penalty.json
+++ b/data/as/8141923/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141923/ws-services-calculation/WCBillingSlab.json b/data/as/8141923/ws-services-calculation/WCBillingSlab.json
index 0850818778..2a3717ffce 100644
--- a/data/as/8141923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141923/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8141972/ws-services-calculation/Penalty.json b/data/as/8141972/ws-services-calculation/Penalty.json
index d990f171b8..bfd75a9831 100644
--- a/data/as/8141972/ws-services-calculation/Penalty.json
+++ b/data/as/8141972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141972/ws-services-calculation/WCBillingSlab.json b/data/as/8141972/ws-services-calculation/WCBillingSlab.json
index cd12a57a2d..73cfc0411a 100644
--- a/data/as/8141972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148068/ws-services-calculation/Penalty.json b/data/as/8148068/ws-services-calculation/Penalty.json
index 08b3b034c1..b96348340c 100644
--- a/data/as/8148068/ws-services-calculation/Penalty.json
+++ b/data/as/8148068/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148068/ws-services-calculation/WCBillingSlab.json b/data/as/8148068/ws-services-calculation/WCBillingSlab.json
index 964410960a..b453cf6e6b 100644
--- a/data/as/8148068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148068/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148081/ws-services-calculation/Penalty.json b/data/as/8148081/ws-services-calculation/Penalty.json
index f4b2de5712..225fe2e66b 100644
--- a/data/as/8148081/ws-services-calculation/Penalty.json
+++ b/data/as/8148081/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148081/ws-services-calculation/WCBillingSlab.json b/data/as/8148081/ws-services-calculation/WCBillingSlab.json
index 19e2e0605c..74af209d66 100644
--- a/data/as/8148081/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148081/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148097/ws-services-calculation/Penalty.json b/data/as/8148097/ws-services-calculation/Penalty.json
index c2574f804f..ae4e2e23cd 100644
--- a/data/as/8148097/ws-services-calculation/Penalty.json
+++ b/data/as/8148097/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148097/ws-services-calculation/WCBillingSlab.json b/data/as/8148097/ws-services-calculation/WCBillingSlab.json
index 652fcc8639..a688238a11 100644
--- a/data/as/8148097/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148097/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148105/ws-services-calculation/Penalty.json b/data/as/8148105/ws-services-calculation/Penalty.json
index bd2c5ea37c..5350c6e056 100644
--- a/data/as/8148105/ws-services-calculation/Penalty.json
+++ b/data/as/8148105/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148105/ws-services-calculation/WCBillingSlab.json b/data/as/8148105/ws-services-calculation/WCBillingSlab.json
index 0c2a267fee..ef47ea7bb1 100644
--- a/data/as/8148105/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148105/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148116/ws-services-calculation/Penalty.json b/data/as/8148116/ws-services-calculation/Penalty.json
index 78ba3fcd37..6cea65d289 100644
--- a/data/as/8148116/ws-services-calculation/Penalty.json
+++ b/data/as/8148116/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148116/ws-services-calculation/WCBillingSlab.json b/data/as/8148116/ws-services-calculation/WCBillingSlab.json
index 7069734e4a..c8d4ee30ec 100644
--- a/data/as/8148116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148116/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148125/ws-services-calculation/Penalty.json b/data/as/8148125/ws-services-calculation/Penalty.json
index cccb25975a..ebef77d097 100644
--- a/data/as/8148125/ws-services-calculation/Penalty.json
+++ b/data/as/8148125/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148125/ws-services-calculation/WCBillingSlab.json b/data/as/8148125/ws-services-calculation/WCBillingSlab.json
index f5b77dd3d8..60562c3129 100644
--- a/data/as/8148125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148125/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148137/ws-services-calculation/Penalty.json b/data/as/8148137/ws-services-calculation/Penalty.json
index 2a007c24ec..8cba4518ff 100644
--- a/data/as/8148137/ws-services-calculation/Penalty.json
+++ b/data/as/8148137/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148137/ws-services-calculation/WCBillingSlab.json b/data/as/8148137/ws-services-calculation/WCBillingSlab.json
index 3245bdc5ee..63dd3dddf0 100644
--- a/data/as/8148137/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148137/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148159/ws-services-calculation/Penalty.json b/data/as/8148159/ws-services-calculation/Penalty.json
index 04d2a2296f..52b06df551 100644
--- a/data/as/8148159/ws-services-calculation/Penalty.json
+++ b/data/as/8148159/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148159/ws-services-calculation/WCBillingSlab.json b/data/as/8148159/ws-services-calculation/WCBillingSlab.json
index 2df4e035c2..8179effb47 100644
--- a/data/as/8148159/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148159/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148173/ws-services-calculation/Penalty.json b/data/as/8148173/ws-services-calculation/Penalty.json
index 3ddab37854..7b15287bf6 100644
--- a/data/as/8148173/ws-services-calculation/Penalty.json
+++ b/data/as/8148173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148173/ws-services-calculation/WCBillingSlab.json b/data/as/8148173/ws-services-calculation/WCBillingSlab.json
index 24d40641c2..7abce006d2 100644
--- a/data/as/8148173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148181/ws-services-calculation/Penalty.json b/data/as/8148181/ws-services-calculation/Penalty.json
index a60b0d8947..efa6121ea7 100644
--- a/data/as/8148181/ws-services-calculation/Penalty.json
+++ b/data/as/8148181/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148181/ws-services-calculation/WCBillingSlab.json b/data/as/8148181/ws-services-calculation/WCBillingSlab.json
index 30fce76763..90aa6cd0f9 100644
--- a/data/as/8148181/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148181/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148193/ws-services-calculation/Penalty.json b/data/as/8148193/ws-services-calculation/Penalty.json
index 7ad6d91fa2..de87235271 100644
--- a/data/as/8148193/ws-services-calculation/Penalty.json
+++ b/data/as/8148193/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148193/ws-services-calculation/WCBillingSlab.json b/data/as/8148193/ws-services-calculation/WCBillingSlab.json
index a5a5e914fa..cd7f4995cc 100644
--- a/data/as/8148193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148193/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148198/ws-services-calculation/Penalty.json b/data/as/8148198/ws-services-calculation/Penalty.json
index a347cd8fe2..e62bdfd5f0 100644
--- a/data/as/8148198/ws-services-calculation/Penalty.json
+++ b/data/as/8148198/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148198/ws-services-calculation/WCBillingSlab.json b/data/as/8148198/ws-services-calculation/WCBillingSlab.json
index 427ccfbc62..4a0293a333 100644
--- a/data/as/8148198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148198/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8148257/ws-services-calculation/Penalty.json b/data/as/8148257/ws-services-calculation/Penalty.json
index 593366ed60..245d4e8840 100644
--- a/data/as/8148257/ws-services-calculation/Penalty.json
+++ b/data/as/8148257/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148257/ws-services-calculation/WCBillingSlab.json b/data/as/8148257/ws-services-calculation/WCBillingSlab.json
index d76798317f..287548e3c9 100644
--- a/data/as/8148257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148257/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153195/ws-services-calculation/Penalty.json b/data/as/8153195/ws-services-calculation/Penalty.json
index 70c9d47a3a..835947c209 100644
--- a/data/as/8153195/ws-services-calculation/Penalty.json
+++ b/data/as/8153195/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153195/ws-services-calculation/WCBillingSlab.json b/data/as/8153195/ws-services-calculation/WCBillingSlab.json
index b05e4a735d..815cc5ec25 100644
--- a/data/as/8153195/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153195/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153198/ws-services-calculation/Penalty.json b/data/as/8153198/ws-services-calculation/Penalty.json
index ab4b7618f8..68aed50ee9 100644
--- a/data/as/8153198/ws-services-calculation/Penalty.json
+++ b/data/as/8153198/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153198/ws-services-calculation/WCBillingSlab.json b/data/as/8153198/ws-services-calculation/WCBillingSlab.json
index d9744a38f7..00af3a71f8 100644
--- a/data/as/8153198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153198/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153201/ws-services-calculation/Penalty.json b/data/as/8153201/ws-services-calculation/Penalty.json
index 0413c72ce8..a0869b909f 100644
--- a/data/as/8153201/ws-services-calculation/Penalty.json
+++ b/data/as/8153201/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153201/ws-services-calculation/WCBillingSlab.json b/data/as/8153201/ws-services-calculation/WCBillingSlab.json
index d5e5822dd0..af3826f4d2 100644
--- a/data/as/8153201/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153201/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153205/ws-services-calculation/Penalty.json b/data/as/8153205/ws-services-calculation/Penalty.json
index 9f17c9f8a7..bc69608b1d 100644
--- a/data/as/8153205/ws-services-calculation/Penalty.json
+++ b/data/as/8153205/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153205/ws-services-calculation/WCBillingSlab.json b/data/as/8153205/ws-services-calculation/WCBillingSlab.json
index 4e21dce16c..7970caf479 100644
--- a/data/as/8153205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153205/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153209/ws-services-calculation/Penalty.json b/data/as/8153209/ws-services-calculation/Penalty.json
index 09fe5f1c70..e76d3b0f48 100644
--- a/data/as/8153209/ws-services-calculation/Penalty.json
+++ b/data/as/8153209/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153209/ws-services-calculation/WCBillingSlab.json b/data/as/8153209/ws-services-calculation/WCBillingSlab.json
index 55714de5ba..28872c844c 100644
--- a/data/as/8153209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153209/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153214/ws-services-calculation/Penalty.json b/data/as/8153214/ws-services-calculation/Penalty.json
index 1feab0f06b..2d543e2bfb 100644
--- a/data/as/8153214/ws-services-calculation/Penalty.json
+++ b/data/as/8153214/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153214/ws-services-calculation/WCBillingSlab.json b/data/as/8153214/ws-services-calculation/WCBillingSlab.json
index 0bcf6bdffe..091111df19 100644
--- a/data/as/8153214/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153214/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153219/ws-services-calculation/Penalty.json b/data/as/8153219/ws-services-calculation/Penalty.json
index 182813ad65..4d8e9e9390 100644
--- a/data/as/8153219/ws-services-calculation/Penalty.json
+++ b/data/as/8153219/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153219/ws-services-calculation/WCBillingSlab.json b/data/as/8153219/ws-services-calculation/WCBillingSlab.json
index 28aa96217a..025058a671 100644
--- a/data/as/8153219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153219/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153224/ws-services-calculation/Penalty.json b/data/as/8153224/ws-services-calculation/Penalty.json
index 374cee982f..c72987a2f3 100644
--- a/data/as/8153224/ws-services-calculation/Penalty.json
+++ b/data/as/8153224/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153224/ws-services-calculation/WCBillingSlab.json b/data/as/8153224/ws-services-calculation/WCBillingSlab.json
index c3cb0d3092..3117a9372d 100644
--- a/data/as/8153224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153224/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153228/ws-services-calculation/Penalty.json b/data/as/8153228/ws-services-calculation/Penalty.json
index 33e6951e41..82967693d6 100644
--- a/data/as/8153228/ws-services-calculation/Penalty.json
+++ b/data/as/8153228/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153228/ws-services-calculation/WCBillingSlab.json b/data/as/8153228/ws-services-calculation/WCBillingSlab.json
index e191c3954a..87c1fe55ba 100644
--- a/data/as/8153228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153228/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153230/ws-services-calculation/Penalty.json b/data/as/8153230/ws-services-calculation/Penalty.json
index 4b34c2c6ca..2cac678fbc 100644
--- a/data/as/8153230/ws-services-calculation/Penalty.json
+++ b/data/as/8153230/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153230/ws-services-calculation/WCBillingSlab.json b/data/as/8153230/ws-services-calculation/WCBillingSlab.json
index afa28d433c..6ddcdd24aa 100644
--- a/data/as/8153230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153230/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153234/ws-services-calculation/Penalty.json b/data/as/8153234/ws-services-calculation/Penalty.json
index 55f4f501b2..206a511dab 100644
--- a/data/as/8153234/ws-services-calculation/Penalty.json
+++ b/data/as/8153234/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153234/ws-services-calculation/WCBillingSlab.json b/data/as/8153234/ws-services-calculation/WCBillingSlab.json
index 8dea1d99aa..3ec10471d3 100644
--- a/data/as/8153234/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153234/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153241/ws-services-calculation/Penalty.json b/data/as/8153241/ws-services-calculation/Penalty.json
index c09d1d3687..20e5baba4a 100644
--- a/data/as/8153241/ws-services-calculation/Penalty.json
+++ b/data/as/8153241/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153241/ws-services-calculation/WCBillingSlab.json b/data/as/8153241/ws-services-calculation/WCBillingSlab.json
index 68264e7af9..2293957bdd 100644
--- a/data/as/8153241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153241/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153248/ws-services-calculation/Penalty.json b/data/as/8153248/ws-services-calculation/Penalty.json
index f841d6d44d..d46d2d9540 100644
--- a/data/as/8153248/ws-services-calculation/Penalty.json
+++ b/data/as/8153248/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153248/ws-services-calculation/WCBillingSlab.json b/data/as/8153248/ws-services-calculation/WCBillingSlab.json
index 5057c2253f..3bf3caeb8e 100644
--- a/data/as/8153248/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153248/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153287/ws-services-calculation/Penalty.json b/data/as/8153287/ws-services-calculation/Penalty.json
index a25501b07e..58be6ebe3f 100644
--- a/data/as/8153287/ws-services-calculation/Penalty.json
+++ b/data/as/8153287/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153287/ws-services-calculation/WCBillingSlab.json b/data/as/8153287/ws-services-calculation/WCBillingSlab.json
index c0ec980cc2..fbb970554d 100644
--- a/data/as/8153287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153287/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153302/ws-services-calculation/Penalty.json b/data/as/8153302/ws-services-calculation/Penalty.json
index e300d7562e..51a2716a42 100644
--- a/data/as/8153302/ws-services-calculation/Penalty.json
+++ b/data/as/8153302/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153302/ws-services-calculation/WCBillingSlab.json b/data/as/8153302/ws-services-calculation/WCBillingSlab.json
index f554931727..488bd45006 100644
--- a/data/as/8153302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153302/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153320/ws-services-calculation/Penalty.json b/data/as/8153320/ws-services-calculation/Penalty.json
index 063ca61797..2e918356be 100644
--- a/data/as/8153320/ws-services-calculation/Penalty.json
+++ b/data/as/8153320/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153320/ws-services-calculation/WCBillingSlab.json b/data/as/8153320/ws-services-calculation/WCBillingSlab.json
index f403bd28c4..3badf8d541 100644
--- a/data/as/8153320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153320/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153337/ws-services-calculation/Penalty.json b/data/as/8153337/ws-services-calculation/Penalty.json
index 9d4a523961..2ecc46d3c1 100644
--- a/data/as/8153337/ws-services-calculation/Penalty.json
+++ b/data/as/8153337/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153337/ws-services-calculation/WCBillingSlab.json b/data/as/8153337/ws-services-calculation/WCBillingSlab.json
index 7d34e48d30..ac861ce535 100644
--- a/data/as/8153337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153337/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153355/ws-services-calculation/Penalty.json b/data/as/8153355/ws-services-calculation/Penalty.json
index b02be5062a..9e59142ac0 100644
--- a/data/as/8153355/ws-services-calculation/Penalty.json
+++ b/data/as/8153355/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153355/ws-services-calculation/WCBillingSlab.json b/data/as/8153355/ws-services-calculation/WCBillingSlab.json
index 3d80618c36..8db47da082 100644
--- a/data/as/8153355/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153355/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153374/ws-services-calculation/Penalty.json b/data/as/8153374/ws-services-calculation/Penalty.json
index 747e80b749..86eabf4a8b 100644
--- a/data/as/8153374/ws-services-calculation/Penalty.json
+++ b/data/as/8153374/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153374/ws-services-calculation/WCBillingSlab.json b/data/as/8153374/ws-services-calculation/WCBillingSlab.json
index fdefcb55ee..a9bc62363b 100644
--- a/data/as/8153374/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153374/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153399/ws-services-calculation/Penalty.json b/data/as/8153399/ws-services-calculation/Penalty.json
index ee4ac2d8e4..d09877ea51 100644
--- a/data/as/8153399/ws-services-calculation/Penalty.json
+++ b/data/as/8153399/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153399/ws-services-calculation/WCBillingSlab.json b/data/as/8153399/ws-services-calculation/WCBillingSlab.json
index c0fd667374..46ca459522 100644
--- a/data/as/8153399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153399/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153482/ws-services-calculation/Penalty.json b/data/as/8153482/ws-services-calculation/Penalty.json
index a846b8b1bb..5d202554f4 100644
--- a/data/as/8153482/ws-services-calculation/Penalty.json
+++ b/data/as/8153482/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153482/ws-services-calculation/WCBillingSlab.json b/data/as/8153482/ws-services-calculation/WCBillingSlab.json
index d397642aef..65c7a81a64 100644
--- a/data/as/8153482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153482/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153639/ws-services-calculation/Penalty.json b/data/as/8153639/ws-services-calculation/Penalty.json
index 4ba2b40dc3..cb55d6d657 100644
--- a/data/as/8153639/ws-services-calculation/Penalty.json
+++ b/data/as/8153639/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153639/ws-services-calculation/WCBillingSlab.json b/data/as/8153639/ws-services-calculation/WCBillingSlab.json
index c8e5cec76d..b87ec95274 100644
--- a/data/as/8153639/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153639/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153665/ws-services-calculation/Penalty.json b/data/as/8153665/ws-services-calculation/Penalty.json
index 6805a0eaf3..b800f05533 100644
--- a/data/as/8153665/ws-services-calculation/Penalty.json
+++ b/data/as/8153665/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153665/ws-services-calculation/WCBillingSlab.json b/data/as/8153665/ws-services-calculation/WCBillingSlab.json
index 281be38515..d30643381e 100644
--- a/data/as/8153665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153665/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153690/ws-services-calculation/Penalty.json b/data/as/8153690/ws-services-calculation/Penalty.json
index b8a5e50646..c2d8ecc808 100644
--- a/data/as/8153690/ws-services-calculation/Penalty.json
+++ b/data/as/8153690/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153690/ws-services-calculation/WCBillingSlab.json b/data/as/8153690/ws-services-calculation/WCBillingSlab.json
index 4ec43d8775..76be3a2460 100644
--- a/data/as/8153690/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153690/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153703/ws-services-calculation/Penalty.json b/data/as/8153703/ws-services-calculation/Penalty.json
index 7d2bc35f5d..611aefaf5e 100644
--- a/data/as/8153703/ws-services-calculation/Penalty.json
+++ b/data/as/8153703/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153703/ws-services-calculation/WCBillingSlab.json b/data/as/8153703/ws-services-calculation/WCBillingSlab.json
index 025c39e7a7..4cf8e41f7d 100644
--- a/data/as/8153703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153703/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153723/ws-services-calculation/Penalty.json b/data/as/8153723/ws-services-calculation/Penalty.json
index 578177224b..42783cb7f2 100644
--- a/data/as/8153723/ws-services-calculation/Penalty.json
+++ b/data/as/8153723/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153723/ws-services-calculation/WCBillingSlab.json b/data/as/8153723/ws-services-calculation/WCBillingSlab.json
index 90c8a72f05..9fd2cf9d79 100644
--- a/data/as/8153723/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153723/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153746/ws-services-calculation/Penalty.json b/data/as/8153746/ws-services-calculation/Penalty.json
index 53759fdd2a..3309959ef8 100644
--- a/data/as/8153746/ws-services-calculation/Penalty.json
+++ b/data/as/8153746/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153746/ws-services-calculation/WCBillingSlab.json b/data/as/8153746/ws-services-calculation/WCBillingSlab.json
index a2d1dce81b..b4c213dfe7 100644
--- a/data/as/8153746/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153746/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153766/ws-services-calculation/Penalty.json b/data/as/8153766/ws-services-calculation/Penalty.json
index 760933e518..ad2e308e43 100644
--- a/data/as/8153766/ws-services-calculation/Penalty.json
+++ b/data/as/8153766/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153766/ws-services-calculation/WCBillingSlab.json b/data/as/8153766/ws-services-calculation/WCBillingSlab.json
index 6b5744d113..39849049b0 100644
--- a/data/as/8153766/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153766/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153777/ws-services-calculation/Penalty.json b/data/as/8153777/ws-services-calculation/Penalty.json
index c8fafd2b85..8ffdba1dc8 100644
--- a/data/as/8153777/ws-services-calculation/Penalty.json
+++ b/data/as/8153777/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153777/ws-services-calculation/WCBillingSlab.json b/data/as/8153777/ws-services-calculation/WCBillingSlab.json
index f671f0ad2b..fb9cc9ea9c 100644
--- a/data/as/8153777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153777/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153800/ws-services-calculation/Penalty.json b/data/as/8153800/ws-services-calculation/Penalty.json
index 2da2cba281..07581151ed 100644
--- a/data/as/8153800/ws-services-calculation/Penalty.json
+++ b/data/as/8153800/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153800/ws-services-calculation/WCBillingSlab.json b/data/as/8153800/ws-services-calculation/WCBillingSlab.json
index 41477dd64b..59ee60524f 100644
--- a/data/as/8153800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153800/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153823/ws-services-calculation/Penalty.json b/data/as/8153823/ws-services-calculation/Penalty.json
index f655e70fcf..986c37b270 100644
--- a/data/as/8153823/ws-services-calculation/Penalty.json
+++ b/data/as/8153823/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153823/ws-services-calculation/WCBillingSlab.json b/data/as/8153823/ws-services-calculation/WCBillingSlab.json
index 5374e67c46..30144be4df 100644
--- a/data/as/8153823/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153823/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8153844/ws-services-calculation/Penalty.json b/data/as/8153844/ws-services-calculation/Penalty.json
index db397121c6..a1e547278e 100644
--- a/data/as/8153844/ws-services-calculation/Penalty.json
+++ b/data/as/8153844/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153844/ws-services-calculation/WCBillingSlab.json b/data/as/8153844/ws-services-calculation/WCBillingSlab.json
index f1d4cdc178..0280ede8d9 100644
--- a/data/as/8153844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153844/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8154251/ws-services-calculation/Penalty.json b/data/as/8154251/ws-services-calculation/Penalty.json
index 6f6d906988..07684af15e 100644
--- a/data/as/8154251/ws-services-calculation/Penalty.json
+++ b/data/as/8154251/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8154251/ws-services-calculation/WCBillingSlab.json b/data/as/8154251/ws-services-calculation/WCBillingSlab.json
index dc79d8c483..71231058ac 100644
--- a/data/as/8154251/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8154251/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155025/ws-services-calculation/Penalty.json b/data/as/8155025/ws-services-calculation/Penalty.json
index 8dd2bc37fa..e33371b2e6 100644
--- a/data/as/8155025/ws-services-calculation/Penalty.json
+++ b/data/as/8155025/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155025/ws-services-calculation/WCBillingSlab.json b/data/as/8155025/ws-services-calculation/WCBillingSlab.json
index ec06102e8e..907c5000c8 100644
--- a/data/as/8155025/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155025/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155026/ws-services-calculation/Penalty.json b/data/as/8155026/ws-services-calculation/Penalty.json
index d071430408..959699137a 100644
--- a/data/as/8155026/ws-services-calculation/Penalty.json
+++ b/data/as/8155026/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155026/ws-services-calculation/WCBillingSlab.json b/data/as/8155026/ws-services-calculation/WCBillingSlab.json
index 2f7f50ac13..1b6875ec9d 100644
--- a/data/as/8155026/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155026/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155041/ws-services-calculation/Penalty.json b/data/as/8155041/ws-services-calculation/Penalty.json
index 548bc51bd4..75ff72cdd7 100644
--- a/data/as/8155041/ws-services-calculation/Penalty.json
+++ b/data/as/8155041/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155041/ws-services-calculation/WCBillingSlab.json b/data/as/8155041/ws-services-calculation/WCBillingSlab.json
index d1a2ceeb1d..0d2544d184 100644
--- a/data/as/8155041/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155041/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155049/ws-services-calculation/Penalty.json b/data/as/8155049/ws-services-calculation/Penalty.json
index 3a7b1c96ee..aae3e70fc8 100644
--- a/data/as/8155049/ws-services-calculation/Penalty.json
+++ b/data/as/8155049/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155049/ws-services-calculation/WCBillingSlab.json b/data/as/8155049/ws-services-calculation/WCBillingSlab.json
index 2233512e9c..e78e47b17d 100644
--- a/data/as/8155049/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155049/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155055/ws-services-calculation/Penalty.json b/data/as/8155055/ws-services-calculation/Penalty.json
index 39fe87ebd5..7087bc7374 100644
--- a/data/as/8155055/ws-services-calculation/Penalty.json
+++ b/data/as/8155055/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155055/ws-services-calculation/WCBillingSlab.json b/data/as/8155055/ws-services-calculation/WCBillingSlab.json
index bf0f933633..8171896124 100644
--- a/data/as/8155055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155055/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155070/ws-services-calculation/Penalty.json b/data/as/8155070/ws-services-calculation/Penalty.json
index fd1bda73e0..4dac12235a 100644
--- a/data/as/8155070/ws-services-calculation/Penalty.json
+++ b/data/as/8155070/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155070/ws-services-calculation/WCBillingSlab.json b/data/as/8155070/ws-services-calculation/WCBillingSlab.json
index 601ba33203..53541b26ac 100644
--- a/data/as/8155070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155070/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155090/ws-services-calculation/Penalty.json b/data/as/8155090/ws-services-calculation/Penalty.json
index 0942af9e80..5c1e6f2da4 100644
--- a/data/as/8155090/ws-services-calculation/Penalty.json
+++ b/data/as/8155090/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155090/ws-services-calculation/WCBillingSlab.json b/data/as/8155090/ws-services-calculation/WCBillingSlab.json
index d7a317aece..9cf31115e3 100644
--- a/data/as/8155090/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155090/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155168/ws-services-calculation/Penalty.json b/data/as/8155168/ws-services-calculation/Penalty.json
index 95bb27355c..1f8e55fe1c 100644
--- a/data/as/8155168/ws-services-calculation/Penalty.json
+++ b/data/as/8155168/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155168/ws-services-calculation/WCBillingSlab.json b/data/as/8155168/ws-services-calculation/WCBillingSlab.json
index 2070cf5de2..034e0e8865 100644
--- a/data/as/8155168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155168/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155206/ws-services-calculation/Penalty.json b/data/as/8155206/ws-services-calculation/Penalty.json
index 7f117b4d75..04d1cda529 100644
--- a/data/as/8155206/ws-services-calculation/Penalty.json
+++ b/data/as/8155206/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155206/ws-services-calculation/WCBillingSlab.json b/data/as/8155206/ws-services-calculation/WCBillingSlab.json
index ed581d4f7d..3ac96831ac 100644
--- a/data/as/8155206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155206/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155271/ws-services-calculation/Penalty.json b/data/as/8155271/ws-services-calculation/Penalty.json
index 42eb065b65..27c077c005 100644
--- a/data/as/8155271/ws-services-calculation/Penalty.json
+++ b/data/as/8155271/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155271/ws-services-calculation/WCBillingSlab.json b/data/as/8155271/ws-services-calculation/WCBillingSlab.json
index 7ba778409d..6b390fdd51 100644
--- a/data/as/8155271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155271/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155279/ws-services-calculation/Penalty.json b/data/as/8155279/ws-services-calculation/Penalty.json
index 9ddcd4bc87..2e1f92c317 100644
--- a/data/as/8155279/ws-services-calculation/Penalty.json
+++ b/data/as/8155279/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155279/ws-services-calculation/WCBillingSlab.json b/data/as/8155279/ws-services-calculation/WCBillingSlab.json
index b3c104d6eb..e73380692e 100644
--- a/data/as/8155279/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155279/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8155344/ws-services-calculation/Penalty.json b/data/as/8155344/ws-services-calculation/Penalty.json
index cb2ddc9929..86d13e5178 100644
--- a/data/as/8155344/ws-services-calculation/Penalty.json
+++ b/data/as/8155344/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155344/ws-services-calculation/WCBillingSlab.json b/data/as/8155344/ws-services-calculation/WCBillingSlab.json
index 50d43c1f99..b836ab1328 100644
--- a/data/as/8155344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155344/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156157/ws-services-calculation/Penalty.json b/data/as/8156157/ws-services-calculation/Penalty.json
index 5631a86902..5ef1214b67 100644
--- a/data/as/8156157/ws-services-calculation/Penalty.json
+++ b/data/as/8156157/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156157/ws-services-calculation/WCBillingSlab.json b/data/as/8156157/ws-services-calculation/WCBillingSlab.json
index 350e2b80cf..01bf5f1d8c 100644
--- a/data/as/8156157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156157/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156180/ws-services-calculation/Penalty.json b/data/as/8156180/ws-services-calculation/Penalty.json
index ffe6f99965..629aa2ed03 100644
--- a/data/as/8156180/ws-services-calculation/Penalty.json
+++ b/data/as/8156180/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156180/ws-services-calculation/WCBillingSlab.json b/data/as/8156180/ws-services-calculation/WCBillingSlab.json
index 866cdd520d..dd490de0ef 100644
--- a/data/as/8156180/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156180/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156193/ws-services-calculation/Penalty.json b/data/as/8156193/ws-services-calculation/Penalty.json
index 1a14f02e2a..555efb7b60 100644
--- a/data/as/8156193/ws-services-calculation/Penalty.json
+++ b/data/as/8156193/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156193/ws-services-calculation/WCBillingSlab.json b/data/as/8156193/ws-services-calculation/WCBillingSlab.json
index 36f491d580..d240209f03 100644
--- a/data/as/8156193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156193/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156208/ws-services-calculation/Penalty.json b/data/as/8156208/ws-services-calculation/Penalty.json
index 7736f7f307..ef6bafc705 100644
--- a/data/as/8156208/ws-services-calculation/Penalty.json
+++ b/data/as/8156208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156208/ws-services-calculation/WCBillingSlab.json b/data/as/8156208/ws-services-calculation/WCBillingSlab.json
index 7b0815e671..f7c8827a39 100644
--- a/data/as/8156208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156216/ws-services-calculation/Penalty.json b/data/as/8156216/ws-services-calculation/Penalty.json
index ca6f908562..fd8b086690 100644
--- a/data/as/8156216/ws-services-calculation/Penalty.json
+++ b/data/as/8156216/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156216/ws-services-calculation/WCBillingSlab.json b/data/as/8156216/ws-services-calculation/WCBillingSlab.json
index 7077d3c8d3..1dea6b06da 100644
--- a/data/as/8156216/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156216/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156220/ws-services-calculation/Penalty.json b/data/as/8156220/ws-services-calculation/Penalty.json
index 981face680..fa0f7e9e3a 100644
--- a/data/as/8156220/ws-services-calculation/Penalty.json
+++ b/data/as/8156220/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156220/ws-services-calculation/WCBillingSlab.json b/data/as/8156220/ws-services-calculation/WCBillingSlab.json
index 68fde8158a..9281304599 100644
--- a/data/as/8156220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156220/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156223/ws-services-calculation/Penalty.json b/data/as/8156223/ws-services-calculation/Penalty.json
index 0f3a85b501..1a5333cc56 100644
--- a/data/as/8156223/ws-services-calculation/Penalty.json
+++ b/data/as/8156223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156223/ws-services-calculation/WCBillingSlab.json b/data/as/8156223/ws-services-calculation/WCBillingSlab.json
index c9a242e0ab..6051a33762 100644
--- a/data/as/8156223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156231/ws-services-calculation/Penalty.json b/data/as/8156231/ws-services-calculation/Penalty.json
index 83c003fd1d..eee5172da9 100644
--- a/data/as/8156231/ws-services-calculation/Penalty.json
+++ b/data/as/8156231/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156231/ws-services-calculation/WCBillingSlab.json b/data/as/8156231/ws-services-calculation/WCBillingSlab.json
index 5bf65b5123..7e60044bc8 100644
--- a/data/as/8156231/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156231/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156241/ws-services-calculation/Penalty.json b/data/as/8156241/ws-services-calculation/Penalty.json
index e1363a6461..ddbefac1fe 100644
--- a/data/as/8156241/ws-services-calculation/Penalty.json
+++ b/data/as/8156241/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156241/ws-services-calculation/WCBillingSlab.json b/data/as/8156241/ws-services-calculation/WCBillingSlab.json
index a67d43c9de..a5427a17a0 100644
--- a/data/as/8156241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156241/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156244/ws-services-calculation/Penalty.json b/data/as/8156244/ws-services-calculation/Penalty.json
index f054bb0e67..1ed4f9b298 100644
--- a/data/as/8156244/ws-services-calculation/Penalty.json
+++ b/data/as/8156244/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156244/ws-services-calculation/WCBillingSlab.json b/data/as/8156244/ws-services-calculation/WCBillingSlab.json
index 96a7d191e9..5c2e8625b5 100644
--- a/data/as/8156244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156244/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156253/ws-services-calculation/Penalty.json b/data/as/8156253/ws-services-calculation/Penalty.json
index 2db03de52b..86f4453959 100644
--- a/data/as/8156253/ws-services-calculation/Penalty.json
+++ b/data/as/8156253/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156253/ws-services-calculation/WCBillingSlab.json b/data/as/8156253/ws-services-calculation/WCBillingSlab.json
index 5dcc48782b..e36af638f3 100644
--- a/data/as/8156253/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156253/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156257/ws-services-calculation/Penalty.json b/data/as/8156257/ws-services-calculation/Penalty.json
index d91096d446..721250d6a3 100644
--- a/data/as/8156257/ws-services-calculation/Penalty.json
+++ b/data/as/8156257/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156257/ws-services-calculation/WCBillingSlab.json b/data/as/8156257/ws-services-calculation/WCBillingSlab.json
index 39f82bab4f..f000dd9625 100644
--- a/data/as/8156257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156257/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156263/ws-services-calculation/Penalty.json b/data/as/8156263/ws-services-calculation/Penalty.json
index 1df928c8e2..079b4d0983 100644
--- a/data/as/8156263/ws-services-calculation/Penalty.json
+++ b/data/as/8156263/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156263/ws-services-calculation/WCBillingSlab.json b/data/as/8156263/ws-services-calculation/WCBillingSlab.json
index 1e26049271..b5fdcfd97a 100644
--- a/data/as/8156263/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156263/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156271/ws-services-calculation/Penalty.json b/data/as/8156271/ws-services-calculation/Penalty.json
index 71d172a3eb..33bfe7d004 100644
--- a/data/as/8156271/ws-services-calculation/Penalty.json
+++ b/data/as/8156271/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156271/ws-services-calculation/WCBillingSlab.json b/data/as/8156271/ws-services-calculation/WCBillingSlab.json
index a17ddb422c..8c54da8dbd 100644
--- a/data/as/8156271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156271/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156274/ws-services-calculation/Penalty.json b/data/as/8156274/ws-services-calculation/Penalty.json
index fd4aca7de9..d03219bed6 100644
--- a/data/as/8156274/ws-services-calculation/Penalty.json
+++ b/data/as/8156274/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156274/ws-services-calculation/WCBillingSlab.json b/data/as/8156274/ws-services-calculation/WCBillingSlab.json
index 12c550dc9c..fc2a59189d 100644
--- a/data/as/8156274/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156274/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156288/ws-services-calculation/Penalty.json b/data/as/8156288/ws-services-calculation/Penalty.json
index 6f6e035b51..0ce7a9dfab 100644
--- a/data/as/8156288/ws-services-calculation/Penalty.json
+++ b/data/as/8156288/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156288/ws-services-calculation/WCBillingSlab.json b/data/as/8156288/ws-services-calculation/WCBillingSlab.json
index 87557d4941..bd8d5eb846 100644
--- a/data/as/8156288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156288/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156289/ws-services-calculation/Penalty.json b/data/as/8156289/ws-services-calculation/Penalty.json
index 42a6122a28..bcdf300bfa 100644
--- a/data/as/8156289/ws-services-calculation/Penalty.json
+++ b/data/as/8156289/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156289/ws-services-calculation/WCBillingSlab.json b/data/as/8156289/ws-services-calculation/WCBillingSlab.json
index 21679ef894..86803c959d 100644
--- a/data/as/8156289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156289/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156315/ws-services-calculation/Penalty.json b/data/as/8156315/ws-services-calculation/Penalty.json
index e251ba590f..7dfc8addea 100644
--- a/data/as/8156315/ws-services-calculation/Penalty.json
+++ b/data/as/8156315/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156315/ws-services-calculation/WCBillingSlab.json b/data/as/8156315/ws-services-calculation/WCBillingSlab.json
index 90a5883fbf..a1acdfbb75 100644
--- a/data/as/8156315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156315/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156393/ws-services-calculation/Penalty.json b/data/as/8156393/ws-services-calculation/Penalty.json
index c2c4023e29..e144ad1702 100644
--- a/data/as/8156393/ws-services-calculation/Penalty.json
+++ b/data/as/8156393/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156393/ws-services-calculation/WCBillingSlab.json b/data/as/8156393/ws-services-calculation/WCBillingSlab.json
index dc92ca3184..a2024cc954 100644
--- a/data/as/8156393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156393/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156410/ws-services-calculation/Penalty.json b/data/as/8156410/ws-services-calculation/Penalty.json
index 5541344c4b..146b77c1ae 100644
--- a/data/as/8156410/ws-services-calculation/Penalty.json
+++ b/data/as/8156410/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156410/ws-services-calculation/WCBillingSlab.json b/data/as/8156410/ws-services-calculation/WCBillingSlab.json
index cc3b5e085f..7feb058c93 100644
--- a/data/as/8156410/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156410/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156419/ws-services-calculation/Penalty.json b/data/as/8156419/ws-services-calculation/Penalty.json
index cc68ab920a..0601e97dfa 100644
--- a/data/as/8156419/ws-services-calculation/Penalty.json
+++ b/data/as/8156419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156419/ws-services-calculation/WCBillingSlab.json b/data/as/8156419/ws-services-calculation/WCBillingSlab.json
index 3bdc3c4309..2ccf334a0e 100644
--- a/data/as/8156419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156424/ws-services-calculation/Penalty.json b/data/as/8156424/ws-services-calculation/Penalty.json
index e145f50ad9..3990252b15 100644
--- a/data/as/8156424/ws-services-calculation/Penalty.json
+++ b/data/as/8156424/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156424/ws-services-calculation/WCBillingSlab.json b/data/as/8156424/ws-services-calculation/WCBillingSlab.json
index ffe3db5f74..ca617e0fdf 100644
--- a/data/as/8156424/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156424/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156430/ws-services-calculation/Penalty.json b/data/as/8156430/ws-services-calculation/Penalty.json
index 4dd151f03c..2a6e277e88 100644
--- a/data/as/8156430/ws-services-calculation/Penalty.json
+++ b/data/as/8156430/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156430/ws-services-calculation/WCBillingSlab.json b/data/as/8156430/ws-services-calculation/WCBillingSlab.json
index 18f0cadf4d..10c32e972f 100644
--- a/data/as/8156430/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156430/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8156440/ws-services-calculation/Penalty.json b/data/as/8156440/ws-services-calculation/Penalty.json
index ddb4696860..0b8eef5399 100644
--- a/data/as/8156440/ws-services-calculation/Penalty.json
+++ b/data/as/8156440/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156440/ws-services-calculation/WCBillingSlab.json b/data/as/8156440/ws-services-calculation/WCBillingSlab.json
index eb1f58345c..52d425b9af 100644
--- a/data/as/8156440/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156440/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8157519/ws-services-calculation/Penalty.json b/data/as/8157519/ws-services-calculation/Penalty.json
index b0d345bcc5..0c8c3d46a6 100644
--- a/data/as/8157519/ws-services-calculation/Penalty.json
+++ b/data/as/8157519/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157519/ws-services-calculation/WCBillingSlab.json b/data/as/8157519/ws-services-calculation/WCBillingSlab.json
index c6c6e67cc1..f78bcb0762 100644
--- a/data/as/8157519/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157519/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8157593/ws-services-calculation/Penalty.json b/data/as/8157593/ws-services-calculation/Penalty.json
index f025d1bf97..ba2621a1d4 100644
--- a/data/as/8157593/ws-services-calculation/Penalty.json
+++ b/data/as/8157593/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157593/ws-services-calculation/WCBillingSlab.json b/data/as/8157593/ws-services-calculation/WCBillingSlab.json
index b62c19614e..edf1a66289 100644
--- a/data/as/8157593/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157593/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8157595/ws-services-calculation/Penalty.json b/data/as/8157595/ws-services-calculation/Penalty.json
index 617a6ff117..5ed4d2cc63 100644
--- a/data/as/8157595/ws-services-calculation/Penalty.json
+++ b/data/as/8157595/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157595/ws-services-calculation/WCBillingSlab.json b/data/as/8157595/ws-services-calculation/WCBillingSlab.json
index 0776463dd2..65c53d6338 100644
--- a/data/as/8157595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157595/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8157600/ws-services-calculation/Penalty.json b/data/as/8157600/ws-services-calculation/Penalty.json
index 1ee5e4f291..84934b4211 100644
--- a/data/as/8157600/ws-services-calculation/Penalty.json
+++ b/data/as/8157600/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157600/ws-services-calculation/WCBillingSlab.json b/data/as/8157600/ws-services-calculation/WCBillingSlab.json
index 7051380349..662aa80ccd 100644
--- a/data/as/8157600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157600/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8157602/ws-services-calculation/Penalty.json b/data/as/8157602/ws-services-calculation/Penalty.json
index 69632ae920..cef5161784 100644
--- a/data/as/8157602/ws-services-calculation/Penalty.json
+++ b/data/as/8157602/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157602/ws-services-calculation/WCBillingSlab.json b/data/as/8157602/ws-services-calculation/WCBillingSlab.json
index 6e7461e2bd..a338ad972e 100644
--- a/data/as/8157602/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157602/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8157739/ws-services-calculation/Penalty.json b/data/as/8157739/ws-services-calculation/Penalty.json
index b09a91af44..26bb885c5b 100644
--- a/data/as/8157739/ws-services-calculation/Penalty.json
+++ b/data/as/8157739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157739/ws-services-calculation/WCBillingSlab.json b/data/as/8157739/ws-services-calculation/WCBillingSlab.json
index 7241855680..3a2bfcc88e 100644
--- a/data/as/8157739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159295/ws-services-calculation/Penalty.json b/data/as/8159295/ws-services-calculation/Penalty.json
index 59d8e3ad38..ba5fc1c10a 100644
--- a/data/as/8159295/ws-services-calculation/Penalty.json
+++ b/data/as/8159295/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159295/ws-services-calculation/WCBillingSlab.json b/data/as/8159295/ws-services-calculation/WCBillingSlab.json
index 1507303986..1143d2d02e 100644
--- a/data/as/8159295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159295/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159645/ws-services-calculation/Penalty.json b/data/as/8159645/ws-services-calculation/Penalty.json
index f6a2dddbd3..a3ecf27f58 100644
--- a/data/as/8159645/ws-services-calculation/Penalty.json
+++ b/data/as/8159645/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159645/ws-services-calculation/WCBillingSlab.json b/data/as/8159645/ws-services-calculation/WCBillingSlab.json
index 4baf2552ed..1787c3968f 100644
--- a/data/as/8159645/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159645/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159671/ws-services-calculation/Penalty.json b/data/as/8159671/ws-services-calculation/Penalty.json
index 114087ba6f..a763454694 100644
--- a/data/as/8159671/ws-services-calculation/Penalty.json
+++ b/data/as/8159671/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159671/ws-services-calculation/WCBillingSlab.json b/data/as/8159671/ws-services-calculation/WCBillingSlab.json
index 2556ba30bc..12538d664a 100644
--- a/data/as/8159671/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159671/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159680/ws-services-calculation/Penalty.json b/data/as/8159680/ws-services-calculation/Penalty.json
index bb83cbbfe6..95c6428606 100644
--- a/data/as/8159680/ws-services-calculation/Penalty.json
+++ b/data/as/8159680/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159680/ws-services-calculation/WCBillingSlab.json b/data/as/8159680/ws-services-calculation/WCBillingSlab.json
index d95686ba99..a7166992a9 100644
--- a/data/as/8159680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159680/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159691/ws-services-calculation/Penalty.json b/data/as/8159691/ws-services-calculation/Penalty.json
index f4da7cd682..296c4fd738 100644
--- a/data/as/8159691/ws-services-calculation/Penalty.json
+++ b/data/as/8159691/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159691/ws-services-calculation/WCBillingSlab.json b/data/as/8159691/ws-services-calculation/WCBillingSlab.json
index 9381e1ccb3..7bd7356d33 100644
--- a/data/as/8159691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159691/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159704/ws-services-calculation/Penalty.json b/data/as/8159704/ws-services-calculation/Penalty.json
index a317d1cf4d..6ea1a55806 100644
--- a/data/as/8159704/ws-services-calculation/Penalty.json
+++ b/data/as/8159704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159704/ws-services-calculation/WCBillingSlab.json b/data/as/8159704/ws-services-calculation/WCBillingSlab.json
index dad99ec758..61b85656d2 100644
--- a/data/as/8159704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159717/ws-services-calculation/Penalty.json b/data/as/8159717/ws-services-calculation/Penalty.json
index 89d59465a1..14f8e68e40 100644
--- a/data/as/8159717/ws-services-calculation/Penalty.json
+++ b/data/as/8159717/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159717/ws-services-calculation/WCBillingSlab.json b/data/as/8159717/ws-services-calculation/WCBillingSlab.json
index c59c8c8b04..bf2c1114ae 100644
--- a/data/as/8159717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159717/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159727/ws-services-calculation/Penalty.json b/data/as/8159727/ws-services-calculation/Penalty.json
index 6a27f87df7..103efbd977 100644
--- a/data/as/8159727/ws-services-calculation/Penalty.json
+++ b/data/as/8159727/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159727/ws-services-calculation/WCBillingSlab.json b/data/as/8159727/ws-services-calculation/WCBillingSlab.json
index 2a1d806e4e..296f7f80a9 100644
--- a/data/as/8159727/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159727/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159738/ws-services-calculation/Penalty.json b/data/as/8159738/ws-services-calculation/Penalty.json
index 1815e5c62c..1f0278b281 100644
--- a/data/as/8159738/ws-services-calculation/Penalty.json
+++ b/data/as/8159738/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159738/ws-services-calculation/WCBillingSlab.json b/data/as/8159738/ws-services-calculation/WCBillingSlab.json
index cf58053f94..214bdbc0b9 100644
--- a/data/as/8159738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159738/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159747/ws-services-calculation/Penalty.json b/data/as/8159747/ws-services-calculation/Penalty.json
index e18ba10ab2..391bac907a 100644
--- a/data/as/8159747/ws-services-calculation/Penalty.json
+++ b/data/as/8159747/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159747/ws-services-calculation/WCBillingSlab.json b/data/as/8159747/ws-services-calculation/WCBillingSlab.json
index c39369d711..ffc82330e5 100644
--- a/data/as/8159747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159747/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159851/ws-services-calculation/Penalty.json b/data/as/8159851/ws-services-calculation/Penalty.json
index 9f3f0e9994..ff2e314b15 100644
--- a/data/as/8159851/ws-services-calculation/Penalty.json
+++ b/data/as/8159851/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159851/ws-services-calculation/WCBillingSlab.json b/data/as/8159851/ws-services-calculation/WCBillingSlab.json
index 1394786585..b74fb9d713 100644
--- a/data/as/8159851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159851/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159874/ws-services-calculation/Penalty.json b/data/as/8159874/ws-services-calculation/Penalty.json
index bbdf0606be..9e60a9d1f3 100644
--- a/data/as/8159874/ws-services-calculation/Penalty.json
+++ b/data/as/8159874/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159874/ws-services-calculation/WCBillingSlab.json b/data/as/8159874/ws-services-calculation/WCBillingSlab.json
index e6d9f337ff..f647ed6e3d 100644
--- a/data/as/8159874/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159874/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159939/ws-services-calculation/Penalty.json b/data/as/8159939/ws-services-calculation/Penalty.json
index 27bc53a40c..eb5bbe64ac 100644
--- a/data/as/8159939/ws-services-calculation/Penalty.json
+++ b/data/as/8159939/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159939/ws-services-calculation/WCBillingSlab.json b/data/as/8159939/ws-services-calculation/WCBillingSlab.json
index ff93cef3bb..1fb2b3fbc5 100644
--- a/data/as/8159939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159939/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159954/ws-services-calculation/Penalty.json b/data/as/8159954/ws-services-calculation/Penalty.json
index f0da6ed808..bb4464aada 100644
--- a/data/as/8159954/ws-services-calculation/Penalty.json
+++ b/data/as/8159954/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159954/ws-services-calculation/WCBillingSlab.json b/data/as/8159954/ws-services-calculation/WCBillingSlab.json
index c5e51ebe60..9fd7c8cadb 100644
--- a/data/as/8159954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159954/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8159963/ws-services-calculation/Penalty.json b/data/as/8159963/ws-services-calculation/Penalty.json
index 45c4e628f2..874a8ca614 100644
--- a/data/as/8159963/ws-services-calculation/Penalty.json
+++ b/data/as/8159963/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159963/ws-services-calculation/WCBillingSlab.json b/data/as/8159963/ws-services-calculation/WCBillingSlab.json
index ce2ee04920..d2442d59eb 100644
--- a/data/as/8159963/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159963/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160000/ws-services-calculation/Penalty.json b/data/as/8160000/ws-services-calculation/Penalty.json
index 7c259380c4..f51befd045 100644
--- a/data/as/8160000/ws-services-calculation/Penalty.json
+++ b/data/as/8160000/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160000/ws-services-calculation/WCBillingSlab.json b/data/as/8160000/ws-services-calculation/WCBillingSlab.json
index 553fd31c67..34dfe509e0 100644
--- a/data/as/8160000/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160000/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160005/ws-services-calculation/Penalty.json b/data/as/8160005/ws-services-calculation/Penalty.json
index a68855c6ea..b8ffe3c4ea 100644
--- a/data/as/8160005/ws-services-calculation/Penalty.json
+++ b/data/as/8160005/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160005/ws-services-calculation/WCBillingSlab.json b/data/as/8160005/ws-services-calculation/WCBillingSlab.json
index 41d9d5800e..67246bb48e 100644
--- a/data/as/8160005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160005/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160019/ws-services-calculation/Penalty.json b/data/as/8160019/ws-services-calculation/Penalty.json
index 64dfbaf308..7def0570a0 100644
--- a/data/as/8160019/ws-services-calculation/Penalty.json
+++ b/data/as/8160019/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160019/ws-services-calculation/WCBillingSlab.json b/data/as/8160019/ws-services-calculation/WCBillingSlab.json
index 877c33453c..f22a1f9951 100644
--- a/data/as/8160019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160019/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160027/ws-services-calculation/Penalty.json b/data/as/8160027/ws-services-calculation/Penalty.json
index 29300b87d5..6c1d8f0de4 100644
--- a/data/as/8160027/ws-services-calculation/Penalty.json
+++ b/data/as/8160027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160027/ws-services-calculation/WCBillingSlab.json b/data/as/8160027/ws-services-calculation/WCBillingSlab.json
index cbe13d1ac4..f65af03469 100644
--- a/data/as/8160027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160039/ws-services-calculation/Penalty.json b/data/as/8160039/ws-services-calculation/Penalty.json
index 99273675b8..d9897a15c6 100644
--- a/data/as/8160039/ws-services-calculation/Penalty.json
+++ b/data/as/8160039/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160039/ws-services-calculation/WCBillingSlab.json b/data/as/8160039/ws-services-calculation/WCBillingSlab.json
index a60c5230ac..abb994d659 100644
--- a/data/as/8160039/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160039/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160338/ws-services-calculation/Penalty.json b/data/as/8160338/ws-services-calculation/Penalty.json
index e027eecdfa..ec6aeb9e08 100644
--- a/data/as/8160338/ws-services-calculation/Penalty.json
+++ b/data/as/8160338/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160338/ws-services-calculation/WCBillingSlab.json b/data/as/8160338/ws-services-calculation/WCBillingSlab.json
index c33c3659d5..e8a8f1bf2b 100644
--- a/data/as/8160338/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160338/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160353/ws-services-calculation/Penalty.json b/data/as/8160353/ws-services-calculation/Penalty.json
index 007991c62c..8a7ec155dd 100644
--- a/data/as/8160353/ws-services-calculation/Penalty.json
+++ b/data/as/8160353/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160353/ws-services-calculation/WCBillingSlab.json b/data/as/8160353/ws-services-calculation/WCBillingSlab.json
index c039bb818c..dec59dc33b 100644
--- a/data/as/8160353/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160353/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160367/ws-services-calculation/Penalty.json b/data/as/8160367/ws-services-calculation/Penalty.json
index 14a9a2141a..30d1b4d308 100644
--- a/data/as/8160367/ws-services-calculation/Penalty.json
+++ b/data/as/8160367/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160367/ws-services-calculation/WCBillingSlab.json b/data/as/8160367/ws-services-calculation/WCBillingSlab.json
index 50ce3dc4f8..a4bef7d004 100644
--- a/data/as/8160367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160367/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160379/ws-services-calculation/Penalty.json b/data/as/8160379/ws-services-calculation/Penalty.json
index 272bf2d350..c5213042f5 100644
--- a/data/as/8160379/ws-services-calculation/Penalty.json
+++ b/data/as/8160379/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160379/ws-services-calculation/WCBillingSlab.json b/data/as/8160379/ws-services-calculation/WCBillingSlab.json
index f739ca9347..c4c378e0b0 100644
--- a/data/as/8160379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160379/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160387/ws-services-calculation/Penalty.json b/data/as/8160387/ws-services-calculation/Penalty.json
index 8ccb15d2e2..907da6b3fc 100644
--- a/data/as/8160387/ws-services-calculation/Penalty.json
+++ b/data/as/8160387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160387/ws-services-calculation/WCBillingSlab.json b/data/as/8160387/ws-services-calculation/WCBillingSlab.json
index c9dd9b243a..de3868ecd6 100644
--- a/data/as/8160387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160400/ws-services-calculation/Penalty.json b/data/as/8160400/ws-services-calculation/Penalty.json
index 8ae57e60ae..24f4ab3dbe 100644
--- a/data/as/8160400/ws-services-calculation/Penalty.json
+++ b/data/as/8160400/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160400/ws-services-calculation/WCBillingSlab.json b/data/as/8160400/ws-services-calculation/WCBillingSlab.json
index fd8206e458..b5e47e4929 100644
--- a/data/as/8160400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160400/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160409/ws-services-calculation/Penalty.json b/data/as/8160409/ws-services-calculation/Penalty.json
index 32492dc1c2..8851fc9058 100644
--- a/data/as/8160409/ws-services-calculation/Penalty.json
+++ b/data/as/8160409/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160409/ws-services-calculation/WCBillingSlab.json b/data/as/8160409/ws-services-calculation/WCBillingSlab.json
index 93c57e8061..81f96682fd 100644
--- a/data/as/8160409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160409/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160417/ws-services-calculation/Penalty.json b/data/as/8160417/ws-services-calculation/Penalty.json
index efff584447..8baa39c054 100644
--- a/data/as/8160417/ws-services-calculation/Penalty.json
+++ b/data/as/8160417/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160417/ws-services-calculation/WCBillingSlab.json b/data/as/8160417/ws-services-calculation/WCBillingSlab.json
index a7987f1675..e3dfcb2d5a 100644
--- a/data/as/8160417/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160417/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160423/ws-services-calculation/Penalty.json b/data/as/8160423/ws-services-calculation/Penalty.json
index 441b39e66e..96ea183c90 100644
--- a/data/as/8160423/ws-services-calculation/Penalty.json
+++ b/data/as/8160423/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160423/ws-services-calculation/WCBillingSlab.json b/data/as/8160423/ws-services-calculation/WCBillingSlab.json
index 3564f75e3a..cb51490365 100644
--- a/data/as/8160423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160423/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160451/ws-services-calculation/Penalty.json b/data/as/8160451/ws-services-calculation/Penalty.json
index 042b5473f0..0c150ff0fb 100644
--- a/data/as/8160451/ws-services-calculation/Penalty.json
+++ b/data/as/8160451/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160451/ws-services-calculation/WCBillingSlab.json b/data/as/8160451/ws-services-calculation/WCBillingSlab.json
index c04c26d777..6f336b0d4b 100644
--- a/data/as/8160451/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160451/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160455/ws-services-calculation/Penalty.json b/data/as/8160455/ws-services-calculation/Penalty.json
index 30682c2372..f63b381197 100644
--- a/data/as/8160455/ws-services-calculation/Penalty.json
+++ b/data/as/8160455/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160455/ws-services-calculation/WCBillingSlab.json b/data/as/8160455/ws-services-calculation/WCBillingSlab.json
index f5cc973861..81f8b22306 100644
--- a/data/as/8160455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160455/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160460/ws-services-calculation/Penalty.json b/data/as/8160460/ws-services-calculation/Penalty.json
index 71c2fa848f..de8cdd087a 100644
--- a/data/as/8160460/ws-services-calculation/Penalty.json
+++ b/data/as/8160460/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160460/ws-services-calculation/WCBillingSlab.json b/data/as/8160460/ws-services-calculation/WCBillingSlab.json
index c7161c291a..ef05067a3c 100644
--- a/data/as/8160460/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160460/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160467/ws-services-calculation/Penalty.json b/data/as/8160467/ws-services-calculation/Penalty.json
index 8f54cee37d..2a79eb0b79 100644
--- a/data/as/8160467/ws-services-calculation/Penalty.json
+++ b/data/as/8160467/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160467/ws-services-calculation/WCBillingSlab.json b/data/as/8160467/ws-services-calculation/WCBillingSlab.json
index a8052a8cfb..bebb6f5a13 100644
--- a/data/as/8160467/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160467/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160474/ws-services-calculation/Penalty.json b/data/as/8160474/ws-services-calculation/Penalty.json
index 6e1aeae5e4..4928fb181f 100644
--- a/data/as/8160474/ws-services-calculation/Penalty.json
+++ b/data/as/8160474/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160474/ws-services-calculation/WCBillingSlab.json b/data/as/8160474/ws-services-calculation/WCBillingSlab.json
index e49a3cd4ea..bccea8e9c7 100644
--- a/data/as/8160474/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160474/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160796/ws-services-calculation/Penalty.json b/data/as/8160796/ws-services-calculation/Penalty.json
index fbc8925532..dbbf6649ae 100644
--- a/data/as/8160796/ws-services-calculation/Penalty.json
+++ b/data/as/8160796/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160796/ws-services-calculation/WCBillingSlab.json b/data/as/8160796/ws-services-calculation/WCBillingSlab.json
index 4809ffeb0a..7eefa1a8d0 100644
--- a/data/as/8160796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160796/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160817/ws-services-calculation/Penalty.json b/data/as/8160817/ws-services-calculation/Penalty.json
index b3979e1a02..f68104ecb8 100644
--- a/data/as/8160817/ws-services-calculation/Penalty.json
+++ b/data/as/8160817/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160817/ws-services-calculation/WCBillingSlab.json b/data/as/8160817/ws-services-calculation/WCBillingSlab.json
index 4957bab71f..2798b07b55 100644
--- a/data/as/8160817/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160817/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160827/ws-services-calculation/Penalty.json b/data/as/8160827/ws-services-calculation/Penalty.json
index 28661a0a8a..c54aee55c5 100644
--- a/data/as/8160827/ws-services-calculation/Penalty.json
+++ b/data/as/8160827/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160827/ws-services-calculation/WCBillingSlab.json b/data/as/8160827/ws-services-calculation/WCBillingSlab.json
index d93e568ea6..0e13f8cc90 100644
--- a/data/as/8160827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160827/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160840/ws-services-calculation/Penalty.json b/data/as/8160840/ws-services-calculation/Penalty.json
index 0fd81ed276..d3c3cd544d 100644
--- a/data/as/8160840/ws-services-calculation/Penalty.json
+++ b/data/as/8160840/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160840/ws-services-calculation/WCBillingSlab.json b/data/as/8160840/ws-services-calculation/WCBillingSlab.json
index 978baa9614..cdac898cb1 100644
--- a/data/as/8160840/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160840/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160852/ws-services-calculation/Penalty.json b/data/as/8160852/ws-services-calculation/Penalty.json
index 41ec9e2a3d..df0066bd54 100644
--- a/data/as/8160852/ws-services-calculation/Penalty.json
+++ b/data/as/8160852/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160852/ws-services-calculation/WCBillingSlab.json b/data/as/8160852/ws-services-calculation/WCBillingSlab.json
index 569da549a0..ee4a267797 100644
--- a/data/as/8160852/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160852/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160864/ws-services-calculation/Penalty.json b/data/as/8160864/ws-services-calculation/Penalty.json
index c8cedd3e5f..12d83574e6 100644
--- a/data/as/8160864/ws-services-calculation/Penalty.json
+++ b/data/as/8160864/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160864/ws-services-calculation/WCBillingSlab.json b/data/as/8160864/ws-services-calculation/WCBillingSlab.json
index 99f31d5b16..8c6a389490 100644
--- a/data/as/8160864/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160864/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160875/ws-services-calculation/Penalty.json b/data/as/8160875/ws-services-calculation/Penalty.json
index 9d866ba88b..a91c12b22a 100644
--- a/data/as/8160875/ws-services-calculation/Penalty.json
+++ b/data/as/8160875/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160875/ws-services-calculation/WCBillingSlab.json b/data/as/8160875/ws-services-calculation/WCBillingSlab.json
index 568f11fece..6c750b602f 100644
--- a/data/as/8160875/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160875/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160897/ws-services-calculation/Penalty.json b/data/as/8160897/ws-services-calculation/Penalty.json
index 0c56b23592..a3021a6721 100644
--- a/data/as/8160897/ws-services-calculation/Penalty.json
+++ b/data/as/8160897/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160897/ws-services-calculation/WCBillingSlab.json b/data/as/8160897/ws-services-calculation/WCBillingSlab.json
index 1076154ae7..12d480edaa 100644
--- a/data/as/8160897/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160897/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8160910/ws-services-calculation/Penalty.json b/data/as/8160910/ws-services-calculation/Penalty.json
index ebdffba6e8..6ad031720f 100644
--- a/data/as/8160910/ws-services-calculation/Penalty.json
+++ b/data/as/8160910/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160910/ws-services-calculation/WCBillingSlab.json b/data/as/8160910/ws-services-calculation/WCBillingSlab.json
index 0d967ac663..684615870d 100644
--- a/data/as/8160910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160910/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161016/ws-services-calculation/Penalty.json b/data/as/8161016/ws-services-calculation/Penalty.json
index 43fb28b8af..131de143ce 100644
--- a/data/as/8161016/ws-services-calculation/Penalty.json
+++ b/data/as/8161016/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161016/ws-services-calculation/WCBillingSlab.json b/data/as/8161016/ws-services-calculation/WCBillingSlab.json
index 70fab87c21..4efbfafcaa 100644
--- a/data/as/8161016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161016/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161774/ws-services-calculation/Penalty.json b/data/as/8161774/ws-services-calculation/Penalty.json
index 7994d3741a..9ffc03b57e 100644
--- a/data/as/8161774/ws-services-calculation/Penalty.json
+++ b/data/as/8161774/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161774/ws-services-calculation/WCBillingSlab.json b/data/as/8161774/ws-services-calculation/WCBillingSlab.json
index 1fe090cfba..be592e0cd8 100644
--- a/data/as/8161774/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161774/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161776/ws-services-calculation/Penalty.json b/data/as/8161776/ws-services-calculation/Penalty.json
index 16f8450fc8..e4800b966d 100644
--- a/data/as/8161776/ws-services-calculation/Penalty.json
+++ b/data/as/8161776/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161776/ws-services-calculation/WCBillingSlab.json b/data/as/8161776/ws-services-calculation/WCBillingSlab.json
index 396619c5fe..ea38321740 100644
--- a/data/as/8161776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161776/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161778/ws-services-calculation/Penalty.json b/data/as/8161778/ws-services-calculation/Penalty.json
index 8150f05ab0..650b61c022 100644
--- a/data/as/8161778/ws-services-calculation/Penalty.json
+++ b/data/as/8161778/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161778/ws-services-calculation/WCBillingSlab.json b/data/as/8161778/ws-services-calculation/WCBillingSlab.json
index 91870afb17..7a30d5c980 100644
--- a/data/as/8161778/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161778/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161779/ws-services-calculation/Penalty.json b/data/as/8161779/ws-services-calculation/Penalty.json
index fdb7f186d9..5fd9405d1b 100644
--- a/data/as/8161779/ws-services-calculation/Penalty.json
+++ b/data/as/8161779/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161779/ws-services-calculation/WCBillingSlab.json b/data/as/8161779/ws-services-calculation/WCBillingSlab.json
index 2a9f521b78..111cb36006 100644
--- a/data/as/8161779/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161779/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161782/ws-services-calculation/Penalty.json b/data/as/8161782/ws-services-calculation/Penalty.json
index 750b30c126..40c4171dc8 100644
--- a/data/as/8161782/ws-services-calculation/Penalty.json
+++ b/data/as/8161782/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161782/ws-services-calculation/WCBillingSlab.json b/data/as/8161782/ws-services-calculation/WCBillingSlab.json
index fc1bac0570..6a12153ad6 100644
--- a/data/as/8161782/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161782/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161786/ws-services-calculation/Penalty.json b/data/as/8161786/ws-services-calculation/Penalty.json
index 07065d956b..abca5b73fe 100644
--- a/data/as/8161786/ws-services-calculation/Penalty.json
+++ b/data/as/8161786/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161786/ws-services-calculation/WCBillingSlab.json b/data/as/8161786/ws-services-calculation/WCBillingSlab.json
index 7ae80a2776..0072284282 100644
--- a/data/as/8161786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161786/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161790/ws-services-calculation/Penalty.json b/data/as/8161790/ws-services-calculation/Penalty.json
index 9b84a66ac6..9770aa35e1 100644
--- a/data/as/8161790/ws-services-calculation/Penalty.json
+++ b/data/as/8161790/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161790/ws-services-calculation/WCBillingSlab.json b/data/as/8161790/ws-services-calculation/WCBillingSlab.json
index 8a601e1a7c..55ef36d4e0 100644
--- a/data/as/8161790/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161790/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161794/ws-services-calculation/Penalty.json b/data/as/8161794/ws-services-calculation/Penalty.json
index bde894eaf2..6b1c0ee1b3 100644
--- a/data/as/8161794/ws-services-calculation/Penalty.json
+++ b/data/as/8161794/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161794/ws-services-calculation/WCBillingSlab.json b/data/as/8161794/ws-services-calculation/WCBillingSlab.json
index a590bdd5b7..9a43a76918 100644
--- a/data/as/8161794/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161794/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161801/ws-services-calculation/Penalty.json b/data/as/8161801/ws-services-calculation/Penalty.json
index 748db5c9ef..0ce86e9f47 100644
--- a/data/as/8161801/ws-services-calculation/Penalty.json
+++ b/data/as/8161801/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161801/ws-services-calculation/WCBillingSlab.json b/data/as/8161801/ws-services-calculation/WCBillingSlab.json
index 84a0f315b1..499ba8e90b 100644
--- a/data/as/8161801/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161801/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161808/ws-services-calculation/Penalty.json b/data/as/8161808/ws-services-calculation/Penalty.json
index 0ce9b1c4ee..5e0974994f 100644
--- a/data/as/8161808/ws-services-calculation/Penalty.json
+++ b/data/as/8161808/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161808/ws-services-calculation/WCBillingSlab.json b/data/as/8161808/ws-services-calculation/WCBillingSlab.json
index 2932e256cc..167aac90b5 100644
--- a/data/as/8161808/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161808/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161819/ws-services-calculation/Penalty.json b/data/as/8161819/ws-services-calculation/Penalty.json
index 425cb4ca4d..8c68f1cb4b 100644
--- a/data/as/8161819/ws-services-calculation/Penalty.json
+++ b/data/as/8161819/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161819/ws-services-calculation/WCBillingSlab.json b/data/as/8161819/ws-services-calculation/WCBillingSlab.json
index f0b7bb839d..d7f816989a 100644
--- a/data/as/8161819/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161819/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161828/ws-services-calculation/Penalty.json b/data/as/8161828/ws-services-calculation/Penalty.json
index 894c7bd5f4..e99cdac355 100644
--- a/data/as/8161828/ws-services-calculation/Penalty.json
+++ b/data/as/8161828/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161828/ws-services-calculation/WCBillingSlab.json b/data/as/8161828/ws-services-calculation/WCBillingSlab.json
index 14d69d740f..e2fc371192 100644
--- a/data/as/8161828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161828/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161841/ws-services-calculation/Penalty.json b/data/as/8161841/ws-services-calculation/Penalty.json
index 85789de1c7..628338f01e 100644
--- a/data/as/8161841/ws-services-calculation/Penalty.json
+++ b/data/as/8161841/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161841/ws-services-calculation/WCBillingSlab.json b/data/as/8161841/ws-services-calculation/WCBillingSlab.json
index 609ca07dca..27ce5edd7e 100644
--- a/data/as/8161841/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161841/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161861/ws-services-calculation/Penalty.json b/data/as/8161861/ws-services-calculation/Penalty.json
index 9a12cdaaba..32068e848c 100644
--- a/data/as/8161861/ws-services-calculation/Penalty.json
+++ b/data/as/8161861/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161861/ws-services-calculation/WCBillingSlab.json b/data/as/8161861/ws-services-calculation/WCBillingSlab.json
index ff6612b20c..1163dc21d9 100644
--- a/data/as/8161861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161861/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161882/ws-services-calculation/Penalty.json b/data/as/8161882/ws-services-calculation/Penalty.json
index 82c925e9ec..344ee09330 100644
--- a/data/as/8161882/ws-services-calculation/Penalty.json
+++ b/data/as/8161882/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161882/ws-services-calculation/WCBillingSlab.json b/data/as/8161882/ws-services-calculation/WCBillingSlab.json
index a5ad1c3847..ffa3267b3c 100644
--- a/data/as/8161882/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161882/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161897/ws-services-calculation/Penalty.json b/data/as/8161897/ws-services-calculation/Penalty.json
index a236a84d0b..633ce064fc 100644
--- a/data/as/8161897/ws-services-calculation/Penalty.json
+++ b/data/as/8161897/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161897/ws-services-calculation/WCBillingSlab.json b/data/as/8161897/ws-services-calculation/WCBillingSlab.json
index 6e4baf9b2c..35682b6527 100644
--- a/data/as/8161897/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161897/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161907/ws-services-calculation/Penalty.json b/data/as/8161907/ws-services-calculation/Penalty.json
index 39a334b566..7c301a19ac 100644
--- a/data/as/8161907/ws-services-calculation/Penalty.json
+++ b/data/as/8161907/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161907/ws-services-calculation/WCBillingSlab.json b/data/as/8161907/ws-services-calculation/WCBillingSlab.json
index c1a2f7daef..043e42c412 100644
--- a/data/as/8161907/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161907/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161918/ws-services-calculation/Penalty.json b/data/as/8161918/ws-services-calculation/Penalty.json
index de62da5aae..436bde7905 100644
--- a/data/as/8161918/ws-services-calculation/Penalty.json
+++ b/data/as/8161918/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161918/ws-services-calculation/WCBillingSlab.json b/data/as/8161918/ws-services-calculation/WCBillingSlab.json
index b7faaa2491..e2b53eea0f 100644
--- a/data/as/8161918/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161918/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161943/ws-services-calculation/Penalty.json b/data/as/8161943/ws-services-calculation/Penalty.json
index 94a1ddfaae..7d0ad7c564 100644
--- a/data/as/8161943/ws-services-calculation/Penalty.json
+++ b/data/as/8161943/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161943/ws-services-calculation/WCBillingSlab.json b/data/as/8161943/ws-services-calculation/WCBillingSlab.json
index 82f676cf82..90f17ccd0c 100644
--- a/data/as/8161943/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161943/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161960/ws-services-calculation/Penalty.json b/data/as/8161960/ws-services-calculation/Penalty.json
index ad7aaf1a63..28da544e0b 100644
--- a/data/as/8161960/ws-services-calculation/Penalty.json
+++ b/data/as/8161960/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161960/ws-services-calculation/WCBillingSlab.json b/data/as/8161960/ws-services-calculation/WCBillingSlab.json
index 601105faa6..d4c29227bb 100644
--- a/data/as/8161960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161960/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161985/ws-services-calculation/Penalty.json b/data/as/8161985/ws-services-calculation/Penalty.json
index 7ec8855585..e4bc0c4f5e 100644
--- a/data/as/8161985/ws-services-calculation/Penalty.json
+++ b/data/as/8161985/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161985/ws-services-calculation/WCBillingSlab.json b/data/as/8161985/ws-services-calculation/WCBillingSlab.json
index bda8dc3fb7..2b4b19cb61 100644
--- a/data/as/8161985/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161985/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8161998/ws-services-calculation/Penalty.json b/data/as/8161998/ws-services-calculation/Penalty.json
index 0659564f50..ff86a8c13b 100644
--- a/data/as/8161998/ws-services-calculation/Penalty.json
+++ b/data/as/8161998/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161998/ws-services-calculation/WCBillingSlab.json b/data/as/8161998/ws-services-calculation/WCBillingSlab.json
index 7d624b22f8..c8372df6ce 100644
--- a/data/as/8161998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161998/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8162013/ws-services-calculation/Penalty.json b/data/as/8162013/ws-services-calculation/Penalty.json
index 65cdccef4f..38ba7ae663 100644
--- a/data/as/8162013/ws-services-calculation/Penalty.json
+++ b/data/as/8162013/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162013/ws-services-calculation/WCBillingSlab.json b/data/as/8162013/ws-services-calculation/WCBillingSlab.json
index 10a8a9e36c..4993877600 100644
--- a/data/as/8162013/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162013/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8162057/ws-services-calculation/Penalty.json b/data/as/8162057/ws-services-calculation/Penalty.json
index 630f5b62b7..f0aeac25bd 100644
--- a/data/as/8162057/ws-services-calculation/Penalty.json
+++ b/data/as/8162057/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162057/ws-services-calculation/WCBillingSlab.json b/data/as/8162057/ws-services-calculation/WCBillingSlab.json
index cafde2c23c..a9650ffddf 100644
--- a/data/as/8162057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162057/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8162079/ws-services-calculation/Penalty.json b/data/as/8162079/ws-services-calculation/Penalty.json
index a271d7a0cd..c285565ac4 100644
--- a/data/as/8162079/ws-services-calculation/Penalty.json
+++ b/data/as/8162079/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162079/ws-services-calculation/WCBillingSlab.json b/data/as/8162079/ws-services-calculation/WCBillingSlab.json
index a82f60aff6..58ba637021 100644
--- a/data/as/8162079/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162079/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8162125/ws-services-calculation/Penalty.json b/data/as/8162125/ws-services-calculation/Penalty.json
index 57e5d70476..ad0fd296b0 100644
--- a/data/as/8162125/ws-services-calculation/Penalty.json
+++ b/data/as/8162125/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162125/ws-services-calculation/WCBillingSlab.json b/data/as/8162125/ws-services-calculation/WCBillingSlab.json
index a903201382..cb8f716888 100644
--- a/data/as/8162125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162125/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8162166/ws-services-calculation/Penalty.json b/data/as/8162166/ws-services-calculation/Penalty.json
index 5a82100c84..857a464374 100644
--- a/data/as/8162166/ws-services-calculation/Penalty.json
+++ b/data/as/8162166/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162166/ws-services-calculation/WCBillingSlab.json b/data/as/8162166/ws-services-calculation/WCBillingSlab.json
index 7c10b9b536..0769ddfce6 100644
--- a/data/as/8162166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162166/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171324/ws-services-calculation/Penalty.json b/data/as/8171324/ws-services-calculation/Penalty.json
index 323463ced0..54ac11546d 100644
--- a/data/as/8171324/ws-services-calculation/Penalty.json
+++ b/data/as/8171324/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171324/ws-services-calculation/WCBillingSlab.json b/data/as/8171324/ws-services-calculation/WCBillingSlab.json
index 8d470b22f2..38d285b76c 100644
--- a/data/as/8171324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171324/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171366/ws-services-calculation/Penalty.json b/data/as/8171366/ws-services-calculation/Penalty.json
index 86fdcb7fab..382a10510c 100644
--- a/data/as/8171366/ws-services-calculation/Penalty.json
+++ b/data/as/8171366/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171366/ws-services-calculation/WCBillingSlab.json b/data/as/8171366/ws-services-calculation/WCBillingSlab.json
index 7f84934ddc..223ff4753e 100644
--- a/data/as/8171366/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171366/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171388/ws-services-calculation/Penalty.json b/data/as/8171388/ws-services-calculation/Penalty.json
index 3e881e907e..189fb156e3 100644
--- a/data/as/8171388/ws-services-calculation/Penalty.json
+++ b/data/as/8171388/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171388/ws-services-calculation/WCBillingSlab.json b/data/as/8171388/ws-services-calculation/WCBillingSlab.json
index 066fc88182..1de46d54b2 100644
--- a/data/as/8171388/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171388/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171415/ws-services-calculation/Penalty.json b/data/as/8171415/ws-services-calculation/Penalty.json
index f779b45b87..35de6a87b4 100644
--- a/data/as/8171415/ws-services-calculation/Penalty.json
+++ b/data/as/8171415/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171415/ws-services-calculation/WCBillingSlab.json b/data/as/8171415/ws-services-calculation/WCBillingSlab.json
index 7e02df41f1..c20d0382ba 100644
--- a/data/as/8171415/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171415/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171462/ws-services-calculation/Penalty.json b/data/as/8171462/ws-services-calculation/Penalty.json
index 1e69b3fa83..30ce5bce82 100644
--- a/data/as/8171462/ws-services-calculation/Penalty.json
+++ b/data/as/8171462/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171462/ws-services-calculation/WCBillingSlab.json b/data/as/8171462/ws-services-calculation/WCBillingSlab.json
index d0d06c6b1d..cba6492de6 100644
--- a/data/as/8171462/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171462/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171475/ws-services-calculation/Penalty.json b/data/as/8171475/ws-services-calculation/Penalty.json
index 0d3637fe14..799fdde016 100644
--- a/data/as/8171475/ws-services-calculation/Penalty.json
+++ b/data/as/8171475/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171475/ws-services-calculation/WCBillingSlab.json b/data/as/8171475/ws-services-calculation/WCBillingSlab.json
index 507da75d0f..19b2ff9f38 100644
--- a/data/as/8171475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171475/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171505/ws-services-calculation/Penalty.json b/data/as/8171505/ws-services-calculation/Penalty.json
index 3c1441b3ae..d134e3780d 100644
--- a/data/as/8171505/ws-services-calculation/Penalty.json
+++ b/data/as/8171505/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171505/ws-services-calculation/WCBillingSlab.json b/data/as/8171505/ws-services-calculation/WCBillingSlab.json
index 27ef7ceecd..a8794cb9be 100644
--- a/data/as/8171505/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171505/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171518/ws-services-calculation/Penalty.json b/data/as/8171518/ws-services-calculation/Penalty.json
index 19101bbee1..b9822e1d75 100644
--- a/data/as/8171518/ws-services-calculation/Penalty.json
+++ b/data/as/8171518/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171518/ws-services-calculation/WCBillingSlab.json b/data/as/8171518/ws-services-calculation/WCBillingSlab.json
index 8b2984967b..9f2836a239 100644
--- a/data/as/8171518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171518/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171531/ws-services-calculation/Penalty.json b/data/as/8171531/ws-services-calculation/Penalty.json
index 1a89069a70..531daec9ae 100644
--- a/data/as/8171531/ws-services-calculation/Penalty.json
+++ b/data/as/8171531/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171531/ws-services-calculation/WCBillingSlab.json b/data/as/8171531/ws-services-calculation/WCBillingSlab.json
index 907849bef0..7b72104058 100644
--- a/data/as/8171531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171531/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171572/ws-services-calculation/Penalty.json b/data/as/8171572/ws-services-calculation/Penalty.json
index f6314b6e78..7bf2e2efc9 100644
--- a/data/as/8171572/ws-services-calculation/Penalty.json
+++ b/data/as/8171572/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171572/ws-services-calculation/WCBillingSlab.json b/data/as/8171572/ws-services-calculation/WCBillingSlab.json
index a9b9b0311f..91535d87fa 100644
--- a/data/as/8171572/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171572/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171735/ws-services-calculation/Penalty.json b/data/as/8171735/ws-services-calculation/Penalty.json
index a368b1171a..c19dcfe842 100644
--- a/data/as/8171735/ws-services-calculation/Penalty.json
+++ b/data/as/8171735/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171735/ws-services-calculation/WCBillingSlab.json b/data/as/8171735/ws-services-calculation/WCBillingSlab.json
index 918adacec5..8d73f78dd7 100644
--- a/data/as/8171735/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171735/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171834/ws-services-calculation/Penalty.json b/data/as/8171834/ws-services-calculation/Penalty.json
index bdc4ec6c07..c1b033339e 100644
--- a/data/as/8171834/ws-services-calculation/Penalty.json
+++ b/data/as/8171834/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171834/ws-services-calculation/WCBillingSlab.json b/data/as/8171834/ws-services-calculation/WCBillingSlab.json
index e951ea2289..be76c0ee20 100644
--- a/data/as/8171834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171834/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171872/ws-services-calculation/Penalty.json b/data/as/8171872/ws-services-calculation/Penalty.json
index cad98ac761..fba938f15b 100644
--- a/data/as/8171872/ws-services-calculation/Penalty.json
+++ b/data/as/8171872/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171872/ws-services-calculation/WCBillingSlab.json b/data/as/8171872/ws-services-calculation/WCBillingSlab.json
index 1090d18004..5eb13a24d7 100644
--- a/data/as/8171872/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171872/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171904/ws-services-calculation/Penalty.json b/data/as/8171904/ws-services-calculation/Penalty.json
index 2019eeebcd..2877646baf 100644
--- a/data/as/8171904/ws-services-calculation/Penalty.json
+++ b/data/as/8171904/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171904/ws-services-calculation/WCBillingSlab.json b/data/as/8171904/ws-services-calculation/WCBillingSlab.json
index d0d094fac4..3eb028fce8 100644
--- a/data/as/8171904/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171904/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171945/ws-services-calculation/Penalty.json b/data/as/8171945/ws-services-calculation/Penalty.json
index 063cd9ad6b..5f41a2eed3 100644
--- a/data/as/8171945/ws-services-calculation/Penalty.json
+++ b/data/as/8171945/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171945/ws-services-calculation/WCBillingSlab.json b/data/as/8171945/ws-services-calculation/WCBillingSlab.json
index 76cd66279a..dd8b75eb24 100644
--- a/data/as/8171945/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171945/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171970/ws-services-calculation/Penalty.json b/data/as/8171970/ws-services-calculation/Penalty.json
index 795a3c7e17..96440ee441 100644
--- a/data/as/8171970/ws-services-calculation/Penalty.json
+++ b/data/as/8171970/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171970/ws-services-calculation/WCBillingSlab.json b/data/as/8171970/ws-services-calculation/WCBillingSlab.json
index 6ef3d4ff9b..deeb24989e 100644
--- a/data/as/8171970/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171970/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8171989/ws-services-calculation/Penalty.json b/data/as/8171989/ws-services-calculation/Penalty.json
index 3e02080838..1529c9aa8d 100644
--- a/data/as/8171989/ws-services-calculation/Penalty.json
+++ b/data/as/8171989/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171989/ws-services-calculation/WCBillingSlab.json b/data/as/8171989/ws-services-calculation/WCBillingSlab.json
index 6881083e62..d615dde13a 100644
--- a/data/as/8171989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171989/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8172016/ws-services-calculation/Penalty.json b/data/as/8172016/ws-services-calculation/Penalty.json
index a2e99c5d41..b7329f88c6 100644
--- a/data/as/8172016/ws-services-calculation/Penalty.json
+++ b/data/as/8172016/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8172016/ws-services-calculation/WCBillingSlab.json b/data/as/8172016/ws-services-calculation/WCBillingSlab.json
index 440b09e2c9..78506ef990 100644
--- a/data/as/8172016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8172016/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8172071/ws-services-calculation/Penalty.json b/data/as/8172071/ws-services-calculation/Penalty.json
index 5d887ea8ff..aedc552158 100644
--- a/data/as/8172071/ws-services-calculation/Penalty.json
+++ b/data/as/8172071/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8172071/ws-services-calculation/WCBillingSlab.json b/data/as/8172071/ws-services-calculation/WCBillingSlab.json
index e46dba0819..b3caa9ad34 100644
--- a/data/as/8172071/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8172071/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175220/ws-services-calculation/Penalty.json b/data/as/8175220/ws-services-calculation/Penalty.json
index 315a77603d..c9c840ba37 100644
--- a/data/as/8175220/ws-services-calculation/Penalty.json
+++ b/data/as/8175220/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175220/ws-services-calculation/WCBillingSlab.json b/data/as/8175220/ws-services-calculation/WCBillingSlab.json
index 1e9374688c..65a1aded0c 100644
--- a/data/as/8175220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175220/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175227/ws-services-calculation/Penalty.json b/data/as/8175227/ws-services-calculation/Penalty.json
index c6b3cc7217..d863b25c6f 100644
--- a/data/as/8175227/ws-services-calculation/Penalty.json
+++ b/data/as/8175227/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175227/ws-services-calculation/WCBillingSlab.json b/data/as/8175227/ws-services-calculation/WCBillingSlab.json
index 9bc96c41d6..e9d0b163a9 100644
--- a/data/as/8175227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175227/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175232/ws-services-calculation/Penalty.json b/data/as/8175232/ws-services-calculation/Penalty.json
index 10867ed9ef..3605cc7490 100644
--- a/data/as/8175232/ws-services-calculation/Penalty.json
+++ b/data/as/8175232/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175232/ws-services-calculation/WCBillingSlab.json b/data/as/8175232/ws-services-calculation/WCBillingSlab.json
index 746edfc5ba..a0beb86583 100644
--- a/data/as/8175232/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175232/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175237/ws-services-calculation/Penalty.json b/data/as/8175237/ws-services-calculation/Penalty.json
index 5bd4aa0079..c85b0f13a1 100644
--- a/data/as/8175237/ws-services-calculation/Penalty.json
+++ b/data/as/8175237/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175237/ws-services-calculation/WCBillingSlab.json b/data/as/8175237/ws-services-calculation/WCBillingSlab.json
index 978c2500de..af5ab5afa6 100644
--- a/data/as/8175237/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175237/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175241/ws-services-calculation/Penalty.json b/data/as/8175241/ws-services-calculation/Penalty.json
index 79796879ca..8f4ba09fd0 100644
--- a/data/as/8175241/ws-services-calculation/Penalty.json
+++ b/data/as/8175241/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175241/ws-services-calculation/WCBillingSlab.json b/data/as/8175241/ws-services-calculation/WCBillingSlab.json
index c33849a2b5..a746704eb4 100644
--- a/data/as/8175241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175241/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175267/ws-services-calculation/Penalty.json b/data/as/8175267/ws-services-calculation/Penalty.json
index a78f3d0044..eb939730eb 100644
--- a/data/as/8175267/ws-services-calculation/Penalty.json
+++ b/data/as/8175267/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175267/ws-services-calculation/WCBillingSlab.json b/data/as/8175267/ws-services-calculation/WCBillingSlab.json
index 17a8e58675..f2ce78ba1e 100644
--- a/data/as/8175267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175267/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8175588/ws-services-calculation/Penalty.json b/data/as/8175588/ws-services-calculation/Penalty.json
index 9056d7a610..245653bde6 100644
--- a/data/as/8175588/ws-services-calculation/Penalty.json
+++ b/data/as/8175588/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175588/ws-services-calculation/WCBillingSlab.json b/data/as/8175588/ws-services-calculation/WCBillingSlab.json
index 906eadf7fd..c258cd0cb5 100644
--- a/data/as/8175588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175588/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8176558/ws-services-calculation/Penalty.json b/data/as/8176558/ws-services-calculation/Penalty.json
index 8dda090417..23daa83eb6 100644
--- a/data/as/8176558/ws-services-calculation/Penalty.json
+++ b/data/as/8176558/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176558/ws-services-calculation/WCBillingSlab.json b/data/as/8176558/ws-services-calculation/WCBillingSlab.json
index b2944b3aa8..425905ce5b 100644
--- a/data/as/8176558/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176558/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8176578/ws-services-calculation/Penalty.json b/data/as/8176578/ws-services-calculation/Penalty.json
index 3abc0e7ff2..10a2021ba6 100644
--- a/data/as/8176578/ws-services-calculation/Penalty.json
+++ b/data/as/8176578/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176578/ws-services-calculation/WCBillingSlab.json b/data/as/8176578/ws-services-calculation/WCBillingSlab.json
index ff64e44254..e2ef80bda1 100644
--- a/data/as/8176578/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176578/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8176607/ws-services-calculation/Penalty.json b/data/as/8176607/ws-services-calculation/Penalty.json
index 9c340d48e5..9490794f8a 100644
--- a/data/as/8176607/ws-services-calculation/Penalty.json
+++ b/data/as/8176607/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176607/ws-services-calculation/WCBillingSlab.json b/data/as/8176607/ws-services-calculation/WCBillingSlab.json
index 3a6892be48..f03e85b8a1 100644
--- a/data/as/8176607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176607/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8176627/ws-services-calculation/Penalty.json b/data/as/8176627/ws-services-calculation/Penalty.json
index b99e172f31..4d9d82ef5e 100644
--- a/data/as/8176627/ws-services-calculation/Penalty.json
+++ b/data/as/8176627/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176627/ws-services-calculation/WCBillingSlab.json b/data/as/8176627/ws-services-calculation/WCBillingSlab.json
index 3e70601ec6..b8a0fc1077 100644
--- a/data/as/8176627/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176627/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8177941/ws-services-calculation/Penalty.json b/data/as/8177941/ws-services-calculation/Penalty.json
index 633b9055d3..d09480c941 100644
--- a/data/as/8177941/ws-services-calculation/Penalty.json
+++ b/data/as/8177941/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8177941/ws-services-calculation/WCBillingSlab.json b/data/as/8177941/ws-services-calculation/WCBillingSlab.json
index 824931320c..bea2a5dff4 100644
--- a/data/as/8177941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8177941/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178172/ws-services-calculation/Penalty.json b/data/as/8178172/ws-services-calculation/Penalty.json
index 327275436a..f9bbafb8d1 100644
--- a/data/as/8178172/ws-services-calculation/Penalty.json
+++ b/data/as/8178172/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178172/ws-services-calculation/WCBillingSlab.json b/data/as/8178172/ws-services-calculation/WCBillingSlab.json
index 86ef3f5a3d..45729a14dd 100644
--- a/data/as/8178172/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178172/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178282/ws-services-calculation/Penalty.json b/data/as/8178282/ws-services-calculation/Penalty.json
index 92d54e3423..a1735cba53 100644
--- a/data/as/8178282/ws-services-calculation/Penalty.json
+++ b/data/as/8178282/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178282/ws-services-calculation/WCBillingSlab.json b/data/as/8178282/ws-services-calculation/WCBillingSlab.json
index 7dad4f092d..f80813f1c7 100644
--- a/data/as/8178282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178282/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178343/ws-services-calculation/Penalty.json b/data/as/8178343/ws-services-calculation/Penalty.json
index d35cffb379..17c03f9853 100644
--- a/data/as/8178343/ws-services-calculation/Penalty.json
+++ b/data/as/8178343/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178343/ws-services-calculation/WCBillingSlab.json b/data/as/8178343/ws-services-calculation/WCBillingSlab.json
index ef9cb30c4e..ce6f721424 100644
--- a/data/as/8178343/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178343/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178428/ws-services-calculation/Penalty.json b/data/as/8178428/ws-services-calculation/Penalty.json
index d917de83c7..e5e68701be 100644
--- a/data/as/8178428/ws-services-calculation/Penalty.json
+++ b/data/as/8178428/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178428/ws-services-calculation/WCBillingSlab.json b/data/as/8178428/ws-services-calculation/WCBillingSlab.json
index c92f0ad44b..a992774cc6 100644
--- a/data/as/8178428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178428/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178783/ws-services-calculation/Penalty.json b/data/as/8178783/ws-services-calculation/Penalty.json
index cebc5605f1..e7e20dccc9 100644
--- a/data/as/8178783/ws-services-calculation/Penalty.json
+++ b/data/as/8178783/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178783/ws-services-calculation/WCBillingSlab.json b/data/as/8178783/ws-services-calculation/WCBillingSlab.json
index a734bd99c7..0544abfd33 100644
--- a/data/as/8178783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178783/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178821/ws-services-calculation/Penalty.json b/data/as/8178821/ws-services-calculation/Penalty.json
index bfcd070adb..6234550373 100644
--- a/data/as/8178821/ws-services-calculation/Penalty.json
+++ b/data/as/8178821/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178821/ws-services-calculation/WCBillingSlab.json b/data/as/8178821/ws-services-calculation/WCBillingSlab.json
index 4081fe4a7a..61772d2ce7 100644
--- a/data/as/8178821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178821/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178861/ws-services-calculation/Penalty.json b/data/as/8178861/ws-services-calculation/Penalty.json
index 8d6329f42c..1055149d46 100644
--- a/data/as/8178861/ws-services-calculation/Penalty.json
+++ b/data/as/8178861/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178861/ws-services-calculation/WCBillingSlab.json b/data/as/8178861/ws-services-calculation/WCBillingSlab.json
index 3df3ccd58a..cb86ecff62 100644
--- a/data/as/8178861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178861/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178895/ws-services-calculation/Penalty.json b/data/as/8178895/ws-services-calculation/Penalty.json
index d75489fba4..89788f995d 100644
--- a/data/as/8178895/ws-services-calculation/Penalty.json
+++ b/data/as/8178895/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178895/ws-services-calculation/WCBillingSlab.json b/data/as/8178895/ws-services-calculation/WCBillingSlab.json
index add25d2418..d42e5a75a7 100644
--- a/data/as/8178895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178895/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8178929/ws-services-calculation/Penalty.json b/data/as/8178929/ws-services-calculation/Penalty.json
index 90f871dcd0..f696b0b5ed 100644
--- a/data/as/8178929/ws-services-calculation/Penalty.json
+++ b/data/as/8178929/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178929/ws-services-calculation/WCBillingSlab.json b/data/as/8178929/ws-services-calculation/WCBillingSlab.json
index 9445629412..f5881448df 100644
--- a/data/as/8178929/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178929/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8181830/ws-services-calculation/Penalty.json b/data/as/8181830/ws-services-calculation/Penalty.json
index a5f5de5bc2..6393727da9 100644
--- a/data/as/8181830/ws-services-calculation/Penalty.json
+++ b/data/as/8181830/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181830/ws-services-calculation/WCBillingSlab.json b/data/as/8181830/ws-services-calculation/WCBillingSlab.json
index a6fd8a2d1d..183b2576f2 100644
--- a/data/as/8181830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181830/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8181848/ws-services-calculation/Penalty.json b/data/as/8181848/ws-services-calculation/Penalty.json
index b33ca9e7a3..8cae1f2905 100644
--- a/data/as/8181848/ws-services-calculation/Penalty.json
+++ b/data/as/8181848/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181848/ws-services-calculation/WCBillingSlab.json b/data/as/8181848/ws-services-calculation/WCBillingSlab.json
index 077eb70e64..cdd30230ac 100644
--- a/data/as/8181848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181848/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8181875/ws-services-calculation/Penalty.json b/data/as/8181875/ws-services-calculation/Penalty.json
index 31547431b8..9110a8554f 100644
--- a/data/as/8181875/ws-services-calculation/Penalty.json
+++ b/data/as/8181875/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181875/ws-services-calculation/WCBillingSlab.json b/data/as/8181875/ws-services-calculation/WCBillingSlab.json
index 9ee24afb05..eaa5002925 100644
--- a/data/as/8181875/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181875/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8181912/ws-services-calculation/Penalty.json b/data/as/8181912/ws-services-calculation/Penalty.json
index 8735420579..9004519c95 100644
--- a/data/as/8181912/ws-services-calculation/Penalty.json
+++ b/data/as/8181912/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181912/ws-services-calculation/WCBillingSlab.json b/data/as/8181912/ws-services-calculation/WCBillingSlab.json
index f7f334fa38..33ca14b891 100644
--- a/data/as/8181912/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181912/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8183542/ws-services-calculation/Penalty.json b/data/as/8183542/ws-services-calculation/Penalty.json
index 3845901532..2de1434d9d 100644
--- a/data/as/8183542/ws-services-calculation/Penalty.json
+++ b/data/as/8183542/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8183542/ws-services-calculation/WCBillingSlab.json b/data/as/8183542/ws-services-calculation/WCBillingSlab.json
index 15527297a9..c39f2c1cd4 100644
--- a/data/as/8183542/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8183542/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8183933/ws-services-calculation/Penalty.json b/data/as/8183933/ws-services-calculation/Penalty.json
index 6ba29de267..483272410b 100644
--- a/data/as/8183933/ws-services-calculation/Penalty.json
+++ b/data/as/8183933/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8183933/ws-services-calculation/WCBillingSlab.json b/data/as/8183933/ws-services-calculation/WCBillingSlab.json
index 8c6cdd2be6..54b1309a50 100644
--- a/data/as/8183933/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8183933/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8184246/ws-services-calculation/Penalty.json b/data/as/8184246/ws-services-calculation/Penalty.json
index 6aaaec33db..09d042e708 100644
--- a/data/as/8184246/ws-services-calculation/Penalty.json
+++ b/data/as/8184246/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184246/ws-services-calculation/WCBillingSlab.json b/data/as/8184246/ws-services-calculation/WCBillingSlab.json
index 39cad5c37a..329c4334ba 100644
--- a/data/as/8184246/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184246/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8184256/ws-services-calculation/Penalty.json b/data/as/8184256/ws-services-calculation/Penalty.json
index 69bce2f66e..2fdb3d63ce 100644
--- a/data/as/8184256/ws-services-calculation/Penalty.json
+++ b/data/as/8184256/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184256/ws-services-calculation/WCBillingSlab.json b/data/as/8184256/ws-services-calculation/WCBillingSlab.json
index d2d519be8a..f86419c9e8 100644
--- a/data/as/8184256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184256/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8184281/ws-services-calculation/Penalty.json b/data/as/8184281/ws-services-calculation/Penalty.json
index 250c0903b8..35f7ba94b4 100644
--- a/data/as/8184281/ws-services-calculation/Penalty.json
+++ b/data/as/8184281/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184281/ws-services-calculation/WCBillingSlab.json b/data/as/8184281/ws-services-calculation/WCBillingSlab.json
index eeeee1a866..236766ce2f 100644
--- a/data/as/8184281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184281/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8184539/ws-services-calculation/Penalty.json b/data/as/8184539/ws-services-calculation/Penalty.json
index b298ca507c..904d2dd666 100644
--- a/data/as/8184539/ws-services-calculation/Penalty.json
+++ b/data/as/8184539/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184539/ws-services-calculation/WCBillingSlab.json b/data/as/8184539/ws-services-calculation/WCBillingSlab.json
index d3d49c9ed0..222a653df2 100644
--- a/data/as/8184539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184539/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185128/ws-services-calculation/Penalty.json b/data/as/8185128/ws-services-calculation/Penalty.json
index 5236455674..ed793d599d 100644
--- a/data/as/8185128/ws-services-calculation/Penalty.json
+++ b/data/as/8185128/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185128/ws-services-calculation/WCBillingSlab.json b/data/as/8185128/ws-services-calculation/WCBillingSlab.json
index d70e5c1f4c..f8f824de16 100644
--- a/data/as/8185128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185128/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185176/ws-services-calculation/Penalty.json b/data/as/8185176/ws-services-calculation/Penalty.json
index a71daa6a28..56784d4cb3 100644
--- a/data/as/8185176/ws-services-calculation/Penalty.json
+++ b/data/as/8185176/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185176/ws-services-calculation/WCBillingSlab.json b/data/as/8185176/ws-services-calculation/WCBillingSlab.json
index 9ae0cb29c8..b39db932f5 100644
--- a/data/as/8185176/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185176/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185212/ws-services-calculation/Penalty.json b/data/as/8185212/ws-services-calculation/Penalty.json
index bd7108d010..b0c379061c 100644
--- a/data/as/8185212/ws-services-calculation/Penalty.json
+++ b/data/as/8185212/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185212/ws-services-calculation/WCBillingSlab.json b/data/as/8185212/ws-services-calculation/WCBillingSlab.json
index a616e37b8f..40abceed4b 100644
--- a/data/as/8185212/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185212/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185242/ws-services-calculation/Penalty.json b/data/as/8185242/ws-services-calculation/Penalty.json
index 3db7d4c94d..48ee72fe00 100644
--- a/data/as/8185242/ws-services-calculation/Penalty.json
+++ b/data/as/8185242/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185242/ws-services-calculation/WCBillingSlab.json b/data/as/8185242/ws-services-calculation/WCBillingSlab.json
index 5d9bce095a..7759814b99 100644
--- a/data/as/8185242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185242/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185270/ws-services-calculation/Penalty.json b/data/as/8185270/ws-services-calculation/Penalty.json
index 2f296dd08e..9405e6dc09 100644
--- a/data/as/8185270/ws-services-calculation/Penalty.json
+++ b/data/as/8185270/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185270/ws-services-calculation/WCBillingSlab.json b/data/as/8185270/ws-services-calculation/WCBillingSlab.json
index ecd82ff8d6..30a58762b9 100644
--- a/data/as/8185270/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185270/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185286/ws-services-calculation/Penalty.json b/data/as/8185286/ws-services-calculation/Penalty.json
index 48eacd1151..c2c784ce53 100644
--- a/data/as/8185286/ws-services-calculation/Penalty.json
+++ b/data/as/8185286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185286/ws-services-calculation/WCBillingSlab.json b/data/as/8185286/ws-services-calculation/WCBillingSlab.json
index 3a7f731ac9..89c0f9b1b0 100644
--- a/data/as/8185286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185317/ws-services-calculation/Penalty.json b/data/as/8185317/ws-services-calculation/Penalty.json
index f96f05aea1..af7499bee7 100644
--- a/data/as/8185317/ws-services-calculation/Penalty.json
+++ b/data/as/8185317/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185317/ws-services-calculation/WCBillingSlab.json b/data/as/8185317/ws-services-calculation/WCBillingSlab.json
index 84a44b4d8e..d3eceba0e0 100644
--- a/data/as/8185317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185317/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185354/ws-services-calculation/Penalty.json b/data/as/8185354/ws-services-calculation/Penalty.json
index c7ff7a4050..8af7d3d920 100644
--- a/data/as/8185354/ws-services-calculation/Penalty.json
+++ b/data/as/8185354/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185354/ws-services-calculation/WCBillingSlab.json b/data/as/8185354/ws-services-calculation/WCBillingSlab.json
index 1da9fbbe2f..da367f8cff 100644
--- a/data/as/8185354/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185354/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185387/ws-services-calculation/Penalty.json b/data/as/8185387/ws-services-calculation/Penalty.json
index 9af87ebe28..8b74270e3e 100644
--- a/data/as/8185387/ws-services-calculation/Penalty.json
+++ b/data/as/8185387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185387/ws-services-calculation/WCBillingSlab.json b/data/as/8185387/ws-services-calculation/WCBillingSlab.json
index a6bddd4515..2fe5669215 100644
--- a/data/as/8185387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185418/ws-services-calculation/Penalty.json b/data/as/8185418/ws-services-calculation/Penalty.json
index fca0f656fc..d5cb009365 100644
--- a/data/as/8185418/ws-services-calculation/Penalty.json
+++ b/data/as/8185418/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185418/ws-services-calculation/WCBillingSlab.json b/data/as/8185418/ws-services-calculation/WCBillingSlab.json
index 610d810ca7..64c5fbd534 100644
--- a/data/as/8185418/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185418/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185772/ws-services-calculation/Penalty.json b/data/as/8185772/ws-services-calculation/Penalty.json
index 63982a4518..96c63396fe 100644
--- a/data/as/8185772/ws-services-calculation/Penalty.json
+++ b/data/as/8185772/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185772/ws-services-calculation/WCBillingSlab.json b/data/as/8185772/ws-services-calculation/WCBillingSlab.json
index c52d7f7d1a..0c9a3e7742 100644
--- a/data/as/8185772/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185772/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185789/ws-services-calculation/Penalty.json b/data/as/8185789/ws-services-calculation/Penalty.json
index 9bdd3fee22..ee659f5264 100644
--- a/data/as/8185789/ws-services-calculation/Penalty.json
+++ b/data/as/8185789/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185789/ws-services-calculation/WCBillingSlab.json b/data/as/8185789/ws-services-calculation/WCBillingSlab.json
index 798cd921d2..0381d42c93 100644
--- a/data/as/8185789/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185789/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185807/ws-services-calculation/Penalty.json b/data/as/8185807/ws-services-calculation/Penalty.json
index 5f63addc2f..df073cc1ce 100644
--- a/data/as/8185807/ws-services-calculation/Penalty.json
+++ b/data/as/8185807/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185807/ws-services-calculation/WCBillingSlab.json b/data/as/8185807/ws-services-calculation/WCBillingSlab.json
index d69709a2cf..ea95756acd 100644
--- a/data/as/8185807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185807/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8185824/ws-services-calculation/Penalty.json b/data/as/8185824/ws-services-calculation/Penalty.json
index 24c7e3845c..bbcdee2a01 100644
--- a/data/as/8185824/ws-services-calculation/Penalty.json
+++ b/data/as/8185824/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185824/ws-services-calculation/WCBillingSlab.json b/data/as/8185824/ws-services-calculation/WCBillingSlab.json
index c6df869292..6f8f599250 100644
--- a/data/as/8185824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185824/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8186783/ws-services-calculation/Penalty.json b/data/as/8186783/ws-services-calculation/Penalty.json
index b25e7c2a1b..ff40645c25 100644
--- a/data/as/8186783/ws-services-calculation/Penalty.json
+++ b/data/as/8186783/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8186783/ws-services-calculation/WCBillingSlab.json b/data/as/8186783/ws-services-calculation/WCBillingSlab.json
index c03c33d4b7..96b6117ab4 100644
--- a/data/as/8186783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8186783/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8186803/ws-services-calculation/Penalty.json b/data/as/8186803/ws-services-calculation/Penalty.json
index 743588c603..823975f5ec 100644
--- a/data/as/8186803/ws-services-calculation/Penalty.json
+++ b/data/as/8186803/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8186803/ws-services-calculation/WCBillingSlab.json b/data/as/8186803/ws-services-calculation/WCBillingSlab.json
index 47a82a6eb4..5b060cad8b 100644
--- a/data/as/8186803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8186803/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187077/ws-services-calculation/Penalty.json b/data/as/8187077/ws-services-calculation/Penalty.json
index bfe9b171af..26b9787a8b 100644
--- a/data/as/8187077/ws-services-calculation/Penalty.json
+++ b/data/as/8187077/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187077/ws-services-calculation/WCBillingSlab.json b/data/as/8187077/ws-services-calculation/WCBillingSlab.json
index dc9ce13032..14c00837db 100644
--- a/data/as/8187077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187077/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187084/ws-services-calculation/Penalty.json b/data/as/8187084/ws-services-calculation/Penalty.json
index 2bbb2592a0..5967332121 100644
--- a/data/as/8187084/ws-services-calculation/Penalty.json
+++ b/data/as/8187084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187084/ws-services-calculation/WCBillingSlab.json b/data/as/8187084/ws-services-calculation/WCBillingSlab.json
index 4f9113dc4f..4d6e438359 100644
--- a/data/as/8187084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187090/ws-services-calculation/Penalty.json b/data/as/8187090/ws-services-calculation/Penalty.json
index b1658c6004..87fd82b13c 100644
--- a/data/as/8187090/ws-services-calculation/Penalty.json
+++ b/data/as/8187090/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187090/ws-services-calculation/WCBillingSlab.json b/data/as/8187090/ws-services-calculation/WCBillingSlab.json
index b6d87b944b..0428c6ced5 100644
--- a/data/as/8187090/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187090/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187146/ws-services-calculation/Penalty.json b/data/as/8187146/ws-services-calculation/Penalty.json
index 6203e9b701..d88bca4fcd 100644
--- a/data/as/8187146/ws-services-calculation/Penalty.json
+++ b/data/as/8187146/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187146/ws-services-calculation/WCBillingSlab.json b/data/as/8187146/ws-services-calculation/WCBillingSlab.json
index 7591e8e9c3..8ef3033139 100644
--- a/data/as/8187146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187146/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187153/ws-services-calculation/Penalty.json b/data/as/8187153/ws-services-calculation/Penalty.json
index f0296b05a6..18ec7afe2d 100644
--- a/data/as/8187153/ws-services-calculation/Penalty.json
+++ b/data/as/8187153/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187153/ws-services-calculation/WCBillingSlab.json b/data/as/8187153/ws-services-calculation/WCBillingSlab.json
index 5175cd7a99..b73d01c9f7 100644
--- a/data/as/8187153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187153/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187157/ws-services-calculation/Penalty.json b/data/as/8187157/ws-services-calculation/Penalty.json
index 12c4e8d56d..7e33fd3af2 100644
--- a/data/as/8187157/ws-services-calculation/Penalty.json
+++ b/data/as/8187157/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187157/ws-services-calculation/WCBillingSlab.json b/data/as/8187157/ws-services-calculation/WCBillingSlab.json
index e0d719cdc4..b89302ef53 100644
--- a/data/as/8187157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187157/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187165/ws-services-calculation/Penalty.json b/data/as/8187165/ws-services-calculation/Penalty.json
index 075ff40f4a..3474c415d4 100644
--- a/data/as/8187165/ws-services-calculation/Penalty.json
+++ b/data/as/8187165/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187165/ws-services-calculation/WCBillingSlab.json b/data/as/8187165/ws-services-calculation/WCBillingSlab.json
index 2eeea4416f..85b4545d46 100644
--- a/data/as/8187165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187165/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From 5c14780bdb32bf562863e60b0acb54ccc1698210 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 15:59:15 +0530
Subject: [PATCH 12/23] Updated folder wise data from 8187171 to 30016761

---
 data/as/30001504/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30001504/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30002704/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30002704/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30002810/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30002810/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30002848/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30002848/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30002858/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30002858/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30003558/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30003558/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30003616/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30003616/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30003640/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30003640/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30003730/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30003730/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30003828/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30003828/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30003829/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30003829/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004161/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004161/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004629/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004629/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004648/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004648/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004669/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004669/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004691/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004691/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004720/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004720/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004770/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004770/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004793/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004793/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004828/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004828/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004842/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004842/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004862/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004862/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004901/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004901/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004921/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004921/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004976/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004976/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004991/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004991/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30004999/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30004999/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005115/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005115/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005154/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005154/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005283/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005283/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005412/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005412/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005420/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005420/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005441/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005441/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005445/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005445/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005446/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005446/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005536/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005536/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005781/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005781/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30005988/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30005988/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30006456/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30006456/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30006497/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30006497/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30006954/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30006954/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30007373/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30007373/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30007375/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30007375/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30009532/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30009532/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30009627/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30009627/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010046/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010046/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010156/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010156/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010193/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010193/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010291/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010291/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010494/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010494/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010625/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010625/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010634/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010634/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010783/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010783/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30010828/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30010828/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011048/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011048/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011088/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011088/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011133/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011133/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011141/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011141/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011158/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011158/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011173/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011173/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011609/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011609/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011655/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011655/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011866/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011866/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30011891/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30011891/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012177/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012177/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012178/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012178/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012221/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012221/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012439/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012439/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012517/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012517/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012531/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012531/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012538/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012538/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30012662/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30012662/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013177/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013177/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013179/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013179/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013181/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013181/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013193/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013193/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013392/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013392/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013404/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013404/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013810/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013810/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013820/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013820/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013836/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013836/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013839/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013839/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013844/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013844/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013848/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013848/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013853/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013853/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013855/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013855/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013863/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013863/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30013915/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30013915/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014184/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014184/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014239/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014239/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014264/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014264/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014427/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014427/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014441/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014441/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014445/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014445/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014448/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014448/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014450/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014450/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014452/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014452/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014454/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014454/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014658/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014658/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014663/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014663/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014666/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014666/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014668/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014668/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014669/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014669/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014670/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014670/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014671/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014671/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014698/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014698/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014701/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014701/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014915/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014915/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014971/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014971/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014990/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014990/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014991/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014991/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30014992/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30014992/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30015050/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30015050/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30015700/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30015700/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016452/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016452/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016458/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016458/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016472/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016472/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016510/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016510/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016693/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016693/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016720/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016720/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016724/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016724/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016755/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016755/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016761/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016761/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/8187171/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187171/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187175/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187175/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187179/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187179/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187185/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187185/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187193/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187193/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187270/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187270/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187278/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187278/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187290/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187290/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187298/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187298/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187307/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187307/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187315/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187315/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187323/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187323/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187332/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187332/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187337/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187337/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187344/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187344/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187350/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187350/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187548/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187548/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8187585/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8187585/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8188301/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8188301/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8188715/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8188715/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8189136/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8189136/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8189158/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8189158/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192257/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192257/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192432/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192432/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192456/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192456/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192523/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192523/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192570/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192570/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192597/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192597/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192615/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192615/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192622/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192622/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192631/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192631/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192655/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192655/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192673/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192673/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8192716/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8192716/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8195888/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8195888/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8195974/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8195974/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196020/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196020/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196023/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196023/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196027/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196027/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196029/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196029/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196038/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196038/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196756/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196756/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196774/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196774/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196779/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196779/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196786/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196786/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196792/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196792/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196816/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196816/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196837/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196837/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196871/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196871/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196879/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196879/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196894/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196894/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196903/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196903/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196910/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196910/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196914/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196914/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196954/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196954/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196972/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196972/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8196995/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8196995/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197005/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197005/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197023/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197023/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197028/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197028/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197048/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197048/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197059/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197059/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197069/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197069/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197098/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197098/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197113/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197113/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197243/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197243/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8197282/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8197282/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198168/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198168/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198173/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198173/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198179/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198179/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198205/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198205/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198213/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198213/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198223/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198223/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8198230/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8198230/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8201977/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8201977/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8201983/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8201983/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8202008/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8202008/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8202014/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8202014/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8202020/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8202020/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8202025/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8202025/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8202278/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8202278/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8202287/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8202287/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203051/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203051/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203064/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203064/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203128/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203128/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203162/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203162/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203178/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203178/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203211/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203211/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203233/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203233/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203251/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203251/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203271/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203271/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203278/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203278/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203286/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203286/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203579/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203579/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203589/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203589/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203592/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203592/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203614/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203614/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203629/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203629/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203647/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203647/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203683/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203683/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203689/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203689/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203693/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203693/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203703/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203703/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203721/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203721/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203725/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203725/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203729/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203729/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203732/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203732/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203748/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203748/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203764/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203764/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203786/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203786/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203804/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203804/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203816/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203816/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203835/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203835/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203855/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203855/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203872/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203872/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203902/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203902/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203915/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203915/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203942/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203942/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8203947/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8203947/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8204267/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8204267/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205058/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205058/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205077/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205077/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205087/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205087/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205096/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205096/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205107/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205107/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205116/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205116/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205127/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205127/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205153/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205153/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205176/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205176/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205265/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205265/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205277/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205277/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205283/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205283/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205289/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205289/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205290/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205290/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205310/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205310/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205339/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205339/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205350/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205350/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205362/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205362/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205375/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205375/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205382/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205382/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205387/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205387/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8205395/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8205395/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206044/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206044/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206058/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206058/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206068/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206068/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206074/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206074/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206091/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206091/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206111/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206111/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206116/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206116/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206170/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206170/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206177/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206177/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206194/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206194/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206219/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206219/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206280/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206280/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206284/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206284/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206297/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206297/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206302/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206302/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206316/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206316/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206425/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206425/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206436/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206436/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206445/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206445/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206457/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206457/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206469/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206469/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206477/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206477/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206486/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206486/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206496/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206496/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206510/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206510/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206524/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206524/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206535/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206535/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206542/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206542/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206547/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206547/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206554/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206554/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206558/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206558/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206789/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206789/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206800/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206800/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206811/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206811/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206824/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206824/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206834/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206834/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8206851/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8206851/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215102/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215102/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215107/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215107/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215197/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215197/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215261/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215261/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215283/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215283/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215285/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215285/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215403/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215403/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215406/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215406/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215411/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215411/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215655/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215655/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215753/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215753/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215757/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215757/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215759/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215759/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215762/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215762/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215767/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215767/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215769/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215769/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8215771/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8215771/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8218304/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8218304/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8218315/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8218315/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8218486/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8218486/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8218509/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8218509/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8218510/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8218510/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222042/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222042/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222249/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222249/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222264/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222264/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222276/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222276/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222311/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222311/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222322/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222322/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222342/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222342/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222348/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222348/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222352/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222352/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222366/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222366/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8222386/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8222386/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8227638/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8227638/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8228162/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8228162/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8228342/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8228342/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8228352/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8228352/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8228831/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8228831/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8228832/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8228832/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8230806/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8230806/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8234493/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8234493/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8234543/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8234543/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8234577/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8234577/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235302/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235302/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235314/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235314/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235328/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235328/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235338/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235338/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235347/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235347/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235358/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235358/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235371/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235371/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235387/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235387/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235394/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235394/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235405/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235405/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235411/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235411/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235421/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235421/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8235807/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8235807/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237353/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237353/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237367/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237367/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237390/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237390/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237435/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237435/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237444/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237444/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237467/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237467/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237495/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237495/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237534/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237534/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237554/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237554/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237581/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237581/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237588/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237588/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237606/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237606/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8237611/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8237611/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8239822/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8239822/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8246724/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8246724/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8250038/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8250038/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8250626/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8250626/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8252919/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8252919/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8255134/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8255134/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8257091/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8257091/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8261500/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8261500/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8261877/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8261877/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8261995/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8261995/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8264422/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8264422/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8265409/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8265409/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8266441/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8266441/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8273083/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8273083/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8279762/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8279762/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8286607/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8286607/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8298009/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8298009/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8307469/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8307469/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8310456/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8310456/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8312752/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8312752/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8320434/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8320434/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8325212/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8325212/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8326277/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8326277/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8326909/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8326909/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 data/as/8365758/ws-services-calculation/Penalty.json        | 2 +-
 data/as/8365758/ws-services-calculation/WCBillingSlab.json  | 4 ++--
 800 files changed, 1200 insertions(+), 1200 deletions(-)

diff --git a/data/as/30001504/ws-services-calculation/Penalty.json b/data/as/30001504/ws-services-calculation/Penalty.json
index acbd483959..2375f0f9d6 100644
--- a/data/as/30001504/ws-services-calculation/Penalty.json
+++ b/data/as/30001504/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30001504/ws-services-calculation/WCBillingSlab.json b/data/as/30001504/ws-services-calculation/WCBillingSlab.json
index 90b4e364e3..4d384a38a9 100644
--- a/data/as/30001504/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30001504/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30002704/ws-services-calculation/Penalty.json b/data/as/30002704/ws-services-calculation/Penalty.json
index 83b0044d4e..e7d2be19c0 100644
--- a/data/as/30002704/ws-services-calculation/Penalty.json
+++ b/data/as/30002704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002704/ws-services-calculation/WCBillingSlab.json b/data/as/30002704/ws-services-calculation/WCBillingSlab.json
index 17f4782265..0503aeacff 100644
--- a/data/as/30002704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30002810/ws-services-calculation/Penalty.json b/data/as/30002810/ws-services-calculation/Penalty.json
index 6fb1ae6721..3ec59bb6ff 100644
--- a/data/as/30002810/ws-services-calculation/Penalty.json
+++ b/data/as/30002810/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002810/ws-services-calculation/WCBillingSlab.json b/data/as/30002810/ws-services-calculation/WCBillingSlab.json
index 8edff933c4..150bedd29e 100644
--- a/data/as/30002810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002810/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30002848/ws-services-calculation/Penalty.json b/data/as/30002848/ws-services-calculation/Penalty.json
index bf3ae4f042..587c556c13 100644
--- a/data/as/30002848/ws-services-calculation/Penalty.json
+++ b/data/as/30002848/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002848/ws-services-calculation/WCBillingSlab.json b/data/as/30002848/ws-services-calculation/WCBillingSlab.json
index 53deebda91..a6b1a97900 100644
--- a/data/as/30002848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002848/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30002858/ws-services-calculation/Penalty.json b/data/as/30002858/ws-services-calculation/Penalty.json
index ff2ae575b9..14b304a4d1 100644
--- a/data/as/30002858/ws-services-calculation/Penalty.json
+++ b/data/as/30002858/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002858/ws-services-calculation/WCBillingSlab.json b/data/as/30002858/ws-services-calculation/WCBillingSlab.json
index d604bcc250..0a25a62bcf 100644
--- a/data/as/30002858/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002858/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30003558/ws-services-calculation/Penalty.json b/data/as/30003558/ws-services-calculation/Penalty.json
index 3d21b6c198..76a9c60de7 100644
--- a/data/as/30003558/ws-services-calculation/Penalty.json
+++ b/data/as/30003558/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003558/ws-services-calculation/WCBillingSlab.json b/data/as/30003558/ws-services-calculation/WCBillingSlab.json
index 9fe44c73be..26ca00bcf6 100644
--- a/data/as/30003558/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003558/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30003616/ws-services-calculation/Penalty.json b/data/as/30003616/ws-services-calculation/Penalty.json
index 925d3aada8..cec3a69382 100644
--- a/data/as/30003616/ws-services-calculation/Penalty.json
+++ b/data/as/30003616/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003616/ws-services-calculation/WCBillingSlab.json b/data/as/30003616/ws-services-calculation/WCBillingSlab.json
index 21e4f9fbf6..eb4d4a957c 100644
--- a/data/as/30003616/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003616/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30003640/ws-services-calculation/Penalty.json b/data/as/30003640/ws-services-calculation/Penalty.json
index 4c93d2df84..f819cc6012 100644
--- a/data/as/30003640/ws-services-calculation/Penalty.json
+++ b/data/as/30003640/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003640/ws-services-calculation/WCBillingSlab.json b/data/as/30003640/ws-services-calculation/WCBillingSlab.json
index 7c82e7a0b1..950db3b607 100644
--- a/data/as/30003640/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003640/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30003730/ws-services-calculation/Penalty.json b/data/as/30003730/ws-services-calculation/Penalty.json
index 5887488905..13d52ce58a 100644
--- a/data/as/30003730/ws-services-calculation/Penalty.json
+++ b/data/as/30003730/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003730/ws-services-calculation/WCBillingSlab.json b/data/as/30003730/ws-services-calculation/WCBillingSlab.json
index 182e41268d..489ccae2f0 100644
--- a/data/as/30003730/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003730/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30003828/ws-services-calculation/Penalty.json b/data/as/30003828/ws-services-calculation/Penalty.json
index b07d878983..6c01cd0eea 100644
--- a/data/as/30003828/ws-services-calculation/Penalty.json
+++ b/data/as/30003828/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003828/ws-services-calculation/WCBillingSlab.json b/data/as/30003828/ws-services-calculation/WCBillingSlab.json
index ca8568999a..ef1a443739 100644
--- a/data/as/30003828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003828/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30003829/ws-services-calculation/Penalty.json b/data/as/30003829/ws-services-calculation/Penalty.json
index 351e14e9dd..b463535a33 100644
--- a/data/as/30003829/ws-services-calculation/Penalty.json
+++ b/data/as/30003829/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003829/ws-services-calculation/WCBillingSlab.json b/data/as/30003829/ws-services-calculation/WCBillingSlab.json
index f01c13f8b4..c79b2f943f 100644
--- a/data/as/30003829/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003829/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004161/ws-services-calculation/Penalty.json b/data/as/30004161/ws-services-calculation/Penalty.json
index 3f04521088..d0660b546a 100644
--- a/data/as/30004161/ws-services-calculation/Penalty.json
+++ b/data/as/30004161/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004161/ws-services-calculation/WCBillingSlab.json b/data/as/30004161/ws-services-calculation/WCBillingSlab.json
index 226b6385b3..2fc2c53704 100644
--- a/data/as/30004161/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004161/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004629/ws-services-calculation/Penalty.json b/data/as/30004629/ws-services-calculation/Penalty.json
index 91c8de5f5a..17427d08f2 100644
--- a/data/as/30004629/ws-services-calculation/Penalty.json
+++ b/data/as/30004629/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004629/ws-services-calculation/WCBillingSlab.json b/data/as/30004629/ws-services-calculation/WCBillingSlab.json
index ac76856a97..dec4615531 100644
--- a/data/as/30004629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004629/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004648/ws-services-calculation/Penalty.json b/data/as/30004648/ws-services-calculation/Penalty.json
index cdea37ed4d..aa97bc0a9f 100644
--- a/data/as/30004648/ws-services-calculation/Penalty.json
+++ b/data/as/30004648/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004648/ws-services-calculation/WCBillingSlab.json b/data/as/30004648/ws-services-calculation/WCBillingSlab.json
index b8fec4f08c..7c816368ae 100644
--- a/data/as/30004648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004648/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004669/ws-services-calculation/Penalty.json b/data/as/30004669/ws-services-calculation/Penalty.json
index 6d289ef26e..62fba3bb19 100644
--- a/data/as/30004669/ws-services-calculation/Penalty.json
+++ b/data/as/30004669/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004669/ws-services-calculation/WCBillingSlab.json b/data/as/30004669/ws-services-calculation/WCBillingSlab.json
index 04b2707657..bf8cf2490d 100644
--- a/data/as/30004669/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004669/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004691/ws-services-calculation/Penalty.json b/data/as/30004691/ws-services-calculation/Penalty.json
index 02b82efadb..af7b87bde8 100644
--- a/data/as/30004691/ws-services-calculation/Penalty.json
+++ b/data/as/30004691/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004691/ws-services-calculation/WCBillingSlab.json b/data/as/30004691/ws-services-calculation/WCBillingSlab.json
index 266263f947..20c0b6fe6f 100644
--- a/data/as/30004691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004691/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004720/ws-services-calculation/Penalty.json b/data/as/30004720/ws-services-calculation/Penalty.json
index 64463e92bb..67fa48aed5 100644
--- a/data/as/30004720/ws-services-calculation/Penalty.json
+++ b/data/as/30004720/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004720/ws-services-calculation/WCBillingSlab.json b/data/as/30004720/ws-services-calculation/WCBillingSlab.json
index 21d3a51089..68ebd47dfd 100644
--- a/data/as/30004720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004720/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004770/ws-services-calculation/Penalty.json b/data/as/30004770/ws-services-calculation/Penalty.json
index 5795998565..cd08b0ddce 100644
--- a/data/as/30004770/ws-services-calculation/Penalty.json
+++ b/data/as/30004770/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004770/ws-services-calculation/WCBillingSlab.json b/data/as/30004770/ws-services-calculation/WCBillingSlab.json
index d5798bf755..e97d1f8e82 100644
--- a/data/as/30004770/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004770/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004793/ws-services-calculation/Penalty.json b/data/as/30004793/ws-services-calculation/Penalty.json
index 6214e3ba43..267e9480fd 100644
--- a/data/as/30004793/ws-services-calculation/Penalty.json
+++ b/data/as/30004793/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004793/ws-services-calculation/WCBillingSlab.json b/data/as/30004793/ws-services-calculation/WCBillingSlab.json
index 45487095fa..d3c8a1a042 100644
--- a/data/as/30004793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004793/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004828/ws-services-calculation/Penalty.json b/data/as/30004828/ws-services-calculation/Penalty.json
index cdc1028550..01e16d00dc 100644
--- a/data/as/30004828/ws-services-calculation/Penalty.json
+++ b/data/as/30004828/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004828/ws-services-calculation/WCBillingSlab.json b/data/as/30004828/ws-services-calculation/WCBillingSlab.json
index bee46e3ca8..672ec246ee 100644
--- a/data/as/30004828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004828/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004842/ws-services-calculation/Penalty.json b/data/as/30004842/ws-services-calculation/Penalty.json
index 6d04f3fcae..40ba5474db 100644
--- a/data/as/30004842/ws-services-calculation/Penalty.json
+++ b/data/as/30004842/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004842/ws-services-calculation/WCBillingSlab.json b/data/as/30004842/ws-services-calculation/WCBillingSlab.json
index b159b61f98..4940b52120 100644
--- a/data/as/30004842/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004842/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004862/ws-services-calculation/Penalty.json b/data/as/30004862/ws-services-calculation/Penalty.json
index 7440d9e828..208315ffca 100644
--- a/data/as/30004862/ws-services-calculation/Penalty.json
+++ b/data/as/30004862/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004862/ws-services-calculation/WCBillingSlab.json b/data/as/30004862/ws-services-calculation/WCBillingSlab.json
index 04a36634e3..38f5798a48 100644
--- a/data/as/30004862/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004862/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004901/ws-services-calculation/Penalty.json b/data/as/30004901/ws-services-calculation/Penalty.json
index e814e6a03b..6b39f79ba6 100644
--- a/data/as/30004901/ws-services-calculation/Penalty.json
+++ b/data/as/30004901/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004901/ws-services-calculation/WCBillingSlab.json b/data/as/30004901/ws-services-calculation/WCBillingSlab.json
index 0d0bcbe829..efeeca0b11 100644
--- a/data/as/30004901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004901/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004921/ws-services-calculation/Penalty.json b/data/as/30004921/ws-services-calculation/Penalty.json
index 16698a721e..ed5393453c 100644
--- a/data/as/30004921/ws-services-calculation/Penalty.json
+++ b/data/as/30004921/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004921/ws-services-calculation/WCBillingSlab.json b/data/as/30004921/ws-services-calculation/WCBillingSlab.json
index e8da3931f5..d6cec6495b 100644
--- a/data/as/30004921/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004921/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004976/ws-services-calculation/Penalty.json b/data/as/30004976/ws-services-calculation/Penalty.json
index 8029d0315f..2b27dc5f09 100644
--- a/data/as/30004976/ws-services-calculation/Penalty.json
+++ b/data/as/30004976/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004976/ws-services-calculation/WCBillingSlab.json b/data/as/30004976/ws-services-calculation/WCBillingSlab.json
index 92ca9f04e6..190777699b 100644
--- a/data/as/30004976/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004976/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004991/ws-services-calculation/Penalty.json b/data/as/30004991/ws-services-calculation/Penalty.json
index 6b877e9843..3d474ffb65 100644
--- a/data/as/30004991/ws-services-calculation/Penalty.json
+++ b/data/as/30004991/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004991/ws-services-calculation/WCBillingSlab.json b/data/as/30004991/ws-services-calculation/WCBillingSlab.json
index 023ab5de52..bd762df0c8 100644
--- a/data/as/30004991/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004991/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30004999/ws-services-calculation/Penalty.json b/data/as/30004999/ws-services-calculation/Penalty.json
index 4a7eab4ad0..5ca8eb5eab 100644
--- a/data/as/30004999/ws-services-calculation/Penalty.json
+++ b/data/as/30004999/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004999/ws-services-calculation/WCBillingSlab.json b/data/as/30004999/ws-services-calculation/WCBillingSlab.json
index 2e86242a2e..4a531d37ca 100644
--- a/data/as/30004999/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004999/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005115/ws-services-calculation/Penalty.json b/data/as/30005115/ws-services-calculation/Penalty.json
index 457d51201b..c0c43666d0 100644
--- a/data/as/30005115/ws-services-calculation/Penalty.json
+++ b/data/as/30005115/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005115/ws-services-calculation/WCBillingSlab.json b/data/as/30005115/ws-services-calculation/WCBillingSlab.json
index 7ff0bd6c5e..437192d4a4 100644
--- a/data/as/30005115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005115/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005154/ws-services-calculation/Penalty.json b/data/as/30005154/ws-services-calculation/Penalty.json
index f165288e52..52d7f43ec8 100644
--- a/data/as/30005154/ws-services-calculation/Penalty.json
+++ b/data/as/30005154/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005154/ws-services-calculation/WCBillingSlab.json b/data/as/30005154/ws-services-calculation/WCBillingSlab.json
index cab5966fda..dfddf6deb7 100644
--- a/data/as/30005154/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005154/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005283/ws-services-calculation/Penalty.json b/data/as/30005283/ws-services-calculation/Penalty.json
index 3e0bf0d34a..0e683b415f 100644
--- a/data/as/30005283/ws-services-calculation/Penalty.json
+++ b/data/as/30005283/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005283/ws-services-calculation/WCBillingSlab.json b/data/as/30005283/ws-services-calculation/WCBillingSlab.json
index fdd6418f5c..3894feb9eb 100644
--- a/data/as/30005283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005283/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005412/ws-services-calculation/Penalty.json b/data/as/30005412/ws-services-calculation/Penalty.json
index 1dd6d8eb65..f264f839fc 100644
--- a/data/as/30005412/ws-services-calculation/Penalty.json
+++ b/data/as/30005412/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005412/ws-services-calculation/WCBillingSlab.json b/data/as/30005412/ws-services-calculation/WCBillingSlab.json
index f307e013fa..2472689d33 100644
--- a/data/as/30005412/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005412/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005420/ws-services-calculation/Penalty.json b/data/as/30005420/ws-services-calculation/Penalty.json
index 627b015e5c..0863e5b2f1 100644
--- a/data/as/30005420/ws-services-calculation/Penalty.json
+++ b/data/as/30005420/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005420/ws-services-calculation/WCBillingSlab.json b/data/as/30005420/ws-services-calculation/WCBillingSlab.json
index 519e829c4c..e0fa39f8a3 100644
--- a/data/as/30005420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005420/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005441/ws-services-calculation/Penalty.json b/data/as/30005441/ws-services-calculation/Penalty.json
index 815e56aebc..30cb93d808 100644
--- a/data/as/30005441/ws-services-calculation/Penalty.json
+++ b/data/as/30005441/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005441/ws-services-calculation/WCBillingSlab.json b/data/as/30005441/ws-services-calculation/WCBillingSlab.json
index c3fc6bb3a2..513f9b3419 100644
--- a/data/as/30005441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005441/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005445/ws-services-calculation/Penalty.json b/data/as/30005445/ws-services-calculation/Penalty.json
index 0952fb9e73..1ed65e7416 100644
--- a/data/as/30005445/ws-services-calculation/Penalty.json
+++ b/data/as/30005445/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005445/ws-services-calculation/WCBillingSlab.json b/data/as/30005445/ws-services-calculation/WCBillingSlab.json
index 272c61fe60..1db02ed10b 100644
--- a/data/as/30005445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005445/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005446/ws-services-calculation/Penalty.json b/data/as/30005446/ws-services-calculation/Penalty.json
index 13b9b13d4c..3465dea843 100644
--- a/data/as/30005446/ws-services-calculation/Penalty.json
+++ b/data/as/30005446/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005446/ws-services-calculation/WCBillingSlab.json b/data/as/30005446/ws-services-calculation/WCBillingSlab.json
index aec021c389..78bff9f638 100644
--- a/data/as/30005446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005446/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005536/ws-services-calculation/Penalty.json b/data/as/30005536/ws-services-calculation/Penalty.json
index 362f8a4b64..f2cb41b031 100644
--- a/data/as/30005536/ws-services-calculation/Penalty.json
+++ b/data/as/30005536/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005536/ws-services-calculation/WCBillingSlab.json b/data/as/30005536/ws-services-calculation/WCBillingSlab.json
index 7e902c0d1e..fb88874db3 100644
--- a/data/as/30005536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005536/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005781/ws-services-calculation/Penalty.json b/data/as/30005781/ws-services-calculation/Penalty.json
index ab14c08129..f0c546a84a 100644
--- a/data/as/30005781/ws-services-calculation/Penalty.json
+++ b/data/as/30005781/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005781/ws-services-calculation/WCBillingSlab.json b/data/as/30005781/ws-services-calculation/WCBillingSlab.json
index 4b58726477..6ad4093b08 100644
--- a/data/as/30005781/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005781/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30005988/ws-services-calculation/Penalty.json b/data/as/30005988/ws-services-calculation/Penalty.json
index b93ddc0643..6e150a88d8 100644
--- a/data/as/30005988/ws-services-calculation/Penalty.json
+++ b/data/as/30005988/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005988/ws-services-calculation/WCBillingSlab.json b/data/as/30005988/ws-services-calculation/WCBillingSlab.json
index 4836ef3a4b..2b0536fce2 100644
--- a/data/as/30005988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005988/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30006456/ws-services-calculation/Penalty.json b/data/as/30006456/ws-services-calculation/Penalty.json
index d154218ea4..da2c6547ae 100644
--- a/data/as/30006456/ws-services-calculation/Penalty.json
+++ b/data/as/30006456/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30006456/ws-services-calculation/WCBillingSlab.json b/data/as/30006456/ws-services-calculation/WCBillingSlab.json
index 0f8dad10eb..885d111871 100644
--- a/data/as/30006456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30006456/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30006497/ws-services-calculation/Penalty.json b/data/as/30006497/ws-services-calculation/Penalty.json
index 7aca9f570f..89f4fab65e 100644
--- a/data/as/30006497/ws-services-calculation/Penalty.json
+++ b/data/as/30006497/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30006497/ws-services-calculation/WCBillingSlab.json b/data/as/30006497/ws-services-calculation/WCBillingSlab.json
index deeb6c3b6b..2065446855 100644
--- a/data/as/30006497/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30006497/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30006954/ws-services-calculation/Penalty.json b/data/as/30006954/ws-services-calculation/Penalty.json
index 182b9e9039..de5ab98fb2 100644
--- a/data/as/30006954/ws-services-calculation/Penalty.json
+++ b/data/as/30006954/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30006954/ws-services-calculation/WCBillingSlab.json b/data/as/30006954/ws-services-calculation/WCBillingSlab.json
index 746dff236a..d2877f217d 100644
--- a/data/as/30006954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30006954/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30007373/ws-services-calculation/Penalty.json b/data/as/30007373/ws-services-calculation/Penalty.json
index 6ba81e72cf..00fd558c38 100644
--- a/data/as/30007373/ws-services-calculation/Penalty.json
+++ b/data/as/30007373/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30007373/ws-services-calculation/WCBillingSlab.json b/data/as/30007373/ws-services-calculation/WCBillingSlab.json
index f825223341..01a855049a 100644
--- a/data/as/30007373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30007373/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30007375/ws-services-calculation/Penalty.json b/data/as/30007375/ws-services-calculation/Penalty.json
index 90c9c4c908..74c961d277 100644
--- a/data/as/30007375/ws-services-calculation/Penalty.json
+++ b/data/as/30007375/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30007375/ws-services-calculation/WCBillingSlab.json b/data/as/30007375/ws-services-calculation/WCBillingSlab.json
index 7d72d26bf2..e68a7be85f 100644
--- a/data/as/30007375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30007375/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30009532/ws-services-calculation/Penalty.json b/data/as/30009532/ws-services-calculation/Penalty.json
index 214fda69ba..f018f34ee6 100644
--- a/data/as/30009532/ws-services-calculation/Penalty.json
+++ b/data/as/30009532/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30009532/ws-services-calculation/WCBillingSlab.json b/data/as/30009532/ws-services-calculation/WCBillingSlab.json
index 6d7cf098d3..06d10cfe0e 100644
--- a/data/as/30009532/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30009532/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30009627/ws-services-calculation/Penalty.json b/data/as/30009627/ws-services-calculation/Penalty.json
index 334acc01a5..b166e64ed2 100644
--- a/data/as/30009627/ws-services-calculation/Penalty.json
+++ b/data/as/30009627/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30009627/ws-services-calculation/WCBillingSlab.json b/data/as/30009627/ws-services-calculation/WCBillingSlab.json
index a7e997b3a4..29889f8c3a 100644
--- a/data/as/30009627/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30009627/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010046/ws-services-calculation/Penalty.json b/data/as/30010046/ws-services-calculation/Penalty.json
index 66253c54cd..1197b5c052 100644
--- a/data/as/30010046/ws-services-calculation/Penalty.json
+++ b/data/as/30010046/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010046/ws-services-calculation/WCBillingSlab.json b/data/as/30010046/ws-services-calculation/WCBillingSlab.json
index 9ff199cbd1..3a17c1d890 100644
--- a/data/as/30010046/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010046/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010156/ws-services-calculation/Penalty.json b/data/as/30010156/ws-services-calculation/Penalty.json
index 2b20c95107..74257a3f0f 100644
--- a/data/as/30010156/ws-services-calculation/Penalty.json
+++ b/data/as/30010156/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010156/ws-services-calculation/WCBillingSlab.json b/data/as/30010156/ws-services-calculation/WCBillingSlab.json
index 3fdc81738f..6ca84d9ef0 100644
--- a/data/as/30010156/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010156/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010193/ws-services-calculation/Penalty.json b/data/as/30010193/ws-services-calculation/Penalty.json
index 56b9e1e907..f2ecfbd0fb 100644
--- a/data/as/30010193/ws-services-calculation/Penalty.json
+++ b/data/as/30010193/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010193/ws-services-calculation/WCBillingSlab.json b/data/as/30010193/ws-services-calculation/WCBillingSlab.json
index e598fbfcf9..bedb25de65 100644
--- a/data/as/30010193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010193/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010223/ws-services-calculation/Penalty.json b/data/as/30010223/ws-services-calculation/Penalty.json
index fed2a396e3..fcb69fbab7 100644
--- a/data/as/30010223/ws-services-calculation/Penalty.json
+++ b/data/as/30010223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010223/ws-services-calculation/WCBillingSlab.json b/data/as/30010223/ws-services-calculation/WCBillingSlab.json
index 6e8a8ea42a..768945a30d 100644
--- a/data/as/30010223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010291/ws-services-calculation/Penalty.json b/data/as/30010291/ws-services-calculation/Penalty.json
index 38567681a5..a76bff3eda 100644
--- a/data/as/30010291/ws-services-calculation/Penalty.json
+++ b/data/as/30010291/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010291/ws-services-calculation/WCBillingSlab.json b/data/as/30010291/ws-services-calculation/WCBillingSlab.json
index 7621c9d944..12752a39fc 100644
--- a/data/as/30010291/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010291/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010494/ws-services-calculation/Penalty.json b/data/as/30010494/ws-services-calculation/Penalty.json
index cfe0c55da5..445dff4bbf 100644
--- a/data/as/30010494/ws-services-calculation/Penalty.json
+++ b/data/as/30010494/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010494/ws-services-calculation/WCBillingSlab.json b/data/as/30010494/ws-services-calculation/WCBillingSlab.json
index ad115bb0ec..1a5d2f57eb 100644
--- a/data/as/30010494/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010494/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010625/ws-services-calculation/Penalty.json b/data/as/30010625/ws-services-calculation/Penalty.json
index 9522844911..ee430d4c0b 100644
--- a/data/as/30010625/ws-services-calculation/Penalty.json
+++ b/data/as/30010625/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010625/ws-services-calculation/WCBillingSlab.json b/data/as/30010625/ws-services-calculation/WCBillingSlab.json
index 879435cdad..9bda33a72b 100644
--- a/data/as/30010625/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010625/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010634/ws-services-calculation/Penalty.json b/data/as/30010634/ws-services-calculation/Penalty.json
index f283b503d4..ccad288306 100644
--- a/data/as/30010634/ws-services-calculation/Penalty.json
+++ b/data/as/30010634/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010634/ws-services-calculation/WCBillingSlab.json b/data/as/30010634/ws-services-calculation/WCBillingSlab.json
index 8860a5ae16..49e0a70cd4 100644
--- a/data/as/30010634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010634/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010783/ws-services-calculation/Penalty.json b/data/as/30010783/ws-services-calculation/Penalty.json
index e391bec12b..5f8cacc37a 100644
--- a/data/as/30010783/ws-services-calculation/Penalty.json
+++ b/data/as/30010783/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010783/ws-services-calculation/WCBillingSlab.json b/data/as/30010783/ws-services-calculation/WCBillingSlab.json
index 42d51d85dc..6921f72099 100644
--- a/data/as/30010783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010783/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30010828/ws-services-calculation/Penalty.json b/data/as/30010828/ws-services-calculation/Penalty.json
index 8bce20d304..f582d1c045 100644
--- a/data/as/30010828/ws-services-calculation/Penalty.json
+++ b/data/as/30010828/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010828/ws-services-calculation/WCBillingSlab.json b/data/as/30010828/ws-services-calculation/WCBillingSlab.json
index 533a38baa6..4e7b540462 100644
--- a/data/as/30010828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010828/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011048/ws-services-calculation/Penalty.json b/data/as/30011048/ws-services-calculation/Penalty.json
index 68e6c5065f..83e72b83ea 100644
--- a/data/as/30011048/ws-services-calculation/Penalty.json
+++ b/data/as/30011048/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011048/ws-services-calculation/WCBillingSlab.json b/data/as/30011048/ws-services-calculation/WCBillingSlab.json
index 91b1313956..9246a65703 100644
--- a/data/as/30011048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011048/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011084/ws-services-calculation/Penalty.json b/data/as/30011084/ws-services-calculation/Penalty.json
index 95247ee87b..458494c5a7 100644
--- a/data/as/30011084/ws-services-calculation/Penalty.json
+++ b/data/as/30011084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011084/ws-services-calculation/WCBillingSlab.json b/data/as/30011084/ws-services-calculation/WCBillingSlab.json
index c45ca95495..9f5b05f81c 100644
--- a/data/as/30011084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011088/ws-services-calculation/Penalty.json b/data/as/30011088/ws-services-calculation/Penalty.json
index 50df38e8e4..3d1b14a4d8 100644
--- a/data/as/30011088/ws-services-calculation/Penalty.json
+++ b/data/as/30011088/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011088/ws-services-calculation/WCBillingSlab.json b/data/as/30011088/ws-services-calculation/WCBillingSlab.json
index 0b9b3d697a..079f81d833 100644
--- a/data/as/30011088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011088/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011133/ws-services-calculation/Penalty.json b/data/as/30011133/ws-services-calculation/Penalty.json
index d97a4ced8a..9886463096 100644
--- a/data/as/30011133/ws-services-calculation/Penalty.json
+++ b/data/as/30011133/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011133/ws-services-calculation/WCBillingSlab.json b/data/as/30011133/ws-services-calculation/WCBillingSlab.json
index e28f59208b..7fdea8514f 100644
--- a/data/as/30011133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011133/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011141/ws-services-calculation/Penalty.json b/data/as/30011141/ws-services-calculation/Penalty.json
index aa8110d3dd..eb9b4a7d2e 100644
--- a/data/as/30011141/ws-services-calculation/Penalty.json
+++ b/data/as/30011141/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011141/ws-services-calculation/WCBillingSlab.json b/data/as/30011141/ws-services-calculation/WCBillingSlab.json
index 77e321ba53..74da28de22 100644
--- a/data/as/30011141/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011141/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011158/ws-services-calculation/Penalty.json b/data/as/30011158/ws-services-calculation/Penalty.json
index d560d2ceb0..3fbaaeb439 100644
--- a/data/as/30011158/ws-services-calculation/Penalty.json
+++ b/data/as/30011158/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011158/ws-services-calculation/WCBillingSlab.json b/data/as/30011158/ws-services-calculation/WCBillingSlab.json
index 2112f8b114..72f479a33e 100644
--- a/data/as/30011158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011158/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011173/ws-services-calculation/Penalty.json b/data/as/30011173/ws-services-calculation/Penalty.json
index e73dc0282f..5d7d52ea77 100644
--- a/data/as/30011173/ws-services-calculation/Penalty.json
+++ b/data/as/30011173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011173/ws-services-calculation/WCBillingSlab.json b/data/as/30011173/ws-services-calculation/WCBillingSlab.json
index 95293e3312..2e7025e035 100644
--- a/data/as/30011173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011609/ws-services-calculation/Penalty.json b/data/as/30011609/ws-services-calculation/Penalty.json
index 9fed9d4f25..0887afa20c 100644
--- a/data/as/30011609/ws-services-calculation/Penalty.json
+++ b/data/as/30011609/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011609/ws-services-calculation/WCBillingSlab.json b/data/as/30011609/ws-services-calculation/WCBillingSlab.json
index b77ff111b0..fd9e0c5b2e 100644
--- a/data/as/30011609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011609/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011655/ws-services-calculation/Penalty.json b/data/as/30011655/ws-services-calculation/Penalty.json
index 0ecf0bad6c..64f5a025e2 100644
--- a/data/as/30011655/ws-services-calculation/Penalty.json
+++ b/data/as/30011655/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011655/ws-services-calculation/WCBillingSlab.json b/data/as/30011655/ws-services-calculation/WCBillingSlab.json
index c473d9f019..936e530bf3 100644
--- a/data/as/30011655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011655/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011866/ws-services-calculation/Penalty.json b/data/as/30011866/ws-services-calculation/Penalty.json
index d3da9c8201..3b62ba6d89 100644
--- a/data/as/30011866/ws-services-calculation/Penalty.json
+++ b/data/as/30011866/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011866/ws-services-calculation/WCBillingSlab.json b/data/as/30011866/ws-services-calculation/WCBillingSlab.json
index b6863d387e..5224e11cb6 100644
--- a/data/as/30011866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011866/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30011891/ws-services-calculation/Penalty.json b/data/as/30011891/ws-services-calculation/Penalty.json
index 2633cb055f..bf60ad353b 100644
--- a/data/as/30011891/ws-services-calculation/Penalty.json
+++ b/data/as/30011891/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011891/ws-services-calculation/WCBillingSlab.json b/data/as/30011891/ws-services-calculation/WCBillingSlab.json
index a8e86fef33..beb902c873 100644
--- a/data/as/30011891/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011891/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012177/ws-services-calculation/Penalty.json b/data/as/30012177/ws-services-calculation/Penalty.json
index cacab8293e..4bcb9608a2 100644
--- a/data/as/30012177/ws-services-calculation/Penalty.json
+++ b/data/as/30012177/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012177/ws-services-calculation/WCBillingSlab.json b/data/as/30012177/ws-services-calculation/WCBillingSlab.json
index bdaf1414b5..3b8da7c5d1 100644
--- a/data/as/30012177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012177/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012178/ws-services-calculation/Penalty.json b/data/as/30012178/ws-services-calculation/Penalty.json
index d36143556a..3ed74e768f 100644
--- a/data/as/30012178/ws-services-calculation/Penalty.json
+++ b/data/as/30012178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012178/ws-services-calculation/WCBillingSlab.json b/data/as/30012178/ws-services-calculation/WCBillingSlab.json
index 5fdef9838e..6b4b541a74 100644
--- a/data/as/30012178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012221/ws-services-calculation/Penalty.json b/data/as/30012221/ws-services-calculation/Penalty.json
index 9947428806..451876e01d 100644
--- a/data/as/30012221/ws-services-calculation/Penalty.json
+++ b/data/as/30012221/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012221/ws-services-calculation/WCBillingSlab.json b/data/as/30012221/ws-services-calculation/WCBillingSlab.json
index 018dd67011..22900bd068 100644
--- a/data/as/30012221/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012221/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012439/ws-services-calculation/Penalty.json b/data/as/30012439/ws-services-calculation/Penalty.json
index b02cba307a..175e55ea6f 100644
--- a/data/as/30012439/ws-services-calculation/Penalty.json
+++ b/data/as/30012439/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012439/ws-services-calculation/WCBillingSlab.json b/data/as/30012439/ws-services-calculation/WCBillingSlab.json
index 2c22d93e56..2de5254689 100644
--- a/data/as/30012439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012439/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012517/ws-services-calculation/Penalty.json b/data/as/30012517/ws-services-calculation/Penalty.json
index 0197e520a6..7332759c98 100644
--- a/data/as/30012517/ws-services-calculation/Penalty.json
+++ b/data/as/30012517/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012517/ws-services-calculation/WCBillingSlab.json b/data/as/30012517/ws-services-calculation/WCBillingSlab.json
index 324be72f84..e8fb9b4999 100644
--- a/data/as/30012517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012517/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012531/ws-services-calculation/Penalty.json b/data/as/30012531/ws-services-calculation/Penalty.json
index 066ade3253..85cc6c53d0 100644
--- a/data/as/30012531/ws-services-calculation/Penalty.json
+++ b/data/as/30012531/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012531/ws-services-calculation/WCBillingSlab.json b/data/as/30012531/ws-services-calculation/WCBillingSlab.json
index cef906d41a..f67c765bb9 100644
--- a/data/as/30012531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012531/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012538/ws-services-calculation/Penalty.json b/data/as/30012538/ws-services-calculation/Penalty.json
index 268a94c4e0..b7ef7040d3 100644
--- a/data/as/30012538/ws-services-calculation/Penalty.json
+++ b/data/as/30012538/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012538/ws-services-calculation/WCBillingSlab.json b/data/as/30012538/ws-services-calculation/WCBillingSlab.json
index 8cc76a70ef..27192c2e76 100644
--- a/data/as/30012538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012538/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30012662/ws-services-calculation/Penalty.json b/data/as/30012662/ws-services-calculation/Penalty.json
index d4e93f31b2..580760a804 100644
--- a/data/as/30012662/ws-services-calculation/Penalty.json
+++ b/data/as/30012662/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012662/ws-services-calculation/WCBillingSlab.json b/data/as/30012662/ws-services-calculation/WCBillingSlab.json
index 4899f2e10b..f8e76f23ee 100644
--- a/data/as/30012662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012662/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013177/ws-services-calculation/Penalty.json b/data/as/30013177/ws-services-calculation/Penalty.json
index 0b643ea8c9..f5a41cea52 100644
--- a/data/as/30013177/ws-services-calculation/Penalty.json
+++ b/data/as/30013177/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013177/ws-services-calculation/WCBillingSlab.json b/data/as/30013177/ws-services-calculation/WCBillingSlab.json
index 8db031e9b7..7d3412b5c5 100644
--- a/data/as/30013177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013177/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013179/ws-services-calculation/Penalty.json b/data/as/30013179/ws-services-calculation/Penalty.json
index 4a0c5ff33f..a4449728a0 100644
--- a/data/as/30013179/ws-services-calculation/Penalty.json
+++ b/data/as/30013179/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013179/ws-services-calculation/WCBillingSlab.json b/data/as/30013179/ws-services-calculation/WCBillingSlab.json
index 0c50b2d175..086a3fd366 100644
--- a/data/as/30013179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013179/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013181/ws-services-calculation/Penalty.json b/data/as/30013181/ws-services-calculation/Penalty.json
index f2c0d55c41..0695a27481 100644
--- a/data/as/30013181/ws-services-calculation/Penalty.json
+++ b/data/as/30013181/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013181/ws-services-calculation/WCBillingSlab.json b/data/as/30013181/ws-services-calculation/WCBillingSlab.json
index c691ee0689..a1fc514a1c 100644
--- a/data/as/30013181/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013181/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013193/ws-services-calculation/Penalty.json b/data/as/30013193/ws-services-calculation/Penalty.json
index 86896d4d5b..0547af8231 100644
--- a/data/as/30013193/ws-services-calculation/Penalty.json
+++ b/data/as/30013193/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013193/ws-services-calculation/WCBillingSlab.json b/data/as/30013193/ws-services-calculation/WCBillingSlab.json
index 4958097fd4..8b04ed09f7 100644
--- a/data/as/30013193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013193/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013208/ws-services-calculation/Penalty.json b/data/as/30013208/ws-services-calculation/Penalty.json
index afe107bdfa..8969c1509f 100644
--- a/data/as/30013208/ws-services-calculation/Penalty.json
+++ b/data/as/30013208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013208/ws-services-calculation/WCBillingSlab.json b/data/as/30013208/ws-services-calculation/WCBillingSlab.json
index b668b2b8d3..04492a1be9 100644
--- a/data/as/30013208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013223/ws-services-calculation/Penalty.json b/data/as/30013223/ws-services-calculation/Penalty.json
index d3147a021f..275cd1c6e8 100644
--- a/data/as/30013223/ws-services-calculation/Penalty.json
+++ b/data/as/30013223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013223/ws-services-calculation/WCBillingSlab.json b/data/as/30013223/ws-services-calculation/WCBillingSlab.json
index f18567e646..a1fd0b513a 100644
--- a/data/as/30013223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013392/ws-services-calculation/Penalty.json b/data/as/30013392/ws-services-calculation/Penalty.json
index 25eb55a060..4f1a9fc7cc 100644
--- a/data/as/30013392/ws-services-calculation/Penalty.json
+++ b/data/as/30013392/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013392/ws-services-calculation/WCBillingSlab.json b/data/as/30013392/ws-services-calculation/WCBillingSlab.json
index 0409c913ff..607750f8bd 100644
--- a/data/as/30013392/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013392/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013404/ws-services-calculation/Penalty.json b/data/as/30013404/ws-services-calculation/Penalty.json
index 766e547e9d..5575a2ba4b 100644
--- a/data/as/30013404/ws-services-calculation/Penalty.json
+++ b/data/as/30013404/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013404/ws-services-calculation/WCBillingSlab.json b/data/as/30013404/ws-services-calculation/WCBillingSlab.json
index 2e00a91f2c..c417e71292 100644
--- a/data/as/30013404/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013404/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013810/ws-services-calculation/Penalty.json b/data/as/30013810/ws-services-calculation/Penalty.json
index 71f456b79a..3ea96d13bd 100644
--- a/data/as/30013810/ws-services-calculation/Penalty.json
+++ b/data/as/30013810/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013810/ws-services-calculation/WCBillingSlab.json b/data/as/30013810/ws-services-calculation/WCBillingSlab.json
index 7fcf390f7a..d364f9f245 100644
--- a/data/as/30013810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013810/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013820/ws-services-calculation/Penalty.json b/data/as/30013820/ws-services-calculation/Penalty.json
index 7591762f62..d2793a4bde 100644
--- a/data/as/30013820/ws-services-calculation/Penalty.json
+++ b/data/as/30013820/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013820/ws-services-calculation/WCBillingSlab.json b/data/as/30013820/ws-services-calculation/WCBillingSlab.json
index 985fcbd863..40c90356fd 100644
--- a/data/as/30013820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013820/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013836/ws-services-calculation/Penalty.json b/data/as/30013836/ws-services-calculation/Penalty.json
index 6fae91c391..5ced0f9201 100644
--- a/data/as/30013836/ws-services-calculation/Penalty.json
+++ b/data/as/30013836/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013836/ws-services-calculation/WCBillingSlab.json b/data/as/30013836/ws-services-calculation/WCBillingSlab.json
index 7657110033..c327dd55a8 100644
--- a/data/as/30013836/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013836/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013839/ws-services-calculation/Penalty.json b/data/as/30013839/ws-services-calculation/Penalty.json
index bedd9fcb0d..5bfa47833c 100644
--- a/data/as/30013839/ws-services-calculation/Penalty.json
+++ b/data/as/30013839/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013839/ws-services-calculation/WCBillingSlab.json b/data/as/30013839/ws-services-calculation/WCBillingSlab.json
index e82f5c5fd0..ff780e5cdf 100644
--- a/data/as/30013839/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013839/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013844/ws-services-calculation/Penalty.json b/data/as/30013844/ws-services-calculation/Penalty.json
index f4d99eeef9..be82ab565a 100644
--- a/data/as/30013844/ws-services-calculation/Penalty.json
+++ b/data/as/30013844/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013844/ws-services-calculation/WCBillingSlab.json b/data/as/30013844/ws-services-calculation/WCBillingSlab.json
index aee2bd6736..bbb93d0b9f 100644
--- a/data/as/30013844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013844/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013848/ws-services-calculation/Penalty.json b/data/as/30013848/ws-services-calculation/Penalty.json
index 7c178d2a72..bcfe1ae201 100644
--- a/data/as/30013848/ws-services-calculation/Penalty.json
+++ b/data/as/30013848/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013848/ws-services-calculation/WCBillingSlab.json b/data/as/30013848/ws-services-calculation/WCBillingSlab.json
index 681680a8e4..316de7d3ac 100644
--- a/data/as/30013848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013848/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013853/ws-services-calculation/Penalty.json b/data/as/30013853/ws-services-calculation/Penalty.json
index 5cccd1c52d..f311fa691b 100644
--- a/data/as/30013853/ws-services-calculation/Penalty.json
+++ b/data/as/30013853/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013853/ws-services-calculation/WCBillingSlab.json b/data/as/30013853/ws-services-calculation/WCBillingSlab.json
index a50baaf691..bdf22ab1db 100644
--- a/data/as/30013853/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013853/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013855/ws-services-calculation/Penalty.json b/data/as/30013855/ws-services-calculation/Penalty.json
index a4de290da2..d5d45e5bad 100644
--- a/data/as/30013855/ws-services-calculation/Penalty.json
+++ b/data/as/30013855/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013855/ws-services-calculation/WCBillingSlab.json b/data/as/30013855/ws-services-calculation/WCBillingSlab.json
index 7e010a70cb..21c1c46662 100644
--- a/data/as/30013855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013855/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013863/ws-services-calculation/Penalty.json b/data/as/30013863/ws-services-calculation/Penalty.json
index 189af40745..563561f089 100644
--- a/data/as/30013863/ws-services-calculation/Penalty.json
+++ b/data/as/30013863/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013863/ws-services-calculation/WCBillingSlab.json b/data/as/30013863/ws-services-calculation/WCBillingSlab.json
index 83958ade42..09b7546830 100644
--- a/data/as/30013863/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013863/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30013915/ws-services-calculation/Penalty.json b/data/as/30013915/ws-services-calculation/Penalty.json
index e14a6037ff..f5a074d9ce 100644
--- a/data/as/30013915/ws-services-calculation/Penalty.json
+++ b/data/as/30013915/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013915/ws-services-calculation/WCBillingSlab.json b/data/as/30013915/ws-services-calculation/WCBillingSlab.json
index 933b826f66..4d26afa448 100644
--- a/data/as/30013915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013915/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014184/ws-services-calculation/Penalty.json b/data/as/30014184/ws-services-calculation/Penalty.json
index 49c90a5f2a..a3e3fc8c12 100644
--- a/data/as/30014184/ws-services-calculation/Penalty.json
+++ b/data/as/30014184/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014184/ws-services-calculation/WCBillingSlab.json b/data/as/30014184/ws-services-calculation/WCBillingSlab.json
index 1d0f236a08..cfb554339f 100644
--- a/data/as/30014184/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014184/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014239/ws-services-calculation/Penalty.json b/data/as/30014239/ws-services-calculation/Penalty.json
index 24e8751910..ceeba8b049 100644
--- a/data/as/30014239/ws-services-calculation/Penalty.json
+++ b/data/as/30014239/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014239/ws-services-calculation/WCBillingSlab.json b/data/as/30014239/ws-services-calculation/WCBillingSlab.json
index 68506a623c..2e9527f9eb 100644
--- a/data/as/30014239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014239/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014264/ws-services-calculation/Penalty.json b/data/as/30014264/ws-services-calculation/Penalty.json
index 35f5db94c3..d395ece6df 100644
--- a/data/as/30014264/ws-services-calculation/Penalty.json
+++ b/data/as/30014264/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014264/ws-services-calculation/WCBillingSlab.json b/data/as/30014264/ws-services-calculation/WCBillingSlab.json
index c7bce3cf36..4fd9677a11 100644
--- a/data/as/30014264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014264/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014427/ws-services-calculation/Penalty.json b/data/as/30014427/ws-services-calculation/Penalty.json
index e83f6d472d..0b014424be 100644
--- a/data/as/30014427/ws-services-calculation/Penalty.json
+++ b/data/as/30014427/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014427/ws-services-calculation/WCBillingSlab.json b/data/as/30014427/ws-services-calculation/WCBillingSlab.json
index 8241321093..8bf60e133d 100644
--- a/data/as/30014427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014427/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014441/ws-services-calculation/Penalty.json b/data/as/30014441/ws-services-calculation/Penalty.json
index 3533c6fd3a..8c0b1aba41 100644
--- a/data/as/30014441/ws-services-calculation/Penalty.json
+++ b/data/as/30014441/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014441/ws-services-calculation/WCBillingSlab.json b/data/as/30014441/ws-services-calculation/WCBillingSlab.json
index ffa926ed3c..060a906303 100644
--- a/data/as/30014441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014441/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014445/ws-services-calculation/Penalty.json b/data/as/30014445/ws-services-calculation/Penalty.json
index d46f677faa..0ee828655e 100644
--- a/data/as/30014445/ws-services-calculation/Penalty.json
+++ b/data/as/30014445/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014445/ws-services-calculation/WCBillingSlab.json b/data/as/30014445/ws-services-calculation/WCBillingSlab.json
index 8632ef2322..ac50374962 100644
--- a/data/as/30014445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014445/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014448/ws-services-calculation/Penalty.json b/data/as/30014448/ws-services-calculation/Penalty.json
index ccefcacf36..90a2dab760 100644
--- a/data/as/30014448/ws-services-calculation/Penalty.json
+++ b/data/as/30014448/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014448/ws-services-calculation/WCBillingSlab.json b/data/as/30014448/ws-services-calculation/WCBillingSlab.json
index e93cba3708..ecbada0077 100644
--- a/data/as/30014448/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014448/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014450/ws-services-calculation/Penalty.json b/data/as/30014450/ws-services-calculation/Penalty.json
index 3ede96f286..5b420ed399 100644
--- a/data/as/30014450/ws-services-calculation/Penalty.json
+++ b/data/as/30014450/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014450/ws-services-calculation/WCBillingSlab.json b/data/as/30014450/ws-services-calculation/WCBillingSlab.json
index b0cd3a754c..e53a801d9d 100644
--- a/data/as/30014450/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014450/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014452/ws-services-calculation/Penalty.json b/data/as/30014452/ws-services-calculation/Penalty.json
index c89be808cf..c163d89e0d 100644
--- a/data/as/30014452/ws-services-calculation/Penalty.json
+++ b/data/as/30014452/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014452/ws-services-calculation/WCBillingSlab.json b/data/as/30014452/ws-services-calculation/WCBillingSlab.json
index 4cac541e5f..920b94e6eb 100644
--- a/data/as/30014452/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014452/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014454/ws-services-calculation/Penalty.json b/data/as/30014454/ws-services-calculation/Penalty.json
index fbcaec921a..0775ebdd22 100644
--- a/data/as/30014454/ws-services-calculation/Penalty.json
+++ b/data/as/30014454/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014454/ws-services-calculation/WCBillingSlab.json b/data/as/30014454/ws-services-calculation/WCBillingSlab.json
index c614c415e6..7d6d03a054 100644
--- a/data/as/30014454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014454/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014658/ws-services-calculation/Penalty.json b/data/as/30014658/ws-services-calculation/Penalty.json
index 846802650e..ebab1c356d 100644
--- a/data/as/30014658/ws-services-calculation/Penalty.json
+++ b/data/as/30014658/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014658/ws-services-calculation/WCBillingSlab.json b/data/as/30014658/ws-services-calculation/WCBillingSlab.json
index 142529c677..3fa80c3e32 100644
--- a/data/as/30014658/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014658/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014663/ws-services-calculation/Penalty.json b/data/as/30014663/ws-services-calculation/Penalty.json
index db13e4f2b6..38759b206c 100644
--- a/data/as/30014663/ws-services-calculation/Penalty.json
+++ b/data/as/30014663/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014663/ws-services-calculation/WCBillingSlab.json b/data/as/30014663/ws-services-calculation/WCBillingSlab.json
index bc282ddebd..22050357b2 100644
--- a/data/as/30014663/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014663/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014666/ws-services-calculation/Penalty.json b/data/as/30014666/ws-services-calculation/Penalty.json
index 78d177fea4..69bf1891e1 100644
--- a/data/as/30014666/ws-services-calculation/Penalty.json
+++ b/data/as/30014666/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014666/ws-services-calculation/WCBillingSlab.json b/data/as/30014666/ws-services-calculation/WCBillingSlab.json
index 0bd715a6a8..2f1623334c 100644
--- a/data/as/30014666/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014666/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014668/ws-services-calculation/Penalty.json b/data/as/30014668/ws-services-calculation/Penalty.json
index b8f8849603..ba28956c8f 100644
--- a/data/as/30014668/ws-services-calculation/Penalty.json
+++ b/data/as/30014668/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014668/ws-services-calculation/WCBillingSlab.json b/data/as/30014668/ws-services-calculation/WCBillingSlab.json
index f1d0951697..3e15cf14fe 100644
--- a/data/as/30014668/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014668/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014669/ws-services-calculation/Penalty.json b/data/as/30014669/ws-services-calculation/Penalty.json
index 0e3e0a33de..5a2b122718 100644
--- a/data/as/30014669/ws-services-calculation/Penalty.json
+++ b/data/as/30014669/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014669/ws-services-calculation/WCBillingSlab.json b/data/as/30014669/ws-services-calculation/WCBillingSlab.json
index 6b61085f43..a8ea759cf6 100644
--- a/data/as/30014669/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014669/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014670/ws-services-calculation/Penalty.json b/data/as/30014670/ws-services-calculation/Penalty.json
index a526478841..66397584e9 100644
--- a/data/as/30014670/ws-services-calculation/Penalty.json
+++ b/data/as/30014670/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014670/ws-services-calculation/WCBillingSlab.json b/data/as/30014670/ws-services-calculation/WCBillingSlab.json
index 85cf69da9d..a93ccdb31e 100644
--- a/data/as/30014670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014670/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014671/ws-services-calculation/Penalty.json b/data/as/30014671/ws-services-calculation/Penalty.json
index be35af3701..a96cbf6df6 100644
--- a/data/as/30014671/ws-services-calculation/Penalty.json
+++ b/data/as/30014671/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014671/ws-services-calculation/WCBillingSlab.json b/data/as/30014671/ws-services-calculation/WCBillingSlab.json
index 0cad3bc311..328f2ceb74 100644
--- a/data/as/30014671/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014671/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014698/ws-services-calculation/Penalty.json b/data/as/30014698/ws-services-calculation/Penalty.json
index ed8e35a2e9..389257d763 100644
--- a/data/as/30014698/ws-services-calculation/Penalty.json
+++ b/data/as/30014698/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014698/ws-services-calculation/WCBillingSlab.json b/data/as/30014698/ws-services-calculation/WCBillingSlab.json
index e7c7fe0cd5..e888301413 100644
--- a/data/as/30014698/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014698/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014701/ws-services-calculation/Penalty.json b/data/as/30014701/ws-services-calculation/Penalty.json
index 6c25d15c30..b40ffced84 100644
--- a/data/as/30014701/ws-services-calculation/Penalty.json
+++ b/data/as/30014701/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014701/ws-services-calculation/WCBillingSlab.json b/data/as/30014701/ws-services-calculation/WCBillingSlab.json
index 0bd28fa107..29d57e9fa7 100644
--- a/data/as/30014701/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014701/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014915/ws-services-calculation/Penalty.json b/data/as/30014915/ws-services-calculation/Penalty.json
index 2b132dbf7c..19e6487a03 100644
--- a/data/as/30014915/ws-services-calculation/Penalty.json
+++ b/data/as/30014915/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014915/ws-services-calculation/WCBillingSlab.json b/data/as/30014915/ws-services-calculation/WCBillingSlab.json
index 7c57933661..6e07feb3cf 100644
--- a/data/as/30014915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014915/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014971/ws-services-calculation/Penalty.json b/data/as/30014971/ws-services-calculation/Penalty.json
index 928bca34ee..624dd0420d 100644
--- a/data/as/30014971/ws-services-calculation/Penalty.json
+++ b/data/as/30014971/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014971/ws-services-calculation/WCBillingSlab.json b/data/as/30014971/ws-services-calculation/WCBillingSlab.json
index 29820fc91e..f1b7047d7e 100644
--- a/data/as/30014971/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014971/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014990/ws-services-calculation/Penalty.json b/data/as/30014990/ws-services-calculation/Penalty.json
index 6f63f7196e..1305ec0844 100644
--- a/data/as/30014990/ws-services-calculation/Penalty.json
+++ b/data/as/30014990/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014990/ws-services-calculation/WCBillingSlab.json b/data/as/30014990/ws-services-calculation/WCBillingSlab.json
index 651785a3fd..1044ea78e1 100644
--- a/data/as/30014990/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014990/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014991/ws-services-calculation/Penalty.json b/data/as/30014991/ws-services-calculation/Penalty.json
index ce5f8e065d..a445a88066 100644
--- a/data/as/30014991/ws-services-calculation/Penalty.json
+++ b/data/as/30014991/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014991/ws-services-calculation/WCBillingSlab.json b/data/as/30014991/ws-services-calculation/WCBillingSlab.json
index d5bbe38c9a..3046c5f229 100644
--- a/data/as/30014991/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014991/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30014992/ws-services-calculation/Penalty.json b/data/as/30014992/ws-services-calculation/Penalty.json
index 3c902e40c1..57f9259d70 100644
--- a/data/as/30014992/ws-services-calculation/Penalty.json
+++ b/data/as/30014992/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014992/ws-services-calculation/WCBillingSlab.json b/data/as/30014992/ws-services-calculation/WCBillingSlab.json
index 04398063d5..a28ac28d33 100644
--- a/data/as/30014992/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014992/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30015050/ws-services-calculation/Penalty.json b/data/as/30015050/ws-services-calculation/Penalty.json
index e990cead4f..8ce5e9cede 100644
--- a/data/as/30015050/ws-services-calculation/Penalty.json
+++ b/data/as/30015050/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30015050/ws-services-calculation/WCBillingSlab.json b/data/as/30015050/ws-services-calculation/WCBillingSlab.json
index efdf4c30c6..c6ae10783b 100644
--- a/data/as/30015050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30015050/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30015700/ws-services-calculation/Penalty.json b/data/as/30015700/ws-services-calculation/Penalty.json
index d5b5e13b2d..30f96c0889 100644
--- a/data/as/30015700/ws-services-calculation/Penalty.json
+++ b/data/as/30015700/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30015700/ws-services-calculation/WCBillingSlab.json b/data/as/30015700/ws-services-calculation/WCBillingSlab.json
index 5b72225b0a..f199377625 100644
--- a/data/as/30015700/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30015700/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016452/ws-services-calculation/Penalty.json b/data/as/30016452/ws-services-calculation/Penalty.json
index 07a3483c75..cfe249af8d 100644
--- a/data/as/30016452/ws-services-calculation/Penalty.json
+++ b/data/as/30016452/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016452/ws-services-calculation/WCBillingSlab.json b/data/as/30016452/ws-services-calculation/WCBillingSlab.json
index fbaeb1dcdf..b3dcd55842 100644
--- a/data/as/30016452/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016452/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016458/ws-services-calculation/Penalty.json b/data/as/30016458/ws-services-calculation/Penalty.json
index 2adfad073c..edeacf3482 100644
--- a/data/as/30016458/ws-services-calculation/Penalty.json
+++ b/data/as/30016458/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016458/ws-services-calculation/WCBillingSlab.json b/data/as/30016458/ws-services-calculation/WCBillingSlab.json
index adc9d94253..880160d592 100644
--- a/data/as/30016458/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016458/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016472/ws-services-calculation/Penalty.json b/data/as/30016472/ws-services-calculation/Penalty.json
index ef51b54293..8dd0593ec7 100644
--- a/data/as/30016472/ws-services-calculation/Penalty.json
+++ b/data/as/30016472/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016472/ws-services-calculation/WCBillingSlab.json b/data/as/30016472/ws-services-calculation/WCBillingSlab.json
index 1efcb8c83d..bc9dda09d0 100644
--- a/data/as/30016472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016472/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016510/ws-services-calculation/Penalty.json b/data/as/30016510/ws-services-calculation/Penalty.json
index 44d6494674..de032323df 100644
--- a/data/as/30016510/ws-services-calculation/Penalty.json
+++ b/data/as/30016510/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016510/ws-services-calculation/WCBillingSlab.json b/data/as/30016510/ws-services-calculation/WCBillingSlab.json
index 564bacec59..f7f3654da6 100644
--- a/data/as/30016510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016510/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016693/ws-services-calculation/Penalty.json b/data/as/30016693/ws-services-calculation/Penalty.json
index cf621a06de..7ea0eff915 100644
--- a/data/as/30016693/ws-services-calculation/Penalty.json
+++ b/data/as/30016693/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016693/ws-services-calculation/WCBillingSlab.json b/data/as/30016693/ws-services-calculation/WCBillingSlab.json
index a26294ef1b..b40750d4bd 100644
--- a/data/as/30016693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016693/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016720/ws-services-calculation/Penalty.json b/data/as/30016720/ws-services-calculation/Penalty.json
index f2669e8fd2..dd857fd681 100644
--- a/data/as/30016720/ws-services-calculation/Penalty.json
+++ b/data/as/30016720/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016720/ws-services-calculation/WCBillingSlab.json b/data/as/30016720/ws-services-calculation/WCBillingSlab.json
index 34dbd69125..baa61f5b1b 100644
--- a/data/as/30016720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016720/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016724/ws-services-calculation/Penalty.json b/data/as/30016724/ws-services-calculation/Penalty.json
index dc390051ff..370a313949 100644
--- a/data/as/30016724/ws-services-calculation/Penalty.json
+++ b/data/as/30016724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016724/ws-services-calculation/WCBillingSlab.json b/data/as/30016724/ws-services-calculation/WCBillingSlab.json
index 8dc9b7f921..14a9804c03 100644
--- a/data/as/30016724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016755/ws-services-calculation/Penalty.json b/data/as/30016755/ws-services-calculation/Penalty.json
index 6cd0b2e33b..6394ebdd0b 100644
--- a/data/as/30016755/ws-services-calculation/Penalty.json
+++ b/data/as/30016755/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016755/ws-services-calculation/WCBillingSlab.json b/data/as/30016755/ws-services-calculation/WCBillingSlab.json
index c388c7f258..154bdfde88 100644
--- a/data/as/30016755/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016755/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016761/ws-services-calculation/Penalty.json b/data/as/30016761/ws-services-calculation/Penalty.json
index add4bb69e5..0e1fdc74dd 100644
--- a/data/as/30016761/ws-services-calculation/Penalty.json
+++ b/data/as/30016761/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016761/ws-services-calculation/WCBillingSlab.json b/data/as/30016761/ws-services-calculation/WCBillingSlab.json
index b5686bf4d0..8e0042b37e 100644
--- a/data/as/30016761/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016761/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187171/ws-services-calculation/Penalty.json b/data/as/8187171/ws-services-calculation/Penalty.json
index 8a513df204..dafb98ad62 100644
--- a/data/as/8187171/ws-services-calculation/Penalty.json
+++ b/data/as/8187171/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187171/ws-services-calculation/WCBillingSlab.json b/data/as/8187171/ws-services-calculation/WCBillingSlab.json
index 1b11f151f1..6a1268d66d 100644
--- a/data/as/8187171/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187171/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187175/ws-services-calculation/Penalty.json b/data/as/8187175/ws-services-calculation/Penalty.json
index a51f4e60ed..560f16eba6 100644
--- a/data/as/8187175/ws-services-calculation/Penalty.json
+++ b/data/as/8187175/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187175/ws-services-calculation/WCBillingSlab.json b/data/as/8187175/ws-services-calculation/WCBillingSlab.json
index a691553227..ced5284b74 100644
--- a/data/as/8187175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187175/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187179/ws-services-calculation/Penalty.json b/data/as/8187179/ws-services-calculation/Penalty.json
index 7a472a3702..ddb36877ef 100644
--- a/data/as/8187179/ws-services-calculation/Penalty.json
+++ b/data/as/8187179/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187179/ws-services-calculation/WCBillingSlab.json b/data/as/8187179/ws-services-calculation/WCBillingSlab.json
index 18539d8f95..a6272fa7b7 100644
--- a/data/as/8187179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187179/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187185/ws-services-calculation/Penalty.json b/data/as/8187185/ws-services-calculation/Penalty.json
index 698883ff0f..2fd292c1bb 100644
--- a/data/as/8187185/ws-services-calculation/Penalty.json
+++ b/data/as/8187185/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187185/ws-services-calculation/WCBillingSlab.json b/data/as/8187185/ws-services-calculation/WCBillingSlab.json
index d7104490ce..7ebd7afa07 100644
--- a/data/as/8187185/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187185/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187193/ws-services-calculation/Penalty.json b/data/as/8187193/ws-services-calculation/Penalty.json
index dbe8badae1..d6905353db 100644
--- a/data/as/8187193/ws-services-calculation/Penalty.json
+++ b/data/as/8187193/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187193/ws-services-calculation/WCBillingSlab.json b/data/as/8187193/ws-services-calculation/WCBillingSlab.json
index fed708d7dc..c839c78b1c 100644
--- a/data/as/8187193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187193/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187270/ws-services-calculation/Penalty.json b/data/as/8187270/ws-services-calculation/Penalty.json
index d419ae5646..4997d71a5b 100644
--- a/data/as/8187270/ws-services-calculation/Penalty.json
+++ b/data/as/8187270/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187270/ws-services-calculation/WCBillingSlab.json b/data/as/8187270/ws-services-calculation/WCBillingSlab.json
index cc2f55b46a..51e81ca3b5 100644
--- a/data/as/8187270/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187270/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187278/ws-services-calculation/Penalty.json b/data/as/8187278/ws-services-calculation/Penalty.json
index 090d37fa32..28abd30452 100644
--- a/data/as/8187278/ws-services-calculation/Penalty.json
+++ b/data/as/8187278/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187278/ws-services-calculation/WCBillingSlab.json b/data/as/8187278/ws-services-calculation/WCBillingSlab.json
index d971b3a152..0b64b9b5cf 100644
--- a/data/as/8187278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187278/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187290/ws-services-calculation/Penalty.json b/data/as/8187290/ws-services-calculation/Penalty.json
index 8035902fe4..82b4447bc7 100644
--- a/data/as/8187290/ws-services-calculation/Penalty.json
+++ b/data/as/8187290/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187290/ws-services-calculation/WCBillingSlab.json b/data/as/8187290/ws-services-calculation/WCBillingSlab.json
index bd21a8c9cb..fd6a5df328 100644
--- a/data/as/8187290/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187290/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187298/ws-services-calculation/Penalty.json b/data/as/8187298/ws-services-calculation/Penalty.json
index 3adbadb09b..706f242d64 100644
--- a/data/as/8187298/ws-services-calculation/Penalty.json
+++ b/data/as/8187298/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187298/ws-services-calculation/WCBillingSlab.json b/data/as/8187298/ws-services-calculation/WCBillingSlab.json
index b551ea47d9..43d63a2e5b 100644
--- a/data/as/8187298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187298/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187307/ws-services-calculation/Penalty.json b/data/as/8187307/ws-services-calculation/Penalty.json
index 9b1e7e96aa..5e4279ec13 100644
--- a/data/as/8187307/ws-services-calculation/Penalty.json
+++ b/data/as/8187307/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187307/ws-services-calculation/WCBillingSlab.json b/data/as/8187307/ws-services-calculation/WCBillingSlab.json
index 09b7699191..9be6ed140b 100644
--- a/data/as/8187307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187307/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187315/ws-services-calculation/Penalty.json b/data/as/8187315/ws-services-calculation/Penalty.json
index 458182e43f..4ce65787de 100644
--- a/data/as/8187315/ws-services-calculation/Penalty.json
+++ b/data/as/8187315/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187315/ws-services-calculation/WCBillingSlab.json b/data/as/8187315/ws-services-calculation/WCBillingSlab.json
index 8da6ddd07b..cfe12c79e1 100644
--- a/data/as/8187315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187315/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187323/ws-services-calculation/Penalty.json b/data/as/8187323/ws-services-calculation/Penalty.json
index 995ec334e0..59346f8cbd 100644
--- a/data/as/8187323/ws-services-calculation/Penalty.json
+++ b/data/as/8187323/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187323/ws-services-calculation/WCBillingSlab.json b/data/as/8187323/ws-services-calculation/WCBillingSlab.json
index 73f3b3b365..f526eb9bd8 100644
--- a/data/as/8187323/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187323/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187332/ws-services-calculation/Penalty.json b/data/as/8187332/ws-services-calculation/Penalty.json
index 268b7c958d..f15b94f42a 100644
--- a/data/as/8187332/ws-services-calculation/Penalty.json
+++ b/data/as/8187332/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187332/ws-services-calculation/WCBillingSlab.json b/data/as/8187332/ws-services-calculation/WCBillingSlab.json
index e2a6ff1381..3001e9e66c 100644
--- a/data/as/8187332/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187332/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187337/ws-services-calculation/Penalty.json b/data/as/8187337/ws-services-calculation/Penalty.json
index 46f32cd1d1..2a8db5affa 100644
--- a/data/as/8187337/ws-services-calculation/Penalty.json
+++ b/data/as/8187337/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187337/ws-services-calculation/WCBillingSlab.json b/data/as/8187337/ws-services-calculation/WCBillingSlab.json
index b484d2bd0f..c4237fd07a 100644
--- a/data/as/8187337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187337/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187344/ws-services-calculation/Penalty.json b/data/as/8187344/ws-services-calculation/Penalty.json
index 73fdb351fe..353cebced0 100644
--- a/data/as/8187344/ws-services-calculation/Penalty.json
+++ b/data/as/8187344/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187344/ws-services-calculation/WCBillingSlab.json b/data/as/8187344/ws-services-calculation/WCBillingSlab.json
index 4902ad32c3..ae14b9958b 100644
--- a/data/as/8187344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187344/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187350/ws-services-calculation/Penalty.json b/data/as/8187350/ws-services-calculation/Penalty.json
index b5363753de..82b14bae88 100644
--- a/data/as/8187350/ws-services-calculation/Penalty.json
+++ b/data/as/8187350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187350/ws-services-calculation/WCBillingSlab.json b/data/as/8187350/ws-services-calculation/WCBillingSlab.json
index 93ff4647e4..3171dbcaf9 100644
--- a/data/as/8187350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187548/ws-services-calculation/Penalty.json b/data/as/8187548/ws-services-calculation/Penalty.json
index dafefb3280..737e650de0 100644
--- a/data/as/8187548/ws-services-calculation/Penalty.json
+++ b/data/as/8187548/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187548/ws-services-calculation/WCBillingSlab.json b/data/as/8187548/ws-services-calculation/WCBillingSlab.json
index a886ccaec6..ded2c2c052 100644
--- a/data/as/8187548/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187548/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8187585/ws-services-calculation/Penalty.json b/data/as/8187585/ws-services-calculation/Penalty.json
index 90af8f7886..bd9cd07ce8 100644
--- a/data/as/8187585/ws-services-calculation/Penalty.json
+++ b/data/as/8187585/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187585/ws-services-calculation/WCBillingSlab.json b/data/as/8187585/ws-services-calculation/WCBillingSlab.json
index 48b954618e..b7ce94c377 100644
--- a/data/as/8187585/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187585/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8188301/ws-services-calculation/Penalty.json b/data/as/8188301/ws-services-calculation/Penalty.json
index e6f5b116b5..7117b8e0d2 100644
--- a/data/as/8188301/ws-services-calculation/Penalty.json
+++ b/data/as/8188301/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8188301/ws-services-calculation/WCBillingSlab.json b/data/as/8188301/ws-services-calculation/WCBillingSlab.json
index 0117bf699d..66a5b6bba2 100644
--- a/data/as/8188301/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8188301/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8188715/ws-services-calculation/Penalty.json b/data/as/8188715/ws-services-calculation/Penalty.json
index c88dad35ad..fbea9a4982 100644
--- a/data/as/8188715/ws-services-calculation/Penalty.json
+++ b/data/as/8188715/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8188715/ws-services-calculation/WCBillingSlab.json b/data/as/8188715/ws-services-calculation/WCBillingSlab.json
index 887f5b8824..b120dca546 100644
--- a/data/as/8188715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8188715/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8189136/ws-services-calculation/Penalty.json b/data/as/8189136/ws-services-calculation/Penalty.json
index dd1503da35..9257d8d317 100644
--- a/data/as/8189136/ws-services-calculation/Penalty.json
+++ b/data/as/8189136/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8189136/ws-services-calculation/WCBillingSlab.json b/data/as/8189136/ws-services-calculation/WCBillingSlab.json
index ec7bb7f9e4..114c5b1d52 100644
--- a/data/as/8189136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8189136/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8189158/ws-services-calculation/Penalty.json b/data/as/8189158/ws-services-calculation/Penalty.json
index d877769f9a..1875c98957 100644
--- a/data/as/8189158/ws-services-calculation/Penalty.json
+++ b/data/as/8189158/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8189158/ws-services-calculation/WCBillingSlab.json b/data/as/8189158/ws-services-calculation/WCBillingSlab.json
index dede0b3eae..cbeb78668a 100644
--- a/data/as/8189158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8189158/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192257/ws-services-calculation/Penalty.json b/data/as/8192257/ws-services-calculation/Penalty.json
index d18a335fc6..a7cf3007ce 100644
--- a/data/as/8192257/ws-services-calculation/Penalty.json
+++ b/data/as/8192257/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192257/ws-services-calculation/WCBillingSlab.json b/data/as/8192257/ws-services-calculation/WCBillingSlab.json
index 41274192f4..caef0edd9d 100644
--- a/data/as/8192257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192257/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192432/ws-services-calculation/Penalty.json b/data/as/8192432/ws-services-calculation/Penalty.json
index 4248c00406..d5a413d0ff 100644
--- a/data/as/8192432/ws-services-calculation/Penalty.json
+++ b/data/as/8192432/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192432/ws-services-calculation/WCBillingSlab.json b/data/as/8192432/ws-services-calculation/WCBillingSlab.json
index 47cf6287c1..5fdf3afff9 100644
--- a/data/as/8192432/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192432/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192456/ws-services-calculation/Penalty.json b/data/as/8192456/ws-services-calculation/Penalty.json
index f675cb73a7..857415eee6 100644
--- a/data/as/8192456/ws-services-calculation/Penalty.json
+++ b/data/as/8192456/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192456/ws-services-calculation/WCBillingSlab.json b/data/as/8192456/ws-services-calculation/WCBillingSlab.json
index 3148871056..3c9f7625db 100644
--- a/data/as/8192456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192456/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192523/ws-services-calculation/Penalty.json b/data/as/8192523/ws-services-calculation/Penalty.json
index 21a8e3be93..f1a80b3e9a 100644
--- a/data/as/8192523/ws-services-calculation/Penalty.json
+++ b/data/as/8192523/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192523/ws-services-calculation/WCBillingSlab.json b/data/as/8192523/ws-services-calculation/WCBillingSlab.json
index 88fec3f1fa..991783e6f0 100644
--- a/data/as/8192523/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192523/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192570/ws-services-calculation/Penalty.json b/data/as/8192570/ws-services-calculation/Penalty.json
index 2b46eb15c7..7a795e6a33 100644
--- a/data/as/8192570/ws-services-calculation/Penalty.json
+++ b/data/as/8192570/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192570/ws-services-calculation/WCBillingSlab.json b/data/as/8192570/ws-services-calculation/WCBillingSlab.json
index 19023d115c..7b667e84a9 100644
--- a/data/as/8192570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192570/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192597/ws-services-calculation/Penalty.json b/data/as/8192597/ws-services-calculation/Penalty.json
index 9230f5a28d..a5fbf887af 100644
--- a/data/as/8192597/ws-services-calculation/Penalty.json
+++ b/data/as/8192597/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192597/ws-services-calculation/WCBillingSlab.json b/data/as/8192597/ws-services-calculation/WCBillingSlab.json
index f929c44084..9043cf3681 100644
--- a/data/as/8192597/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192597/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192615/ws-services-calculation/Penalty.json b/data/as/8192615/ws-services-calculation/Penalty.json
index b1350858a3..8db4a2a356 100644
--- a/data/as/8192615/ws-services-calculation/Penalty.json
+++ b/data/as/8192615/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192615/ws-services-calculation/WCBillingSlab.json b/data/as/8192615/ws-services-calculation/WCBillingSlab.json
index 1ecae61477..740cbb3291 100644
--- a/data/as/8192615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192615/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192622/ws-services-calculation/Penalty.json b/data/as/8192622/ws-services-calculation/Penalty.json
index 7a54b06503..6c4c386eb0 100644
--- a/data/as/8192622/ws-services-calculation/Penalty.json
+++ b/data/as/8192622/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192622/ws-services-calculation/WCBillingSlab.json b/data/as/8192622/ws-services-calculation/WCBillingSlab.json
index 106a47e92e..4c09db171c 100644
--- a/data/as/8192622/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192622/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192631/ws-services-calculation/Penalty.json b/data/as/8192631/ws-services-calculation/Penalty.json
index bdaa6fd89a..4d97aea9d7 100644
--- a/data/as/8192631/ws-services-calculation/Penalty.json
+++ b/data/as/8192631/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192631/ws-services-calculation/WCBillingSlab.json b/data/as/8192631/ws-services-calculation/WCBillingSlab.json
index f17a29b1fd..cf4c53bc88 100644
--- a/data/as/8192631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192631/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192655/ws-services-calculation/Penalty.json b/data/as/8192655/ws-services-calculation/Penalty.json
index 894ac529b4..5f12f15468 100644
--- a/data/as/8192655/ws-services-calculation/Penalty.json
+++ b/data/as/8192655/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192655/ws-services-calculation/WCBillingSlab.json b/data/as/8192655/ws-services-calculation/WCBillingSlab.json
index 228afbc701..4434995777 100644
--- a/data/as/8192655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192655/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192673/ws-services-calculation/Penalty.json b/data/as/8192673/ws-services-calculation/Penalty.json
index 36cf1ec02d..2bfd47af24 100644
--- a/data/as/8192673/ws-services-calculation/Penalty.json
+++ b/data/as/8192673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192673/ws-services-calculation/WCBillingSlab.json b/data/as/8192673/ws-services-calculation/WCBillingSlab.json
index 41f81c2e6e..38b2ae307a 100644
--- a/data/as/8192673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8192716/ws-services-calculation/Penalty.json b/data/as/8192716/ws-services-calculation/Penalty.json
index 97e0eabe03..3ccda0b9f5 100644
--- a/data/as/8192716/ws-services-calculation/Penalty.json
+++ b/data/as/8192716/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192716/ws-services-calculation/WCBillingSlab.json b/data/as/8192716/ws-services-calculation/WCBillingSlab.json
index 58601046c0..1ea3c7cc16 100644
--- a/data/as/8192716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192716/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8195888/ws-services-calculation/Penalty.json b/data/as/8195888/ws-services-calculation/Penalty.json
index 75263bb71f..2342ec6f05 100644
--- a/data/as/8195888/ws-services-calculation/Penalty.json
+++ b/data/as/8195888/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8195888/ws-services-calculation/WCBillingSlab.json b/data/as/8195888/ws-services-calculation/WCBillingSlab.json
index b105661bcd..c599c2da92 100644
--- a/data/as/8195888/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8195888/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8195974/ws-services-calculation/Penalty.json b/data/as/8195974/ws-services-calculation/Penalty.json
index 7189220ef5..c523ff19cd 100644
--- a/data/as/8195974/ws-services-calculation/Penalty.json
+++ b/data/as/8195974/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8195974/ws-services-calculation/WCBillingSlab.json b/data/as/8195974/ws-services-calculation/WCBillingSlab.json
index 76a43560bb..237b649e16 100644
--- a/data/as/8195974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8195974/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196020/ws-services-calculation/Penalty.json b/data/as/8196020/ws-services-calculation/Penalty.json
index f04499cba3..0d9b3afaa7 100644
--- a/data/as/8196020/ws-services-calculation/Penalty.json
+++ b/data/as/8196020/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196020/ws-services-calculation/WCBillingSlab.json b/data/as/8196020/ws-services-calculation/WCBillingSlab.json
index ed3debde2d..5f3a13a638 100644
--- a/data/as/8196020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196020/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196023/ws-services-calculation/Penalty.json b/data/as/8196023/ws-services-calculation/Penalty.json
index 0db9b7f53e..74713ca077 100644
--- a/data/as/8196023/ws-services-calculation/Penalty.json
+++ b/data/as/8196023/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196023/ws-services-calculation/WCBillingSlab.json b/data/as/8196023/ws-services-calculation/WCBillingSlab.json
index c08308b7fe..2994c0efef 100644
--- a/data/as/8196023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196023/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196027/ws-services-calculation/Penalty.json b/data/as/8196027/ws-services-calculation/Penalty.json
index 3a39bff137..feaa02484d 100644
--- a/data/as/8196027/ws-services-calculation/Penalty.json
+++ b/data/as/8196027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196027/ws-services-calculation/WCBillingSlab.json b/data/as/8196027/ws-services-calculation/WCBillingSlab.json
index bddb03b337..4dd24aa77f 100644
--- a/data/as/8196027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196029/ws-services-calculation/Penalty.json b/data/as/8196029/ws-services-calculation/Penalty.json
index e6d0571535..67eeca94ae 100644
--- a/data/as/8196029/ws-services-calculation/Penalty.json
+++ b/data/as/8196029/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196029/ws-services-calculation/WCBillingSlab.json b/data/as/8196029/ws-services-calculation/WCBillingSlab.json
index e6ca124e99..1b9a140f2a 100644
--- a/data/as/8196029/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196029/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196038/ws-services-calculation/Penalty.json b/data/as/8196038/ws-services-calculation/Penalty.json
index 564b629783..624a5c59a5 100644
--- a/data/as/8196038/ws-services-calculation/Penalty.json
+++ b/data/as/8196038/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196038/ws-services-calculation/WCBillingSlab.json b/data/as/8196038/ws-services-calculation/WCBillingSlab.json
index e8a197dcb3..d3fcc8c8af 100644
--- a/data/as/8196038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196038/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196756/ws-services-calculation/Penalty.json b/data/as/8196756/ws-services-calculation/Penalty.json
index 866ff914f9..d95212c38a 100644
--- a/data/as/8196756/ws-services-calculation/Penalty.json
+++ b/data/as/8196756/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196756/ws-services-calculation/WCBillingSlab.json b/data/as/8196756/ws-services-calculation/WCBillingSlab.json
index 76c30f07d3..256b3f8b5b 100644
--- a/data/as/8196756/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196756/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196774/ws-services-calculation/Penalty.json b/data/as/8196774/ws-services-calculation/Penalty.json
index df5427b3cb..a7e9a27f43 100644
--- a/data/as/8196774/ws-services-calculation/Penalty.json
+++ b/data/as/8196774/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196774/ws-services-calculation/WCBillingSlab.json b/data/as/8196774/ws-services-calculation/WCBillingSlab.json
index c561f01cc6..7982dfd7dc 100644
--- a/data/as/8196774/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196774/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196779/ws-services-calculation/Penalty.json b/data/as/8196779/ws-services-calculation/Penalty.json
index 06361f4fde..ebd837f7d2 100644
--- a/data/as/8196779/ws-services-calculation/Penalty.json
+++ b/data/as/8196779/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196779/ws-services-calculation/WCBillingSlab.json b/data/as/8196779/ws-services-calculation/WCBillingSlab.json
index 42fffb474d..c451fe5fbe 100644
--- a/data/as/8196779/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196779/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196786/ws-services-calculation/Penalty.json b/data/as/8196786/ws-services-calculation/Penalty.json
index 0aad31eb29..0feb7d7371 100644
--- a/data/as/8196786/ws-services-calculation/Penalty.json
+++ b/data/as/8196786/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196786/ws-services-calculation/WCBillingSlab.json b/data/as/8196786/ws-services-calculation/WCBillingSlab.json
index 74347e18bd..e9c26104b2 100644
--- a/data/as/8196786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196786/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196792/ws-services-calculation/Penalty.json b/data/as/8196792/ws-services-calculation/Penalty.json
index 6b51295b45..29ee885f37 100644
--- a/data/as/8196792/ws-services-calculation/Penalty.json
+++ b/data/as/8196792/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196792/ws-services-calculation/WCBillingSlab.json b/data/as/8196792/ws-services-calculation/WCBillingSlab.json
index d7197fd83a..fb1e4d53ae 100644
--- a/data/as/8196792/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196792/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196816/ws-services-calculation/Penalty.json b/data/as/8196816/ws-services-calculation/Penalty.json
index 13ae1ce34a..3b4efc0bee 100644
--- a/data/as/8196816/ws-services-calculation/Penalty.json
+++ b/data/as/8196816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196816/ws-services-calculation/WCBillingSlab.json b/data/as/8196816/ws-services-calculation/WCBillingSlab.json
index d5ea87e70e..e20d01127f 100644
--- a/data/as/8196816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196837/ws-services-calculation/Penalty.json b/data/as/8196837/ws-services-calculation/Penalty.json
index 8bf948a2b8..41fffa979b 100644
--- a/data/as/8196837/ws-services-calculation/Penalty.json
+++ b/data/as/8196837/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196837/ws-services-calculation/WCBillingSlab.json b/data/as/8196837/ws-services-calculation/WCBillingSlab.json
index 649db30329..c154a58768 100644
--- a/data/as/8196837/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196837/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196871/ws-services-calculation/Penalty.json b/data/as/8196871/ws-services-calculation/Penalty.json
index 607a0c0b28..fc692994d2 100644
--- a/data/as/8196871/ws-services-calculation/Penalty.json
+++ b/data/as/8196871/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196871/ws-services-calculation/WCBillingSlab.json b/data/as/8196871/ws-services-calculation/WCBillingSlab.json
index 3a4053b878..48fb6b2475 100644
--- a/data/as/8196871/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196871/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196879/ws-services-calculation/Penalty.json b/data/as/8196879/ws-services-calculation/Penalty.json
index e482f33efc..ca538da644 100644
--- a/data/as/8196879/ws-services-calculation/Penalty.json
+++ b/data/as/8196879/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196879/ws-services-calculation/WCBillingSlab.json b/data/as/8196879/ws-services-calculation/WCBillingSlab.json
index c8d3115d8c..701ada453c 100644
--- a/data/as/8196879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196879/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196894/ws-services-calculation/Penalty.json b/data/as/8196894/ws-services-calculation/Penalty.json
index bbe4632b83..ce54e09112 100644
--- a/data/as/8196894/ws-services-calculation/Penalty.json
+++ b/data/as/8196894/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196894/ws-services-calculation/WCBillingSlab.json b/data/as/8196894/ws-services-calculation/WCBillingSlab.json
index 49ed4c8090..34cb63bec9 100644
--- a/data/as/8196894/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196894/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196903/ws-services-calculation/Penalty.json b/data/as/8196903/ws-services-calculation/Penalty.json
index f322c5ab49..671b0d9340 100644
--- a/data/as/8196903/ws-services-calculation/Penalty.json
+++ b/data/as/8196903/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196903/ws-services-calculation/WCBillingSlab.json b/data/as/8196903/ws-services-calculation/WCBillingSlab.json
index 4f9dbf4ffa..0b108511bb 100644
--- a/data/as/8196903/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196903/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196910/ws-services-calculation/Penalty.json b/data/as/8196910/ws-services-calculation/Penalty.json
index 7aead859cb..bdc19afb22 100644
--- a/data/as/8196910/ws-services-calculation/Penalty.json
+++ b/data/as/8196910/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196910/ws-services-calculation/WCBillingSlab.json b/data/as/8196910/ws-services-calculation/WCBillingSlab.json
index 200306eb54..6fd0104525 100644
--- a/data/as/8196910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196910/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196914/ws-services-calculation/Penalty.json b/data/as/8196914/ws-services-calculation/Penalty.json
index 6c3a2839e7..c33d67b0ee 100644
--- a/data/as/8196914/ws-services-calculation/Penalty.json
+++ b/data/as/8196914/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196914/ws-services-calculation/WCBillingSlab.json b/data/as/8196914/ws-services-calculation/WCBillingSlab.json
index ea87356f2b..e4a54417dd 100644
--- a/data/as/8196914/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196914/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196954/ws-services-calculation/Penalty.json b/data/as/8196954/ws-services-calculation/Penalty.json
index 221396b33d..d6e1600481 100644
--- a/data/as/8196954/ws-services-calculation/Penalty.json
+++ b/data/as/8196954/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196954/ws-services-calculation/WCBillingSlab.json b/data/as/8196954/ws-services-calculation/WCBillingSlab.json
index 2e515fc6d8..f5f95a440f 100644
--- a/data/as/8196954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196954/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196972/ws-services-calculation/Penalty.json b/data/as/8196972/ws-services-calculation/Penalty.json
index be84dc824f..25530c6d0e 100644
--- a/data/as/8196972/ws-services-calculation/Penalty.json
+++ b/data/as/8196972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196972/ws-services-calculation/WCBillingSlab.json b/data/as/8196972/ws-services-calculation/WCBillingSlab.json
index a0583941ba..7948abb791 100644
--- a/data/as/8196972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8196995/ws-services-calculation/Penalty.json b/data/as/8196995/ws-services-calculation/Penalty.json
index b17aeae909..36ce5d99a6 100644
--- a/data/as/8196995/ws-services-calculation/Penalty.json
+++ b/data/as/8196995/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196995/ws-services-calculation/WCBillingSlab.json b/data/as/8196995/ws-services-calculation/WCBillingSlab.json
index 065cbb0975..27ac2dd3fb 100644
--- a/data/as/8196995/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196995/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197005/ws-services-calculation/Penalty.json b/data/as/8197005/ws-services-calculation/Penalty.json
index 1d23551ece..5a470d2cb4 100644
--- a/data/as/8197005/ws-services-calculation/Penalty.json
+++ b/data/as/8197005/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197005/ws-services-calculation/WCBillingSlab.json b/data/as/8197005/ws-services-calculation/WCBillingSlab.json
index 1201ec9184..d1d9aee91d 100644
--- a/data/as/8197005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197005/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197023/ws-services-calculation/Penalty.json b/data/as/8197023/ws-services-calculation/Penalty.json
index 1b286f21fb..dfed25110b 100644
--- a/data/as/8197023/ws-services-calculation/Penalty.json
+++ b/data/as/8197023/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197023/ws-services-calculation/WCBillingSlab.json b/data/as/8197023/ws-services-calculation/WCBillingSlab.json
index 58d895a2a4..b0acad48b1 100644
--- a/data/as/8197023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197023/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197028/ws-services-calculation/Penalty.json b/data/as/8197028/ws-services-calculation/Penalty.json
index 0d6707213f..8f4b82db52 100644
--- a/data/as/8197028/ws-services-calculation/Penalty.json
+++ b/data/as/8197028/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197028/ws-services-calculation/WCBillingSlab.json b/data/as/8197028/ws-services-calculation/WCBillingSlab.json
index 879a6ef44f..1e9bccddbe 100644
--- a/data/as/8197028/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197028/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197048/ws-services-calculation/Penalty.json b/data/as/8197048/ws-services-calculation/Penalty.json
index ed93243518..953c7a0b52 100644
--- a/data/as/8197048/ws-services-calculation/Penalty.json
+++ b/data/as/8197048/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197048/ws-services-calculation/WCBillingSlab.json b/data/as/8197048/ws-services-calculation/WCBillingSlab.json
index 5a6306c848..13fef5d444 100644
--- a/data/as/8197048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197048/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197059/ws-services-calculation/Penalty.json b/data/as/8197059/ws-services-calculation/Penalty.json
index 5cab69e943..141546dc0f 100644
--- a/data/as/8197059/ws-services-calculation/Penalty.json
+++ b/data/as/8197059/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197059/ws-services-calculation/WCBillingSlab.json b/data/as/8197059/ws-services-calculation/WCBillingSlab.json
index fd2ee1b6b3..ed1de07b4b 100644
--- a/data/as/8197059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197059/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197069/ws-services-calculation/Penalty.json b/data/as/8197069/ws-services-calculation/Penalty.json
index fa5fa3f233..9217542d95 100644
--- a/data/as/8197069/ws-services-calculation/Penalty.json
+++ b/data/as/8197069/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197069/ws-services-calculation/WCBillingSlab.json b/data/as/8197069/ws-services-calculation/WCBillingSlab.json
index 461dda90d0..9754ac6504 100644
--- a/data/as/8197069/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197069/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197098/ws-services-calculation/Penalty.json b/data/as/8197098/ws-services-calculation/Penalty.json
index fbcfbc4acd..071efd3362 100644
--- a/data/as/8197098/ws-services-calculation/Penalty.json
+++ b/data/as/8197098/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197098/ws-services-calculation/WCBillingSlab.json b/data/as/8197098/ws-services-calculation/WCBillingSlab.json
index bf888c6268..93926039ea 100644
--- a/data/as/8197098/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197098/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197113/ws-services-calculation/Penalty.json b/data/as/8197113/ws-services-calculation/Penalty.json
index c2ee79c656..6f438bfe5b 100644
--- a/data/as/8197113/ws-services-calculation/Penalty.json
+++ b/data/as/8197113/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197113/ws-services-calculation/WCBillingSlab.json b/data/as/8197113/ws-services-calculation/WCBillingSlab.json
index c9a5653b7d..439de209f2 100644
--- a/data/as/8197113/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197113/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197243/ws-services-calculation/Penalty.json b/data/as/8197243/ws-services-calculation/Penalty.json
index b7d17d03ea..7d38315d4a 100644
--- a/data/as/8197243/ws-services-calculation/Penalty.json
+++ b/data/as/8197243/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197243/ws-services-calculation/WCBillingSlab.json b/data/as/8197243/ws-services-calculation/WCBillingSlab.json
index f562871fff..be69dce653 100644
--- a/data/as/8197243/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197243/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8197282/ws-services-calculation/Penalty.json b/data/as/8197282/ws-services-calculation/Penalty.json
index 95f4c347ef..746ac4cc85 100644
--- a/data/as/8197282/ws-services-calculation/Penalty.json
+++ b/data/as/8197282/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197282/ws-services-calculation/WCBillingSlab.json b/data/as/8197282/ws-services-calculation/WCBillingSlab.json
index 4776b05c03..b295a2228e 100644
--- a/data/as/8197282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197282/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198168/ws-services-calculation/Penalty.json b/data/as/8198168/ws-services-calculation/Penalty.json
index 6f70393b4d..c798aa5bf6 100644
--- a/data/as/8198168/ws-services-calculation/Penalty.json
+++ b/data/as/8198168/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198168/ws-services-calculation/WCBillingSlab.json b/data/as/8198168/ws-services-calculation/WCBillingSlab.json
index be0ba4aa47..b9990a29af 100644
--- a/data/as/8198168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198168/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198173/ws-services-calculation/Penalty.json b/data/as/8198173/ws-services-calculation/Penalty.json
index ceef04e266..a367a525bf 100644
--- a/data/as/8198173/ws-services-calculation/Penalty.json
+++ b/data/as/8198173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198173/ws-services-calculation/WCBillingSlab.json b/data/as/8198173/ws-services-calculation/WCBillingSlab.json
index 0cef784453..bd1b8c01b6 100644
--- a/data/as/8198173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198179/ws-services-calculation/Penalty.json b/data/as/8198179/ws-services-calculation/Penalty.json
index 340ef00509..8b7f36108c 100644
--- a/data/as/8198179/ws-services-calculation/Penalty.json
+++ b/data/as/8198179/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198179/ws-services-calculation/WCBillingSlab.json b/data/as/8198179/ws-services-calculation/WCBillingSlab.json
index a8f2b19862..fade4b1914 100644
--- a/data/as/8198179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198179/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198205/ws-services-calculation/Penalty.json b/data/as/8198205/ws-services-calculation/Penalty.json
index 5bd984b87d..873754d1ce 100644
--- a/data/as/8198205/ws-services-calculation/Penalty.json
+++ b/data/as/8198205/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198205/ws-services-calculation/WCBillingSlab.json b/data/as/8198205/ws-services-calculation/WCBillingSlab.json
index f36bdabee1..0561a27a49 100644
--- a/data/as/8198205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198205/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198213/ws-services-calculation/Penalty.json b/data/as/8198213/ws-services-calculation/Penalty.json
index 53edaf63cc..693b10a801 100644
--- a/data/as/8198213/ws-services-calculation/Penalty.json
+++ b/data/as/8198213/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198213/ws-services-calculation/WCBillingSlab.json b/data/as/8198213/ws-services-calculation/WCBillingSlab.json
index d55746da10..889cd5e5c0 100644
--- a/data/as/8198213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198213/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198223/ws-services-calculation/Penalty.json b/data/as/8198223/ws-services-calculation/Penalty.json
index df04107ce2..0374490d7a 100644
--- a/data/as/8198223/ws-services-calculation/Penalty.json
+++ b/data/as/8198223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198223/ws-services-calculation/WCBillingSlab.json b/data/as/8198223/ws-services-calculation/WCBillingSlab.json
index 621e99eeda..19e9850246 100644
--- a/data/as/8198223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8198230/ws-services-calculation/Penalty.json b/data/as/8198230/ws-services-calculation/Penalty.json
index 89f7f1aaec..a403cc28ae 100644
--- a/data/as/8198230/ws-services-calculation/Penalty.json
+++ b/data/as/8198230/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198230/ws-services-calculation/WCBillingSlab.json b/data/as/8198230/ws-services-calculation/WCBillingSlab.json
index 2904f15ab8..ea3ae222a4 100644
--- a/data/as/8198230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198230/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8201977/ws-services-calculation/Penalty.json b/data/as/8201977/ws-services-calculation/Penalty.json
index 0d22254eac..baa18d4365 100644
--- a/data/as/8201977/ws-services-calculation/Penalty.json
+++ b/data/as/8201977/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8201977/ws-services-calculation/WCBillingSlab.json b/data/as/8201977/ws-services-calculation/WCBillingSlab.json
index 9a4444a524..b78cd0b96e 100644
--- a/data/as/8201977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8201977/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8201983/ws-services-calculation/Penalty.json b/data/as/8201983/ws-services-calculation/Penalty.json
index 72e7fd2c32..db452dfe99 100644
--- a/data/as/8201983/ws-services-calculation/Penalty.json
+++ b/data/as/8201983/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8201983/ws-services-calculation/WCBillingSlab.json b/data/as/8201983/ws-services-calculation/WCBillingSlab.json
index 873fbe7119..23452f7ca3 100644
--- a/data/as/8201983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8201983/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8202008/ws-services-calculation/Penalty.json b/data/as/8202008/ws-services-calculation/Penalty.json
index 76cc53d22b..84318c7054 100644
--- a/data/as/8202008/ws-services-calculation/Penalty.json
+++ b/data/as/8202008/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202008/ws-services-calculation/WCBillingSlab.json b/data/as/8202008/ws-services-calculation/WCBillingSlab.json
index fb7758027d..d2080a4e7a 100644
--- a/data/as/8202008/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202008/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8202014/ws-services-calculation/Penalty.json b/data/as/8202014/ws-services-calculation/Penalty.json
index 52096773d0..17dcfe3928 100644
--- a/data/as/8202014/ws-services-calculation/Penalty.json
+++ b/data/as/8202014/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202014/ws-services-calculation/WCBillingSlab.json b/data/as/8202014/ws-services-calculation/WCBillingSlab.json
index f276a5a2c2..c62892c30f 100644
--- a/data/as/8202014/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202014/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8202020/ws-services-calculation/Penalty.json b/data/as/8202020/ws-services-calculation/Penalty.json
index c24be7dd3c..dd5e62cbaa 100644
--- a/data/as/8202020/ws-services-calculation/Penalty.json
+++ b/data/as/8202020/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202020/ws-services-calculation/WCBillingSlab.json b/data/as/8202020/ws-services-calculation/WCBillingSlab.json
index 284947f85d..4aba332269 100644
--- a/data/as/8202020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202020/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8202025/ws-services-calculation/Penalty.json b/data/as/8202025/ws-services-calculation/Penalty.json
index df284488ba..50d67d7d71 100644
--- a/data/as/8202025/ws-services-calculation/Penalty.json
+++ b/data/as/8202025/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202025/ws-services-calculation/WCBillingSlab.json b/data/as/8202025/ws-services-calculation/WCBillingSlab.json
index e78dbd18ea..1df6cc82c8 100644
--- a/data/as/8202025/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202025/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8202278/ws-services-calculation/Penalty.json b/data/as/8202278/ws-services-calculation/Penalty.json
index 2d65239545..205878fb77 100644
--- a/data/as/8202278/ws-services-calculation/Penalty.json
+++ b/data/as/8202278/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202278/ws-services-calculation/WCBillingSlab.json b/data/as/8202278/ws-services-calculation/WCBillingSlab.json
index dc42fe5b02..06f148bbe3 100644
--- a/data/as/8202278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202278/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8202287/ws-services-calculation/Penalty.json b/data/as/8202287/ws-services-calculation/Penalty.json
index 68c2b5dd16..59a60e080e 100644
--- a/data/as/8202287/ws-services-calculation/Penalty.json
+++ b/data/as/8202287/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202287/ws-services-calculation/WCBillingSlab.json b/data/as/8202287/ws-services-calculation/WCBillingSlab.json
index 7c27977594..59aea0ad47 100644
--- a/data/as/8202287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202287/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203051/ws-services-calculation/Penalty.json b/data/as/8203051/ws-services-calculation/Penalty.json
index 137734a423..003a7d98f0 100644
--- a/data/as/8203051/ws-services-calculation/Penalty.json
+++ b/data/as/8203051/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203051/ws-services-calculation/WCBillingSlab.json b/data/as/8203051/ws-services-calculation/WCBillingSlab.json
index 0fe93d0606..15e4bfecae 100644
--- a/data/as/8203051/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203051/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203064/ws-services-calculation/Penalty.json b/data/as/8203064/ws-services-calculation/Penalty.json
index ce28f35fc7..3c75d53d0d 100644
--- a/data/as/8203064/ws-services-calculation/Penalty.json
+++ b/data/as/8203064/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203064/ws-services-calculation/WCBillingSlab.json b/data/as/8203064/ws-services-calculation/WCBillingSlab.json
index 4c006a0dbf..132b5cedb9 100644
--- a/data/as/8203064/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203064/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203128/ws-services-calculation/Penalty.json b/data/as/8203128/ws-services-calculation/Penalty.json
index fd3299ea1b..0dcd1f5f0a 100644
--- a/data/as/8203128/ws-services-calculation/Penalty.json
+++ b/data/as/8203128/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203128/ws-services-calculation/WCBillingSlab.json b/data/as/8203128/ws-services-calculation/WCBillingSlab.json
index 414c45a210..1f782d9acd 100644
--- a/data/as/8203128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203128/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203162/ws-services-calculation/Penalty.json b/data/as/8203162/ws-services-calculation/Penalty.json
index d830281cf5..60c84dcd9d 100644
--- a/data/as/8203162/ws-services-calculation/Penalty.json
+++ b/data/as/8203162/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203162/ws-services-calculation/WCBillingSlab.json b/data/as/8203162/ws-services-calculation/WCBillingSlab.json
index 2655a489bb..bb8765d985 100644
--- a/data/as/8203162/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203162/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203178/ws-services-calculation/Penalty.json b/data/as/8203178/ws-services-calculation/Penalty.json
index 917c1ba9f9..00fe46577c 100644
--- a/data/as/8203178/ws-services-calculation/Penalty.json
+++ b/data/as/8203178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203178/ws-services-calculation/WCBillingSlab.json b/data/as/8203178/ws-services-calculation/WCBillingSlab.json
index f728d8e54b..91e7b562d2 100644
--- a/data/as/8203178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203211/ws-services-calculation/Penalty.json b/data/as/8203211/ws-services-calculation/Penalty.json
index a49fbd853d..b2b40f78c9 100644
--- a/data/as/8203211/ws-services-calculation/Penalty.json
+++ b/data/as/8203211/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203211/ws-services-calculation/WCBillingSlab.json b/data/as/8203211/ws-services-calculation/WCBillingSlab.json
index 5bbcf0aa3e..8752c352e0 100644
--- a/data/as/8203211/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203211/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203233/ws-services-calculation/Penalty.json b/data/as/8203233/ws-services-calculation/Penalty.json
index 9998a750a0..2c2daa3008 100644
--- a/data/as/8203233/ws-services-calculation/Penalty.json
+++ b/data/as/8203233/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203233/ws-services-calculation/WCBillingSlab.json b/data/as/8203233/ws-services-calculation/WCBillingSlab.json
index 4f6f26a64e..06fa3224a0 100644
--- a/data/as/8203233/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203233/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203251/ws-services-calculation/Penalty.json b/data/as/8203251/ws-services-calculation/Penalty.json
index df54684189..847115e2a9 100644
--- a/data/as/8203251/ws-services-calculation/Penalty.json
+++ b/data/as/8203251/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203251/ws-services-calculation/WCBillingSlab.json b/data/as/8203251/ws-services-calculation/WCBillingSlab.json
index 5d90767603..c74f815801 100644
--- a/data/as/8203251/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203251/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203271/ws-services-calculation/Penalty.json b/data/as/8203271/ws-services-calculation/Penalty.json
index 8ee2d10a1c..5da4b51414 100644
--- a/data/as/8203271/ws-services-calculation/Penalty.json
+++ b/data/as/8203271/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203271/ws-services-calculation/WCBillingSlab.json b/data/as/8203271/ws-services-calculation/WCBillingSlab.json
index 37281f6646..624952c1ed 100644
--- a/data/as/8203271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203271/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203278/ws-services-calculation/Penalty.json b/data/as/8203278/ws-services-calculation/Penalty.json
index 96e4171b3c..474e986940 100644
--- a/data/as/8203278/ws-services-calculation/Penalty.json
+++ b/data/as/8203278/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203278/ws-services-calculation/WCBillingSlab.json b/data/as/8203278/ws-services-calculation/WCBillingSlab.json
index 301d794751..a690916a93 100644
--- a/data/as/8203278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203278/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203286/ws-services-calculation/Penalty.json b/data/as/8203286/ws-services-calculation/Penalty.json
index 3241f3abed..9d2eacec8a 100644
--- a/data/as/8203286/ws-services-calculation/Penalty.json
+++ b/data/as/8203286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203286/ws-services-calculation/WCBillingSlab.json b/data/as/8203286/ws-services-calculation/WCBillingSlab.json
index 42caf02987..1486cce277 100644
--- a/data/as/8203286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203579/ws-services-calculation/Penalty.json b/data/as/8203579/ws-services-calculation/Penalty.json
index a9a23f500d..88f9297ed7 100644
--- a/data/as/8203579/ws-services-calculation/Penalty.json
+++ b/data/as/8203579/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203579/ws-services-calculation/WCBillingSlab.json b/data/as/8203579/ws-services-calculation/WCBillingSlab.json
index a9453eb360..c3bbdfdf39 100644
--- a/data/as/8203579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203579/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203589/ws-services-calculation/Penalty.json b/data/as/8203589/ws-services-calculation/Penalty.json
index 55a64763fc..6eac780664 100644
--- a/data/as/8203589/ws-services-calculation/Penalty.json
+++ b/data/as/8203589/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203589/ws-services-calculation/WCBillingSlab.json b/data/as/8203589/ws-services-calculation/WCBillingSlab.json
index cc95036808..b694e31177 100644
--- a/data/as/8203589/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203589/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203592/ws-services-calculation/Penalty.json b/data/as/8203592/ws-services-calculation/Penalty.json
index 4387b3d1ea..3b9f7821ee 100644
--- a/data/as/8203592/ws-services-calculation/Penalty.json
+++ b/data/as/8203592/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203592/ws-services-calculation/WCBillingSlab.json b/data/as/8203592/ws-services-calculation/WCBillingSlab.json
index 8c6afb8504..6855017bf2 100644
--- a/data/as/8203592/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203592/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203614/ws-services-calculation/Penalty.json b/data/as/8203614/ws-services-calculation/Penalty.json
index e4c9eeb553..1bf8e80e0f 100644
--- a/data/as/8203614/ws-services-calculation/Penalty.json
+++ b/data/as/8203614/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203614/ws-services-calculation/WCBillingSlab.json b/data/as/8203614/ws-services-calculation/WCBillingSlab.json
index cc6dffd1f8..8e466c5bf6 100644
--- a/data/as/8203614/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203614/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203629/ws-services-calculation/Penalty.json b/data/as/8203629/ws-services-calculation/Penalty.json
index 162c1b1499..74dbcf5577 100644
--- a/data/as/8203629/ws-services-calculation/Penalty.json
+++ b/data/as/8203629/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203629/ws-services-calculation/WCBillingSlab.json b/data/as/8203629/ws-services-calculation/WCBillingSlab.json
index ff67c52864..00647ab092 100644
--- a/data/as/8203629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203629/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203647/ws-services-calculation/Penalty.json b/data/as/8203647/ws-services-calculation/Penalty.json
index 4faa9cbefc..1f4105ee4e 100644
--- a/data/as/8203647/ws-services-calculation/Penalty.json
+++ b/data/as/8203647/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203647/ws-services-calculation/WCBillingSlab.json b/data/as/8203647/ws-services-calculation/WCBillingSlab.json
index ea69b56e5c..dc598f8eb8 100644
--- a/data/as/8203647/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203647/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203683/ws-services-calculation/Penalty.json b/data/as/8203683/ws-services-calculation/Penalty.json
index 558384dcbd..f44d9e3d36 100644
--- a/data/as/8203683/ws-services-calculation/Penalty.json
+++ b/data/as/8203683/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203683/ws-services-calculation/WCBillingSlab.json b/data/as/8203683/ws-services-calculation/WCBillingSlab.json
index e4a6939f0a..e97e91b55b 100644
--- a/data/as/8203683/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203683/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203689/ws-services-calculation/Penalty.json b/data/as/8203689/ws-services-calculation/Penalty.json
index df6f2272a7..0861dc8ad4 100644
--- a/data/as/8203689/ws-services-calculation/Penalty.json
+++ b/data/as/8203689/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203689/ws-services-calculation/WCBillingSlab.json b/data/as/8203689/ws-services-calculation/WCBillingSlab.json
index bab3b9aeed..85da731a57 100644
--- a/data/as/8203689/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203689/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203693/ws-services-calculation/Penalty.json b/data/as/8203693/ws-services-calculation/Penalty.json
index 828b6f0588..923e799f4a 100644
--- a/data/as/8203693/ws-services-calculation/Penalty.json
+++ b/data/as/8203693/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203693/ws-services-calculation/WCBillingSlab.json b/data/as/8203693/ws-services-calculation/WCBillingSlab.json
index e78bab8922..7901648985 100644
--- a/data/as/8203693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203693/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203703/ws-services-calculation/Penalty.json b/data/as/8203703/ws-services-calculation/Penalty.json
index 70455f7eed..b36bba76e4 100644
--- a/data/as/8203703/ws-services-calculation/Penalty.json
+++ b/data/as/8203703/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203703/ws-services-calculation/WCBillingSlab.json b/data/as/8203703/ws-services-calculation/WCBillingSlab.json
index b3696d3ae8..5fda087751 100644
--- a/data/as/8203703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203703/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203721/ws-services-calculation/Penalty.json b/data/as/8203721/ws-services-calculation/Penalty.json
index 8502eb305e..2a2bb92009 100644
--- a/data/as/8203721/ws-services-calculation/Penalty.json
+++ b/data/as/8203721/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203721/ws-services-calculation/WCBillingSlab.json b/data/as/8203721/ws-services-calculation/WCBillingSlab.json
index 911fc85d3f..fa80d4742a 100644
--- a/data/as/8203721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203721/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203725/ws-services-calculation/Penalty.json b/data/as/8203725/ws-services-calculation/Penalty.json
index 5c80edafed..4c34bf3b13 100644
--- a/data/as/8203725/ws-services-calculation/Penalty.json
+++ b/data/as/8203725/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203725/ws-services-calculation/WCBillingSlab.json b/data/as/8203725/ws-services-calculation/WCBillingSlab.json
index fae875d4d6..72b5c821fd 100644
--- a/data/as/8203725/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203725/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203729/ws-services-calculation/Penalty.json b/data/as/8203729/ws-services-calculation/Penalty.json
index f7a60d0597..186758da13 100644
--- a/data/as/8203729/ws-services-calculation/Penalty.json
+++ b/data/as/8203729/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203729/ws-services-calculation/WCBillingSlab.json b/data/as/8203729/ws-services-calculation/WCBillingSlab.json
index eab4fb3766..5fe55c4f50 100644
--- a/data/as/8203729/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203729/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203732/ws-services-calculation/Penalty.json b/data/as/8203732/ws-services-calculation/Penalty.json
index 7fb8c69c65..56907d1bda 100644
--- a/data/as/8203732/ws-services-calculation/Penalty.json
+++ b/data/as/8203732/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203732/ws-services-calculation/WCBillingSlab.json b/data/as/8203732/ws-services-calculation/WCBillingSlab.json
index 30a322c886..138d86c35c 100644
--- a/data/as/8203732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203732/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203748/ws-services-calculation/Penalty.json b/data/as/8203748/ws-services-calculation/Penalty.json
index 67816ae857..a7acdc068a 100644
--- a/data/as/8203748/ws-services-calculation/Penalty.json
+++ b/data/as/8203748/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203748/ws-services-calculation/WCBillingSlab.json b/data/as/8203748/ws-services-calculation/WCBillingSlab.json
index f6be076839..2d9cee04ba 100644
--- a/data/as/8203748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203748/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203764/ws-services-calculation/Penalty.json b/data/as/8203764/ws-services-calculation/Penalty.json
index 86d42bb526..e698feef96 100644
--- a/data/as/8203764/ws-services-calculation/Penalty.json
+++ b/data/as/8203764/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203764/ws-services-calculation/WCBillingSlab.json b/data/as/8203764/ws-services-calculation/WCBillingSlab.json
index a221d31792..ded90b2fda 100644
--- a/data/as/8203764/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203764/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203786/ws-services-calculation/Penalty.json b/data/as/8203786/ws-services-calculation/Penalty.json
index 832f29a47b..c10f172e4e 100644
--- a/data/as/8203786/ws-services-calculation/Penalty.json
+++ b/data/as/8203786/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203786/ws-services-calculation/WCBillingSlab.json b/data/as/8203786/ws-services-calculation/WCBillingSlab.json
index 649fface58..2e3575cc90 100644
--- a/data/as/8203786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203786/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203804/ws-services-calculation/Penalty.json b/data/as/8203804/ws-services-calculation/Penalty.json
index bac9df98d6..6e0d82cb40 100644
--- a/data/as/8203804/ws-services-calculation/Penalty.json
+++ b/data/as/8203804/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203804/ws-services-calculation/WCBillingSlab.json b/data/as/8203804/ws-services-calculation/WCBillingSlab.json
index 465547d6ed..1fc3a51f07 100644
--- a/data/as/8203804/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203804/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203816/ws-services-calculation/Penalty.json b/data/as/8203816/ws-services-calculation/Penalty.json
index 3858ea5d2e..dc9587c139 100644
--- a/data/as/8203816/ws-services-calculation/Penalty.json
+++ b/data/as/8203816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203816/ws-services-calculation/WCBillingSlab.json b/data/as/8203816/ws-services-calculation/WCBillingSlab.json
index 067f6d566b..c1a8797924 100644
--- a/data/as/8203816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203835/ws-services-calculation/Penalty.json b/data/as/8203835/ws-services-calculation/Penalty.json
index a09cb9fbdf..18232e5186 100644
--- a/data/as/8203835/ws-services-calculation/Penalty.json
+++ b/data/as/8203835/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203835/ws-services-calculation/WCBillingSlab.json b/data/as/8203835/ws-services-calculation/WCBillingSlab.json
index 6f9d73a14b..daa36f53f5 100644
--- a/data/as/8203835/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203835/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203855/ws-services-calculation/Penalty.json b/data/as/8203855/ws-services-calculation/Penalty.json
index 953f2f0d70..c23592e3c1 100644
--- a/data/as/8203855/ws-services-calculation/Penalty.json
+++ b/data/as/8203855/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203855/ws-services-calculation/WCBillingSlab.json b/data/as/8203855/ws-services-calculation/WCBillingSlab.json
index 99ea15df1f..ceb13709de 100644
--- a/data/as/8203855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203855/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203872/ws-services-calculation/Penalty.json b/data/as/8203872/ws-services-calculation/Penalty.json
index aed5c8e3e2..572550e5cd 100644
--- a/data/as/8203872/ws-services-calculation/Penalty.json
+++ b/data/as/8203872/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203872/ws-services-calculation/WCBillingSlab.json b/data/as/8203872/ws-services-calculation/WCBillingSlab.json
index 9026d8e7b7..77fd5d1069 100644
--- a/data/as/8203872/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203872/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203902/ws-services-calculation/Penalty.json b/data/as/8203902/ws-services-calculation/Penalty.json
index 302af7b396..f16bfc3276 100644
--- a/data/as/8203902/ws-services-calculation/Penalty.json
+++ b/data/as/8203902/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203902/ws-services-calculation/WCBillingSlab.json b/data/as/8203902/ws-services-calculation/WCBillingSlab.json
index e1c7de2882..7be2453637 100644
--- a/data/as/8203902/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203902/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203915/ws-services-calculation/Penalty.json b/data/as/8203915/ws-services-calculation/Penalty.json
index 962aeb5e5a..4c28514556 100644
--- a/data/as/8203915/ws-services-calculation/Penalty.json
+++ b/data/as/8203915/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203915/ws-services-calculation/WCBillingSlab.json b/data/as/8203915/ws-services-calculation/WCBillingSlab.json
index 58892cc94d..f571492bcf 100644
--- a/data/as/8203915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203915/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203942/ws-services-calculation/Penalty.json b/data/as/8203942/ws-services-calculation/Penalty.json
index 0ecebe768c..18439fc9da 100644
--- a/data/as/8203942/ws-services-calculation/Penalty.json
+++ b/data/as/8203942/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203942/ws-services-calculation/WCBillingSlab.json b/data/as/8203942/ws-services-calculation/WCBillingSlab.json
index 606260b3d1..117c71a8aa 100644
--- a/data/as/8203942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203942/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8203947/ws-services-calculation/Penalty.json b/data/as/8203947/ws-services-calculation/Penalty.json
index 0436ea13ec..0276f5b044 100644
--- a/data/as/8203947/ws-services-calculation/Penalty.json
+++ b/data/as/8203947/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203947/ws-services-calculation/WCBillingSlab.json b/data/as/8203947/ws-services-calculation/WCBillingSlab.json
index 01b9eb94be..51e510c054 100644
--- a/data/as/8203947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203947/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8204267/ws-services-calculation/Penalty.json b/data/as/8204267/ws-services-calculation/Penalty.json
index 91b77563c1..5f4cd91022 100644
--- a/data/as/8204267/ws-services-calculation/Penalty.json
+++ b/data/as/8204267/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8204267/ws-services-calculation/WCBillingSlab.json b/data/as/8204267/ws-services-calculation/WCBillingSlab.json
index f553dc5982..ef72583410 100644
--- a/data/as/8204267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8204267/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205058/ws-services-calculation/Penalty.json b/data/as/8205058/ws-services-calculation/Penalty.json
index 980a0db719..a12e8dd6ee 100644
--- a/data/as/8205058/ws-services-calculation/Penalty.json
+++ b/data/as/8205058/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205058/ws-services-calculation/WCBillingSlab.json b/data/as/8205058/ws-services-calculation/WCBillingSlab.json
index 4e96796932..b3ce11c356 100644
--- a/data/as/8205058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205058/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205077/ws-services-calculation/Penalty.json b/data/as/8205077/ws-services-calculation/Penalty.json
index 0b67e75bb2..6b9c03d18c 100644
--- a/data/as/8205077/ws-services-calculation/Penalty.json
+++ b/data/as/8205077/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205077/ws-services-calculation/WCBillingSlab.json b/data/as/8205077/ws-services-calculation/WCBillingSlab.json
index 06de180bee..089d294c24 100644
--- a/data/as/8205077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205077/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205087/ws-services-calculation/Penalty.json b/data/as/8205087/ws-services-calculation/Penalty.json
index 7b0dcebfe9..4eb2c9c784 100644
--- a/data/as/8205087/ws-services-calculation/Penalty.json
+++ b/data/as/8205087/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205087/ws-services-calculation/WCBillingSlab.json b/data/as/8205087/ws-services-calculation/WCBillingSlab.json
index 7c1a30a2ea..e00241ccda 100644
--- a/data/as/8205087/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205087/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205096/ws-services-calculation/Penalty.json b/data/as/8205096/ws-services-calculation/Penalty.json
index 65400dc863..c0b211f7a1 100644
--- a/data/as/8205096/ws-services-calculation/Penalty.json
+++ b/data/as/8205096/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205096/ws-services-calculation/WCBillingSlab.json b/data/as/8205096/ws-services-calculation/WCBillingSlab.json
index d5b6310126..7616d96c46 100644
--- a/data/as/8205096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205096/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205107/ws-services-calculation/Penalty.json b/data/as/8205107/ws-services-calculation/Penalty.json
index cbe852754e..1d8148d35f 100644
--- a/data/as/8205107/ws-services-calculation/Penalty.json
+++ b/data/as/8205107/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205107/ws-services-calculation/WCBillingSlab.json b/data/as/8205107/ws-services-calculation/WCBillingSlab.json
index 687d2d3d20..8bfba85ad4 100644
--- a/data/as/8205107/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205107/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205116/ws-services-calculation/Penalty.json b/data/as/8205116/ws-services-calculation/Penalty.json
index 510396a1cb..543718a670 100644
--- a/data/as/8205116/ws-services-calculation/Penalty.json
+++ b/data/as/8205116/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205116/ws-services-calculation/WCBillingSlab.json b/data/as/8205116/ws-services-calculation/WCBillingSlab.json
index c57dbccf69..1f509f4e1e 100644
--- a/data/as/8205116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205116/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205127/ws-services-calculation/Penalty.json b/data/as/8205127/ws-services-calculation/Penalty.json
index 77749e0ac4..e62669cb7d 100644
--- a/data/as/8205127/ws-services-calculation/Penalty.json
+++ b/data/as/8205127/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205127/ws-services-calculation/WCBillingSlab.json b/data/as/8205127/ws-services-calculation/WCBillingSlab.json
index 4065d74061..0c73d0be27 100644
--- a/data/as/8205127/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205127/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205153/ws-services-calculation/Penalty.json b/data/as/8205153/ws-services-calculation/Penalty.json
index b28585413a..1db1637727 100644
--- a/data/as/8205153/ws-services-calculation/Penalty.json
+++ b/data/as/8205153/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205153/ws-services-calculation/WCBillingSlab.json b/data/as/8205153/ws-services-calculation/WCBillingSlab.json
index 49e3f072aa..b9d1afbbe9 100644
--- a/data/as/8205153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205153/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205176/ws-services-calculation/Penalty.json b/data/as/8205176/ws-services-calculation/Penalty.json
index b9a134576b..5390a0b5f8 100644
--- a/data/as/8205176/ws-services-calculation/Penalty.json
+++ b/data/as/8205176/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205176/ws-services-calculation/WCBillingSlab.json b/data/as/8205176/ws-services-calculation/WCBillingSlab.json
index ec41751933..c659607572 100644
--- a/data/as/8205176/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205176/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205265/ws-services-calculation/Penalty.json b/data/as/8205265/ws-services-calculation/Penalty.json
index 0ea59ad288..1892d4137b 100644
--- a/data/as/8205265/ws-services-calculation/Penalty.json
+++ b/data/as/8205265/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205265/ws-services-calculation/WCBillingSlab.json b/data/as/8205265/ws-services-calculation/WCBillingSlab.json
index 956430ae98..d83098df98 100644
--- a/data/as/8205265/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205265/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205277/ws-services-calculation/Penalty.json b/data/as/8205277/ws-services-calculation/Penalty.json
index 949b54211d..695bd751f0 100644
--- a/data/as/8205277/ws-services-calculation/Penalty.json
+++ b/data/as/8205277/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205277/ws-services-calculation/WCBillingSlab.json b/data/as/8205277/ws-services-calculation/WCBillingSlab.json
index 963e5679f6..421ce4e96b 100644
--- a/data/as/8205277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205277/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205283/ws-services-calculation/Penalty.json b/data/as/8205283/ws-services-calculation/Penalty.json
index da352664de..e9b45f44fb 100644
--- a/data/as/8205283/ws-services-calculation/Penalty.json
+++ b/data/as/8205283/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205283/ws-services-calculation/WCBillingSlab.json b/data/as/8205283/ws-services-calculation/WCBillingSlab.json
index 8b948c3089..7bfc2fc1f0 100644
--- a/data/as/8205283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205283/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205289/ws-services-calculation/Penalty.json b/data/as/8205289/ws-services-calculation/Penalty.json
index 185e47c61f..a1393403cc 100644
--- a/data/as/8205289/ws-services-calculation/Penalty.json
+++ b/data/as/8205289/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205289/ws-services-calculation/WCBillingSlab.json b/data/as/8205289/ws-services-calculation/WCBillingSlab.json
index 54a8d1f05d..b701decc90 100644
--- a/data/as/8205289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205289/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205290/ws-services-calculation/Penalty.json b/data/as/8205290/ws-services-calculation/Penalty.json
index f7463d3a22..8b7b6699ac 100644
--- a/data/as/8205290/ws-services-calculation/Penalty.json
+++ b/data/as/8205290/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205290/ws-services-calculation/WCBillingSlab.json b/data/as/8205290/ws-services-calculation/WCBillingSlab.json
index 6e886e063b..ede3b65747 100644
--- a/data/as/8205290/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205290/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205310/ws-services-calculation/Penalty.json b/data/as/8205310/ws-services-calculation/Penalty.json
index 73ea4e8475..1a0fcace9b 100644
--- a/data/as/8205310/ws-services-calculation/Penalty.json
+++ b/data/as/8205310/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205310/ws-services-calculation/WCBillingSlab.json b/data/as/8205310/ws-services-calculation/WCBillingSlab.json
index 252786ab28..ddd98fc1d0 100644
--- a/data/as/8205310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205310/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205339/ws-services-calculation/Penalty.json b/data/as/8205339/ws-services-calculation/Penalty.json
index d2fce1da96..2a5cd5e286 100644
--- a/data/as/8205339/ws-services-calculation/Penalty.json
+++ b/data/as/8205339/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205339/ws-services-calculation/WCBillingSlab.json b/data/as/8205339/ws-services-calculation/WCBillingSlab.json
index a935d8dcba..91d9e21512 100644
--- a/data/as/8205339/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205339/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205350/ws-services-calculation/Penalty.json b/data/as/8205350/ws-services-calculation/Penalty.json
index e6bd655037..4bcc6edc09 100644
--- a/data/as/8205350/ws-services-calculation/Penalty.json
+++ b/data/as/8205350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205350/ws-services-calculation/WCBillingSlab.json b/data/as/8205350/ws-services-calculation/WCBillingSlab.json
index 76d5973b79..aa1e915c72 100644
--- a/data/as/8205350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205362/ws-services-calculation/Penalty.json b/data/as/8205362/ws-services-calculation/Penalty.json
index db9d4fce82..92158ad925 100644
--- a/data/as/8205362/ws-services-calculation/Penalty.json
+++ b/data/as/8205362/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205362/ws-services-calculation/WCBillingSlab.json b/data/as/8205362/ws-services-calculation/WCBillingSlab.json
index 9a0b8dd674..c8d896a4d0 100644
--- a/data/as/8205362/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205362/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205375/ws-services-calculation/Penalty.json b/data/as/8205375/ws-services-calculation/Penalty.json
index 1698716967..6973420f7e 100644
--- a/data/as/8205375/ws-services-calculation/Penalty.json
+++ b/data/as/8205375/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205375/ws-services-calculation/WCBillingSlab.json b/data/as/8205375/ws-services-calculation/WCBillingSlab.json
index cf3aac5a6b..76c9798f68 100644
--- a/data/as/8205375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205375/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205382/ws-services-calculation/Penalty.json b/data/as/8205382/ws-services-calculation/Penalty.json
index fb446d4bcf..9544402cb0 100644
--- a/data/as/8205382/ws-services-calculation/Penalty.json
+++ b/data/as/8205382/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205382/ws-services-calculation/WCBillingSlab.json b/data/as/8205382/ws-services-calculation/WCBillingSlab.json
index 9b6b6bc77b..afaab48dff 100644
--- a/data/as/8205382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205382/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205387/ws-services-calculation/Penalty.json b/data/as/8205387/ws-services-calculation/Penalty.json
index 03910c0452..d9b9cfc40d 100644
--- a/data/as/8205387/ws-services-calculation/Penalty.json
+++ b/data/as/8205387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205387/ws-services-calculation/WCBillingSlab.json b/data/as/8205387/ws-services-calculation/WCBillingSlab.json
index 9a3537ed9d..e4a6f0edab 100644
--- a/data/as/8205387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8205395/ws-services-calculation/Penalty.json b/data/as/8205395/ws-services-calculation/Penalty.json
index 2a64359383..42b4613ac6 100644
--- a/data/as/8205395/ws-services-calculation/Penalty.json
+++ b/data/as/8205395/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205395/ws-services-calculation/WCBillingSlab.json b/data/as/8205395/ws-services-calculation/WCBillingSlab.json
index e2418b37c5..8b5c3ed3ad 100644
--- a/data/as/8205395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205395/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206044/ws-services-calculation/Penalty.json b/data/as/8206044/ws-services-calculation/Penalty.json
index fc849550af..4f5765b53e 100644
--- a/data/as/8206044/ws-services-calculation/Penalty.json
+++ b/data/as/8206044/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206044/ws-services-calculation/WCBillingSlab.json b/data/as/8206044/ws-services-calculation/WCBillingSlab.json
index a1545128e0..82460802fd 100644
--- a/data/as/8206044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206044/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206058/ws-services-calculation/Penalty.json b/data/as/8206058/ws-services-calculation/Penalty.json
index ec44d8a58c..c41dd290c8 100644
--- a/data/as/8206058/ws-services-calculation/Penalty.json
+++ b/data/as/8206058/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206058/ws-services-calculation/WCBillingSlab.json b/data/as/8206058/ws-services-calculation/WCBillingSlab.json
index 21831b62d8..603edaf9d5 100644
--- a/data/as/8206058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206058/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206068/ws-services-calculation/Penalty.json b/data/as/8206068/ws-services-calculation/Penalty.json
index 8b34c71942..c44aae2bf9 100644
--- a/data/as/8206068/ws-services-calculation/Penalty.json
+++ b/data/as/8206068/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206068/ws-services-calculation/WCBillingSlab.json b/data/as/8206068/ws-services-calculation/WCBillingSlab.json
index d509e8f6e6..8ab4f06b60 100644
--- a/data/as/8206068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206068/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206074/ws-services-calculation/Penalty.json b/data/as/8206074/ws-services-calculation/Penalty.json
index 36bff42177..a0416dd6eb 100644
--- a/data/as/8206074/ws-services-calculation/Penalty.json
+++ b/data/as/8206074/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206074/ws-services-calculation/WCBillingSlab.json b/data/as/8206074/ws-services-calculation/WCBillingSlab.json
index 53186e260f..27f43b668b 100644
--- a/data/as/8206074/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206074/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206091/ws-services-calculation/Penalty.json b/data/as/8206091/ws-services-calculation/Penalty.json
index ffb7e25f52..c8e09e23ca 100644
--- a/data/as/8206091/ws-services-calculation/Penalty.json
+++ b/data/as/8206091/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206091/ws-services-calculation/WCBillingSlab.json b/data/as/8206091/ws-services-calculation/WCBillingSlab.json
index 128d9a5d87..59f89a8018 100644
--- a/data/as/8206091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206091/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206111/ws-services-calculation/Penalty.json b/data/as/8206111/ws-services-calculation/Penalty.json
index b3b8603d85..a4fd824a97 100644
--- a/data/as/8206111/ws-services-calculation/Penalty.json
+++ b/data/as/8206111/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206111/ws-services-calculation/WCBillingSlab.json b/data/as/8206111/ws-services-calculation/WCBillingSlab.json
index 8a5c99cc24..c6dc2443ca 100644
--- a/data/as/8206111/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206111/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206116/ws-services-calculation/Penalty.json b/data/as/8206116/ws-services-calculation/Penalty.json
index 50e200909c..9c92b5dabf 100644
--- a/data/as/8206116/ws-services-calculation/Penalty.json
+++ b/data/as/8206116/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206116/ws-services-calculation/WCBillingSlab.json b/data/as/8206116/ws-services-calculation/WCBillingSlab.json
index f96bae2b2c..0dd252a1df 100644
--- a/data/as/8206116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206116/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206170/ws-services-calculation/Penalty.json b/data/as/8206170/ws-services-calculation/Penalty.json
index dcbbe05965..e1ff5649d4 100644
--- a/data/as/8206170/ws-services-calculation/Penalty.json
+++ b/data/as/8206170/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206170/ws-services-calculation/WCBillingSlab.json b/data/as/8206170/ws-services-calculation/WCBillingSlab.json
index 0b998f94ff..5b376729c4 100644
--- a/data/as/8206170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206170/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206177/ws-services-calculation/Penalty.json b/data/as/8206177/ws-services-calculation/Penalty.json
index ad676c49cc..e67fa356a9 100644
--- a/data/as/8206177/ws-services-calculation/Penalty.json
+++ b/data/as/8206177/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206177/ws-services-calculation/WCBillingSlab.json b/data/as/8206177/ws-services-calculation/WCBillingSlab.json
index 17084ee2c2..2d998e9bfe 100644
--- a/data/as/8206177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206177/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206194/ws-services-calculation/Penalty.json b/data/as/8206194/ws-services-calculation/Penalty.json
index 5daee9033b..007ce57f1e 100644
--- a/data/as/8206194/ws-services-calculation/Penalty.json
+++ b/data/as/8206194/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206194/ws-services-calculation/WCBillingSlab.json b/data/as/8206194/ws-services-calculation/WCBillingSlab.json
index d3d0ba3a37..875443c679 100644
--- a/data/as/8206194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206194/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206219/ws-services-calculation/Penalty.json b/data/as/8206219/ws-services-calculation/Penalty.json
index f4a3d9c173..0fdbda5da7 100644
--- a/data/as/8206219/ws-services-calculation/Penalty.json
+++ b/data/as/8206219/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206219/ws-services-calculation/WCBillingSlab.json b/data/as/8206219/ws-services-calculation/WCBillingSlab.json
index 63a850dafa..e767737a10 100644
--- a/data/as/8206219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206219/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206280/ws-services-calculation/Penalty.json b/data/as/8206280/ws-services-calculation/Penalty.json
index f24c82e96e..db94e59042 100644
--- a/data/as/8206280/ws-services-calculation/Penalty.json
+++ b/data/as/8206280/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206280/ws-services-calculation/WCBillingSlab.json b/data/as/8206280/ws-services-calculation/WCBillingSlab.json
index e52e051517..191c80955b 100644
--- a/data/as/8206280/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206280/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206284/ws-services-calculation/Penalty.json b/data/as/8206284/ws-services-calculation/Penalty.json
index dd3f367635..ea94764e59 100644
--- a/data/as/8206284/ws-services-calculation/Penalty.json
+++ b/data/as/8206284/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206284/ws-services-calculation/WCBillingSlab.json b/data/as/8206284/ws-services-calculation/WCBillingSlab.json
index 7a62658a8a..1bbb715c45 100644
--- a/data/as/8206284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206284/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206297/ws-services-calculation/Penalty.json b/data/as/8206297/ws-services-calculation/Penalty.json
index 5e1efeb3b0..8357961581 100644
--- a/data/as/8206297/ws-services-calculation/Penalty.json
+++ b/data/as/8206297/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206297/ws-services-calculation/WCBillingSlab.json b/data/as/8206297/ws-services-calculation/WCBillingSlab.json
index 75c3e8e474..b237e3710b 100644
--- a/data/as/8206297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206297/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206302/ws-services-calculation/Penalty.json b/data/as/8206302/ws-services-calculation/Penalty.json
index 3f8fac1002..45684446ef 100644
--- a/data/as/8206302/ws-services-calculation/Penalty.json
+++ b/data/as/8206302/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206302/ws-services-calculation/WCBillingSlab.json b/data/as/8206302/ws-services-calculation/WCBillingSlab.json
index 0a01109fcf..2f8736f4e2 100644
--- a/data/as/8206302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206302/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206316/ws-services-calculation/Penalty.json b/data/as/8206316/ws-services-calculation/Penalty.json
index 9457e561f7..b6d48016b2 100644
--- a/data/as/8206316/ws-services-calculation/Penalty.json
+++ b/data/as/8206316/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206316/ws-services-calculation/WCBillingSlab.json b/data/as/8206316/ws-services-calculation/WCBillingSlab.json
index 60f2fdac0e..43856af336 100644
--- a/data/as/8206316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206316/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206425/ws-services-calculation/Penalty.json b/data/as/8206425/ws-services-calculation/Penalty.json
index 67a6ff77a7..7f6e491d88 100644
--- a/data/as/8206425/ws-services-calculation/Penalty.json
+++ b/data/as/8206425/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206425/ws-services-calculation/WCBillingSlab.json b/data/as/8206425/ws-services-calculation/WCBillingSlab.json
index ad7b6f3120..85f4c94ce8 100644
--- a/data/as/8206425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206425/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206436/ws-services-calculation/Penalty.json b/data/as/8206436/ws-services-calculation/Penalty.json
index 71ee53ac83..3e1cbbd2a3 100644
--- a/data/as/8206436/ws-services-calculation/Penalty.json
+++ b/data/as/8206436/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206436/ws-services-calculation/WCBillingSlab.json b/data/as/8206436/ws-services-calculation/WCBillingSlab.json
index 667ffa9b56..d8c31fbc0a 100644
--- a/data/as/8206436/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206436/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206445/ws-services-calculation/Penalty.json b/data/as/8206445/ws-services-calculation/Penalty.json
index 596e01ea1b..5eabe58f0e 100644
--- a/data/as/8206445/ws-services-calculation/Penalty.json
+++ b/data/as/8206445/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206445/ws-services-calculation/WCBillingSlab.json b/data/as/8206445/ws-services-calculation/WCBillingSlab.json
index 67b803f2ac..45c7c479e2 100644
--- a/data/as/8206445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206445/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206457/ws-services-calculation/Penalty.json b/data/as/8206457/ws-services-calculation/Penalty.json
index b979096f1e..7cc1ac0be5 100644
--- a/data/as/8206457/ws-services-calculation/Penalty.json
+++ b/data/as/8206457/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206457/ws-services-calculation/WCBillingSlab.json b/data/as/8206457/ws-services-calculation/WCBillingSlab.json
index a2f6eae8c7..dc6a727e39 100644
--- a/data/as/8206457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206457/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206469/ws-services-calculation/Penalty.json b/data/as/8206469/ws-services-calculation/Penalty.json
index 79c842dda7..c087cc428a 100644
--- a/data/as/8206469/ws-services-calculation/Penalty.json
+++ b/data/as/8206469/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206469/ws-services-calculation/WCBillingSlab.json b/data/as/8206469/ws-services-calculation/WCBillingSlab.json
index 9f6d857767..aa847f4954 100644
--- a/data/as/8206469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206469/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206477/ws-services-calculation/Penalty.json b/data/as/8206477/ws-services-calculation/Penalty.json
index 19dc39f24b..fd07fc7509 100644
--- a/data/as/8206477/ws-services-calculation/Penalty.json
+++ b/data/as/8206477/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206477/ws-services-calculation/WCBillingSlab.json b/data/as/8206477/ws-services-calculation/WCBillingSlab.json
index 346bbd70fe..d555428f5b 100644
--- a/data/as/8206477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206477/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206486/ws-services-calculation/Penalty.json b/data/as/8206486/ws-services-calculation/Penalty.json
index 9aba8c6014..45130c69cf 100644
--- a/data/as/8206486/ws-services-calculation/Penalty.json
+++ b/data/as/8206486/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206486/ws-services-calculation/WCBillingSlab.json b/data/as/8206486/ws-services-calculation/WCBillingSlab.json
index 9288fc9767..c8bb6d83db 100644
--- a/data/as/8206486/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206486/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206496/ws-services-calculation/Penalty.json b/data/as/8206496/ws-services-calculation/Penalty.json
index 78cd37e963..d408fb3274 100644
--- a/data/as/8206496/ws-services-calculation/Penalty.json
+++ b/data/as/8206496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206496/ws-services-calculation/WCBillingSlab.json b/data/as/8206496/ws-services-calculation/WCBillingSlab.json
index c04d978364..fefe95f0b4 100644
--- a/data/as/8206496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206510/ws-services-calculation/Penalty.json b/data/as/8206510/ws-services-calculation/Penalty.json
index 0ca4398563..2bbef2c1bb 100644
--- a/data/as/8206510/ws-services-calculation/Penalty.json
+++ b/data/as/8206510/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206510/ws-services-calculation/WCBillingSlab.json b/data/as/8206510/ws-services-calculation/WCBillingSlab.json
index 927242a32f..8cdbefaa7d 100644
--- a/data/as/8206510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206510/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206524/ws-services-calculation/Penalty.json b/data/as/8206524/ws-services-calculation/Penalty.json
index daae187a19..e9fa094a10 100644
--- a/data/as/8206524/ws-services-calculation/Penalty.json
+++ b/data/as/8206524/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206524/ws-services-calculation/WCBillingSlab.json b/data/as/8206524/ws-services-calculation/WCBillingSlab.json
index 2369497cff..afdc427b74 100644
--- a/data/as/8206524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206524/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206535/ws-services-calculation/Penalty.json b/data/as/8206535/ws-services-calculation/Penalty.json
index 94d28d60ab..9a2831942d 100644
--- a/data/as/8206535/ws-services-calculation/Penalty.json
+++ b/data/as/8206535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206535/ws-services-calculation/WCBillingSlab.json b/data/as/8206535/ws-services-calculation/WCBillingSlab.json
index 58c3095b3e..d10888a1ae 100644
--- a/data/as/8206535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206542/ws-services-calculation/Penalty.json b/data/as/8206542/ws-services-calculation/Penalty.json
index 1cb97b5875..df3c91d5d7 100644
--- a/data/as/8206542/ws-services-calculation/Penalty.json
+++ b/data/as/8206542/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206542/ws-services-calculation/WCBillingSlab.json b/data/as/8206542/ws-services-calculation/WCBillingSlab.json
index 9e641ab573..6ed27ced6b 100644
--- a/data/as/8206542/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206542/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206547/ws-services-calculation/Penalty.json b/data/as/8206547/ws-services-calculation/Penalty.json
index 5846cd46dc..68ea3966ac 100644
--- a/data/as/8206547/ws-services-calculation/Penalty.json
+++ b/data/as/8206547/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206547/ws-services-calculation/WCBillingSlab.json b/data/as/8206547/ws-services-calculation/WCBillingSlab.json
index 5370c5ba98..d6842e4143 100644
--- a/data/as/8206547/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206547/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206554/ws-services-calculation/Penalty.json b/data/as/8206554/ws-services-calculation/Penalty.json
index 4bf3f5a8f0..6065ea5b71 100644
--- a/data/as/8206554/ws-services-calculation/Penalty.json
+++ b/data/as/8206554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206554/ws-services-calculation/WCBillingSlab.json b/data/as/8206554/ws-services-calculation/WCBillingSlab.json
index 9879f9cbc2..9132e4884c 100644
--- a/data/as/8206554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206558/ws-services-calculation/Penalty.json b/data/as/8206558/ws-services-calculation/Penalty.json
index 85109ab133..00d3d01890 100644
--- a/data/as/8206558/ws-services-calculation/Penalty.json
+++ b/data/as/8206558/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206558/ws-services-calculation/WCBillingSlab.json b/data/as/8206558/ws-services-calculation/WCBillingSlab.json
index 644bf08472..415435e94a 100644
--- a/data/as/8206558/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206558/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206789/ws-services-calculation/Penalty.json b/data/as/8206789/ws-services-calculation/Penalty.json
index 2a8ff09d4c..015dd7ede0 100644
--- a/data/as/8206789/ws-services-calculation/Penalty.json
+++ b/data/as/8206789/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206789/ws-services-calculation/WCBillingSlab.json b/data/as/8206789/ws-services-calculation/WCBillingSlab.json
index 49c7c45f08..b10dd44970 100644
--- a/data/as/8206789/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206789/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206800/ws-services-calculation/Penalty.json b/data/as/8206800/ws-services-calculation/Penalty.json
index 2bd2a3698e..9509d323b5 100644
--- a/data/as/8206800/ws-services-calculation/Penalty.json
+++ b/data/as/8206800/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206800/ws-services-calculation/WCBillingSlab.json b/data/as/8206800/ws-services-calculation/WCBillingSlab.json
index 4b4539537b..d867641ebc 100644
--- a/data/as/8206800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206800/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206811/ws-services-calculation/Penalty.json b/data/as/8206811/ws-services-calculation/Penalty.json
index a1d93f4696..7e0f9e4d47 100644
--- a/data/as/8206811/ws-services-calculation/Penalty.json
+++ b/data/as/8206811/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206811/ws-services-calculation/WCBillingSlab.json b/data/as/8206811/ws-services-calculation/WCBillingSlab.json
index 22c7164da9..c69b79ed46 100644
--- a/data/as/8206811/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206811/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206824/ws-services-calculation/Penalty.json b/data/as/8206824/ws-services-calculation/Penalty.json
index f1483cd364..514f128920 100644
--- a/data/as/8206824/ws-services-calculation/Penalty.json
+++ b/data/as/8206824/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206824/ws-services-calculation/WCBillingSlab.json b/data/as/8206824/ws-services-calculation/WCBillingSlab.json
index 056e34853f..99cedbf653 100644
--- a/data/as/8206824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206824/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206834/ws-services-calculation/Penalty.json b/data/as/8206834/ws-services-calculation/Penalty.json
index ca1c8b7cdb..3b3b7b3325 100644
--- a/data/as/8206834/ws-services-calculation/Penalty.json
+++ b/data/as/8206834/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206834/ws-services-calculation/WCBillingSlab.json b/data/as/8206834/ws-services-calculation/WCBillingSlab.json
index a79ec3c67b..ac32e87ed6 100644
--- a/data/as/8206834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206834/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8206851/ws-services-calculation/Penalty.json b/data/as/8206851/ws-services-calculation/Penalty.json
index a82b7dd906..5010f1c927 100644
--- a/data/as/8206851/ws-services-calculation/Penalty.json
+++ b/data/as/8206851/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206851/ws-services-calculation/WCBillingSlab.json b/data/as/8206851/ws-services-calculation/WCBillingSlab.json
index 3af12a3aaf..2551228b85 100644
--- a/data/as/8206851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206851/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215102/ws-services-calculation/Penalty.json b/data/as/8215102/ws-services-calculation/Penalty.json
index d6be2d173a..144c1a2734 100644
--- a/data/as/8215102/ws-services-calculation/Penalty.json
+++ b/data/as/8215102/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215102/ws-services-calculation/WCBillingSlab.json b/data/as/8215102/ws-services-calculation/WCBillingSlab.json
index b72e272a73..485e658725 100644
--- a/data/as/8215102/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215102/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215107/ws-services-calculation/Penalty.json b/data/as/8215107/ws-services-calculation/Penalty.json
index 28abac825b..e24dd8de9a 100644
--- a/data/as/8215107/ws-services-calculation/Penalty.json
+++ b/data/as/8215107/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215107/ws-services-calculation/WCBillingSlab.json b/data/as/8215107/ws-services-calculation/WCBillingSlab.json
index 55278341a1..77c00d2043 100644
--- a/data/as/8215107/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215107/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215197/ws-services-calculation/Penalty.json b/data/as/8215197/ws-services-calculation/Penalty.json
index 4f2b1ca66c..9b969d0d07 100644
--- a/data/as/8215197/ws-services-calculation/Penalty.json
+++ b/data/as/8215197/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215197/ws-services-calculation/WCBillingSlab.json b/data/as/8215197/ws-services-calculation/WCBillingSlab.json
index 0b49d90af6..d72a7bc600 100644
--- a/data/as/8215197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215197/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215261/ws-services-calculation/Penalty.json b/data/as/8215261/ws-services-calculation/Penalty.json
index 6d8b98a0d5..790d77d978 100644
--- a/data/as/8215261/ws-services-calculation/Penalty.json
+++ b/data/as/8215261/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215261/ws-services-calculation/WCBillingSlab.json b/data/as/8215261/ws-services-calculation/WCBillingSlab.json
index 538798eb78..a7da33e0b7 100644
--- a/data/as/8215261/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215261/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215283/ws-services-calculation/Penalty.json b/data/as/8215283/ws-services-calculation/Penalty.json
index 959031197a..51def436c6 100644
--- a/data/as/8215283/ws-services-calculation/Penalty.json
+++ b/data/as/8215283/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215283/ws-services-calculation/WCBillingSlab.json b/data/as/8215283/ws-services-calculation/WCBillingSlab.json
index fe3908e820..81cab1bb2a 100644
--- a/data/as/8215283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215283/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215285/ws-services-calculation/Penalty.json b/data/as/8215285/ws-services-calculation/Penalty.json
index 402243f82e..e96f5d26ad 100644
--- a/data/as/8215285/ws-services-calculation/Penalty.json
+++ b/data/as/8215285/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215285/ws-services-calculation/WCBillingSlab.json b/data/as/8215285/ws-services-calculation/WCBillingSlab.json
index decaca1d11..4affd12b03 100644
--- a/data/as/8215285/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215285/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215403/ws-services-calculation/Penalty.json b/data/as/8215403/ws-services-calculation/Penalty.json
index c74bc5d333..4428e2bb65 100644
--- a/data/as/8215403/ws-services-calculation/Penalty.json
+++ b/data/as/8215403/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215403/ws-services-calculation/WCBillingSlab.json b/data/as/8215403/ws-services-calculation/WCBillingSlab.json
index e331257b32..e6689cd8ad 100644
--- a/data/as/8215403/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215403/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215406/ws-services-calculation/Penalty.json b/data/as/8215406/ws-services-calculation/Penalty.json
index a98d14c73c..6b3ceebbef 100644
--- a/data/as/8215406/ws-services-calculation/Penalty.json
+++ b/data/as/8215406/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215406/ws-services-calculation/WCBillingSlab.json b/data/as/8215406/ws-services-calculation/WCBillingSlab.json
index e80e3300cb..d3a8b1460d 100644
--- a/data/as/8215406/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215406/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215411/ws-services-calculation/Penalty.json b/data/as/8215411/ws-services-calculation/Penalty.json
index 54e71e0c59..658014c12a 100644
--- a/data/as/8215411/ws-services-calculation/Penalty.json
+++ b/data/as/8215411/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215411/ws-services-calculation/WCBillingSlab.json b/data/as/8215411/ws-services-calculation/WCBillingSlab.json
index 93b90f47c3..79290f3f21 100644
--- a/data/as/8215411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215411/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215655/ws-services-calculation/Penalty.json b/data/as/8215655/ws-services-calculation/Penalty.json
index 8a2c0df2c5..bfcab90570 100644
--- a/data/as/8215655/ws-services-calculation/Penalty.json
+++ b/data/as/8215655/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215655/ws-services-calculation/WCBillingSlab.json b/data/as/8215655/ws-services-calculation/WCBillingSlab.json
index 90b8990985..928e79d1d1 100644
--- a/data/as/8215655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215655/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215753/ws-services-calculation/Penalty.json b/data/as/8215753/ws-services-calculation/Penalty.json
index 905dc0202d..6f6b86bdf7 100644
--- a/data/as/8215753/ws-services-calculation/Penalty.json
+++ b/data/as/8215753/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215753/ws-services-calculation/WCBillingSlab.json b/data/as/8215753/ws-services-calculation/WCBillingSlab.json
index 1a4d31858a..ca44b25285 100644
--- a/data/as/8215753/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215753/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215757/ws-services-calculation/Penalty.json b/data/as/8215757/ws-services-calculation/Penalty.json
index 62349b2470..3b07772245 100644
--- a/data/as/8215757/ws-services-calculation/Penalty.json
+++ b/data/as/8215757/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215757/ws-services-calculation/WCBillingSlab.json b/data/as/8215757/ws-services-calculation/WCBillingSlab.json
index 908991829e..0b0c83291f 100644
--- a/data/as/8215757/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215757/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215759/ws-services-calculation/Penalty.json b/data/as/8215759/ws-services-calculation/Penalty.json
index d20224e37d..396f66576d 100644
--- a/data/as/8215759/ws-services-calculation/Penalty.json
+++ b/data/as/8215759/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215759/ws-services-calculation/WCBillingSlab.json b/data/as/8215759/ws-services-calculation/WCBillingSlab.json
index 1f8b4bbd8f..0f1c52e9d7 100644
--- a/data/as/8215759/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215759/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215762/ws-services-calculation/Penalty.json b/data/as/8215762/ws-services-calculation/Penalty.json
index d1506f2c00..211b7a14f6 100644
--- a/data/as/8215762/ws-services-calculation/Penalty.json
+++ b/data/as/8215762/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215762/ws-services-calculation/WCBillingSlab.json b/data/as/8215762/ws-services-calculation/WCBillingSlab.json
index 269ab71c4c..5b4c9e6460 100644
--- a/data/as/8215762/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215762/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215767/ws-services-calculation/Penalty.json b/data/as/8215767/ws-services-calculation/Penalty.json
index 0a12749760..d1531c3097 100644
--- a/data/as/8215767/ws-services-calculation/Penalty.json
+++ b/data/as/8215767/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215767/ws-services-calculation/WCBillingSlab.json b/data/as/8215767/ws-services-calculation/WCBillingSlab.json
index 6aff71e75a..5e84d3553d 100644
--- a/data/as/8215767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215767/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215769/ws-services-calculation/Penalty.json b/data/as/8215769/ws-services-calculation/Penalty.json
index 13e95a3b1f..e3cd5f5edb 100644
--- a/data/as/8215769/ws-services-calculation/Penalty.json
+++ b/data/as/8215769/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215769/ws-services-calculation/WCBillingSlab.json b/data/as/8215769/ws-services-calculation/WCBillingSlab.json
index cbe41a7f4e..eff305e1c4 100644
--- a/data/as/8215769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215769/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8215771/ws-services-calculation/Penalty.json b/data/as/8215771/ws-services-calculation/Penalty.json
index 513745a6d7..905de8c81b 100644
--- a/data/as/8215771/ws-services-calculation/Penalty.json
+++ b/data/as/8215771/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215771/ws-services-calculation/WCBillingSlab.json b/data/as/8215771/ws-services-calculation/WCBillingSlab.json
index cea59e1365..70df52602e 100644
--- a/data/as/8215771/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215771/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8218304/ws-services-calculation/Penalty.json b/data/as/8218304/ws-services-calculation/Penalty.json
index ea3ece6737..37f1320c4a 100644
--- a/data/as/8218304/ws-services-calculation/Penalty.json
+++ b/data/as/8218304/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218304/ws-services-calculation/WCBillingSlab.json b/data/as/8218304/ws-services-calculation/WCBillingSlab.json
index a1e91067b7..eff54c07f8 100644
--- a/data/as/8218304/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218304/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8218315/ws-services-calculation/Penalty.json b/data/as/8218315/ws-services-calculation/Penalty.json
index afa56f34ed..2b4ae329c0 100644
--- a/data/as/8218315/ws-services-calculation/Penalty.json
+++ b/data/as/8218315/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218315/ws-services-calculation/WCBillingSlab.json b/data/as/8218315/ws-services-calculation/WCBillingSlab.json
index c7a88504e8..bb5afc0e63 100644
--- a/data/as/8218315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218315/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8218486/ws-services-calculation/Penalty.json b/data/as/8218486/ws-services-calculation/Penalty.json
index dbdda798fc..5ed98126fc 100644
--- a/data/as/8218486/ws-services-calculation/Penalty.json
+++ b/data/as/8218486/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218486/ws-services-calculation/WCBillingSlab.json b/data/as/8218486/ws-services-calculation/WCBillingSlab.json
index c0657edd3d..3c3655fa43 100644
--- a/data/as/8218486/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218486/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8218509/ws-services-calculation/Penalty.json b/data/as/8218509/ws-services-calculation/Penalty.json
index e9e0cee7ac..a982bcbb6e 100644
--- a/data/as/8218509/ws-services-calculation/Penalty.json
+++ b/data/as/8218509/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218509/ws-services-calculation/WCBillingSlab.json b/data/as/8218509/ws-services-calculation/WCBillingSlab.json
index cdb4f3e7ac..f2631ca295 100644
--- a/data/as/8218509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218509/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8218510/ws-services-calculation/Penalty.json b/data/as/8218510/ws-services-calculation/Penalty.json
index 3526326d1b..32a157828e 100644
--- a/data/as/8218510/ws-services-calculation/Penalty.json
+++ b/data/as/8218510/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218510/ws-services-calculation/WCBillingSlab.json b/data/as/8218510/ws-services-calculation/WCBillingSlab.json
index 9dad025112..666ffce94d 100644
--- a/data/as/8218510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218510/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222042/ws-services-calculation/Penalty.json b/data/as/8222042/ws-services-calculation/Penalty.json
index 82ef71bfa9..6482da5b8d 100644
--- a/data/as/8222042/ws-services-calculation/Penalty.json
+++ b/data/as/8222042/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222042/ws-services-calculation/WCBillingSlab.json b/data/as/8222042/ws-services-calculation/WCBillingSlab.json
index a6f965c117..6f9b7adaf2 100644
--- a/data/as/8222042/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222042/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222249/ws-services-calculation/Penalty.json b/data/as/8222249/ws-services-calculation/Penalty.json
index ee28dfb2d2..ec8ab4c134 100644
--- a/data/as/8222249/ws-services-calculation/Penalty.json
+++ b/data/as/8222249/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222249/ws-services-calculation/WCBillingSlab.json b/data/as/8222249/ws-services-calculation/WCBillingSlab.json
index a923876f36..853d884e67 100644
--- a/data/as/8222249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222249/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222264/ws-services-calculation/Penalty.json b/data/as/8222264/ws-services-calculation/Penalty.json
index de7bf0d99a..eee74f97d0 100644
--- a/data/as/8222264/ws-services-calculation/Penalty.json
+++ b/data/as/8222264/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222264/ws-services-calculation/WCBillingSlab.json b/data/as/8222264/ws-services-calculation/WCBillingSlab.json
index 380a1929be..9126b2391a 100644
--- a/data/as/8222264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222264/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222276/ws-services-calculation/Penalty.json b/data/as/8222276/ws-services-calculation/Penalty.json
index d42ca2f97c..0576a9809a 100644
--- a/data/as/8222276/ws-services-calculation/Penalty.json
+++ b/data/as/8222276/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222276/ws-services-calculation/WCBillingSlab.json b/data/as/8222276/ws-services-calculation/WCBillingSlab.json
index 883b4cc221..a3226d79cb 100644
--- a/data/as/8222276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222276/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222311/ws-services-calculation/Penalty.json b/data/as/8222311/ws-services-calculation/Penalty.json
index b1c3133141..e9649b8ca9 100644
--- a/data/as/8222311/ws-services-calculation/Penalty.json
+++ b/data/as/8222311/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222311/ws-services-calculation/WCBillingSlab.json b/data/as/8222311/ws-services-calculation/WCBillingSlab.json
index 48e5d6d346..1e7d0ba976 100644
--- a/data/as/8222311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222311/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222322/ws-services-calculation/Penalty.json b/data/as/8222322/ws-services-calculation/Penalty.json
index d71a944d09..a1713bcf18 100644
--- a/data/as/8222322/ws-services-calculation/Penalty.json
+++ b/data/as/8222322/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222322/ws-services-calculation/WCBillingSlab.json b/data/as/8222322/ws-services-calculation/WCBillingSlab.json
index a40c2cb448..5fbf2eeb6e 100644
--- a/data/as/8222322/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222322/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222342/ws-services-calculation/Penalty.json b/data/as/8222342/ws-services-calculation/Penalty.json
index 44a4f63662..781057e72f 100644
--- a/data/as/8222342/ws-services-calculation/Penalty.json
+++ b/data/as/8222342/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222342/ws-services-calculation/WCBillingSlab.json b/data/as/8222342/ws-services-calculation/WCBillingSlab.json
index dbeba431b2..cc80ba68d8 100644
--- a/data/as/8222342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222342/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222348/ws-services-calculation/Penalty.json b/data/as/8222348/ws-services-calculation/Penalty.json
index 6873d66566..481f642c7c 100644
--- a/data/as/8222348/ws-services-calculation/Penalty.json
+++ b/data/as/8222348/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222348/ws-services-calculation/WCBillingSlab.json b/data/as/8222348/ws-services-calculation/WCBillingSlab.json
index b831ead85a..8c3208e0fd 100644
--- a/data/as/8222348/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222348/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222352/ws-services-calculation/Penalty.json b/data/as/8222352/ws-services-calculation/Penalty.json
index a4ef821396..a36f3f6bf2 100644
--- a/data/as/8222352/ws-services-calculation/Penalty.json
+++ b/data/as/8222352/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222352/ws-services-calculation/WCBillingSlab.json b/data/as/8222352/ws-services-calculation/WCBillingSlab.json
index ea037c0fb2..99aefbdd6b 100644
--- a/data/as/8222352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222352/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222366/ws-services-calculation/Penalty.json b/data/as/8222366/ws-services-calculation/Penalty.json
index bc7aa215a2..5aacee0ac7 100644
--- a/data/as/8222366/ws-services-calculation/Penalty.json
+++ b/data/as/8222366/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222366/ws-services-calculation/WCBillingSlab.json b/data/as/8222366/ws-services-calculation/WCBillingSlab.json
index e4e81928a4..00c8ef60c2 100644
--- a/data/as/8222366/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222366/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8222386/ws-services-calculation/Penalty.json b/data/as/8222386/ws-services-calculation/Penalty.json
index 3141a4e945..62480a6075 100644
--- a/data/as/8222386/ws-services-calculation/Penalty.json
+++ b/data/as/8222386/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222386/ws-services-calculation/WCBillingSlab.json b/data/as/8222386/ws-services-calculation/WCBillingSlab.json
index c8df48e17e..f9a8d90f56 100644
--- a/data/as/8222386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222386/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8227638/ws-services-calculation/Penalty.json b/data/as/8227638/ws-services-calculation/Penalty.json
index 741268a072..6e57d20f79 100644
--- a/data/as/8227638/ws-services-calculation/Penalty.json
+++ b/data/as/8227638/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8227638/ws-services-calculation/WCBillingSlab.json b/data/as/8227638/ws-services-calculation/WCBillingSlab.json
index 7d1f8b7c0d..93d67d1a2d 100644
--- a/data/as/8227638/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8227638/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8228162/ws-services-calculation/Penalty.json b/data/as/8228162/ws-services-calculation/Penalty.json
index abb4560958..137e0e7760 100644
--- a/data/as/8228162/ws-services-calculation/Penalty.json
+++ b/data/as/8228162/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228162/ws-services-calculation/WCBillingSlab.json b/data/as/8228162/ws-services-calculation/WCBillingSlab.json
index 4d102b0398..af7445045f 100644
--- a/data/as/8228162/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228162/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8228342/ws-services-calculation/Penalty.json b/data/as/8228342/ws-services-calculation/Penalty.json
index 26e80cb19c..832f78f225 100644
--- a/data/as/8228342/ws-services-calculation/Penalty.json
+++ b/data/as/8228342/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228342/ws-services-calculation/WCBillingSlab.json b/data/as/8228342/ws-services-calculation/WCBillingSlab.json
index bf820bffcc..92fdfc7953 100644
--- a/data/as/8228342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228342/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8228352/ws-services-calculation/Penalty.json b/data/as/8228352/ws-services-calculation/Penalty.json
index c65fa49bd4..774de553f9 100644
--- a/data/as/8228352/ws-services-calculation/Penalty.json
+++ b/data/as/8228352/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228352/ws-services-calculation/WCBillingSlab.json b/data/as/8228352/ws-services-calculation/WCBillingSlab.json
index 104fcf62e8..a7886195d9 100644
--- a/data/as/8228352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228352/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8228831/ws-services-calculation/Penalty.json b/data/as/8228831/ws-services-calculation/Penalty.json
index 8b5b8614d0..b86f77b401 100644
--- a/data/as/8228831/ws-services-calculation/Penalty.json
+++ b/data/as/8228831/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228831/ws-services-calculation/WCBillingSlab.json b/data/as/8228831/ws-services-calculation/WCBillingSlab.json
index a2b0b46a95..d46c38a856 100644
--- a/data/as/8228831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228831/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8228832/ws-services-calculation/Penalty.json b/data/as/8228832/ws-services-calculation/Penalty.json
index 616403247e..1ec7635734 100644
--- a/data/as/8228832/ws-services-calculation/Penalty.json
+++ b/data/as/8228832/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228832/ws-services-calculation/WCBillingSlab.json b/data/as/8228832/ws-services-calculation/WCBillingSlab.json
index e28df7898e..4d0def9271 100644
--- a/data/as/8228832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228832/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8230806/ws-services-calculation/Penalty.json b/data/as/8230806/ws-services-calculation/Penalty.json
index cab61aa7c8..b44456831b 100644
--- a/data/as/8230806/ws-services-calculation/Penalty.json
+++ b/data/as/8230806/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8230806/ws-services-calculation/WCBillingSlab.json b/data/as/8230806/ws-services-calculation/WCBillingSlab.json
index 0125b4b8e0..0a78d7c916 100644
--- a/data/as/8230806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8230806/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8234493/ws-services-calculation/Penalty.json b/data/as/8234493/ws-services-calculation/Penalty.json
index 7c9f33c0cc..328832104c 100644
--- a/data/as/8234493/ws-services-calculation/Penalty.json
+++ b/data/as/8234493/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8234493/ws-services-calculation/WCBillingSlab.json b/data/as/8234493/ws-services-calculation/WCBillingSlab.json
index 8b1107f5b6..00aa68171c 100644
--- a/data/as/8234493/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8234493/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8234543/ws-services-calculation/Penalty.json b/data/as/8234543/ws-services-calculation/Penalty.json
index cf62eb0295..208a92f5b5 100644
--- a/data/as/8234543/ws-services-calculation/Penalty.json
+++ b/data/as/8234543/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8234543/ws-services-calculation/WCBillingSlab.json b/data/as/8234543/ws-services-calculation/WCBillingSlab.json
index e1d363f1db..61da3cb276 100644
--- a/data/as/8234543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8234543/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8234577/ws-services-calculation/Penalty.json b/data/as/8234577/ws-services-calculation/Penalty.json
index 647a7cbd56..2707bd6daf 100644
--- a/data/as/8234577/ws-services-calculation/Penalty.json
+++ b/data/as/8234577/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8234577/ws-services-calculation/WCBillingSlab.json b/data/as/8234577/ws-services-calculation/WCBillingSlab.json
index 8da08433b1..06491211ac 100644
--- a/data/as/8234577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8234577/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235302/ws-services-calculation/Penalty.json b/data/as/8235302/ws-services-calculation/Penalty.json
index d87dfdc61e..61ec17532f 100644
--- a/data/as/8235302/ws-services-calculation/Penalty.json
+++ b/data/as/8235302/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235302/ws-services-calculation/WCBillingSlab.json b/data/as/8235302/ws-services-calculation/WCBillingSlab.json
index 8a0bbedaa0..3029289973 100644
--- a/data/as/8235302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235302/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235314/ws-services-calculation/Penalty.json b/data/as/8235314/ws-services-calculation/Penalty.json
index 132f31cf81..2b176cf634 100644
--- a/data/as/8235314/ws-services-calculation/Penalty.json
+++ b/data/as/8235314/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235314/ws-services-calculation/WCBillingSlab.json b/data/as/8235314/ws-services-calculation/WCBillingSlab.json
index f23a05a96e..b46ed6fdb1 100644
--- a/data/as/8235314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235314/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235328/ws-services-calculation/Penalty.json b/data/as/8235328/ws-services-calculation/Penalty.json
index c5b95bbc92..0c0bfdafbd 100644
--- a/data/as/8235328/ws-services-calculation/Penalty.json
+++ b/data/as/8235328/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235328/ws-services-calculation/WCBillingSlab.json b/data/as/8235328/ws-services-calculation/WCBillingSlab.json
index 883842d344..48ae45b844 100644
--- a/data/as/8235328/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235328/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235338/ws-services-calculation/Penalty.json b/data/as/8235338/ws-services-calculation/Penalty.json
index 6fa653a662..ff7ca2bae3 100644
--- a/data/as/8235338/ws-services-calculation/Penalty.json
+++ b/data/as/8235338/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235338/ws-services-calculation/WCBillingSlab.json b/data/as/8235338/ws-services-calculation/WCBillingSlab.json
index 21463ba89e..603eab0825 100644
--- a/data/as/8235338/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235338/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235347/ws-services-calculation/Penalty.json b/data/as/8235347/ws-services-calculation/Penalty.json
index 44e17fc863..7c93f07147 100644
--- a/data/as/8235347/ws-services-calculation/Penalty.json
+++ b/data/as/8235347/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235347/ws-services-calculation/WCBillingSlab.json b/data/as/8235347/ws-services-calculation/WCBillingSlab.json
index fba37f36ac..ebe8bb8e25 100644
--- a/data/as/8235347/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235347/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235358/ws-services-calculation/Penalty.json b/data/as/8235358/ws-services-calculation/Penalty.json
index 96e2d2a290..8aeed9a402 100644
--- a/data/as/8235358/ws-services-calculation/Penalty.json
+++ b/data/as/8235358/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235358/ws-services-calculation/WCBillingSlab.json b/data/as/8235358/ws-services-calculation/WCBillingSlab.json
index 0ac7b73cb3..dc90e63178 100644
--- a/data/as/8235358/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235358/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235371/ws-services-calculation/Penalty.json b/data/as/8235371/ws-services-calculation/Penalty.json
index 11eaf6bf41..a8adb351b0 100644
--- a/data/as/8235371/ws-services-calculation/Penalty.json
+++ b/data/as/8235371/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235371/ws-services-calculation/WCBillingSlab.json b/data/as/8235371/ws-services-calculation/WCBillingSlab.json
index 28fae1c0d2..1904899615 100644
--- a/data/as/8235371/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235371/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235387/ws-services-calculation/Penalty.json b/data/as/8235387/ws-services-calculation/Penalty.json
index eb39b080fd..c6b5a89841 100644
--- a/data/as/8235387/ws-services-calculation/Penalty.json
+++ b/data/as/8235387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235387/ws-services-calculation/WCBillingSlab.json b/data/as/8235387/ws-services-calculation/WCBillingSlab.json
index a378f931ce..59cdbca612 100644
--- a/data/as/8235387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235394/ws-services-calculation/Penalty.json b/data/as/8235394/ws-services-calculation/Penalty.json
index 37b45edb4b..38feb3c5b5 100644
--- a/data/as/8235394/ws-services-calculation/Penalty.json
+++ b/data/as/8235394/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235394/ws-services-calculation/WCBillingSlab.json b/data/as/8235394/ws-services-calculation/WCBillingSlab.json
index b77a82c605..c0aefe4ffe 100644
--- a/data/as/8235394/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235394/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235405/ws-services-calculation/Penalty.json b/data/as/8235405/ws-services-calculation/Penalty.json
index 33768979e5..84bfd9b019 100644
--- a/data/as/8235405/ws-services-calculation/Penalty.json
+++ b/data/as/8235405/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235405/ws-services-calculation/WCBillingSlab.json b/data/as/8235405/ws-services-calculation/WCBillingSlab.json
index 306e010e56..85f72c7167 100644
--- a/data/as/8235405/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235405/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235411/ws-services-calculation/Penalty.json b/data/as/8235411/ws-services-calculation/Penalty.json
index 34a1e28f52..5ae913a089 100644
--- a/data/as/8235411/ws-services-calculation/Penalty.json
+++ b/data/as/8235411/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235411/ws-services-calculation/WCBillingSlab.json b/data/as/8235411/ws-services-calculation/WCBillingSlab.json
index de14f6c2ee..7fa2327666 100644
--- a/data/as/8235411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235411/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235421/ws-services-calculation/Penalty.json b/data/as/8235421/ws-services-calculation/Penalty.json
index d416247396..51bbd5dbfb 100644
--- a/data/as/8235421/ws-services-calculation/Penalty.json
+++ b/data/as/8235421/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235421/ws-services-calculation/WCBillingSlab.json b/data/as/8235421/ws-services-calculation/WCBillingSlab.json
index 4b0edec4e8..634068b678 100644
--- a/data/as/8235421/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235421/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8235807/ws-services-calculation/Penalty.json b/data/as/8235807/ws-services-calculation/Penalty.json
index 7ff131da58..07ce33af57 100644
--- a/data/as/8235807/ws-services-calculation/Penalty.json
+++ b/data/as/8235807/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235807/ws-services-calculation/WCBillingSlab.json b/data/as/8235807/ws-services-calculation/WCBillingSlab.json
index 207c0bc295..e40b28f663 100644
--- a/data/as/8235807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235807/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237353/ws-services-calculation/Penalty.json b/data/as/8237353/ws-services-calculation/Penalty.json
index 739f4aaaa8..ef03ae2fa1 100644
--- a/data/as/8237353/ws-services-calculation/Penalty.json
+++ b/data/as/8237353/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237353/ws-services-calculation/WCBillingSlab.json b/data/as/8237353/ws-services-calculation/WCBillingSlab.json
index c07c3a1d41..80a2749964 100644
--- a/data/as/8237353/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237353/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237367/ws-services-calculation/Penalty.json b/data/as/8237367/ws-services-calculation/Penalty.json
index 10ebfdbf91..70fefff978 100644
--- a/data/as/8237367/ws-services-calculation/Penalty.json
+++ b/data/as/8237367/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237367/ws-services-calculation/WCBillingSlab.json b/data/as/8237367/ws-services-calculation/WCBillingSlab.json
index 5f96ee3525..bfe899bed7 100644
--- a/data/as/8237367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237367/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237390/ws-services-calculation/Penalty.json b/data/as/8237390/ws-services-calculation/Penalty.json
index 2c7209c61d..6bce43d4c4 100644
--- a/data/as/8237390/ws-services-calculation/Penalty.json
+++ b/data/as/8237390/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237390/ws-services-calculation/WCBillingSlab.json b/data/as/8237390/ws-services-calculation/WCBillingSlab.json
index f0c9022c6a..00b91c2db5 100644
--- a/data/as/8237390/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237390/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237435/ws-services-calculation/Penalty.json b/data/as/8237435/ws-services-calculation/Penalty.json
index 5c6525e35b..169268150d 100644
--- a/data/as/8237435/ws-services-calculation/Penalty.json
+++ b/data/as/8237435/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237435/ws-services-calculation/WCBillingSlab.json b/data/as/8237435/ws-services-calculation/WCBillingSlab.json
index 901fd7edf9..abdde5b7de 100644
--- a/data/as/8237435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237435/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237444/ws-services-calculation/Penalty.json b/data/as/8237444/ws-services-calculation/Penalty.json
index 5dbcba908a..c1aa606f4a 100644
--- a/data/as/8237444/ws-services-calculation/Penalty.json
+++ b/data/as/8237444/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237444/ws-services-calculation/WCBillingSlab.json b/data/as/8237444/ws-services-calculation/WCBillingSlab.json
index b4e366b5a8..0931f41411 100644
--- a/data/as/8237444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237444/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237467/ws-services-calculation/Penalty.json b/data/as/8237467/ws-services-calculation/Penalty.json
index 7b41668662..08c20ee65b 100644
--- a/data/as/8237467/ws-services-calculation/Penalty.json
+++ b/data/as/8237467/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237467/ws-services-calculation/WCBillingSlab.json b/data/as/8237467/ws-services-calculation/WCBillingSlab.json
index b7092a8988..c24529d021 100644
--- a/data/as/8237467/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237467/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237495/ws-services-calculation/Penalty.json b/data/as/8237495/ws-services-calculation/Penalty.json
index dcd9d989d8..a53867feb1 100644
--- a/data/as/8237495/ws-services-calculation/Penalty.json
+++ b/data/as/8237495/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237495/ws-services-calculation/WCBillingSlab.json b/data/as/8237495/ws-services-calculation/WCBillingSlab.json
index 42e3f2483a..e47538675c 100644
--- a/data/as/8237495/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237495/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237534/ws-services-calculation/Penalty.json b/data/as/8237534/ws-services-calculation/Penalty.json
index 3861b82ed5..db463f650d 100644
--- a/data/as/8237534/ws-services-calculation/Penalty.json
+++ b/data/as/8237534/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237534/ws-services-calculation/WCBillingSlab.json b/data/as/8237534/ws-services-calculation/WCBillingSlab.json
index 2ad79d5b65..6e3a809ff1 100644
--- a/data/as/8237534/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237534/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237554/ws-services-calculation/Penalty.json b/data/as/8237554/ws-services-calculation/Penalty.json
index 906f2edbc7..e6cc6442ff 100644
--- a/data/as/8237554/ws-services-calculation/Penalty.json
+++ b/data/as/8237554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237554/ws-services-calculation/WCBillingSlab.json b/data/as/8237554/ws-services-calculation/WCBillingSlab.json
index 2defaa471f..cc5f10367c 100644
--- a/data/as/8237554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237581/ws-services-calculation/Penalty.json b/data/as/8237581/ws-services-calculation/Penalty.json
index 5defe1bdd6..b13e0d5fc7 100644
--- a/data/as/8237581/ws-services-calculation/Penalty.json
+++ b/data/as/8237581/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237581/ws-services-calculation/WCBillingSlab.json b/data/as/8237581/ws-services-calculation/WCBillingSlab.json
index 2b6fcfd08c..b8e9012109 100644
--- a/data/as/8237581/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237581/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237588/ws-services-calculation/Penalty.json b/data/as/8237588/ws-services-calculation/Penalty.json
index d484272c82..77ecbb351d 100644
--- a/data/as/8237588/ws-services-calculation/Penalty.json
+++ b/data/as/8237588/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237588/ws-services-calculation/WCBillingSlab.json b/data/as/8237588/ws-services-calculation/WCBillingSlab.json
index e0ca6147cd..29124f5fc9 100644
--- a/data/as/8237588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237588/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237606/ws-services-calculation/Penalty.json b/data/as/8237606/ws-services-calculation/Penalty.json
index fdf9c6d44c..fb37377ab5 100644
--- a/data/as/8237606/ws-services-calculation/Penalty.json
+++ b/data/as/8237606/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237606/ws-services-calculation/WCBillingSlab.json b/data/as/8237606/ws-services-calculation/WCBillingSlab.json
index ccd1ba77b0..e8be286b30 100644
--- a/data/as/8237606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237606/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8237611/ws-services-calculation/Penalty.json b/data/as/8237611/ws-services-calculation/Penalty.json
index 8f6788f9a2..89bdff3a0a 100644
--- a/data/as/8237611/ws-services-calculation/Penalty.json
+++ b/data/as/8237611/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237611/ws-services-calculation/WCBillingSlab.json b/data/as/8237611/ws-services-calculation/WCBillingSlab.json
index 5b2c04a02e..d01a920553 100644
--- a/data/as/8237611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237611/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8239822/ws-services-calculation/Penalty.json b/data/as/8239822/ws-services-calculation/Penalty.json
index b99dafe194..3d6c45eb00 100644
--- a/data/as/8239822/ws-services-calculation/Penalty.json
+++ b/data/as/8239822/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8239822/ws-services-calculation/WCBillingSlab.json b/data/as/8239822/ws-services-calculation/WCBillingSlab.json
index f8c36911fc..ddbc58d4db 100644
--- a/data/as/8239822/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8239822/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8246724/ws-services-calculation/Penalty.json b/data/as/8246724/ws-services-calculation/Penalty.json
index 3ee91d2990..029bb455a8 100644
--- a/data/as/8246724/ws-services-calculation/Penalty.json
+++ b/data/as/8246724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8246724/ws-services-calculation/WCBillingSlab.json b/data/as/8246724/ws-services-calculation/WCBillingSlab.json
index df78e8b125..2d53c8cfdb 100644
--- a/data/as/8246724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8246724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8250038/ws-services-calculation/Penalty.json b/data/as/8250038/ws-services-calculation/Penalty.json
index b7ac64a697..b04e0a3ecb 100644
--- a/data/as/8250038/ws-services-calculation/Penalty.json
+++ b/data/as/8250038/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8250038/ws-services-calculation/WCBillingSlab.json b/data/as/8250038/ws-services-calculation/WCBillingSlab.json
index 42964db112..89bbc42d4c 100644
--- a/data/as/8250038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8250038/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8250626/ws-services-calculation/Penalty.json b/data/as/8250626/ws-services-calculation/Penalty.json
index 5350ef119a..335469b6e6 100644
--- a/data/as/8250626/ws-services-calculation/Penalty.json
+++ b/data/as/8250626/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8250626/ws-services-calculation/WCBillingSlab.json b/data/as/8250626/ws-services-calculation/WCBillingSlab.json
index af60daa003..3f943ac6ad 100644
--- a/data/as/8250626/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8250626/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8252919/ws-services-calculation/Penalty.json b/data/as/8252919/ws-services-calculation/Penalty.json
index 59b50dbd83..8594cfeca3 100644
--- a/data/as/8252919/ws-services-calculation/Penalty.json
+++ b/data/as/8252919/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8252919/ws-services-calculation/WCBillingSlab.json b/data/as/8252919/ws-services-calculation/WCBillingSlab.json
index 58a61dae15..d263df429e 100644
--- a/data/as/8252919/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8252919/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8255134/ws-services-calculation/Penalty.json b/data/as/8255134/ws-services-calculation/Penalty.json
index 723391d45b..621992dbbd 100644
--- a/data/as/8255134/ws-services-calculation/Penalty.json
+++ b/data/as/8255134/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8255134/ws-services-calculation/WCBillingSlab.json b/data/as/8255134/ws-services-calculation/WCBillingSlab.json
index 512d3935d6..dea3ed4b6d 100644
--- a/data/as/8255134/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8255134/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8257091/ws-services-calculation/Penalty.json b/data/as/8257091/ws-services-calculation/Penalty.json
index ab3b543d79..16293ebb93 100644
--- a/data/as/8257091/ws-services-calculation/Penalty.json
+++ b/data/as/8257091/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8257091/ws-services-calculation/WCBillingSlab.json b/data/as/8257091/ws-services-calculation/WCBillingSlab.json
index 223f168a6a..806419931a 100644
--- a/data/as/8257091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8257091/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8261500/ws-services-calculation/Penalty.json b/data/as/8261500/ws-services-calculation/Penalty.json
index 7a830e2e41..c723564a67 100644
--- a/data/as/8261500/ws-services-calculation/Penalty.json
+++ b/data/as/8261500/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8261500/ws-services-calculation/WCBillingSlab.json b/data/as/8261500/ws-services-calculation/WCBillingSlab.json
index f670313a11..004f58cdea 100644
--- a/data/as/8261500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8261500/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8261877/ws-services-calculation/Penalty.json b/data/as/8261877/ws-services-calculation/Penalty.json
index f138ab2f9e..6962b2a1f1 100644
--- a/data/as/8261877/ws-services-calculation/Penalty.json
+++ b/data/as/8261877/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8261877/ws-services-calculation/WCBillingSlab.json b/data/as/8261877/ws-services-calculation/WCBillingSlab.json
index 4022fdd79d..ae6a6f24fd 100644
--- a/data/as/8261877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8261877/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8261995/ws-services-calculation/Penalty.json b/data/as/8261995/ws-services-calculation/Penalty.json
index af621f5a96..8f5cab7439 100644
--- a/data/as/8261995/ws-services-calculation/Penalty.json
+++ b/data/as/8261995/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8261995/ws-services-calculation/WCBillingSlab.json b/data/as/8261995/ws-services-calculation/WCBillingSlab.json
index 1457c7656e..3dc5a2362e 100644
--- a/data/as/8261995/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8261995/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8264422/ws-services-calculation/Penalty.json b/data/as/8264422/ws-services-calculation/Penalty.json
index a9a6ee0ddc..11d0d827ba 100644
--- a/data/as/8264422/ws-services-calculation/Penalty.json
+++ b/data/as/8264422/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8264422/ws-services-calculation/WCBillingSlab.json b/data/as/8264422/ws-services-calculation/WCBillingSlab.json
index 6fe523efd3..9e70c316d8 100644
--- a/data/as/8264422/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8264422/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8265409/ws-services-calculation/Penalty.json b/data/as/8265409/ws-services-calculation/Penalty.json
index 37706d0bfa..f6d45e4e64 100644
--- a/data/as/8265409/ws-services-calculation/Penalty.json
+++ b/data/as/8265409/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8265409/ws-services-calculation/WCBillingSlab.json b/data/as/8265409/ws-services-calculation/WCBillingSlab.json
index 9d0363a3e2..b92fa75052 100644
--- a/data/as/8265409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8265409/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8266441/ws-services-calculation/Penalty.json b/data/as/8266441/ws-services-calculation/Penalty.json
index 6f546f4924..9d1fec3737 100644
--- a/data/as/8266441/ws-services-calculation/Penalty.json
+++ b/data/as/8266441/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8266441/ws-services-calculation/WCBillingSlab.json b/data/as/8266441/ws-services-calculation/WCBillingSlab.json
index 96f9b99462..0a339b4403 100644
--- a/data/as/8266441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8266441/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8273083/ws-services-calculation/Penalty.json b/data/as/8273083/ws-services-calculation/Penalty.json
index 47750404ae..18cc51eb55 100644
--- a/data/as/8273083/ws-services-calculation/Penalty.json
+++ b/data/as/8273083/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8273083/ws-services-calculation/WCBillingSlab.json b/data/as/8273083/ws-services-calculation/WCBillingSlab.json
index b09b933498..e3654d7be9 100644
--- a/data/as/8273083/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8273083/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8279762/ws-services-calculation/Penalty.json b/data/as/8279762/ws-services-calculation/Penalty.json
index ce6730f28e..e533de5294 100644
--- a/data/as/8279762/ws-services-calculation/Penalty.json
+++ b/data/as/8279762/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8279762/ws-services-calculation/WCBillingSlab.json b/data/as/8279762/ws-services-calculation/WCBillingSlab.json
index e9a3d849f7..c2c7e3a5a8 100644
--- a/data/as/8279762/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8279762/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8286607/ws-services-calculation/Penalty.json b/data/as/8286607/ws-services-calculation/Penalty.json
index 102fc0ffa8..47705c3e94 100644
--- a/data/as/8286607/ws-services-calculation/Penalty.json
+++ b/data/as/8286607/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8286607/ws-services-calculation/WCBillingSlab.json b/data/as/8286607/ws-services-calculation/WCBillingSlab.json
index df36a563fb..6623b42c84 100644
--- a/data/as/8286607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8286607/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8298009/ws-services-calculation/Penalty.json b/data/as/8298009/ws-services-calculation/Penalty.json
index 994c585272..eebec1ea99 100644
--- a/data/as/8298009/ws-services-calculation/Penalty.json
+++ b/data/as/8298009/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8298009/ws-services-calculation/WCBillingSlab.json b/data/as/8298009/ws-services-calculation/WCBillingSlab.json
index ed2327658a..3d2e79283d 100644
--- a/data/as/8298009/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8298009/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8307469/ws-services-calculation/Penalty.json b/data/as/8307469/ws-services-calculation/Penalty.json
index d213e60a6a..8e2b5dd76f 100644
--- a/data/as/8307469/ws-services-calculation/Penalty.json
+++ b/data/as/8307469/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8307469/ws-services-calculation/WCBillingSlab.json b/data/as/8307469/ws-services-calculation/WCBillingSlab.json
index 323c4a8057..1142094b66 100644
--- a/data/as/8307469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8307469/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8310456/ws-services-calculation/Penalty.json b/data/as/8310456/ws-services-calculation/Penalty.json
index 237cb70a4e..97cfc11e97 100644
--- a/data/as/8310456/ws-services-calculation/Penalty.json
+++ b/data/as/8310456/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8310456/ws-services-calculation/WCBillingSlab.json b/data/as/8310456/ws-services-calculation/WCBillingSlab.json
index 13c8394169..dc6a55fc18 100644
--- a/data/as/8310456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8310456/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8312752/ws-services-calculation/Penalty.json b/data/as/8312752/ws-services-calculation/Penalty.json
index 3c37be9c8b..183e4c1056 100644
--- a/data/as/8312752/ws-services-calculation/Penalty.json
+++ b/data/as/8312752/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8312752/ws-services-calculation/WCBillingSlab.json b/data/as/8312752/ws-services-calculation/WCBillingSlab.json
index f5e90417ab..589d022267 100644
--- a/data/as/8312752/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8312752/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8320434/ws-services-calculation/Penalty.json b/data/as/8320434/ws-services-calculation/Penalty.json
index bbad2d4b3c..03e70ee1d0 100644
--- a/data/as/8320434/ws-services-calculation/Penalty.json
+++ b/data/as/8320434/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8320434/ws-services-calculation/WCBillingSlab.json b/data/as/8320434/ws-services-calculation/WCBillingSlab.json
index 3880c07768..0742390eef 100644
--- a/data/as/8320434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8320434/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8325212/ws-services-calculation/Penalty.json b/data/as/8325212/ws-services-calculation/Penalty.json
index e00fc36509..c45a49dd19 100644
--- a/data/as/8325212/ws-services-calculation/Penalty.json
+++ b/data/as/8325212/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8325212/ws-services-calculation/WCBillingSlab.json b/data/as/8325212/ws-services-calculation/WCBillingSlab.json
index a5691a338b..df4446dcd2 100644
--- a/data/as/8325212/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8325212/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8326277/ws-services-calculation/Penalty.json b/data/as/8326277/ws-services-calculation/Penalty.json
index 7f79a1abb6..1739b80452 100644
--- a/data/as/8326277/ws-services-calculation/Penalty.json
+++ b/data/as/8326277/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8326277/ws-services-calculation/WCBillingSlab.json b/data/as/8326277/ws-services-calculation/WCBillingSlab.json
index c31b20e9c0..896ae836b2 100644
--- a/data/as/8326277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8326277/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8326909/ws-services-calculation/Penalty.json b/data/as/8326909/ws-services-calculation/Penalty.json
index ee12f56c48..7dea421d8c 100644
--- a/data/as/8326909/ws-services-calculation/Penalty.json
+++ b/data/as/8326909/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8326909/ws-services-calculation/WCBillingSlab.json b/data/as/8326909/ws-services-calculation/WCBillingSlab.json
index ebaec66d4b..f4d5368d06 100644
--- a/data/as/8326909/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8326909/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/8365758/ws-services-calculation/Penalty.json b/data/as/8365758/ws-services-calculation/Penalty.json
index e1a0747271..d26965161a 100644
--- a/data/as/8365758/ws-services-calculation/Penalty.json
+++ b/data/as/8365758/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8365758/ws-services-calculation/WCBillingSlab.json b/data/as/8365758/ws-services-calculation/WCBillingSlab.json
index 1fbfb45aeb..135c3ff795 100644
--- a/data/as/8365758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8365758/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From 6aaea21b56d36a522ed1f01c57feffe80aedad8b Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 16:03:04 +0530
Subject: [PATCH 13/23] Updated folder wise data from 30016769 to 30060621

---
 data/as/30016769/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016769/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016773/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016773/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016776/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016776/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016777/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016777/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016779/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016779/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016893/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016893/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30016917/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30016917/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017080/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017080/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017213/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017213/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017259/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017259/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017426/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017426/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017520/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017520/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017697/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017697/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017715/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017715/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017720/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017720/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017735/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017735/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017892/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017892/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017895/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017895/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30017896/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30017896/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018185/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018185/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018227/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018227/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018243/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018243/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018312/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018312/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018441/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018441/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018712/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018712/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018720/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018720/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018721/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018721/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018738/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018738/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018741/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018741/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018824/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018824/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018921/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018921/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018935/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018935/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30018941/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30018941/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019121/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019121/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019130/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019130/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019135/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019135/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019139/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019139/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019144/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019144/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019151/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019151/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019154/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019154/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019163/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019163/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019166/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019166/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019168/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019168/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019170/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019170/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019171/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019171/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019173/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019173/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019266/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019266/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019465/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019465/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019506/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019506/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019535/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019535/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019544/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019544/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019572/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019572/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019680/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019680/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019686/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019686/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019793/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019793/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019799/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019799/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019826/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019826/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30019832/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30019832/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020076/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020076/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020201/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020201/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020202/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020202/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020369/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020369/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020383/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020383/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020502/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020502/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020637/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020637/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020760/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020760/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020766/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020766/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020777/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020777/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30020972/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30020972/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30021055/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30021055/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30021475/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30021475/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30021482/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30021482/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30021560/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30021560/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30021973/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30021973/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30021987/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30021987/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022258/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022258/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022299/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022299/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022418/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022418/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022523/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022523/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022537/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022537/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022693/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022693/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022702/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022702/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022721/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022721/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022760/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022760/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022777/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022777/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022787/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022787/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022800/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022800/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022816/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022816/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022851/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022851/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022854/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022854/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022858/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022858/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022862/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022862/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022947/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022947/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022975/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022975/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30022986/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30022986/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023075/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023075/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023147/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023147/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023196/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023196/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023283/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023283/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023298/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023298/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023308/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023308/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023317/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023317/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023324/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023324/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023337/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023337/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023347/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023347/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023360/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023360/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023708/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023708/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023894/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023894/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023984/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023984/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30023999/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30023999/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30027151/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30027151/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30027153/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30027153/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30027587/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30027587/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30027681/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30027681/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30030288/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30030288/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30030309/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30030309/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30030458/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30030458/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30031382/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30031382/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30033116/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30033116/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036349/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036349/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036685/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036685/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036696/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036696/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036706/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036706/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036712/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036712/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036747/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036747/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036796/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036796/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036799/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036799/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30036923/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30036923/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037050/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037050/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037052/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037052/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037053/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037053/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037055/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037055/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037056/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037056/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037057/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037057/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037058/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037058/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037282/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037282/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037284/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037284/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037287/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037287/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037289/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037289/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037516/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037516/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037943/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037943/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037947/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037947/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037948/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037948/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037949/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037949/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037950/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037950/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037951/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037951/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037952/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037952/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037953/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037953/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037954/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037954/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037955/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037955/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30037960/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30037960/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038014/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038014/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038150/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038150/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038176/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038176/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038197/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038197/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038633/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038633/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038634/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038634/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038636/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038636/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038738/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038738/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038913/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038913/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038945/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038945/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038960/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038960/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30038988/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30038988/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30039003/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30039003/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30039714/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30039714/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30039715/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30039715/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30039748/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30039748/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30040182/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30040182/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30040815/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30040815/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041202/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041202/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041203/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041203/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041386/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041386/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041849/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041849/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041850/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041850/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041853/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041853/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041854/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041854/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041859/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041859/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041866/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041866/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041873/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041873/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041886/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041886/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041901/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041901/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30041907/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30041907/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042788/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042788/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042793/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042793/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042799/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042799/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042803/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042803/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042807/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042807/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042812/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042812/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042816/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042816/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042819/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042819/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042954/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042954/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042955/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042955/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042957/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042957/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042959/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042959/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042961/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042961/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042963/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042963/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30042965/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30042965/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043298/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043298/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043311/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043311/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043314/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043314/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043321/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043321/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043327/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043327/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043330/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043330/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043335/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043335/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043343/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043343/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043349/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043349/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043358/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043358/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043557/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043557/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043601/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043601/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043606/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043606/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043782/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043782/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043797/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043797/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043820/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043820/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043846/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043846/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043851/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043851/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30043879/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30043879/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30044254/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30044254/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30044293/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30044293/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30044481/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30044481/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30044491/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30044491/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30045140/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30045140/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30045632/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30045632/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30045635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30045635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30046142/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30046142/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30046178/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30046178/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30046241/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30046241/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30046274/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30046274/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30046286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30046286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30046465/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30046465/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048127/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048127/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048267/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048267/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048408/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048408/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048644/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048644/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048673/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048673/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048680/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048680/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048696/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048696/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048776/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048776/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048965/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048965/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048987/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048987/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30048994/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30048994/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049004/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049004/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049048/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049048/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049049/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049049/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049050/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049050/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049081/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049081/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049228/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049228/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049262/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049262/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049278/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049278/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049299/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049299/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049604/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049604/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049608/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049608/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049610/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049610/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049624/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049624/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049625/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049625/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049629/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049629/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049631/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049631/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049632/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049632/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049922/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049922/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049941/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049941/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30049949/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30049949/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30050030/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30050030/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30050223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30050223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30050805/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30050805/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30050939/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30050939/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30050952/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30050952/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051014/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051014/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051018/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051018/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051021/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051021/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051023/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051023/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051099/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051099/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051263/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051263/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051272/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051272/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051276/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051276/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051373/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051373/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051391/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051391/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051400/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051400/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051407/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051407/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051492/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051492/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051495/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051495/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051497/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051497/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051501/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051501/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051507/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051507/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051529/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051529/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051562/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051562/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051569/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051569/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051624/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051624/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30051683/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30051683/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30052428/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30052428/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30052432/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30052432/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30052437/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30052437/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30052518/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30052518/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30052737/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30052737/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30052787/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30052787/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30053173/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30053173/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30053615/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30053615/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30053688/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30053688/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054045/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054045/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054048/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054048/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054057/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054057/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054383/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054383/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054393/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054393/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054598/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054598/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30054601/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30054601/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055210/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055210/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055216/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055216/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055275/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055275/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055680/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055680/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055696/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055696/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055718/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055718/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055724/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055724/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055929/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055929/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30055936/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30055936/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056016/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056016/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056027/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056027/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056041/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056041/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056050/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056050/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056072/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056072/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056080/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056080/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056087/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056087/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056104/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056104/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056141/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056141/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056146/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056146/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056407/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056407/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056412/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056412/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056417/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056417/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056425/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056425/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056431/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056431/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056433/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056433/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056435/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056435/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056490/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056490/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056609/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056609/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056640/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056640/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056810/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056810/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056913/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056913/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056918/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056918/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30056922/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30056922/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057164/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057164/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057166/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057166/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057174/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057174/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057288/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057288/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057297/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057297/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057361/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057361/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057363/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057363/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057369/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057369/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057524/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057524/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057641/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057641/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057745/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057745/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057746/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057746/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057748/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057748/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057972/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057972/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057974/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057974/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057979/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057979/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057983/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057983/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057985/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057985/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057989/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057989/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30057993/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30057993/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058019/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058019/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058023/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058023/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058044/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058044/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058047/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058047/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058052/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058052/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058057/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058057/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058109/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058109/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058320/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058320/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058339/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058339/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30058545/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30058545/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059252/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059252/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059318/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059318/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059391/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059391/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059490/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059490/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059492/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059492/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059495/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059495/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059497/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059497/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059500/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059500/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059502/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059502/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059510/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059510/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059517/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059517/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30059589/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30059589/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060114/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060114/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060116/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060116/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060146/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060146/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060151/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060151/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060155/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060155/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060169/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060169/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060173/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060173/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060178/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060178/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060179/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060179/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060206/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060206/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060256/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060256/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060309/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060309/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060313/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060313/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060518/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060518/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060621/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060621/ws-services-calculation/WCBillingSlab.json | 4 ++--
 800 files changed, 1200 insertions(+), 1200 deletions(-)

diff --git a/data/as/30016769/ws-services-calculation/Penalty.json b/data/as/30016769/ws-services-calculation/Penalty.json
index fb588c00c0..6cd5583b43 100644
--- a/data/as/30016769/ws-services-calculation/Penalty.json
+++ b/data/as/30016769/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016769/ws-services-calculation/WCBillingSlab.json b/data/as/30016769/ws-services-calculation/WCBillingSlab.json
index 5bd85237e9..0a301a008b 100644
--- a/data/as/30016769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016769/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016773/ws-services-calculation/Penalty.json b/data/as/30016773/ws-services-calculation/Penalty.json
index 3b97cf71e5..396ed142cf 100644
--- a/data/as/30016773/ws-services-calculation/Penalty.json
+++ b/data/as/30016773/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016773/ws-services-calculation/WCBillingSlab.json b/data/as/30016773/ws-services-calculation/WCBillingSlab.json
index 8ea44ba4b3..29941544c0 100644
--- a/data/as/30016773/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016773/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016776/ws-services-calculation/Penalty.json b/data/as/30016776/ws-services-calculation/Penalty.json
index bfd5887a69..d0e5b08244 100644
--- a/data/as/30016776/ws-services-calculation/Penalty.json
+++ b/data/as/30016776/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016776/ws-services-calculation/WCBillingSlab.json b/data/as/30016776/ws-services-calculation/WCBillingSlab.json
index 20a5d073c5..f45f0fd614 100644
--- a/data/as/30016776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016776/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016777/ws-services-calculation/Penalty.json b/data/as/30016777/ws-services-calculation/Penalty.json
index 56db860b61..b1ec924f0b 100644
--- a/data/as/30016777/ws-services-calculation/Penalty.json
+++ b/data/as/30016777/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016777/ws-services-calculation/WCBillingSlab.json b/data/as/30016777/ws-services-calculation/WCBillingSlab.json
index 2ff69d49ab..664d8794f4 100644
--- a/data/as/30016777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016777/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016779/ws-services-calculation/Penalty.json b/data/as/30016779/ws-services-calculation/Penalty.json
index 6d93cd6ddf..c33e986317 100644
--- a/data/as/30016779/ws-services-calculation/Penalty.json
+++ b/data/as/30016779/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016779/ws-services-calculation/WCBillingSlab.json b/data/as/30016779/ws-services-calculation/WCBillingSlab.json
index 4cbb1d8247..027848da34 100644
--- a/data/as/30016779/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016779/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016893/ws-services-calculation/Penalty.json b/data/as/30016893/ws-services-calculation/Penalty.json
index ff024f1877..ba275238bc 100644
--- a/data/as/30016893/ws-services-calculation/Penalty.json
+++ b/data/as/30016893/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016893/ws-services-calculation/WCBillingSlab.json b/data/as/30016893/ws-services-calculation/WCBillingSlab.json
index 1f2926cc04..2ff6480bdc 100644
--- a/data/as/30016893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016893/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30016917/ws-services-calculation/Penalty.json b/data/as/30016917/ws-services-calculation/Penalty.json
index 67dfba1be6..c9abc9d373 100644
--- a/data/as/30016917/ws-services-calculation/Penalty.json
+++ b/data/as/30016917/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016917/ws-services-calculation/WCBillingSlab.json b/data/as/30016917/ws-services-calculation/WCBillingSlab.json
index 7fd812fb6c..50e7bbcd99 100644
--- a/data/as/30016917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016917/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017080/ws-services-calculation/Penalty.json b/data/as/30017080/ws-services-calculation/Penalty.json
index 7d5971395f..02efb02c3b 100644
--- a/data/as/30017080/ws-services-calculation/Penalty.json
+++ b/data/as/30017080/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017080/ws-services-calculation/WCBillingSlab.json b/data/as/30017080/ws-services-calculation/WCBillingSlab.json
index 1aaa6900cc..dfdc129e94 100644
--- a/data/as/30017080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017080/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017213/ws-services-calculation/Penalty.json b/data/as/30017213/ws-services-calculation/Penalty.json
index 5d8c2c2bb6..9529c8b9b4 100644
--- a/data/as/30017213/ws-services-calculation/Penalty.json
+++ b/data/as/30017213/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017213/ws-services-calculation/WCBillingSlab.json b/data/as/30017213/ws-services-calculation/WCBillingSlab.json
index bfd21fec5d..30790aa5b9 100644
--- a/data/as/30017213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017213/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017259/ws-services-calculation/Penalty.json b/data/as/30017259/ws-services-calculation/Penalty.json
index a4f0266972..de65be4065 100644
--- a/data/as/30017259/ws-services-calculation/Penalty.json
+++ b/data/as/30017259/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017259/ws-services-calculation/WCBillingSlab.json b/data/as/30017259/ws-services-calculation/WCBillingSlab.json
index 7713a0a782..4053bbef5f 100644
--- a/data/as/30017259/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017259/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017426/ws-services-calculation/Penalty.json b/data/as/30017426/ws-services-calculation/Penalty.json
index 76e19c4efd..5b927716ee 100644
--- a/data/as/30017426/ws-services-calculation/Penalty.json
+++ b/data/as/30017426/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017426/ws-services-calculation/WCBillingSlab.json b/data/as/30017426/ws-services-calculation/WCBillingSlab.json
index 01e0e5490e..450d19fe01 100644
--- a/data/as/30017426/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017426/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017520/ws-services-calculation/Penalty.json b/data/as/30017520/ws-services-calculation/Penalty.json
index 06b6d3e29d..2692196a12 100644
--- a/data/as/30017520/ws-services-calculation/Penalty.json
+++ b/data/as/30017520/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017520/ws-services-calculation/WCBillingSlab.json b/data/as/30017520/ws-services-calculation/WCBillingSlab.json
index 7690c4c1a0..15c134bc1f 100644
--- a/data/as/30017520/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017520/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017697/ws-services-calculation/Penalty.json b/data/as/30017697/ws-services-calculation/Penalty.json
index 9576c5aae5..aff3c2bc83 100644
--- a/data/as/30017697/ws-services-calculation/Penalty.json
+++ b/data/as/30017697/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017697/ws-services-calculation/WCBillingSlab.json b/data/as/30017697/ws-services-calculation/WCBillingSlab.json
index 0390c264df..37d2310ba3 100644
--- a/data/as/30017697/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017697/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017715/ws-services-calculation/Penalty.json b/data/as/30017715/ws-services-calculation/Penalty.json
index d6a1b152e1..ab81669e13 100644
--- a/data/as/30017715/ws-services-calculation/Penalty.json
+++ b/data/as/30017715/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017715/ws-services-calculation/WCBillingSlab.json b/data/as/30017715/ws-services-calculation/WCBillingSlab.json
index 63f9554233..e76ec30865 100644
--- a/data/as/30017715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017715/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017720/ws-services-calculation/Penalty.json b/data/as/30017720/ws-services-calculation/Penalty.json
index 81b292f2ff..03992b135d 100644
--- a/data/as/30017720/ws-services-calculation/Penalty.json
+++ b/data/as/30017720/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017720/ws-services-calculation/WCBillingSlab.json b/data/as/30017720/ws-services-calculation/WCBillingSlab.json
index 2f1b1bd2d0..f7a3295ebf 100644
--- a/data/as/30017720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017720/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017735/ws-services-calculation/Penalty.json b/data/as/30017735/ws-services-calculation/Penalty.json
index 5bf7b68084..e96cf91fef 100644
--- a/data/as/30017735/ws-services-calculation/Penalty.json
+++ b/data/as/30017735/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017735/ws-services-calculation/WCBillingSlab.json b/data/as/30017735/ws-services-calculation/WCBillingSlab.json
index 4eef58c644..b593c31272 100644
--- a/data/as/30017735/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017735/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017892/ws-services-calculation/Penalty.json b/data/as/30017892/ws-services-calculation/Penalty.json
index 4f2eb45ab6..0878c30a2c 100644
--- a/data/as/30017892/ws-services-calculation/Penalty.json
+++ b/data/as/30017892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017892/ws-services-calculation/WCBillingSlab.json b/data/as/30017892/ws-services-calculation/WCBillingSlab.json
index 1b0db3e0c7..99b44f28f7 100644
--- a/data/as/30017892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017895/ws-services-calculation/Penalty.json b/data/as/30017895/ws-services-calculation/Penalty.json
index c70306ec71..50d5b7d483 100644
--- a/data/as/30017895/ws-services-calculation/Penalty.json
+++ b/data/as/30017895/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017895/ws-services-calculation/WCBillingSlab.json b/data/as/30017895/ws-services-calculation/WCBillingSlab.json
index ea2161f339..369c751054 100644
--- a/data/as/30017895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017895/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30017896/ws-services-calculation/Penalty.json b/data/as/30017896/ws-services-calculation/Penalty.json
index 675f555f9a..5f92c1eec7 100644
--- a/data/as/30017896/ws-services-calculation/Penalty.json
+++ b/data/as/30017896/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017896/ws-services-calculation/WCBillingSlab.json b/data/as/30017896/ws-services-calculation/WCBillingSlab.json
index d0f91ae655..95fb68815e 100644
--- a/data/as/30017896/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017896/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018185/ws-services-calculation/Penalty.json b/data/as/30018185/ws-services-calculation/Penalty.json
index 613f0d0ea7..9144115b2d 100644
--- a/data/as/30018185/ws-services-calculation/Penalty.json
+++ b/data/as/30018185/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018185/ws-services-calculation/WCBillingSlab.json b/data/as/30018185/ws-services-calculation/WCBillingSlab.json
index 9f4a8e24b5..53c400cfed 100644
--- a/data/as/30018185/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018185/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018227/ws-services-calculation/Penalty.json b/data/as/30018227/ws-services-calculation/Penalty.json
index 4db3e8b986..7a63a369a8 100644
--- a/data/as/30018227/ws-services-calculation/Penalty.json
+++ b/data/as/30018227/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018227/ws-services-calculation/WCBillingSlab.json b/data/as/30018227/ws-services-calculation/WCBillingSlab.json
index 7fae6e986f..74ecf9da21 100644
--- a/data/as/30018227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018227/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018243/ws-services-calculation/Penalty.json b/data/as/30018243/ws-services-calculation/Penalty.json
index 1402becc27..9e41fc0d22 100644
--- a/data/as/30018243/ws-services-calculation/Penalty.json
+++ b/data/as/30018243/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018243/ws-services-calculation/WCBillingSlab.json b/data/as/30018243/ws-services-calculation/WCBillingSlab.json
index 8d2b13ee39..d370e2a988 100644
--- a/data/as/30018243/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018243/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018312/ws-services-calculation/Penalty.json b/data/as/30018312/ws-services-calculation/Penalty.json
index 4ea7b7d69f..c1dee6ad22 100644
--- a/data/as/30018312/ws-services-calculation/Penalty.json
+++ b/data/as/30018312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018312/ws-services-calculation/WCBillingSlab.json b/data/as/30018312/ws-services-calculation/WCBillingSlab.json
index 3534ee5f67..78e5f27140 100644
--- a/data/as/30018312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018441/ws-services-calculation/Penalty.json b/data/as/30018441/ws-services-calculation/Penalty.json
index 8eb957765a..37ebf533b1 100644
--- a/data/as/30018441/ws-services-calculation/Penalty.json
+++ b/data/as/30018441/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018441/ws-services-calculation/WCBillingSlab.json b/data/as/30018441/ws-services-calculation/WCBillingSlab.json
index fc00641d8f..4957e5da11 100644
--- a/data/as/30018441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018441/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018712/ws-services-calculation/Penalty.json b/data/as/30018712/ws-services-calculation/Penalty.json
index f7d40f0bfd..c18a264a17 100644
--- a/data/as/30018712/ws-services-calculation/Penalty.json
+++ b/data/as/30018712/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018712/ws-services-calculation/WCBillingSlab.json b/data/as/30018712/ws-services-calculation/WCBillingSlab.json
index cf93f3a040..010c422b96 100644
--- a/data/as/30018712/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018712/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018720/ws-services-calculation/Penalty.json b/data/as/30018720/ws-services-calculation/Penalty.json
index 5505f292d0..d884f286d6 100644
--- a/data/as/30018720/ws-services-calculation/Penalty.json
+++ b/data/as/30018720/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018720/ws-services-calculation/WCBillingSlab.json b/data/as/30018720/ws-services-calculation/WCBillingSlab.json
index f228c94691..cfdcfba6ef 100644
--- a/data/as/30018720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018720/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018721/ws-services-calculation/Penalty.json b/data/as/30018721/ws-services-calculation/Penalty.json
index b3c49db486..53a06fc32b 100644
--- a/data/as/30018721/ws-services-calculation/Penalty.json
+++ b/data/as/30018721/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018721/ws-services-calculation/WCBillingSlab.json b/data/as/30018721/ws-services-calculation/WCBillingSlab.json
index f84d8b3292..5be6e7f116 100644
--- a/data/as/30018721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018721/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018738/ws-services-calculation/Penalty.json b/data/as/30018738/ws-services-calculation/Penalty.json
index 42e4daf793..929dccc09a 100644
--- a/data/as/30018738/ws-services-calculation/Penalty.json
+++ b/data/as/30018738/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018738/ws-services-calculation/WCBillingSlab.json b/data/as/30018738/ws-services-calculation/WCBillingSlab.json
index 26b3d0fb04..585eccd886 100644
--- a/data/as/30018738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018738/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018739/ws-services-calculation/Penalty.json b/data/as/30018739/ws-services-calculation/Penalty.json
index c09d931cbd..78054db316 100644
--- a/data/as/30018739/ws-services-calculation/Penalty.json
+++ b/data/as/30018739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018739/ws-services-calculation/WCBillingSlab.json b/data/as/30018739/ws-services-calculation/WCBillingSlab.json
index 91cc051d00..dbf79ab6b5 100644
--- a/data/as/30018739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018741/ws-services-calculation/Penalty.json b/data/as/30018741/ws-services-calculation/Penalty.json
index 13fe53e942..53802da57b 100644
--- a/data/as/30018741/ws-services-calculation/Penalty.json
+++ b/data/as/30018741/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018741/ws-services-calculation/WCBillingSlab.json b/data/as/30018741/ws-services-calculation/WCBillingSlab.json
index 6bbc4ff632..ccadb4c1c2 100644
--- a/data/as/30018741/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018741/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018824/ws-services-calculation/Penalty.json b/data/as/30018824/ws-services-calculation/Penalty.json
index b05d73aafb..74226d6d82 100644
--- a/data/as/30018824/ws-services-calculation/Penalty.json
+++ b/data/as/30018824/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018824/ws-services-calculation/WCBillingSlab.json b/data/as/30018824/ws-services-calculation/WCBillingSlab.json
index ab0cc942d1..69020a0a1e 100644
--- a/data/as/30018824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018824/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018921/ws-services-calculation/Penalty.json b/data/as/30018921/ws-services-calculation/Penalty.json
index 20819fe06e..48809c27cd 100644
--- a/data/as/30018921/ws-services-calculation/Penalty.json
+++ b/data/as/30018921/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018921/ws-services-calculation/WCBillingSlab.json b/data/as/30018921/ws-services-calculation/WCBillingSlab.json
index dfce3e9c74..d3eaf773d3 100644
--- a/data/as/30018921/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018921/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018935/ws-services-calculation/Penalty.json b/data/as/30018935/ws-services-calculation/Penalty.json
index 898373a55c..fd15cf7ea6 100644
--- a/data/as/30018935/ws-services-calculation/Penalty.json
+++ b/data/as/30018935/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018935/ws-services-calculation/WCBillingSlab.json b/data/as/30018935/ws-services-calculation/WCBillingSlab.json
index e109182d3d..a35741f3b5 100644
--- a/data/as/30018935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018935/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30018941/ws-services-calculation/Penalty.json b/data/as/30018941/ws-services-calculation/Penalty.json
index c78bd78933..93248df594 100644
--- a/data/as/30018941/ws-services-calculation/Penalty.json
+++ b/data/as/30018941/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018941/ws-services-calculation/WCBillingSlab.json b/data/as/30018941/ws-services-calculation/WCBillingSlab.json
index d404882f92..aecc994736 100644
--- a/data/as/30018941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018941/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019121/ws-services-calculation/Penalty.json b/data/as/30019121/ws-services-calculation/Penalty.json
index 1a41c81c61..65e4c830a6 100644
--- a/data/as/30019121/ws-services-calculation/Penalty.json
+++ b/data/as/30019121/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019121/ws-services-calculation/WCBillingSlab.json b/data/as/30019121/ws-services-calculation/WCBillingSlab.json
index c493598b19..b4bb203335 100644
--- a/data/as/30019121/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019121/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019130/ws-services-calculation/Penalty.json b/data/as/30019130/ws-services-calculation/Penalty.json
index 96eadc8884..3b1e644467 100644
--- a/data/as/30019130/ws-services-calculation/Penalty.json
+++ b/data/as/30019130/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019130/ws-services-calculation/WCBillingSlab.json b/data/as/30019130/ws-services-calculation/WCBillingSlab.json
index 00335de82b..3856b9d029 100644
--- a/data/as/30019130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019130/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019135/ws-services-calculation/Penalty.json b/data/as/30019135/ws-services-calculation/Penalty.json
index 6909ecc9c9..6fc13248af 100644
--- a/data/as/30019135/ws-services-calculation/Penalty.json
+++ b/data/as/30019135/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019135/ws-services-calculation/WCBillingSlab.json b/data/as/30019135/ws-services-calculation/WCBillingSlab.json
index 5082a44d8d..e3a823cd78 100644
--- a/data/as/30019135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019135/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019139/ws-services-calculation/Penalty.json b/data/as/30019139/ws-services-calculation/Penalty.json
index 30f49f149f..b7659ba614 100644
--- a/data/as/30019139/ws-services-calculation/Penalty.json
+++ b/data/as/30019139/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019139/ws-services-calculation/WCBillingSlab.json b/data/as/30019139/ws-services-calculation/WCBillingSlab.json
index 9ff754fa44..926785c51f 100644
--- a/data/as/30019139/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019139/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019144/ws-services-calculation/Penalty.json b/data/as/30019144/ws-services-calculation/Penalty.json
index c125004e32..1210f1981c 100644
--- a/data/as/30019144/ws-services-calculation/Penalty.json
+++ b/data/as/30019144/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019144/ws-services-calculation/WCBillingSlab.json b/data/as/30019144/ws-services-calculation/WCBillingSlab.json
index 895bf3fcfb..517ef7df6a 100644
--- a/data/as/30019144/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019144/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019151/ws-services-calculation/Penalty.json b/data/as/30019151/ws-services-calculation/Penalty.json
index c13e15660b..60e49f1295 100644
--- a/data/as/30019151/ws-services-calculation/Penalty.json
+++ b/data/as/30019151/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019151/ws-services-calculation/WCBillingSlab.json b/data/as/30019151/ws-services-calculation/WCBillingSlab.json
index 4fa55cbe67..095955ddb6 100644
--- a/data/as/30019151/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019151/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019154/ws-services-calculation/Penalty.json b/data/as/30019154/ws-services-calculation/Penalty.json
index 44f7e0ee47..c426f57d8c 100644
--- a/data/as/30019154/ws-services-calculation/Penalty.json
+++ b/data/as/30019154/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019154/ws-services-calculation/WCBillingSlab.json b/data/as/30019154/ws-services-calculation/WCBillingSlab.json
index 88d385856d..483f2d5fb7 100644
--- a/data/as/30019154/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019154/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019163/ws-services-calculation/Penalty.json b/data/as/30019163/ws-services-calculation/Penalty.json
index 01ad750101..b31c7de4f9 100644
--- a/data/as/30019163/ws-services-calculation/Penalty.json
+++ b/data/as/30019163/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019163/ws-services-calculation/WCBillingSlab.json b/data/as/30019163/ws-services-calculation/WCBillingSlab.json
index a1c2539624..f04819cbc8 100644
--- a/data/as/30019163/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019163/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019166/ws-services-calculation/Penalty.json b/data/as/30019166/ws-services-calculation/Penalty.json
index c644712f7b..b48fa12f21 100644
--- a/data/as/30019166/ws-services-calculation/Penalty.json
+++ b/data/as/30019166/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019166/ws-services-calculation/WCBillingSlab.json b/data/as/30019166/ws-services-calculation/WCBillingSlab.json
index 523e4b9224..9d8e6ca58e 100644
--- a/data/as/30019166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019166/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019168/ws-services-calculation/Penalty.json b/data/as/30019168/ws-services-calculation/Penalty.json
index 876888f04a..15be7a2672 100644
--- a/data/as/30019168/ws-services-calculation/Penalty.json
+++ b/data/as/30019168/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019168/ws-services-calculation/WCBillingSlab.json b/data/as/30019168/ws-services-calculation/WCBillingSlab.json
index 01c14cd5cc..64fb384ad9 100644
--- a/data/as/30019168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019168/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019170/ws-services-calculation/Penalty.json b/data/as/30019170/ws-services-calculation/Penalty.json
index 7954b12f63..6c8aeb1c24 100644
--- a/data/as/30019170/ws-services-calculation/Penalty.json
+++ b/data/as/30019170/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019170/ws-services-calculation/WCBillingSlab.json b/data/as/30019170/ws-services-calculation/WCBillingSlab.json
index aa72ef4cde..7247af4950 100644
--- a/data/as/30019170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019170/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019171/ws-services-calculation/Penalty.json b/data/as/30019171/ws-services-calculation/Penalty.json
index 6ff04d425f..8dc03a2e0a 100644
--- a/data/as/30019171/ws-services-calculation/Penalty.json
+++ b/data/as/30019171/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019171/ws-services-calculation/WCBillingSlab.json b/data/as/30019171/ws-services-calculation/WCBillingSlab.json
index dee7952937..98817d86f8 100644
--- a/data/as/30019171/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019171/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019173/ws-services-calculation/Penalty.json b/data/as/30019173/ws-services-calculation/Penalty.json
index abae81acfa..a169f5a1fc 100644
--- a/data/as/30019173/ws-services-calculation/Penalty.json
+++ b/data/as/30019173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019173/ws-services-calculation/WCBillingSlab.json b/data/as/30019173/ws-services-calculation/WCBillingSlab.json
index 82d3fc33d0..5c7d42c513 100644
--- a/data/as/30019173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019266/ws-services-calculation/Penalty.json b/data/as/30019266/ws-services-calculation/Penalty.json
index 982cc1490f..a2b133a02f 100644
--- a/data/as/30019266/ws-services-calculation/Penalty.json
+++ b/data/as/30019266/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019266/ws-services-calculation/WCBillingSlab.json b/data/as/30019266/ws-services-calculation/WCBillingSlab.json
index f85d47088d..b8170b0c55 100644
--- a/data/as/30019266/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019266/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019465/ws-services-calculation/Penalty.json b/data/as/30019465/ws-services-calculation/Penalty.json
index e2ec5e4ee1..145922f248 100644
--- a/data/as/30019465/ws-services-calculation/Penalty.json
+++ b/data/as/30019465/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019465/ws-services-calculation/WCBillingSlab.json b/data/as/30019465/ws-services-calculation/WCBillingSlab.json
index c2bb11a599..2b89fdd314 100644
--- a/data/as/30019465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019465/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019506/ws-services-calculation/Penalty.json b/data/as/30019506/ws-services-calculation/Penalty.json
index 121a27a49c..ae0d7d6a45 100644
--- a/data/as/30019506/ws-services-calculation/Penalty.json
+++ b/data/as/30019506/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019506/ws-services-calculation/WCBillingSlab.json b/data/as/30019506/ws-services-calculation/WCBillingSlab.json
index 9c08cf1ef5..bbc14768b3 100644
--- a/data/as/30019506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019506/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019535/ws-services-calculation/Penalty.json b/data/as/30019535/ws-services-calculation/Penalty.json
index 5908021aed..6e367d69fc 100644
--- a/data/as/30019535/ws-services-calculation/Penalty.json
+++ b/data/as/30019535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019535/ws-services-calculation/WCBillingSlab.json b/data/as/30019535/ws-services-calculation/WCBillingSlab.json
index 2d9e7b8413..299faa615c 100644
--- a/data/as/30019535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019544/ws-services-calculation/Penalty.json b/data/as/30019544/ws-services-calculation/Penalty.json
index 71802a83d4..2d716a4ec1 100644
--- a/data/as/30019544/ws-services-calculation/Penalty.json
+++ b/data/as/30019544/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019544/ws-services-calculation/WCBillingSlab.json b/data/as/30019544/ws-services-calculation/WCBillingSlab.json
index 5226ca850f..d482816f5a 100644
--- a/data/as/30019544/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019544/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019572/ws-services-calculation/Penalty.json b/data/as/30019572/ws-services-calculation/Penalty.json
index 26478a7790..c89c6f2f48 100644
--- a/data/as/30019572/ws-services-calculation/Penalty.json
+++ b/data/as/30019572/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019572/ws-services-calculation/WCBillingSlab.json b/data/as/30019572/ws-services-calculation/WCBillingSlab.json
index cd0dd4fedd..401a22b469 100644
--- a/data/as/30019572/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019572/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019680/ws-services-calculation/Penalty.json b/data/as/30019680/ws-services-calculation/Penalty.json
index 2e3a158561..b6ffb414f7 100644
--- a/data/as/30019680/ws-services-calculation/Penalty.json
+++ b/data/as/30019680/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019680/ws-services-calculation/WCBillingSlab.json b/data/as/30019680/ws-services-calculation/WCBillingSlab.json
index f14aeef3bf..c53c1d227f 100644
--- a/data/as/30019680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019680/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019686/ws-services-calculation/Penalty.json b/data/as/30019686/ws-services-calculation/Penalty.json
index f79f06401d..414896b09e 100644
--- a/data/as/30019686/ws-services-calculation/Penalty.json
+++ b/data/as/30019686/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019686/ws-services-calculation/WCBillingSlab.json b/data/as/30019686/ws-services-calculation/WCBillingSlab.json
index 456dfeb570..582c41c980 100644
--- a/data/as/30019686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019686/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019793/ws-services-calculation/Penalty.json b/data/as/30019793/ws-services-calculation/Penalty.json
index e5195ca147..0ef8ad2a9d 100644
--- a/data/as/30019793/ws-services-calculation/Penalty.json
+++ b/data/as/30019793/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019793/ws-services-calculation/WCBillingSlab.json b/data/as/30019793/ws-services-calculation/WCBillingSlab.json
index b0a1047a61..740569a3aa 100644
--- a/data/as/30019793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019793/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019799/ws-services-calculation/Penalty.json b/data/as/30019799/ws-services-calculation/Penalty.json
index d35a87e025..8cd56c9f0e 100644
--- a/data/as/30019799/ws-services-calculation/Penalty.json
+++ b/data/as/30019799/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019799/ws-services-calculation/WCBillingSlab.json b/data/as/30019799/ws-services-calculation/WCBillingSlab.json
index b8c47f65ac..bb131b4be4 100644
--- a/data/as/30019799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019799/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019826/ws-services-calculation/Penalty.json b/data/as/30019826/ws-services-calculation/Penalty.json
index 18763050f5..ee5701c3dd 100644
--- a/data/as/30019826/ws-services-calculation/Penalty.json
+++ b/data/as/30019826/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019826/ws-services-calculation/WCBillingSlab.json b/data/as/30019826/ws-services-calculation/WCBillingSlab.json
index 6583fb0915..6ba19a57be 100644
--- a/data/as/30019826/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019826/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30019832/ws-services-calculation/Penalty.json b/data/as/30019832/ws-services-calculation/Penalty.json
index 1043a5522f..a8c98b0710 100644
--- a/data/as/30019832/ws-services-calculation/Penalty.json
+++ b/data/as/30019832/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019832/ws-services-calculation/WCBillingSlab.json b/data/as/30019832/ws-services-calculation/WCBillingSlab.json
index e7548f81a7..77a216dc42 100644
--- a/data/as/30019832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019832/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020076/ws-services-calculation/Penalty.json b/data/as/30020076/ws-services-calculation/Penalty.json
index 708e677873..45459e87c2 100644
--- a/data/as/30020076/ws-services-calculation/Penalty.json
+++ b/data/as/30020076/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020076/ws-services-calculation/WCBillingSlab.json b/data/as/30020076/ws-services-calculation/WCBillingSlab.json
index d17bf34013..290b688e74 100644
--- a/data/as/30020076/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020076/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020201/ws-services-calculation/Penalty.json b/data/as/30020201/ws-services-calculation/Penalty.json
index 328452fa8e..1a4f8d3a20 100644
--- a/data/as/30020201/ws-services-calculation/Penalty.json
+++ b/data/as/30020201/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020201/ws-services-calculation/WCBillingSlab.json b/data/as/30020201/ws-services-calculation/WCBillingSlab.json
index 55cec2c376..c8d4faad4b 100644
--- a/data/as/30020201/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020201/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020202/ws-services-calculation/Penalty.json b/data/as/30020202/ws-services-calculation/Penalty.json
index b4d063d30c..dbfe5d5174 100644
--- a/data/as/30020202/ws-services-calculation/Penalty.json
+++ b/data/as/30020202/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020202/ws-services-calculation/WCBillingSlab.json b/data/as/30020202/ws-services-calculation/WCBillingSlab.json
index 425f3c6c31..5265a5630a 100644
--- a/data/as/30020202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020202/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020369/ws-services-calculation/Penalty.json b/data/as/30020369/ws-services-calculation/Penalty.json
index 607d264373..ba2429b6e6 100644
--- a/data/as/30020369/ws-services-calculation/Penalty.json
+++ b/data/as/30020369/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020369/ws-services-calculation/WCBillingSlab.json b/data/as/30020369/ws-services-calculation/WCBillingSlab.json
index 26b38e60f2..90cddfcd39 100644
--- a/data/as/30020369/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020369/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020383/ws-services-calculation/Penalty.json b/data/as/30020383/ws-services-calculation/Penalty.json
index db78f4d98e..ffff75b6d7 100644
--- a/data/as/30020383/ws-services-calculation/Penalty.json
+++ b/data/as/30020383/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020383/ws-services-calculation/WCBillingSlab.json b/data/as/30020383/ws-services-calculation/WCBillingSlab.json
index f92aa8be31..d7f34ac6fb 100644
--- a/data/as/30020383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020383/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020502/ws-services-calculation/Penalty.json b/data/as/30020502/ws-services-calculation/Penalty.json
index a6a6c587cd..052a08c7f1 100644
--- a/data/as/30020502/ws-services-calculation/Penalty.json
+++ b/data/as/30020502/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020502/ws-services-calculation/WCBillingSlab.json b/data/as/30020502/ws-services-calculation/WCBillingSlab.json
index be0d3a9a30..f176f9d82c 100644
--- a/data/as/30020502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020502/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020635/ws-services-calculation/Penalty.json b/data/as/30020635/ws-services-calculation/Penalty.json
index a5df0aee12..e468cbbc67 100644
--- a/data/as/30020635/ws-services-calculation/Penalty.json
+++ b/data/as/30020635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020635/ws-services-calculation/WCBillingSlab.json b/data/as/30020635/ws-services-calculation/WCBillingSlab.json
index f9fa87e98a..2090b8d038 100644
--- a/data/as/30020635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020637/ws-services-calculation/Penalty.json b/data/as/30020637/ws-services-calculation/Penalty.json
index 5ecdb70107..fa3a7fdde5 100644
--- a/data/as/30020637/ws-services-calculation/Penalty.json
+++ b/data/as/30020637/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020637/ws-services-calculation/WCBillingSlab.json b/data/as/30020637/ws-services-calculation/WCBillingSlab.json
index 6e7f178acd..f5391dcaf0 100644
--- a/data/as/30020637/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020637/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020760/ws-services-calculation/Penalty.json b/data/as/30020760/ws-services-calculation/Penalty.json
index 05f7b615c3..7338db5c5d 100644
--- a/data/as/30020760/ws-services-calculation/Penalty.json
+++ b/data/as/30020760/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020760/ws-services-calculation/WCBillingSlab.json b/data/as/30020760/ws-services-calculation/WCBillingSlab.json
index 9f6bf28479..4c342799bc 100644
--- a/data/as/30020760/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020760/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020766/ws-services-calculation/Penalty.json b/data/as/30020766/ws-services-calculation/Penalty.json
index d131b37bfa..84ead2b67d 100644
--- a/data/as/30020766/ws-services-calculation/Penalty.json
+++ b/data/as/30020766/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020766/ws-services-calculation/WCBillingSlab.json b/data/as/30020766/ws-services-calculation/WCBillingSlab.json
index ccc0fb93bc..c8acf2de06 100644
--- a/data/as/30020766/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020766/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020777/ws-services-calculation/Penalty.json b/data/as/30020777/ws-services-calculation/Penalty.json
index 9704e19753..3f057d9fb9 100644
--- a/data/as/30020777/ws-services-calculation/Penalty.json
+++ b/data/as/30020777/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020777/ws-services-calculation/WCBillingSlab.json b/data/as/30020777/ws-services-calculation/WCBillingSlab.json
index db4a1fae1a..538e51a755 100644
--- a/data/as/30020777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020777/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30020972/ws-services-calculation/Penalty.json b/data/as/30020972/ws-services-calculation/Penalty.json
index 5b54e0df2c..faf53b250b 100644
--- a/data/as/30020972/ws-services-calculation/Penalty.json
+++ b/data/as/30020972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020972/ws-services-calculation/WCBillingSlab.json b/data/as/30020972/ws-services-calculation/WCBillingSlab.json
index 14d01822ca..9a40dea16c 100644
--- a/data/as/30020972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30021055/ws-services-calculation/Penalty.json b/data/as/30021055/ws-services-calculation/Penalty.json
index 2884db3961..bb1dc4e5ee 100644
--- a/data/as/30021055/ws-services-calculation/Penalty.json
+++ b/data/as/30021055/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021055/ws-services-calculation/WCBillingSlab.json b/data/as/30021055/ws-services-calculation/WCBillingSlab.json
index a3d606a48c..3430acec62 100644
--- a/data/as/30021055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021055/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30021475/ws-services-calculation/Penalty.json b/data/as/30021475/ws-services-calculation/Penalty.json
index 0d194f3e6f..124fde51ba 100644
--- a/data/as/30021475/ws-services-calculation/Penalty.json
+++ b/data/as/30021475/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021475/ws-services-calculation/WCBillingSlab.json b/data/as/30021475/ws-services-calculation/WCBillingSlab.json
index 9a8cbd3250..b215717637 100644
--- a/data/as/30021475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021475/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30021482/ws-services-calculation/Penalty.json b/data/as/30021482/ws-services-calculation/Penalty.json
index c95d56931a..db8d203069 100644
--- a/data/as/30021482/ws-services-calculation/Penalty.json
+++ b/data/as/30021482/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021482/ws-services-calculation/WCBillingSlab.json b/data/as/30021482/ws-services-calculation/WCBillingSlab.json
index 0626837c2e..3e903f5f20 100644
--- a/data/as/30021482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021482/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30021560/ws-services-calculation/Penalty.json b/data/as/30021560/ws-services-calculation/Penalty.json
index 791244ccee..021a119952 100644
--- a/data/as/30021560/ws-services-calculation/Penalty.json
+++ b/data/as/30021560/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021560/ws-services-calculation/WCBillingSlab.json b/data/as/30021560/ws-services-calculation/WCBillingSlab.json
index 3b33f839ff..8fcca32269 100644
--- a/data/as/30021560/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021560/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30021973/ws-services-calculation/Penalty.json b/data/as/30021973/ws-services-calculation/Penalty.json
index 3955082442..c056838aa6 100644
--- a/data/as/30021973/ws-services-calculation/Penalty.json
+++ b/data/as/30021973/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021973/ws-services-calculation/WCBillingSlab.json b/data/as/30021973/ws-services-calculation/WCBillingSlab.json
index e47ec75cc2..0659c35d9a 100644
--- a/data/as/30021973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021973/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30021987/ws-services-calculation/Penalty.json b/data/as/30021987/ws-services-calculation/Penalty.json
index fc8f1e2414..b9065e31a1 100644
--- a/data/as/30021987/ws-services-calculation/Penalty.json
+++ b/data/as/30021987/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021987/ws-services-calculation/WCBillingSlab.json b/data/as/30021987/ws-services-calculation/WCBillingSlab.json
index 4008271530..500e7bc8ea 100644
--- a/data/as/30021987/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021987/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022258/ws-services-calculation/Penalty.json b/data/as/30022258/ws-services-calculation/Penalty.json
index 9b1e1611cb..b76453bb69 100644
--- a/data/as/30022258/ws-services-calculation/Penalty.json
+++ b/data/as/30022258/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022258/ws-services-calculation/WCBillingSlab.json b/data/as/30022258/ws-services-calculation/WCBillingSlab.json
index 8f7852ff3c..1de801ece6 100644
--- a/data/as/30022258/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022258/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022299/ws-services-calculation/Penalty.json b/data/as/30022299/ws-services-calculation/Penalty.json
index a5f10a94da..d6f370064e 100644
--- a/data/as/30022299/ws-services-calculation/Penalty.json
+++ b/data/as/30022299/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022299/ws-services-calculation/WCBillingSlab.json b/data/as/30022299/ws-services-calculation/WCBillingSlab.json
index 353bd79c14..ec31b24c35 100644
--- a/data/as/30022299/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022299/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022418/ws-services-calculation/Penalty.json b/data/as/30022418/ws-services-calculation/Penalty.json
index eaa8e0deef..ca9ac43438 100644
--- a/data/as/30022418/ws-services-calculation/Penalty.json
+++ b/data/as/30022418/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022418/ws-services-calculation/WCBillingSlab.json b/data/as/30022418/ws-services-calculation/WCBillingSlab.json
index 049f1386ff..3b22f21a17 100644
--- a/data/as/30022418/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022418/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022523/ws-services-calculation/Penalty.json b/data/as/30022523/ws-services-calculation/Penalty.json
index 338d4ff1dc..c6a5bc4d62 100644
--- a/data/as/30022523/ws-services-calculation/Penalty.json
+++ b/data/as/30022523/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022523/ws-services-calculation/WCBillingSlab.json b/data/as/30022523/ws-services-calculation/WCBillingSlab.json
index 20d65412ab..74695afd75 100644
--- a/data/as/30022523/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022523/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022537/ws-services-calculation/Penalty.json b/data/as/30022537/ws-services-calculation/Penalty.json
index 61ee076e5d..8abfb96eb2 100644
--- a/data/as/30022537/ws-services-calculation/Penalty.json
+++ b/data/as/30022537/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022537/ws-services-calculation/WCBillingSlab.json b/data/as/30022537/ws-services-calculation/WCBillingSlab.json
index f978a8018d..2c6a29d0a6 100644
--- a/data/as/30022537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022537/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022693/ws-services-calculation/Penalty.json b/data/as/30022693/ws-services-calculation/Penalty.json
index 1a50fbda6f..69c4bc6079 100644
--- a/data/as/30022693/ws-services-calculation/Penalty.json
+++ b/data/as/30022693/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022693/ws-services-calculation/WCBillingSlab.json b/data/as/30022693/ws-services-calculation/WCBillingSlab.json
index dfa4767154..e56d841bef 100644
--- a/data/as/30022693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022693/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022702/ws-services-calculation/Penalty.json b/data/as/30022702/ws-services-calculation/Penalty.json
index 585fa7f930..abc6210fe5 100644
--- a/data/as/30022702/ws-services-calculation/Penalty.json
+++ b/data/as/30022702/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022702/ws-services-calculation/WCBillingSlab.json b/data/as/30022702/ws-services-calculation/WCBillingSlab.json
index 28bb300778..77419bf373 100644
--- a/data/as/30022702/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022702/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022721/ws-services-calculation/Penalty.json b/data/as/30022721/ws-services-calculation/Penalty.json
index 37e9015a69..b50b03399b 100644
--- a/data/as/30022721/ws-services-calculation/Penalty.json
+++ b/data/as/30022721/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022721/ws-services-calculation/WCBillingSlab.json b/data/as/30022721/ws-services-calculation/WCBillingSlab.json
index 63f0f101af..576153d023 100644
--- a/data/as/30022721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022721/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022760/ws-services-calculation/Penalty.json b/data/as/30022760/ws-services-calculation/Penalty.json
index 1550bd623e..8523728e04 100644
--- a/data/as/30022760/ws-services-calculation/Penalty.json
+++ b/data/as/30022760/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022760/ws-services-calculation/WCBillingSlab.json b/data/as/30022760/ws-services-calculation/WCBillingSlab.json
index f0780742c7..2f9586f311 100644
--- a/data/as/30022760/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022760/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022777/ws-services-calculation/Penalty.json b/data/as/30022777/ws-services-calculation/Penalty.json
index b97e9250b4..0552f5f98b 100644
--- a/data/as/30022777/ws-services-calculation/Penalty.json
+++ b/data/as/30022777/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022777/ws-services-calculation/WCBillingSlab.json b/data/as/30022777/ws-services-calculation/WCBillingSlab.json
index 92c4ab11b7..b5dfeb5a93 100644
--- a/data/as/30022777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022777/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022787/ws-services-calculation/Penalty.json b/data/as/30022787/ws-services-calculation/Penalty.json
index 15ca5246b6..5263f89bc9 100644
--- a/data/as/30022787/ws-services-calculation/Penalty.json
+++ b/data/as/30022787/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022787/ws-services-calculation/WCBillingSlab.json b/data/as/30022787/ws-services-calculation/WCBillingSlab.json
index 6243bac3b3..854621236d 100644
--- a/data/as/30022787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022787/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022800/ws-services-calculation/Penalty.json b/data/as/30022800/ws-services-calculation/Penalty.json
index 98365b284c..121a012c5d 100644
--- a/data/as/30022800/ws-services-calculation/Penalty.json
+++ b/data/as/30022800/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022800/ws-services-calculation/WCBillingSlab.json b/data/as/30022800/ws-services-calculation/WCBillingSlab.json
index 804bd78ce7..12f63c9e55 100644
--- a/data/as/30022800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022800/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022816/ws-services-calculation/Penalty.json b/data/as/30022816/ws-services-calculation/Penalty.json
index 6bac5b3b38..d4fe99bd7b 100644
--- a/data/as/30022816/ws-services-calculation/Penalty.json
+++ b/data/as/30022816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022816/ws-services-calculation/WCBillingSlab.json b/data/as/30022816/ws-services-calculation/WCBillingSlab.json
index 9a5a1e4222..f739b941e0 100644
--- a/data/as/30022816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022851/ws-services-calculation/Penalty.json b/data/as/30022851/ws-services-calculation/Penalty.json
index c48762d290..764b88f2ae 100644
--- a/data/as/30022851/ws-services-calculation/Penalty.json
+++ b/data/as/30022851/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022851/ws-services-calculation/WCBillingSlab.json b/data/as/30022851/ws-services-calculation/WCBillingSlab.json
index db46b8c140..d1d303735e 100644
--- a/data/as/30022851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022851/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022854/ws-services-calculation/Penalty.json b/data/as/30022854/ws-services-calculation/Penalty.json
index c516cc6547..98ddc3c102 100644
--- a/data/as/30022854/ws-services-calculation/Penalty.json
+++ b/data/as/30022854/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022854/ws-services-calculation/WCBillingSlab.json b/data/as/30022854/ws-services-calculation/WCBillingSlab.json
index c8e8e9ee0a..4e47661011 100644
--- a/data/as/30022854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022854/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022858/ws-services-calculation/Penalty.json b/data/as/30022858/ws-services-calculation/Penalty.json
index a9f711c921..edd2d8e679 100644
--- a/data/as/30022858/ws-services-calculation/Penalty.json
+++ b/data/as/30022858/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022858/ws-services-calculation/WCBillingSlab.json b/data/as/30022858/ws-services-calculation/WCBillingSlab.json
index f20db70b59..372529c9a5 100644
--- a/data/as/30022858/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022858/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022862/ws-services-calculation/Penalty.json b/data/as/30022862/ws-services-calculation/Penalty.json
index 8a9ff8f666..cd8b7e72bc 100644
--- a/data/as/30022862/ws-services-calculation/Penalty.json
+++ b/data/as/30022862/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022862/ws-services-calculation/WCBillingSlab.json b/data/as/30022862/ws-services-calculation/WCBillingSlab.json
index ddf7892cf1..8645fa1d3c 100644
--- a/data/as/30022862/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022862/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022947/ws-services-calculation/Penalty.json b/data/as/30022947/ws-services-calculation/Penalty.json
index 32af3412b6..d274890dbc 100644
--- a/data/as/30022947/ws-services-calculation/Penalty.json
+++ b/data/as/30022947/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022947/ws-services-calculation/WCBillingSlab.json b/data/as/30022947/ws-services-calculation/WCBillingSlab.json
index 30de91b0c0..1011b4eda2 100644
--- a/data/as/30022947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022947/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022975/ws-services-calculation/Penalty.json b/data/as/30022975/ws-services-calculation/Penalty.json
index 4bb0b914af..c0b1ef2703 100644
--- a/data/as/30022975/ws-services-calculation/Penalty.json
+++ b/data/as/30022975/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022975/ws-services-calculation/WCBillingSlab.json b/data/as/30022975/ws-services-calculation/WCBillingSlab.json
index d60f2146e0..8d0e87086e 100644
--- a/data/as/30022975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022975/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30022986/ws-services-calculation/Penalty.json b/data/as/30022986/ws-services-calculation/Penalty.json
index f37eb24838..453ab1913f 100644
--- a/data/as/30022986/ws-services-calculation/Penalty.json
+++ b/data/as/30022986/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022986/ws-services-calculation/WCBillingSlab.json b/data/as/30022986/ws-services-calculation/WCBillingSlab.json
index 34843c5709..0cd72f8455 100644
--- a/data/as/30022986/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022986/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023075/ws-services-calculation/Penalty.json b/data/as/30023075/ws-services-calculation/Penalty.json
index 65ed216fc8..1b77774fc0 100644
--- a/data/as/30023075/ws-services-calculation/Penalty.json
+++ b/data/as/30023075/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023075/ws-services-calculation/WCBillingSlab.json b/data/as/30023075/ws-services-calculation/WCBillingSlab.json
index 04bc23d6b7..719cb748cd 100644
--- a/data/as/30023075/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023075/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023084/ws-services-calculation/Penalty.json b/data/as/30023084/ws-services-calculation/Penalty.json
index 4287a9d706..c4ff3fdb11 100644
--- a/data/as/30023084/ws-services-calculation/Penalty.json
+++ b/data/as/30023084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023084/ws-services-calculation/WCBillingSlab.json b/data/as/30023084/ws-services-calculation/WCBillingSlab.json
index 858df56bdd..464b6b3aa9 100644
--- a/data/as/30023084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023147/ws-services-calculation/Penalty.json b/data/as/30023147/ws-services-calculation/Penalty.json
index 46d1f0ee1d..9e8828e6fe 100644
--- a/data/as/30023147/ws-services-calculation/Penalty.json
+++ b/data/as/30023147/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023147/ws-services-calculation/WCBillingSlab.json b/data/as/30023147/ws-services-calculation/WCBillingSlab.json
index 475c18499e..1ea4b4deb5 100644
--- a/data/as/30023147/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023147/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023196/ws-services-calculation/Penalty.json b/data/as/30023196/ws-services-calculation/Penalty.json
index 0be879c38d..d14937022b 100644
--- a/data/as/30023196/ws-services-calculation/Penalty.json
+++ b/data/as/30023196/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023196/ws-services-calculation/WCBillingSlab.json b/data/as/30023196/ws-services-calculation/WCBillingSlab.json
index 757114c90e..d768085197 100644
--- a/data/as/30023196/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023196/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023283/ws-services-calculation/Penalty.json b/data/as/30023283/ws-services-calculation/Penalty.json
index 50559c7c9a..2968c2725d 100644
--- a/data/as/30023283/ws-services-calculation/Penalty.json
+++ b/data/as/30023283/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023283/ws-services-calculation/WCBillingSlab.json b/data/as/30023283/ws-services-calculation/WCBillingSlab.json
index e99271166d..2d0c625cab 100644
--- a/data/as/30023283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023283/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023298/ws-services-calculation/Penalty.json b/data/as/30023298/ws-services-calculation/Penalty.json
index 01a9ee2448..87af6db6d7 100644
--- a/data/as/30023298/ws-services-calculation/Penalty.json
+++ b/data/as/30023298/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023298/ws-services-calculation/WCBillingSlab.json b/data/as/30023298/ws-services-calculation/WCBillingSlab.json
index 0fef62d96d..109ee0ace9 100644
--- a/data/as/30023298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023298/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023308/ws-services-calculation/Penalty.json b/data/as/30023308/ws-services-calculation/Penalty.json
index 4f3f3e6076..37399526e7 100644
--- a/data/as/30023308/ws-services-calculation/Penalty.json
+++ b/data/as/30023308/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023308/ws-services-calculation/WCBillingSlab.json b/data/as/30023308/ws-services-calculation/WCBillingSlab.json
index 6ba4b8fd1d..629f3545d0 100644
--- a/data/as/30023308/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023308/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023317/ws-services-calculation/Penalty.json b/data/as/30023317/ws-services-calculation/Penalty.json
index d23b06fbdb..2815ecc5d5 100644
--- a/data/as/30023317/ws-services-calculation/Penalty.json
+++ b/data/as/30023317/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023317/ws-services-calculation/WCBillingSlab.json b/data/as/30023317/ws-services-calculation/WCBillingSlab.json
index ba24b91f5f..1005f2027b 100644
--- a/data/as/30023317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023317/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023324/ws-services-calculation/Penalty.json b/data/as/30023324/ws-services-calculation/Penalty.json
index 882908a772..98943f882e 100644
--- a/data/as/30023324/ws-services-calculation/Penalty.json
+++ b/data/as/30023324/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023324/ws-services-calculation/WCBillingSlab.json b/data/as/30023324/ws-services-calculation/WCBillingSlab.json
index 5b3ca6667e..914ace0210 100644
--- a/data/as/30023324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023324/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023337/ws-services-calculation/Penalty.json b/data/as/30023337/ws-services-calculation/Penalty.json
index c6a2596819..47ce019688 100644
--- a/data/as/30023337/ws-services-calculation/Penalty.json
+++ b/data/as/30023337/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023337/ws-services-calculation/WCBillingSlab.json b/data/as/30023337/ws-services-calculation/WCBillingSlab.json
index 5d727b26ca..96eac2de2c 100644
--- a/data/as/30023337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023337/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023347/ws-services-calculation/Penalty.json b/data/as/30023347/ws-services-calculation/Penalty.json
index db840ce156..4da5eef9e4 100644
--- a/data/as/30023347/ws-services-calculation/Penalty.json
+++ b/data/as/30023347/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023347/ws-services-calculation/WCBillingSlab.json b/data/as/30023347/ws-services-calculation/WCBillingSlab.json
index 9c7a934d5b..2e5536db06 100644
--- a/data/as/30023347/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023347/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023360/ws-services-calculation/Penalty.json b/data/as/30023360/ws-services-calculation/Penalty.json
index 95b2abeecd..97be92164c 100644
--- a/data/as/30023360/ws-services-calculation/Penalty.json
+++ b/data/as/30023360/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023360/ws-services-calculation/WCBillingSlab.json b/data/as/30023360/ws-services-calculation/WCBillingSlab.json
index ac5bb4eae4..e21afb1626 100644
--- a/data/as/30023360/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023360/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023708/ws-services-calculation/Penalty.json b/data/as/30023708/ws-services-calculation/Penalty.json
index 9a29e5089a..406b69a050 100644
--- a/data/as/30023708/ws-services-calculation/Penalty.json
+++ b/data/as/30023708/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023708/ws-services-calculation/WCBillingSlab.json b/data/as/30023708/ws-services-calculation/WCBillingSlab.json
index 0cf4fe8483..5b4ce34a37 100644
--- a/data/as/30023708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023708/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023894/ws-services-calculation/Penalty.json b/data/as/30023894/ws-services-calculation/Penalty.json
index f1ffe45b2d..c4136c63cb 100644
--- a/data/as/30023894/ws-services-calculation/Penalty.json
+++ b/data/as/30023894/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023894/ws-services-calculation/WCBillingSlab.json b/data/as/30023894/ws-services-calculation/WCBillingSlab.json
index 7ffa06b39a..4d90fe1fe8 100644
--- a/data/as/30023894/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023894/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023984/ws-services-calculation/Penalty.json b/data/as/30023984/ws-services-calculation/Penalty.json
index 30196c0994..33690dd959 100644
--- a/data/as/30023984/ws-services-calculation/Penalty.json
+++ b/data/as/30023984/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023984/ws-services-calculation/WCBillingSlab.json b/data/as/30023984/ws-services-calculation/WCBillingSlab.json
index e57d2a573c..5fb33b102c 100644
--- a/data/as/30023984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023984/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30023999/ws-services-calculation/Penalty.json b/data/as/30023999/ws-services-calculation/Penalty.json
index 0fdbc10136..c7c4be9cf0 100644
--- a/data/as/30023999/ws-services-calculation/Penalty.json
+++ b/data/as/30023999/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023999/ws-services-calculation/WCBillingSlab.json b/data/as/30023999/ws-services-calculation/WCBillingSlab.json
index b8307d6290..7c70ad9499 100644
--- a/data/as/30023999/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023999/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30027151/ws-services-calculation/Penalty.json b/data/as/30027151/ws-services-calculation/Penalty.json
index 77c1166e32..9c58260311 100644
--- a/data/as/30027151/ws-services-calculation/Penalty.json
+++ b/data/as/30027151/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027151/ws-services-calculation/WCBillingSlab.json b/data/as/30027151/ws-services-calculation/WCBillingSlab.json
index fbca1dd243..cfb257e682 100644
--- a/data/as/30027151/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027151/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30027153/ws-services-calculation/Penalty.json b/data/as/30027153/ws-services-calculation/Penalty.json
index c062181cbd..0c58efff76 100644
--- a/data/as/30027153/ws-services-calculation/Penalty.json
+++ b/data/as/30027153/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027153/ws-services-calculation/WCBillingSlab.json b/data/as/30027153/ws-services-calculation/WCBillingSlab.json
index d786737cbc..45ba9f73c7 100644
--- a/data/as/30027153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027153/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30027587/ws-services-calculation/Penalty.json b/data/as/30027587/ws-services-calculation/Penalty.json
index e3bb98fd10..93f87d538e 100644
--- a/data/as/30027587/ws-services-calculation/Penalty.json
+++ b/data/as/30027587/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027587/ws-services-calculation/WCBillingSlab.json b/data/as/30027587/ws-services-calculation/WCBillingSlab.json
index 94f412b47c..cb521ec6ab 100644
--- a/data/as/30027587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027587/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30027681/ws-services-calculation/Penalty.json b/data/as/30027681/ws-services-calculation/Penalty.json
index 57c61af72e..46de032cd9 100644
--- a/data/as/30027681/ws-services-calculation/Penalty.json
+++ b/data/as/30027681/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027681/ws-services-calculation/WCBillingSlab.json b/data/as/30027681/ws-services-calculation/WCBillingSlab.json
index bfe5aff3ad..270db79a4d 100644
--- a/data/as/30027681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027681/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30030288/ws-services-calculation/Penalty.json b/data/as/30030288/ws-services-calculation/Penalty.json
index ef4425ca3a..112be0339b 100644
--- a/data/as/30030288/ws-services-calculation/Penalty.json
+++ b/data/as/30030288/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30030288/ws-services-calculation/WCBillingSlab.json b/data/as/30030288/ws-services-calculation/WCBillingSlab.json
index 37208a1f13..ed79287df0 100644
--- a/data/as/30030288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30030288/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30030309/ws-services-calculation/Penalty.json b/data/as/30030309/ws-services-calculation/Penalty.json
index 02cf659c78..b0da7319c9 100644
--- a/data/as/30030309/ws-services-calculation/Penalty.json
+++ b/data/as/30030309/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30030309/ws-services-calculation/WCBillingSlab.json b/data/as/30030309/ws-services-calculation/WCBillingSlab.json
index 3f18afe179..e09cee07bc 100644
--- a/data/as/30030309/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30030309/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30030458/ws-services-calculation/Penalty.json b/data/as/30030458/ws-services-calculation/Penalty.json
index c838a389e2..69a8128dd2 100644
--- a/data/as/30030458/ws-services-calculation/Penalty.json
+++ b/data/as/30030458/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30030458/ws-services-calculation/WCBillingSlab.json b/data/as/30030458/ws-services-calculation/WCBillingSlab.json
index 3c0dd4c170..ce632ce65a 100644
--- a/data/as/30030458/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30030458/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30031382/ws-services-calculation/Penalty.json b/data/as/30031382/ws-services-calculation/Penalty.json
index 297a01a5a5..828c36777c 100644
--- a/data/as/30031382/ws-services-calculation/Penalty.json
+++ b/data/as/30031382/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30031382/ws-services-calculation/WCBillingSlab.json b/data/as/30031382/ws-services-calculation/WCBillingSlab.json
index c560e6ac60..fb4b821fae 100644
--- a/data/as/30031382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30031382/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30033116/ws-services-calculation/Penalty.json b/data/as/30033116/ws-services-calculation/Penalty.json
index 7fdda28094..594059ab05 100644
--- a/data/as/30033116/ws-services-calculation/Penalty.json
+++ b/data/as/30033116/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30033116/ws-services-calculation/WCBillingSlab.json b/data/as/30033116/ws-services-calculation/WCBillingSlab.json
index fe718b0141..90a09da303 100644
--- a/data/as/30033116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30033116/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036349/ws-services-calculation/Penalty.json b/data/as/30036349/ws-services-calculation/Penalty.json
index b3121c390a..bfca561b17 100644
--- a/data/as/30036349/ws-services-calculation/Penalty.json
+++ b/data/as/30036349/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036349/ws-services-calculation/WCBillingSlab.json b/data/as/30036349/ws-services-calculation/WCBillingSlab.json
index 337fed7d42..42958c120a 100644
--- a/data/as/30036349/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036349/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036685/ws-services-calculation/Penalty.json b/data/as/30036685/ws-services-calculation/Penalty.json
index a33064548c..ca6f8a4eba 100644
--- a/data/as/30036685/ws-services-calculation/Penalty.json
+++ b/data/as/30036685/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036685/ws-services-calculation/WCBillingSlab.json b/data/as/30036685/ws-services-calculation/WCBillingSlab.json
index 413537c9bd..99fb6d702d 100644
--- a/data/as/30036685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036685/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036696/ws-services-calculation/Penalty.json b/data/as/30036696/ws-services-calculation/Penalty.json
index 56db4931c4..261389da03 100644
--- a/data/as/30036696/ws-services-calculation/Penalty.json
+++ b/data/as/30036696/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036696/ws-services-calculation/WCBillingSlab.json b/data/as/30036696/ws-services-calculation/WCBillingSlab.json
index f0293c16e4..5b72ce7be4 100644
--- a/data/as/30036696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036696/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036706/ws-services-calculation/Penalty.json b/data/as/30036706/ws-services-calculation/Penalty.json
index a21324619d..856037e26d 100644
--- a/data/as/30036706/ws-services-calculation/Penalty.json
+++ b/data/as/30036706/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036706/ws-services-calculation/WCBillingSlab.json b/data/as/30036706/ws-services-calculation/WCBillingSlab.json
index ce09280428..0719e6958a 100644
--- a/data/as/30036706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036706/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036712/ws-services-calculation/Penalty.json b/data/as/30036712/ws-services-calculation/Penalty.json
index 35b125b7e4..1b1134950a 100644
--- a/data/as/30036712/ws-services-calculation/Penalty.json
+++ b/data/as/30036712/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036712/ws-services-calculation/WCBillingSlab.json b/data/as/30036712/ws-services-calculation/WCBillingSlab.json
index 610882b85c..c030b225db 100644
--- a/data/as/30036712/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036712/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036747/ws-services-calculation/Penalty.json b/data/as/30036747/ws-services-calculation/Penalty.json
index f19280fc1a..88db71d0bd 100644
--- a/data/as/30036747/ws-services-calculation/Penalty.json
+++ b/data/as/30036747/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036747/ws-services-calculation/WCBillingSlab.json b/data/as/30036747/ws-services-calculation/WCBillingSlab.json
index 60ca57918e..5458a0fa94 100644
--- a/data/as/30036747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036747/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036796/ws-services-calculation/Penalty.json b/data/as/30036796/ws-services-calculation/Penalty.json
index 64baa52046..f3fff05beb 100644
--- a/data/as/30036796/ws-services-calculation/Penalty.json
+++ b/data/as/30036796/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036796/ws-services-calculation/WCBillingSlab.json b/data/as/30036796/ws-services-calculation/WCBillingSlab.json
index 671ff8d756..f024c93b36 100644
--- a/data/as/30036796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036796/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036799/ws-services-calculation/Penalty.json b/data/as/30036799/ws-services-calculation/Penalty.json
index 613eb26a52..ffa6a6d989 100644
--- a/data/as/30036799/ws-services-calculation/Penalty.json
+++ b/data/as/30036799/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036799/ws-services-calculation/WCBillingSlab.json b/data/as/30036799/ws-services-calculation/WCBillingSlab.json
index 27c4ba5fc7..d0da44db3d 100644
--- a/data/as/30036799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036799/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30036923/ws-services-calculation/Penalty.json b/data/as/30036923/ws-services-calculation/Penalty.json
index 4d4b7490b1..094b6fe957 100644
--- a/data/as/30036923/ws-services-calculation/Penalty.json
+++ b/data/as/30036923/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036923/ws-services-calculation/WCBillingSlab.json b/data/as/30036923/ws-services-calculation/WCBillingSlab.json
index 478fcf34b6..9c2b15fc04 100644
--- a/data/as/30036923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036923/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037050/ws-services-calculation/Penalty.json b/data/as/30037050/ws-services-calculation/Penalty.json
index 5d012bd468..5478eae5fa 100644
--- a/data/as/30037050/ws-services-calculation/Penalty.json
+++ b/data/as/30037050/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037050/ws-services-calculation/WCBillingSlab.json b/data/as/30037050/ws-services-calculation/WCBillingSlab.json
index 7585a4ee13..06737b51a2 100644
--- a/data/as/30037050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037050/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037052/ws-services-calculation/Penalty.json b/data/as/30037052/ws-services-calculation/Penalty.json
index 56bcb3ff31..bcab935884 100644
--- a/data/as/30037052/ws-services-calculation/Penalty.json
+++ b/data/as/30037052/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037052/ws-services-calculation/WCBillingSlab.json b/data/as/30037052/ws-services-calculation/WCBillingSlab.json
index aab5f36ec2..56ef5ea1bf 100644
--- a/data/as/30037052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037052/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037053/ws-services-calculation/Penalty.json b/data/as/30037053/ws-services-calculation/Penalty.json
index febd1f00ca..8bfac85e54 100644
--- a/data/as/30037053/ws-services-calculation/Penalty.json
+++ b/data/as/30037053/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037053/ws-services-calculation/WCBillingSlab.json b/data/as/30037053/ws-services-calculation/WCBillingSlab.json
index ed4787a052..e3a783fdca 100644
--- a/data/as/30037053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037053/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037055/ws-services-calculation/Penalty.json b/data/as/30037055/ws-services-calculation/Penalty.json
index 9430b0d5a9..28479f317c 100644
--- a/data/as/30037055/ws-services-calculation/Penalty.json
+++ b/data/as/30037055/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037055/ws-services-calculation/WCBillingSlab.json b/data/as/30037055/ws-services-calculation/WCBillingSlab.json
index 8958ad8068..52e7e579af 100644
--- a/data/as/30037055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037055/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037056/ws-services-calculation/Penalty.json b/data/as/30037056/ws-services-calculation/Penalty.json
index 8b1691e94a..33b6e85438 100644
--- a/data/as/30037056/ws-services-calculation/Penalty.json
+++ b/data/as/30037056/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037056/ws-services-calculation/WCBillingSlab.json b/data/as/30037056/ws-services-calculation/WCBillingSlab.json
index eae2a127c6..3b81e6d87a 100644
--- a/data/as/30037056/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037056/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037057/ws-services-calculation/Penalty.json b/data/as/30037057/ws-services-calculation/Penalty.json
index 2f0a692377..90213ddc28 100644
--- a/data/as/30037057/ws-services-calculation/Penalty.json
+++ b/data/as/30037057/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037057/ws-services-calculation/WCBillingSlab.json b/data/as/30037057/ws-services-calculation/WCBillingSlab.json
index 989e3dddf8..430addd9f6 100644
--- a/data/as/30037057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037057/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037058/ws-services-calculation/Penalty.json b/data/as/30037058/ws-services-calculation/Penalty.json
index c789f6d941..d0cd161da4 100644
--- a/data/as/30037058/ws-services-calculation/Penalty.json
+++ b/data/as/30037058/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037058/ws-services-calculation/WCBillingSlab.json b/data/as/30037058/ws-services-calculation/WCBillingSlab.json
index 5027a5462a..cc08fed2ef 100644
--- a/data/as/30037058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037058/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037282/ws-services-calculation/Penalty.json b/data/as/30037282/ws-services-calculation/Penalty.json
index 4d0ca4df73..34ddf48932 100644
--- a/data/as/30037282/ws-services-calculation/Penalty.json
+++ b/data/as/30037282/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037282/ws-services-calculation/WCBillingSlab.json b/data/as/30037282/ws-services-calculation/WCBillingSlab.json
index c42fda7d7d..6f6b97e097 100644
--- a/data/as/30037282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037282/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037284/ws-services-calculation/Penalty.json b/data/as/30037284/ws-services-calculation/Penalty.json
index 7084a314c3..e27e282884 100644
--- a/data/as/30037284/ws-services-calculation/Penalty.json
+++ b/data/as/30037284/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037284/ws-services-calculation/WCBillingSlab.json b/data/as/30037284/ws-services-calculation/WCBillingSlab.json
index 11a87fa07d..0f5cc943bc 100644
--- a/data/as/30037284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037284/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037286/ws-services-calculation/Penalty.json b/data/as/30037286/ws-services-calculation/Penalty.json
index 833e9bc78b..ea9013de5f 100644
--- a/data/as/30037286/ws-services-calculation/Penalty.json
+++ b/data/as/30037286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037286/ws-services-calculation/WCBillingSlab.json b/data/as/30037286/ws-services-calculation/WCBillingSlab.json
index 8305662eac..908729d1cb 100644
--- a/data/as/30037286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037287/ws-services-calculation/Penalty.json b/data/as/30037287/ws-services-calculation/Penalty.json
index 40208fd2ba..b567a9f99b 100644
--- a/data/as/30037287/ws-services-calculation/Penalty.json
+++ b/data/as/30037287/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037287/ws-services-calculation/WCBillingSlab.json b/data/as/30037287/ws-services-calculation/WCBillingSlab.json
index 2b3d2673dd..ce8250bcc2 100644
--- a/data/as/30037287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037287/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037289/ws-services-calculation/Penalty.json b/data/as/30037289/ws-services-calculation/Penalty.json
index 2bd7bb9663..36ad2b4eb7 100644
--- a/data/as/30037289/ws-services-calculation/Penalty.json
+++ b/data/as/30037289/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037289/ws-services-calculation/WCBillingSlab.json b/data/as/30037289/ws-services-calculation/WCBillingSlab.json
index a19642960b..b22c4aabb9 100644
--- a/data/as/30037289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037289/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037516/ws-services-calculation/Penalty.json b/data/as/30037516/ws-services-calculation/Penalty.json
index 121495f700..3ac59f8edf 100644
--- a/data/as/30037516/ws-services-calculation/Penalty.json
+++ b/data/as/30037516/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037516/ws-services-calculation/WCBillingSlab.json b/data/as/30037516/ws-services-calculation/WCBillingSlab.json
index ee09935e68..15e0bf4abb 100644
--- a/data/as/30037516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037516/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037943/ws-services-calculation/Penalty.json b/data/as/30037943/ws-services-calculation/Penalty.json
index 0b19bd83eb..c2b67099a2 100644
--- a/data/as/30037943/ws-services-calculation/Penalty.json
+++ b/data/as/30037943/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037943/ws-services-calculation/WCBillingSlab.json b/data/as/30037943/ws-services-calculation/WCBillingSlab.json
index c159de1681..1a14136314 100644
--- a/data/as/30037943/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037943/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037947/ws-services-calculation/Penalty.json b/data/as/30037947/ws-services-calculation/Penalty.json
index d02f581d34..8881d41551 100644
--- a/data/as/30037947/ws-services-calculation/Penalty.json
+++ b/data/as/30037947/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037947/ws-services-calculation/WCBillingSlab.json b/data/as/30037947/ws-services-calculation/WCBillingSlab.json
index b95ef53c49..1125487516 100644
--- a/data/as/30037947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037947/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037948/ws-services-calculation/Penalty.json b/data/as/30037948/ws-services-calculation/Penalty.json
index ce11f7d849..9028c90969 100644
--- a/data/as/30037948/ws-services-calculation/Penalty.json
+++ b/data/as/30037948/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037948/ws-services-calculation/WCBillingSlab.json b/data/as/30037948/ws-services-calculation/WCBillingSlab.json
index f5a0d5f3d9..0474ade96d 100644
--- a/data/as/30037948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037948/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037949/ws-services-calculation/Penalty.json b/data/as/30037949/ws-services-calculation/Penalty.json
index 667f7de29e..ea78ee682d 100644
--- a/data/as/30037949/ws-services-calculation/Penalty.json
+++ b/data/as/30037949/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037949/ws-services-calculation/WCBillingSlab.json b/data/as/30037949/ws-services-calculation/WCBillingSlab.json
index 5ac2d8d82d..20092fb8d7 100644
--- a/data/as/30037949/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037949/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037950/ws-services-calculation/Penalty.json b/data/as/30037950/ws-services-calculation/Penalty.json
index c7684c8cb3..bad641a985 100644
--- a/data/as/30037950/ws-services-calculation/Penalty.json
+++ b/data/as/30037950/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037950/ws-services-calculation/WCBillingSlab.json b/data/as/30037950/ws-services-calculation/WCBillingSlab.json
index b9a7ea0f35..579163f4df 100644
--- a/data/as/30037950/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037950/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037951/ws-services-calculation/Penalty.json b/data/as/30037951/ws-services-calculation/Penalty.json
index 93b671ce6c..3d6e1074ba 100644
--- a/data/as/30037951/ws-services-calculation/Penalty.json
+++ b/data/as/30037951/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037951/ws-services-calculation/WCBillingSlab.json b/data/as/30037951/ws-services-calculation/WCBillingSlab.json
index b44638ac2d..d0873f0625 100644
--- a/data/as/30037951/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037951/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037952/ws-services-calculation/Penalty.json b/data/as/30037952/ws-services-calculation/Penalty.json
index dfe161f1cc..ba164c3e45 100644
--- a/data/as/30037952/ws-services-calculation/Penalty.json
+++ b/data/as/30037952/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037952/ws-services-calculation/WCBillingSlab.json b/data/as/30037952/ws-services-calculation/WCBillingSlab.json
index f512bc1265..d9326900f3 100644
--- a/data/as/30037952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037952/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037953/ws-services-calculation/Penalty.json b/data/as/30037953/ws-services-calculation/Penalty.json
index 449f85da94..4aab2d38d2 100644
--- a/data/as/30037953/ws-services-calculation/Penalty.json
+++ b/data/as/30037953/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037953/ws-services-calculation/WCBillingSlab.json b/data/as/30037953/ws-services-calculation/WCBillingSlab.json
index 608fd4921b..01ac7e84a1 100644
--- a/data/as/30037953/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037953/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037954/ws-services-calculation/Penalty.json b/data/as/30037954/ws-services-calculation/Penalty.json
index 1471684ffc..36692c99b4 100644
--- a/data/as/30037954/ws-services-calculation/Penalty.json
+++ b/data/as/30037954/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037954/ws-services-calculation/WCBillingSlab.json b/data/as/30037954/ws-services-calculation/WCBillingSlab.json
index dac12e1075..4476a6417e 100644
--- a/data/as/30037954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037954/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037955/ws-services-calculation/Penalty.json b/data/as/30037955/ws-services-calculation/Penalty.json
index 1f58e479f6..216b93fce2 100644
--- a/data/as/30037955/ws-services-calculation/Penalty.json
+++ b/data/as/30037955/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037955/ws-services-calculation/WCBillingSlab.json b/data/as/30037955/ws-services-calculation/WCBillingSlab.json
index b53619e94b..83bad02818 100644
--- a/data/as/30037955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037955/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30037960/ws-services-calculation/Penalty.json b/data/as/30037960/ws-services-calculation/Penalty.json
index 81edb6caa1..fd01cac6ed 100644
--- a/data/as/30037960/ws-services-calculation/Penalty.json
+++ b/data/as/30037960/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037960/ws-services-calculation/WCBillingSlab.json b/data/as/30037960/ws-services-calculation/WCBillingSlab.json
index 42935aa106..bc9f0efce1 100644
--- a/data/as/30037960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037960/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038014/ws-services-calculation/Penalty.json b/data/as/30038014/ws-services-calculation/Penalty.json
index 8e6e5827e6..c1b8c759c6 100644
--- a/data/as/30038014/ws-services-calculation/Penalty.json
+++ b/data/as/30038014/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038014/ws-services-calculation/WCBillingSlab.json b/data/as/30038014/ws-services-calculation/WCBillingSlab.json
index 034c65a31d..96237e35fa 100644
--- a/data/as/30038014/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038014/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038150/ws-services-calculation/Penalty.json b/data/as/30038150/ws-services-calculation/Penalty.json
index 87cbb28462..c88c6433ea 100644
--- a/data/as/30038150/ws-services-calculation/Penalty.json
+++ b/data/as/30038150/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038150/ws-services-calculation/WCBillingSlab.json b/data/as/30038150/ws-services-calculation/WCBillingSlab.json
index 5c55375f1a..42f7e096cb 100644
--- a/data/as/30038150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038150/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038176/ws-services-calculation/Penalty.json b/data/as/30038176/ws-services-calculation/Penalty.json
index 904318f1f6..c461b36319 100644
--- a/data/as/30038176/ws-services-calculation/Penalty.json
+++ b/data/as/30038176/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038176/ws-services-calculation/WCBillingSlab.json b/data/as/30038176/ws-services-calculation/WCBillingSlab.json
index 611843e654..a13cf839e8 100644
--- a/data/as/30038176/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038176/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038197/ws-services-calculation/Penalty.json b/data/as/30038197/ws-services-calculation/Penalty.json
index 40cfd13132..6494a617b8 100644
--- a/data/as/30038197/ws-services-calculation/Penalty.json
+++ b/data/as/30038197/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038197/ws-services-calculation/WCBillingSlab.json b/data/as/30038197/ws-services-calculation/WCBillingSlab.json
index 10086d182b..ed4d8039ab 100644
--- a/data/as/30038197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038197/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038208/ws-services-calculation/Penalty.json b/data/as/30038208/ws-services-calculation/Penalty.json
index e935e33308..c3b4433e42 100644
--- a/data/as/30038208/ws-services-calculation/Penalty.json
+++ b/data/as/30038208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038208/ws-services-calculation/WCBillingSlab.json b/data/as/30038208/ws-services-calculation/WCBillingSlab.json
index 7fddd6d564..71de09e3d5 100644
--- a/data/as/30038208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038633/ws-services-calculation/Penalty.json b/data/as/30038633/ws-services-calculation/Penalty.json
index 4ca34abac9..df0cd6a567 100644
--- a/data/as/30038633/ws-services-calculation/Penalty.json
+++ b/data/as/30038633/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038633/ws-services-calculation/WCBillingSlab.json b/data/as/30038633/ws-services-calculation/WCBillingSlab.json
index b70542b605..c4e9a65d99 100644
--- a/data/as/30038633/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038633/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038634/ws-services-calculation/Penalty.json b/data/as/30038634/ws-services-calculation/Penalty.json
index 15879544e1..56ef474f44 100644
--- a/data/as/30038634/ws-services-calculation/Penalty.json
+++ b/data/as/30038634/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038634/ws-services-calculation/WCBillingSlab.json b/data/as/30038634/ws-services-calculation/WCBillingSlab.json
index 94067c7f8a..8824d90185 100644
--- a/data/as/30038634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038634/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038635/ws-services-calculation/Penalty.json b/data/as/30038635/ws-services-calculation/Penalty.json
index 54439e31fa..e4d06de01b 100644
--- a/data/as/30038635/ws-services-calculation/Penalty.json
+++ b/data/as/30038635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038635/ws-services-calculation/WCBillingSlab.json b/data/as/30038635/ws-services-calculation/WCBillingSlab.json
index 6d9f1bbf96..86618e9f1d 100644
--- a/data/as/30038635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038636/ws-services-calculation/Penalty.json b/data/as/30038636/ws-services-calculation/Penalty.json
index 45f3792a73..019ca3a4a5 100644
--- a/data/as/30038636/ws-services-calculation/Penalty.json
+++ b/data/as/30038636/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038636/ws-services-calculation/WCBillingSlab.json b/data/as/30038636/ws-services-calculation/WCBillingSlab.json
index 3b732e4543..4faffdbcb7 100644
--- a/data/as/30038636/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038636/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038738/ws-services-calculation/Penalty.json b/data/as/30038738/ws-services-calculation/Penalty.json
index 402534a861..2f22036eac 100644
--- a/data/as/30038738/ws-services-calculation/Penalty.json
+++ b/data/as/30038738/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038738/ws-services-calculation/WCBillingSlab.json b/data/as/30038738/ws-services-calculation/WCBillingSlab.json
index 9bf6a6210d..35a65492d2 100644
--- a/data/as/30038738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038738/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038913/ws-services-calculation/Penalty.json b/data/as/30038913/ws-services-calculation/Penalty.json
index da2da61f2d..7661f9aa48 100644
--- a/data/as/30038913/ws-services-calculation/Penalty.json
+++ b/data/as/30038913/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038913/ws-services-calculation/WCBillingSlab.json b/data/as/30038913/ws-services-calculation/WCBillingSlab.json
index de1776fb6c..419f3c1998 100644
--- a/data/as/30038913/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038913/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038945/ws-services-calculation/Penalty.json b/data/as/30038945/ws-services-calculation/Penalty.json
index 0ade9204aa..176200054d 100644
--- a/data/as/30038945/ws-services-calculation/Penalty.json
+++ b/data/as/30038945/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038945/ws-services-calculation/WCBillingSlab.json b/data/as/30038945/ws-services-calculation/WCBillingSlab.json
index 2495e42192..c690a53e63 100644
--- a/data/as/30038945/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038945/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038960/ws-services-calculation/Penalty.json b/data/as/30038960/ws-services-calculation/Penalty.json
index 372ebfc0c4..ea8116399a 100644
--- a/data/as/30038960/ws-services-calculation/Penalty.json
+++ b/data/as/30038960/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038960/ws-services-calculation/WCBillingSlab.json b/data/as/30038960/ws-services-calculation/WCBillingSlab.json
index a6c4aedbc3..4a48e2929c 100644
--- a/data/as/30038960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038960/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30038988/ws-services-calculation/Penalty.json b/data/as/30038988/ws-services-calculation/Penalty.json
index 862ccaeff7..0876ebb419 100644
--- a/data/as/30038988/ws-services-calculation/Penalty.json
+++ b/data/as/30038988/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038988/ws-services-calculation/WCBillingSlab.json b/data/as/30038988/ws-services-calculation/WCBillingSlab.json
index daf062d877..79a8982b38 100644
--- a/data/as/30038988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038988/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30039003/ws-services-calculation/Penalty.json b/data/as/30039003/ws-services-calculation/Penalty.json
index 34d9eb24e2..74c7622c1f 100644
--- a/data/as/30039003/ws-services-calculation/Penalty.json
+++ b/data/as/30039003/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039003/ws-services-calculation/WCBillingSlab.json b/data/as/30039003/ws-services-calculation/WCBillingSlab.json
index ad57302094..71d52e6948 100644
--- a/data/as/30039003/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039003/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30039714/ws-services-calculation/Penalty.json b/data/as/30039714/ws-services-calculation/Penalty.json
index 9180b36be3..b7a1759109 100644
--- a/data/as/30039714/ws-services-calculation/Penalty.json
+++ b/data/as/30039714/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039714/ws-services-calculation/WCBillingSlab.json b/data/as/30039714/ws-services-calculation/WCBillingSlab.json
index 9ccd5cfbe9..e42ba15f93 100644
--- a/data/as/30039714/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039714/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30039715/ws-services-calculation/Penalty.json b/data/as/30039715/ws-services-calculation/Penalty.json
index 02f999b4e3..0b94d1b715 100644
--- a/data/as/30039715/ws-services-calculation/Penalty.json
+++ b/data/as/30039715/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039715/ws-services-calculation/WCBillingSlab.json b/data/as/30039715/ws-services-calculation/WCBillingSlab.json
index 22c444dc04..224db75465 100644
--- a/data/as/30039715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039715/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30039748/ws-services-calculation/Penalty.json b/data/as/30039748/ws-services-calculation/Penalty.json
index 0b8b08ebb5..35ccc1e002 100644
--- a/data/as/30039748/ws-services-calculation/Penalty.json
+++ b/data/as/30039748/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039748/ws-services-calculation/WCBillingSlab.json b/data/as/30039748/ws-services-calculation/WCBillingSlab.json
index 3e6b0a2e70..ed7e19934d 100644
--- a/data/as/30039748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039748/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30040182/ws-services-calculation/Penalty.json b/data/as/30040182/ws-services-calculation/Penalty.json
index ca264f482b..15a680d463 100644
--- a/data/as/30040182/ws-services-calculation/Penalty.json
+++ b/data/as/30040182/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30040182/ws-services-calculation/WCBillingSlab.json b/data/as/30040182/ws-services-calculation/WCBillingSlab.json
index 29a64defbc..30e4d29966 100644
--- a/data/as/30040182/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30040182/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30040815/ws-services-calculation/Penalty.json b/data/as/30040815/ws-services-calculation/Penalty.json
index c32496a4da..ac9ddb9618 100644
--- a/data/as/30040815/ws-services-calculation/Penalty.json
+++ b/data/as/30040815/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30040815/ws-services-calculation/WCBillingSlab.json b/data/as/30040815/ws-services-calculation/WCBillingSlab.json
index b538dc0a9d..6fce488441 100644
--- a/data/as/30040815/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30040815/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041202/ws-services-calculation/Penalty.json b/data/as/30041202/ws-services-calculation/Penalty.json
index 3f6fb511fa..3f4f290528 100644
--- a/data/as/30041202/ws-services-calculation/Penalty.json
+++ b/data/as/30041202/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041202/ws-services-calculation/WCBillingSlab.json b/data/as/30041202/ws-services-calculation/WCBillingSlab.json
index 8a39cbbc03..45b5953405 100644
--- a/data/as/30041202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041202/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041203/ws-services-calculation/Penalty.json b/data/as/30041203/ws-services-calculation/Penalty.json
index b0bf6fc3de..b00859a6c4 100644
--- a/data/as/30041203/ws-services-calculation/Penalty.json
+++ b/data/as/30041203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041203/ws-services-calculation/WCBillingSlab.json b/data/as/30041203/ws-services-calculation/WCBillingSlab.json
index a9952d4e4e..ccb59046d6 100644
--- a/data/as/30041203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041386/ws-services-calculation/Penalty.json b/data/as/30041386/ws-services-calculation/Penalty.json
index 7a6cf2f717..dcca71bf7f 100644
--- a/data/as/30041386/ws-services-calculation/Penalty.json
+++ b/data/as/30041386/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041386/ws-services-calculation/WCBillingSlab.json b/data/as/30041386/ws-services-calculation/WCBillingSlab.json
index 1c8756ce51..c31c14eaf6 100644
--- a/data/as/30041386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041386/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041849/ws-services-calculation/Penalty.json b/data/as/30041849/ws-services-calculation/Penalty.json
index d130412b93..ac9643f8d0 100644
--- a/data/as/30041849/ws-services-calculation/Penalty.json
+++ b/data/as/30041849/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041849/ws-services-calculation/WCBillingSlab.json b/data/as/30041849/ws-services-calculation/WCBillingSlab.json
index 2561ec9143..accdec3891 100644
--- a/data/as/30041849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041849/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041850/ws-services-calculation/Penalty.json b/data/as/30041850/ws-services-calculation/Penalty.json
index cae6b7f935..4f0b876a04 100644
--- a/data/as/30041850/ws-services-calculation/Penalty.json
+++ b/data/as/30041850/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041850/ws-services-calculation/WCBillingSlab.json b/data/as/30041850/ws-services-calculation/WCBillingSlab.json
index 586dd5df8b..f2a3ffe3a2 100644
--- a/data/as/30041850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041850/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041853/ws-services-calculation/Penalty.json b/data/as/30041853/ws-services-calculation/Penalty.json
index 88fea64b2d..a0f9847f6d 100644
--- a/data/as/30041853/ws-services-calculation/Penalty.json
+++ b/data/as/30041853/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041853/ws-services-calculation/WCBillingSlab.json b/data/as/30041853/ws-services-calculation/WCBillingSlab.json
index ce7eb7cacd..959e21fd71 100644
--- a/data/as/30041853/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041853/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041854/ws-services-calculation/Penalty.json b/data/as/30041854/ws-services-calculation/Penalty.json
index a8ff980e2e..af16bceb39 100644
--- a/data/as/30041854/ws-services-calculation/Penalty.json
+++ b/data/as/30041854/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041854/ws-services-calculation/WCBillingSlab.json b/data/as/30041854/ws-services-calculation/WCBillingSlab.json
index f1d8935351..1645298c1a 100644
--- a/data/as/30041854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041854/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041859/ws-services-calculation/Penalty.json b/data/as/30041859/ws-services-calculation/Penalty.json
index 87b6712cb2..0849e2194b 100644
--- a/data/as/30041859/ws-services-calculation/Penalty.json
+++ b/data/as/30041859/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041859/ws-services-calculation/WCBillingSlab.json b/data/as/30041859/ws-services-calculation/WCBillingSlab.json
index a67b6125c8..1d6362b212 100644
--- a/data/as/30041859/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041859/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041866/ws-services-calculation/Penalty.json b/data/as/30041866/ws-services-calculation/Penalty.json
index 65eed6a07d..fbfd1bd73e 100644
--- a/data/as/30041866/ws-services-calculation/Penalty.json
+++ b/data/as/30041866/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041866/ws-services-calculation/WCBillingSlab.json b/data/as/30041866/ws-services-calculation/WCBillingSlab.json
index ba61534fef..d2591f5439 100644
--- a/data/as/30041866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041866/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041873/ws-services-calculation/Penalty.json b/data/as/30041873/ws-services-calculation/Penalty.json
index b012ffd543..43cae7f135 100644
--- a/data/as/30041873/ws-services-calculation/Penalty.json
+++ b/data/as/30041873/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041873/ws-services-calculation/WCBillingSlab.json b/data/as/30041873/ws-services-calculation/WCBillingSlab.json
index e0d61463d9..9d56a2fa6b 100644
--- a/data/as/30041873/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041873/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041886/ws-services-calculation/Penalty.json b/data/as/30041886/ws-services-calculation/Penalty.json
index daf1077d38..620687a004 100644
--- a/data/as/30041886/ws-services-calculation/Penalty.json
+++ b/data/as/30041886/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041886/ws-services-calculation/WCBillingSlab.json b/data/as/30041886/ws-services-calculation/WCBillingSlab.json
index 457e3a57b6..58c2191b7b 100644
--- a/data/as/30041886/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041886/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041901/ws-services-calculation/Penalty.json b/data/as/30041901/ws-services-calculation/Penalty.json
index fbc8a0ae69..9f53424c1b 100644
--- a/data/as/30041901/ws-services-calculation/Penalty.json
+++ b/data/as/30041901/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041901/ws-services-calculation/WCBillingSlab.json b/data/as/30041901/ws-services-calculation/WCBillingSlab.json
index 69ac734292..36c9ed032a 100644
--- a/data/as/30041901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041901/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30041907/ws-services-calculation/Penalty.json b/data/as/30041907/ws-services-calculation/Penalty.json
index 56a04c4aa2..538e4d9e81 100644
--- a/data/as/30041907/ws-services-calculation/Penalty.json
+++ b/data/as/30041907/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041907/ws-services-calculation/WCBillingSlab.json b/data/as/30041907/ws-services-calculation/WCBillingSlab.json
index 0f2838c175..b6dd369551 100644
--- a/data/as/30041907/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041907/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042788/ws-services-calculation/Penalty.json b/data/as/30042788/ws-services-calculation/Penalty.json
index 81bcb46c7c..52e024dfa5 100644
--- a/data/as/30042788/ws-services-calculation/Penalty.json
+++ b/data/as/30042788/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042788/ws-services-calculation/WCBillingSlab.json b/data/as/30042788/ws-services-calculation/WCBillingSlab.json
index 41cb288456..4d8504f880 100644
--- a/data/as/30042788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042788/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042793/ws-services-calculation/Penalty.json b/data/as/30042793/ws-services-calculation/Penalty.json
index 82c07b1a33..b42446af64 100644
--- a/data/as/30042793/ws-services-calculation/Penalty.json
+++ b/data/as/30042793/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042793/ws-services-calculation/WCBillingSlab.json b/data/as/30042793/ws-services-calculation/WCBillingSlab.json
index 0078fa427e..8bc38dc3da 100644
--- a/data/as/30042793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042793/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042799/ws-services-calculation/Penalty.json b/data/as/30042799/ws-services-calculation/Penalty.json
index 1d98281523..4729076209 100644
--- a/data/as/30042799/ws-services-calculation/Penalty.json
+++ b/data/as/30042799/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042799/ws-services-calculation/WCBillingSlab.json b/data/as/30042799/ws-services-calculation/WCBillingSlab.json
index b3f4fc1a34..d511598fca 100644
--- a/data/as/30042799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042799/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042803/ws-services-calculation/Penalty.json b/data/as/30042803/ws-services-calculation/Penalty.json
index cfe1ee7f40..104696f347 100644
--- a/data/as/30042803/ws-services-calculation/Penalty.json
+++ b/data/as/30042803/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042803/ws-services-calculation/WCBillingSlab.json b/data/as/30042803/ws-services-calculation/WCBillingSlab.json
index 4f317ee639..5e657673aa 100644
--- a/data/as/30042803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042803/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042807/ws-services-calculation/Penalty.json b/data/as/30042807/ws-services-calculation/Penalty.json
index ae72a02dff..676ca70f04 100644
--- a/data/as/30042807/ws-services-calculation/Penalty.json
+++ b/data/as/30042807/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042807/ws-services-calculation/WCBillingSlab.json b/data/as/30042807/ws-services-calculation/WCBillingSlab.json
index 60aee3001b..e214b3a2e5 100644
--- a/data/as/30042807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042807/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042812/ws-services-calculation/Penalty.json b/data/as/30042812/ws-services-calculation/Penalty.json
index 829696689c..eb51b64b63 100644
--- a/data/as/30042812/ws-services-calculation/Penalty.json
+++ b/data/as/30042812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042812/ws-services-calculation/WCBillingSlab.json b/data/as/30042812/ws-services-calculation/WCBillingSlab.json
index 689cb58af0..cfbbed4eab 100644
--- a/data/as/30042812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042816/ws-services-calculation/Penalty.json b/data/as/30042816/ws-services-calculation/Penalty.json
index 694cfe9ec1..84ec689644 100644
--- a/data/as/30042816/ws-services-calculation/Penalty.json
+++ b/data/as/30042816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042816/ws-services-calculation/WCBillingSlab.json b/data/as/30042816/ws-services-calculation/WCBillingSlab.json
index 5f29a291e5..c022dd78cc 100644
--- a/data/as/30042816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042819/ws-services-calculation/Penalty.json b/data/as/30042819/ws-services-calculation/Penalty.json
index 69c740f989..a8943215a1 100644
--- a/data/as/30042819/ws-services-calculation/Penalty.json
+++ b/data/as/30042819/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042819/ws-services-calculation/WCBillingSlab.json b/data/as/30042819/ws-services-calculation/WCBillingSlab.json
index 8961d853cf..e6b6b54f61 100644
--- a/data/as/30042819/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042819/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042954/ws-services-calculation/Penalty.json b/data/as/30042954/ws-services-calculation/Penalty.json
index be98abaed5..2d8114e70b 100644
--- a/data/as/30042954/ws-services-calculation/Penalty.json
+++ b/data/as/30042954/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042954/ws-services-calculation/WCBillingSlab.json b/data/as/30042954/ws-services-calculation/WCBillingSlab.json
index 108535fd9b..fc03f440a4 100644
--- a/data/as/30042954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042954/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042955/ws-services-calculation/Penalty.json b/data/as/30042955/ws-services-calculation/Penalty.json
index 877e28012d..d39bfbb1b5 100644
--- a/data/as/30042955/ws-services-calculation/Penalty.json
+++ b/data/as/30042955/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042955/ws-services-calculation/WCBillingSlab.json b/data/as/30042955/ws-services-calculation/WCBillingSlab.json
index 07029010c8..a851a631ce 100644
--- a/data/as/30042955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042955/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042957/ws-services-calculation/Penalty.json b/data/as/30042957/ws-services-calculation/Penalty.json
index bd5f9fb5c9..270ec7c840 100644
--- a/data/as/30042957/ws-services-calculation/Penalty.json
+++ b/data/as/30042957/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042957/ws-services-calculation/WCBillingSlab.json b/data/as/30042957/ws-services-calculation/WCBillingSlab.json
index a9f83e7c40..0f08b707ef 100644
--- a/data/as/30042957/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042957/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042959/ws-services-calculation/Penalty.json b/data/as/30042959/ws-services-calculation/Penalty.json
index 84ecff0890..5f1157a345 100644
--- a/data/as/30042959/ws-services-calculation/Penalty.json
+++ b/data/as/30042959/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042959/ws-services-calculation/WCBillingSlab.json b/data/as/30042959/ws-services-calculation/WCBillingSlab.json
index e0af082670..68502da530 100644
--- a/data/as/30042959/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042959/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042961/ws-services-calculation/Penalty.json b/data/as/30042961/ws-services-calculation/Penalty.json
index 654b04d5a0..8ddb72de13 100644
--- a/data/as/30042961/ws-services-calculation/Penalty.json
+++ b/data/as/30042961/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042961/ws-services-calculation/WCBillingSlab.json b/data/as/30042961/ws-services-calculation/WCBillingSlab.json
index 96863dc0b2..ef934f6460 100644
--- a/data/as/30042961/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042961/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042963/ws-services-calculation/Penalty.json b/data/as/30042963/ws-services-calculation/Penalty.json
index 2f063f33e1..6af6361392 100644
--- a/data/as/30042963/ws-services-calculation/Penalty.json
+++ b/data/as/30042963/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042963/ws-services-calculation/WCBillingSlab.json b/data/as/30042963/ws-services-calculation/WCBillingSlab.json
index 698aa6f667..424e182a51 100644
--- a/data/as/30042963/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042963/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30042965/ws-services-calculation/Penalty.json b/data/as/30042965/ws-services-calculation/Penalty.json
index 9bc47f64e0..0a8227baac 100644
--- a/data/as/30042965/ws-services-calculation/Penalty.json
+++ b/data/as/30042965/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042965/ws-services-calculation/WCBillingSlab.json b/data/as/30042965/ws-services-calculation/WCBillingSlab.json
index bec3ae21e5..5bbd38f12b 100644
--- a/data/as/30042965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042965/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043286/ws-services-calculation/Penalty.json b/data/as/30043286/ws-services-calculation/Penalty.json
index b08365168f..020c5e0263 100644
--- a/data/as/30043286/ws-services-calculation/Penalty.json
+++ b/data/as/30043286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043286/ws-services-calculation/WCBillingSlab.json b/data/as/30043286/ws-services-calculation/WCBillingSlab.json
index 3e262ab38d..2a9ee921fe 100644
--- a/data/as/30043286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043298/ws-services-calculation/Penalty.json b/data/as/30043298/ws-services-calculation/Penalty.json
index 73fc7c5e21..8a11e3e3a2 100644
--- a/data/as/30043298/ws-services-calculation/Penalty.json
+++ b/data/as/30043298/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043298/ws-services-calculation/WCBillingSlab.json b/data/as/30043298/ws-services-calculation/WCBillingSlab.json
index 5a9fbeea48..b5d89527d8 100644
--- a/data/as/30043298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043298/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043311/ws-services-calculation/Penalty.json b/data/as/30043311/ws-services-calculation/Penalty.json
index e56771f69f..12a88b3269 100644
--- a/data/as/30043311/ws-services-calculation/Penalty.json
+++ b/data/as/30043311/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043311/ws-services-calculation/WCBillingSlab.json b/data/as/30043311/ws-services-calculation/WCBillingSlab.json
index c20ad96b0d..e75cd8d90b 100644
--- a/data/as/30043311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043311/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043314/ws-services-calculation/Penalty.json b/data/as/30043314/ws-services-calculation/Penalty.json
index ef202dacdf..6076a2335c 100644
--- a/data/as/30043314/ws-services-calculation/Penalty.json
+++ b/data/as/30043314/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043314/ws-services-calculation/WCBillingSlab.json b/data/as/30043314/ws-services-calculation/WCBillingSlab.json
index b3651e37bd..5fc65376c0 100644
--- a/data/as/30043314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043314/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043321/ws-services-calculation/Penalty.json b/data/as/30043321/ws-services-calculation/Penalty.json
index 28842c09f9..1ee9da3482 100644
--- a/data/as/30043321/ws-services-calculation/Penalty.json
+++ b/data/as/30043321/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043321/ws-services-calculation/WCBillingSlab.json b/data/as/30043321/ws-services-calculation/WCBillingSlab.json
index ab3726507f..6d7d5d40c0 100644
--- a/data/as/30043321/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043321/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043327/ws-services-calculation/Penalty.json b/data/as/30043327/ws-services-calculation/Penalty.json
index b1f3b6147c..2a3f1e88a5 100644
--- a/data/as/30043327/ws-services-calculation/Penalty.json
+++ b/data/as/30043327/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043327/ws-services-calculation/WCBillingSlab.json b/data/as/30043327/ws-services-calculation/WCBillingSlab.json
index 21c5133991..679d73d102 100644
--- a/data/as/30043327/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043327/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043330/ws-services-calculation/Penalty.json b/data/as/30043330/ws-services-calculation/Penalty.json
index 4d1e3b215b..7686d876e8 100644
--- a/data/as/30043330/ws-services-calculation/Penalty.json
+++ b/data/as/30043330/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043330/ws-services-calculation/WCBillingSlab.json b/data/as/30043330/ws-services-calculation/WCBillingSlab.json
index e17a281d8b..6687fdad6d 100644
--- a/data/as/30043330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043330/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043335/ws-services-calculation/Penalty.json b/data/as/30043335/ws-services-calculation/Penalty.json
index 0ad1da9fea..0acb311465 100644
--- a/data/as/30043335/ws-services-calculation/Penalty.json
+++ b/data/as/30043335/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043335/ws-services-calculation/WCBillingSlab.json b/data/as/30043335/ws-services-calculation/WCBillingSlab.json
index b754fac184..8ce0151a72 100644
--- a/data/as/30043335/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043335/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043343/ws-services-calculation/Penalty.json b/data/as/30043343/ws-services-calculation/Penalty.json
index 7dfd67a946..ac1dba78bf 100644
--- a/data/as/30043343/ws-services-calculation/Penalty.json
+++ b/data/as/30043343/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043343/ws-services-calculation/WCBillingSlab.json b/data/as/30043343/ws-services-calculation/WCBillingSlab.json
index 491c98a290..5410bdb66b 100644
--- a/data/as/30043343/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043343/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043349/ws-services-calculation/Penalty.json b/data/as/30043349/ws-services-calculation/Penalty.json
index 7f1cf27709..300c89b8a1 100644
--- a/data/as/30043349/ws-services-calculation/Penalty.json
+++ b/data/as/30043349/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043349/ws-services-calculation/WCBillingSlab.json b/data/as/30043349/ws-services-calculation/WCBillingSlab.json
index da927e9491..d3d03c661a 100644
--- a/data/as/30043349/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043349/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043358/ws-services-calculation/Penalty.json b/data/as/30043358/ws-services-calculation/Penalty.json
index 675c810b5a..1320475bb1 100644
--- a/data/as/30043358/ws-services-calculation/Penalty.json
+++ b/data/as/30043358/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043358/ws-services-calculation/WCBillingSlab.json b/data/as/30043358/ws-services-calculation/WCBillingSlab.json
index bbf517a7ce..0e065aef71 100644
--- a/data/as/30043358/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043358/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043557/ws-services-calculation/Penalty.json b/data/as/30043557/ws-services-calculation/Penalty.json
index 99fb38bdf2..6fcb05cff6 100644
--- a/data/as/30043557/ws-services-calculation/Penalty.json
+++ b/data/as/30043557/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043557/ws-services-calculation/WCBillingSlab.json b/data/as/30043557/ws-services-calculation/WCBillingSlab.json
index 13fdafbed3..cdf80716bb 100644
--- a/data/as/30043557/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043557/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043601/ws-services-calculation/Penalty.json b/data/as/30043601/ws-services-calculation/Penalty.json
index 37c9402f76..e0de99b778 100644
--- a/data/as/30043601/ws-services-calculation/Penalty.json
+++ b/data/as/30043601/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043601/ws-services-calculation/WCBillingSlab.json b/data/as/30043601/ws-services-calculation/WCBillingSlab.json
index 46dfb47c40..51ddcd57bc 100644
--- a/data/as/30043601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043601/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043606/ws-services-calculation/Penalty.json b/data/as/30043606/ws-services-calculation/Penalty.json
index 03775a97f0..46b8c36a94 100644
--- a/data/as/30043606/ws-services-calculation/Penalty.json
+++ b/data/as/30043606/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043606/ws-services-calculation/WCBillingSlab.json b/data/as/30043606/ws-services-calculation/WCBillingSlab.json
index 3827982693..08882341f5 100644
--- a/data/as/30043606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043606/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043782/ws-services-calculation/Penalty.json b/data/as/30043782/ws-services-calculation/Penalty.json
index 1e729390f6..ef5626f863 100644
--- a/data/as/30043782/ws-services-calculation/Penalty.json
+++ b/data/as/30043782/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043782/ws-services-calculation/WCBillingSlab.json b/data/as/30043782/ws-services-calculation/WCBillingSlab.json
index cdfa33e37e..4f71b1bc15 100644
--- a/data/as/30043782/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043782/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043797/ws-services-calculation/Penalty.json b/data/as/30043797/ws-services-calculation/Penalty.json
index 562b03bdce..8b32aa2328 100644
--- a/data/as/30043797/ws-services-calculation/Penalty.json
+++ b/data/as/30043797/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043797/ws-services-calculation/WCBillingSlab.json b/data/as/30043797/ws-services-calculation/WCBillingSlab.json
index 0bcbd0c175..24b7523f20 100644
--- a/data/as/30043797/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043797/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043820/ws-services-calculation/Penalty.json b/data/as/30043820/ws-services-calculation/Penalty.json
index 5975c015d3..e0f4e87732 100644
--- a/data/as/30043820/ws-services-calculation/Penalty.json
+++ b/data/as/30043820/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043820/ws-services-calculation/WCBillingSlab.json b/data/as/30043820/ws-services-calculation/WCBillingSlab.json
index e54c192d70..c63f65d412 100644
--- a/data/as/30043820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043820/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043846/ws-services-calculation/Penalty.json b/data/as/30043846/ws-services-calculation/Penalty.json
index 18670e2057..373f7b1cb6 100644
--- a/data/as/30043846/ws-services-calculation/Penalty.json
+++ b/data/as/30043846/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043846/ws-services-calculation/WCBillingSlab.json b/data/as/30043846/ws-services-calculation/WCBillingSlab.json
index 904c3155f5..daf8d2d0e5 100644
--- a/data/as/30043846/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043846/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043851/ws-services-calculation/Penalty.json b/data/as/30043851/ws-services-calculation/Penalty.json
index fb32a89175..f43c764c10 100644
--- a/data/as/30043851/ws-services-calculation/Penalty.json
+++ b/data/as/30043851/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043851/ws-services-calculation/WCBillingSlab.json b/data/as/30043851/ws-services-calculation/WCBillingSlab.json
index ed6f401df3..149c63d68b 100644
--- a/data/as/30043851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043851/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30043879/ws-services-calculation/Penalty.json b/data/as/30043879/ws-services-calculation/Penalty.json
index 45384f6266..bd06590995 100644
--- a/data/as/30043879/ws-services-calculation/Penalty.json
+++ b/data/as/30043879/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043879/ws-services-calculation/WCBillingSlab.json b/data/as/30043879/ws-services-calculation/WCBillingSlab.json
index 0d6a117f6e..12b14fb9c0 100644
--- a/data/as/30043879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043879/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30044254/ws-services-calculation/Penalty.json b/data/as/30044254/ws-services-calculation/Penalty.json
index 68359bc51c..e7430d9a8f 100644
--- a/data/as/30044254/ws-services-calculation/Penalty.json
+++ b/data/as/30044254/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044254/ws-services-calculation/WCBillingSlab.json b/data/as/30044254/ws-services-calculation/WCBillingSlab.json
index 3e3ca1d80b..b365d25453 100644
--- a/data/as/30044254/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044254/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30044293/ws-services-calculation/Penalty.json b/data/as/30044293/ws-services-calculation/Penalty.json
index e59c7b19da..3ec59de987 100644
--- a/data/as/30044293/ws-services-calculation/Penalty.json
+++ b/data/as/30044293/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044293/ws-services-calculation/WCBillingSlab.json b/data/as/30044293/ws-services-calculation/WCBillingSlab.json
index b14af2f151..f6ae464bde 100644
--- a/data/as/30044293/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044293/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30044481/ws-services-calculation/Penalty.json b/data/as/30044481/ws-services-calculation/Penalty.json
index 462566a0f0..e19a0f6593 100644
--- a/data/as/30044481/ws-services-calculation/Penalty.json
+++ b/data/as/30044481/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044481/ws-services-calculation/WCBillingSlab.json b/data/as/30044481/ws-services-calculation/WCBillingSlab.json
index 694988798f..1604daad3f 100644
--- a/data/as/30044481/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044481/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30044491/ws-services-calculation/Penalty.json b/data/as/30044491/ws-services-calculation/Penalty.json
index 17f2a20e69..a76079c8b4 100644
--- a/data/as/30044491/ws-services-calculation/Penalty.json
+++ b/data/as/30044491/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044491/ws-services-calculation/WCBillingSlab.json b/data/as/30044491/ws-services-calculation/WCBillingSlab.json
index b477f38ed9..cf4890e307 100644
--- a/data/as/30044491/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044491/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30045140/ws-services-calculation/Penalty.json b/data/as/30045140/ws-services-calculation/Penalty.json
index 6583f37024..b688f86c02 100644
--- a/data/as/30045140/ws-services-calculation/Penalty.json
+++ b/data/as/30045140/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30045140/ws-services-calculation/WCBillingSlab.json b/data/as/30045140/ws-services-calculation/WCBillingSlab.json
index 8582859b7b..40f4417a90 100644
--- a/data/as/30045140/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30045140/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30045632/ws-services-calculation/Penalty.json b/data/as/30045632/ws-services-calculation/Penalty.json
index 707ee19aca..2f0fc714db 100644
--- a/data/as/30045632/ws-services-calculation/Penalty.json
+++ b/data/as/30045632/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30045632/ws-services-calculation/WCBillingSlab.json b/data/as/30045632/ws-services-calculation/WCBillingSlab.json
index 1cf930f141..08c88465e7 100644
--- a/data/as/30045632/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30045632/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30045635/ws-services-calculation/Penalty.json b/data/as/30045635/ws-services-calculation/Penalty.json
index 423a0e2d74..82b31ba4f0 100644
--- a/data/as/30045635/ws-services-calculation/Penalty.json
+++ b/data/as/30045635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30045635/ws-services-calculation/WCBillingSlab.json b/data/as/30045635/ws-services-calculation/WCBillingSlab.json
index b8da524b6b..b6dc4f88e5 100644
--- a/data/as/30045635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30045635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30046142/ws-services-calculation/Penalty.json b/data/as/30046142/ws-services-calculation/Penalty.json
index f4e928741b..98d69513ca 100644
--- a/data/as/30046142/ws-services-calculation/Penalty.json
+++ b/data/as/30046142/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046142/ws-services-calculation/WCBillingSlab.json b/data/as/30046142/ws-services-calculation/WCBillingSlab.json
index 6c40934f2f..db524fc5cb 100644
--- a/data/as/30046142/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046142/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30046178/ws-services-calculation/Penalty.json b/data/as/30046178/ws-services-calculation/Penalty.json
index 6849f66141..0c2a9628f4 100644
--- a/data/as/30046178/ws-services-calculation/Penalty.json
+++ b/data/as/30046178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046178/ws-services-calculation/WCBillingSlab.json b/data/as/30046178/ws-services-calculation/WCBillingSlab.json
index 648cfaf863..c83d149166 100644
--- a/data/as/30046178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30046241/ws-services-calculation/Penalty.json b/data/as/30046241/ws-services-calculation/Penalty.json
index a67316da05..33cb729d44 100644
--- a/data/as/30046241/ws-services-calculation/Penalty.json
+++ b/data/as/30046241/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046241/ws-services-calculation/WCBillingSlab.json b/data/as/30046241/ws-services-calculation/WCBillingSlab.json
index 914a0eaea3..7868b90bf1 100644
--- a/data/as/30046241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046241/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30046274/ws-services-calculation/Penalty.json b/data/as/30046274/ws-services-calculation/Penalty.json
index 456f162d06..fb6f34015a 100644
--- a/data/as/30046274/ws-services-calculation/Penalty.json
+++ b/data/as/30046274/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046274/ws-services-calculation/WCBillingSlab.json b/data/as/30046274/ws-services-calculation/WCBillingSlab.json
index 15af529efa..c9ad6f5607 100644
--- a/data/as/30046274/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046274/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30046286/ws-services-calculation/Penalty.json b/data/as/30046286/ws-services-calculation/Penalty.json
index eba3cbffab..2f79b4b452 100644
--- a/data/as/30046286/ws-services-calculation/Penalty.json
+++ b/data/as/30046286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046286/ws-services-calculation/WCBillingSlab.json b/data/as/30046286/ws-services-calculation/WCBillingSlab.json
index 4ee0ba3a12..b8bb6d6fd3 100644
--- a/data/as/30046286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30046465/ws-services-calculation/Penalty.json b/data/as/30046465/ws-services-calculation/Penalty.json
index 72d59842c0..091b7ed55b 100644
--- a/data/as/30046465/ws-services-calculation/Penalty.json
+++ b/data/as/30046465/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046465/ws-services-calculation/WCBillingSlab.json b/data/as/30046465/ws-services-calculation/WCBillingSlab.json
index cc82e7efba..1fe3422597 100644
--- a/data/as/30046465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046465/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048127/ws-services-calculation/Penalty.json b/data/as/30048127/ws-services-calculation/Penalty.json
index 537d9bbf4f..1f242f5bad 100644
--- a/data/as/30048127/ws-services-calculation/Penalty.json
+++ b/data/as/30048127/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048127/ws-services-calculation/WCBillingSlab.json b/data/as/30048127/ws-services-calculation/WCBillingSlab.json
index c5e0ae9868..370d40ec03 100644
--- a/data/as/30048127/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048127/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048267/ws-services-calculation/Penalty.json b/data/as/30048267/ws-services-calculation/Penalty.json
index 3e183d18ca..40b144ff9f 100644
--- a/data/as/30048267/ws-services-calculation/Penalty.json
+++ b/data/as/30048267/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048267/ws-services-calculation/WCBillingSlab.json b/data/as/30048267/ws-services-calculation/WCBillingSlab.json
index 117fa2a9cf..be7da0b909 100644
--- a/data/as/30048267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048267/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048408/ws-services-calculation/Penalty.json b/data/as/30048408/ws-services-calculation/Penalty.json
index b4df82d2e5..833c71117e 100644
--- a/data/as/30048408/ws-services-calculation/Penalty.json
+++ b/data/as/30048408/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048408/ws-services-calculation/WCBillingSlab.json b/data/as/30048408/ws-services-calculation/WCBillingSlab.json
index 7ec2378711..289c758f5b 100644
--- a/data/as/30048408/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048408/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048644/ws-services-calculation/Penalty.json b/data/as/30048644/ws-services-calculation/Penalty.json
index e284c4730b..eedc35b417 100644
--- a/data/as/30048644/ws-services-calculation/Penalty.json
+++ b/data/as/30048644/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048644/ws-services-calculation/WCBillingSlab.json b/data/as/30048644/ws-services-calculation/WCBillingSlab.json
index a3301ea8f8..b9b5653fc7 100644
--- a/data/as/30048644/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048644/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048673/ws-services-calculation/Penalty.json b/data/as/30048673/ws-services-calculation/Penalty.json
index 35208acb50..e84f7e7ae7 100644
--- a/data/as/30048673/ws-services-calculation/Penalty.json
+++ b/data/as/30048673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048673/ws-services-calculation/WCBillingSlab.json b/data/as/30048673/ws-services-calculation/WCBillingSlab.json
index 2fc4bfd082..e9b29bdb1b 100644
--- a/data/as/30048673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048680/ws-services-calculation/Penalty.json b/data/as/30048680/ws-services-calculation/Penalty.json
index 0304d0e8bf..5ba30bb551 100644
--- a/data/as/30048680/ws-services-calculation/Penalty.json
+++ b/data/as/30048680/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048680/ws-services-calculation/WCBillingSlab.json b/data/as/30048680/ws-services-calculation/WCBillingSlab.json
index 2d5251bf23..5b101d0e2e 100644
--- a/data/as/30048680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048680/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048696/ws-services-calculation/Penalty.json b/data/as/30048696/ws-services-calculation/Penalty.json
index de67b6a27e..66aaa433bc 100644
--- a/data/as/30048696/ws-services-calculation/Penalty.json
+++ b/data/as/30048696/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048696/ws-services-calculation/WCBillingSlab.json b/data/as/30048696/ws-services-calculation/WCBillingSlab.json
index eef3018f94..da4b6729b7 100644
--- a/data/as/30048696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048696/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048776/ws-services-calculation/Penalty.json b/data/as/30048776/ws-services-calculation/Penalty.json
index cbcad9259b..3e847a132a 100644
--- a/data/as/30048776/ws-services-calculation/Penalty.json
+++ b/data/as/30048776/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048776/ws-services-calculation/WCBillingSlab.json b/data/as/30048776/ws-services-calculation/WCBillingSlab.json
index 73931d9ee8..28a72dfde3 100644
--- a/data/as/30048776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048776/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048965/ws-services-calculation/Penalty.json b/data/as/30048965/ws-services-calculation/Penalty.json
index 2e71e0fabf..8abd09e270 100644
--- a/data/as/30048965/ws-services-calculation/Penalty.json
+++ b/data/as/30048965/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048965/ws-services-calculation/WCBillingSlab.json b/data/as/30048965/ws-services-calculation/WCBillingSlab.json
index 80ac11781e..7363fc8173 100644
--- a/data/as/30048965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048965/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048987/ws-services-calculation/Penalty.json b/data/as/30048987/ws-services-calculation/Penalty.json
index 7f8cfd9e62..24a9480ea7 100644
--- a/data/as/30048987/ws-services-calculation/Penalty.json
+++ b/data/as/30048987/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048987/ws-services-calculation/WCBillingSlab.json b/data/as/30048987/ws-services-calculation/WCBillingSlab.json
index 56d932f18a..081447074d 100644
--- a/data/as/30048987/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048987/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30048994/ws-services-calculation/Penalty.json b/data/as/30048994/ws-services-calculation/Penalty.json
index d334302f56..f7c6d32000 100644
--- a/data/as/30048994/ws-services-calculation/Penalty.json
+++ b/data/as/30048994/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048994/ws-services-calculation/WCBillingSlab.json b/data/as/30048994/ws-services-calculation/WCBillingSlab.json
index 7819925e07..560ac51299 100644
--- a/data/as/30048994/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048994/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049004/ws-services-calculation/Penalty.json b/data/as/30049004/ws-services-calculation/Penalty.json
index 80c40defcf..2c2d292f29 100644
--- a/data/as/30049004/ws-services-calculation/Penalty.json
+++ b/data/as/30049004/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049004/ws-services-calculation/WCBillingSlab.json b/data/as/30049004/ws-services-calculation/WCBillingSlab.json
index bc70b5cec1..e08c21d1b2 100644
--- a/data/as/30049004/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049004/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049048/ws-services-calculation/Penalty.json b/data/as/30049048/ws-services-calculation/Penalty.json
index 3ed9d3fba6..589c09f7d6 100644
--- a/data/as/30049048/ws-services-calculation/Penalty.json
+++ b/data/as/30049048/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049048/ws-services-calculation/WCBillingSlab.json b/data/as/30049048/ws-services-calculation/WCBillingSlab.json
index c91bad2c72..95b96fcae6 100644
--- a/data/as/30049048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049048/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049049/ws-services-calculation/Penalty.json b/data/as/30049049/ws-services-calculation/Penalty.json
index 68dea1d40b..68b373a806 100644
--- a/data/as/30049049/ws-services-calculation/Penalty.json
+++ b/data/as/30049049/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049049/ws-services-calculation/WCBillingSlab.json b/data/as/30049049/ws-services-calculation/WCBillingSlab.json
index ea097eb61f..89750bbc85 100644
--- a/data/as/30049049/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049049/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049050/ws-services-calculation/Penalty.json b/data/as/30049050/ws-services-calculation/Penalty.json
index 69d9492a5c..851badff7f 100644
--- a/data/as/30049050/ws-services-calculation/Penalty.json
+++ b/data/as/30049050/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049050/ws-services-calculation/WCBillingSlab.json b/data/as/30049050/ws-services-calculation/WCBillingSlab.json
index c3140a3d64..3f003a78d8 100644
--- a/data/as/30049050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049050/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049081/ws-services-calculation/Penalty.json b/data/as/30049081/ws-services-calculation/Penalty.json
index a1e1c585f9..ba538edde2 100644
--- a/data/as/30049081/ws-services-calculation/Penalty.json
+++ b/data/as/30049081/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049081/ws-services-calculation/WCBillingSlab.json b/data/as/30049081/ws-services-calculation/WCBillingSlab.json
index a02ce2a558..d3ee35cc3b 100644
--- a/data/as/30049081/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049081/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049228/ws-services-calculation/Penalty.json b/data/as/30049228/ws-services-calculation/Penalty.json
index 5b993f3cd4..fb625aa616 100644
--- a/data/as/30049228/ws-services-calculation/Penalty.json
+++ b/data/as/30049228/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049228/ws-services-calculation/WCBillingSlab.json b/data/as/30049228/ws-services-calculation/WCBillingSlab.json
index 46dbdafb52..48e4dc7fc0 100644
--- a/data/as/30049228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049228/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049262/ws-services-calculation/Penalty.json b/data/as/30049262/ws-services-calculation/Penalty.json
index 7962bb2437..f71410f8f0 100644
--- a/data/as/30049262/ws-services-calculation/Penalty.json
+++ b/data/as/30049262/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049262/ws-services-calculation/WCBillingSlab.json b/data/as/30049262/ws-services-calculation/WCBillingSlab.json
index 2bde694962..e2dc91a773 100644
--- a/data/as/30049262/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049262/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049278/ws-services-calculation/Penalty.json b/data/as/30049278/ws-services-calculation/Penalty.json
index 1c169d627d..5171eff1f0 100644
--- a/data/as/30049278/ws-services-calculation/Penalty.json
+++ b/data/as/30049278/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049278/ws-services-calculation/WCBillingSlab.json b/data/as/30049278/ws-services-calculation/WCBillingSlab.json
index 70c35297e5..4404886577 100644
--- a/data/as/30049278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049278/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049299/ws-services-calculation/Penalty.json b/data/as/30049299/ws-services-calculation/Penalty.json
index 049cef3d35..4cfe9a0171 100644
--- a/data/as/30049299/ws-services-calculation/Penalty.json
+++ b/data/as/30049299/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049299/ws-services-calculation/WCBillingSlab.json b/data/as/30049299/ws-services-calculation/WCBillingSlab.json
index cbe01fd6f1..a678ef8398 100644
--- a/data/as/30049299/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049299/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049604/ws-services-calculation/Penalty.json b/data/as/30049604/ws-services-calculation/Penalty.json
index 66262c9690..450aef7fd6 100644
--- a/data/as/30049604/ws-services-calculation/Penalty.json
+++ b/data/as/30049604/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049604/ws-services-calculation/WCBillingSlab.json b/data/as/30049604/ws-services-calculation/WCBillingSlab.json
index 0a90be1acf..6cdced999d 100644
--- a/data/as/30049604/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049604/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049608/ws-services-calculation/Penalty.json b/data/as/30049608/ws-services-calculation/Penalty.json
index 9a0f3f18d1..5c6bf21400 100644
--- a/data/as/30049608/ws-services-calculation/Penalty.json
+++ b/data/as/30049608/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049608/ws-services-calculation/WCBillingSlab.json b/data/as/30049608/ws-services-calculation/WCBillingSlab.json
index 64575e7f2d..4f0f0531ba 100644
--- a/data/as/30049608/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049608/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049610/ws-services-calculation/Penalty.json b/data/as/30049610/ws-services-calculation/Penalty.json
index 4adf77d7f7..2234e4e4bb 100644
--- a/data/as/30049610/ws-services-calculation/Penalty.json
+++ b/data/as/30049610/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049610/ws-services-calculation/WCBillingSlab.json b/data/as/30049610/ws-services-calculation/WCBillingSlab.json
index 0022f16e3e..b1312fb982 100644
--- a/data/as/30049610/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049610/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049624/ws-services-calculation/Penalty.json b/data/as/30049624/ws-services-calculation/Penalty.json
index d1cb33251f..fb6902462e 100644
--- a/data/as/30049624/ws-services-calculation/Penalty.json
+++ b/data/as/30049624/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049624/ws-services-calculation/WCBillingSlab.json b/data/as/30049624/ws-services-calculation/WCBillingSlab.json
index 5857ad499a..47ffc9b212 100644
--- a/data/as/30049624/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049624/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049625/ws-services-calculation/Penalty.json b/data/as/30049625/ws-services-calculation/Penalty.json
index 4d7c364307..a604775eef 100644
--- a/data/as/30049625/ws-services-calculation/Penalty.json
+++ b/data/as/30049625/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049625/ws-services-calculation/WCBillingSlab.json b/data/as/30049625/ws-services-calculation/WCBillingSlab.json
index c05b1733fe..7fbec785e1 100644
--- a/data/as/30049625/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049625/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049629/ws-services-calculation/Penalty.json b/data/as/30049629/ws-services-calculation/Penalty.json
index 1eb2880f23..f17fba81b1 100644
--- a/data/as/30049629/ws-services-calculation/Penalty.json
+++ b/data/as/30049629/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049629/ws-services-calculation/WCBillingSlab.json b/data/as/30049629/ws-services-calculation/WCBillingSlab.json
index f4de198460..3d59292de9 100644
--- a/data/as/30049629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049629/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049631/ws-services-calculation/Penalty.json b/data/as/30049631/ws-services-calculation/Penalty.json
index 5ab7c39961..5bf606b994 100644
--- a/data/as/30049631/ws-services-calculation/Penalty.json
+++ b/data/as/30049631/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049631/ws-services-calculation/WCBillingSlab.json b/data/as/30049631/ws-services-calculation/WCBillingSlab.json
index da1258de31..3ce74d81a9 100644
--- a/data/as/30049631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049631/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049632/ws-services-calculation/Penalty.json b/data/as/30049632/ws-services-calculation/Penalty.json
index dabf4a4893..f993e9407a 100644
--- a/data/as/30049632/ws-services-calculation/Penalty.json
+++ b/data/as/30049632/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049632/ws-services-calculation/WCBillingSlab.json b/data/as/30049632/ws-services-calculation/WCBillingSlab.json
index 991ddc8183..4e1d984a89 100644
--- a/data/as/30049632/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049632/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049922/ws-services-calculation/Penalty.json b/data/as/30049922/ws-services-calculation/Penalty.json
index a168b0401e..3c8f0ede83 100644
--- a/data/as/30049922/ws-services-calculation/Penalty.json
+++ b/data/as/30049922/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049922/ws-services-calculation/WCBillingSlab.json b/data/as/30049922/ws-services-calculation/WCBillingSlab.json
index 2edd83f059..ac32518ae1 100644
--- a/data/as/30049922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049922/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049941/ws-services-calculation/Penalty.json b/data/as/30049941/ws-services-calculation/Penalty.json
index 5db4babe94..74c685f933 100644
--- a/data/as/30049941/ws-services-calculation/Penalty.json
+++ b/data/as/30049941/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049941/ws-services-calculation/WCBillingSlab.json b/data/as/30049941/ws-services-calculation/WCBillingSlab.json
index ba8a82d625..0c96bf7565 100644
--- a/data/as/30049941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049941/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30049949/ws-services-calculation/Penalty.json b/data/as/30049949/ws-services-calculation/Penalty.json
index 619870b52c..3a6c32e4ce 100644
--- a/data/as/30049949/ws-services-calculation/Penalty.json
+++ b/data/as/30049949/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049949/ws-services-calculation/WCBillingSlab.json b/data/as/30049949/ws-services-calculation/WCBillingSlab.json
index 2ff1e01ce2..fb2974308c 100644
--- a/data/as/30049949/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049949/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30050030/ws-services-calculation/Penalty.json b/data/as/30050030/ws-services-calculation/Penalty.json
index fe9c004e73..f10f4e24bd 100644
--- a/data/as/30050030/ws-services-calculation/Penalty.json
+++ b/data/as/30050030/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050030/ws-services-calculation/WCBillingSlab.json b/data/as/30050030/ws-services-calculation/WCBillingSlab.json
index 8ece54aed3..c05e11b194 100644
--- a/data/as/30050030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050030/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30050223/ws-services-calculation/Penalty.json b/data/as/30050223/ws-services-calculation/Penalty.json
index db290c86b5..f8dd5672f9 100644
--- a/data/as/30050223/ws-services-calculation/Penalty.json
+++ b/data/as/30050223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050223/ws-services-calculation/WCBillingSlab.json b/data/as/30050223/ws-services-calculation/WCBillingSlab.json
index 23636a5506..45ef579faa 100644
--- a/data/as/30050223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30050805/ws-services-calculation/Penalty.json b/data/as/30050805/ws-services-calculation/Penalty.json
index f3c371576d..48c7c3cea8 100644
--- a/data/as/30050805/ws-services-calculation/Penalty.json
+++ b/data/as/30050805/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050805/ws-services-calculation/WCBillingSlab.json b/data/as/30050805/ws-services-calculation/WCBillingSlab.json
index e933e41bd3..5eb92ce12c 100644
--- a/data/as/30050805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050805/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30050939/ws-services-calculation/Penalty.json b/data/as/30050939/ws-services-calculation/Penalty.json
index 9329175fb9..91447d1538 100644
--- a/data/as/30050939/ws-services-calculation/Penalty.json
+++ b/data/as/30050939/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050939/ws-services-calculation/WCBillingSlab.json b/data/as/30050939/ws-services-calculation/WCBillingSlab.json
index 711b87027f..a948143094 100644
--- a/data/as/30050939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050939/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30050952/ws-services-calculation/Penalty.json b/data/as/30050952/ws-services-calculation/Penalty.json
index 5febdf8109..3ab883372b 100644
--- a/data/as/30050952/ws-services-calculation/Penalty.json
+++ b/data/as/30050952/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050952/ws-services-calculation/WCBillingSlab.json b/data/as/30050952/ws-services-calculation/WCBillingSlab.json
index d2a81d2376..d8f76660e8 100644
--- a/data/as/30050952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050952/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051014/ws-services-calculation/Penalty.json b/data/as/30051014/ws-services-calculation/Penalty.json
index 7b7228f0d3..5d547f18fa 100644
--- a/data/as/30051014/ws-services-calculation/Penalty.json
+++ b/data/as/30051014/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051014/ws-services-calculation/WCBillingSlab.json b/data/as/30051014/ws-services-calculation/WCBillingSlab.json
index b932cd58f8..89fe508471 100644
--- a/data/as/30051014/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051014/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051018/ws-services-calculation/Penalty.json b/data/as/30051018/ws-services-calculation/Penalty.json
index 3924b33b37..05187d8bb5 100644
--- a/data/as/30051018/ws-services-calculation/Penalty.json
+++ b/data/as/30051018/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051018/ws-services-calculation/WCBillingSlab.json b/data/as/30051018/ws-services-calculation/WCBillingSlab.json
index 5332cf12b2..94a717ffee 100644
--- a/data/as/30051018/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051018/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051021/ws-services-calculation/Penalty.json b/data/as/30051021/ws-services-calculation/Penalty.json
index cf78484b85..5bab04cd1c 100644
--- a/data/as/30051021/ws-services-calculation/Penalty.json
+++ b/data/as/30051021/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051021/ws-services-calculation/WCBillingSlab.json b/data/as/30051021/ws-services-calculation/WCBillingSlab.json
index 807b2ad9ca..431f77506d 100644
--- a/data/as/30051021/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051021/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051023/ws-services-calculation/Penalty.json b/data/as/30051023/ws-services-calculation/Penalty.json
index 274df2dadf..e2bfc337f1 100644
--- a/data/as/30051023/ws-services-calculation/Penalty.json
+++ b/data/as/30051023/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051023/ws-services-calculation/WCBillingSlab.json b/data/as/30051023/ws-services-calculation/WCBillingSlab.json
index 16fd4df73e..e8cbaedd7d 100644
--- a/data/as/30051023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051023/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051099/ws-services-calculation/Penalty.json b/data/as/30051099/ws-services-calculation/Penalty.json
index c80661e5f2..b8ee05b149 100644
--- a/data/as/30051099/ws-services-calculation/Penalty.json
+++ b/data/as/30051099/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051099/ws-services-calculation/WCBillingSlab.json b/data/as/30051099/ws-services-calculation/WCBillingSlab.json
index 6f9bd7ebfb..efce5e3a50 100644
--- a/data/as/30051099/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051099/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051263/ws-services-calculation/Penalty.json b/data/as/30051263/ws-services-calculation/Penalty.json
index c5d82239b4..d6318d1741 100644
--- a/data/as/30051263/ws-services-calculation/Penalty.json
+++ b/data/as/30051263/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051263/ws-services-calculation/WCBillingSlab.json b/data/as/30051263/ws-services-calculation/WCBillingSlab.json
index 9fc0cf30a9..2c04891316 100644
--- a/data/as/30051263/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051263/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051272/ws-services-calculation/Penalty.json b/data/as/30051272/ws-services-calculation/Penalty.json
index 78349827f0..249870d32a 100644
--- a/data/as/30051272/ws-services-calculation/Penalty.json
+++ b/data/as/30051272/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051272/ws-services-calculation/WCBillingSlab.json b/data/as/30051272/ws-services-calculation/WCBillingSlab.json
index 4426f4c67d..58c7f7360e 100644
--- a/data/as/30051272/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051272/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051276/ws-services-calculation/Penalty.json b/data/as/30051276/ws-services-calculation/Penalty.json
index 5726ecea46..9e0630eb34 100644
--- a/data/as/30051276/ws-services-calculation/Penalty.json
+++ b/data/as/30051276/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051276/ws-services-calculation/WCBillingSlab.json b/data/as/30051276/ws-services-calculation/WCBillingSlab.json
index fb9d9f0d4f..a508db6181 100644
--- a/data/as/30051276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051276/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051373/ws-services-calculation/Penalty.json b/data/as/30051373/ws-services-calculation/Penalty.json
index 52efa2af19..ce37689615 100644
--- a/data/as/30051373/ws-services-calculation/Penalty.json
+++ b/data/as/30051373/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051373/ws-services-calculation/WCBillingSlab.json b/data/as/30051373/ws-services-calculation/WCBillingSlab.json
index 793f62b441..a919d11552 100644
--- a/data/as/30051373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051373/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051391/ws-services-calculation/Penalty.json b/data/as/30051391/ws-services-calculation/Penalty.json
index 89c29a9484..30ff32de0d 100644
--- a/data/as/30051391/ws-services-calculation/Penalty.json
+++ b/data/as/30051391/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051391/ws-services-calculation/WCBillingSlab.json b/data/as/30051391/ws-services-calculation/WCBillingSlab.json
index 73c69370f5..75a15bd73c 100644
--- a/data/as/30051391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051391/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051400/ws-services-calculation/Penalty.json b/data/as/30051400/ws-services-calculation/Penalty.json
index 46f4ea3ff6..df89cbb90d 100644
--- a/data/as/30051400/ws-services-calculation/Penalty.json
+++ b/data/as/30051400/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051400/ws-services-calculation/WCBillingSlab.json b/data/as/30051400/ws-services-calculation/WCBillingSlab.json
index 5a99c75534..11d015586d 100644
--- a/data/as/30051400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051400/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051407/ws-services-calculation/Penalty.json b/data/as/30051407/ws-services-calculation/Penalty.json
index 6893350866..e01195ac7d 100644
--- a/data/as/30051407/ws-services-calculation/Penalty.json
+++ b/data/as/30051407/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051407/ws-services-calculation/WCBillingSlab.json b/data/as/30051407/ws-services-calculation/WCBillingSlab.json
index f0bae6485e..9d0aeb531c 100644
--- a/data/as/30051407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051407/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051492/ws-services-calculation/Penalty.json b/data/as/30051492/ws-services-calculation/Penalty.json
index f6b346940e..935e488c54 100644
--- a/data/as/30051492/ws-services-calculation/Penalty.json
+++ b/data/as/30051492/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051492/ws-services-calculation/WCBillingSlab.json b/data/as/30051492/ws-services-calculation/WCBillingSlab.json
index 8f1ee93845..05cb384c1c 100644
--- a/data/as/30051492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051492/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051495/ws-services-calculation/Penalty.json b/data/as/30051495/ws-services-calculation/Penalty.json
index a32c21bd13..8bd734685f 100644
--- a/data/as/30051495/ws-services-calculation/Penalty.json
+++ b/data/as/30051495/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051495/ws-services-calculation/WCBillingSlab.json b/data/as/30051495/ws-services-calculation/WCBillingSlab.json
index ca80e23525..7970175ea7 100644
--- a/data/as/30051495/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051495/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051497/ws-services-calculation/Penalty.json b/data/as/30051497/ws-services-calculation/Penalty.json
index e337a32056..6d48023466 100644
--- a/data/as/30051497/ws-services-calculation/Penalty.json
+++ b/data/as/30051497/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051497/ws-services-calculation/WCBillingSlab.json b/data/as/30051497/ws-services-calculation/WCBillingSlab.json
index 80e41e524e..a21dcbfa8c 100644
--- a/data/as/30051497/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051497/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051501/ws-services-calculation/Penalty.json b/data/as/30051501/ws-services-calculation/Penalty.json
index b20f35ae2f..799b1bc8a8 100644
--- a/data/as/30051501/ws-services-calculation/Penalty.json
+++ b/data/as/30051501/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051501/ws-services-calculation/WCBillingSlab.json b/data/as/30051501/ws-services-calculation/WCBillingSlab.json
index d2f04640c9..c126a2c251 100644
--- a/data/as/30051501/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051501/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051507/ws-services-calculation/Penalty.json b/data/as/30051507/ws-services-calculation/Penalty.json
index 5bcf73b728..7c9cc74341 100644
--- a/data/as/30051507/ws-services-calculation/Penalty.json
+++ b/data/as/30051507/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051507/ws-services-calculation/WCBillingSlab.json b/data/as/30051507/ws-services-calculation/WCBillingSlab.json
index e79208c91a..fd87af5efe 100644
--- a/data/as/30051507/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051507/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051529/ws-services-calculation/Penalty.json b/data/as/30051529/ws-services-calculation/Penalty.json
index 3700220c6b..055a628d3a 100644
--- a/data/as/30051529/ws-services-calculation/Penalty.json
+++ b/data/as/30051529/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051529/ws-services-calculation/WCBillingSlab.json b/data/as/30051529/ws-services-calculation/WCBillingSlab.json
index 9774a5835c..1554415863 100644
--- a/data/as/30051529/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051529/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051562/ws-services-calculation/Penalty.json b/data/as/30051562/ws-services-calculation/Penalty.json
index c0ce95ed0c..5a8f3bf5c8 100644
--- a/data/as/30051562/ws-services-calculation/Penalty.json
+++ b/data/as/30051562/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051562/ws-services-calculation/WCBillingSlab.json b/data/as/30051562/ws-services-calculation/WCBillingSlab.json
index 71b0510478..b2c12846be 100644
--- a/data/as/30051562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051562/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051569/ws-services-calculation/Penalty.json b/data/as/30051569/ws-services-calculation/Penalty.json
index 11d7f74a82..e84af7f938 100644
--- a/data/as/30051569/ws-services-calculation/Penalty.json
+++ b/data/as/30051569/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051569/ws-services-calculation/WCBillingSlab.json b/data/as/30051569/ws-services-calculation/WCBillingSlab.json
index 4fa1773739..5291d7a2bb 100644
--- a/data/as/30051569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051569/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051624/ws-services-calculation/Penalty.json b/data/as/30051624/ws-services-calculation/Penalty.json
index 660b80d708..8b8af407a1 100644
--- a/data/as/30051624/ws-services-calculation/Penalty.json
+++ b/data/as/30051624/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051624/ws-services-calculation/WCBillingSlab.json b/data/as/30051624/ws-services-calculation/WCBillingSlab.json
index 13b1f161c6..00a79034be 100644
--- a/data/as/30051624/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051624/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30051683/ws-services-calculation/Penalty.json b/data/as/30051683/ws-services-calculation/Penalty.json
index 3e0d902461..4f2d635223 100644
--- a/data/as/30051683/ws-services-calculation/Penalty.json
+++ b/data/as/30051683/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051683/ws-services-calculation/WCBillingSlab.json b/data/as/30051683/ws-services-calculation/WCBillingSlab.json
index fe400dcdbf..0df5f6139c 100644
--- a/data/as/30051683/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051683/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30052428/ws-services-calculation/Penalty.json b/data/as/30052428/ws-services-calculation/Penalty.json
index 3a170b1414..2a54ef7c77 100644
--- a/data/as/30052428/ws-services-calculation/Penalty.json
+++ b/data/as/30052428/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052428/ws-services-calculation/WCBillingSlab.json b/data/as/30052428/ws-services-calculation/WCBillingSlab.json
index b152ec6060..9110f5598b 100644
--- a/data/as/30052428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052428/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30052432/ws-services-calculation/Penalty.json b/data/as/30052432/ws-services-calculation/Penalty.json
index 5718e59f18..57bcff75ad 100644
--- a/data/as/30052432/ws-services-calculation/Penalty.json
+++ b/data/as/30052432/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052432/ws-services-calculation/WCBillingSlab.json b/data/as/30052432/ws-services-calculation/WCBillingSlab.json
index 7835249bdb..7ed3ee728f 100644
--- a/data/as/30052432/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052432/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30052437/ws-services-calculation/Penalty.json b/data/as/30052437/ws-services-calculation/Penalty.json
index 99fc6f7618..c479fb1d0d 100644
--- a/data/as/30052437/ws-services-calculation/Penalty.json
+++ b/data/as/30052437/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052437/ws-services-calculation/WCBillingSlab.json b/data/as/30052437/ws-services-calculation/WCBillingSlab.json
index 7eda7434e8..347a2d76e0 100644
--- a/data/as/30052437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052437/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30052518/ws-services-calculation/Penalty.json b/data/as/30052518/ws-services-calculation/Penalty.json
index 4e2a9f36f2..ff8bf0263a 100644
--- a/data/as/30052518/ws-services-calculation/Penalty.json
+++ b/data/as/30052518/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052518/ws-services-calculation/WCBillingSlab.json b/data/as/30052518/ws-services-calculation/WCBillingSlab.json
index 8bd2afbf33..059b892c77 100644
--- a/data/as/30052518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052518/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30052737/ws-services-calculation/Penalty.json b/data/as/30052737/ws-services-calculation/Penalty.json
index c4b99b4a9b..0616d78a6d 100644
--- a/data/as/30052737/ws-services-calculation/Penalty.json
+++ b/data/as/30052737/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052737/ws-services-calculation/WCBillingSlab.json b/data/as/30052737/ws-services-calculation/WCBillingSlab.json
index f60e575c0d..a29bf0bc94 100644
--- a/data/as/30052737/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052737/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30052787/ws-services-calculation/Penalty.json b/data/as/30052787/ws-services-calculation/Penalty.json
index e82682e3c0..7040cb76a6 100644
--- a/data/as/30052787/ws-services-calculation/Penalty.json
+++ b/data/as/30052787/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052787/ws-services-calculation/WCBillingSlab.json b/data/as/30052787/ws-services-calculation/WCBillingSlab.json
index 2f88c281a3..b228fd28fc 100644
--- a/data/as/30052787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052787/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30053173/ws-services-calculation/Penalty.json b/data/as/30053173/ws-services-calculation/Penalty.json
index 7da9d098ff..b47346305e 100644
--- a/data/as/30053173/ws-services-calculation/Penalty.json
+++ b/data/as/30053173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30053173/ws-services-calculation/WCBillingSlab.json b/data/as/30053173/ws-services-calculation/WCBillingSlab.json
index 7f55b2fcfb..5c6c3c0460 100644
--- a/data/as/30053173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30053173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30053615/ws-services-calculation/Penalty.json b/data/as/30053615/ws-services-calculation/Penalty.json
index 9770a310b0..11d2aa8421 100644
--- a/data/as/30053615/ws-services-calculation/Penalty.json
+++ b/data/as/30053615/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30053615/ws-services-calculation/WCBillingSlab.json b/data/as/30053615/ws-services-calculation/WCBillingSlab.json
index 85c9c2a61d..e0d5b8cd2e 100644
--- a/data/as/30053615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30053615/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30053688/ws-services-calculation/Penalty.json b/data/as/30053688/ws-services-calculation/Penalty.json
index f07f6dedcc..41b4980a96 100644
--- a/data/as/30053688/ws-services-calculation/Penalty.json
+++ b/data/as/30053688/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30053688/ws-services-calculation/WCBillingSlab.json b/data/as/30053688/ws-services-calculation/WCBillingSlab.json
index 41f21d0da4..2c1edada95 100644
--- a/data/as/30053688/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30053688/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054045/ws-services-calculation/Penalty.json b/data/as/30054045/ws-services-calculation/Penalty.json
index 3adc21403e..0cc893d13a 100644
--- a/data/as/30054045/ws-services-calculation/Penalty.json
+++ b/data/as/30054045/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054045/ws-services-calculation/WCBillingSlab.json b/data/as/30054045/ws-services-calculation/WCBillingSlab.json
index 96b2243c5e..4da41fb30e 100644
--- a/data/as/30054045/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054045/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054048/ws-services-calculation/Penalty.json b/data/as/30054048/ws-services-calculation/Penalty.json
index 0a7a76f060..0955cddaba 100644
--- a/data/as/30054048/ws-services-calculation/Penalty.json
+++ b/data/as/30054048/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054048/ws-services-calculation/WCBillingSlab.json b/data/as/30054048/ws-services-calculation/WCBillingSlab.json
index c3cfd04084..3a1ad3d2cc 100644
--- a/data/as/30054048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054048/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054057/ws-services-calculation/Penalty.json b/data/as/30054057/ws-services-calculation/Penalty.json
index e11740623b..bdad1611d3 100644
--- a/data/as/30054057/ws-services-calculation/Penalty.json
+++ b/data/as/30054057/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054057/ws-services-calculation/WCBillingSlab.json b/data/as/30054057/ws-services-calculation/WCBillingSlab.json
index 5dd85b4ebd..45e4f26ea4 100644
--- a/data/as/30054057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054057/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054383/ws-services-calculation/Penalty.json b/data/as/30054383/ws-services-calculation/Penalty.json
index d431f688b0..4bb0e44143 100644
--- a/data/as/30054383/ws-services-calculation/Penalty.json
+++ b/data/as/30054383/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054383/ws-services-calculation/WCBillingSlab.json b/data/as/30054383/ws-services-calculation/WCBillingSlab.json
index 6061ab30a0..3ff4eecec1 100644
--- a/data/as/30054383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054383/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054393/ws-services-calculation/Penalty.json b/data/as/30054393/ws-services-calculation/Penalty.json
index 08643bb4c9..c4bc696eff 100644
--- a/data/as/30054393/ws-services-calculation/Penalty.json
+++ b/data/as/30054393/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054393/ws-services-calculation/WCBillingSlab.json b/data/as/30054393/ws-services-calculation/WCBillingSlab.json
index c7e15c5cc5..20d3e7f8b2 100644
--- a/data/as/30054393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054393/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054598/ws-services-calculation/Penalty.json b/data/as/30054598/ws-services-calculation/Penalty.json
index 6ed10b472f..a9e07cda05 100644
--- a/data/as/30054598/ws-services-calculation/Penalty.json
+++ b/data/as/30054598/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054598/ws-services-calculation/WCBillingSlab.json b/data/as/30054598/ws-services-calculation/WCBillingSlab.json
index b498d9ddad..b7939c5332 100644
--- a/data/as/30054598/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054598/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30054601/ws-services-calculation/Penalty.json b/data/as/30054601/ws-services-calculation/Penalty.json
index fccd41ec4a..10f6f95db2 100644
--- a/data/as/30054601/ws-services-calculation/Penalty.json
+++ b/data/as/30054601/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054601/ws-services-calculation/WCBillingSlab.json b/data/as/30054601/ws-services-calculation/WCBillingSlab.json
index 3a637b1c1b..869d70e239 100644
--- a/data/as/30054601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054601/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055210/ws-services-calculation/Penalty.json b/data/as/30055210/ws-services-calculation/Penalty.json
index fd9f9c8505..0621870acb 100644
--- a/data/as/30055210/ws-services-calculation/Penalty.json
+++ b/data/as/30055210/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055210/ws-services-calculation/WCBillingSlab.json b/data/as/30055210/ws-services-calculation/WCBillingSlab.json
index 4279d451e5..44d3664c76 100644
--- a/data/as/30055210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055210/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055216/ws-services-calculation/Penalty.json b/data/as/30055216/ws-services-calculation/Penalty.json
index 8c84a51a2c..dc396c4af1 100644
--- a/data/as/30055216/ws-services-calculation/Penalty.json
+++ b/data/as/30055216/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055216/ws-services-calculation/WCBillingSlab.json b/data/as/30055216/ws-services-calculation/WCBillingSlab.json
index ce6dab68a9..0a1ce22c77 100644
--- a/data/as/30055216/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055216/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055275/ws-services-calculation/Penalty.json b/data/as/30055275/ws-services-calculation/Penalty.json
index fe1529f81b..3e8d669797 100644
--- a/data/as/30055275/ws-services-calculation/Penalty.json
+++ b/data/as/30055275/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055275/ws-services-calculation/WCBillingSlab.json b/data/as/30055275/ws-services-calculation/WCBillingSlab.json
index 1235c77dd6..0f6e0f5bfd 100644
--- a/data/as/30055275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055275/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055680/ws-services-calculation/Penalty.json b/data/as/30055680/ws-services-calculation/Penalty.json
index d221a2bc31..815a1abac4 100644
--- a/data/as/30055680/ws-services-calculation/Penalty.json
+++ b/data/as/30055680/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055680/ws-services-calculation/WCBillingSlab.json b/data/as/30055680/ws-services-calculation/WCBillingSlab.json
index 763fb4e1b2..c3a5255aee 100644
--- a/data/as/30055680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055680/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055696/ws-services-calculation/Penalty.json b/data/as/30055696/ws-services-calculation/Penalty.json
index a3daeca602..69fff3ff20 100644
--- a/data/as/30055696/ws-services-calculation/Penalty.json
+++ b/data/as/30055696/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055696/ws-services-calculation/WCBillingSlab.json b/data/as/30055696/ws-services-calculation/WCBillingSlab.json
index 3b7b579261..5b2d8987e8 100644
--- a/data/as/30055696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055696/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055718/ws-services-calculation/Penalty.json b/data/as/30055718/ws-services-calculation/Penalty.json
index 2e337bc1ec..509c8039e8 100644
--- a/data/as/30055718/ws-services-calculation/Penalty.json
+++ b/data/as/30055718/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055718/ws-services-calculation/WCBillingSlab.json b/data/as/30055718/ws-services-calculation/WCBillingSlab.json
index 035169b81e..dffa096ad9 100644
--- a/data/as/30055718/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055718/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055724/ws-services-calculation/Penalty.json b/data/as/30055724/ws-services-calculation/Penalty.json
index b693990d0e..6dc4d0c1a1 100644
--- a/data/as/30055724/ws-services-calculation/Penalty.json
+++ b/data/as/30055724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055724/ws-services-calculation/WCBillingSlab.json b/data/as/30055724/ws-services-calculation/WCBillingSlab.json
index bb7437912f..3a43b2cb62 100644
--- a/data/as/30055724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055929/ws-services-calculation/Penalty.json b/data/as/30055929/ws-services-calculation/Penalty.json
index 6811a6dfd7..fde9c1a9e7 100644
--- a/data/as/30055929/ws-services-calculation/Penalty.json
+++ b/data/as/30055929/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055929/ws-services-calculation/WCBillingSlab.json b/data/as/30055929/ws-services-calculation/WCBillingSlab.json
index e4b8c19534..c94552ac4e 100644
--- a/data/as/30055929/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055929/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30055936/ws-services-calculation/Penalty.json b/data/as/30055936/ws-services-calculation/Penalty.json
index 0d4bc0ec50..898305739a 100644
--- a/data/as/30055936/ws-services-calculation/Penalty.json
+++ b/data/as/30055936/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055936/ws-services-calculation/WCBillingSlab.json b/data/as/30055936/ws-services-calculation/WCBillingSlab.json
index e5fad97641..1ee875c7e7 100644
--- a/data/as/30055936/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055936/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056016/ws-services-calculation/Penalty.json b/data/as/30056016/ws-services-calculation/Penalty.json
index 4d2ad2a8e2..bc3b477c9a 100644
--- a/data/as/30056016/ws-services-calculation/Penalty.json
+++ b/data/as/30056016/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056016/ws-services-calculation/WCBillingSlab.json b/data/as/30056016/ws-services-calculation/WCBillingSlab.json
index 16107003d2..343d720c4e 100644
--- a/data/as/30056016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056016/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056027/ws-services-calculation/Penalty.json b/data/as/30056027/ws-services-calculation/Penalty.json
index f5c1722224..398cfe4f77 100644
--- a/data/as/30056027/ws-services-calculation/Penalty.json
+++ b/data/as/30056027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056027/ws-services-calculation/WCBillingSlab.json b/data/as/30056027/ws-services-calculation/WCBillingSlab.json
index 566514d62a..625e897d7b 100644
--- a/data/as/30056027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056041/ws-services-calculation/Penalty.json b/data/as/30056041/ws-services-calculation/Penalty.json
index d89e19d499..303e6a5aca 100644
--- a/data/as/30056041/ws-services-calculation/Penalty.json
+++ b/data/as/30056041/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056041/ws-services-calculation/WCBillingSlab.json b/data/as/30056041/ws-services-calculation/WCBillingSlab.json
index db93cf4336..4a8fa2924b 100644
--- a/data/as/30056041/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056041/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056050/ws-services-calculation/Penalty.json b/data/as/30056050/ws-services-calculation/Penalty.json
index 9c5c2dfd80..e67a606a2e 100644
--- a/data/as/30056050/ws-services-calculation/Penalty.json
+++ b/data/as/30056050/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056050/ws-services-calculation/WCBillingSlab.json b/data/as/30056050/ws-services-calculation/WCBillingSlab.json
index 6b5edfa08f..1dd60773fe 100644
--- a/data/as/30056050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056050/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056072/ws-services-calculation/Penalty.json b/data/as/30056072/ws-services-calculation/Penalty.json
index 2a3e34684f..4c807b751e 100644
--- a/data/as/30056072/ws-services-calculation/Penalty.json
+++ b/data/as/30056072/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056072/ws-services-calculation/WCBillingSlab.json b/data/as/30056072/ws-services-calculation/WCBillingSlab.json
index d20aeea54a..4da76eccf1 100644
--- a/data/as/30056072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056072/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056080/ws-services-calculation/Penalty.json b/data/as/30056080/ws-services-calculation/Penalty.json
index 06ded93855..d2dfc03d23 100644
--- a/data/as/30056080/ws-services-calculation/Penalty.json
+++ b/data/as/30056080/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056080/ws-services-calculation/WCBillingSlab.json b/data/as/30056080/ws-services-calculation/WCBillingSlab.json
index ec8a37bb9f..ac5ff13551 100644
--- a/data/as/30056080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056080/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056087/ws-services-calculation/Penalty.json b/data/as/30056087/ws-services-calculation/Penalty.json
index c2078d0c60..b8eb4df788 100644
--- a/data/as/30056087/ws-services-calculation/Penalty.json
+++ b/data/as/30056087/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056087/ws-services-calculation/WCBillingSlab.json b/data/as/30056087/ws-services-calculation/WCBillingSlab.json
index 21c43096b9..62def6db38 100644
--- a/data/as/30056087/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056087/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056104/ws-services-calculation/Penalty.json b/data/as/30056104/ws-services-calculation/Penalty.json
index 8e308747a9..b68c8a9b52 100644
--- a/data/as/30056104/ws-services-calculation/Penalty.json
+++ b/data/as/30056104/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056104/ws-services-calculation/WCBillingSlab.json b/data/as/30056104/ws-services-calculation/WCBillingSlab.json
index fc71331371..d4e6ad1573 100644
--- a/data/as/30056104/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056104/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056141/ws-services-calculation/Penalty.json b/data/as/30056141/ws-services-calculation/Penalty.json
index 2e55555167..a3665efe88 100644
--- a/data/as/30056141/ws-services-calculation/Penalty.json
+++ b/data/as/30056141/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056141/ws-services-calculation/WCBillingSlab.json b/data/as/30056141/ws-services-calculation/WCBillingSlab.json
index 80bb93a43f..2988d1b9d6 100644
--- a/data/as/30056141/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056141/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056146/ws-services-calculation/Penalty.json b/data/as/30056146/ws-services-calculation/Penalty.json
index f4fbfc94e6..5f096d411e 100644
--- a/data/as/30056146/ws-services-calculation/Penalty.json
+++ b/data/as/30056146/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056146/ws-services-calculation/WCBillingSlab.json b/data/as/30056146/ws-services-calculation/WCBillingSlab.json
index db49957ce5..ffe24beef5 100644
--- a/data/as/30056146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056146/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056407/ws-services-calculation/Penalty.json b/data/as/30056407/ws-services-calculation/Penalty.json
index a85fb4fb3a..265c8169da 100644
--- a/data/as/30056407/ws-services-calculation/Penalty.json
+++ b/data/as/30056407/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056407/ws-services-calculation/WCBillingSlab.json b/data/as/30056407/ws-services-calculation/WCBillingSlab.json
index 53cf403220..f8b05b3062 100644
--- a/data/as/30056407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056407/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056412/ws-services-calculation/Penalty.json b/data/as/30056412/ws-services-calculation/Penalty.json
index 86123e5aff..d7298f2115 100644
--- a/data/as/30056412/ws-services-calculation/Penalty.json
+++ b/data/as/30056412/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056412/ws-services-calculation/WCBillingSlab.json b/data/as/30056412/ws-services-calculation/WCBillingSlab.json
index 5975dc836c..dd428cddc9 100644
--- a/data/as/30056412/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056412/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056417/ws-services-calculation/Penalty.json b/data/as/30056417/ws-services-calculation/Penalty.json
index 9f552b2779..0a77925822 100644
--- a/data/as/30056417/ws-services-calculation/Penalty.json
+++ b/data/as/30056417/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056417/ws-services-calculation/WCBillingSlab.json b/data/as/30056417/ws-services-calculation/WCBillingSlab.json
index 683d5be30a..571cfa059d 100644
--- a/data/as/30056417/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056417/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056425/ws-services-calculation/Penalty.json b/data/as/30056425/ws-services-calculation/Penalty.json
index 902b648bbf..1f1fdfe7c4 100644
--- a/data/as/30056425/ws-services-calculation/Penalty.json
+++ b/data/as/30056425/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056425/ws-services-calculation/WCBillingSlab.json b/data/as/30056425/ws-services-calculation/WCBillingSlab.json
index 5b8c60fe10..acb0174206 100644
--- a/data/as/30056425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056425/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056431/ws-services-calculation/Penalty.json b/data/as/30056431/ws-services-calculation/Penalty.json
index 654dfea217..b1fe6fcdf9 100644
--- a/data/as/30056431/ws-services-calculation/Penalty.json
+++ b/data/as/30056431/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056431/ws-services-calculation/WCBillingSlab.json b/data/as/30056431/ws-services-calculation/WCBillingSlab.json
index cd02dd269d..78a41a3634 100644
--- a/data/as/30056431/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056431/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056433/ws-services-calculation/Penalty.json b/data/as/30056433/ws-services-calculation/Penalty.json
index 3677da3d9b..20a6635a3e 100644
--- a/data/as/30056433/ws-services-calculation/Penalty.json
+++ b/data/as/30056433/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056433/ws-services-calculation/WCBillingSlab.json b/data/as/30056433/ws-services-calculation/WCBillingSlab.json
index 31b7c17ef7..89b358c668 100644
--- a/data/as/30056433/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056433/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056435/ws-services-calculation/Penalty.json b/data/as/30056435/ws-services-calculation/Penalty.json
index fd26c05dbc..306c4ad142 100644
--- a/data/as/30056435/ws-services-calculation/Penalty.json
+++ b/data/as/30056435/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056435/ws-services-calculation/WCBillingSlab.json b/data/as/30056435/ws-services-calculation/WCBillingSlab.json
index 67443480e1..f155b1813e 100644
--- a/data/as/30056435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056435/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056490/ws-services-calculation/Penalty.json b/data/as/30056490/ws-services-calculation/Penalty.json
index 1df596350b..57aa52d740 100644
--- a/data/as/30056490/ws-services-calculation/Penalty.json
+++ b/data/as/30056490/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056490/ws-services-calculation/WCBillingSlab.json b/data/as/30056490/ws-services-calculation/WCBillingSlab.json
index 4593b077a6..c6ba320b36 100644
--- a/data/as/30056490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056490/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056609/ws-services-calculation/Penalty.json b/data/as/30056609/ws-services-calculation/Penalty.json
index f31bf4a09a..d272dec442 100644
--- a/data/as/30056609/ws-services-calculation/Penalty.json
+++ b/data/as/30056609/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056609/ws-services-calculation/WCBillingSlab.json b/data/as/30056609/ws-services-calculation/WCBillingSlab.json
index 85573e7f71..c4f8294ab3 100644
--- a/data/as/30056609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056609/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056640/ws-services-calculation/Penalty.json b/data/as/30056640/ws-services-calculation/Penalty.json
index 6446c258f0..6ec0cdd6ac 100644
--- a/data/as/30056640/ws-services-calculation/Penalty.json
+++ b/data/as/30056640/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056640/ws-services-calculation/WCBillingSlab.json b/data/as/30056640/ws-services-calculation/WCBillingSlab.json
index 5c22424d59..56f8571644 100644
--- a/data/as/30056640/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056640/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056810/ws-services-calculation/Penalty.json b/data/as/30056810/ws-services-calculation/Penalty.json
index 7874dbdeff..27ceff7d09 100644
--- a/data/as/30056810/ws-services-calculation/Penalty.json
+++ b/data/as/30056810/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056810/ws-services-calculation/WCBillingSlab.json b/data/as/30056810/ws-services-calculation/WCBillingSlab.json
index bef8cd9b0b..086fe1ffd0 100644
--- a/data/as/30056810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056810/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056913/ws-services-calculation/Penalty.json b/data/as/30056913/ws-services-calculation/Penalty.json
index d3b494a51a..3d34eddc1d 100644
--- a/data/as/30056913/ws-services-calculation/Penalty.json
+++ b/data/as/30056913/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056913/ws-services-calculation/WCBillingSlab.json b/data/as/30056913/ws-services-calculation/WCBillingSlab.json
index fae85794cb..6773f2c082 100644
--- a/data/as/30056913/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056913/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056918/ws-services-calculation/Penalty.json b/data/as/30056918/ws-services-calculation/Penalty.json
index c7273f3932..a0f1ce9759 100644
--- a/data/as/30056918/ws-services-calculation/Penalty.json
+++ b/data/as/30056918/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056918/ws-services-calculation/WCBillingSlab.json b/data/as/30056918/ws-services-calculation/WCBillingSlab.json
index 1e352cbc82..815192542d 100644
--- a/data/as/30056918/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056918/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30056922/ws-services-calculation/Penalty.json b/data/as/30056922/ws-services-calculation/Penalty.json
index c6159bc52a..4baca2c800 100644
--- a/data/as/30056922/ws-services-calculation/Penalty.json
+++ b/data/as/30056922/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056922/ws-services-calculation/WCBillingSlab.json b/data/as/30056922/ws-services-calculation/WCBillingSlab.json
index 8d04d82b71..870cde4579 100644
--- a/data/as/30056922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056922/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057164/ws-services-calculation/Penalty.json b/data/as/30057164/ws-services-calculation/Penalty.json
index 071b387848..500f458a01 100644
--- a/data/as/30057164/ws-services-calculation/Penalty.json
+++ b/data/as/30057164/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057164/ws-services-calculation/WCBillingSlab.json b/data/as/30057164/ws-services-calculation/WCBillingSlab.json
index 8952c45c1e..647c3b0add 100644
--- a/data/as/30057164/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057164/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057166/ws-services-calculation/Penalty.json b/data/as/30057166/ws-services-calculation/Penalty.json
index f3e9ab0626..d5682787fb 100644
--- a/data/as/30057166/ws-services-calculation/Penalty.json
+++ b/data/as/30057166/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057166/ws-services-calculation/WCBillingSlab.json b/data/as/30057166/ws-services-calculation/WCBillingSlab.json
index 78083d89c1..9c40a6869d 100644
--- a/data/as/30057166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057166/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057174/ws-services-calculation/Penalty.json b/data/as/30057174/ws-services-calculation/Penalty.json
index 243ff0151d..574be80467 100644
--- a/data/as/30057174/ws-services-calculation/Penalty.json
+++ b/data/as/30057174/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057174/ws-services-calculation/WCBillingSlab.json b/data/as/30057174/ws-services-calculation/WCBillingSlab.json
index 020ebd0bae..7fd265ee1e 100644
--- a/data/as/30057174/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057174/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057288/ws-services-calculation/Penalty.json b/data/as/30057288/ws-services-calculation/Penalty.json
index 9f73bd0cf6..e97435fc7b 100644
--- a/data/as/30057288/ws-services-calculation/Penalty.json
+++ b/data/as/30057288/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057288/ws-services-calculation/WCBillingSlab.json b/data/as/30057288/ws-services-calculation/WCBillingSlab.json
index 6e524a97f1..149fe9495e 100644
--- a/data/as/30057288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057288/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057297/ws-services-calculation/Penalty.json b/data/as/30057297/ws-services-calculation/Penalty.json
index 52507884cb..0f219d5ef4 100644
--- a/data/as/30057297/ws-services-calculation/Penalty.json
+++ b/data/as/30057297/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057297/ws-services-calculation/WCBillingSlab.json b/data/as/30057297/ws-services-calculation/WCBillingSlab.json
index 8570038f7d..a0f3e78c42 100644
--- a/data/as/30057297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057297/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057361/ws-services-calculation/Penalty.json b/data/as/30057361/ws-services-calculation/Penalty.json
index ca05962b86..e5ea8ae41b 100644
--- a/data/as/30057361/ws-services-calculation/Penalty.json
+++ b/data/as/30057361/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057361/ws-services-calculation/WCBillingSlab.json b/data/as/30057361/ws-services-calculation/WCBillingSlab.json
index 292c4f2ca6..38fce70843 100644
--- a/data/as/30057361/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057361/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057363/ws-services-calculation/Penalty.json b/data/as/30057363/ws-services-calculation/Penalty.json
index eccdec8092..b6ffbb1d27 100644
--- a/data/as/30057363/ws-services-calculation/Penalty.json
+++ b/data/as/30057363/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057363/ws-services-calculation/WCBillingSlab.json b/data/as/30057363/ws-services-calculation/WCBillingSlab.json
index a50cf2970b..e6eb09d458 100644
--- a/data/as/30057363/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057363/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057369/ws-services-calculation/Penalty.json b/data/as/30057369/ws-services-calculation/Penalty.json
index 5c99ba3ecd..5e1831cce2 100644
--- a/data/as/30057369/ws-services-calculation/Penalty.json
+++ b/data/as/30057369/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057369/ws-services-calculation/WCBillingSlab.json b/data/as/30057369/ws-services-calculation/WCBillingSlab.json
index f0b83d914a..8507fc5dd0 100644
--- a/data/as/30057369/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057369/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057524/ws-services-calculation/Penalty.json b/data/as/30057524/ws-services-calculation/Penalty.json
index 7880643c91..9812d0734f 100644
--- a/data/as/30057524/ws-services-calculation/Penalty.json
+++ b/data/as/30057524/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057524/ws-services-calculation/WCBillingSlab.json b/data/as/30057524/ws-services-calculation/WCBillingSlab.json
index 0f090b951e..c6c5d14ba7 100644
--- a/data/as/30057524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057524/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057641/ws-services-calculation/Penalty.json b/data/as/30057641/ws-services-calculation/Penalty.json
index 6553fe9f61..f0681b2dd9 100644
--- a/data/as/30057641/ws-services-calculation/Penalty.json
+++ b/data/as/30057641/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057641/ws-services-calculation/WCBillingSlab.json b/data/as/30057641/ws-services-calculation/WCBillingSlab.json
index 18227401ec..d917fabb72 100644
--- a/data/as/30057641/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057641/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057745/ws-services-calculation/Penalty.json b/data/as/30057745/ws-services-calculation/Penalty.json
index 13dc491885..89d311e199 100644
--- a/data/as/30057745/ws-services-calculation/Penalty.json
+++ b/data/as/30057745/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057745/ws-services-calculation/WCBillingSlab.json b/data/as/30057745/ws-services-calculation/WCBillingSlab.json
index c90f67af51..917c4c2bbb 100644
--- a/data/as/30057745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057745/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057746/ws-services-calculation/Penalty.json b/data/as/30057746/ws-services-calculation/Penalty.json
index e69bd1aa45..cb8b5b0311 100644
--- a/data/as/30057746/ws-services-calculation/Penalty.json
+++ b/data/as/30057746/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057746/ws-services-calculation/WCBillingSlab.json b/data/as/30057746/ws-services-calculation/WCBillingSlab.json
index a6bea01c0f..be52ade618 100644
--- a/data/as/30057746/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057746/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057748/ws-services-calculation/Penalty.json b/data/as/30057748/ws-services-calculation/Penalty.json
index 13c8eb47f5..b453fe36fe 100644
--- a/data/as/30057748/ws-services-calculation/Penalty.json
+++ b/data/as/30057748/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057748/ws-services-calculation/WCBillingSlab.json b/data/as/30057748/ws-services-calculation/WCBillingSlab.json
index 0d58c5dc78..61423be2cb 100644
--- a/data/as/30057748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057748/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057972/ws-services-calculation/Penalty.json b/data/as/30057972/ws-services-calculation/Penalty.json
index c529744453..969332efaf 100644
--- a/data/as/30057972/ws-services-calculation/Penalty.json
+++ b/data/as/30057972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057972/ws-services-calculation/WCBillingSlab.json b/data/as/30057972/ws-services-calculation/WCBillingSlab.json
index 36d4189a91..db6cf81c94 100644
--- a/data/as/30057972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057974/ws-services-calculation/Penalty.json b/data/as/30057974/ws-services-calculation/Penalty.json
index c5fa4036b5..911b63af18 100644
--- a/data/as/30057974/ws-services-calculation/Penalty.json
+++ b/data/as/30057974/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057974/ws-services-calculation/WCBillingSlab.json b/data/as/30057974/ws-services-calculation/WCBillingSlab.json
index 914906d06c..683fcddf2a 100644
--- a/data/as/30057974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057974/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057979/ws-services-calculation/Penalty.json b/data/as/30057979/ws-services-calculation/Penalty.json
index 52802bbe84..b096f1c4fe 100644
--- a/data/as/30057979/ws-services-calculation/Penalty.json
+++ b/data/as/30057979/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057979/ws-services-calculation/WCBillingSlab.json b/data/as/30057979/ws-services-calculation/WCBillingSlab.json
index 38f353525b..24f4c6a1ad 100644
--- a/data/as/30057979/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057979/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057983/ws-services-calculation/Penalty.json b/data/as/30057983/ws-services-calculation/Penalty.json
index eb8473c7a7..440ba4d4d5 100644
--- a/data/as/30057983/ws-services-calculation/Penalty.json
+++ b/data/as/30057983/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057983/ws-services-calculation/WCBillingSlab.json b/data/as/30057983/ws-services-calculation/WCBillingSlab.json
index 8a2bcf1c3a..1a5a0a5dda 100644
--- a/data/as/30057983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057983/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057985/ws-services-calculation/Penalty.json b/data/as/30057985/ws-services-calculation/Penalty.json
index 500407b882..ac23eb6896 100644
--- a/data/as/30057985/ws-services-calculation/Penalty.json
+++ b/data/as/30057985/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057985/ws-services-calculation/WCBillingSlab.json b/data/as/30057985/ws-services-calculation/WCBillingSlab.json
index 98f53786a0..bad91cd1e2 100644
--- a/data/as/30057985/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057985/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057989/ws-services-calculation/Penalty.json b/data/as/30057989/ws-services-calculation/Penalty.json
index cb778d2fb7..4839a61627 100644
--- a/data/as/30057989/ws-services-calculation/Penalty.json
+++ b/data/as/30057989/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057989/ws-services-calculation/WCBillingSlab.json b/data/as/30057989/ws-services-calculation/WCBillingSlab.json
index b5af9694ea..7dcf9fb205 100644
--- a/data/as/30057989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057989/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30057993/ws-services-calculation/Penalty.json b/data/as/30057993/ws-services-calculation/Penalty.json
index 68757480c8..1705d0da49 100644
--- a/data/as/30057993/ws-services-calculation/Penalty.json
+++ b/data/as/30057993/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057993/ws-services-calculation/WCBillingSlab.json b/data/as/30057993/ws-services-calculation/WCBillingSlab.json
index ab919ef9b6..dc034e585d 100644
--- a/data/as/30057993/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057993/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058019/ws-services-calculation/Penalty.json b/data/as/30058019/ws-services-calculation/Penalty.json
index ddda86b009..0800a63890 100644
--- a/data/as/30058019/ws-services-calculation/Penalty.json
+++ b/data/as/30058019/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058019/ws-services-calculation/WCBillingSlab.json b/data/as/30058019/ws-services-calculation/WCBillingSlab.json
index f39be4d59c..eae29f7ac5 100644
--- a/data/as/30058019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058019/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058023/ws-services-calculation/Penalty.json b/data/as/30058023/ws-services-calculation/Penalty.json
index e901f56e9f..43ce274c9b 100644
--- a/data/as/30058023/ws-services-calculation/Penalty.json
+++ b/data/as/30058023/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058023/ws-services-calculation/WCBillingSlab.json b/data/as/30058023/ws-services-calculation/WCBillingSlab.json
index 93c326a749..7138912b1d 100644
--- a/data/as/30058023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058023/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058044/ws-services-calculation/Penalty.json b/data/as/30058044/ws-services-calculation/Penalty.json
index f035504a92..05da6c354b 100644
--- a/data/as/30058044/ws-services-calculation/Penalty.json
+++ b/data/as/30058044/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058044/ws-services-calculation/WCBillingSlab.json b/data/as/30058044/ws-services-calculation/WCBillingSlab.json
index cea0a823db..2dd12e7617 100644
--- a/data/as/30058044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058044/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058047/ws-services-calculation/Penalty.json b/data/as/30058047/ws-services-calculation/Penalty.json
index ce42cbdcb4..84acd641c5 100644
--- a/data/as/30058047/ws-services-calculation/Penalty.json
+++ b/data/as/30058047/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058047/ws-services-calculation/WCBillingSlab.json b/data/as/30058047/ws-services-calculation/WCBillingSlab.json
index 341d4c7c09..9614d03870 100644
--- a/data/as/30058047/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058047/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058052/ws-services-calculation/Penalty.json b/data/as/30058052/ws-services-calculation/Penalty.json
index 79d05d5657..b2e25d1c96 100644
--- a/data/as/30058052/ws-services-calculation/Penalty.json
+++ b/data/as/30058052/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058052/ws-services-calculation/WCBillingSlab.json b/data/as/30058052/ws-services-calculation/WCBillingSlab.json
index 10a0c7d926..ab62f61bf1 100644
--- a/data/as/30058052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058052/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058057/ws-services-calculation/Penalty.json b/data/as/30058057/ws-services-calculation/Penalty.json
index f1e7287eb7..a1e70ea68f 100644
--- a/data/as/30058057/ws-services-calculation/Penalty.json
+++ b/data/as/30058057/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058057/ws-services-calculation/WCBillingSlab.json b/data/as/30058057/ws-services-calculation/WCBillingSlab.json
index a1a78c3e68..eefe6cae1c 100644
--- a/data/as/30058057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058057/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058109/ws-services-calculation/Penalty.json b/data/as/30058109/ws-services-calculation/Penalty.json
index e8fe2d7656..cd3237e7a9 100644
--- a/data/as/30058109/ws-services-calculation/Penalty.json
+++ b/data/as/30058109/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058109/ws-services-calculation/WCBillingSlab.json b/data/as/30058109/ws-services-calculation/WCBillingSlab.json
index 650d33e9c1..837c2f358f 100644
--- a/data/as/30058109/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058109/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058320/ws-services-calculation/Penalty.json b/data/as/30058320/ws-services-calculation/Penalty.json
index 4b6dddeb4a..c51ae65aac 100644
--- a/data/as/30058320/ws-services-calculation/Penalty.json
+++ b/data/as/30058320/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058320/ws-services-calculation/WCBillingSlab.json b/data/as/30058320/ws-services-calculation/WCBillingSlab.json
index 2d777ab7ec..4d3851aa65 100644
--- a/data/as/30058320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058320/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058339/ws-services-calculation/Penalty.json b/data/as/30058339/ws-services-calculation/Penalty.json
index 3e55bb3f67..8a51691772 100644
--- a/data/as/30058339/ws-services-calculation/Penalty.json
+++ b/data/as/30058339/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058339/ws-services-calculation/WCBillingSlab.json b/data/as/30058339/ws-services-calculation/WCBillingSlab.json
index 360fb15c34..e48346affe 100644
--- a/data/as/30058339/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058339/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30058545/ws-services-calculation/Penalty.json b/data/as/30058545/ws-services-calculation/Penalty.json
index 2f4fc4e179..4c475b217d 100644
--- a/data/as/30058545/ws-services-calculation/Penalty.json
+++ b/data/as/30058545/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058545/ws-services-calculation/WCBillingSlab.json b/data/as/30058545/ws-services-calculation/WCBillingSlab.json
index 846aa00510..ea19cb6829 100644
--- a/data/as/30058545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058545/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059252/ws-services-calculation/Penalty.json b/data/as/30059252/ws-services-calculation/Penalty.json
index d14156ab4e..8005b9a523 100644
--- a/data/as/30059252/ws-services-calculation/Penalty.json
+++ b/data/as/30059252/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059252/ws-services-calculation/WCBillingSlab.json b/data/as/30059252/ws-services-calculation/WCBillingSlab.json
index 446094faa3..69b9beaebf 100644
--- a/data/as/30059252/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059252/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059318/ws-services-calculation/Penalty.json b/data/as/30059318/ws-services-calculation/Penalty.json
index 3c04fc7f77..d931057196 100644
--- a/data/as/30059318/ws-services-calculation/Penalty.json
+++ b/data/as/30059318/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059318/ws-services-calculation/WCBillingSlab.json b/data/as/30059318/ws-services-calculation/WCBillingSlab.json
index b2787ce015..cd66275819 100644
--- a/data/as/30059318/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059318/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059391/ws-services-calculation/Penalty.json b/data/as/30059391/ws-services-calculation/Penalty.json
index fb793b8106..6714e4ef80 100644
--- a/data/as/30059391/ws-services-calculation/Penalty.json
+++ b/data/as/30059391/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059391/ws-services-calculation/WCBillingSlab.json b/data/as/30059391/ws-services-calculation/WCBillingSlab.json
index f184b69915..3f921dbc05 100644
--- a/data/as/30059391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059391/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059490/ws-services-calculation/Penalty.json b/data/as/30059490/ws-services-calculation/Penalty.json
index 58843eace0..adfad78a43 100644
--- a/data/as/30059490/ws-services-calculation/Penalty.json
+++ b/data/as/30059490/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059490/ws-services-calculation/WCBillingSlab.json b/data/as/30059490/ws-services-calculation/WCBillingSlab.json
index 4622ac31c8..04158867a4 100644
--- a/data/as/30059490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059490/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059492/ws-services-calculation/Penalty.json b/data/as/30059492/ws-services-calculation/Penalty.json
index c6cba67a54..e5f7e48ad6 100644
--- a/data/as/30059492/ws-services-calculation/Penalty.json
+++ b/data/as/30059492/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059492/ws-services-calculation/WCBillingSlab.json b/data/as/30059492/ws-services-calculation/WCBillingSlab.json
index aee98008f2..6001692d63 100644
--- a/data/as/30059492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059492/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059495/ws-services-calculation/Penalty.json b/data/as/30059495/ws-services-calculation/Penalty.json
index 088b1c5241..a27f7fc89c 100644
--- a/data/as/30059495/ws-services-calculation/Penalty.json
+++ b/data/as/30059495/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059495/ws-services-calculation/WCBillingSlab.json b/data/as/30059495/ws-services-calculation/WCBillingSlab.json
index 4de8eb43a6..7210e6c654 100644
--- a/data/as/30059495/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059495/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059497/ws-services-calculation/Penalty.json b/data/as/30059497/ws-services-calculation/Penalty.json
index 81da03d963..7a86d8a734 100644
--- a/data/as/30059497/ws-services-calculation/Penalty.json
+++ b/data/as/30059497/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059497/ws-services-calculation/WCBillingSlab.json b/data/as/30059497/ws-services-calculation/WCBillingSlab.json
index 17165ba9d6..133614edc6 100644
--- a/data/as/30059497/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059497/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059500/ws-services-calculation/Penalty.json b/data/as/30059500/ws-services-calculation/Penalty.json
index 205cd57b65..d9d4f4c3d5 100644
--- a/data/as/30059500/ws-services-calculation/Penalty.json
+++ b/data/as/30059500/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059500/ws-services-calculation/WCBillingSlab.json b/data/as/30059500/ws-services-calculation/WCBillingSlab.json
index 0a0af218ad..b693a67471 100644
--- a/data/as/30059500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059500/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059502/ws-services-calculation/Penalty.json b/data/as/30059502/ws-services-calculation/Penalty.json
index f7765e8df6..da91721a3c 100644
--- a/data/as/30059502/ws-services-calculation/Penalty.json
+++ b/data/as/30059502/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059502/ws-services-calculation/WCBillingSlab.json b/data/as/30059502/ws-services-calculation/WCBillingSlab.json
index f7ddda0fd0..45c35a9aa5 100644
--- a/data/as/30059502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059502/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059510/ws-services-calculation/Penalty.json b/data/as/30059510/ws-services-calculation/Penalty.json
index a274c6357e..dd7509c027 100644
--- a/data/as/30059510/ws-services-calculation/Penalty.json
+++ b/data/as/30059510/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059510/ws-services-calculation/WCBillingSlab.json b/data/as/30059510/ws-services-calculation/WCBillingSlab.json
index 0635b80194..e095509d3a 100644
--- a/data/as/30059510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059510/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059517/ws-services-calculation/Penalty.json b/data/as/30059517/ws-services-calculation/Penalty.json
index cd38a07e3a..a40bbb3b32 100644
--- a/data/as/30059517/ws-services-calculation/Penalty.json
+++ b/data/as/30059517/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059517/ws-services-calculation/WCBillingSlab.json b/data/as/30059517/ws-services-calculation/WCBillingSlab.json
index 21dfa7bf6e..0fffa7849a 100644
--- a/data/as/30059517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059517/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30059589/ws-services-calculation/Penalty.json b/data/as/30059589/ws-services-calculation/Penalty.json
index 9b55bf4a62..a2643bc67b 100644
--- a/data/as/30059589/ws-services-calculation/Penalty.json
+++ b/data/as/30059589/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059589/ws-services-calculation/WCBillingSlab.json b/data/as/30059589/ws-services-calculation/WCBillingSlab.json
index f894deb381..a83af0570f 100644
--- a/data/as/30059589/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059589/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060114/ws-services-calculation/Penalty.json b/data/as/30060114/ws-services-calculation/Penalty.json
index 49237ac38d..a14a5a859f 100644
--- a/data/as/30060114/ws-services-calculation/Penalty.json
+++ b/data/as/30060114/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060114/ws-services-calculation/WCBillingSlab.json b/data/as/30060114/ws-services-calculation/WCBillingSlab.json
index 5eec2cad95..a5b396c6d3 100644
--- a/data/as/30060114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060114/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060116/ws-services-calculation/Penalty.json b/data/as/30060116/ws-services-calculation/Penalty.json
index 057198d8e2..62a9483445 100644
--- a/data/as/30060116/ws-services-calculation/Penalty.json
+++ b/data/as/30060116/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060116/ws-services-calculation/WCBillingSlab.json b/data/as/30060116/ws-services-calculation/WCBillingSlab.json
index 9628f9a65e..934e7b0a49 100644
--- a/data/as/30060116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060116/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060146/ws-services-calculation/Penalty.json b/data/as/30060146/ws-services-calculation/Penalty.json
index d6bdfc5073..a60eb7d18f 100644
--- a/data/as/30060146/ws-services-calculation/Penalty.json
+++ b/data/as/30060146/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060146/ws-services-calculation/WCBillingSlab.json b/data/as/30060146/ws-services-calculation/WCBillingSlab.json
index 7b54a22255..f3c17c0f32 100644
--- a/data/as/30060146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060146/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060151/ws-services-calculation/Penalty.json b/data/as/30060151/ws-services-calculation/Penalty.json
index 5e66f12949..011fcafc7b 100644
--- a/data/as/30060151/ws-services-calculation/Penalty.json
+++ b/data/as/30060151/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060151/ws-services-calculation/WCBillingSlab.json b/data/as/30060151/ws-services-calculation/WCBillingSlab.json
index f07efb1a8c..7120c78d40 100644
--- a/data/as/30060151/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060151/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060155/ws-services-calculation/Penalty.json b/data/as/30060155/ws-services-calculation/Penalty.json
index 32149928f8..4e4566775a 100644
--- a/data/as/30060155/ws-services-calculation/Penalty.json
+++ b/data/as/30060155/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060155/ws-services-calculation/WCBillingSlab.json b/data/as/30060155/ws-services-calculation/WCBillingSlab.json
index f967c61ed3..2456abd591 100644
--- a/data/as/30060155/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060155/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060169/ws-services-calculation/Penalty.json b/data/as/30060169/ws-services-calculation/Penalty.json
index 0ed61e6a54..973471065a 100644
--- a/data/as/30060169/ws-services-calculation/Penalty.json
+++ b/data/as/30060169/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060169/ws-services-calculation/WCBillingSlab.json b/data/as/30060169/ws-services-calculation/WCBillingSlab.json
index de6da5e54f..a71eecebe8 100644
--- a/data/as/30060169/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060169/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060173/ws-services-calculation/Penalty.json b/data/as/30060173/ws-services-calculation/Penalty.json
index 1c4287e229..ee9090dea4 100644
--- a/data/as/30060173/ws-services-calculation/Penalty.json
+++ b/data/as/30060173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060173/ws-services-calculation/WCBillingSlab.json b/data/as/30060173/ws-services-calculation/WCBillingSlab.json
index 64b46be112..4f067d0144 100644
--- a/data/as/30060173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060178/ws-services-calculation/Penalty.json b/data/as/30060178/ws-services-calculation/Penalty.json
index 865824615e..f6287fb4db 100644
--- a/data/as/30060178/ws-services-calculation/Penalty.json
+++ b/data/as/30060178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060178/ws-services-calculation/WCBillingSlab.json b/data/as/30060178/ws-services-calculation/WCBillingSlab.json
index 5faff3d5bf..7f23ef9903 100644
--- a/data/as/30060178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060179/ws-services-calculation/Penalty.json b/data/as/30060179/ws-services-calculation/Penalty.json
index 81d08a5b32..39d15df83f 100644
--- a/data/as/30060179/ws-services-calculation/Penalty.json
+++ b/data/as/30060179/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060179/ws-services-calculation/WCBillingSlab.json b/data/as/30060179/ws-services-calculation/WCBillingSlab.json
index fb0138b6e9..e7bfab1311 100644
--- a/data/as/30060179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060179/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060206/ws-services-calculation/Penalty.json b/data/as/30060206/ws-services-calculation/Penalty.json
index a318c4d2ea..f7159b6446 100644
--- a/data/as/30060206/ws-services-calculation/Penalty.json
+++ b/data/as/30060206/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060206/ws-services-calculation/WCBillingSlab.json b/data/as/30060206/ws-services-calculation/WCBillingSlab.json
index 77503617f0..a6602ef973 100644
--- a/data/as/30060206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060206/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060256/ws-services-calculation/Penalty.json b/data/as/30060256/ws-services-calculation/Penalty.json
index d6c1c50685..cb55512bcb 100644
--- a/data/as/30060256/ws-services-calculation/Penalty.json
+++ b/data/as/30060256/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060256/ws-services-calculation/WCBillingSlab.json b/data/as/30060256/ws-services-calculation/WCBillingSlab.json
index 10d374ac81..409dcb919b 100644
--- a/data/as/30060256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060256/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060309/ws-services-calculation/Penalty.json b/data/as/30060309/ws-services-calculation/Penalty.json
index 59fe5ff9c0..97265efb47 100644
--- a/data/as/30060309/ws-services-calculation/Penalty.json
+++ b/data/as/30060309/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060309/ws-services-calculation/WCBillingSlab.json b/data/as/30060309/ws-services-calculation/WCBillingSlab.json
index 0a7358e5b4..f0aaf9415d 100644
--- a/data/as/30060309/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060309/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060313/ws-services-calculation/Penalty.json b/data/as/30060313/ws-services-calculation/Penalty.json
index 2cad7d8c96..68e6c92640 100644
--- a/data/as/30060313/ws-services-calculation/Penalty.json
+++ b/data/as/30060313/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060313/ws-services-calculation/WCBillingSlab.json b/data/as/30060313/ws-services-calculation/WCBillingSlab.json
index c8f21f316e..75ce1535c9 100644
--- a/data/as/30060313/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060313/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060518/ws-services-calculation/Penalty.json b/data/as/30060518/ws-services-calculation/Penalty.json
index ad8171be9c..d5a13e54bd 100644
--- a/data/as/30060518/ws-services-calculation/Penalty.json
+++ b/data/as/30060518/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060518/ws-services-calculation/WCBillingSlab.json b/data/as/30060518/ws-services-calculation/WCBillingSlab.json
index c954ee8864..57293e4031 100644
--- a/data/as/30060518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060518/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060621/ws-services-calculation/Penalty.json b/data/as/30060621/ws-services-calculation/Penalty.json
index ee9c16088a..b4b7325b5a 100644
--- a/data/as/30060621/ws-services-calculation/Penalty.json
+++ b/data/as/30060621/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060621/ws-services-calculation/WCBillingSlab.json b/data/as/30060621/ws-services-calculation/WCBillingSlab.json
index 5046600575..79017b25d0 100644
--- a/data/as/30060621/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060621/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From 3ac3e71321c40f18689539449ae922d58f35f251 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 16:05:58 +0530
Subject: [PATCH 14/23] Updated others

---
 data/as/30060637/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060637/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060647/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060647/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060667/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060667/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060692/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060692/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060709/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060709/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060718/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060718/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060740/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060740/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060825/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060825/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060872/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060872/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060887/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060887/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060892/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060892/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060893/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060893/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060898/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060898/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060901/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060901/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30060910/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30060910/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30061011/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30061011/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30061020/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30061020/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30061025/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30061025/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30062203/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30062203/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30062205/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30062205/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30062312/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30062312/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30062320/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30062320/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30062583/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30062583/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063118/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063118/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063119/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063119/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063143/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063143/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063149/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063149/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063152/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063152/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063228/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063228/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063239/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063239/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063240/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063240/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063285/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063285/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063294/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063294/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063300/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063300/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30063426/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30063426/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30064069/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30064069/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30064490/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30064490/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30064646/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30064646/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30064830/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30064830/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30065052/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30065052/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30065285/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30065285/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30065673/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30065673/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30065681/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30065681/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30065865/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30065865/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30065876/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30065876/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30066198/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30066198/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30066211/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30066211/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30066318/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30066318/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30066345/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30066345/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067036/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067036/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067040/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067040/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067065/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067065/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067067/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067067/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067086/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067086/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067101/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067101/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067113/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067113/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067122/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067122/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067179/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067179/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067304/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067304/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067307/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067307/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067308/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067308/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067407/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067407/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067418/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067418/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067441/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067441/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067449/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067449/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067468/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067468/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067475/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067475/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067509/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067509/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067518/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067518/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067536/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067536/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067611/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067611/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067623/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067623/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067699/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067699/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067707/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067707/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067709/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067709/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067714/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067714/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067748/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067748/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067790/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067790/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067803/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067803/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067829/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067829/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067830/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067830/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067861/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067861/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067915/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067915/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067928/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067928/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067938/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067938/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067942/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067942/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067950/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067950/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067958/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067958/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067962/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067962/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067985/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067985/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30067989/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30067989/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068077/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068077/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068088/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068088/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068096/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068096/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068187/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068187/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068194/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068194/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068198/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068198/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068210/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068210/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068218/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068218/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068225/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068225/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068229/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068229/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068331/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068331/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068340/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068340/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068345/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068345/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068356/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068356/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068380/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068380/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068419/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068419/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068422/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068422/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068427/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068427/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068428/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068428/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068533/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068533/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068606/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068606/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068609/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068609/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068614/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068614/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068620/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068620/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068648/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068648/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068650/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068650/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068669/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068669/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30068672/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30068672/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069086/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069086/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069093/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069093/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069124/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069124/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069136/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069136/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069142/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069142/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069148/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069148/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069157/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069157/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069165/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069165/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069183/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069183/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069230/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069230/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069261/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069261/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069267/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069267/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069282/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069282/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069283/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069283/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069284/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069284/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069296/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069296/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069733/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069733/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069738/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069738/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069742/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069742/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30069820/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30069820/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070165/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070165/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070166/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070166/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070207/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070207/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070230/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070230/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070236/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070236/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070239/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070239/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070243/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070243/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070267/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070267/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070269/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070269/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070276/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070276/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070288/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070288/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070302/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070302/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070309/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070309/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070314/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070314/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070342/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070342/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070344/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070344/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070346/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070346/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070350/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070350/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070357/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070357/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070365/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070365/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070375/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070375/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070386/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070386/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070406/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070406/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070419/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070419/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070464/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070464/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070470/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070470/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070477/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070477/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070483/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070483/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070590/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070590/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070600/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070600/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070606/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070606/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070609/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070609/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070611/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070611/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070613/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070613/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070620/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070620/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30070802/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30070802/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071063/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071063/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071098/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071098/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071129/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071129/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071139/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071139/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071148/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071148/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071202/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071202/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071569/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071569/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071579/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071579/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071722/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071722/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071743/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071743/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071758/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071758/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071787/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071787/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071801/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071801/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071806/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071806/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071827/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071827/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071830/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071830/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30071861/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30071861/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072127/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072127/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072402/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072402/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072569/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072569/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072574/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072574/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072592/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072592/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072599/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072599/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072650/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072650/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072651/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072651/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072655/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072655/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072656/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072656/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072662/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072662/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072834/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072834/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072841/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072841/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072843/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072843/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072845/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072845/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072880/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072880/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072900/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072900/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072901/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072901/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30072996/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30072996/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073350/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073350/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073352/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073352/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073354/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073354/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073356/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073356/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073357/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073357/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073473/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073473/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073477/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073477/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073481/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073481/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073483/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073483/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073485/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073485/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073492/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073492/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30073521/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30073521/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074179/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074179/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074189/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074189/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074675/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074675/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074706/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074706/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074732/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074732/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074827/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074827/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074916/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074916/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074975/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074975/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074989/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074989/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30074995/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30074995/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075002/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075002/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075008/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075008/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075655/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075655/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075682/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075682/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075685/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075685/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075704/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075704/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075708/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075708/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075836/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075836/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075842/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075842/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30075998/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30075998/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076178/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076178/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076404/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076404/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076417/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076417/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076423/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076423/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076442/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076442/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076501/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076501/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076546/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076546/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076588/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076588/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076595/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076595/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30076911/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30076911/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077015/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077015/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077065/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077065/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077169/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077169/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077173/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077173/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077183/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077183/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077189/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077189/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077362/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077362/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077383/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077383/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077387/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077387/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077405/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077405/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077516/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077516/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077531/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077531/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077533/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077533/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30077538/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30077538/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30078496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30078496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30078499/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30078499/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30079129/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30079129/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30079143/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30079143/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30079150/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30079150/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30079745/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30079745/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30079783/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30079783/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30080314/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30080314/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30080792/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30080792/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30080805/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30080805/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30080812/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30080812/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30081191/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30081191/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30081194/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30081194/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30081197/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30081197/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30081199/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30081199/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30081237/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30081237/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30082029/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30082029/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30082892/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30082892/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30083052/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30083052/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30083450/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30083450/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30090984/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30090984/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30091027/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30091027/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30091086/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30091086/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30091137/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30091137/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30091277/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30091277/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30091350/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30091350/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30092981/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30092981/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30093053/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30093053/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30093085/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30093085/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30093111/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30093111/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096216/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096216/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096276/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096276/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096403/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096403/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096485/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096485/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096579/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096579/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096711/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096711/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30096898/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30096898/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30097297/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30097297/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30105174/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30105174/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30105196/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30105196/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30105223/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30105223/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30113305/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30113305/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30113852/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30113852/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30115191/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30115191/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30115208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30115208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30115249/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30115249/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30115981/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30115981/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30116153/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30116153/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30116490/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30116490/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30116536/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30116536/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30117305/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30117305/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30117521/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30117521/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30117549/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30117549/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30117565/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30117565/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30117571/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30117571/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30119702/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30119702/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30125919/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30125919/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30125926/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30125926/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30125970/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30125970/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30125974/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30125974/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30125980/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30125980/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126191/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126191/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126197/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126197/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126217/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126217/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126233/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126233/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126239/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126239/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126308/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126308/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126312/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126312/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126316/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126316/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126334/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126334/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126487/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126487/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126500/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126500/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126582/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126582/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30126590/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30126590/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30127284/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30127284/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30127356/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30127356/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30127370/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30127370/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30127414/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30127414/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30128175/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30128175/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30128194/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30128194/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30128549/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30128549/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30128554/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30128554/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30128895/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30128895/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30128902/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30128902/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30129324/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30129324/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30129329/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30129329/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30129382/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30129382/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30129385/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30129385/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30129475/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30129475/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30129479/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30129479/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30130374/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30130374/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30130381/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30130381/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30130399/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30130399/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30130411/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30130411/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30130420/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30130420/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30130435/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30130435/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132498/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132498/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132532/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132532/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132548/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132548/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132559/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132559/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132588/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132588/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132620/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132620/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132648/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132648/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132661/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132661/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30132799/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30132799/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30137902/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30137902/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30137931/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30137931/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30137946/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30137946/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30137988/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30137988/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30138003/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30138003/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30138012/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30138012/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30138032/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30138032/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30139203/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30139203/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30139213/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30139213/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140232/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140232/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140242/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140242/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140254/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140254/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140608/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140608/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140613/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140613/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140620/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140620/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30140642/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30140642/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30141038/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30141038/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30141193/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30141193/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30141195/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30141195/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143283/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143283/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143295/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143295/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143305/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143305/ws-services-calculation/WCBillingSlab.json | 4 ++--
 800 files changed, 1200 insertions(+), 1200 deletions(-)

diff --git a/data/as/30060637/ws-services-calculation/Penalty.json b/data/as/30060637/ws-services-calculation/Penalty.json
index 65932abfe3..787ad3acbc 100644
--- a/data/as/30060637/ws-services-calculation/Penalty.json
+++ b/data/as/30060637/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060637/ws-services-calculation/WCBillingSlab.json b/data/as/30060637/ws-services-calculation/WCBillingSlab.json
index db42095934..289861ad34 100644
--- a/data/as/30060637/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060637/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060647/ws-services-calculation/Penalty.json b/data/as/30060647/ws-services-calculation/Penalty.json
index a9d562cb19..ac49c65f0b 100644
--- a/data/as/30060647/ws-services-calculation/Penalty.json
+++ b/data/as/30060647/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060647/ws-services-calculation/WCBillingSlab.json b/data/as/30060647/ws-services-calculation/WCBillingSlab.json
index fcd2e00735..e99e56cb83 100644
--- a/data/as/30060647/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060647/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060667/ws-services-calculation/Penalty.json b/data/as/30060667/ws-services-calculation/Penalty.json
index ebc7b8ec51..374fe51374 100644
--- a/data/as/30060667/ws-services-calculation/Penalty.json
+++ b/data/as/30060667/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060667/ws-services-calculation/WCBillingSlab.json b/data/as/30060667/ws-services-calculation/WCBillingSlab.json
index 6c23e39b28..940de1a9bc 100644
--- a/data/as/30060667/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060667/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060692/ws-services-calculation/Penalty.json b/data/as/30060692/ws-services-calculation/Penalty.json
index e392769451..06173b081d 100644
--- a/data/as/30060692/ws-services-calculation/Penalty.json
+++ b/data/as/30060692/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060692/ws-services-calculation/WCBillingSlab.json b/data/as/30060692/ws-services-calculation/WCBillingSlab.json
index 13f6430e70..039843f52b 100644
--- a/data/as/30060692/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060692/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060709/ws-services-calculation/Penalty.json b/data/as/30060709/ws-services-calculation/Penalty.json
index 5cbecd4871..f38d544b21 100644
--- a/data/as/30060709/ws-services-calculation/Penalty.json
+++ b/data/as/30060709/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060709/ws-services-calculation/WCBillingSlab.json b/data/as/30060709/ws-services-calculation/WCBillingSlab.json
index 11224630f8..c98a9281fa 100644
--- a/data/as/30060709/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060709/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060718/ws-services-calculation/Penalty.json b/data/as/30060718/ws-services-calculation/Penalty.json
index 15df854121..a94514ef49 100644
--- a/data/as/30060718/ws-services-calculation/Penalty.json
+++ b/data/as/30060718/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060718/ws-services-calculation/WCBillingSlab.json b/data/as/30060718/ws-services-calculation/WCBillingSlab.json
index 5d3927fbfc..b59ba3022a 100644
--- a/data/as/30060718/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060718/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060740/ws-services-calculation/Penalty.json b/data/as/30060740/ws-services-calculation/Penalty.json
index b40a84ce64..69e8973881 100644
--- a/data/as/30060740/ws-services-calculation/Penalty.json
+++ b/data/as/30060740/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060740/ws-services-calculation/WCBillingSlab.json b/data/as/30060740/ws-services-calculation/WCBillingSlab.json
index 310232edfd..d0bbce5f3c 100644
--- a/data/as/30060740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060740/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060825/ws-services-calculation/Penalty.json b/data/as/30060825/ws-services-calculation/Penalty.json
index 9c6f6bb293..4a291fc508 100644
--- a/data/as/30060825/ws-services-calculation/Penalty.json
+++ b/data/as/30060825/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060825/ws-services-calculation/WCBillingSlab.json b/data/as/30060825/ws-services-calculation/WCBillingSlab.json
index 4601416822..a81099eb26 100644
--- a/data/as/30060825/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060825/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060872/ws-services-calculation/Penalty.json b/data/as/30060872/ws-services-calculation/Penalty.json
index 4eba0d6d59..32b5e5f1f5 100644
--- a/data/as/30060872/ws-services-calculation/Penalty.json
+++ b/data/as/30060872/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060872/ws-services-calculation/WCBillingSlab.json b/data/as/30060872/ws-services-calculation/WCBillingSlab.json
index 356fce7f88..27099e5bbb 100644
--- a/data/as/30060872/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060872/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060887/ws-services-calculation/Penalty.json b/data/as/30060887/ws-services-calculation/Penalty.json
index a15a6f7d24..5ccfc5cae6 100644
--- a/data/as/30060887/ws-services-calculation/Penalty.json
+++ b/data/as/30060887/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060887/ws-services-calculation/WCBillingSlab.json b/data/as/30060887/ws-services-calculation/WCBillingSlab.json
index f2ec717dfd..61f019e8d4 100644
--- a/data/as/30060887/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060887/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060892/ws-services-calculation/Penalty.json b/data/as/30060892/ws-services-calculation/Penalty.json
index 8e67c27e05..50340f8603 100644
--- a/data/as/30060892/ws-services-calculation/Penalty.json
+++ b/data/as/30060892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060892/ws-services-calculation/WCBillingSlab.json b/data/as/30060892/ws-services-calculation/WCBillingSlab.json
index 10f0ae47b3..86304af3ee 100644
--- a/data/as/30060892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060893/ws-services-calculation/Penalty.json b/data/as/30060893/ws-services-calculation/Penalty.json
index 7eef7bb960..4f88b4ff86 100644
--- a/data/as/30060893/ws-services-calculation/Penalty.json
+++ b/data/as/30060893/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060893/ws-services-calculation/WCBillingSlab.json b/data/as/30060893/ws-services-calculation/WCBillingSlab.json
index db16579938..93b906a9f5 100644
--- a/data/as/30060893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060893/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060898/ws-services-calculation/Penalty.json b/data/as/30060898/ws-services-calculation/Penalty.json
index c222106c40..c8aefa48f8 100644
--- a/data/as/30060898/ws-services-calculation/Penalty.json
+++ b/data/as/30060898/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060898/ws-services-calculation/WCBillingSlab.json b/data/as/30060898/ws-services-calculation/WCBillingSlab.json
index 30497b7752..5c2cdaf9b6 100644
--- a/data/as/30060898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060898/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060901/ws-services-calculation/Penalty.json b/data/as/30060901/ws-services-calculation/Penalty.json
index f304f7ea4a..6d0347209c 100644
--- a/data/as/30060901/ws-services-calculation/Penalty.json
+++ b/data/as/30060901/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060901/ws-services-calculation/WCBillingSlab.json b/data/as/30060901/ws-services-calculation/WCBillingSlab.json
index 5da4ad22dc..2c3eb8ae0a 100644
--- a/data/as/30060901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060901/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30060910/ws-services-calculation/Penalty.json b/data/as/30060910/ws-services-calculation/Penalty.json
index 729be307ca..ba46df3754 100644
--- a/data/as/30060910/ws-services-calculation/Penalty.json
+++ b/data/as/30060910/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060910/ws-services-calculation/WCBillingSlab.json b/data/as/30060910/ws-services-calculation/WCBillingSlab.json
index 2a0299f1b6..a6d55db722 100644
--- a/data/as/30060910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060910/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30061011/ws-services-calculation/Penalty.json b/data/as/30061011/ws-services-calculation/Penalty.json
index 424aa0b450..e9d5ed06ac 100644
--- a/data/as/30061011/ws-services-calculation/Penalty.json
+++ b/data/as/30061011/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30061011/ws-services-calculation/WCBillingSlab.json b/data/as/30061011/ws-services-calculation/WCBillingSlab.json
index d35c8b810b..4d27caab75 100644
--- a/data/as/30061011/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30061011/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30061020/ws-services-calculation/Penalty.json b/data/as/30061020/ws-services-calculation/Penalty.json
index 5c8111b867..1e05fa6240 100644
--- a/data/as/30061020/ws-services-calculation/Penalty.json
+++ b/data/as/30061020/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30061020/ws-services-calculation/WCBillingSlab.json b/data/as/30061020/ws-services-calculation/WCBillingSlab.json
index f42eda8b71..9328d66b8f 100644
--- a/data/as/30061020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30061020/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30061025/ws-services-calculation/Penalty.json b/data/as/30061025/ws-services-calculation/Penalty.json
index 0ac56ea108..1e372e8ff9 100644
--- a/data/as/30061025/ws-services-calculation/Penalty.json
+++ b/data/as/30061025/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30061025/ws-services-calculation/WCBillingSlab.json b/data/as/30061025/ws-services-calculation/WCBillingSlab.json
index eb08247f55..9ab17f37ca 100644
--- a/data/as/30061025/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30061025/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30062203/ws-services-calculation/Penalty.json b/data/as/30062203/ws-services-calculation/Penalty.json
index 921eec6798..bfd434f59e 100644
--- a/data/as/30062203/ws-services-calculation/Penalty.json
+++ b/data/as/30062203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062203/ws-services-calculation/WCBillingSlab.json b/data/as/30062203/ws-services-calculation/WCBillingSlab.json
index 573fbf5951..29f8b2096a 100644
--- a/data/as/30062203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30062205/ws-services-calculation/Penalty.json b/data/as/30062205/ws-services-calculation/Penalty.json
index 564be8661b..dd8ec1c4f2 100644
--- a/data/as/30062205/ws-services-calculation/Penalty.json
+++ b/data/as/30062205/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062205/ws-services-calculation/WCBillingSlab.json b/data/as/30062205/ws-services-calculation/WCBillingSlab.json
index 712eaade76..dc671486ea 100644
--- a/data/as/30062205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062205/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30062312/ws-services-calculation/Penalty.json b/data/as/30062312/ws-services-calculation/Penalty.json
index 7d3ef7a0c9..b7817fe56c 100644
--- a/data/as/30062312/ws-services-calculation/Penalty.json
+++ b/data/as/30062312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062312/ws-services-calculation/WCBillingSlab.json b/data/as/30062312/ws-services-calculation/WCBillingSlab.json
index aa146b68d5..325f9b0f6d 100644
--- a/data/as/30062312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30062320/ws-services-calculation/Penalty.json b/data/as/30062320/ws-services-calculation/Penalty.json
index 6c11d65499..199b595377 100644
--- a/data/as/30062320/ws-services-calculation/Penalty.json
+++ b/data/as/30062320/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062320/ws-services-calculation/WCBillingSlab.json b/data/as/30062320/ws-services-calculation/WCBillingSlab.json
index a898778b58..b9d2c3c9d8 100644
--- a/data/as/30062320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062320/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30062583/ws-services-calculation/Penalty.json b/data/as/30062583/ws-services-calculation/Penalty.json
index 1ad0806b4f..2773e2df73 100644
--- a/data/as/30062583/ws-services-calculation/Penalty.json
+++ b/data/as/30062583/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062583/ws-services-calculation/WCBillingSlab.json b/data/as/30062583/ws-services-calculation/WCBillingSlab.json
index 7699adeb3b..5d516ec5dd 100644
--- a/data/as/30062583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062583/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063118/ws-services-calculation/Penalty.json b/data/as/30063118/ws-services-calculation/Penalty.json
index b391e18fe7..884a56d268 100644
--- a/data/as/30063118/ws-services-calculation/Penalty.json
+++ b/data/as/30063118/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063118/ws-services-calculation/WCBillingSlab.json b/data/as/30063118/ws-services-calculation/WCBillingSlab.json
index 5290dffa93..50b268c5a2 100644
--- a/data/as/30063118/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063118/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063119/ws-services-calculation/Penalty.json b/data/as/30063119/ws-services-calculation/Penalty.json
index d552a98d14..960d227b57 100644
--- a/data/as/30063119/ws-services-calculation/Penalty.json
+++ b/data/as/30063119/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063119/ws-services-calculation/WCBillingSlab.json b/data/as/30063119/ws-services-calculation/WCBillingSlab.json
index 1e2922307d..c94f1a5c1b 100644
--- a/data/as/30063119/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063119/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063143/ws-services-calculation/Penalty.json b/data/as/30063143/ws-services-calculation/Penalty.json
index 873dd09de5..56276438a0 100644
--- a/data/as/30063143/ws-services-calculation/Penalty.json
+++ b/data/as/30063143/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063143/ws-services-calculation/WCBillingSlab.json b/data/as/30063143/ws-services-calculation/WCBillingSlab.json
index 3ffd894b0e..fac68d20a9 100644
--- a/data/as/30063143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063143/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063149/ws-services-calculation/Penalty.json b/data/as/30063149/ws-services-calculation/Penalty.json
index 26bedfc9ce..338eab2d43 100644
--- a/data/as/30063149/ws-services-calculation/Penalty.json
+++ b/data/as/30063149/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063149/ws-services-calculation/WCBillingSlab.json b/data/as/30063149/ws-services-calculation/WCBillingSlab.json
index 41e9adb889..ae233083be 100644
--- a/data/as/30063149/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063149/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063152/ws-services-calculation/Penalty.json b/data/as/30063152/ws-services-calculation/Penalty.json
index 53d8082d3d..c93eb25b1d 100644
--- a/data/as/30063152/ws-services-calculation/Penalty.json
+++ b/data/as/30063152/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063152/ws-services-calculation/WCBillingSlab.json b/data/as/30063152/ws-services-calculation/WCBillingSlab.json
index 37867b0051..45f2c623a1 100644
--- a/data/as/30063152/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063152/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063223/ws-services-calculation/Penalty.json b/data/as/30063223/ws-services-calculation/Penalty.json
index fb75b7ec3a..68225ffe62 100644
--- a/data/as/30063223/ws-services-calculation/Penalty.json
+++ b/data/as/30063223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063223/ws-services-calculation/WCBillingSlab.json b/data/as/30063223/ws-services-calculation/WCBillingSlab.json
index b8719599c2..7d5f5da879 100644
--- a/data/as/30063223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063228/ws-services-calculation/Penalty.json b/data/as/30063228/ws-services-calculation/Penalty.json
index 4d3ae467f8..244fa764cc 100644
--- a/data/as/30063228/ws-services-calculation/Penalty.json
+++ b/data/as/30063228/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063228/ws-services-calculation/WCBillingSlab.json b/data/as/30063228/ws-services-calculation/WCBillingSlab.json
index 0c0740c14e..09fb121edf 100644
--- a/data/as/30063228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063228/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063239/ws-services-calculation/Penalty.json b/data/as/30063239/ws-services-calculation/Penalty.json
index 92836c317d..a19c3ff6bd 100644
--- a/data/as/30063239/ws-services-calculation/Penalty.json
+++ b/data/as/30063239/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063239/ws-services-calculation/WCBillingSlab.json b/data/as/30063239/ws-services-calculation/WCBillingSlab.json
index 6e2cda96c7..7410597bf4 100644
--- a/data/as/30063239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063239/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063240/ws-services-calculation/Penalty.json b/data/as/30063240/ws-services-calculation/Penalty.json
index 720c36de6b..cce1b01eba 100644
--- a/data/as/30063240/ws-services-calculation/Penalty.json
+++ b/data/as/30063240/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063240/ws-services-calculation/WCBillingSlab.json b/data/as/30063240/ws-services-calculation/WCBillingSlab.json
index 4a6bc80b49..83866cb057 100644
--- a/data/as/30063240/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063240/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063285/ws-services-calculation/Penalty.json b/data/as/30063285/ws-services-calculation/Penalty.json
index 4cae28049b..f2ec60e7dd 100644
--- a/data/as/30063285/ws-services-calculation/Penalty.json
+++ b/data/as/30063285/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063285/ws-services-calculation/WCBillingSlab.json b/data/as/30063285/ws-services-calculation/WCBillingSlab.json
index 38bf15459a..a516c9f369 100644
--- a/data/as/30063285/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063285/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063294/ws-services-calculation/Penalty.json b/data/as/30063294/ws-services-calculation/Penalty.json
index f049f5ff00..a2a1502744 100644
--- a/data/as/30063294/ws-services-calculation/Penalty.json
+++ b/data/as/30063294/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063294/ws-services-calculation/WCBillingSlab.json b/data/as/30063294/ws-services-calculation/WCBillingSlab.json
index 32e03398b1..99e075f20d 100644
--- a/data/as/30063294/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063294/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063300/ws-services-calculation/Penalty.json b/data/as/30063300/ws-services-calculation/Penalty.json
index b2bc0a0114..e5c9bddce5 100644
--- a/data/as/30063300/ws-services-calculation/Penalty.json
+++ b/data/as/30063300/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063300/ws-services-calculation/WCBillingSlab.json b/data/as/30063300/ws-services-calculation/WCBillingSlab.json
index 2c33284b4c..4abee414fb 100644
--- a/data/as/30063300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063300/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30063426/ws-services-calculation/Penalty.json b/data/as/30063426/ws-services-calculation/Penalty.json
index 4e308a8cbf..dffd961c5d 100644
--- a/data/as/30063426/ws-services-calculation/Penalty.json
+++ b/data/as/30063426/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063426/ws-services-calculation/WCBillingSlab.json b/data/as/30063426/ws-services-calculation/WCBillingSlab.json
index 9e5a3d3f3f..63a837491b 100644
--- a/data/as/30063426/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063426/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30064069/ws-services-calculation/Penalty.json b/data/as/30064069/ws-services-calculation/Penalty.json
index ca3fab8027..b0d509fdd0 100644
--- a/data/as/30064069/ws-services-calculation/Penalty.json
+++ b/data/as/30064069/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064069/ws-services-calculation/WCBillingSlab.json b/data/as/30064069/ws-services-calculation/WCBillingSlab.json
index e9f47b194a..569cfc69b8 100644
--- a/data/as/30064069/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064069/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30064490/ws-services-calculation/Penalty.json b/data/as/30064490/ws-services-calculation/Penalty.json
index c2345b26b1..fe20f1a57c 100644
--- a/data/as/30064490/ws-services-calculation/Penalty.json
+++ b/data/as/30064490/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064490/ws-services-calculation/WCBillingSlab.json b/data/as/30064490/ws-services-calculation/WCBillingSlab.json
index f7b407f098..04addc7663 100644
--- a/data/as/30064490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064490/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30064646/ws-services-calculation/Penalty.json b/data/as/30064646/ws-services-calculation/Penalty.json
index e9a7de959d..ed5cbf9151 100644
--- a/data/as/30064646/ws-services-calculation/Penalty.json
+++ b/data/as/30064646/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064646/ws-services-calculation/WCBillingSlab.json b/data/as/30064646/ws-services-calculation/WCBillingSlab.json
index e25a643b3a..5279d2f0da 100644
--- a/data/as/30064646/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064646/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30064830/ws-services-calculation/Penalty.json b/data/as/30064830/ws-services-calculation/Penalty.json
index 75c4af7e77..35a7570979 100644
--- a/data/as/30064830/ws-services-calculation/Penalty.json
+++ b/data/as/30064830/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064830/ws-services-calculation/WCBillingSlab.json b/data/as/30064830/ws-services-calculation/WCBillingSlab.json
index 9d856db16b..bf2478168c 100644
--- a/data/as/30064830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064830/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30065052/ws-services-calculation/Penalty.json b/data/as/30065052/ws-services-calculation/Penalty.json
index 7c3acb8a38..147056bff5 100644
--- a/data/as/30065052/ws-services-calculation/Penalty.json
+++ b/data/as/30065052/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065052/ws-services-calculation/WCBillingSlab.json b/data/as/30065052/ws-services-calculation/WCBillingSlab.json
index 05dc0bceb6..99d11997ee 100644
--- a/data/as/30065052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065052/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30065285/ws-services-calculation/Penalty.json b/data/as/30065285/ws-services-calculation/Penalty.json
index f962d47403..5047397065 100644
--- a/data/as/30065285/ws-services-calculation/Penalty.json
+++ b/data/as/30065285/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065285/ws-services-calculation/WCBillingSlab.json b/data/as/30065285/ws-services-calculation/WCBillingSlab.json
index fea5e330bd..bff45f0c2c 100644
--- a/data/as/30065285/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065285/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30065673/ws-services-calculation/Penalty.json b/data/as/30065673/ws-services-calculation/Penalty.json
index 21e5873e13..4f803d5441 100644
--- a/data/as/30065673/ws-services-calculation/Penalty.json
+++ b/data/as/30065673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065673/ws-services-calculation/WCBillingSlab.json b/data/as/30065673/ws-services-calculation/WCBillingSlab.json
index 7c8a02c0c0..4572637fc3 100644
--- a/data/as/30065673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30065681/ws-services-calculation/Penalty.json b/data/as/30065681/ws-services-calculation/Penalty.json
index 82fa7fa2e6..f2f24ef8bf 100644
--- a/data/as/30065681/ws-services-calculation/Penalty.json
+++ b/data/as/30065681/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065681/ws-services-calculation/WCBillingSlab.json b/data/as/30065681/ws-services-calculation/WCBillingSlab.json
index a95e771f34..dc60435055 100644
--- a/data/as/30065681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065681/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30065865/ws-services-calculation/Penalty.json b/data/as/30065865/ws-services-calculation/Penalty.json
index 0028ec4f08..f3597a2c66 100644
--- a/data/as/30065865/ws-services-calculation/Penalty.json
+++ b/data/as/30065865/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065865/ws-services-calculation/WCBillingSlab.json b/data/as/30065865/ws-services-calculation/WCBillingSlab.json
index 63f1f75313..6ff774201c 100644
--- a/data/as/30065865/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065865/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30065876/ws-services-calculation/Penalty.json b/data/as/30065876/ws-services-calculation/Penalty.json
index a969237ae7..88c43f3918 100644
--- a/data/as/30065876/ws-services-calculation/Penalty.json
+++ b/data/as/30065876/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065876/ws-services-calculation/WCBillingSlab.json b/data/as/30065876/ws-services-calculation/WCBillingSlab.json
index 8ceceadda4..601c7d74d4 100644
--- a/data/as/30065876/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065876/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30066198/ws-services-calculation/Penalty.json b/data/as/30066198/ws-services-calculation/Penalty.json
index fa094ed4d8..64833e4e44 100644
--- a/data/as/30066198/ws-services-calculation/Penalty.json
+++ b/data/as/30066198/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066198/ws-services-calculation/WCBillingSlab.json b/data/as/30066198/ws-services-calculation/WCBillingSlab.json
index 22f6cce22b..61a25847d2 100644
--- a/data/as/30066198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066198/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30066211/ws-services-calculation/Penalty.json b/data/as/30066211/ws-services-calculation/Penalty.json
index 6ec4aaf696..b3aece17b8 100644
--- a/data/as/30066211/ws-services-calculation/Penalty.json
+++ b/data/as/30066211/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066211/ws-services-calculation/WCBillingSlab.json b/data/as/30066211/ws-services-calculation/WCBillingSlab.json
index 5af2e93e85..ef7590608f 100644
--- a/data/as/30066211/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066211/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30066318/ws-services-calculation/Penalty.json b/data/as/30066318/ws-services-calculation/Penalty.json
index e55e2a40d9..830310b42b 100644
--- a/data/as/30066318/ws-services-calculation/Penalty.json
+++ b/data/as/30066318/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066318/ws-services-calculation/WCBillingSlab.json b/data/as/30066318/ws-services-calculation/WCBillingSlab.json
index f088ade41b..e18df652d1 100644
--- a/data/as/30066318/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066318/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30066345/ws-services-calculation/Penalty.json b/data/as/30066345/ws-services-calculation/Penalty.json
index 251a574f53..509f08528a 100644
--- a/data/as/30066345/ws-services-calculation/Penalty.json
+++ b/data/as/30066345/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066345/ws-services-calculation/WCBillingSlab.json b/data/as/30066345/ws-services-calculation/WCBillingSlab.json
index cf59cd764f..25fcdee0b1 100644
--- a/data/as/30066345/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066345/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067036/ws-services-calculation/Penalty.json b/data/as/30067036/ws-services-calculation/Penalty.json
index 6dc24c35f4..ab61932f9f 100644
--- a/data/as/30067036/ws-services-calculation/Penalty.json
+++ b/data/as/30067036/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067036/ws-services-calculation/WCBillingSlab.json b/data/as/30067036/ws-services-calculation/WCBillingSlab.json
index ed29d675d4..70e61952e0 100644
--- a/data/as/30067036/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067036/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067040/ws-services-calculation/Penalty.json b/data/as/30067040/ws-services-calculation/Penalty.json
index 2499b0c743..87b7b39231 100644
--- a/data/as/30067040/ws-services-calculation/Penalty.json
+++ b/data/as/30067040/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067040/ws-services-calculation/WCBillingSlab.json b/data/as/30067040/ws-services-calculation/WCBillingSlab.json
index cd080c5d70..c501c19657 100644
--- a/data/as/30067040/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067040/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067065/ws-services-calculation/Penalty.json b/data/as/30067065/ws-services-calculation/Penalty.json
index d1d80bbfee..94e6839c89 100644
--- a/data/as/30067065/ws-services-calculation/Penalty.json
+++ b/data/as/30067065/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067065/ws-services-calculation/WCBillingSlab.json b/data/as/30067065/ws-services-calculation/WCBillingSlab.json
index 6d33328378..0143f1dad5 100644
--- a/data/as/30067065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067065/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067067/ws-services-calculation/Penalty.json b/data/as/30067067/ws-services-calculation/Penalty.json
index 69cf7b4ccd..c8ddd4ce4d 100644
--- a/data/as/30067067/ws-services-calculation/Penalty.json
+++ b/data/as/30067067/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067067/ws-services-calculation/WCBillingSlab.json b/data/as/30067067/ws-services-calculation/WCBillingSlab.json
index 5942f67331..bbf65da9af 100644
--- a/data/as/30067067/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067067/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067084/ws-services-calculation/Penalty.json b/data/as/30067084/ws-services-calculation/Penalty.json
index 0c7fcf985d..a0f3ea89aa 100644
--- a/data/as/30067084/ws-services-calculation/Penalty.json
+++ b/data/as/30067084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067084/ws-services-calculation/WCBillingSlab.json b/data/as/30067084/ws-services-calculation/WCBillingSlab.json
index 60f09c1b42..13eb618ae3 100644
--- a/data/as/30067084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067086/ws-services-calculation/Penalty.json b/data/as/30067086/ws-services-calculation/Penalty.json
index 121582965d..66cca1dee8 100644
--- a/data/as/30067086/ws-services-calculation/Penalty.json
+++ b/data/as/30067086/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067086/ws-services-calculation/WCBillingSlab.json b/data/as/30067086/ws-services-calculation/WCBillingSlab.json
index d4b9c36e64..fcba5be324 100644
--- a/data/as/30067086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067086/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067101/ws-services-calculation/Penalty.json b/data/as/30067101/ws-services-calculation/Penalty.json
index 3d47cfeda0..b74af603a7 100644
--- a/data/as/30067101/ws-services-calculation/Penalty.json
+++ b/data/as/30067101/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067101/ws-services-calculation/WCBillingSlab.json b/data/as/30067101/ws-services-calculation/WCBillingSlab.json
index fb8bcec408..1e585d388b 100644
--- a/data/as/30067101/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067101/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067113/ws-services-calculation/Penalty.json b/data/as/30067113/ws-services-calculation/Penalty.json
index 8ce0c35647..15ef1d6bf5 100644
--- a/data/as/30067113/ws-services-calculation/Penalty.json
+++ b/data/as/30067113/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067113/ws-services-calculation/WCBillingSlab.json b/data/as/30067113/ws-services-calculation/WCBillingSlab.json
index 161cb733e7..a8c7562e14 100644
--- a/data/as/30067113/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067113/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067122/ws-services-calculation/Penalty.json b/data/as/30067122/ws-services-calculation/Penalty.json
index 2d3982d81a..09865c9bc7 100644
--- a/data/as/30067122/ws-services-calculation/Penalty.json
+++ b/data/as/30067122/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067122/ws-services-calculation/WCBillingSlab.json b/data/as/30067122/ws-services-calculation/WCBillingSlab.json
index abcb174f15..d6637b0daf 100644
--- a/data/as/30067122/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067122/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067179/ws-services-calculation/Penalty.json b/data/as/30067179/ws-services-calculation/Penalty.json
index 6e01fb124f..4948340e34 100644
--- a/data/as/30067179/ws-services-calculation/Penalty.json
+++ b/data/as/30067179/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067179/ws-services-calculation/WCBillingSlab.json b/data/as/30067179/ws-services-calculation/WCBillingSlab.json
index d870d7dd07..282954da46 100644
--- a/data/as/30067179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067179/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067304/ws-services-calculation/Penalty.json b/data/as/30067304/ws-services-calculation/Penalty.json
index 49de40e314..dd6f347def 100644
--- a/data/as/30067304/ws-services-calculation/Penalty.json
+++ b/data/as/30067304/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067304/ws-services-calculation/WCBillingSlab.json b/data/as/30067304/ws-services-calculation/WCBillingSlab.json
index fb5334bf62..1a4505dcec 100644
--- a/data/as/30067304/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067304/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067307/ws-services-calculation/Penalty.json b/data/as/30067307/ws-services-calculation/Penalty.json
index 0f2432206b..44787f6091 100644
--- a/data/as/30067307/ws-services-calculation/Penalty.json
+++ b/data/as/30067307/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067307/ws-services-calculation/WCBillingSlab.json b/data/as/30067307/ws-services-calculation/WCBillingSlab.json
index a0d539885a..c50dbec57d 100644
--- a/data/as/30067307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067307/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067308/ws-services-calculation/Penalty.json b/data/as/30067308/ws-services-calculation/Penalty.json
index 5e1c192d5b..697b6886f7 100644
--- a/data/as/30067308/ws-services-calculation/Penalty.json
+++ b/data/as/30067308/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067308/ws-services-calculation/WCBillingSlab.json b/data/as/30067308/ws-services-calculation/WCBillingSlab.json
index dda43abe72..87b8203750 100644
--- a/data/as/30067308/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067308/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067407/ws-services-calculation/Penalty.json b/data/as/30067407/ws-services-calculation/Penalty.json
index 7295d32bb3..02d99bfdda 100644
--- a/data/as/30067407/ws-services-calculation/Penalty.json
+++ b/data/as/30067407/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067407/ws-services-calculation/WCBillingSlab.json b/data/as/30067407/ws-services-calculation/WCBillingSlab.json
index c01830a373..d94deee530 100644
--- a/data/as/30067407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067407/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067418/ws-services-calculation/Penalty.json b/data/as/30067418/ws-services-calculation/Penalty.json
index 16ae2a16c8..2a3ead53bf 100644
--- a/data/as/30067418/ws-services-calculation/Penalty.json
+++ b/data/as/30067418/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067418/ws-services-calculation/WCBillingSlab.json b/data/as/30067418/ws-services-calculation/WCBillingSlab.json
index b760c63cbe..5a67770328 100644
--- a/data/as/30067418/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067418/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067441/ws-services-calculation/Penalty.json b/data/as/30067441/ws-services-calculation/Penalty.json
index 733475b7a1..b15e440691 100644
--- a/data/as/30067441/ws-services-calculation/Penalty.json
+++ b/data/as/30067441/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067441/ws-services-calculation/WCBillingSlab.json b/data/as/30067441/ws-services-calculation/WCBillingSlab.json
index 9792baf252..0ac9ed1c0e 100644
--- a/data/as/30067441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067441/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067449/ws-services-calculation/Penalty.json b/data/as/30067449/ws-services-calculation/Penalty.json
index 7bc65fba29..4c631733be 100644
--- a/data/as/30067449/ws-services-calculation/Penalty.json
+++ b/data/as/30067449/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067449/ws-services-calculation/WCBillingSlab.json b/data/as/30067449/ws-services-calculation/WCBillingSlab.json
index e6c5cb24d8..2814008762 100644
--- a/data/as/30067449/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067449/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067468/ws-services-calculation/Penalty.json b/data/as/30067468/ws-services-calculation/Penalty.json
index 2d393151df..a7b5bc2105 100644
--- a/data/as/30067468/ws-services-calculation/Penalty.json
+++ b/data/as/30067468/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067468/ws-services-calculation/WCBillingSlab.json b/data/as/30067468/ws-services-calculation/WCBillingSlab.json
index ecc29a1784..15cd9634ae 100644
--- a/data/as/30067468/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067468/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067475/ws-services-calculation/Penalty.json b/data/as/30067475/ws-services-calculation/Penalty.json
index 17693f9daa..167941271b 100644
--- a/data/as/30067475/ws-services-calculation/Penalty.json
+++ b/data/as/30067475/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067475/ws-services-calculation/WCBillingSlab.json b/data/as/30067475/ws-services-calculation/WCBillingSlab.json
index 02a0f20a53..501317a8bc 100644
--- a/data/as/30067475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067475/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067509/ws-services-calculation/Penalty.json b/data/as/30067509/ws-services-calculation/Penalty.json
index df171ee253..42f01e0695 100644
--- a/data/as/30067509/ws-services-calculation/Penalty.json
+++ b/data/as/30067509/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067509/ws-services-calculation/WCBillingSlab.json b/data/as/30067509/ws-services-calculation/WCBillingSlab.json
index 844de8f6e2..8c4137353b 100644
--- a/data/as/30067509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067509/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067518/ws-services-calculation/Penalty.json b/data/as/30067518/ws-services-calculation/Penalty.json
index 83db7f1420..8d793e1e85 100644
--- a/data/as/30067518/ws-services-calculation/Penalty.json
+++ b/data/as/30067518/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067518/ws-services-calculation/WCBillingSlab.json b/data/as/30067518/ws-services-calculation/WCBillingSlab.json
index b2ff565619..de6690a92b 100644
--- a/data/as/30067518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067518/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067536/ws-services-calculation/Penalty.json b/data/as/30067536/ws-services-calculation/Penalty.json
index ab36c75530..f6acf731b4 100644
--- a/data/as/30067536/ws-services-calculation/Penalty.json
+++ b/data/as/30067536/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067536/ws-services-calculation/WCBillingSlab.json b/data/as/30067536/ws-services-calculation/WCBillingSlab.json
index 9ad2a3612b..f1cc11e249 100644
--- a/data/as/30067536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067536/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067611/ws-services-calculation/Penalty.json b/data/as/30067611/ws-services-calculation/Penalty.json
index d826534012..5112b8b20c 100644
--- a/data/as/30067611/ws-services-calculation/Penalty.json
+++ b/data/as/30067611/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067611/ws-services-calculation/WCBillingSlab.json b/data/as/30067611/ws-services-calculation/WCBillingSlab.json
index 3773b06537..8932b1c85b 100644
--- a/data/as/30067611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067611/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067623/ws-services-calculation/Penalty.json b/data/as/30067623/ws-services-calculation/Penalty.json
index eaf7f5ef55..59d24ca40e 100644
--- a/data/as/30067623/ws-services-calculation/Penalty.json
+++ b/data/as/30067623/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067623/ws-services-calculation/WCBillingSlab.json b/data/as/30067623/ws-services-calculation/WCBillingSlab.json
index 8621fe529a..311755b30b 100644
--- a/data/as/30067623/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067623/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067699/ws-services-calculation/Penalty.json b/data/as/30067699/ws-services-calculation/Penalty.json
index 4c71bb168f..e60ef440c5 100644
--- a/data/as/30067699/ws-services-calculation/Penalty.json
+++ b/data/as/30067699/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067699/ws-services-calculation/WCBillingSlab.json b/data/as/30067699/ws-services-calculation/WCBillingSlab.json
index 8e6b9b8832..49ae05495d 100644
--- a/data/as/30067699/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067699/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067707/ws-services-calculation/Penalty.json b/data/as/30067707/ws-services-calculation/Penalty.json
index 0ef71b63ec..981a2180f7 100644
--- a/data/as/30067707/ws-services-calculation/Penalty.json
+++ b/data/as/30067707/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067707/ws-services-calculation/WCBillingSlab.json b/data/as/30067707/ws-services-calculation/WCBillingSlab.json
index 34e0971a1f..c627f710d3 100644
--- a/data/as/30067707/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067707/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067709/ws-services-calculation/Penalty.json b/data/as/30067709/ws-services-calculation/Penalty.json
index 7b134d5bb2..0d9f6adedd 100644
--- a/data/as/30067709/ws-services-calculation/Penalty.json
+++ b/data/as/30067709/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067709/ws-services-calculation/WCBillingSlab.json b/data/as/30067709/ws-services-calculation/WCBillingSlab.json
index e4aac7aa36..2bc8e00057 100644
--- a/data/as/30067709/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067709/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067714/ws-services-calculation/Penalty.json b/data/as/30067714/ws-services-calculation/Penalty.json
index 59f24ac4ea..4c30beb66b 100644
--- a/data/as/30067714/ws-services-calculation/Penalty.json
+++ b/data/as/30067714/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067714/ws-services-calculation/WCBillingSlab.json b/data/as/30067714/ws-services-calculation/WCBillingSlab.json
index cb0b1e2710..f585905180 100644
--- a/data/as/30067714/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067714/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067748/ws-services-calculation/Penalty.json b/data/as/30067748/ws-services-calculation/Penalty.json
index 1cbf46a728..5150b934bf 100644
--- a/data/as/30067748/ws-services-calculation/Penalty.json
+++ b/data/as/30067748/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067748/ws-services-calculation/WCBillingSlab.json b/data/as/30067748/ws-services-calculation/WCBillingSlab.json
index 56d7508ae0..311583deae 100644
--- a/data/as/30067748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067748/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067790/ws-services-calculation/Penalty.json b/data/as/30067790/ws-services-calculation/Penalty.json
index cc5532e539..fb77c05e09 100644
--- a/data/as/30067790/ws-services-calculation/Penalty.json
+++ b/data/as/30067790/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067790/ws-services-calculation/WCBillingSlab.json b/data/as/30067790/ws-services-calculation/WCBillingSlab.json
index f34143fdcc..4cbbee1ef2 100644
--- a/data/as/30067790/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067790/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067803/ws-services-calculation/Penalty.json b/data/as/30067803/ws-services-calculation/Penalty.json
index 6db1e45dad..0e49feda19 100644
--- a/data/as/30067803/ws-services-calculation/Penalty.json
+++ b/data/as/30067803/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067803/ws-services-calculation/WCBillingSlab.json b/data/as/30067803/ws-services-calculation/WCBillingSlab.json
index dd3d87d523..949f11c87a 100644
--- a/data/as/30067803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067803/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067829/ws-services-calculation/Penalty.json b/data/as/30067829/ws-services-calculation/Penalty.json
index 4056a24a83..417f0885bf 100644
--- a/data/as/30067829/ws-services-calculation/Penalty.json
+++ b/data/as/30067829/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067829/ws-services-calculation/WCBillingSlab.json b/data/as/30067829/ws-services-calculation/WCBillingSlab.json
index a07c021212..c56bbede10 100644
--- a/data/as/30067829/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067829/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067830/ws-services-calculation/Penalty.json b/data/as/30067830/ws-services-calculation/Penalty.json
index ac4cfe0a58..a2995c3c3b 100644
--- a/data/as/30067830/ws-services-calculation/Penalty.json
+++ b/data/as/30067830/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067830/ws-services-calculation/WCBillingSlab.json b/data/as/30067830/ws-services-calculation/WCBillingSlab.json
index 49bbfcf423..0374f61697 100644
--- a/data/as/30067830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067830/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067861/ws-services-calculation/Penalty.json b/data/as/30067861/ws-services-calculation/Penalty.json
index 94fd235260..eae3b54d52 100644
--- a/data/as/30067861/ws-services-calculation/Penalty.json
+++ b/data/as/30067861/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067861/ws-services-calculation/WCBillingSlab.json b/data/as/30067861/ws-services-calculation/WCBillingSlab.json
index 24d9a0a5f3..7fc58fda13 100644
--- a/data/as/30067861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067861/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067915/ws-services-calculation/Penalty.json b/data/as/30067915/ws-services-calculation/Penalty.json
index e51bec824f..38a8e7d084 100644
--- a/data/as/30067915/ws-services-calculation/Penalty.json
+++ b/data/as/30067915/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067915/ws-services-calculation/WCBillingSlab.json b/data/as/30067915/ws-services-calculation/WCBillingSlab.json
index 62d538f2d6..c5489fafc8 100644
--- a/data/as/30067915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067915/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067928/ws-services-calculation/Penalty.json b/data/as/30067928/ws-services-calculation/Penalty.json
index d93fc964da..2a45d32084 100644
--- a/data/as/30067928/ws-services-calculation/Penalty.json
+++ b/data/as/30067928/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067928/ws-services-calculation/WCBillingSlab.json b/data/as/30067928/ws-services-calculation/WCBillingSlab.json
index c46621eb67..627d9c9a8b 100644
--- a/data/as/30067928/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067928/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067938/ws-services-calculation/Penalty.json b/data/as/30067938/ws-services-calculation/Penalty.json
index c4e7f66114..a6766fb408 100644
--- a/data/as/30067938/ws-services-calculation/Penalty.json
+++ b/data/as/30067938/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067938/ws-services-calculation/WCBillingSlab.json b/data/as/30067938/ws-services-calculation/WCBillingSlab.json
index 8f90460853..68abf6934a 100644
--- a/data/as/30067938/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067938/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067942/ws-services-calculation/Penalty.json b/data/as/30067942/ws-services-calculation/Penalty.json
index 7b67282efb..27b594c163 100644
--- a/data/as/30067942/ws-services-calculation/Penalty.json
+++ b/data/as/30067942/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067942/ws-services-calculation/WCBillingSlab.json b/data/as/30067942/ws-services-calculation/WCBillingSlab.json
index d7ab6d5129..603b832f01 100644
--- a/data/as/30067942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067942/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067950/ws-services-calculation/Penalty.json b/data/as/30067950/ws-services-calculation/Penalty.json
index ec49ec65d3..06a7270a71 100644
--- a/data/as/30067950/ws-services-calculation/Penalty.json
+++ b/data/as/30067950/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067950/ws-services-calculation/WCBillingSlab.json b/data/as/30067950/ws-services-calculation/WCBillingSlab.json
index 9ae23e23f6..3fc0dc15b5 100644
--- a/data/as/30067950/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067950/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067958/ws-services-calculation/Penalty.json b/data/as/30067958/ws-services-calculation/Penalty.json
index 36381d2cad..60107e21aa 100644
--- a/data/as/30067958/ws-services-calculation/Penalty.json
+++ b/data/as/30067958/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067958/ws-services-calculation/WCBillingSlab.json b/data/as/30067958/ws-services-calculation/WCBillingSlab.json
index b0180c4757..53c74ccd2b 100644
--- a/data/as/30067958/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067958/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067962/ws-services-calculation/Penalty.json b/data/as/30067962/ws-services-calculation/Penalty.json
index f60ba00903..56b27b28da 100644
--- a/data/as/30067962/ws-services-calculation/Penalty.json
+++ b/data/as/30067962/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067962/ws-services-calculation/WCBillingSlab.json b/data/as/30067962/ws-services-calculation/WCBillingSlab.json
index b22ba7f5b9..30c2cf6de2 100644
--- a/data/as/30067962/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067962/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067985/ws-services-calculation/Penalty.json b/data/as/30067985/ws-services-calculation/Penalty.json
index 3c1cb4072f..13bb9aab3c 100644
--- a/data/as/30067985/ws-services-calculation/Penalty.json
+++ b/data/as/30067985/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067985/ws-services-calculation/WCBillingSlab.json b/data/as/30067985/ws-services-calculation/WCBillingSlab.json
index 12fd73cf66..cb6e997a84 100644
--- a/data/as/30067985/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067985/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30067989/ws-services-calculation/Penalty.json b/data/as/30067989/ws-services-calculation/Penalty.json
index 794ec3adc1..db8084055b 100644
--- a/data/as/30067989/ws-services-calculation/Penalty.json
+++ b/data/as/30067989/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067989/ws-services-calculation/WCBillingSlab.json b/data/as/30067989/ws-services-calculation/WCBillingSlab.json
index d7675b6e5f..090dd91f68 100644
--- a/data/as/30067989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067989/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068077/ws-services-calculation/Penalty.json b/data/as/30068077/ws-services-calculation/Penalty.json
index ef805bdbd2..1891b5afdc 100644
--- a/data/as/30068077/ws-services-calculation/Penalty.json
+++ b/data/as/30068077/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068077/ws-services-calculation/WCBillingSlab.json b/data/as/30068077/ws-services-calculation/WCBillingSlab.json
index b0afce9550..16001cc7f4 100644
--- a/data/as/30068077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068077/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068088/ws-services-calculation/Penalty.json b/data/as/30068088/ws-services-calculation/Penalty.json
index 0d2dea5183..5a01a12e1e 100644
--- a/data/as/30068088/ws-services-calculation/Penalty.json
+++ b/data/as/30068088/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068088/ws-services-calculation/WCBillingSlab.json b/data/as/30068088/ws-services-calculation/WCBillingSlab.json
index b9b77cc668..8964cffaf3 100644
--- a/data/as/30068088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068088/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068096/ws-services-calculation/Penalty.json b/data/as/30068096/ws-services-calculation/Penalty.json
index 58a0685d3f..9824314bc6 100644
--- a/data/as/30068096/ws-services-calculation/Penalty.json
+++ b/data/as/30068096/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068096/ws-services-calculation/WCBillingSlab.json b/data/as/30068096/ws-services-calculation/WCBillingSlab.json
index f9894fe092..d60fe1059c 100644
--- a/data/as/30068096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068096/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068187/ws-services-calculation/Penalty.json b/data/as/30068187/ws-services-calculation/Penalty.json
index 447384ddfb..112ab4d013 100644
--- a/data/as/30068187/ws-services-calculation/Penalty.json
+++ b/data/as/30068187/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068187/ws-services-calculation/WCBillingSlab.json b/data/as/30068187/ws-services-calculation/WCBillingSlab.json
index d033346a9d..b8ec69f053 100644
--- a/data/as/30068187/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068187/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068194/ws-services-calculation/Penalty.json b/data/as/30068194/ws-services-calculation/Penalty.json
index 95a3cc4667..ca6cee7fa3 100644
--- a/data/as/30068194/ws-services-calculation/Penalty.json
+++ b/data/as/30068194/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068194/ws-services-calculation/WCBillingSlab.json b/data/as/30068194/ws-services-calculation/WCBillingSlab.json
index aaf13521c0..818d356db5 100644
--- a/data/as/30068194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068194/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068198/ws-services-calculation/Penalty.json b/data/as/30068198/ws-services-calculation/Penalty.json
index 234873e658..5fb4f769f5 100644
--- a/data/as/30068198/ws-services-calculation/Penalty.json
+++ b/data/as/30068198/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068198/ws-services-calculation/WCBillingSlab.json b/data/as/30068198/ws-services-calculation/WCBillingSlab.json
index ab962abb9e..533c13199a 100644
--- a/data/as/30068198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068198/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068210/ws-services-calculation/Penalty.json b/data/as/30068210/ws-services-calculation/Penalty.json
index 3cafd72509..8b94eedb2a 100644
--- a/data/as/30068210/ws-services-calculation/Penalty.json
+++ b/data/as/30068210/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068210/ws-services-calculation/WCBillingSlab.json b/data/as/30068210/ws-services-calculation/WCBillingSlab.json
index 62f0d45bc2..de83a5573a 100644
--- a/data/as/30068210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068210/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068218/ws-services-calculation/Penalty.json b/data/as/30068218/ws-services-calculation/Penalty.json
index d11c02ec81..52f70cdd92 100644
--- a/data/as/30068218/ws-services-calculation/Penalty.json
+++ b/data/as/30068218/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068218/ws-services-calculation/WCBillingSlab.json b/data/as/30068218/ws-services-calculation/WCBillingSlab.json
index 68090229fd..3a484633b5 100644
--- a/data/as/30068218/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068218/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068225/ws-services-calculation/Penalty.json b/data/as/30068225/ws-services-calculation/Penalty.json
index f6ab770c42..b7ad82919f 100644
--- a/data/as/30068225/ws-services-calculation/Penalty.json
+++ b/data/as/30068225/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068225/ws-services-calculation/WCBillingSlab.json b/data/as/30068225/ws-services-calculation/WCBillingSlab.json
index 54367d6549..a0e614bcac 100644
--- a/data/as/30068225/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068225/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068229/ws-services-calculation/Penalty.json b/data/as/30068229/ws-services-calculation/Penalty.json
index b0e1cd71e9..e3c500a5dc 100644
--- a/data/as/30068229/ws-services-calculation/Penalty.json
+++ b/data/as/30068229/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068229/ws-services-calculation/WCBillingSlab.json b/data/as/30068229/ws-services-calculation/WCBillingSlab.json
index b77f73648a..3fe2f354de 100644
--- a/data/as/30068229/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068229/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068331/ws-services-calculation/Penalty.json b/data/as/30068331/ws-services-calculation/Penalty.json
index 2f51226a2b..783ce13b30 100644
--- a/data/as/30068331/ws-services-calculation/Penalty.json
+++ b/data/as/30068331/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068331/ws-services-calculation/WCBillingSlab.json b/data/as/30068331/ws-services-calculation/WCBillingSlab.json
index f52cfa682c..229ed6273f 100644
--- a/data/as/30068331/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068331/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068340/ws-services-calculation/Penalty.json b/data/as/30068340/ws-services-calculation/Penalty.json
index 5d4188b2f6..ac8c5ce9df 100644
--- a/data/as/30068340/ws-services-calculation/Penalty.json
+++ b/data/as/30068340/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068340/ws-services-calculation/WCBillingSlab.json b/data/as/30068340/ws-services-calculation/WCBillingSlab.json
index 2d6f712024..398a9143b1 100644
--- a/data/as/30068340/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068340/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068345/ws-services-calculation/Penalty.json b/data/as/30068345/ws-services-calculation/Penalty.json
index f1ce59e241..e71595ce80 100644
--- a/data/as/30068345/ws-services-calculation/Penalty.json
+++ b/data/as/30068345/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068345/ws-services-calculation/WCBillingSlab.json b/data/as/30068345/ws-services-calculation/WCBillingSlab.json
index b2778038ef..1b2fe8a8ce 100644
--- a/data/as/30068345/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068345/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068356/ws-services-calculation/Penalty.json b/data/as/30068356/ws-services-calculation/Penalty.json
index e720eefb43..ba2662d9ad 100644
--- a/data/as/30068356/ws-services-calculation/Penalty.json
+++ b/data/as/30068356/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068356/ws-services-calculation/WCBillingSlab.json b/data/as/30068356/ws-services-calculation/WCBillingSlab.json
index 8d52eebf8e..d85fe1b32c 100644
--- a/data/as/30068356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068356/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068380/ws-services-calculation/Penalty.json b/data/as/30068380/ws-services-calculation/Penalty.json
index f96a1d1066..97a5e4ce06 100644
--- a/data/as/30068380/ws-services-calculation/Penalty.json
+++ b/data/as/30068380/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068380/ws-services-calculation/WCBillingSlab.json b/data/as/30068380/ws-services-calculation/WCBillingSlab.json
index cd246f8926..4e593d8db2 100644
--- a/data/as/30068380/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068380/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068419/ws-services-calculation/Penalty.json b/data/as/30068419/ws-services-calculation/Penalty.json
index 7ddd81ff84..c1b247784c 100644
--- a/data/as/30068419/ws-services-calculation/Penalty.json
+++ b/data/as/30068419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068419/ws-services-calculation/WCBillingSlab.json b/data/as/30068419/ws-services-calculation/WCBillingSlab.json
index cd8a638ca2..b4b08eb28f 100644
--- a/data/as/30068419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068422/ws-services-calculation/Penalty.json b/data/as/30068422/ws-services-calculation/Penalty.json
index f89d003536..4c70302f19 100644
--- a/data/as/30068422/ws-services-calculation/Penalty.json
+++ b/data/as/30068422/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068422/ws-services-calculation/WCBillingSlab.json b/data/as/30068422/ws-services-calculation/WCBillingSlab.json
index c3890b5a3e..ad57a53e64 100644
--- a/data/as/30068422/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068422/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068427/ws-services-calculation/Penalty.json b/data/as/30068427/ws-services-calculation/Penalty.json
index c218a2190e..863a4f6010 100644
--- a/data/as/30068427/ws-services-calculation/Penalty.json
+++ b/data/as/30068427/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068427/ws-services-calculation/WCBillingSlab.json b/data/as/30068427/ws-services-calculation/WCBillingSlab.json
index d471e192b5..c5a17751dd 100644
--- a/data/as/30068427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068427/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068428/ws-services-calculation/Penalty.json b/data/as/30068428/ws-services-calculation/Penalty.json
index 351dc4f1b8..08d8c989db 100644
--- a/data/as/30068428/ws-services-calculation/Penalty.json
+++ b/data/as/30068428/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068428/ws-services-calculation/WCBillingSlab.json b/data/as/30068428/ws-services-calculation/WCBillingSlab.json
index 95a2e6c3ba..13d422b4ab 100644
--- a/data/as/30068428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068428/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068533/ws-services-calculation/Penalty.json b/data/as/30068533/ws-services-calculation/Penalty.json
index 668120547b..1249daaa9e 100644
--- a/data/as/30068533/ws-services-calculation/Penalty.json
+++ b/data/as/30068533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068533/ws-services-calculation/WCBillingSlab.json b/data/as/30068533/ws-services-calculation/WCBillingSlab.json
index a4c5fc5ae2..02d0c5adbe 100644
--- a/data/as/30068533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068606/ws-services-calculation/Penalty.json b/data/as/30068606/ws-services-calculation/Penalty.json
index 670ce788ba..3d1bfd69b5 100644
--- a/data/as/30068606/ws-services-calculation/Penalty.json
+++ b/data/as/30068606/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068606/ws-services-calculation/WCBillingSlab.json b/data/as/30068606/ws-services-calculation/WCBillingSlab.json
index bb3c552306..73d0abcd3a 100644
--- a/data/as/30068606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068606/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068609/ws-services-calculation/Penalty.json b/data/as/30068609/ws-services-calculation/Penalty.json
index 61506e4f94..72a9c16d72 100644
--- a/data/as/30068609/ws-services-calculation/Penalty.json
+++ b/data/as/30068609/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068609/ws-services-calculation/WCBillingSlab.json b/data/as/30068609/ws-services-calculation/WCBillingSlab.json
index 2075f4de2f..f12dc83521 100644
--- a/data/as/30068609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068609/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068614/ws-services-calculation/Penalty.json b/data/as/30068614/ws-services-calculation/Penalty.json
index 004acb6881..ecc6679c6a 100644
--- a/data/as/30068614/ws-services-calculation/Penalty.json
+++ b/data/as/30068614/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068614/ws-services-calculation/WCBillingSlab.json b/data/as/30068614/ws-services-calculation/WCBillingSlab.json
index bfa7da7814..0070bde52c 100644
--- a/data/as/30068614/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068614/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068620/ws-services-calculation/Penalty.json b/data/as/30068620/ws-services-calculation/Penalty.json
index 08d3367766..5a88a4b652 100644
--- a/data/as/30068620/ws-services-calculation/Penalty.json
+++ b/data/as/30068620/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068620/ws-services-calculation/WCBillingSlab.json b/data/as/30068620/ws-services-calculation/WCBillingSlab.json
index b5daf1a02c..ad1f957c04 100644
--- a/data/as/30068620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068620/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068648/ws-services-calculation/Penalty.json b/data/as/30068648/ws-services-calculation/Penalty.json
index 5256cec1f1..d31ad0522f 100644
--- a/data/as/30068648/ws-services-calculation/Penalty.json
+++ b/data/as/30068648/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068648/ws-services-calculation/WCBillingSlab.json b/data/as/30068648/ws-services-calculation/WCBillingSlab.json
index 93359c1b9f..a031a32cd1 100644
--- a/data/as/30068648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068648/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068650/ws-services-calculation/Penalty.json b/data/as/30068650/ws-services-calculation/Penalty.json
index d2440070a4..71db065117 100644
--- a/data/as/30068650/ws-services-calculation/Penalty.json
+++ b/data/as/30068650/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068650/ws-services-calculation/WCBillingSlab.json b/data/as/30068650/ws-services-calculation/WCBillingSlab.json
index 5483a62ef8..220428157b 100644
--- a/data/as/30068650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068650/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068669/ws-services-calculation/Penalty.json b/data/as/30068669/ws-services-calculation/Penalty.json
index 93a63b59ad..a5a39ddaa6 100644
--- a/data/as/30068669/ws-services-calculation/Penalty.json
+++ b/data/as/30068669/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068669/ws-services-calculation/WCBillingSlab.json b/data/as/30068669/ws-services-calculation/WCBillingSlab.json
index 6db2816216..0f2f4508bd 100644
--- a/data/as/30068669/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068669/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30068672/ws-services-calculation/Penalty.json b/data/as/30068672/ws-services-calculation/Penalty.json
index bbaa4dcdfa..d0a1305780 100644
--- a/data/as/30068672/ws-services-calculation/Penalty.json
+++ b/data/as/30068672/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068672/ws-services-calculation/WCBillingSlab.json b/data/as/30068672/ws-services-calculation/WCBillingSlab.json
index 627072b1ac..559678e41d 100644
--- a/data/as/30068672/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068672/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069086/ws-services-calculation/Penalty.json b/data/as/30069086/ws-services-calculation/Penalty.json
index 1c71a1043c..c606f6bc8c 100644
--- a/data/as/30069086/ws-services-calculation/Penalty.json
+++ b/data/as/30069086/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069086/ws-services-calculation/WCBillingSlab.json b/data/as/30069086/ws-services-calculation/WCBillingSlab.json
index 2eec82ea70..2b15d398a7 100644
--- a/data/as/30069086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069086/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069093/ws-services-calculation/Penalty.json b/data/as/30069093/ws-services-calculation/Penalty.json
index cd316439ce..5e9a626457 100644
--- a/data/as/30069093/ws-services-calculation/Penalty.json
+++ b/data/as/30069093/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069093/ws-services-calculation/WCBillingSlab.json b/data/as/30069093/ws-services-calculation/WCBillingSlab.json
index fa59d7a10f..43baef9069 100644
--- a/data/as/30069093/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069093/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069124/ws-services-calculation/Penalty.json b/data/as/30069124/ws-services-calculation/Penalty.json
index 27d5fe5517..8de54f3806 100644
--- a/data/as/30069124/ws-services-calculation/Penalty.json
+++ b/data/as/30069124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069124/ws-services-calculation/WCBillingSlab.json b/data/as/30069124/ws-services-calculation/WCBillingSlab.json
index c6230f74ea..2508eeae66 100644
--- a/data/as/30069124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069136/ws-services-calculation/Penalty.json b/data/as/30069136/ws-services-calculation/Penalty.json
index 143c793af7..f29ce4cf60 100644
--- a/data/as/30069136/ws-services-calculation/Penalty.json
+++ b/data/as/30069136/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069136/ws-services-calculation/WCBillingSlab.json b/data/as/30069136/ws-services-calculation/WCBillingSlab.json
index fdea228aeb..8bcaa8b1e4 100644
--- a/data/as/30069136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069136/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069142/ws-services-calculation/Penalty.json b/data/as/30069142/ws-services-calculation/Penalty.json
index b81775b8a4..ae4fdc0bb1 100644
--- a/data/as/30069142/ws-services-calculation/Penalty.json
+++ b/data/as/30069142/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069142/ws-services-calculation/WCBillingSlab.json b/data/as/30069142/ws-services-calculation/WCBillingSlab.json
index 31f0a108eb..1fe3464562 100644
--- a/data/as/30069142/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069142/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069148/ws-services-calculation/Penalty.json b/data/as/30069148/ws-services-calculation/Penalty.json
index 99bed71b99..303b1a02f3 100644
--- a/data/as/30069148/ws-services-calculation/Penalty.json
+++ b/data/as/30069148/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069148/ws-services-calculation/WCBillingSlab.json b/data/as/30069148/ws-services-calculation/WCBillingSlab.json
index d159841763..4f1775aa59 100644
--- a/data/as/30069148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069148/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069157/ws-services-calculation/Penalty.json b/data/as/30069157/ws-services-calculation/Penalty.json
index b726fa3f9d..399e71d6fe 100644
--- a/data/as/30069157/ws-services-calculation/Penalty.json
+++ b/data/as/30069157/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069157/ws-services-calculation/WCBillingSlab.json b/data/as/30069157/ws-services-calculation/WCBillingSlab.json
index 58767efe00..83831cf7ad 100644
--- a/data/as/30069157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069157/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069165/ws-services-calculation/Penalty.json b/data/as/30069165/ws-services-calculation/Penalty.json
index eddd112646..a54798d39a 100644
--- a/data/as/30069165/ws-services-calculation/Penalty.json
+++ b/data/as/30069165/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069165/ws-services-calculation/WCBillingSlab.json b/data/as/30069165/ws-services-calculation/WCBillingSlab.json
index 644d4b81ae..ff0045151b 100644
--- a/data/as/30069165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069165/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069183/ws-services-calculation/Penalty.json b/data/as/30069183/ws-services-calculation/Penalty.json
index 00f5916e67..fcbab3a4ec 100644
--- a/data/as/30069183/ws-services-calculation/Penalty.json
+++ b/data/as/30069183/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069183/ws-services-calculation/WCBillingSlab.json b/data/as/30069183/ws-services-calculation/WCBillingSlab.json
index fdcd23bdb3..5a7267bd67 100644
--- a/data/as/30069183/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069183/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069223/ws-services-calculation/Penalty.json b/data/as/30069223/ws-services-calculation/Penalty.json
index 9012754c91..d7389b6b1b 100644
--- a/data/as/30069223/ws-services-calculation/Penalty.json
+++ b/data/as/30069223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069223/ws-services-calculation/WCBillingSlab.json b/data/as/30069223/ws-services-calculation/WCBillingSlab.json
index 220eefd857..b0458b83ac 100644
--- a/data/as/30069223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069230/ws-services-calculation/Penalty.json b/data/as/30069230/ws-services-calculation/Penalty.json
index 15141582d9..09f2af86ad 100644
--- a/data/as/30069230/ws-services-calculation/Penalty.json
+++ b/data/as/30069230/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069230/ws-services-calculation/WCBillingSlab.json b/data/as/30069230/ws-services-calculation/WCBillingSlab.json
index 4758eab2e6..4cde8f0311 100644
--- a/data/as/30069230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069230/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069261/ws-services-calculation/Penalty.json b/data/as/30069261/ws-services-calculation/Penalty.json
index 7a4d351d45..e937082e1f 100644
--- a/data/as/30069261/ws-services-calculation/Penalty.json
+++ b/data/as/30069261/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069261/ws-services-calculation/WCBillingSlab.json b/data/as/30069261/ws-services-calculation/WCBillingSlab.json
index 9a5fef15c2..d3189d0bee 100644
--- a/data/as/30069261/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069261/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069267/ws-services-calculation/Penalty.json b/data/as/30069267/ws-services-calculation/Penalty.json
index 0e604b3770..950644a119 100644
--- a/data/as/30069267/ws-services-calculation/Penalty.json
+++ b/data/as/30069267/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069267/ws-services-calculation/WCBillingSlab.json b/data/as/30069267/ws-services-calculation/WCBillingSlab.json
index bd784043fa..f1b8bcb1d0 100644
--- a/data/as/30069267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069267/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069282/ws-services-calculation/Penalty.json b/data/as/30069282/ws-services-calculation/Penalty.json
index 04d3cd40e2..3ae3fa5f69 100644
--- a/data/as/30069282/ws-services-calculation/Penalty.json
+++ b/data/as/30069282/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069282/ws-services-calculation/WCBillingSlab.json b/data/as/30069282/ws-services-calculation/WCBillingSlab.json
index d542637a58..5f334839da 100644
--- a/data/as/30069282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069282/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069283/ws-services-calculation/Penalty.json b/data/as/30069283/ws-services-calculation/Penalty.json
index 6392f7124b..7fac33d693 100644
--- a/data/as/30069283/ws-services-calculation/Penalty.json
+++ b/data/as/30069283/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069283/ws-services-calculation/WCBillingSlab.json b/data/as/30069283/ws-services-calculation/WCBillingSlab.json
index 5916bc6ed6..f4f67c0233 100644
--- a/data/as/30069283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069283/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069284/ws-services-calculation/Penalty.json b/data/as/30069284/ws-services-calculation/Penalty.json
index b25e9eed86..ecfedb1aa8 100644
--- a/data/as/30069284/ws-services-calculation/Penalty.json
+++ b/data/as/30069284/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069284/ws-services-calculation/WCBillingSlab.json b/data/as/30069284/ws-services-calculation/WCBillingSlab.json
index 9691e8309a..0a27a1505f 100644
--- a/data/as/30069284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069284/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069296/ws-services-calculation/Penalty.json b/data/as/30069296/ws-services-calculation/Penalty.json
index 2bd340b033..283d8a9594 100644
--- a/data/as/30069296/ws-services-calculation/Penalty.json
+++ b/data/as/30069296/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069296/ws-services-calculation/WCBillingSlab.json b/data/as/30069296/ws-services-calculation/WCBillingSlab.json
index eaa3743bef..71a259fb7d 100644
--- a/data/as/30069296/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069296/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069733/ws-services-calculation/Penalty.json b/data/as/30069733/ws-services-calculation/Penalty.json
index 9ebdeedbc3..4dbef50cc8 100644
--- a/data/as/30069733/ws-services-calculation/Penalty.json
+++ b/data/as/30069733/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069733/ws-services-calculation/WCBillingSlab.json b/data/as/30069733/ws-services-calculation/WCBillingSlab.json
index 3b5d1c72b5..f3584593a7 100644
--- a/data/as/30069733/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069733/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069738/ws-services-calculation/Penalty.json b/data/as/30069738/ws-services-calculation/Penalty.json
index 8af18efe88..4a3f8bc352 100644
--- a/data/as/30069738/ws-services-calculation/Penalty.json
+++ b/data/as/30069738/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069738/ws-services-calculation/WCBillingSlab.json b/data/as/30069738/ws-services-calculation/WCBillingSlab.json
index 7da1e7e506..5c7e78643f 100644
--- a/data/as/30069738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069738/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069742/ws-services-calculation/Penalty.json b/data/as/30069742/ws-services-calculation/Penalty.json
index f0a271e2ec..59dc28614f 100644
--- a/data/as/30069742/ws-services-calculation/Penalty.json
+++ b/data/as/30069742/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069742/ws-services-calculation/WCBillingSlab.json b/data/as/30069742/ws-services-calculation/WCBillingSlab.json
index d42ebf82d6..aceaf38c92 100644
--- a/data/as/30069742/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069742/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30069820/ws-services-calculation/Penalty.json b/data/as/30069820/ws-services-calculation/Penalty.json
index 94d4c8d075..e987b9dbec 100644
--- a/data/as/30069820/ws-services-calculation/Penalty.json
+++ b/data/as/30069820/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069820/ws-services-calculation/WCBillingSlab.json b/data/as/30069820/ws-services-calculation/WCBillingSlab.json
index 9f1f9eea7d..86825f738f 100644
--- a/data/as/30069820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069820/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070165/ws-services-calculation/Penalty.json b/data/as/30070165/ws-services-calculation/Penalty.json
index fa642a111f..4ff12c653b 100644
--- a/data/as/30070165/ws-services-calculation/Penalty.json
+++ b/data/as/30070165/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070165/ws-services-calculation/WCBillingSlab.json b/data/as/30070165/ws-services-calculation/WCBillingSlab.json
index 17acd6dc21..50f4a1de3f 100644
--- a/data/as/30070165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070165/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070166/ws-services-calculation/Penalty.json b/data/as/30070166/ws-services-calculation/Penalty.json
index 5a2420b5e1..b4edecec93 100644
--- a/data/as/30070166/ws-services-calculation/Penalty.json
+++ b/data/as/30070166/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070166/ws-services-calculation/WCBillingSlab.json b/data/as/30070166/ws-services-calculation/WCBillingSlab.json
index b329f2beee..16e27b6889 100644
--- a/data/as/30070166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070166/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070207/ws-services-calculation/Penalty.json b/data/as/30070207/ws-services-calculation/Penalty.json
index 5de50d457a..5a95b36b7e 100644
--- a/data/as/30070207/ws-services-calculation/Penalty.json
+++ b/data/as/30070207/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070207/ws-services-calculation/WCBillingSlab.json b/data/as/30070207/ws-services-calculation/WCBillingSlab.json
index ce0940071f..2349ceca60 100644
--- a/data/as/30070207/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070207/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070230/ws-services-calculation/Penalty.json b/data/as/30070230/ws-services-calculation/Penalty.json
index 50e5c378ef..0527c8c2f4 100644
--- a/data/as/30070230/ws-services-calculation/Penalty.json
+++ b/data/as/30070230/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070230/ws-services-calculation/WCBillingSlab.json b/data/as/30070230/ws-services-calculation/WCBillingSlab.json
index 68cd2f634e..906ce2f099 100644
--- a/data/as/30070230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070230/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070236/ws-services-calculation/Penalty.json b/data/as/30070236/ws-services-calculation/Penalty.json
index bae13435fc..a2fee3c4d7 100644
--- a/data/as/30070236/ws-services-calculation/Penalty.json
+++ b/data/as/30070236/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070236/ws-services-calculation/WCBillingSlab.json b/data/as/30070236/ws-services-calculation/WCBillingSlab.json
index e2ec737348..ba983d05ab 100644
--- a/data/as/30070236/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070236/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070239/ws-services-calculation/Penalty.json b/data/as/30070239/ws-services-calculation/Penalty.json
index 9dc223326b..7a052a6722 100644
--- a/data/as/30070239/ws-services-calculation/Penalty.json
+++ b/data/as/30070239/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070239/ws-services-calculation/WCBillingSlab.json b/data/as/30070239/ws-services-calculation/WCBillingSlab.json
index 9a764c5488..cbaa854d7e 100644
--- a/data/as/30070239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070239/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070243/ws-services-calculation/Penalty.json b/data/as/30070243/ws-services-calculation/Penalty.json
index 5434390c18..dccae9c57d 100644
--- a/data/as/30070243/ws-services-calculation/Penalty.json
+++ b/data/as/30070243/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070243/ws-services-calculation/WCBillingSlab.json b/data/as/30070243/ws-services-calculation/WCBillingSlab.json
index 2bfd39448b..67b1bf12f0 100644
--- a/data/as/30070243/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070243/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070267/ws-services-calculation/Penalty.json b/data/as/30070267/ws-services-calculation/Penalty.json
index 5b8a93f004..57208b30e6 100644
--- a/data/as/30070267/ws-services-calculation/Penalty.json
+++ b/data/as/30070267/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070267/ws-services-calculation/WCBillingSlab.json b/data/as/30070267/ws-services-calculation/WCBillingSlab.json
index ba907b2859..c6d49975cc 100644
--- a/data/as/30070267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070267/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070269/ws-services-calculation/Penalty.json b/data/as/30070269/ws-services-calculation/Penalty.json
index 6a7ae6513c..5180a688df 100644
--- a/data/as/30070269/ws-services-calculation/Penalty.json
+++ b/data/as/30070269/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070269/ws-services-calculation/WCBillingSlab.json b/data/as/30070269/ws-services-calculation/WCBillingSlab.json
index 15a3d4d568..7bc19a3535 100644
--- a/data/as/30070269/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070269/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070276/ws-services-calculation/Penalty.json b/data/as/30070276/ws-services-calculation/Penalty.json
index 3c5e836ec0..554e0dd982 100644
--- a/data/as/30070276/ws-services-calculation/Penalty.json
+++ b/data/as/30070276/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070276/ws-services-calculation/WCBillingSlab.json b/data/as/30070276/ws-services-calculation/WCBillingSlab.json
index 981837dc45..a1f61bcc28 100644
--- a/data/as/30070276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070276/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070288/ws-services-calculation/Penalty.json b/data/as/30070288/ws-services-calculation/Penalty.json
index 88b0270578..6c93ce1008 100644
--- a/data/as/30070288/ws-services-calculation/Penalty.json
+++ b/data/as/30070288/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070288/ws-services-calculation/WCBillingSlab.json b/data/as/30070288/ws-services-calculation/WCBillingSlab.json
index b135231afd..9f3f478b0d 100644
--- a/data/as/30070288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070288/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070302/ws-services-calculation/Penalty.json b/data/as/30070302/ws-services-calculation/Penalty.json
index 4d063971c5..fff22892d1 100644
--- a/data/as/30070302/ws-services-calculation/Penalty.json
+++ b/data/as/30070302/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070302/ws-services-calculation/WCBillingSlab.json b/data/as/30070302/ws-services-calculation/WCBillingSlab.json
index dfb52cba5f..46b2bea2ae 100644
--- a/data/as/30070302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070302/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070309/ws-services-calculation/Penalty.json b/data/as/30070309/ws-services-calculation/Penalty.json
index 5ab2f88828..c41e3f34b4 100644
--- a/data/as/30070309/ws-services-calculation/Penalty.json
+++ b/data/as/30070309/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070309/ws-services-calculation/WCBillingSlab.json b/data/as/30070309/ws-services-calculation/WCBillingSlab.json
index f31a20542a..086d96f326 100644
--- a/data/as/30070309/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070309/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070314/ws-services-calculation/Penalty.json b/data/as/30070314/ws-services-calculation/Penalty.json
index db18644a95..6218e759b0 100644
--- a/data/as/30070314/ws-services-calculation/Penalty.json
+++ b/data/as/30070314/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070314/ws-services-calculation/WCBillingSlab.json b/data/as/30070314/ws-services-calculation/WCBillingSlab.json
index 9acc2dd713..c7891dce72 100644
--- a/data/as/30070314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070314/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070342/ws-services-calculation/Penalty.json b/data/as/30070342/ws-services-calculation/Penalty.json
index db5fe3e9ba..4c29756ffe 100644
--- a/data/as/30070342/ws-services-calculation/Penalty.json
+++ b/data/as/30070342/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070342/ws-services-calculation/WCBillingSlab.json b/data/as/30070342/ws-services-calculation/WCBillingSlab.json
index 8700b51cbd..ca79d62d5f 100644
--- a/data/as/30070342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070342/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070344/ws-services-calculation/Penalty.json b/data/as/30070344/ws-services-calculation/Penalty.json
index 32c37621ca..0dcc5ba387 100644
--- a/data/as/30070344/ws-services-calculation/Penalty.json
+++ b/data/as/30070344/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070344/ws-services-calculation/WCBillingSlab.json b/data/as/30070344/ws-services-calculation/WCBillingSlab.json
index 0ff1e9841c..9a628375c0 100644
--- a/data/as/30070344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070344/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070346/ws-services-calculation/Penalty.json b/data/as/30070346/ws-services-calculation/Penalty.json
index 6c2512b881..1b622671d3 100644
--- a/data/as/30070346/ws-services-calculation/Penalty.json
+++ b/data/as/30070346/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070346/ws-services-calculation/WCBillingSlab.json b/data/as/30070346/ws-services-calculation/WCBillingSlab.json
index a5a519fb3e..72a2b39ae5 100644
--- a/data/as/30070346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070346/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070350/ws-services-calculation/Penalty.json b/data/as/30070350/ws-services-calculation/Penalty.json
index d0ee5bd0b0..51d64cf4ce 100644
--- a/data/as/30070350/ws-services-calculation/Penalty.json
+++ b/data/as/30070350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070350/ws-services-calculation/WCBillingSlab.json b/data/as/30070350/ws-services-calculation/WCBillingSlab.json
index f954283d3f..2fc3e16dc5 100644
--- a/data/as/30070350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070357/ws-services-calculation/Penalty.json b/data/as/30070357/ws-services-calculation/Penalty.json
index c20f16954d..a45be83b0e 100644
--- a/data/as/30070357/ws-services-calculation/Penalty.json
+++ b/data/as/30070357/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070357/ws-services-calculation/WCBillingSlab.json b/data/as/30070357/ws-services-calculation/WCBillingSlab.json
index 254b571b2e..b2f80b1484 100644
--- a/data/as/30070357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070357/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070365/ws-services-calculation/Penalty.json b/data/as/30070365/ws-services-calculation/Penalty.json
index 2106d37e8c..798889be96 100644
--- a/data/as/30070365/ws-services-calculation/Penalty.json
+++ b/data/as/30070365/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070365/ws-services-calculation/WCBillingSlab.json b/data/as/30070365/ws-services-calculation/WCBillingSlab.json
index dfd55a9bce..1b96be6057 100644
--- a/data/as/30070365/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070365/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070375/ws-services-calculation/Penalty.json b/data/as/30070375/ws-services-calculation/Penalty.json
index 74759aafdd..b7c0283072 100644
--- a/data/as/30070375/ws-services-calculation/Penalty.json
+++ b/data/as/30070375/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070375/ws-services-calculation/WCBillingSlab.json b/data/as/30070375/ws-services-calculation/WCBillingSlab.json
index 768afd0189..1b750b0158 100644
--- a/data/as/30070375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070375/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070386/ws-services-calculation/Penalty.json b/data/as/30070386/ws-services-calculation/Penalty.json
index 718b284e80..ce46b76f3b 100644
--- a/data/as/30070386/ws-services-calculation/Penalty.json
+++ b/data/as/30070386/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070386/ws-services-calculation/WCBillingSlab.json b/data/as/30070386/ws-services-calculation/WCBillingSlab.json
index e9fbf61a54..9954a6af46 100644
--- a/data/as/30070386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070386/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070406/ws-services-calculation/Penalty.json b/data/as/30070406/ws-services-calculation/Penalty.json
index 4707232949..956c13bbdf 100644
--- a/data/as/30070406/ws-services-calculation/Penalty.json
+++ b/data/as/30070406/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070406/ws-services-calculation/WCBillingSlab.json b/data/as/30070406/ws-services-calculation/WCBillingSlab.json
index 8f5769ea9c..da838a5558 100644
--- a/data/as/30070406/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070406/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070419/ws-services-calculation/Penalty.json b/data/as/30070419/ws-services-calculation/Penalty.json
index 3162800dc6..01579ff278 100644
--- a/data/as/30070419/ws-services-calculation/Penalty.json
+++ b/data/as/30070419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070419/ws-services-calculation/WCBillingSlab.json b/data/as/30070419/ws-services-calculation/WCBillingSlab.json
index df4bbd35e7..6707045cc3 100644
--- a/data/as/30070419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070464/ws-services-calculation/Penalty.json b/data/as/30070464/ws-services-calculation/Penalty.json
index 715693693e..6b4b74230a 100644
--- a/data/as/30070464/ws-services-calculation/Penalty.json
+++ b/data/as/30070464/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070464/ws-services-calculation/WCBillingSlab.json b/data/as/30070464/ws-services-calculation/WCBillingSlab.json
index 30fb8309aa..8337963b6c 100644
--- a/data/as/30070464/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070464/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070470/ws-services-calculation/Penalty.json b/data/as/30070470/ws-services-calculation/Penalty.json
index 3aef634a2d..9cc7d53906 100644
--- a/data/as/30070470/ws-services-calculation/Penalty.json
+++ b/data/as/30070470/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070470/ws-services-calculation/WCBillingSlab.json b/data/as/30070470/ws-services-calculation/WCBillingSlab.json
index 4835174545..7f7be93fbb 100644
--- a/data/as/30070470/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070470/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070477/ws-services-calculation/Penalty.json b/data/as/30070477/ws-services-calculation/Penalty.json
index 273b808a2b..9097ef7ece 100644
--- a/data/as/30070477/ws-services-calculation/Penalty.json
+++ b/data/as/30070477/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070477/ws-services-calculation/WCBillingSlab.json b/data/as/30070477/ws-services-calculation/WCBillingSlab.json
index d43fb8abbb..5f241f4576 100644
--- a/data/as/30070477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070477/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070483/ws-services-calculation/Penalty.json b/data/as/30070483/ws-services-calculation/Penalty.json
index b71573762c..2485050526 100644
--- a/data/as/30070483/ws-services-calculation/Penalty.json
+++ b/data/as/30070483/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070483/ws-services-calculation/WCBillingSlab.json b/data/as/30070483/ws-services-calculation/WCBillingSlab.json
index 6a398218c8..082e67f92c 100644
--- a/data/as/30070483/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070483/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070590/ws-services-calculation/Penalty.json b/data/as/30070590/ws-services-calculation/Penalty.json
index 8e645edef3..7ef93acc32 100644
--- a/data/as/30070590/ws-services-calculation/Penalty.json
+++ b/data/as/30070590/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070590/ws-services-calculation/WCBillingSlab.json b/data/as/30070590/ws-services-calculation/WCBillingSlab.json
index 949ea05cae..875017e021 100644
--- a/data/as/30070590/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070590/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070600/ws-services-calculation/Penalty.json b/data/as/30070600/ws-services-calculation/Penalty.json
index 475cfcc23b..4b9ad68fc6 100644
--- a/data/as/30070600/ws-services-calculation/Penalty.json
+++ b/data/as/30070600/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070600/ws-services-calculation/WCBillingSlab.json b/data/as/30070600/ws-services-calculation/WCBillingSlab.json
index 4384655390..ba77281642 100644
--- a/data/as/30070600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070600/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070606/ws-services-calculation/Penalty.json b/data/as/30070606/ws-services-calculation/Penalty.json
index a20a845719..e32a370e27 100644
--- a/data/as/30070606/ws-services-calculation/Penalty.json
+++ b/data/as/30070606/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070606/ws-services-calculation/WCBillingSlab.json b/data/as/30070606/ws-services-calculation/WCBillingSlab.json
index 1f475bc9d5..d54e301941 100644
--- a/data/as/30070606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070606/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070609/ws-services-calculation/Penalty.json b/data/as/30070609/ws-services-calculation/Penalty.json
index 51200f74c2..64d47df69b 100644
--- a/data/as/30070609/ws-services-calculation/Penalty.json
+++ b/data/as/30070609/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070609/ws-services-calculation/WCBillingSlab.json b/data/as/30070609/ws-services-calculation/WCBillingSlab.json
index 46f4e02444..f64402210d 100644
--- a/data/as/30070609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070609/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070611/ws-services-calculation/Penalty.json b/data/as/30070611/ws-services-calculation/Penalty.json
index a68d0dbb41..b59d680160 100644
--- a/data/as/30070611/ws-services-calculation/Penalty.json
+++ b/data/as/30070611/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070611/ws-services-calculation/WCBillingSlab.json b/data/as/30070611/ws-services-calculation/WCBillingSlab.json
index ca927187a0..f1b4e93a7e 100644
--- a/data/as/30070611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070611/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070613/ws-services-calculation/Penalty.json b/data/as/30070613/ws-services-calculation/Penalty.json
index 6ddcddfa72..9e6e5e7b09 100644
--- a/data/as/30070613/ws-services-calculation/Penalty.json
+++ b/data/as/30070613/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070613/ws-services-calculation/WCBillingSlab.json b/data/as/30070613/ws-services-calculation/WCBillingSlab.json
index 38fb21a37b..81d1a3f4f7 100644
--- a/data/as/30070613/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070613/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070620/ws-services-calculation/Penalty.json b/data/as/30070620/ws-services-calculation/Penalty.json
index b5c32e204e..f4f19bc1bb 100644
--- a/data/as/30070620/ws-services-calculation/Penalty.json
+++ b/data/as/30070620/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070620/ws-services-calculation/WCBillingSlab.json b/data/as/30070620/ws-services-calculation/WCBillingSlab.json
index 4304b5a366..fbbe125c82 100644
--- a/data/as/30070620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070620/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30070802/ws-services-calculation/Penalty.json b/data/as/30070802/ws-services-calculation/Penalty.json
index ae0d9b17ca..91e60cf651 100644
--- a/data/as/30070802/ws-services-calculation/Penalty.json
+++ b/data/as/30070802/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070802/ws-services-calculation/WCBillingSlab.json b/data/as/30070802/ws-services-calculation/WCBillingSlab.json
index 54fee6421c..71191b58c2 100644
--- a/data/as/30070802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070802/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071063/ws-services-calculation/Penalty.json b/data/as/30071063/ws-services-calculation/Penalty.json
index 64fac9adca..2110e987dc 100644
--- a/data/as/30071063/ws-services-calculation/Penalty.json
+++ b/data/as/30071063/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071063/ws-services-calculation/WCBillingSlab.json b/data/as/30071063/ws-services-calculation/WCBillingSlab.json
index 27179f2bb1..808d900a29 100644
--- a/data/as/30071063/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071063/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071098/ws-services-calculation/Penalty.json b/data/as/30071098/ws-services-calculation/Penalty.json
index d95eb2380c..8d1ea0713c 100644
--- a/data/as/30071098/ws-services-calculation/Penalty.json
+++ b/data/as/30071098/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071098/ws-services-calculation/WCBillingSlab.json b/data/as/30071098/ws-services-calculation/WCBillingSlab.json
index 23ff71f881..6adbc770e0 100644
--- a/data/as/30071098/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071098/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071129/ws-services-calculation/Penalty.json b/data/as/30071129/ws-services-calculation/Penalty.json
index f00a13bcfe..d451eb8c40 100644
--- a/data/as/30071129/ws-services-calculation/Penalty.json
+++ b/data/as/30071129/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071129/ws-services-calculation/WCBillingSlab.json b/data/as/30071129/ws-services-calculation/WCBillingSlab.json
index 8a7940f5c9..cbe2a39700 100644
--- a/data/as/30071129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071129/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071139/ws-services-calculation/Penalty.json b/data/as/30071139/ws-services-calculation/Penalty.json
index fc1fc5e49b..4180d65f5f 100644
--- a/data/as/30071139/ws-services-calculation/Penalty.json
+++ b/data/as/30071139/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071139/ws-services-calculation/WCBillingSlab.json b/data/as/30071139/ws-services-calculation/WCBillingSlab.json
index 90a3a21af5..8658089c54 100644
--- a/data/as/30071139/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071139/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071148/ws-services-calculation/Penalty.json b/data/as/30071148/ws-services-calculation/Penalty.json
index 73d9882ba3..8067df08dd 100644
--- a/data/as/30071148/ws-services-calculation/Penalty.json
+++ b/data/as/30071148/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071148/ws-services-calculation/WCBillingSlab.json b/data/as/30071148/ws-services-calculation/WCBillingSlab.json
index 7fe432cf8d..6ea0ac309c 100644
--- a/data/as/30071148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071148/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071202/ws-services-calculation/Penalty.json b/data/as/30071202/ws-services-calculation/Penalty.json
index 3e7cf60d66..585d1eaf36 100644
--- a/data/as/30071202/ws-services-calculation/Penalty.json
+++ b/data/as/30071202/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071202/ws-services-calculation/WCBillingSlab.json b/data/as/30071202/ws-services-calculation/WCBillingSlab.json
index 4b9f7dd48c..9e92a32b88 100644
--- a/data/as/30071202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071202/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071208/ws-services-calculation/Penalty.json b/data/as/30071208/ws-services-calculation/Penalty.json
index 1c4358a9af..70b62db258 100644
--- a/data/as/30071208/ws-services-calculation/Penalty.json
+++ b/data/as/30071208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071208/ws-services-calculation/WCBillingSlab.json b/data/as/30071208/ws-services-calculation/WCBillingSlab.json
index 0b9b7c4212..f0c1ab34f6 100644
--- a/data/as/30071208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071569/ws-services-calculation/Penalty.json b/data/as/30071569/ws-services-calculation/Penalty.json
index bb096d803a..147a071c29 100644
--- a/data/as/30071569/ws-services-calculation/Penalty.json
+++ b/data/as/30071569/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071569/ws-services-calculation/WCBillingSlab.json b/data/as/30071569/ws-services-calculation/WCBillingSlab.json
index c84a210010..bed54106ad 100644
--- a/data/as/30071569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071569/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071579/ws-services-calculation/Penalty.json b/data/as/30071579/ws-services-calculation/Penalty.json
index 5bf84b8c96..4016bef9e4 100644
--- a/data/as/30071579/ws-services-calculation/Penalty.json
+++ b/data/as/30071579/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071579/ws-services-calculation/WCBillingSlab.json b/data/as/30071579/ws-services-calculation/WCBillingSlab.json
index b35cf2c7bd..70199f3510 100644
--- a/data/as/30071579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071579/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071722/ws-services-calculation/Penalty.json b/data/as/30071722/ws-services-calculation/Penalty.json
index a3c89af30a..03202acb7c 100644
--- a/data/as/30071722/ws-services-calculation/Penalty.json
+++ b/data/as/30071722/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071722/ws-services-calculation/WCBillingSlab.json b/data/as/30071722/ws-services-calculation/WCBillingSlab.json
index 2f955fb651..0b7833ed42 100644
--- a/data/as/30071722/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071722/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071743/ws-services-calculation/Penalty.json b/data/as/30071743/ws-services-calculation/Penalty.json
index 7f738c62ce..d6a92ed54c 100644
--- a/data/as/30071743/ws-services-calculation/Penalty.json
+++ b/data/as/30071743/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071743/ws-services-calculation/WCBillingSlab.json b/data/as/30071743/ws-services-calculation/WCBillingSlab.json
index 0e67573d10..29694eeb26 100644
--- a/data/as/30071743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071743/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071758/ws-services-calculation/Penalty.json b/data/as/30071758/ws-services-calculation/Penalty.json
index 73e8301b60..5ace7b6665 100644
--- a/data/as/30071758/ws-services-calculation/Penalty.json
+++ b/data/as/30071758/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071758/ws-services-calculation/WCBillingSlab.json b/data/as/30071758/ws-services-calculation/WCBillingSlab.json
index 837ca6f5f8..e317488c29 100644
--- a/data/as/30071758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071758/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071787/ws-services-calculation/Penalty.json b/data/as/30071787/ws-services-calculation/Penalty.json
index fec0136634..9db5f2858d 100644
--- a/data/as/30071787/ws-services-calculation/Penalty.json
+++ b/data/as/30071787/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071787/ws-services-calculation/WCBillingSlab.json b/data/as/30071787/ws-services-calculation/WCBillingSlab.json
index 46253a1a8c..7f1ba23ba8 100644
--- a/data/as/30071787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071787/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071801/ws-services-calculation/Penalty.json b/data/as/30071801/ws-services-calculation/Penalty.json
index faae4be299..16cb95e0e1 100644
--- a/data/as/30071801/ws-services-calculation/Penalty.json
+++ b/data/as/30071801/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071801/ws-services-calculation/WCBillingSlab.json b/data/as/30071801/ws-services-calculation/WCBillingSlab.json
index 4842028056..503a3d3ed9 100644
--- a/data/as/30071801/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071801/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071806/ws-services-calculation/Penalty.json b/data/as/30071806/ws-services-calculation/Penalty.json
index 0de3f29d19..01eaa0a052 100644
--- a/data/as/30071806/ws-services-calculation/Penalty.json
+++ b/data/as/30071806/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071806/ws-services-calculation/WCBillingSlab.json b/data/as/30071806/ws-services-calculation/WCBillingSlab.json
index 546bef48bf..9ce0f2cc17 100644
--- a/data/as/30071806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071806/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071827/ws-services-calculation/Penalty.json b/data/as/30071827/ws-services-calculation/Penalty.json
index 97cdb5d233..5b088b9e5f 100644
--- a/data/as/30071827/ws-services-calculation/Penalty.json
+++ b/data/as/30071827/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071827/ws-services-calculation/WCBillingSlab.json b/data/as/30071827/ws-services-calculation/WCBillingSlab.json
index 8868290ca2..652a1d0db3 100644
--- a/data/as/30071827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071827/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071830/ws-services-calculation/Penalty.json b/data/as/30071830/ws-services-calculation/Penalty.json
index 44b9ffd61b..e637758fa2 100644
--- a/data/as/30071830/ws-services-calculation/Penalty.json
+++ b/data/as/30071830/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071830/ws-services-calculation/WCBillingSlab.json b/data/as/30071830/ws-services-calculation/WCBillingSlab.json
index e6f9a5b024..d04ac99286 100644
--- a/data/as/30071830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071830/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30071861/ws-services-calculation/Penalty.json b/data/as/30071861/ws-services-calculation/Penalty.json
index 176c8f465e..7b2b4fa76f 100644
--- a/data/as/30071861/ws-services-calculation/Penalty.json
+++ b/data/as/30071861/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071861/ws-services-calculation/WCBillingSlab.json b/data/as/30071861/ws-services-calculation/WCBillingSlab.json
index ee0d865cb9..574e28437f 100644
--- a/data/as/30071861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071861/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072127/ws-services-calculation/Penalty.json b/data/as/30072127/ws-services-calculation/Penalty.json
index d34a54ab94..3d328b3875 100644
--- a/data/as/30072127/ws-services-calculation/Penalty.json
+++ b/data/as/30072127/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072127/ws-services-calculation/WCBillingSlab.json b/data/as/30072127/ws-services-calculation/WCBillingSlab.json
index 5d64f08eee..4d350d2a66 100644
--- a/data/as/30072127/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072127/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072402/ws-services-calculation/Penalty.json b/data/as/30072402/ws-services-calculation/Penalty.json
index ab77b16933..4b78125d13 100644
--- a/data/as/30072402/ws-services-calculation/Penalty.json
+++ b/data/as/30072402/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072402/ws-services-calculation/WCBillingSlab.json b/data/as/30072402/ws-services-calculation/WCBillingSlab.json
index 140fa3dfe3..113105f9bd 100644
--- a/data/as/30072402/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072402/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072569/ws-services-calculation/Penalty.json b/data/as/30072569/ws-services-calculation/Penalty.json
index 3fede220bf..58729b98e4 100644
--- a/data/as/30072569/ws-services-calculation/Penalty.json
+++ b/data/as/30072569/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072569/ws-services-calculation/WCBillingSlab.json b/data/as/30072569/ws-services-calculation/WCBillingSlab.json
index a5d3420246..53d8747dac 100644
--- a/data/as/30072569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072569/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072574/ws-services-calculation/Penalty.json b/data/as/30072574/ws-services-calculation/Penalty.json
index fa5f337538..c8c1d3a130 100644
--- a/data/as/30072574/ws-services-calculation/Penalty.json
+++ b/data/as/30072574/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072574/ws-services-calculation/WCBillingSlab.json b/data/as/30072574/ws-services-calculation/WCBillingSlab.json
index 06c7d4fdfc..d96c0dba3c 100644
--- a/data/as/30072574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072574/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072592/ws-services-calculation/Penalty.json b/data/as/30072592/ws-services-calculation/Penalty.json
index 5a0799ab28..1a252fa427 100644
--- a/data/as/30072592/ws-services-calculation/Penalty.json
+++ b/data/as/30072592/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072592/ws-services-calculation/WCBillingSlab.json b/data/as/30072592/ws-services-calculation/WCBillingSlab.json
index 39832dde1e..5cfca1e12b 100644
--- a/data/as/30072592/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072592/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072599/ws-services-calculation/Penalty.json b/data/as/30072599/ws-services-calculation/Penalty.json
index 13ee49c333..be8b355478 100644
--- a/data/as/30072599/ws-services-calculation/Penalty.json
+++ b/data/as/30072599/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072599/ws-services-calculation/WCBillingSlab.json b/data/as/30072599/ws-services-calculation/WCBillingSlab.json
index a51373d295..26ba924553 100644
--- a/data/as/30072599/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072599/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072650/ws-services-calculation/Penalty.json b/data/as/30072650/ws-services-calculation/Penalty.json
index 41e13116ec..19055e572d 100644
--- a/data/as/30072650/ws-services-calculation/Penalty.json
+++ b/data/as/30072650/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072650/ws-services-calculation/WCBillingSlab.json b/data/as/30072650/ws-services-calculation/WCBillingSlab.json
index 8f023dac6a..e6534db857 100644
--- a/data/as/30072650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072650/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072651/ws-services-calculation/Penalty.json b/data/as/30072651/ws-services-calculation/Penalty.json
index fe41ef9a70..5532c15ef0 100644
--- a/data/as/30072651/ws-services-calculation/Penalty.json
+++ b/data/as/30072651/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072651/ws-services-calculation/WCBillingSlab.json b/data/as/30072651/ws-services-calculation/WCBillingSlab.json
index 4059585649..5fa5f3c71c 100644
--- a/data/as/30072651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072651/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072655/ws-services-calculation/Penalty.json b/data/as/30072655/ws-services-calculation/Penalty.json
index 54271d4119..30ebe3fd29 100644
--- a/data/as/30072655/ws-services-calculation/Penalty.json
+++ b/data/as/30072655/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072655/ws-services-calculation/WCBillingSlab.json b/data/as/30072655/ws-services-calculation/WCBillingSlab.json
index 490da37c8a..298869777e 100644
--- a/data/as/30072655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072655/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072656/ws-services-calculation/Penalty.json b/data/as/30072656/ws-services-calculation/Penalty.json
index 29052486cb..07a70eeafb 100644
--- a/data/as/30072656/ws-services-calculation/Penalty.json
+++ b/data/as/30072656/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072656/ws-services-calculation/WCBillingSlab.json b/data/as/30072656/ws-services-calculation/WCBillingSlab.json
index ec8accf1dd..ee8ab51a5a 100644
--- a/data/as/30072656/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072656/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072662/ws-services-calculation/Penalty.json b/data/as/30072662/ws-services-calculation/Penalty.json
index 58427f7251..0f85dce655 100644
--- a/data/as/30072662/ws-services-calculation/Penalty.json
+++ b/data/as/30072662/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072662/ws-services-calculation/WCBillingSlab.json b/data/as/30072662/ws-services-calculation/WCBillingSlab.json
index 3c6f9321e6..7419f8c31d 100644
--- a/data/as/30072662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072662/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072834/ws-services-calculation/Penalty.json b/data/as/30072834/ws-services-calculation/Penalty.json
index c241572193..9fe7b617c6 100644
--- a/data/as/30072834/ws-services-calculation/Penalty.json
+++ b/data/as/30072834/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072834/ws-services-calculation/WCBillingSlab.json b/data/as/30072834/ws-services-calculation/WCBillingSlab.json
index 212a45d3a5..1ff6a637db 100644
--- a/data/as/30072834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072834/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072841/ws-services-calculation/Penalty.json b/data/as/30072841/ws-services-calculation/Penalty.json
index 48f7d1a91b..690912d080 100644
--- a/data/as/30072841/ws-services-calculation/Penalty.json
+++ b/data/as/30072841/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072841/ws-services-calculation/WCBillingSlab.json b/data/as/30072841/ws-services-calculation/WCBillingSlab.json
index 4a9b0df8ca..4cde7e4179 100644
--- a/data/as/30072841/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072841/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072843/ws-services-calculation/Penalty.json b/data/as/30072843/ws-services-calculation/Penalty.json
index 387781babf..d041441f04 100644
--- a/data/as/30072843/ws-services-calculation/Penalty.json
+++ b/data/as/30072843/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072843/ws-services-calculation/WCBillingSlab.json b/data/as/30072843/ws-services-calculation/WCBillingSlab.json
index e47c451d18..e322ebe941 100644
--- a/data/as/30072843/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072843/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072845/ws-services-calculation/Penalty.json b/data/as/30072845/ws-services-calculation/Penalty.json
index 1f262101f0..2cb7e3ed4a 100644
--- a/data/as/30072845/ws-services-calculation/Penalty.json
+++ b/data/as/30072845/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072845/ws-services-calculation/WCBillingSlab.json b/data/as/30072845/ws-services-calculation/WCBillingSlab.json
index 55a3880f16..3bc4f5981d 100644
--- a/data/as/30072845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072845/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072880/ws-services-calculation/Penalty.json b/data/as/30072880/ws-services-calculation/Penalty.json
index e25e4f99a7..398aa4ab6f 100644
--- a/data/as/30072880/ws-services-calculation/Penalty.json
+++ b/data/as/30072880/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072880/ws-services-calculation/WCBillingSlab.json b/data/as/30072880/ws-services-calculation/WCBillingSlab.json
index 10e3a26ee3..8f83bda1cd 100644
--- a/data/as/30072880/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072880/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072900/ws-services-calculation/Penalty.json b/data/as/30072900/ws-services-calculation/Penalty.json
index e5fe5e2494..518f663f9f 100644
--- a/data/as/30072900/ws-services-calculation/Penalty.json
+++ b/data/as/30072900/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072900/ws-services-calculation/WCBillingSlab.json b/data/as/30072900/ws-services-calculation/WCBillingSlab.json
index d4790fc272..90c2f19f3a 100644
--- a/data/as/30072900/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072900/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072901/ws-services-calculation/Penalty.json b/data/as/30072901/ws-services-calculation/Penalty.json
index e89ddaf71c..0fd9c9af33 100644
--- a/data/as/30072901/ws-services-calculation/Penalty.json
+++ b/data/as/30072901/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072901/ws-services-calculation/WCBillingSlab.json b/data/as/30072901/ws-services-calculation/WCBillingSlab.json
index 8f607ede9c..e7f1c4ad49 100644
--- a/data/as/30072901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072901/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30072996/ws-services-calculation/Penalty.json b/data/as/30072996/ws-services-calculation/Penalty.json
index 4daca10ce8..7d6abccba2 100644
--- a/data/as/30072996/ws-services-calculation/Penalty.json
+++ b/data/as/30072996/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072996/ws-services-calculation/WCBillingSlab.json b/data/as/30072996/ws-services-calculation/WCBillingSlab.json
index b908492eb0..e4e4de01db 100644
--- a/data/as/30072996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072996/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073350/ws-services-calculation/Penalty.json b/data/as/30073350/ws-services-calculation/Penalty.json
index 7580bb888f..6a56341971 100644
--- a/data/as/30073350/ws-services-calculation/Penalty.json
+++ b/data/as/30073350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073350/ws-services-calculation/WCBillingSlab.json b/data/as/30073350/ws-services-calculation/WCBillingSlab.json
index 7ff824895f..1f1f0fc8df 100644
--- a/data/as/30073350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073352/ws-services-calculation/Penalty.json b/data/as/30073352/ws-services-calculation/Penalty.json
index 29c5e27fc8..969ade9bd8 100644
--- a/data/as/30073352/ws-services-calculation/Penalty.json
+++ b/data/as/30073352/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073352/ws-services-calculation/WCBillingSlab.json b/data/as/30073352/ws-services-calculation/WCBillingSlab.json
index 513b701feb..cc00e73588 100644
--- a/data/as/30073352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073352/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073354/ws-services-calculation/Penalty.json b/data/as/30073354/ws-services-calculation/Penalty.json
index a57b7e6da9..563de50653 100644
--- a/data/as/30073354/ws-services-calculation/Penalty.json
+++ b/data/as/30073354/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073354/ws-services-calculation/WCBillingSlab.json b/data/as/30073354/ws-services-calculation/WCBillingSlab.json
index 11bfa4acff..b23add32e9 100644
--- a/data/as/30073354/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073354/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073356/ws-services-calculation/Penalty.json b/data/as/30073356/ws-services-calculation/Penalty.json
index fadb0c7958..a637664957 100644
--- a/data/as/30073356/ws-services-calculation/Penalty.json
+++ b/data/as/30073356/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073356/ws-services-calculation/WCBillingSlab.json b/data/as/30073356/ws-services-calculation/WCBillingSlab.json
index ca6690e099..7dd1e55d73 100644
--- a/data/as/30073356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073356/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073357/ws-services-calculation/Penalty.json b/data/as/30073357/ws-services-calculation/Penalty.json
index e2267b519c..a74bd2b77d 100644
--- a/data/as/30073357/ws-services-calculation/Penalty.json
+++ b/data/as/30073357/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073357/ws-services-calculation/WCBillingSlab.json b/data/as/30073357/ws-services-calculation/WCBillingSlab.json
index 6ec592f066..d075858246 100644
--- a/data/as/30073357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073357/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073473/ws-services-calculation/Penalty.json b/data/as/30073473/ws-services-calculation/Penalty.json
index 004722a0ce..cf4d18a419 100644
--- a/data/as/30073473/ws-services-calculation/Penalty.json
+++ b/data/as/30073473/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073473/ws-services-calculation/WCBillingSlab.json b/data/as/30073473/ws-services-calculation/WCBillingSlab.json
index 5c1fc53d7e..a9bb79cfe8 100644
--- a/data/as/30073473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073473/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073477/ws-services-calculation/Penalty.json b/data/as/30073477/ws-services-calculation/Penalty.json
index 3a0c6f34fc..392fc6bbc8 100644
--- a/data/as/30073477/ws-services-calculation/Penalty.json
+++ b/data/as/30073477/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073477/ws-services-calculation/WCBillingSlab.json b/data/as/30073477/ws-services-calculation/WCBillingSlab.json
index 2aa6086522..8d050119b8 100644
--- a/data/as/30073477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073477/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073481/ws-services-calculation/Penalty.json b/data/as/30073481/ws-services-calculation/Penalty.json
index 07a752bf52..c1d5f41176 100644
--- a/data/as/30073481/ws-services-calculation/Penalty.json
+++ b/data/as/30073481/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073481/ws-services-calculation/WCBillingSlab.json b/data/as/30073481/ws-services-calculation/WCBillingSlab.json
index 6409591914..9b400a691a 100644
--- a/data/as/30073481/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073481/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073483/ws-services-calculation/Penalty.json b/data/as/30073483/ws-services-calculation/Penalty.json
index 56d6ae944d..c09cd0e1d0 100644
--- a/data/as/30073483/ws-services-calculation/Penalty.json
+++ b/data/as/30073483/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073483/ws-services-calculation/WCBillingSlab.json b/data/as/30073483/ws-services-calculation/WCBillingSlab.json
index 2405f2d32f..bce704cc95 100644
--- a/data/as/30073483/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073483/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073485/ws-services-calculation/Penalty.json b/data/as/30073485/ws-services-calculation/Penalty.json
index 42ea749cfe..c0b5621eb6 100644
--- a/data/as/30073485/ws-services-calculation/Penalty.json
+++ b/data/as/30073485/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073485/ws-services-calculation/WCBillingSlab.json b/data/as/30073485/ws-services-calculation/WCBillingSlab.json
index 7a7be793ad..4928ebc21e 100644
--- a/data/as/30073485/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073485/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073492/ws-services-calculation/Penalty.json b/data/as/30073492/ws-services-calculation/Penalty.json
index bf4b87ee95..e151f7974f 100644
--- a/data/as/30073492/ws-services-calculation/Penalty.json
+++ b/data/as/30073492/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073492/ws-services-calculation/WCBillingSlab.json b/data/as/30073492/ws-services-calculation/WCBillingSlab.json
index 0f6061ad38..c099734ede 100644
--- a/data/as/30073492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073492/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30073521/ws-services-calculation/Penalty.json b/data/as/30073521/ws-services-calculation/Penalty.json
index bc4c700c0c..24f175445b 100644
--- a/data/as/30073521/ws-services-calculation/Penalty.json
+++ b/data/as/30073521/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073521/ws-services-calculation/WCBillingSlab.json b/data/as/30073521/ws-services-calculation/WCBillingSlab.json
index 94024bafb0..2cfe0a4b77 100644
--- a/data/as/30073521/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073521/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074179/ws-services-calculation/Penalty.json b/data/as/30074179/ws-services-calculation/Penalty.json
index 8d512fd874..e8fdba44ae 100644
--- a/data/as/30074179/ws-services-calculation/Penalty.json
+++ b/data/as/30074179/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074179/ws-services-calculation/WCBillingSlab.json b/data/as/30074179/ws-services-calculation/WCBillingSlab.json
index 5a3bffff02..e4c5cc8460 100644
--- a/data/as/30074179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074179/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074189/ws-services-calculation/Penalty.json b/data/as/30074189/ws-services-calculation/Penalty.json
index 37d1912603..eaaeea80cd 100644
--- a/data/as/30074189/ws-services-calculation/Penalty.json
+++ b/data/as/30074189/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074189/ws-services-calculation/WCBillingSlab.json b/data/as/30074189/ws-services-calculation/WCBillingSlab.json
index fb65f948e1..e492773135 100644
--- a/data/as/30074189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074189/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074675/ws-services-calculation/Penalty.json b/data/as/30074675/ws-services-calculation/Penalty.json
index a49e24d808..554c226b29 100644
--- a/data/as/30074675/ws-services-calculation/Penalty.json
+++ b/data/as/30074675/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074675/ws-services-calculation/WCBillingSlab.json b/data/as/30074675/ws-services-calculation/WCBillingSlab.json
index 24f16e618e..b21b8c77dd 100644
--- a/data/as/30074675/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074675/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074706/ws-services-calculation/Penalty.json b/data/as/30074706/ws-services-calculation/Penalty.json
index 8368393a75..070e8ffcf7 100644
--- a/data/as/30074706/ws-services-calculation/Penalty.json
+++ b/data/as/30074706/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074706/ws-services-calculation/WCBillingSlab.json b/data/as/30074706/ws-services-calculation/WCBillingSlab.json
index 44d2a17063..12e4e81a38 100644
--- a/data/as/30074706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074706/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074732/ws-services-calculation/Penalty.json b/data/as/30074732/ws-services-calculation/Penalty.json
index dd3204d38c..a42404a618 100644
--- a/data/as/30074732/ws-services-calculation/Penalty.json
+++ b/data/as/30074732/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074732/ws-services-calculation/WCBillingSlab.json b/data/as/30074732/ws-services-calculation/WCBillingSlab.json
index bba689ea49..21b3c2a5cd 100644
--- a/data/as/30074732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074732/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074827/ws-services-calculation/Penalty.json b/data/as/30074827/ws-services-calculation/Penalty.json
index cd64658669..e222daadcf 100644
--- a/data/as/30074827/ws-services-calculation/Penalty.json
+++ b/data/as/30074827/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074827/ws-services-calculation/WCBillingSlab.json b/data/as/30074827/ws-services-calculation/WCBillingSlab.json
index c1b636e54c..760a511269 100644
--- a/data/as/30074827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074827/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074916/ws-services-calculation/Penalty.json b/data/as/30074916/ws-services-calculation/Penalty.json
index e0477a3b5c..e9bd52da02 100644
--- a/data/as/30074916/ws-services-calculation/Penalty.json
+++ b/data/as/30074916/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074916/ws-services-calculation/WCBillingSlab.json b/data/as/30074916/ws-services-calculation/WCBillingSlab.json
index 3cf411d4e0..7857c23aa0 100644
--- a/data/as/30074916/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074916/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074975/ws-services-calculation/Penalty.json b/data/as/30074975/ws-services-calculation/Penalty.json
index 82374f7877..9e9b5fa3e9 100644
--- a/data/as/30074975/ws-services-calculation/Penalty.json
+++ b/data/as/30074975/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074975/ws-services-calculation/WCBillingSlab.json b/data/as/30074975/ws-services-calculation/WCBillingSlab.json
index 03f3eb96f5..4181dc4d91 100644
--- a/data/as/30074975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074975/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074989/ws-services-calculation/Penalty.json b/data/as/30074989/ws-services-calculation/Penalty.json
index 570c86ec5c..7f61d71f5d 100644
--- a/data/as/30074989/ws-services-calculation/Penalty.json
+++ b/data/as/30074989/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074989/ws-services-calculation/WCBillingSlab.json b/data/as/30074989/ws-services-calculation/WCBillingSlab.json
index fd4f696e5a..6d9b9e5fd2 100644
--- a/data/as/30074989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074989/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30074995/ws-services-calculation/Penalty.json b/data/as/30074995/ws-services-calculation/Penalty.json
index 4f95da0abd..8baee03281 100644
--- a/data/as/30074995/ws-services-calculation/Penalty.json
+++ b/data/as/30074995/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074995/ws-services-calculation/WCBillingSlab.json b/data/as/30074995/ws-services-calculation/WCBillingSlab.json
index 84729ec984..bfb079e779 100644
--- a/data/as/30074995/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074995/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075002/ws-services-calculation/Penalty.json b/data/as/30075002/ws-services-calculation/Penalty.json
index c339a1e223..72ded0af19 100644
--- a/data/as/30075002/ws-services-calculation/Penalty.json
+++ b/data/as/30075002/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075002/ws-services-calculation/WCBillingSlab.json b/data/as/30075002/ws-services-calculation/WCBillingSlab.json
index 37b576ca94..ef85d909be 100644
--- a/data/as/30075002/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075002/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075008/ws-services-calculation/Penalty.json b/data/as/30075008/ws-services-calculation/Penalty.json
index 3906102542..f660f1ae56 100644
--- a/data/as/30075008/ws-services-calculation/Penalty.json
+++ b/data/as/30075008/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075008/ws-services-calculation/WCBillingSlab.json b/data/as/30075008/ws-services-calculation/WCBillingSlab.json
index 62cce56564..b44792a396 100644
--- a/data/as/30075008/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075008/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075655/ws-services-calculation/Penalty.json b/data/as/30075655/ws-services-calculation/Penalty.json
index ebdb36914e..84865922f4 100644
--- a/data/as/30075655/ws-services-calculation/Penalty.json
+++ b/data/as/30075655/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075655/ws-services-calculation/WCBillingSlab.json b/data/as/30075655/ws-services-calculation/WCBillingSlab.json
index 02c2f684e2..3173458b14 100644
--- a/data/as/30075655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075655/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075682/ws-services-calculation/Penalty.json b/data/as/30075682/ws-services-calculation/Penalty.json
index 2ea5cbde4c..208d461fbf 100644
--- a/data/as/30075682/ws-services-calculation/Penalty.json
+++ b/data/as/30075682/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075682/ws-services-calculation/WCBillingSlab.json b/data/as/30075682/ws-services-calculation/WCBillingSlab.json
index 5150591523..a35c0bdd39 100644
--- a/data/as/30075682/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075682/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075685/ws-services-calculation/Penalty.json b/data/as/30075685/ws-services-calculation/Penalty.json
index 06f3e80565..ab48070c9f 100644
--- a/data/as/30075685/ws-services-calculation/Penalty.json
+++ b/data/as/30075685/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075685/ws-services-calculation/WCBillingSlab.json b/data/as/30075685/ws-services-calculation/WCBillingSlab.json
index 30add7e50a..5b392f4371 100644
--- a/data/as/30075685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075685/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075704/ws-services-calculation/Penalty.json b/data/as/30075704/ws-services-calculation/Penalty.json
index 5fbc1582a1..97e0b91985 100644
--- a/data/as/30075704/ws-services-calculation/Penalty.json
+++ b/data/as/30075704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075704/ws-services-calculation/WCBillingSlab.json b/data/as/30075704/ws-services-calculation/WCBillingSlab.json
index 6aaa94f51e..7b3addf39d 100644
--- a/data/as/30075704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075708/ws-services-calculation/Penalty.json b/data/as/30075708/ws-services-calculation/Penalty.json
index 0f29960e69..56461c0bf8 100644
--- a/data/as/30075708/ws-services-calculation/Penalty.json
+++ b/data/as/30075708/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075708/ws-services-calculation/WCBillingSlab.json b/data/as/30075708/ws-services-calculation/WCBillingSlab.json
index 94c71324b8..66ff333688 100644
--- a/data/as/30075708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075708/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075836/ws-services-calculation/Penalty.json b/data/as/30075836/ws-services-calculation/Penalty.json
index a3a0cedbbc..dd2a4a3edb 100644
--- a/data/as/30075836/ws-services-calculation/Penalty.json
+++ b/data/as/30075836/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075836/ws-services-calculation/WCBillingSlab.json b/data/as/30075836/ws-services-calculation/WCBillingSlab.json
index f9d5673e5c..4e62a837e8 100644
--- a/data/as/30075836/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075836/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075842/ws-services-calculation/Penalty.json b/data/as/30075842/ws-services-calculation/Penalty.json
index f2a2338e89..4fcf8f4c9a 100644
--- a/data/as/30075842/ws-services-calculation/Penalty.json
+++ b/data/as/30075842/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075842/ws-services-calculation/WCBillingSlab.json b/data/as/30075842/ws-services-calculation/WCBillingSlab.json
index fdcc599a4b..46e0ae273d 100644
--- a/data/as/30075842/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075842/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30075998/ws-services-calculation/Penalty.json b/data/as/30075998/ws-services-calculation/Penalty.json
index f5034aa542..104d2ab11a 100644
--- a/data/as/30075998/ws-services-calculation/Penalty.json
+++ b/data/as/30075998/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075998/ws-services-calculation/WCBillingSlab.json b/data/as/30075998/ws-services-calculation/WCBillingSlab.json
index 528895bd6f..3ed7fa8952 100644
--- a/data/as/30075998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075998/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076178/ws-services-calculation/Penalty.json b/data/as/30076178/ws-services-calculation/Penalty.json
index 038194efbf..be402f860d 100644
--- a/data/as/30076178/ws-services-calculation/Penalty.json
+++ b/data/as/30076178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076178/ws-services-calculation/WCBillingSlab.json b/data/as/30076178/ws-services-calculation/WCBillingSlab.json
index 9fdbefaf18..fe6758a5a7 100644
--- a/data/as/30076178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076404/ws-services-calculation/Penalty.json b/data/as/30076404/ws-services-calculation/Penalty.json
index ed9be71fa7..2a2947327f 100644
--- a/data/as/30076404/ws-services-calculation/Penalty.json
+++ b/data/as/30076404/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076404/ws-services-calculation/WCBillingSlab.json b/data/as/30076404/ws-services-calculation/WCBillingSlab.json
index f36a641a56..d98678de76 100644
--- a/data/as/30076404/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076404/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076417/ws-services-calculation/Penalty.json b/data/as/30076417/ws-services-calculation/Penalty.json
index 92c4654856..e27c4f3a60 100644
--- a/data/as/30076417/ws-services-calculation/Penalty.json
+++ b/data/as/30076417/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076417/ws-services-calculation/WCBillingSlab.json b/data/as/30076417/ws-services-calculation/WCBillingSlab.json
index 91c0fcf9e5..e720892979 100644
--- a/data/as/30076417/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076417/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076423/ws-services-calculation/Penalty.json b/data/as/30076423/ws-services-calculation/Penalty.json
index 8d63243cef..a64ae20ae0 100644
--- a/data/as/30076423/ws-services-calculation/Penalty.json
+++ b/data/as/30076423/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076423/ws-services-calculation/WCBillingSlab.json b/data/as/30076423/ws-services-calculation/WCBillingSlab.json
index bd75a308bd..903a8e0c9a 100644
--- a/data/as/30076423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076423/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076442/ws-services-calculation/Penalty.json b/data/as/30076442/ws-services-calculation/Penalty.json
index 57bd61ab6e..c619cf413f 100644
--- a/data/as/30076442/ws-services-calculation/Penalty.json
+++ b/data/as/30076442/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076442/ws-services-calculation/WCBillingSlab.json b/data/as/30076442/ws-services-calculation/WCBillingSlab.json
index 19bf60aa5d..9246a52c3a 100644
--- a/data/as/30076442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076442/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076496/ws-services-calculation/Penalty.json b/data/as/30076496/ws-services-calculation/Penalty.json
index cb4c1dbed5..742237dcae 100644
--- a/data/as/30076496/ws-services-calculation/Penalty.json
+++ b/data/as/30076496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076496/ws-services-calculation/WCBillingSlab.json b/data/as/30076496/ws-services-calculation/WCBillingSlab.json
index f39ffeadc8..6a6292f16e 100644
--- a/data/as/30076496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076501/ws-services-calculation/Penalty.json b/data/as/30076501/ws-services-calculation/Penalty.json
index 9f5e69e0af..9529929817 100644
--- a/data/as/30076501/ws-services-calculation/Penalty.json
+++ b/data/as/30076501/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076501/ws-services-calculation/WCBillingSlab.json b/data/as/30076501/ws-services-calculation/WCBillingSlab.json
index 174afea182..7d77c2a390 100644
--- a/data/as/30076501/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076501/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076546/ws-services-calculation/Penalty.json b/data/as/30076546/ws-services-calculation/Penalty.json
index ad8ec74485..ab6a046326 100644
--- a/data/as/30076546/ws-services-calculation/Penalty.json
+++ b/data/as/30076546/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076546/ws-services-calculation/WCBillingSlab.json b/data/as/30076546/ws-services-calculation/WCBillingSlab.json
index 1824e005e2..e50eced010 100644
--- a/data/as/30076546/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076546/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076588/ws-services-calculation/Penalty.json b/data/as/30076588/ws-services-calculation/Penalty.json
index a0df54e493..e72a5a6d3a 100644
--- a/data/as/30076588/ws-services-calculation/Penalty.json
+++ b/data/as/30076588/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076588/ws-services-calculation/WCBillingSlab.json b/data/as/30076588/ws-services-calculation/WCBillingSlab.json
index 31ef041879..32f5c170f2 100644
--- a/data/as/30076588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076588/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076595/ws-services-calculation/Penalty.json b/data/as/30076595/ws-services-calculation/Penalty.json
index 6b8c640a69..c56e6c930b 100644
--- a/data/as/30076595/ws-services-calculation/Penalty.json
+++ b/data/as/30076595/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076595/ws-services-calculation/WCBillingSlab.json b/data/as/30076595/ws-services-calculation/WCBillingSlab.json
index 396c77c525..7af60a0865 100644
--- a/data/as/30076595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076595/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30076911/ws-services-calculation/Penalty.json b/data/as/30076911/ws-services-calculation/Penalty.json
index dc761903e9..b59ffd6f5c 100644
--- a/data/as/30076911/ws-services-calculation/Penalty.json
+++ b/data/as/30076911/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076911/ws-services-calculation/WCBillingSlab.json b/data/as/30076911/ws-services-calculation/WCBillingSlab.json
index 6d5eb91afb..f88bb7e04d 100644
--- a/data/as/30076911/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076911/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077015/ws-services-calculation/Penalty.json b/data/as/30077015/ws-services-calculation/Penalty.json
index e558ccc05a..e79777f3cd 100644
--- a/data/as/30077015/ws-services-calculation/Penalty.json
+++ b/data/as/30077015/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077015/ws-services-calculation/WCBillingSlab.json b/data/as/30077015/ws-services-calculation/WCBillingSlab.json
index 1da051a4de..d5f96f12c2 100644
--- a/data/as/30077015/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077015/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077065/ws-services-calculation/Penalty.json b/data/as/30077065/ws-services-calculation/Penalty.json
index 8db1a33d94..20e561f9be 100644
--- a/data/as/30077065/ws-services-calculation/Penalty.json
+++ b/data/as/30077065/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077065/ws-services-calculation/WCBillingSlab.json b/data/as/30077065/ws-services-calculation/WCBillingSlab.json
index fd4d08d071..d8b6af9d5f 100644
--- a/data/as/30077065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077065/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077169/ws-services-calculation/Penalty.json b/data/as/30077169/ws-services-calculation/Penalty.json
index 5939e1f0dc..0022c9f12e 100644
--- a/data/as/30077169/ws-services-calculation/Penalty.json
+++ b/data/as/30077169/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077169/ws-services-calculation/WCBillingSlab.json b/data/as/30077169/ws-services-calculation/WCBillingSlab.json
index 7f2866ae94..6727970cab 100644
--- a/data/as/30077169/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077169/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077173/ws-services-calculation/Penalty.json b/data/as/30077173/ws-services-calculation/Penalty.json
index 59990fa859..b31696078b 100644
--- a/data/as/30077173/ws-services-calculation/Penalty.json
+++ b/data/as/30077173/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077173/ws-services-calculation/WCBillingSlab.json b/data/as/30077173/ws-services-calculation/WCBillingSlab.json
index f137a96643..12c232fd57 100644
--- a/data/as/30077173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077173/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077183/ws-services-calculation/Penalty.json b/data/as/30077183/ws-services-calculation/Penalty.json
index 83547db351..f6ec58a692 100644
--- a/data/as/30077183/ws-services-calculation/Penalty.json
+++ b/data/as/30077183/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077183/ws-services-calculation/WCBillingSlab.json b/data/as/30077183/ws-services-calculation/WCBillingSlab.json
index a5f0f7ac19..f5037ea846 100644
--- a/data/as/30077183/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077183/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077189/ws-services-calculation/Penalty.json b/data/as/30077189/ws-services-calculation/Penalty.json
index 823558ffcd..7784b18181 100644
--- a/data/as/30077189/ws-services-calculation/Penalty.json
+++ b/data/as/30077189/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077189/ws-services-calculation/WCBillingSlab.json b/data/as/30077189/ws-services-calculation/WCBillingSlab.json
index 7bb4bbc56d..6c3cbc3871 100644
--- a/data/as/30077189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077189/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077362/ws-services-calculation/Penalty.json b/data/as/30077362/ws-services-calculation/Penalty.json
index 83b377bd62..7ede96d801 100644
--- a/data/as/30077362/ws-services-calculation/Penalty.json
+++ b/data/as/30077362/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077362/ws-services-calculation/WCBillingSlab.json b/data/as/30077362/ws-services-calculation/WCBillingSlab.json
index 0b7db16fac..cdfe1356c1 100644
--- a/data/as/30077362/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077362/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077383/ws-services-calculation/Penalty.json b/data/as/30077383/ws-services-calculation/Penalty.json
index 0b1451d852..bb3973ea3c 100644
--- a/data/as/30077383/ws-services-calculation/Penalty.json
+++ b/data/as/30077383/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077383/ws-services-calculation/WCBillingSlab.json b/data/as/30077383/ws-services-calculation/WCBillingSlab.json
index a26acbf051..4210fb600a 100644
--- a/data/as/30077383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077383/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077387/ws-services-calculation/Penalty.json b/data/as/30077387/ws-services-calculation/Penalty.json
index 47b4dcab7d..d6facfa6a0 100644
--- a/data/as/30077387/ws-services-calculation/Penalty.json
+++ b/data/as/30077387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077387/ws-services-calculation/WCBillingSlab.json b/data/as/30077387/ws-services-calculation/WCBillingSlab.json
index 071df312d0..b231f18d53 100644
--- a/data/as/30077387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077405/ws-services-calculation/Penalty.json b/data/as/30077405/ws-services-calculation/Penalty.json
index 736ee39228..dd8c04150d 100644
--- a/data/as/30077405/ws-services-calculation/Penalty.json
+++ b/data/as/30077405/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077405/ws-services-calculation/WCBillingSlab.json b/data/as/30077405/ws-services-calculation/WCBillingSlab.json
index 22c405a71f..854c489348 100644
--- a/data/as/30077405/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077405/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077516/ws-services-calculation/Penalty.json b/data/as/30077516/ws-services-calculation/Penalty.json
index 46406a9123..118b4b0980 100644
--- a/data/as/30077516/ws-services-calculation/Penalty.json
+++ b/data/as/30077516/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077516/ws-services-calculation/WCBillingSlab.json b/data/as/30077516/ws-services-calculation/WCBillingSlab.json
index 99c521f88f..ac33d26e71 100644
--- a/data/as/30077516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077516/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077531/ws-services-calculation/Penalty.json b/data/as/30077531/ws-services-calculation/Penalty.json
index f312745d29..75f3d23d88 100644
--- a/data/as/30077531/ws-services-calculation/Penalty.json
+++ b/data/as/30077531/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077531/ws-services-calculation/WCBillingSlab.json b/data/as/30077531/ws-services-calculation/WCBillingSlab.json
index 3aaa1db647..d2533ab513 100644
--- a/data/as/30077531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077531/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077533/ws-services-calculation/Penalty.json b/data/as/30077533/ws-services-calculation/Penalty.json
index 751387dff4..26ead7342f 100644
--- a/data/as/30077533/ws-services-calculation/Penalty.json
+++ b/data/as/30077533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077533/ws-services-calculation/WCBillingSlab.json b/data/as/30077533/ws-services-calculation/WCBillingSlab.json
index a4d0c70485..94a494c186 100644
--- a/data/as/30077533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30077538/ws-services-calculation/Penalty.json b/data/as/30077538/ws-services-calculation/Penalty.json
index e7d3894457..139fed1d89 100644
--- a/data/as/30077538/ws-services-calculation/Penalty.json
+++ b/data/as/30077538/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077538/ws-services-calculation/WCBillingSlab.json b/data/as/30077538/ws-services-calculation/WCBillingSlab.json
index 149d8e25a3..43dc797167 100644
--- a/data/as/30077538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077538/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30078496/ws-services-calculation/Penalty.json b/data/as/30078496/ws-services-calculation/Penalty.json
index cc90a4923c..797a52f11c 100644
--- a/data/as/30078496/ws-services-calculation/Penalty.json
+++ b/data/as/30078496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30078496/ws-services-calculation/WCBillingSlab.json b/data/as/30078496/ws-services-calculation/WCBillingSlab.json
index ca48848618..0e9bfea7b7 100644
--- a/data/as/30078496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30078496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30078499/ws-services-calculation/Penalty.json b/data/as/30078499/ws-services-calculation/Penalty.json
index 7bb831b97e..b3b06080dc 100644
--- a/data/as/30078499/ws-services-calculation/Penalty.json
+++ b/data/as/30078499/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30078499/ws-services-calculation/WCBillingSlab.json b/data/as/30078499/ws-services-calculation/WCBillingSlab.json
index f9cbbfdc34..165820af44 100644
--- a/data/as/30078499/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30078499/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30079129/ws-services-calculation/Penalty.json b/data/as/30079129/ws-services-calculation/Penalty.json
index 15803e568f..f23138668c 100644
--- a/data/as/30079129/ws-services-calculation/Penalty.json
+++ b/data/as/30079129/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079129/ws-services-calculation/WCBillingSlab.json b/data/as/30079129/ws-services-calculation/WCBillingSlab.json
index 44470bf1fb..626d992275 100644
--- a/data/as/30079129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079129/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30079143/ws-services-calculation/Penalty.json b/data/as/30079143/ws-services-calculation/Penalty.json
index 4994fd1d50..51dcacd495 100644
--- a/data/as/30079143/ws-services-calculation/Penalty.json
+++ b/data/as/30079143/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079143/ws-services-calculation/WCBillingSlab.json b/data/as/30079143/ws-services-calculation/WCBillingSlab.json
index dcecf02c80..77c7930cbe 100644
--- a/data/as/30079143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079143/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30079150/ws-services-calculation/Penalty.json b/data/as/30079150/ws-services-calculation/Penalty.json
index d834f40936..da1b98d544 100644
--- a/data/as/30079150/ws-services-calculation/Penalty.json
+++ b/data/as/30079150/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079150/ws-services-calculation/WCBillingSlab.json b/data/as/30079150/ws-services-calculation/WCBillingSlab.json
index 7f91d875ad..84c03ce89e 100644
--- a/data/as/30079150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079150/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30079745/ws-services-calculation/Penalty.json b/data/as/30079745/ws-services-calculation/Penalty.json
index 6b5979f90a..3ce1c024d9 100644
--- a/data/as/30079745/ws-services-calculation/Penalty.json
+++ b/data/as/30079745/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079745/ws-services-calculation/WCBillingSlab.json b/data/as/30079745/ws-services-calculation/WCBillingSlab.json
index cdb1ccdb65..b43ed63ef3 100644
--- a/data/as/30079745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079745/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30079783/ws-services-calculation/Penalty.json b/data/as/30079783/ws-services-calculation/Penalty.json
index 068467d143..3caa570b9e 100644
--- a/data/as/30079783/ws-services-calculation/Penalty.json
+++ b/data/as/30079783/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079783/ws-services-calculation/WCBillingSlab.json b/data/as/30079783/ws-services-calculation/WCBillingSlab.json
index b3f12388f1..3e30105eb5 100644
--- a/data/as/30079783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079783/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30080314/ws-services-calculation/Penalty.json b/data/as/30080314/ws-services-calculation/Penalty.json
index b0c18de49f..06b7c51048 100644
--- a/data/as/30080314/ws-services-calculation/Penalty.json
+++ b/data/as/30080314/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080314/ws-services-calculation/WCBillingSlab.json b/data/as/30080314/ws-services-calculation/WCBillingSlab.json
index 179b7dafe7..4949fe8d2e 100644
--- a/data/as/30080314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080314/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30080792/ws-services-calculation/Penalty.json b/data/as/30080792/ws-services-calculation/Penalty.json
index 48242c065e..58c9e01f24 100644
--- a/data/as/30080792/ws-services-calculation/Penalty.json
+++ b/data/as/30080792/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080792/ws-services-calculation/WCBillingSlab.json b/data/as/30080792/ws-services-calculation/WCBillingSlab.json
index 2b3e917092..271333e288 100644
--- a/data/as/30080792/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080792/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30080805/ws-services-calculation/Penalty.json b/data/as/30080805/ws-services-calculation/Penalty.json
index 9e3bd138ee..a740953b70 100644
--- a/data/as/30080805/ws-services-calculation/Penalty.json
+++ b/data/as/30080805/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080805/ws-services-calculation/WCBillingSlab.json b/data/as/30080805/ws-services-calculation/WCBillingSlab.json
index 9d7b7b5186..2ad82a4f47 100644
--- a/data/as/30080805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080805/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30080812/ws-services-calculation/Penalty.json b/data/as/30080812/ws-services-calculation/Penalty.json
index 48d21da08d..e2bb1a1316 100644
--- a/data/as/30080812/ws-services-calculation/Penalty.json
+++ b/data/as/30080812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080812/ws-services-calculation/WCBillingSlab.json b/data/as/30080812/ws-services-calculation/WCBillingSlab.json
index 091c74baeb..f2b28462e0 100644
--- a/data/as/30080812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30081191/ws-services-calculation/Penalty.json b/data/as/30081191/ws-services-calculation/Penalty.json
index 450f466505..e5af45e998 100644
--- a/data/as/30081191/ws-services-calculation/Penalty.json
+++ b/data/as/30081191/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081191/ws-services-calculation/WCBillingSlab.json b/data/as/30081191/ws-services-calculation/WCBillingSlab.json
index be83f47cd1..e869e9cfea 100644
--- a/data/as/30081191/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081191/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30081194/ws-services-calculation/Penalty.json b/data/as/30081194/ws-services-calculation/Penalty.json
index f38e2e566d..2b924ccbdf 100644
--- a/data/as/30081194/ws-services-calculation/Penalty.json
+++ b/data/as/30081194/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081194/ws-services-calculation/WCBillingSlab.json b/data/as/30081194/ws-services-calculation/WCBillingSlab.json
index ad4993353f..4a56afa521 100644
--- a/data/as/30081194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081194/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30081197/ws-services-calculation/Penalty.json b/data/as/30081197/ws-services-calculation/Penalty.json
index ac797d4632..b59ee91048 100644
--- a/data/as/30081197/ws-services-calculation/Penalty.json
+++ b/data/as/30081197/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081197/ws-services-calculation/WCBillingSlab.json b/data/as/30081197/ws-services-calculation/WCBillingSlab.json
index 5fceeecdc4..12f19c240e 100644
--- a/data/as/30081197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081197/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30081199/ws-services-calculation/Penalty.json b/data/as/30081199/ws-services-calculation/Penalty.json
index bb201d98b4..684eeba4b8 100644
--- a/data/as/30081199/ws-services-calculation/Penalty.json
+++ b/data/as/30081199/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081199/ws-services-calculation/WCBillingSlab.json b/data/as/30081199/ws-services-calculation/WCBillingSlab.json
index 4c81a362f0..86af2f6fcf 100644
--- a/data/as/30081199/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081199/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30081237/ws-services-calculation/Penalty.json b/data/as/30081237/ws-services-calculation/Penalty.json
index f886c2be86..fdf893a368 100644
--- a/data/as/30081237/ws-services-calculation/Penalty.json
+++ b/data/as/30081237/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081237/ws-services-calculation/WCBillingSlab.json b/data/as/30081237/ws-services-calculation/WCBillingSlab.json
index 7be546f7a3..4483b00fa6 100644
--- a/data/as/30081237/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081237/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30082029/ws-services-calculation/Penalty.json b/data/as/30082029/ws-services-calculation/Penalty.json
index 782e725a9e..0821cd68b6 100644
--- a/data/as/30082029/ws-services-calculation/Penalty.json
+++ b/data/as/30082029/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30082029/ws-services-calculation/WCBillingSlab.json b/data/as/30082029/ws-services-calculation/WCBillingSlab.json
index 609abb8536..d42f95b941 100644
--- a/data/as/30082029/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30082029/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30082892/ws-services-calculation/Penalty.json b/data/as/30082892/ws-services-calculation/Penalty.json
index c864937c4b..cecef2873c 100644
--- a/data/as/30082892/ws-services-calculation/Penalty.json
+++ b/data/as/30082892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30082892/ws-services-calculation/WCBillingSlab.json b/data/as/30082892/ws-services-calculation/WCBillingSlab.json
index 689a4e3cfb..05e198e1ce 100644
--- a/data/as/30082892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30082892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30083052/ws-services-calculation/Penalty.json b/data/as/30083052/ws-services-calculation/Penalty.json
index b940742e9d..24fb314fcf 100644
--- a/data/as/30083052/ws-services-calculation/Penalty.json
+++ b/data/as/30083052/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30083052/ws-services-calculation/WCBillingSlab.json b/data/as/30083052/ws-services-calculation/WCBillingSlab.json
index a02a525acd..a88c0d5820 100644
--- a/data/as/30083052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30083052/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30083450/ws-services-calculation/Penalty.json b/data/as/30083450/ws-services-calculation/Penalty.json
index 75a9278e24..e962ac635c 100644
--- a/data/as/30083450/ws-services-calculation/Penalty.json
+++ b/data/as/30083450/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30083450/ws-services-calculation/WCBillingSlab.json b/data/as/30083450/ws-services-calculation/WCBillingSlab.json
index a8ed561cf0..094230ed5e 100644
--- a/data/as/30083450/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30083450/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30090984/ws-services-calculation/Penalty.json b/data/as/30090984/ws-services-calculation/Penalty.json
index 26d18ae4f3..d970bba30f 100644
--- a/data/as/30090984/ws-services-calculation/Penalty.json
+++ b/data/as/30090984/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30090984/ws-services-calculation/WCBillingSlab.json b/data/as/30090984/ws-services-calculation/WCBillingSlab.json
index 1dabd4c573..121dd3a596 100644
--- a/data/as/30090984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30090984/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30091027/ws-services-calculation/Penalty.json b/data/as/30091027/ws-services-calculation/Penalty.json
index fe42095619..bf52a8a4f7 100644
--- a/data/as/30091027/ws-services-calculation/Penalty.json
+++ b/data/as/30091027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091027/ws-services-calculation/WCBillingSlab.json b/data/as/30091027/ws-services-calculation/WCBillingSlab.json
index b7344f01a4..8a11e4e63e 100644
--- a/data/as/30091027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30091086/ws-services-calculation/Penalty.json b/data/as/30091086/ws-services-calculation/Penalty.json
index 1a7671e0b6..9ab9e79aff 100644
--- a/data/as/30091086/ws-services-calculation/Penalty.json
+++ b/data/as/30091086/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091086/ws-services-calculation/WCBillingSlab.json b/data/as/30091086/ws-services-calculation/WCBillingSlab.json
index 64b18a9f37..1640574e5d 100644
--- a/data/as/30091086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091086/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30091137/ws-services-calculation/Penalty.json b/data/as/30091137/ws-services-calculation/Penalty.json
index 61f65f9db1..4f3565046a 100644
--- a/data/as/30091137/ws-services-calculation/Penalty.json
+++ b/data/as/30091137/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091137/ws-services-calculation/WCBillingSlab.json b/data/as/30091137/ws-services-calculation/WCBillingSlab.json
index d4f3d5c88a..b065eab2fc 100644
--- a/data/as/30091137/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091137/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30091277/ws-services-calculation/Penalty.json b/data/as/30091277/ws-services-calculation/Penalty.json
index 7a2f82c3a9..da17b3385f 100644
--- a/data/as/30091277/ws-services-calculation/Penalty.json
+++ b/data/as/30091277/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091277/ws-services-calculation/WCBillingSlab.json b/data/as/30091277/ws-services-calculation/WCBillingSlab.json
index d71210c3ef..cdc7ff08c9 100644
--- a/data/as/30091277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091277/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30091350/ws-services-calculation/Penalty.json b/data/as/30091350/ws-services-calculation/Penalty.json
index 34a7ff5f7b..84ca143e12 100644
--- a/data/as/30091350/ws-services-calculation/Penalty.json
+++ b/data/as/30091350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091350/ws-services-calculation/WCBillingSlab.json b/data/as/30091350/ws-services-calculation/WCBillingSlab.json
index 3bc5ac816f..bb9e97e5ac 100644
--- a/data/as/30091350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30092981/ws-services-calculation/Penalty.json b/data/as/30092981/ws-services-calculation/Penalty.json
index 5a83611b8a..68d6704b9b 100644
--- a/data/as/30092981/ws-services-calculation/Penalty.json
+++ b/data/as/30092981/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30092981/ws-services-calculation/WCBillingSlab.json b/data/as/30092981/ws-services-calculation/WCBillingSlab.json
index 8eceef914c..11ea725b21 100644
--- a/data/as/30092981/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30092981/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30093053/ws-services-calculation/Penalty.json b/data/as/30093053/ws-services-calculation/Penalty.json
index 7abb1bb82f..c4cd3c5bb9 100644
--- a/data/as/30093053/ws-services-calculation/Penalty.json
+++ b/data/as/30093053/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30093053/ws-services-calculation/WCBillingSlab.json b/data/as/30093053/ws-services-calculation/WCBillingSlab.json
index 18b2aeef90..91c57152db 100644
--- a/data/as/30093053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30093053/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30093085/ws-services-calculation/Penalty.json b/data/as/30093085/ws-services-calculation/Penalty.json
index 6dcc15da17..69ea66db59 100644
--- a/data/as/30093085/ws-services-calculation/Penalty.json
+++ b/data/as/30093085/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30093085/ws-services-calculation/WCBillingSlab.json b/data/as/30093085/ws-services-calculation/WCBillingSlab.json
index 6236ba46ba..9ff2367c60 100644
--- a/data/as/30093085/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30093085/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30093111/ws-services-calculation/Penalty.json b/data/as/30093111/ws-services-calculation/Penalty.json
index 4da186148e..e432df56c8 100644
--- a/data/as/30093111/ws-services-calculation/Penalty.json
+++ b/data/as/30093111/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30093111/ws-services-calculation/WCBillingSlab.json b/data/as/30093111/ws-services-calculation/WCBillingSlab.json
index b7d324a625..a729a5f511 100644
--- a/data/as/30093111/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30093111/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096216/ws-services-calculation/Penalty.json b/data/as/30096216/ws-services-calculation/Penalty.json
index 1a82ef4537..88d40cc42c 100644
--- a/data/as/30096216/ws-services-calculation/Penalty.json
+++ b/data/as/30096216/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096216/ws-services-calculation/WCBillingSlab.json b/data/as/30096216/ws-services-calculation/WCBillingSlab.json
index 1605b38b55..d41fc2fadf 100644
--- a/data/as/30096216/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096216/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096276/ws-services-calculation/Penalty.json b/data/as/30096276/ws-services-calculation/Penalty.json
index ce264cd02c..732f8d5753 100644
--- a/data/as/30096276/ws-services-calculation/Penalty.json
+++ b/data/as/30096276/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096276/ws-services-calculation/WCBillingSlab.json b/data/as/30096276/ws-services-calculation/WCBillingSlab.json
index 69a1ee9b83..d6fed59196 100644
--- a/data/as/30096276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096276/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096403/ws-services-calculation/Penalty.json b/data/as/30096403/ws-services-calculation/Penalty.json
index 5d4b918b3f..9e8a23a4ec 100644
--- a/data/as/30096403/ws-services-calculation/Penalty.json
+++ b/data/as/30096403/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096403/ws-services-calculation/WCBillingSlab.json b/data/as/30096403/ws-services-calculation/WCBillingSlab.json
index e173aa7718..76275fabce 100644
--- a/data/as/30096403/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096403/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096485/ws-services-calculation/Penalty.json b/data/as/30096485/ws-services-calculation/Penalty.json
index 7398d76fe6..b1e40d3c9a 100644
--- a/data/as/30096485/ws-services-calculation/Penalty.json
+++ b/data/as/30096485/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096485/ws-services-calculation/WCBillingSlab.json b/data/as/30096485/ws-services-calculation/WCBillingSlab.json
index 51d9935078..4bdb205fcf 100644
--- a/data/as/30096485/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096485/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096579/ws-services-calculation/Penalty.json b/data/as/30096579/ws-services-calculation/Penalty.json
index d219f628fd..e2064aa0cb 100644
--- a/data/as/30096579/ws-services-calculation/Penalty.json
+++ b/data/as/30096579/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096579/ws-services-calculation/WCBillingSlab.json b/data/as/30096579/ws-services-calculation/WCBillingSlab.json
index 348ceac825..846649deb5 100644
--- a/data/as/30096579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096579/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096711/ws-services-calculation/Penalty.json b/data/as/30096711/ws-services-calculation/Penalty.json
index 2b73ea8c91..f601ddbfb8 100644
--- a/data/as/30096711/ws-services-calculation/Penalty.json
+++ b/data/as/30096711/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096711/ws-services-calculation/WCBillingSlab.json b/data/as/30096711/ws-services-calculation/WCBillingSlab.json
index b89f0fc28f..8a12c133fd 100644
--- a/data/as/30096711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096711/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30096898/ws-services-calculation/Penalty.json b/data/as/30096898/ws-services-calculation/Penalty.json
index d1b7c5cab3..37b23604fc 100644
--- a/data/as/30096898/ws-services-calculation/Penalty.json
+++ b/data/as/30096898/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096898/ws-services-calculation/WCBillingSlab.json b/data/as/30096898/ws-services-calculation/WCBillingSlab.json
index bbf9f220c7..a098319efc 100644
--- a/data/as/30096898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096898/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30097297/ws-services-calculation/Penalty.json b/data/as/30097297/ws-services-calculation/Penalty.json
index e9784d7093..57806a4367 100644
--- a/data/as/30097297/ws-services-calculation/Penalty.json
+++ b/data/as/30097297/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30097297/ws-services-calculation/WCBillingSlab.json b/data/as/30097297/ws-services-calculation/WCBillingSlab.json
index 0be74ad343..483ea84639 100644
--- a/data/as/30097297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30097297/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30105174/ws-services-calculation/Penalty.json b/data/as/30105174/ws-services-calculation/Penalty.json
index 69c1b8155f..ce416f451b 100644
--- a/data/as/30105174/ws-services-calculation/Penalty.json
+++ b/data/as/30105174/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30105174/ws-services-calculation/WCBillingSlab.json b/data/as/30105174/ws-services-calculation/WCBillingSlab.json
index e60e50766e..7f91f2177a 100644
--- a/data/as/30105174/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30105174/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30105196/ws-services-calculation/Penalty.json b/data/as/30105196/ws-services-calculation/Penalty.json
index ffdc69b901..b9aed00b81 100644
--- a/data/as/30105196/ws-services-calculation/Penalty.json
+++ b/data/as/30105196/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30105196/ws-services-calculation/WCBillingSlab.json b/data/as/30105196/ws-services-calculation/WCBillingSlab.json
index 3fd181523a..ab8a745d2f 100644
--- a/data/as/30105196/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30105196/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30105223/ws-services-calculation/Penalty.json b/data/as/30105223/ws-services-calculation/Penalty.json
index b44ba1eba8..1093adfeb7 100644
--- a/data/as/30105223/ws-services-calculation/Penalty.json
+++ b/data/as/30105223/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30105223/ws-services-calculation/WCBillingSlab.json b/data/as/30105223/ws-services-calculation/WCBillingSlab.json
index d223e4c539..6433ea4a78 100644
--- a/data/as/30105223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30105223/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30113305/ws-services-calculation/Penalty.json b/data/as/30113305/ws-services-calculation/Penalty.json
index 812ed922ee..c8a1b4447a 100644
--- a/data/as/30113305/ws-services-calculation/Penalty.json
+++ b/data/as/30113305/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30113305/ws-services-calculation/WCBillingSlab.json b/data/as/30113305/ws-services-calculation/WCBillingSlab.json
index 051dd13f2f..653d7706ed 100644
--- a/data/as/30113305/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30113305/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30113852/ws-services-calculation/Penalty.json b/data/as/30113852/ws-services-calculation/Penalty.json
index 5a875588c5..09717fc0d7 100644
--- a/data/as/30113852/ws-services-calculation/Penalty.json
+++ b/data/as/30113852/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30113852/ws-services-calculation/WCBillingSlab.json b/data/as/30113852/ws-services-calculation/WCBillingSlab.json
index ac57640689..bdfd1fa5eb 100644
--- a/data/as/30113852/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30113852/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30115191/ws-services-calculation/Penalty.json b/data/as/30115191/ws-services-calculation/Penalty.json
index 2447dae410..e4b00d0af1 100644
--- a/data/as/30115191/ws-services-calculation/Penalty.json
+++ b/data/as/30115191/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115191/ws-services-calculation/WCBillingSlab.json b/data/as/30115191/ws-services-calculation/WCBillingSlab.json
index e63f71412c..73dee14c17 100644
--- a/data/as/30115191/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115191/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30115208/ws-services-calculation/Penalty.json b/data/as/30115208/ws-services-calculation/Penalty.json
index 0787ef30b3..992e5885c6 100644
--- a/data/as/30115208/ws-services-calculation/Penalty.json
+++ b/data/as/30115208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115208/ws-services-calculation/WCBillingSlab.json b/data/as/30115208/ws-services-calculation/WCBillingSlab.json
index 7320bfc1a7..d762bf5e1a 100644
--- a/data/as/30115208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30115249/ws-services-calculation/Penalty.json b/data/as/30115249/ws-services-calculation/Penalty.json
index 740f0cb036..fcaf801e82 100644
--- a/data/as/30115249/ws-services-calculation/Penalty.json
+++ b/data/as/30115249/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115249/ws-services-calculation/WCBillingSlab.json b/data/as/30115249/ws-services-calculation/WCBillingSlab.json
index 5ff0398d95..9aa46c6a0c 100644
--- a/data/as/30115249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115249/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30115981/ws-services-calculation/Penalty.json b/data/as/30115981/ws-services-calculation/Penalty.json
index 99f8b9df00..5b5c07e06f 100644
--- a/data/as/30115981/ws-services-calculation/Penalty.json
+++ b/data/as/30115981/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115981/ws-services-calculation/WCBillingSlab.json b/data/as/30115981/ws-services-calculation/WCBillingSlab.json
index cf766c6a87..48a5fcaccf 100644
--- a/data/as/30115981/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115981/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30116153/ws-services-calculation/Penalty.json b/data/as/30116153/ws-services-calculation/Penalty.json
index 217a852f69..f8420f5c77 100644
--- a/data/as/30116153/ws-services-calculation/Penalty.json
+++ b/data/as/30116153/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30116153/ws-services-calculation/WCBillingSlab.json b/data/as/30116153/ws-services-calculation/WCBillingSlab.json
index 2f3944d2df..c1052c2502 100644
--- a/data/as/30116153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30116153/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30116490/ws-services-calculation/Penalty.json b/data/as/30116490/ws-services-calculation/Penalty.json
index fb80be6a7c..7dd40509eb 100644
--- a/data/as/30116490/ws-services-calculation/Penalty.json
+++ b/data/as/30116490/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30116490/ws-services-calculation/WCBillingSlab.json b/data/as/30116490/ws-services-calculation/WCBillingSlab.json
index 189b92dc0f..e0b2860c15 100644
--- a/data/as/30116490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30116490/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30116536/ws-services-calculation/Penalty.json b/data/as/30116536/ws-services-calculation/Penalty.json
index 1131374eb3..0465a7a176 100644
--- a/data/as/30116536/ws-services-calculation/Penalty.json
+++ b/data/as/30116536/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30116536/ws-services-calculation/WCBillingSlab.json b/data/as/30116536/ws-services-calculation/WCBillingSlab.json
index aacf4f4f74..74efdcc847 100644
--- a/data/as/30116536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30116536/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30117305/ws-services-calculation/Penalty.json b/data/as/30117305/ws-services-calculation/Penalty.json
index b59198cb7c..daabaf41d5 100644
--- a/data/as/30117305/ws-services-calculation/Penalty.json
+++ b/data/as/30117305/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117305/ws-services-calculation/WCBillingSlab.json b/data/as/30117305/ws-services-calculation/WCBillingSlab.json
index 44266a5363..88c0320e2f 100644
--- a/data/as/30117305/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117305/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30117521/ws-services-calculation/Penalty.json b/data/as/30117521/ws-services-calculation/Penalty.json
index e760749a03..365c05a673 100644
--- a/data/as/30117521/ws-services-calculation/Penalty.json
+++ b/data/as/30117521/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117521/ws-services-calculation/WCBillingSlab.json b/data/as/30117521/ws-services-calculation/WCBillingSlab.json
index 4e5410291b..f2a0e43ab9 100644
--- a/data/as/30117521/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117521/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30117549/ws-services-calculation/Penalty.json b/data/as/30117549/ws-services-calculation/Penalty.json
index 3001767c05..4b0f04e6ea 100644
--- a/data/as/30117549/ws-services-calculation/Penalty.json
+++ b/data/as/30117549/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117549/ws-services-calculation/WCBillingSlab.json b/data/as/30117549/ws-services-calculation/WCBillingSlab.json
index a965b9097c..0472d6b94c 100644
--- a/data/as/30117549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117549/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30117565/ws-services-calculation/Penalty.json b/data/as/30117565/ws-services-calculation/Penalty.json
index c0d41fc98d..f09d68aa7a 100644
--- a/data/as/30117565/ws-services-calculation/Penalty.json
+++ b/data/as/30117565/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117565/ws-services-calculation/WCBillingSlab.json b/data/as/30117565/ws-services-calculation/WCBillingSlab.json
index 99ca9c4364..a391e4d697 100644
--- a/data/as/30117565/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117565/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30117571/ws-services-calculation/Penalty.json b/data/as/30117571/ws-services-calculation/Penalty.json
index 821066684f..d5c82e023a 100644
--- a/data/as/30117571/ws-services-calculation/Penalty.json
+++ b/data/as/30117571/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117571/ws-services-calculation/WCBillingSlab.json b/data/as/30117571/ws-services-calculation/WCBillingSlab.json
index a7e13255ab..bf0e226301 100644
--- a/data/as/30117571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117571/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30119702/ws-services-calculation/Penalty.json b/data/as/30119702/ws-services-calculation/Penalty.json
index f5d96a246b..02b5955531 100644
--- a/data/as/30119702/ws-services-calculation/Penalty.json
+++ b/data/as/30119702/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30119702/ws-services-calculation/WCBillingSlab.json b/data/as/30119702/ws-services-calculation/WCBillingSlab.json
index 9ac50c6b1a..cb0ce64f16 100644
--- a/data/as/30119702/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30119702/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30125919/ws-services-calculation/Penalty.json b/data/as/30125919/ws-services-calculation/Penalty.json
index 194be6cba9..b33850a769 100644
--- a/data/as/30125919/ws-services-calculation/Penalty.json
+++ b/data/as/30125919/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125919/ws-services-calculation/WCBillingSlab.json b/data/as/30125919/ws-services-calculation/WCBillingSlab.json
index d967d5acb1..fae0fe04ba 100644
--- a/data/as/30125919/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125919/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30125926/ws-services-calculation/Penalty.json b/data/as/30125926/ws-services-calculation/Penalty.json
index 734b8e4f04..5205da6416 100644
--- a/data/as/30125926/ws-services-calculation/Penalty.json
+++ b/data/as/30125926/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125926/ws-services-calculation/WCBillingSlab.json b/data/as/30125926/ws-services-calculation/WCBillingSlab.json
index bd36f33bfb..89338330c8 100644
--- a/data/as/30125926/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125926/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30125970/ws-services-calculation/Penalty.json b/data/as/30125970/ws-services-calculation/Penalty.json
index 743352b082..c7853392f5 100644
--- a/data/as/30125970/ws-services-calculation/Penalty.json
+++ b/data/as/30125970/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125970/ws-services-calculation/WCBillingSlab.json b/data/as/30125970/ws-services-calculation/WCBillingSlab.json
index 6bd9f00e2a..9d30fcfba1 100644
--- a/data/as/30125970/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125970/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30125974/ws-services-calculation/Penalty.json b/data/as/30125974/ws-services-calculation/Penalty.json
index f38ef823a8..b1803fd26a 100644
--- a/data/as/30125974/ws-services-calculation/Penalty.json
+++ b/data/as/30125974/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125974/ws-services-calculation/WCBillingSlab.json b/data/as/30125974/ws-services-calculation/WCBillingSlab.json
index eaf8ba8e76..a762633360 100644
--- a/data/as/30125974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125974/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30125980/ws-services-calculation/Penalty.json b/data/as/30125980/ws-services-calculation/Penalty.json
index c3df7a285f..4d0029ce53 100644
--- a/data/as/30125980/ws-services-calculation/Penalty.json
+++ b/data/as/30125980/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125980/ws-services-calculation/WCBillingSlab.json b/data/as/30125980/ws-services-calculation/WCBillingSlab.json
index b98948033a..27f43db70f 100644
--- a/data/as/30125980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125980/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126191/ws-services-calculation/Penalty.json b/data/as/30126191/ws-services-calculation/Penalty.json
index 86396b393e..ded728017d 100644
--- a/data/as/30126191/ws-services-calculation/Penalty.json
+++ b/data/as/30126191/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126191/ws-services-calculation/WCBillingSlab.json b/data/as/30126191/ws-services-calculation/WCBillingSlab.json
index d8944ac423..a9b7110cfc 100644
--- a/data/as/30126191/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126191/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126197/ws-services-calculation/Penalty.json b/data/as/30126197/ws-services-calculation/Penalty.json
index 04c745789d..37b4246704 100644
--- a/data/as/30126197/ws-services-calculation/Penalty.json
+++ b/data/as/30126197/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126197/ws-services-calculation/WCBillingSlab.json b/data/as/30126197/ws-services-calculation/WCBillingSlab.json
index 74495a466e..e9d77e9bf8 100644
--- a/data/as/30126197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126197/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126217/ws-services-calculation/Penalty.json b/data/as/30126217/ws-services-calculation/Penalty.json
index 183ce23171..c1b8388033 100644
--- a/data/as/30126217/ws-services-calculation/Penalty.json
+++ b/data/as/30126217/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126217/ws-services-calculation/WCBillingSlab.json b/data/as/30126217/ws-services-calculation/WCBillingSlab.json
index a34d5817a4..0ae08af9dc 100644
--- a/data/as/30126217/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126217/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126233/ws-services-calculation/Penalty.json b/data/as/30126233/ws-services-calculation/Penalty.json
index 073ff285e9..16112a02c1 100644
--- a/data/as/30126233/ws-services-calculation/Penalty.json
+++ b/data/as/30126233/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126233/ws-services-calculation/WCBillingSlab.json b/data/as/30126233/ws-services-calculation/WCBillingSlab.json
index 2dc386a877..44771cee9b 100644
--- a/data/as/30126233/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126233/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126239/ws-services-calculation/Penalty.json b/data/as/30126239/ws-services-calculation/Penalty.json
index 62c6bd58fd..14e07e6134 100644
--- a/data/as/30126239/ws-services-calculation/Penalty.json
+++ b/data/as/30126239/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126239/ws-services-calculation/WCBillingSlab.json b/data/as/30126239/ws-services-calculation/WCBillingSlab.json
index 4e92fadc9e..559440a73b 100644
--- a/data/as/30126239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126239/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126308/ws-services-calculation/Penalty.json b/data/as/30126308/ws-services-calculation/Penalty.json
index 7ea07e34e7..39f0ebba45 100644
--- a/data/as/30126308/ws-services-calculation/Penalty.json
+++ b/data/as/30126308/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126308/ws-services-calculation/WCBillingSlab.json b/data/as/30126308/ws-services-calculation/WCBillingSlab.json
index 280c1cf1fb..5fd8f89e43 100644
--- a/data/as/30126308/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126308/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126312/ws-services-calculation/Penalty.json b/data/as/30126312/ws-services-calculation/Penalty.json
index c207651f4d..9c60f2a261 100644
--- a/data/as/30126312/ws-services-calculation/Penalty.json
+++ b/data/as/30126312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126312/ws-services-calculation/WCBillingSlab.json b/data/as/30126312/ws-services-calculation/WCBillingSlab.json
index cd92cb4212..4e631990fc 100644
--- a/data/as/30126312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126316/ws-services-calculation/Penalty.json b/data/as/30126316/ws-services-calculation/Penalty.json
index 05e98dec2a..57e3d55065 100644
--- a/data/as/30126316/ws-services-calculation/Penalty.json
+++ b/data/as/30126316/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126316/ws-services-calculation/WCBillingSlab.json b/data/as/30126316/ws-services-calculation/WCBillingSlab.json
index 8213c1decd..244e59be3d 100644
--- a/data/as/30126316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126316/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126334/ws-services-calculation/Penalty.json b/data/as/30126334/ws-services-calculation/Penalty.json
index 85251d18b9..d27c2e15e7 100644
--- a/data/as/30126334/ws-services-calculation/Penalty.json
+++ b/data/as/30126334/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126334/ws-services-calculation/WCBillingSlab.json b/data/as/30126334/ws-services-calculation/WCBillingSlab.json
index eb5c14921a..b015cdb6ec 100644
--- a/data/as/30126334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126334/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126487/ws-services-calculation/Penalty.json b/data/as/30126487/ws-services-calculation/Penalty.json
index ba035e5b58..ecbaa8ced8 100644
--- a/data/as/30126487/ws-services-calculation/Penalty.json
+++ b/data/as/30126487/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126487/ws-services-calculation/WCBillingSlab.json b/data/as/30126487/ws-services-calculation/WCBillingSlab.json
index 3ddab7e83c..67c131c0c6 100644
--- a/data/as/30126487/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126487/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126496/ws-services-calculation/Penalty.json b/data/as/30126496/ws-services-calculation/Penalty.json
index e5cfa03967..5770e21cac 100644
--- a/data/as/30126496/ws-services-calculation/Penalty.json
+++ b/data/as/30126496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126496/ws-services-calculation/WCBillingSlab.json b/data/as/30126496/ws-services-calculation/WCBillingSlab.json
index adf41acb5a..9ac2ff62e7 100644
--- a/data/as/30126496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126500/ws-services-calculation/Penalty.json b/data/as/30126500/ws-services-calculation/Penalty.json
index 23e9010a6b..0da28e24bd 100644
--- a/data/as/30126500/ws-services-calculation/Penalty.json
+++ b/data/as/30126500/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126500/ws-services-calculation/WCBillingSlab.json b/data/as/30126500/ws-services-calculation/WCBillingSlab.json
index a586a5d0aa..4a589a71f1 100644
--- a/data/as/30126500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126500/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126582/ws-services-calculation/Penalty.json b/data/as/30126582/ws-services-calculation/Penalty.json
index ebde62cc8c..f9e2d230c0 100644
--- a/data/as/30126582/ws-services-calculation/Penalty.json
+++ b/data/as/30126582/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126582/ws-services-calculation/WCBillingSlab.json b/data/as/30126582/ws-services-calculation/WCBillingSlab.json
index 890ba62881..0df2348b5c 100644
--- a/data/as/30126582/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126582/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30126590/ws-services-calculation/Penalty.json b/data/as/30126590/ws-services-calculation/Penalty.json
index 56bca7efec..b5b7f80086 100644
--- a/data/as/30126590/ws-services-calculation/Penalty.json
+++ b/data/as/30126590/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126590/ws-services-calculation/WCBillingSlab.json b/data/as/30126590/ws-services-calculation/WCBillingSlab.json
index 87b832076d..505784fa8a 100644
--- a/data/as/30126590/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126590/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30127284/ws-services-calculation/Penalty.json b/data/as/30127284/ws-services-calculation/Penalty.json
index 06c1ebada6..6ad2965229 100644
--- a/data/as/30127284/ws-services-calculation/Penalty.json
+++ b/data/as/30127284/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127284/ws-services-calculation/WCBillingSlab.json b/data/as/30127284/ws-services-calculation/WCBillingSlab.json
index aa28ed29f5..431d2ec0ac 100644
--- a/data/as/30127284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127284/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30127356/ws-services-calculation/Penalty.json b/data/as/30127356/ws-services-calculation/Penalty.json
index e3ed17c1a8..8e127192e5 100644
--- a/data/as/30127356/ws-services-calculation/Penalty.json
+++ b/data/as/30127356/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127356/ws-services-calculation/WCBillingSlab.json b/data/as/30127356/ws-services-calculation/WCBillingSlab.json
index b9fd8ef167..867687ffc0 100644
--- a/data/as/30127356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127356/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30127370/ws-services-calculation/Penalty.json b/data/as/30127370/ws-services-calculation/Penalty.json
index 869d698724..22fb5022bc 100644
--- a/data/as/30127370/ws-services-calculation/Penalty.json
+++ b/data/as/30127370/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127370/ws-services-calculation/WCBillingSlab.json b/data/as/30127370/ws-services-calculation/WCBillingSlab.json
index 9959c30e3b..67cf6ceb2b 100644
--- a/data/as/30127370/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127370/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30127414/ws-services-calculation/Penalty.json b/data/as/30127414/ws-services-calculation/Penalty.json
index 3330907404..c74c18c2d1 100644
--- a/data/as/30127414/ws-services-calculation/Penalty.json
+++ b/data/as/30127414/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127414/ws-services-calculation/WCBillingSlab.json b/data/as/30127414/ws-services-calculation/WCBillingSlab.json
index 990519643d..062e8c44db 100644
--- a/data/as/30127414/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127414/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30128175/ws-services-calculation/Penalty.json b/data/as/30128175/ws-services-calculation/Penalty.json
index 4b53cbb84b..344f8b93cb 100644
--- a/data/as/30128175/ws-services-calculation/Penalty.json
+++ b/data/as/30128175/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128175/ws-services-calculation/WCBillingSlab.json b/data/as/30128175/ws-services-calculation/WCBillingSlab.json
index 23bceda46d..e727e80a6d 100644
--- a/data/as/30128175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128175/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30128194/ws-services-calculation/Penalty.json b/data/as/30128194/ws-services-calculation/Penalty.json
index 64ef61a503..8aec8d35d4 100644
--- a/data/as/30128194/ws-services-calculation/Penalty.json
+++ b/data/as/30128194/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128194/ws-services-calculation/WCBillingSlab.json b/data/as/30128194/ws-services-calculation/WCBillingSlab.json
index 23598bfd32..71fc8cabcb 100644
--- a/data/as/30128194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128194/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30128549/ws-services-calculation/Penalty.json b/data/as/30128549/ws-services-calculation/Penalty.json
index faca6addbd..b4ee5066a6 100644
--- a/data/as/30128549/ws-services-calculation/Penalty.json
+++ b/data/as/30128549/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128549/ws-services-calculation/WCBillingSlab.json b/data/as/30128549/ws-services-calculation/WCBillingSlab.json
index 7c1896d473..3e10e9f5b0 100644
--- a/data/as/30128549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128549/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30128554/ws-services-calculation/Penalty.json b/data/as/30128554/ws-services-calculation/Penalty.json
index 89331e1c20..d5de440c09 100644
--- a/data/as/30128554/ws-services-calculation/Penalty.json
+++ b/data/as/30128554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128554/ws-services-calculation/WCBillingSlab.json b/data/as/30128554/ws-services-calculation/WCBillingSlab.json
index 63e9f03df9..2cd86ff325 100644
--- a/data/as/30128554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30128895/ws-services-calculation/Penalty.json b/data/as/30128895/ws-services-calculation/Penalty.json
index ad5fc012f7..ebda880509 100644
--- a/data/as/30128895/ws-services-calculation/Penalty.json
+++ b/data/as/30128895/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128895/ws-services-calculation/WCBillingSlab.json b/data/as/30128895/ws-services-calculation/WCBillingSlab.json
index eb2754a1fe..c1ab4ccae8 100644
--- a/data/as/30128895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128895/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30128902/ws-services-calculation/Penalty.json b/data/as/30128902/ws-services-calculation/Penalty.json
index 091e516181..69f3f60dd7 100644
--- a/data/as/30128902/ws-services-calculation/Penalty.json
+++ b/data/as/30128902/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128902/ws-services-calculation/WCBillingSlab.json b/data/as/30128902/ws-services-calculation/WCBillingSlab.json
index aac94084e9..df42a0964d 100644
--- a/data/as/30128902/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128902/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30129324/ws-services-calculation/Penalty.json b/data/as/30129324/ws-services-calculation/Penalty.json
index 466898c875..6269fee27f 100644
--- a/data/as/30129324/ws-services-calculation/Penalty.json
+++ b/data/as/30129324/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129324/ws-services-calculation/WCBillingSlab.json b/data/as/30129324/ws-services-calculation/WCBillingSlab.json
index 9e013b68ba..ff1d6624f6 100644
--- a/data/as/30129324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129324/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30129329/ws-services-calculation/Penalty.json b/data/as/30129329/ws-services-calculation/Penalty.json
index 62dc0b2219..659afbe494 100644
--- a/data/as/30129329/ws-services-calculation/Penalty.json
+++ b/data/as/30129329/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129329/ws-services-calculation/WCBillingSlab.json b/data/as/30129329/ws-services-calculation/WCBillingSlab.json
index 9d22617099..f89534c86c 100644
--- a/data/as/30129329/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129329/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30129382/ws-services-calculation/Penalty.json b/data/as/30129382/ws-services-calculation/Penalty.json
index 535bf738ae..128a79e708 100644
--- a/data/as/30129382/ws-services-calculation/Penalty.json
+++ b/data/as/30129382/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129382/ws-services-calculation/WCBillingSlab.json b/data/as/30129382/ws-services-calculation/WCBillingSlab.json
index c6972e8811..2c6397d213 100644
--- a/data/as/30129382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129382/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30129385/ws-services-calculation/Penalty.json b/data/as/30129385/ws-services-calculation/Penalty.json
index a5abef84fa..b9c89d92c9 100644
--- a/data/as/30129385/ws-services-calculation/Penalty.json
+++ b/data/as/30129385/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129385/ws-services-calculation/WCBillingSlab.json b/data/as/30129385/ws-services-calculation/WCBillingSlab.json
index 10bedb0b7a..47a1c1b0b0 100644
--- a/data/as/30129385/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129385/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30129475/ws-services-calculation/Penalty.json b/data/as/30129475/ws-services-calculation/Penalty.json
index 65af461f74..18cb5aadf1 100644
--- a/data/as/30129475/ws-services-calculation/Penalty.json
+++ b/data/as/30129475/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129475/ws-services-calculation/WCBillingSlab.json b/data/as/30129475/ws-services-calculation/WCBillingSlab.json
index 46e8a6bc60..9593c3fde4 100644
--- a/data/as/30129475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129475/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30129479/ws-services-calculation/Penalty.json b/data/as/30129479/ws-services-calculation/Penalty.json
index fe60a39eb0..94dfde7f27 100644
--- a/data/as/30129479/ws-services-calculation/Penalty.json
+++ b/data/as/30129479/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129479/ws-services-calculation/WCBillingSlab.json b/data/as/30129479/ws-services-calculation/WCBillingSlab.json
index bed27fa85d..2c28a7548e 100644
--- a/data/as/30129479/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129479/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30130374/ws-services-calculation/Penalty.json b/data/as/30130374/ws-services-calculation/Penalty.json
index 32f5c2f0ca..34caf83f48 100644
--- a/data/as/30130374/ws-services-calculation/Penalty.json
+++ b/data/as/30130374/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130374/ws-services-calculation/WCBillingSlab.json b/data/as/30130374/ws-services-calculation/WCBillingSlab.json
index 2118949587..c7ba61eda9 100644
--- a/data/as/30130374/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130374/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30130381/ws-services-calculation/Penalty.json b/data/as/30130381/ws-services-calculation/Penalty.json
index e525071daa..2551dd87f8 100644
--- a/data/as/30130381/ws-services-calculation/Penalty.json
+++ b/data/as/30130381/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130381/ws-services-calculation/WCBillingSlab.json b/data/as/30130381/ws-services-calculation/WCBillingSlab.json
index 02e405275a..18f9aa0f83 100644
--- a/data/as/30130381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130381/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30130399/ws-services-calculation/Penalty.json b/data/as/30130399/ws-services-calculation/Penalty.json
index c8370e3cd9..e99301dd5c 100644
--- a/data/as/30130399/ws-services-calculation/Penalty.json
+++ b/data/as/30130399/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130399/ws-services-calculation/WCBillingSlab.json b/data/as/30130399/ws-services-calculation/WCBillingSlab.json
index e7a7f42679..c14d2b6737 100644
--- a/data/as/30130399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130399/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30130411/ws-services-calculation/Penalty.json b/data/as/30130411/ws-services-calculation/Penalty.json
index 3136a1d7a4..f39b4413ba 100644
--- a/data/as/30130411/ws-services-calculation/Penalty.json
+++ b/data/as/30130411/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130411/ws-services-calculation/WCBillingSlab.json b/data/as/30130411/ws-services-calculation/WCBillingSlab.json
index 587dc26439..19bf21cb2f 100644
--- a/data/as/30130411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130411/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30130420/ws-services-calculation/Penalty.json b/data/as/30130420/ws-services-calculation/Penalty.json
index 1f0b848c89..df16e5e518 100644
--- a/data/as/30130420/ws-services-calculation/Penalty.json
+++ b/data/as/30130420/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130420/ws-services-calculation/WCBillingSlab.json b/data/as/30130420/ws-services-calculation/WCBillingSlab.json
index 2536e8a12d..61d4377b00 100644
--- a/data/as/30130420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130420/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30130435/ws-services-calculation/Penalty.json b/data/as/30130435/ws-services-calculation/Penalty.json
index 021b6c11ca..c59eb69055 100644
--- a/data/as/30130435/ws-services-calculation/Penalty.json
+++ b/data/as/30130435/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130435/ws-services-calculation/WCBillingSlab.json b/data/as/30130435/ws-services-calculation/WCBillingSlab.json
index 1a2777d446..6e3756c68c 100644
--- a/data/as/30130435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130435/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132498/ws-services-calculation/Penalty.json b/data/as/30132498/ws-services-calculation/Penalty.json
index dea30d4a82..8818bcfac1 100644
--- a/data/as/30132498/ws-services-calculation/Penalty.json
+++ b/data/as/30132498/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132498/ws-services-calculation/WCBillingSlab.json b/data/as/30132498/ws-services-calculation/WCBillingSlab.json
index c1cdf3f098..42a72fc3a4 100644
--- a/data/as/30132498/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132498/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132532/ws-services-calculation/Penalty.json b/data/as/30132532/ws-services-calculation/Penalty.json
index dcf2a2c5fc..7a74def36e 100644
--- a/data/as/30132532/ws-services-calculation/Penalty.json
+++ b/data/as/30132532/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132532/ws-services-calculation/WCBillingSlab.json b/data/as/30132532/ws-services-calculation/WCBillingSlab.json
index 32fa6d2015..820ad810cc 100644
--- a/data/as/30132532/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132532/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132548/ws-services-calculation/Penalty.json b/data/as/30132548/ws-services-calculation/Penalty.json
index 2389c56b00..cd62f941a5 100644
--- a/data/as/30132548/ws-services-calculation/Penalty.json
+++ b/data/as/30132548/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132548/ws-services-calculation/WCBillingSlab.json b/data/as/30132548/ws-services-calculation/WCBillingSlab.json
index fcabb7d0f8..3c057386f7 100644
--- a/data/as/30132548/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132548/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132559/ws-services-calculation/Penalty.json b/data/as/30132559/ws-services-calculation/Penalty.json
index d169a9c24b..95640bae1e 100644
--- a/data/as/30132559/ws-services-calculation/Penalty.json
+++ b/data/as/30132559/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132559/ws-services-calculation/WCBillingSlab.json b/data/as/30132559/ws-services-calculation/WCBillingSlab.json
index 60c2fde82b..e80030ac9a 100644
--- a/data/as/30132559/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132559/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132588/ws-services-calculation/Penalty.json b/data/as/30132588/ws-services-calculation/Penalty.json
index 2659ccec45..ef2b41e28c 100644
--- a/data/as/30132588/ws-services-calculation/Penalty.json
+++ b/data/as/30132588/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132588/ws-services-calculation/WCBillingSlab.json b/data/as/30132588/ws-services-calculation/WCBillingSlab.json
index 92bdf0e1ca..083ac949c2 100644
--- a/data/as/30132588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132588/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132620/ws-services-calculation/Penalty.json b/data/as/30132620/ws-services-calculation/Penalty.json
index e30b42133c..f442740aa7 100644
--- a/data/as/30132620/ws-services-calculation/Penalty.json
+++ b/data/as/30132620/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132620/ws-services-calculation/WCBillingSlab.json b/data/as/30132620/ws-services-calculation/WCBillingSlab.json
index 0b58bcc99c..9ffc12cb80 100644
--- a/data/as/30132620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132620/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132648/ws-services-calculation/Penalty.json b/data/as/30132648/ws-services-calculation/Penalty.json
index 4263e973a5..8b2cf8d7a2 100644
--- a/data/as/30132648/ws-services-calculation/Penalty.json
+++ b/data/as/30132648/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132648/ws-services-calculation/WCBillingSlab.json b/data/as/30132648/ws-services-calculation/WCBillingSlab.json
index bce8cb68b0..582669c9d4 100644
--- a/data/as/30132648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132648/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132661/ws-services-calculation/Penalty.json b/data/as/30132661/ws-services-calculation/Penalty.json
index 49a6eab744..7b043462be 100644
--- a/data/as/30132661/ws-services-calculation/Penalty.json
+++ b/data/as/30132661/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132661/ws-services-calculation/WCBillingSlab.json b/data/as/30132661/ws-services-calculation/WCBillingSlab.json
index 6be67c594b..79bf0a02ad 100644
--- a/data/as/30132661/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132661/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30132799/ws-services-calculation/Penalty.json b/data/as/30132799/ws-services-calculation/Penalty.json
index f99baf5eea..7eb9024ae1 100644
--- a/data/as/30132799/ws-services-calculation/Penalty.json
+++ b/data/as/30132799/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132799/ws-services-calculation/WCBillingSlab.json b/data/as/30132799/ws-services-calculation/WCBillingSlab.json
index e149113227..4820cb76ec 100644
--- a/data/as/30132799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132799/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30137902/ws-services-calculation/Penalty.json b/data/as/30137902/ws-services-calculation/Penalty.json
index 4ef3058aa7..75565692f1 100644
--- a/data/as/30137902/ws-services-calculation/Penalty.json
+++ b/data/as/30137902/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137902/ws-services-calculation/WCBillingSlab.json b/data/as/30137902/ws-services-calculation/WCBillingSlab.json
index af7364efdc..9f328354c7 100644
--- a/data/as/30137902/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137902/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30137931/ws-services-calculation/Penalty.json b/data/as/30137931/ws-services-calculation/Penalty.json
index 8fdd868653..b7bb84579e 100644
--- a/data/as/30137931/ws-services-calculation/Penalty.json
+++ b/data/as/30137931/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137931/ws-services-calculation/WCBillingSlab.json b/data/as/30137931/ws-services-calculation/WCBillingSlab.json
index 4e34988f80..3f32edcb52 100644
--- a/data/as/30137931/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137931/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30137946/ws-services-calculation/Penalty.json b/data/as/30137946/ws-services-calculation/Penalty.json
index 16744f6554..db18705b45 100644
--- a/data/as/30137946/ws-services-calculation/Penalty.json
+++ b/data/as/30137946/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137946/ws-services-calculation/WCBillingSlab.json b/data/as/30137946/ws-services-calculation/WCBillingSlab.json
index b39bec3603..24cf7b81d6 100644
--- a/data/as/30137946/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137946/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30137988/ws-services-calculation/Penalty.json b/data/as/30137988/ws-services-calculation/Penalty.json
index 5ea19ab7f2..393131d52d 100644
--- a/data/as/30137988/ws-services-calculation/Penalty.json
+++ b/data/as/30137988/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137988/ws-services-calculation/WCBillingSlab.json b/data/as/30137988/ws-services-calculation/WCBillingSlab.json
index df1532b5a1..aff1d928ee 100644
--- a/data/as/30137988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137988/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30138003/ws-services-calculation/Penalty.json b/data/as/30138003/ws-services-calculation/Penalty.json
index 46f5d13c57..655aae550a 100644
--- a/data/as/30138003/ws-services-calculation/Penalty.json
+++ b/data/as/30138003/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30138003/ws-services-calculation/WCBillingSlab.json b/data/as/30138003/ws-services-calculation/WCBillingSlab.json
index a682e3a5ef..7a5df5e5b8 100644
--- a/data/as/30138003/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30138003/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30138012/ws-services-calculation/Penalty.json b/data/as/30138012/ws-services-calculation/Penalty.json
index 419a10c884..797cd6ed54 100644
--- a/data/as/30138012/ws-services-calculation/Penalty.json
+++ b/data/as/30138012/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30138012/ws-services-calculation/WCBillingSlab.json b/data/as/30138012/ws-services-calculation/WCBillingSlab.json
index ecbee17dd6..b01ea69068 100644
--- a/data/as/30138012/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30138012/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30138032/ws-services-calculation/Penalty.json b/data/as/30138032/ws-services-calculation/Penalty.json
index 5b3663873e..6ec551136a 100644
--- a/data/as/30138032/ws-services-calculation/Penalty.json
+++ b/data/as/30138032/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30138032/ws-services-calculation/WCBillingSlab.json b/data/as/30138032/ws-services-calculation/WCBillingSlab.json
index 1641827e1f..3bcfaa7ddd 100644
--- a/data/as/30138032/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30138032/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30139203/ws-services-calculation/Penalty.json b/data/as/30139203/ws-services-calculation/Penalty.json
index 612965d459..ffed592725 100644
--- a/data/as/30139203/ws-services-calculation/Penalty.json
+++ b/data/as/30139203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30139203/ws-services-calculation/WCBillingSlab.json b/data/as/30139203/ws-services-calculation/WCBillingSlab.json
index 5f28bdfd94..cda1a6bf1b 100644
--- a/data/as/30139203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30139203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30139213/ws-services-calculation/Penalty.json b/data/as/30139213/ws-services-calculation/Penalty.json
index 69c6e01344..4d231f4a80 100644
--- a/data/as/30139213/ws-services-calculation/Penalty.json
+++ b/data/as/30139213/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30139213/ws-services-calculation/WCBillingSlab.json b/data/as/30139213/ws-services-calculation/WCBillingSlab.json
index fdbc2fd1df..2b8125ce26 100644
--- a/data/as/30139213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30139213/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140232/ws-services-calculation/Penalty.json b/data/as/30140232/ws-services-calculation/Penalty.json
index 2d95aa65e3..d7c02130f1 100644
--- a/data/as/30140232/ws-services-calculation/Penalty.json
+++ b/data/as/30140232/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140232/ws-services-calculation/WCBillingSlab.json b/data/as/30140232/ws-services-calculation/WCBillingSlab.json
index 3ce8e4f024..fa262266a4 100644
--- a/data/as/30140232/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140232/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140242/ws-services-calculation/Penalty.json b/data/as/30140242/ws-services-calculation/Penalty.json
index 2b0c8bdfd2..eb9425fdba 100644
--- a/data/as/30140242/ws-services-calculation/Penalty.json
+++ b/data/as/30140242/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140242/ws-services-calculation/WCBillingSlab.json b/data/as/30140242/ws-services-calculation/WCBillingSlab.json
index 29f9ef38e7..1fa52874ff 100644
--- a/data/as/30140242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140242/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140254/ws-services-calculation/Penalty.json b/data/as/30140254/ws-services-calculation/Penalty.json
index 27a845dc89..42a8a7591f 100644
--- a/data/as/30140254/ws-services-calculation/Penalty.json
+++ b/data/as/30140254/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140254/ws-services-calculation/WCBillingSlab.json b/data/as/30140254/ws-services-calculation/WCBillingSlab.json
index 4af49de8de..069eb6857f 100644
--- a/data/as/30140254/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140254/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140608/ws-services-calculation/Penalty.json b/data/as/30140608/ws-services-calculation/Penalty.json
index cfd533fc0d..f75a5f0759 100644
--- a/data/as/30140608/ws-services-calculation/Penalty.json
+++ b/data/as/30140608/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140608/ws-services-calculation/WCBillingSlab.json b/data/as/30140608/ws-services-calculation/WCBillingSlab.json
index fc593bfdd7..0757c6f663 100644
--- a/data/as/30140608/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140608/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140613/ws-services-calculation/Penalty.json b/data/as/30140613/ws-services-calculation/Penalty.json
index 5bb278dab0..0042e970dc 100644
--- a/data/as/30140613/ws-services-calculation/Penalty.json
+++ b/data/as/30140613/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140613/ws-services-calculation/WCBillingSlab.json b/data/as/30140613/ws-services-calculation/WCBillingSlab.json
index 744c2f8559..e121cf4199 100644
--- a/data/as/30140613/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140613/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140620/ws-services-calculation/Penalty.json b/data/as/30140620/ws-services-calculation/Penalty.json
index dfd440df6b..581fefa65d 100644
--- a/data/as/30140620/ws-services-calculation/Penalty.json
+++ b/data/as/30140620/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140620/ws-services-calculation/WCBillingSlab.json b/data/as/30140620/ws-services-calculation/WCBillingSlab.json
index 2cd28789ce..bb7416fd6f 100644
--- a/data/as/30140620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140620/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30140642/ws-services-calculation/Penalty.json b/data/as/30140642/ws-services-calculation/Penalty.json
index 3aec22dadc..6e6b60bcb9 100644
--- a/data/as/30140642/ws-services-calculation/Penalty.json
+++ b/data/as/30140642/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140642/ws-services-calculation/WCBillingSlab.json b/data/as/30140642/ws-services-calculation/WCBillingSlab.json
index 25e38a7a37..8d70a4f98b 100644
--- a/data/as/30140642/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140642/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30141038/ws-services-calculation/Penalty.json b/data/as/30141038/ws-services-calculation/Penalty.json
index 4c01891c21..71630b8322 100644
--- a/data/as/30141038/ws-services-calculation/Penalty.json
+++ b/data/as/30141038/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30141038/ws-services-calculation/WCBillingSlab.json b/data/as/30141038/ws-services-calculation/WCBillingSlab.json
index 5b3f54a016..e6a34bb55e 100644
--- a/data/as/30141038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30141038/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30141193/ws-services-calculation/Penalty.json b/data/as/30141193/ws-services-calculation/Penalty.json
index db29becbad..48576808ab 100644
--- a/data/as/30141193/ws-services-calculation/Penalty.json
+++ b/data/as/30141193/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30141193/ws-services-calculation/WCBillingSlab.json b/data/as/30141193/ws-services-calculation/WCBillingSlab.json
index ac79e8b9b9..ab82246658 100644
--- a/data/as/30141193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30141193/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30141195/ws-services-calculation/Penalty.json b/data/as/30141195/ws-services-calculation/Penalty.json
index f16f988567..14740f430e 100644
--- a/data/as/30141195/ws-services-calculation/Penalty.json
+++ b/data/as/30141195/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30141195/ws-services-calculation/WCBillingSlab.json b/data/as/30141195/ws-services-calculation/WCBillingSlab.json
index a624770a05..14cd988c33 100644
--- a/data/as/30141195/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30141195/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143283/ws-services-calculation/Penalty.json b/data/as/30143283/ws-services-calculation/Penalty.json
index c5921a52f7..2e78448766 100644
--- a/data/as/30143283/ws-services-calculation/Penalty.json
+++ b/data/as/30143283/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143283/ws-services-calculation/WCBillingSlab.json b/data/as/30143283/ws-services-calculation/WCBillingSlab.json
index 09050d4f5b..1e52266390 100644
--- a/data/as/30143283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143283/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143295/ws-services-calculation/Penalty.json b/data/as/30143295/ws-services-calculation/Penalty.json
index bd2fa0f34c..08fc83b1a7 100644
--- a/data/as/30143295/ws-services-calculation/Penalty.json
+++ b/data/as/30143295/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143295/ws-services-calculation/WCBillingSlab.json b/data/as/30143295/ws-services-calculation/WCBillingSlab.json
index 78ca326ca8..f7f14fccc9 100644
--- a/data/as/30143295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143295/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143305/ws-services-calculation/Penalty.json b/data/as/30143305/ws-services-calculation/Penalty.json
index 648cfd897a..01f4da42c3 100644
--- a/data/as/30143305/ws-services-calculation/Penalty.json
+++ b/data/as/30143305/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143305/ws-services-calculation/WCBillingSlab.json b/data/as/30143305/ws-services-calculation/WCBillingSlab.json
index 83d99ea12e..723546cba4 100644
--- a/data/as/30143305/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143305/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From 7806fe0bb4f5d87d3b728296288537e5ab8da2f4 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 16:07:52 +0530
Subject: [PATCH 15/23] Updated others one

---
 data/as/30143323/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143323/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143328/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143328/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143504/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143504/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143512/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143512/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30143523/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30143523/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30144955/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30144955/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30145080/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30145080/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30146239/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30146239/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30146477/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30146477/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30146517/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30146517/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30146665/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30146665/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30148255/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30148255/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30148279/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30148279/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30148838/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30148838/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30148938/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30148938/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30148954/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30148954/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30149001/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30149001/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30149016/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30149016/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30149044/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30149044/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30149093/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30149093/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30149113/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30149113/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150209/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150209/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150213/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150213/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150234/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150234/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150700/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150700/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150737/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150737/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150785/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150785/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150803/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150803/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30150834/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30150834/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158066/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158066/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158126/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158126/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158312/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158312/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158662/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158662/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158694/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158694/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158752/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158752/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30158825/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30158825/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30159298/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30159298/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30159329/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30159329/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30163627/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30163627/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30163652/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30163652/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30163717/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30163717/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166511/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166511/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166533/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166533/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166583/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166583/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166670/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166670/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166762/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166762/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30166822/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30166822/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167065/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167065/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167107/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167107/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167121/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167121/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167130/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167130/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167292/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167292/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167319/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167319/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167381/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167381/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167391/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167391/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167408/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167408/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167439/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167439/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167463/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167463/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167486/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167486/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30167823/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30167823/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169470/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169470/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169472/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169472/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169516/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169516/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169525/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169525/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169537/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169537/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169560/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169560/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169583/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169583/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169600/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169600/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169629/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169629/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169643/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169643/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169657/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169657/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169665/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169665/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169790/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169790/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169802/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169802/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169825/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169825/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30169988/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30169988/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170226/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170226/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170237/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170237/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170249/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170249/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170262/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170262/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170419/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170419/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170429/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170429/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170784/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170784/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170810/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170810/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30170948/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30170948/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30171030/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30171030/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172407/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172407/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172409/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172409/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172412/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172412/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172420/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172420/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172437/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172437/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172442/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172442/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172452/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172452/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172456/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172456/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172473/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172473/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172482/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172482/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172498/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172498/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172503/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172503/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172507/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172507/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172509/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172509/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172538/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172538/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172543/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172543/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30172573/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30172573/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173072/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173072/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173097/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173097/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173162/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173162/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173172/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173172/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173251/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173251/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173284/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173284/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173317/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173317/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173387/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173387/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173395/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173395/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173400/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173400/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173409/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173409/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173419/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173419/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173427/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173427/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173442/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173442/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173455/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173455/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173471/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173471/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173509/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173509/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173535/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173535/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173679/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173679/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173688/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173688/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173698/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173698/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173710/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173710/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173740/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173740/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173753/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173753/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173770/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173770/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173782/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173782/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173794/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173794/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173812/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173812/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173814/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173814/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173816/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173816/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173961/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173961/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173962/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173962/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173963/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173963/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173965/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173965/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173967/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173967/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173972/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173972/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173973/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173973/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173975/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173975/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173977/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173977/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173978/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173978/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173979/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173979/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173980/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173980/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173981/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173981/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173982/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173982/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173983/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173983/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30173984/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30173984/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174052/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174052/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174053/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174053/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174055/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174055/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174058/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174058/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174059/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174059/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174062/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174062/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174064/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174064/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174065/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174065/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174068/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174068/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174070/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174070/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174072/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174072/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174082/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174082/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174085/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174085/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174088/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174088/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174094/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174094/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174097/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174097/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174123/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174123/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174125/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174125/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174133/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174133/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174139/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174139/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174143/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174143/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174150/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174150/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174158/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174158/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174165/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174165/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174178/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174178/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174186/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174186/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174190/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174190/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174199/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174199/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174210/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174210/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174211/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174211/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174222/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174222/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174241/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174241/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174244/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174244/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174291/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174291/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174314/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174314/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174344/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174344/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174357/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174357/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174375/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174375/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174407/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174407/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174416/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174416/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174419/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174419/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174439/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174439/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174442/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174442/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174454/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174454/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174538/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174538/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174541/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174541/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174546/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174546/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174562/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174562/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174577/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174577/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174593/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174593/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174610/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174610/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174622/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174622/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174633/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174633/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174651/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174651/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174677/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174677/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174688/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174688/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174694/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174694/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174699/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174699/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174700/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174700/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174721/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174721/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174729/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174729/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174732/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174732/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174740/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174740/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174745/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174745/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174747/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174747/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174796/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174796/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174826/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174826/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174847/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174847/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174854/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174854/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174863/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174863/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174870/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174870/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174887/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174887/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174894/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174894/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174961/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174961/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30174977/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30174977/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175021/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175021/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175053/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175053/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175075/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175075/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175155/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175155/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175169/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175169/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175190/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175190/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175203/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175203/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175204/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175204/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175213/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175213/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175228/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175228/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175239/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175239/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175264/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175264/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175272/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175272/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175295/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175295/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175334/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175334/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175367/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175367/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175392/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175392/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175425/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175425/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175446/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175446/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175464/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175464/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175466/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175466/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175474/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175474/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175490/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175490/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175493/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175493/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175539/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175539/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175554/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175554/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175648/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175648/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175668/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175668/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175691/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175691/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175708/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175708/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175727/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175727/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175767/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175767/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175783/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175783/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175784/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175784/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175795/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175795/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175807/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175807/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175812/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175812/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175821/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175821/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175827/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175827/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175831/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175831/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175853/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175853/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175854/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175854/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175867/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175867/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175876/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175876/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175883/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175883/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175888/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175888/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175891/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175891/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175904/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175904/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175917/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175917/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30175983/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30175983/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176038/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176038/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176114/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176114/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176117/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176117/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176156/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176156/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176170/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176170/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176178/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176178/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176209/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176209/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176222/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176222/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176252/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176252/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176279/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176279/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176310/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176310/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176350/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176350/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176394/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176394/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176403/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176403/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176503/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176503/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176512/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176512/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176517/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176517/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176525/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176525/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176539/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176539/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176552/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176552/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176563/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176563/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176575/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176575/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176589/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176589/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176605/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176605/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176670/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176670/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176673/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176673/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176676/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176676/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176679/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176679/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176683/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176683/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176709/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176709/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176714/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176714/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176720/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176720/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30176756/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30176756/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177227/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177227/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177242/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177242/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177275/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177275/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177297/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177297/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177314/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177314/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177334/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177334/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177375/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177375/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177874/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177874/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177929/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177929/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177971/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177971/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30177999/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30177999/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178023/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178023/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178056/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178056/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178092/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178092/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178124/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178124/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178175/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178175/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178287/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178287/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178310/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178310/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178331/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178331/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178371/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178371/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178397/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178397/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178423/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178423/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178440/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178440/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178942/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178942/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30178977/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30178977/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179000/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179000/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179124/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179124/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179165/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179165/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179209/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179209/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179232/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179232/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179397/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179397/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179439/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179439/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179473/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179473/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179510/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179510/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179533/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179533/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179578/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179578/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179689/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179689/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179724/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179724/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179767/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179767/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179793/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179793/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179802/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179802/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179808/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179808/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179812/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179812/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179815/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179815/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30179821/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30179821/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180631/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180631/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180654/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180654/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180663/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180663/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180675/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180675/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180698/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180698/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180724/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180724/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180855/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180855/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180870/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180870/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180952/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180952/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30180965/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30180965/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181077/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181077/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181091/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181091/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181099/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181099/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181126/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181126/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181144/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181144/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181145/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181145/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181168/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181168/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181188/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181188/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181246/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181246/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181257/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181257/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181268/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181268/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181293/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181293/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181327/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181327/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181400/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181400/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181411/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181411/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181434/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181434/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181444/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181444/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181457/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181457/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181562/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181562/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181575/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181575/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181597/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181597/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181604/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181604/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181615/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181615/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181621/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181621/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181628/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181628/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181639/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181639/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181769/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181769/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181824/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181824/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181850/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181850/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181892/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181892/ws-services-calculation/WCBillingSlab.json | 4 ++--
 800 files changed, 1200 insertions(+), 1200 deletions(-)

diff --git a/data/as/30143323/ws-services-calculation/Penalty.json b/data/as/30143323/ws-services-calculation/Penalty.json
index 31be140926..a18fd9075a 100644
--- a/data/as/30143323/ws-services-calculation/Penalty.json
+++ b/data/as/30143323/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143323/ws-services-calculation/WCBillingSlab.json b/data/as/30143323/ws-services-calculation/WCBillingSlab.json
index fba3fba0ce..f2a2583749 100644
--- a/data/as/30143323/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143323/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143328/ws-services-calculation/Penalty.json b/data/as/30143328/ws-services-calculation/Penalty.json
index dc35cf89cc..3dd60fd363 100644
--- a/data/as/30143328/ws-services-calculation/Penalty.json
+++ b/data/as/30143328/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143328/ws-services-calculation/WCBillingSlab.json b/data/as/30143328/ws-services-calculation/WCBillingSlab.json
index c7689a6702..d3cc9908d7 100644
--- a/data/as/30143328/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143328/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143496/ws-services-calculation/Penalty.json b/data/as/30143496/ws-services-calculation/Penalty.json
index d8aa2d4f4e..74e315ab83 100644
--- a/data/as/30143496/ws-services-calculation/Penalty.json
+++ b/data/as/30143496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143496/ws-services-calculation/WCBillingSlab.json b/data/as/30143496/ws-services-calculation/WCBillingSlab.json
index bbeda3a5d0..6854a9b7cb 100644
--- a/data/as/30143496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143504/ws-services-calculation/Penalty.json b/data/as/30143504/ws-services-calculation/Penalty.json
index 5f324db9e5..0a4bbf4f56 100644
--- a/data/as/30143504/ws-services-calculation/Penalty.json
+++ b/data/as/30143504/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143504/ws-services-calculation/WCBillingSlab.json b/data/as/30143504/ws-services-calculation/WCBillingSlab.json
index 13baee1daa..529a220659 100644
--- a/data/as/30143504/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143504/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143512/ws-services-calculation/Penalty.json b/data/as/30143512/ws-services-calculation/Penalty.json
index 8d5be471c6..101ccdda07 100644
--- a/data/as/30143512/ws-services-calculation/Penalty.json
+++ b/data/as/30143512/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143512/ws-services-calculation/WCBillingSlab.json b/data/as/30143512/ws-services-calculation/WCBillingSlab.json
index e3ddc215b0..996b434335 100644
--- a/data/as/30143512/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143512/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30143523/ws-services-calculation/Penalty.json b/data/as/30143523/ws-services-calculation/Penalty.json
index 8eb1a2e20f..8d007b1b4c 100644
--- a/data/as/30143523/ws-services-calculation/Penalty.json
+++ b/data/as/30143523/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143523/ws-services-calculation/WCBillingSlab.json b/data/as/30143523/ws-services-calculation/WCBillingSlab.json
index daed467edf..167d520c59 100644
--- a/data/as/30143523/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143523/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30144955/ws-services-calculation/Penalty.json b/data/as/30144955/ws-services-calculation/Penalty.json
index cc4f9a075d..58052f3ad8 100644
--- a/data/as/30144955/ws-services-calculation/Penalty.json
+++ b/data/as/30144955/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30144955/ws-services-calculation/WCBillingSlab.json b/data/as/30144955/ws-services-calculation/WCBillingSlab.json
index f35b425b0d..cb3760d8e9 100644
--- a/data/as/30144955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30144955/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30145080/ws-services-calculation/Penalty.json b/data/as/30145080/ws-services-calculation/Penalty.json
index 8d42e5a7b7..bddd4ff721 100644
--- a/data/as/30145080/ws-services-calculation/Penalty.json
+++ b/data/as/30145080/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30145080/ws-services-calculation/WCBillingSlab.json b/data/as/30145080/ws-services-calculation/WCBillingSlab.json
index c0184c9fbe..6a89d0d755 100644
--- a/data/as/30145080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30145080/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30146239/ws-services-calculation/Penalty.json b/data/as/30146239/ws-services-calculation/Penalty.json
index c2805a0e56..e34c5becb6 100644
--- a/data/as/30146239/ws-services-calculation/Penalty.json
+++ b/data/as/30146239/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146239/ws-services-calculation/WCBillingSlab.json b/data/as/30146239/ws-services-calculation/WCBillingSlab.json
index 9c043695e4..ca5e48004e 100644
--- a/data/as/30146239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146239/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30146477/ws-services-calculation/Penalty.json b/data/as/30146477/ws-services-calculation/Penalty.json
index 9f86a5b317..65f1ae58ab 100644
--- a/data/as/30146477/ws-services-calculation/Penalty.json
+++ b/data/as/30146477/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146477/ws-services-calculation/WCBillingSlab.json b/data/as/30146477/ws-services-calculation/WCBillingSlab.json
index 1d309791e8..129939f364 100644
--- a/data/as/30146477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146477/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30146517/ws-services-calculation/Penalty.json b/data/as/30146517/ws-services-calculation/Penalty.json
index b46d9e9a1c..40fd07d53d 100644
--- a/data/as/30146517/ws-services-calculation/Penalty.json
+++ b/data/as/30146517/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146517/ws-services-calculation/WCBillingSlab.json b/data/as/30146517/ws-services-calculation/WCBillingSlab.json
index 54075fcdca..039d325980 100644
--- a/data/as/30146517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146517/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30146665/ws-services-calculation/Penalty.json b/data/as/30146665/ws-services-calculation/Penalty.json
index c247e97ba9..c0b5f109f9 100644
--- a/data/as/30146665/ws-services-calculation/Penalty.json
+++ b/data/as/30146665/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146665/ws-services-calculation/WCBillingSlab.json b/data/as/30146665/ws-services-calculation/WCBillingSlab.json
index 88df3a5dba..f42b1751ad 100644
--- a/data/as/30146665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146665/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30148255/ws-services-calculation/Penalty.json b/data/as/30148255/ws-services-calculation/Penalty.json
index d11250a67e..0ab11e9557 100644
--- a/data/as/30148255/ws-services-calculation/Penalty.json
+++ b/data/as/30148255/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148255/ws-services-calculation/WCBillingSlab.json b/data/as/30148255/ws-services-calculation/WCBillingSlab.json
index 263efa92d8..1b8ec8c5dd 100644
--- a/data/as/30148255/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148255/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30148279/ws-services-calculation/Penalty.json b/data/as/30148279/ws-services-calculation/Penalty.json
index 5b214fb620..9dbf583aca 100644
--- a/data/as/30148279/ws-services-calculation/Penalty.json
+++ b/data/as/30148279/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148279/ws-services-calculation/WCBillingSlab.json b/data/as/30148279/ws-services-calculation/WCBillingSlab.json
index 7dfb4e1535..022aa7930a 100644
--- a/data/as/30148279/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148279/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30148838/ws-services-calculation/Penalty.json b/data/as/30148838/ws-services-calculation/Penalty.json
index bbce67ae5b..6d33e885bf 100644
--- a/data/as/30148838/ws-services-calculation/Penalty.json
+++ b/data/as/30148838/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148838/ws-services-calculation/WCBillingSlab.json b/data/as/30148838/ws-services-calculation/WCBillingSlab.json
index 0fbd034a75..13643b6dee 100644
--- a/data/as/30148838/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148838/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30148938/ws-services-calculation/Penalty.json b/data/as/30148938/ws-services-calculation/Penalty.json
index bd628cbea5..adf68a7813 100644
--- a/data/as/30148938/ws-services-calculation/Penalty.json
+++ b/data/as/30148938/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148938/ws-services-calculation/WCBillingSlab.json b/data/as/30148938/ws-services-calculation/WCBillingSlab.json
index 119b69b69b..9d55cfcb60 100644
--- a/data/as/30148938/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148938/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30148954/ws-services-calculation/Penalty.json b/data/as/30148954/ws-services-calculation/Penalty.json
index f10be9ed20..f018a02526 100644
--- a/data/as/30148954/ws-services-calculation/Penalty.json
+++ b/data/as/30148954/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148954/ws-services-calculation/WCBillingSlab.json b/data/as/30148954/ws-services-calculation/WCBillingSlab.json
index bece3fdd68..ed61df2b47 100644
--- a/data/as/30148954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148954/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30149001/ws-services-calculation/Penalty.json b/data/as/30149001/ws-services-calculation/Penalty.json
index 11f818d939..5fbc266442 100644
--- a/data/as/30149001/ws-services-calculation/Penalty.json
+++ b/data/as/30149001/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149001/ws-services-calculation/WCBillingSlab.json b/data/as/30149001/ws-services-calculation/WCBillingSlab.json
index 6db828d0db..1d67dafa32 100644
--- a/data/as/30149001/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149001/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30149016/ws-services-calculation/Penalty.json b/data/as/30149016/ws-services-calculation/Penalty.json
index 322e020ee2..bf21609492 100644
--- a/data/as/30149016/ws-services-calculation/Penalty.json
+++ b/data/as/30149016/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149016/ws-services-calculation/WCBillingSlab.json b/data/as/30149016/ws-services-calculation/WCBillingSlab.json
index 22ada8195e..5201a4aa04 100644
--- a/data/as/30149016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149016/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30149044/ws-services-calculation/Penalty.json b/data/as/30149044/ws-services-calculation/Penalty.json
index dd9538eede..04a9301e07 100644
--- a/data/as/30149044/ws-services-calculation/Penalty.json
+++ b/data/as/30149044/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149044/ws-services-calculation/WCBillingSlab.json b/data/as/30149044/ws-services-calculation/WCBillingSlab.json
index 825294ea62..690b9d6fcf 100644
--- a/data/as/30149044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149044/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30149093/ws-services-calculation/Penalty.json b/data/as/30149093/ws-services-calculation/Penalty.json
index c87727412c..6b485f4af0 100644
--- a/data/as/30149093/ws-services-calculation/Penalty.json
+++ b/data/as/30149093/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149093/ws-services-calculation/WCBillingSlab.json b/data/as/30149093/ws-services-calculation/WCBillingSlab.json
index bfc7174f0f..8d08b7665a 100644
--- a/data/as/30149093/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149093/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30149113/ws-services-calculation/Penalty.json b/data/as/30149113/ws-services-calculation/Penalty.json
index 655f25c4e3..c1d778f504 100644
--- a/data/as/30149113/ws-services-calculation/Penalty.json
+++ b/data/as/30149113/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149113/ws-services-calculation/WCBillingSlab.json b/data/as/30149113/ws-services-calculation/WCBillingSlab.json
index 7dba4a1f4b..92ae0ea3d7 100644
--- a/data/as/30149113/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149113/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150209/ws-services-calculation/Penalty.json b/data/as/30150209/ws-services-calculation/Penalty.json
index 257b174f8c..76628ad143 100644
--- a/data/as/30150209/ws-services-calculation/Penalty.json
+++ b/data/as/30150209/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150209/ws-services-calculation/WCBillingSlab.json b/data/as/30150209/ws-services-calculation/WCBillingSlab.json
index 1d679e816f..e6ec6ddcbc 100644
--- a/data/as/30150209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150209/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150213/ws-services-calculation/Penalty.json b/data/as/30150213/ws-services-calculation/Penalty.json
index df422f7288..9e276d0d45 100644
--- a/data/as/30150213/ws-services-calculation/Penalty.json
+++ b/data/as/30150213/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150213/ws-services-calculation/WCBillingSlab.json b/data/as/30150213/ws-services-calculation/WCBillingSlab.json
index 3c58222dab..b763996dcd 100644
--- a/data/as/30150213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150213/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150234/ws-services-calculation/Penalty.json b/data/as/30150234/ws-services-calculation/Penalty.json
index 589a36ccdb..5c987c29f2 100644
--- a/data/as/30150234/ws-services-calculation/Penalty.json
+++ b/data/as/30150234/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150234/ws-services-calculation/WCBillingSlab.json b/data/as/30150234/ws-services-calculation/WCBillingSlab.json
index 85c8492f2b..b4d17b7e69 100644
--- a/data/as/30150234/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150234/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150700/ws-services-calculation/Penalty.json b/data/as/30150700/ws-services-calculation/Penalty.json
index b5e417d0f9..4d381c27f2 100644
--- a/data/as/30150700/ws-services-calculation/Penalty.json
+++ b/data/as/30150700/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150700/ws-services-calculation/WCBillingSlab.json b/data/as/30150700/ws-services-calculation/WCBillingSlab.json
index 91d2156cee..728ee27658 100644
--- a/data/as/30150700/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150700/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150737/ws-services-calculation/Penalty.json b/data/as/30150737/ws-services-calculation/Penalty.json
index bb78fa36f6..8fb52e6339 100644
--- a/data/as/30150737/ws-services-calculation/Penalty.json
+++ b/data/as/30150737/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150737/ws-services-calculation/WCBillingSlab.json b/data/as/30150737/ws-services-calculation/WCBillingSlab.json
index ea8aea7683..78b5a7ecb1 100644
--- a/data/as/30150737/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150737/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150785/ws-services-calculation/Penalty.json b/data/as/30150785/ws-services-calculation/Penalty.json
index 2784198171..a312219952 100644
--- a/data/as/30150785/ws-services-calculation/Penalty.json
+++ b/data/as/30150785/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150785/ws-services-calculation/WCBillingSlab.json b/data/as/30150785/ws-services-calculation/WCBillingSlab.json
index 501731ec52..3279f7bd74 100644
--- a/data/as/30150785/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150785/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150803/ws-services-calculation/Penalty.json b/data/as/30150803/ws-services-calculation/Penalty.json
index 0521c39232..6ab483c13a 100644
--- a/data/as/30150803/ws-services-calculation/Penalty.json
+++ b/data/as/30150803/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150803/ws-services-calculation/WCBillingSlab.json b/data/as/30150803/ws-services-calculation/WCBillingSlab.json
index 2779aaa789..f07624838a 100644
--- a/data/as/30150803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150803/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30150834/ws-services-calculation/Penalty.json b/data/as/30150834/ws-services-calculation/Penalty.json
index f363af1eaa..d3a2c924d5 100644
--- a/data/as/30150834/ws-services-calculation/Penalty.json
+++ b/data/as/30150834/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150834/ws-services-calculation/WCBillingSlab.json b/data/as/30150834/ws-services-calculation/WCBillingSlab.json
index 04d9e72b7c..f27fd80025 100644
--- a/data/as/30150834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150834/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158066/ws-services-calculation/Penalty.json b/data/as/30158066/ws-services-calculation/Penalty.json
index 2967404240..6faff04d98 100644
--- a/data/as/30158066/ws-services-calculation/Penalty.json
+++ b/data/as/30158066/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158066/ws-services-calculation/WCBillingSlab.json b/data/as/30158066/ws-services-calculation/WCBillingSlab.json
index b2e9bcbf6c..57483ccb4e 100644
--- a/data/as/30158066/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158066/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158126/ws-services-calculation/Penalty.json b/data/as/30158126/ws-services-calculation/Penalty.json
index baa025e2d1..612b76ae05 100644
--- a/data/as/30158126/ws-services-calculation/Penalty.json
+++ b/data/as/30158126/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158126/ws-services-calculation/WCBillingSlab.json b/data/as/30158126/ws-services-calculation/WCBillingSlab.json
index 9280ee672b..f473ab2821 100644
--- a/data/as/30158126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158126/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158312/ws-services-calculation/Penalty.json b/data/as/30158312/ws-services-calculation/Penalty.json
index e85e4cce96..b910a2c62e 100644
--- a/data/as/30158312/ws-services-calculation/Penalty.json
+++ b/data/as/30158312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158312/ws-services-calculation/WCBillingSlab.json b/data/as/30158312/ws-services-calculation/WCBillingSlab.json
index 3288635e81..2e938643ab 100644
--- a/data/as/30158312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158662/ws-services-calculation/Penalty.json b/data/as/30158662/ws-services-calculation/Penalty.json
index 3e31c6f8a9..d457d91f80 100644
--- a/data/as/30158662/ws-services-calculation/Penalty.json
+++ b/data/as/30158662/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158662/ws-services-calculation/WCBillingSlab.json b/data/as/30158662/ws-services-calculation/WCBillingSlab.json
index 4d2a3ac035..a2427bf3a2 100644
--- a/data/as/30158662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158662/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158694/ws-services-calculation/Penalty.json b/data/as/30158694/ws-services-calculation/Penalty.json
index a953b54b23..e273d4ee46 100644
--- a/data/as/30158694/ws-services-calculation/Penalty.json
+++ b/data/as/30158694/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158694/ws-services-calculation/WCBillingSlab.json b/data/as/30158694/ws-services-calculation/WCBillingSlab.json
index 8c50e21b68..5c0274bae4 100644
--- a/data/as/30158694/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158694/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158752/ws-services-calculation/Penalty.json b/data/as/30158752/ws-services-calculation/Penalty.json
index b3b94d6072..27a4409dc0 100644
--- a/data/as/30158752/ws-services-calculation/Penalty.json
+++ b/data/as/30158752/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158752/ws-services-calculation/WCBillingSlab.json b/data/as/30158752/ws-services-calculation/WCBillingSlab.json
index 0e0c427815..c22b9582eb 100644
--- a/data/as/30158752/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158752/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30158825/ws-services-calculation/Penalty.json b/data/as/30158825/ws-services-calculation/Penalty.json
index 19715a2ace..042e29f0ae 100644
--- a/data/as/30158825/ws-services-calculation/Penalty.json
+++ b/data/as/30158825/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158825/ws-services-calculation/WCBillingSlab.json b/data/as/30158825/ws-services-calculation/WCBillingSlab.json
index 5c9f6e8a89..1087cd46c3 100644
--- a/data/as/30158825/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158825/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30159298/ws-services-calculation/Penalty.json b/data/as/30159298/ws-services-calculation/Penalty.json
index 4965e4ff3e..fd6b3bc0b1 100644
--- a/data/as/30159298/ws-services-calculation/Penalty.json
+++ b/data/as/30159298/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30159298/ws-services-calculation/WCBillingSlab.json b/data/as/30159298/ws-services-calculation/WCBillingSlab.json
index cea6810187..d54dcba39a 100644
--- a/data/as/30159298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30159298/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30159329/ws-services-calculation/Penalty.json b/data/as/30159329/ws-services-calculation/Penalty.json
index d12153a776..80f3fbc496 100644
--- a/data/as/30159329/ws-services-calculation/Penalty.json
+++ b/data/as/30159329/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30159329/ws-services-calculation/WCBillingSlab.json b/data/as/30159329/ws-services-calculation/WCBillingSlab.json
index 290abb7521..9cda3d3c3b 100644
--- a/data/as/30159329/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30159329/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30163627/ws-services-calculation/Penalty.json b/data/as/30163627/ws-services-calculation/Penalty.json
index e710e2379a..ca90bb1a43 100644
--- a/data/as/30163627/ws-services-calculation/Penalty.json
+++ b/data/as/30163627/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30163627/ws-services-calculation/WCBillingSlab.json b/data/as/30163627/ws-services-calculation/WCBillingSlab.json
index 7579fb5ced..b8ba38fc41 100644
--- a/data/as/30163627/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30163627/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30163652/ws-services-calculation/Penalty.json b/data/as/30163652/ws-services-calculation/Penalty.json
index 7d6d6d89b0..ae3f96a088 100644
--- a/data/as/30163652/ws-services-calculation/Penalty.json
+++ b/data/as/30163652/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30163652/ws-services-calculation/WCBillingSlab.json b/data/as/30163652/ws-services-calculation/WCBillingSlab.json
index f2cf525697..2523fd2cbe 100644
--- a/data/as/30163652/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30163652/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30163717/ws-services-calculation/Penalty.json b/data/as/30163717/ws-services-calculation/Penalty.json
index 066239eaa0..5e321bdcb1 100644
--- a/data/as/30163717/ws-services-calculation/Penalty.json
+++ b/data/as/30163717/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30163717/ws-services-calculation/WCBillingSlab.json b/data/as/30163717/ws-services-calculation/WCBillingSlab.json
index 8cfab4aca1..ab23d59fd6 100644
--- a/data/as/30163717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30163717/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166511/ws-services-calculation/Penalty.json b/data/as/30166511/ws-services-calculation/Penalty.json
index a34c5e8984..43058ab949 100644
--- a/data/as/30166511/ws-services-calculation/Penalty.json
+++ b/data/as/30166511/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166511/ws-services-calculation/WCBillingSlab.json b/data/as/30166511/ws-services-calculation/WCBillingSlab.json
index 50ba5a5f1e..d8d7c435bb 100644
--- a/data/as/30166511/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166511/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166533/ws-services-calculation/Penalty.json b/data/as/30166533/ws-services-calculation/Penalty.json
index 70586a6b08..adfc360b9b 100644
--- a/data/as/30166533/ws-services-calculation/Penalty.json
+++ b/data/as/30166533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166533/ws-services-calculation/WCBillingSlab.json b/data/as/30166533/ws-services-calculation/WCBillingSlab.json
index 8d91d23e04..02faeb3570 100644
--- a/data/as/30166533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166583/ws-services-calculation/Penalty.json b/data/as/30166583/ws-services-calculation/Penalty.json
index ee6365dc28..df068330ba 100644
--- a/data/as/30166583/ws-services-calculation/Penalty.json
+++ b/data/as/30166583/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166583/ws-services-calculation/WCBillingSlab.json b/data/as/30166583/ws-services-calculation/WCBillingSlab.json
index 74a64ba50d..008dbcbab6 100644
--- a/data/as/30166583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166583/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166670/ws-services-calculation/Penalty.json b/data/as/30166670/ws-services-calculation/Penalty.json
index db928d7fd1..961372c862 100644
--- a/data/as/30166670/ws-services-calculation/Penalty.json
+++ b/data/as/30166670/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166670/ws-services-calculation/WCBillingSlab.json b/data/as/30166670/ws-services-calculation/WCBillingSlab.json
index b6db821ecb..c8fc2d5e41 100644
--- a/data/as/30166670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166670/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166739/ws-services-calculation/Penalty.json b/data/as/30166739/ws-services-calculation/Penalty.json
index affc56b5b6..a883837845 100644
--- a/data/as/30166739/ws-services-calculation/Penalty.json
+++ b/data/as/30166739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166739/ws-services-calculation/WCBillingSlab.json b/data/as/30166739/ws-services-calculation/WCBillingSlab.json
index 6d7823cfd2..1f31237d51 100644
--- a/data/as/30166739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166762/ws-services-calculation/Penalty.json b/data/as/30166762/ws-services-calculation/Penalty.json
index 00a7214634..cf0ac85ab5 100644
--- a/data/as/30166762/ws-services-calculation/Penalty.json
+++ b/data/as/30166762/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166762/ws-services-calculation/WCBillingSlab.json b/data/as/30166762/ws-services-calculation/WCBillingSlab.json
index dc7248c175..893ecb3276 100644
--- a/data/as/30166762/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166762/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30166822/ws-services-calculation/Penalty.json b/data/as/30166822/ws-services-calculation/Penalty.json
index 8c43d49b31..8b311b08da 100644
--- a/data/as/30166822/ws-services-calculation/Penalty.json
+++ b/data/as/30166822/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166822/ws-services-calculation/WCBillingSlab.json b/data/as/30166822/ws-services-calculation/WCBillingSlab.json
index 61d2e448cb..71476851eb 100644
--- a/data/as/30166822/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166822/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167065/ws-services-calculation/Penalty.json b/data/as/30167065/ws-services-calculation/Penalty.json
index bf5e6c478a..044954924a 100644
--- a/data/as/30167065/ws-services-calculation/Penalty.json
+++ b/data/as/30167065/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167065/ws-services-calculation/WCBillingSlab.json b/data/as/30167065/ws-services-calculation/WCBillingSlab.json
index fce1ca959a..42cb3a237d 100644
--- a/data/as/30167065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167065/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167107/ws-services-calculation/Penalty.json b/data/as/30167107/ws-services-calculation/Penalty.json
index e6fbe1673e..1d808537a5 100644
--- a/data/as/30167107/ws-services-calculation/Penalty.json
+++ b/data/as/30167107/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167107/ws-services-calculation/WCBillingSlab.json b/data/as/30167107/ws-services-calculation/WCBillingSlab.json
index 36e17fd05c..5b862d8a8c 100644
--- a/data/as/30167107/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167107/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167121/ws-services-calculation/Penalty.json b/data/as/30167121/ws-services-calculation/Penalty.json
index 70c8522fd2..176aa26a4f 100644
--- a/data/as/30167121/ws-services-calculation/Penalty.json
+++ b/data/as/30167121/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167121/ws-services-calculation/WCBillingSlab.json b/data/as/30167121/ws-services-calculation/WCBillingSlab.json
index 61066bdaa4..17c1c93c9e 100644
--- a/data/as/30167121/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167121/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167130/ws-services-calculation/Penalty.json b/data/as/30167130/ws-services-calculation/Penalty.json
index c351ab210f..42868b7985 100644
--- a/data/as/30167130/ws-services-calculation/Penalty.json
+++ b/data/as/30167130/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167130/ws-services-calculation/WCBillingSlab.json b/data/as/30167130/ws-services-calculation/WCBillingSlab.json
index 60ab156a40..d7a647471e 100644
--- a/data/as/30167130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167130/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167292/ws-services-calculation/Penalty.json b/data/as/30167292/ws-services-calculation/Penalty.json
index 69ecb9edd7..c2daeceed2 100644
--- a/data/as/30167292/ws-services-calculation/Penalty.json
+++ b/data/as/30167292/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167292/ws-services-calculation/WCBillingSlab.json b/data/as/30167292/ws-services-calculation/WCBillingSlab.json
index 80b5ee2850..edba116db2 100644
--- a/data/as/30167292/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167292/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167319/ws-services-calculation/Penalty.json b/data/as/30167319/ws-services-calculation/Penalty.json
index b3ce3e8266..0487c62711 100644
--- a/data/as/30167319/ws-services-calculation/Penalty.json
+++ b/data/as/30167319/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167319/ws-services-calculation/WCBillingSlab.json b/data/as/30167319/ws-services-calculation/WCBillingSlab.json
index 0e07de5ee2..c58e43c447 100644
--- a/data/as/30167319/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167319/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167381/ws-services-calculation/Penalty.json b/data/as/30167381/ws-services-calculation/Penalty.json
index 0c6e33be38..4d6f057685 100644
--- a/data/as/30167381/ws-services-calculation/Penalty.json
+++ b/data/as/30167381/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167381/ws-services-calculation/WCBillingSlab.json b/data/as/30167381/ws-services-calculation/WCBillingSlab.json
index ee9fa96c9c..5ddf605b66 100644
--- a/data/as/30167381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167381/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167391/ws-services-calculation/Penalty.json b/data/as/30167391/ws-services-calculation/Penalty.json
index b5318e8fb5..f2c2fc5055 100644
--- a/data/as/30167391/ws-services-calculation/Penalty.json
+++ b/data/as/30167391/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167391/ws-services-calculation/WCBillingSlab.json b/data/as/30167391/ws-services-calculation/WCBillingSlab.json
index 9d4785c1f6..1b86f50eeb 100644
--- a/data/as/30167391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167391/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167408/ws-services-calculation/Penalty.json b/data/as/30167408/ws-services-calculation/Penalty.json
index 4dc8665a16..5250bd9a53 100644
--- a/data/as/30167408/ws-services-calculation/Penalty.json
+++ b/data/as/30167408/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167408/ws-services-calculation/WCBillingSlab.json b/data/as/30167408/ws-services-calculation/WCBillingSlab.json
index d1e5038745..38af5f9844 100644
--- a/data/as/30167408/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167408/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167439/ws-services-calculation/Penalty.json b/data/as/30167439/ws-services-calculation/Penalty.json
index 27f8451155..36fd5679c6 100644
--- a/data/as/30167439/ws-services-calculation/Penalty.json
+++ b/data/as/30167439/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167439/ws-services-calculation/WCBillingSlab.json b/data/as/30167439/ws-services-calculation/WCBillingSlab.json
index 097fbdbf30..479625dccd 100644
--- a/data/as/30167439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167439/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167463/ws-services-calculation/Penalty.json b/data/as/30167463/ws-services-calculation/Penalty.json
index 1cc624dbdc..9378aa745f 100644
--- a/data/as/30167463/ws-services-calculation/Penalty.json
+++ b/data/as/30167463/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167463/ws-services-calculation/WCBillingSlab.json b/data/as/30167463/ws-services-calculation/WCBillingSlab.json
index 9d971214f7..e847d3bd5f 100644
--- a/data/as/30167463/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167463/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167486/ws-services-calculation/Penalty.json b/data/as/30167486/ws-services-calculation/Penalty.json
index c93a77193d..93547d9ef9 100644
--- a/data/as/30167486/ws-services-calculation/Penalty.json
+++ b/data/as/30167486/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167486/ws-services-calculation/WCBillingSlab.json b/data/as/30167486/ws-services-calculation/WCBillingSlab.json
index 30923dc609..aa8cdf6699 100644
--- a/data/as/30167486/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167486/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30167823/ws-services-calculation/Penalty.json b/data/as/30167823/ws-services-calculation/Penalty.json
index deab02bc0d..7d6904e2f7 100644
--- a/data/as/30167823/ws-services-calculation/Penalty.json
+++ b/data/as/30167823/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167823/ws-services-calculation/WCBillingSlab.json b/data/as/30167823/ws-services-calculation/WCBillingSlab.json
index b979ad8998..1af2dc57e6 100644
--- a/data/as/30167823/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167823/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169470/ws-services-calculation/Penalty.json b/data/as/30169470/ws-services-calculation/Penalty.json
index d739a0a267..266e79e28d 100644
--- a/data/as/30169470/ws-services-calculation/Penalty.json
+++ b/data/as/30169470/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169470/ws-services-calculation/WCBillingSlab.json b/data/as/30169470/ws-services-calculation/WCBillingSlab.json
index 3cbd919dcd..2007decee7 100644
--- a/data/as/30169470/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169470/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169472/ws-services-calculation/Penalty.json b/data/as/30169472/ws-services-calculation/Penalty.json
index 71eee88fa0..f0050b579b 100644
--- a/data/as/30169472/ws-services-calculation/Penalty.json
+++ b/data/as/30169472/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169472/ws-services-calculation/WCBillingSlab.json b/data/as/30169472/ws-services-calculation/WCBillingSlab.json
index bd03b19175..ba9f2e70fb 100644
--- a/data/as/30169472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169472/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169516/ws-services-calculation/Penalty.json b/data/as/30169516/ws-services-calculation/Penalty.json
index 9a8e7edfae..0a29e8581e 100644
--- a/data/as/30169516/ws-services-calculation/Penalty.json
+++ b/data/as/30169516/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169516/ws-services-calculation/WCBillingSlab.json b/data/as/30169516/ws-services-calculation/WCBillingSlab.json
index 7dee19b323..90ab5ca47d 100644
--- a/data/as/30169516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169516/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169525/ws-services-calculation/Penalty.json b/data/as/30169525/ws-services-calculation/Penalty.json
index 40caadc450..c5d4f16997 100644
--- a/data/as/30169525/ws-services-calculation/Penalty.json
+++ b/data/as/30169525/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169525/ws-services-calculation/WCBillingSlab.json b/data/as/30169525/ws-services-calculation/WCBillingSlab.json
index d59fbd4ef5..6ca0ae6317 100644
--- a/data/as/30169525/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169525/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169537/ws-services-calculation/Penalty.json b/data/as/30169537/ws-services-calculation/Penalty.json
index ab2c81efe0..fddf4e31d6 100644
--- a/data/as/30169537/ws-services-calculation/Penalty.json
+++ b/data/as/30169537/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169537/ws-services-calculation/WCBillingSlab.json b/data/as/30169537/ws-services-calculation/WCBillingSlab.json
index 69906eb9ae..51d092a37c 100644
--- a/data/as/30169537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169537/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169560/ws-services-calculation/Penalty.json b/data/as/30169560/ws-services-calculation/Penalty.json
index 36209b16dd..c8870149d6 100644
--- a/data/as/30169560/ws-services-calculation/Penalty.json
+++ b/data/as/30169560/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169560/ws-services-calculation/WCBillingSlab.json b/data/as/30169560/ws-services-calculation/WCBillingSlab.json
index e7178abc58..b95a682ca5 100644
--- a/data/as/30169560/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169560/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169583/ws-services-calculation/Penalty.json b/data/as/30169583/ws-services-calculation/Penalty.json
index e317693344..206f6c1367 100644
--- a/data/as/30169583/ws-services-calculation/Penalty.json
+++ b/data/as/30169583/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169583/ws-services-calculation/WCBillingSlab.json b/data/as/30169583/ws-services-calculation/WCBillingSlab.json
index 7cf24cfc4c..86b966ac22 100644
--- a/data/as/30169583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169583/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169600/ws-services-calculation/Penalty.json b/data/as/30169600/ws-services-calculation/Penalty.json
index b26379131d..630e9c872a 100644
--- a/data/as/30169600/ws-services-calculation/Penalty.json
+++ b/data/as/30169600/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169600/ws-services-calculation/WCBillingSlab.json b/data/as/30169600/ws-services-calculation/WCBillingSlab.json
index 821f0419fb..aafe8403b0 100644
--- a/data/as/30169600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169600/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169629/ws-services-calculation/Penalty.json b/data/as/30169629/ws-services-calculation/Penalty.json
index c6e559147b..465cb8b166 100644
--- a/data/as/30169629/ws-services-calculation/Penalty.json
+++ b/data/as/30169629/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169629/ws-services-calculation/WCBillingSlab.json b/data/as/30169629/ws-services-calculation/WCBillingSlab.json
index 76f8071e4f..f839148f89 100644
--- a/data/as/30169629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169629/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169643/ws-services-calculation/Penalty.json b/data/as/30169643/ws-services-calculation/Penalty.json
index c95156726b..606d6ffadd 100644
--- a/data/as/30169643/ws-services-calculation/Penalty.json
+++ b/data/as/30169643/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169643/ws-services-calculation/WCBillingSlab.json b/data/as/30169643/ws-services-calculation/WCBillingSlab.json
index 95cc3959f9..86d4f6c005 100644
--- a/data/as/30169643/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169643/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169657/ws-services-calculation/Penalty.json b/data/as/30169657/ws-services-calculation/Penalty.json
index 3b277d87d9..1e8c94b680 100644
--- a/data/as/30169657/ws-services-calculation/Penalty.json
+++ b/data/as/30169657/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169657/ws-services-calculation/WCBillingSlab.json b/data/as/30169657/ws-services-calculation/WCBillingSlab.json
index bf4f9b0e7d..80951def96 100644
--- a/data/as/30169657/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169657/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169665/ws-services-calculation/Penalty.json b/data/as/30169665/ws-services-calculation/Penalty.json
index 7f90a67a7c..77fb96e4cf 100644
--- a/data/as/30169665/ws-services-calculation/Penalty.json
+++ b/data/as/30169665/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169665/ws-services-calculation/WCBillingSlab.json b/data/as/30169665/ws-services-calculation/WCBillingSlab.json
index a671cb56fd..782b5f819d 100644
--- a/data/as/30169665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169665/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169790/ws-services-calculation/Penalty.json b/data/as/30169790/ws-services-calculation/Penalty.json
index 196f394cea..71d4c5b49f 100644
--- a/data/as/30169790/ws-services-calculation/Penalty.json
+++ b/data/as/30169790/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169790/ws-services-calculation/WCBillingSlab.json b/data/as/30169790/ws-services-calculation/WCBillingSlab.json
index a33f5bc13f..3bf9721356 100644
--- a/data/as/30169790/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169790/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169802/ws-services-calculation/Penalty.json b/data/as/30169802/ws-services-calculation/Penalty.json
index 43f4ffa6a3..96be29cb94 100644
--- a/data/as/30169802/ws-services-calculation/Penalty.json
+++ b/data/as/30169802/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169802/ws-services-calculation/WCBillingSlab.json b/data/as/30169802/ws-services-calculation/WCBillingSlab.json
index a1dde82ed1..d466c4cbf2 100644
--- a/data/as/30169802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169802/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169825/ws-services-calculation/Penalty.json b/data/as/30169825/ws-services-calculation/Penalty.json
index a3e3c9678d..260de2ee86 100644
--- a/data/as/30169825/ws-services-calculation/Penalty.json
+++ b/data/as/30169825/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169825/ws-services-calculation/WCBillingSlab.json b/data/as/30169825/ws-services-calculation/WCBillingSlab.json
index 210d7cea73..29a75bcc6b 100644
--- a/data/as/30169825/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169825/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30169988/ws-services-calculation/Penalty.json b/data/as/30169988/ws-services-calculation/Penalty.json
index 232d16a58d..206d1ce00e 100644
--- a/data/as/30169988/ws-services-calculation/Penalty.json
+++ b/data/as/30169988/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169988/ws-services-calculation/WCBillingSlab.json b/data/as/30169988/ws-services-calculation/WCBillingSlab.json
index 1f94d3ec7d..f88cecf663 100644
--- a/data/as/30169988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169988/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170226/ws-services-calculation/Penalty.json b/data/as/30170226/ws-services-calculation/Penalty.json
index f1ed309fb8..5ae3134e31 100644
--- a/data/as/30170226/ws-services-calculation/Penalty.json
+++ b/data/as/30170226/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170226/ws-services-calculation/WCBillingSlab.json b/data/as/30170226/ws-services-calculation/WCBillingSlab.json
index 029f1f334b..4072b43203 100644
--- a/data/as/30170226/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170226/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170237/ws-services-calculation/Penalty.json b/data/as/30170237/ws-services-calculation/Penalty.json
index 6e4826f36f..6377bc61c6 100644
--- a/data/as/30170237/ws-services-calculation/Penalty.json
+++ b/data/as/30170237/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170237/ws-services-calculation/WCBillingSlab.json b/data/as/30170237/ws-services-calculation/WCBillingSlab.json
index 9c4e7354b6..6896290aac 100644
--- a/data/as/30170237/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170237/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170249/ws-services-calculation/Penalty.json b/data/as/30170249/ws-services-calculation/Penalty.json
index bbf46ba855..aa44a056b0 100644
--- a/data/as/30170249/ws-services-calculation/Penalty.json
+++ b/data/as/30170249/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170249/ws-services-calculation/WCBillingSlab.json b/data/as/30170249/ws-services-calculation/WCBillingSlab.json
index e0f19969c2..9409503003 100644
--- a/data/as/30170249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170249/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170262/ws-services-calculation/Penalty.json b/data/as/30170262/ws-services-calculation/Penalty.json
index b553a7eaec..4bc307e1ac 100644
--- a/data/as/30170262/ws-services-calculation/Penalty.json
+++ b/data/as/30170262/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170262/ws-services-calculation/WCBillingSlab.json b/data/as/30170262/ws-services-calculation/WCBillingSlab.json
index 5e2c4553e4..4c9505cab6 100644
--- a/data/as/30170262/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170262/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170419/ws-services-calculation/Penalty.json b/data/as/30170419/ws-services-calculation/Penalty.json
index 0e5bdc4744..0707b7be2b 100644
--- a/data/as/30170419/ws-services-calculation/Penalty.json
+++ b/data/as/30170419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170419/ws-services-calculation/WCBillingSlab.json b/data/as/30170419/ws-services-calculation/WCBillingSlab.json
index 6919ed2511..50ccf7a207 100644
--- a/data/as/30170419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170429/ws-services-calculation/Penalty.json b/data/as/30170429/ws-services-calculation/Penalty.json
index 904d9240d3..2cc49e2571 100644
--- a/data/as/30170429/ws-services-calculation/Penalty.json
+++ b/data/as/30170429/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170429/ws-services-calculation/WCBillingSlab.json b/data/as/30170429/ws-services-calculation/WCBillingSlab.json
index 7b00f83ddb..300e544e64 100644
--- a/data/as/30170429/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170429/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170784/ws-services-calculation/Penalty.json b/data/as/30170784/ws-services-calculation/Penalty.json
index 430af36cc6..f565fcc244 100644
--- a/data/as/30170784/ws-services-calculation/Penalty.json
+++ b/data/as/30170784/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170784/ws-services-calculation/WCBillingSlab.json b/data/as/30170784/ws-services-calculation/WCBillingSlab.json
index 7eb39ed255..0ba80f0266 100644
--- a/data/as/30170784/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170784/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170810/ws-services-calculation/Penalty.json b/data/as/30170810/ws-services-calculation/Penalty.json
index 6eb81584cf..b25d0476cf 100644
--- a/data/as/30170810/ws-services-calculation/Penalty.json
+++ b/data/as/30170810/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170810/ws-services-calculation/WCBillingSlab.json b/data/as/30170810/ws-services-calculation/WCBillingSlab.json
index 32adcf743f..b6cdb213a2 100644
--- a/data/as/30170810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170810/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30170948/ws-services-calculation/Penalty.json b/data/as/30170948/ws-services-calculation/Penalty.json
index e47a6d560d..239ff60e5d 100644
--- a/data/as/30170948/ws-services-calculation/Penalty.json
+++ b/data/as/30170948/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170948/ws-services-calculation/WCBillingSlab.json b/data/as/30170948/ws-services-calculation/WCBillingSlab.json
index ecf946c8fb..207ce8645e 100644
--- a/data/as/30170948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170948/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30171030/ws-services-calculation/Penalty.json b/data/as/30171030/ws-services-calculation/Penalty.json
index 83f6a74248..33ce1987f3 100644
--- a/data/as/30171030/ws-services-calculation/Penalty.json
+++ b/data/as/30171030/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30171030/ws-services-calculation/WCBillingSlab.json b/data/as/30171030/ws-services-calculation/WCBillingSlab.json
index 3785920c1d..a751cf7fdf 100644
--- a/data/as/30171030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30171030/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172407/ws-services-calculation/Penalty.json b/data/as/30172407/ws-services-calculation/Penalty.json
index 47bbf56540..83ca8e7beb 100644
--- a/data/as/30172407/ws-services-calculation/Penalty.json
+++ b/data/as/30172407/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172407/ws-services-calculation/WCBillingSlab.json b/data/as/30172407/ws-services-calculation/WCBillingSlab.json
index 0d1b7d711b..cfe52541e6 100644
--- a/data/as/30172407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172407/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172409/ws-services-calculation/Penalty.json b/data/as/30172409/ws-services-calculation/Penalty.json
index 1791e82e5d..9eba103df1 100644
--- a/data/as/30172409/ws-services-calculation/Penalty.json
+++ b/data/as/30172409/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172409/ws-services-calculation/WCBillingSlab.json b/data/as/30172409/ws-services-calculation/WCBillingSlab.json
index e89d3a07e3..fefc6b86b6 100644
--- a/data/as/30172409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172409/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172412/ws-services-calculation/Penalty.json b/data/as/30172412/ws-services-calculation/Penalty.json
index 2db9bc0120..6b4bd2ee3c 100644
--- a/data/as/30172412/ws-services-calculation/Penalty.json
+++ b/data/as/30172412/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172412/ws-services-calculation/WCBillingSlab.json b/data/as/30172412/ws-services-calculation/WCBillingSlab.json
index ee480c964f..a07692c891 100644
--- a/data/as/30172412/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172412/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172420/ws-services-calculation/Penalty.json b/data/as/30172420/ws-services-calculation/Penalty.json
index 99510706de..63aeba0d92 100644
--- a/data/as/30172420/ws-services-calculation/Penalty.json
+++ b/data/as/30172420/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172420/ws-services-calculation/WCBillingSlab.json b/data/as/30172420/ws-services-calculation/WCBillingSlab.json
index df637b31d7..8066d8ed68 100644
--- a/data/as/30172420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172420/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172437/ws-services-calculation/Penalty.json b/data/as/30172437/ws-services-calculation/Penalty.json
index e82f8737e2..f634184baa 100644
--- a/data/as/30172437/ws-services-calculation/Penalty.json
+++ b/data/as/30172437/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172437/ws-services-calculation/WCBillingSlab.json b/data/as/30172437/ws-services-calculation/WCBillingSlab.json
index 1d8eeecb3c..c814e49245 100644
--- a/data/as/30172437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172437/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172442/ws-services-calculation/Penalty.json b/data/as/30172442/ws-services-calculation/Penalty.json
index 0a312ed4db..d36ad58f4a 100644
--- a/data/as/30172442/ws-services-calculation/Penalty.json
+++ b/data/as/30172442/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172442/ws-services-calculation/WCBillingSlab.json b/data/as/30172442/ws-services-calculation/WCBillingSlab.json
index 60c88db174..23fa710d08 100644
--- a/data/as/30172442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172442/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172452/ws-services-calculation/Penalty.json b/data/as/30172452/ws-services-calculation/Penalty.json
index fbbd5c8f79..3a89bdc8a7 100644
--- a/data/as/30172452/ws-services-calculation/Penalty.json
+++ b/data/as/30172452/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172452/ws-services-calculation/WCBillingSlab.json b/data/as/30172452/ws-services-calculation/WCBillingSlab.json
index d2ea452ad3..4e541e90c3 100644
--- a/data/as/30172452/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172452/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172456/ws-services-calculation/Penalty.json b/data/as/30172456/ws-services-calculation/Penalty.json
index 206933a019..07adbf9e65 100644
--- a/data/as/30172456/ws-services-calculation/Penalty.json
+++ b/data/as/30172456/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172456/ws-services-calculation/WCBillingSlab.json b/data/as/30172456/ws-services-calculation/WCBillingSlab.json
index 00b2e6b771..89943e68a5 100644
--- a/data/as/30172456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172456/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172473/ws-services-calculation/Penalty.json b/data/as/30172473/ws-services-calculation/Penalty.json
index a7e25748ee..a9ea0ebf3a 100644
--- a/data/as/30172473/ws-services-calculation/Penalty.json
+++ b/data/as/30172473/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172473/ws-services-calculation/WCBillingSlab.json b/data/as/30172473/ws-services-calculation/WCBillingSlab.json
index f5c7a0747e..c0f3829bf1 100644
--- a/data/as/30172473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172473/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172482/ws-services-calculation/Penalty.json b/data/as/30172482/ws-services-calculation/Penalty.json
index ff089cd3da..0e5ee2b53d 100644
--- a/data/as/30172482/ws-services-calculation/Penalty.json
+++ b/data/as/30172482/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172482/ws-services-calculation/WCBillingSlab.json b/data/as/30172482/ws-services-calculation/WCBillingSlab.json
index a70900f847..cd5c3c7158 100644
--- a/data/as/30172482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172482/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172498/ws-services-calculation/Penalty.json b/data/as/30172498/ws-services-calculation/Penalty.json
index 530077f2e1..f88c381ccd 100644
--- a/data/as/30172498/ws-services-calculation/Penalty.json
+++ b/data/as/30172498/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172498/ws-services-calculation/WCBillingSlab.json b/data/as/30172498/ws-services-calculation/WCBillingSlab.json
index f3e647ff06..0732d7859f 100644
--- a/data/as/30172498/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172498/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172503/ws-services-calculation/Penalty.json b/data/as/30172503/ws-services-calculation/Penalty.json
index 971c32b0cc..1c88a6ae06 100644
--- a/data/as/30172503/ws-services-calculation/Penalty.json
+++ b/data/as/30172503/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172503/ws-services-calculation/WCBillingSlab.json b/data/as/30172503/ws-services-calculation/WCBillingSlab.json
index a2fc5bfae0..9fa0af26f6 100644
--- a/data/as/30172503/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172503/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172507/ws-services-calculation/Penalty.json b/data/as/30172507/ws-services-calculation/Penalty.json
index b981b37580..912b8c9ea8 100644
--- a/data/as/30172507/ws-services-calculation/Penalty.json
+++ b/data/as/30172507/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172507/ws-services-calculation/WCBillingSlab.json b/data/as/30172507/ws-services-calculation/WCBillingSlab.json
index 75673001c4..016be2b7bb 100644
--- a/data/as/30172507/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172507/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172509/ws-services-calculation/Penalty.json b/data/as/30172509/ws-services-calculation/Penalty.json
index 46c6c1194b..5283671e67 100644
--- a/data/as/30172509/ws-services-calculation/Penalty.json
+++ b/data/as/30172509/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172509/ws-services-calculation/WCBillingSlab.json b/data/as/30172509/ws-services-calculation/WCBillingSlab.json
index 4c0296d26e..647558674b 100644
--- a/data/as/30172509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172509/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172538/ws-services-calculation/Penalty.json b/data/as/30172538/ws-services-calculation/Penalty.json
index 1482c4b06e..a982c8ac99 100644
--- a/data/as/30172538/ws-services-calculation/Penalty.json
+++ b/data/as/30172538/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172538/ws-services-calculation/WCBillingSlab.json b/data/as/30172538/ws-services-calculation/WCBillingSlab.json
index 722eb18694..c851a483e3 100644
--- a/data/as/30172538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172538/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172543/ws-services-calculation/Penalty.json b/data/as/30172543/ws-services-calculation/Penalty.json
index 86a31cc646..cf0f748158 100644
--- a/data/as/30172543/ws-services-calculation/Penalty.json
+++ b/data/as/30172543/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172543/ws-services-calculation/WCBillingSlab.json b/data/as/30172543/ws-services-calculation/WCBillingSlab.json
index 008fab0a16..987b9e7570 100644
--- a/data/as/30172543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172543/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30172573/ws-services-calculation/Penalty.json b/data/as/30172573/ws-services-calculation/Penalty.json
index 9108f82868..fd175e7604 100644
--- a/data/as/30172573/ws-services-calculation/Penalty.json
+++ b/data/as/30172573/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172573/ws-services-calculation/WCBillingSlab.json b/data/as/30172573/ws-services-calculation/WCBillingSlab.json
index 1621496c89..1505d49414 100644
--- a/data/as/30172573/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172573/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173072/ws-services-calculation/Penalty.json b/data/as/30173072/ws-services-calculation/Penalty.json
index 6c32e2f33e..d1648cea65 100644
--- a/data/as/30173072/ws-services-calculation/Penalty.json
+++ b/data/as/30173072/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173072/ws-services-calculation/WCBillingSlab.json b/data/as/30173072/ws-services-calculation/WCBillingSlab.json
index 0378460e87..2b756239ae 100644
--- a/data/as/30173072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173072/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173084/ws-services-calculation/Penalty.json b/data/as/30173084/ws-services-calculation/Penalty.json
index 02de27e3ff..bdb36c231c 100644
--- a/data/as/30173084/ws-services-calculation/Penalty.json
+++ b/data/as/30173084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173084/ws-services-calculation/WCBillingSlab.json b/data/as/30173084/ws-services-calculation/WCBillingSlab.json
index 33fb0615c1..e7ecdcfbf7 100644
--- a/data/as/30173084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173097/ws-services-calculation/Penalty.json b/data/as/30173097/ws-services-calculation/Penalty.json
index 9dc1d945f5..ee3b500d5a 100644
--- a/data/as/30173097/ws-services-calculation/Penalty.json
+++ b/data/as/30173097/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173097/ws-services-calculation/WCBillingSlab.json b/data/as/30173097/ws-services-calculation/WCBillingSlab.json
index 7ab4b11873..9486b21b5f 100644
--- a/data/as/30173097/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173097/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173162/ws-services-calculation/Penalty.json b/data/as/30173162/ws-services-calculation/Penalty.json
index c2cb625de0..950c0be2c9 100644
--- a/data/as/30173162/ws-services-calculation/Penalty.json
+++ b/data/as/30173162/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173162/ws-services-calculation/WCBillingSlab.json b/data/as/30173162/ws-services-calculation/WCBillingSlab.json
index b6932b15c8..fba5d83e97 100644
--- a/data/as/30173162/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173162/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173172/ws-services-calculation/Penalty.json b/data/as/30173172/ws-services-calculation/Penalty.json
index c3e40fc794..0b0795f6e5 100644
--- a/data/as/30173172/ws-services-calculation/Penalty.json
+++ b/data/as/30173172/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173172/ws-services-calculation/WCBillingSlab.json b/data/as/30173172/ws-services-calculation/WCBillingSlab.json
index 0b9daaed08..d38eedcff2 100644
--- a/data/as/30173172/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173172/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173251/ws-services-calculation/Penalty.json b/data/as/30173251/ws-services-calculation/Penalty.json
index f81e73f54a..ac9e316106 100644
--- a/data/as/30173251/ws-services-calculation/Penalty.json
+++ b/data/as/30173251/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173251/ws-services-calculation/WCBillingSlab.json b/data/as/30173251/ws-services-calculation/WCBillingSlab.json
index 84bc3f04fa..f802eb184f 100644
--- a/data/as/30173251/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173251/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173284/ws-services-calculation/Penalty.json b/data/as/30173284/ws-services-calculation/Penalty.json
index c07931313d..d8595cb0f4 100644
--- a/data/as/30173284/ws-services-calculation/Penalty.json
+++ b/data/as/30173284/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173284/ws-services-calculation/WCBillingSlab.json b/data/as/30173284/ws-services-calculation/WCBillingSlab.json
index d3550e7607..be1a914cfa 100644
--- a/data/as/30173284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173284/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173317/ws-services-calculation/Penalty.json b/data/as/30173317/ws-services-calculation/Penalty.json
index 31d6f719a3..470c3778da 100644
--- a/data/as/30173317/ws-services-calculation/Penalty.json
+++ b/data/as/30173317/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173317/ws-services-calculation/WCBillingSlab.json b/data/as/30173317/ws-services-calculation/WCBillingSlab.json
index 019159210f..74de8620c6 100644
--- a/data/as/30173317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173317/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173387/ws-services-calculation/Penalty.json b/data/as/30173387/ws-services-calculation/Penalty.json
index 486be44613..d0126a608f 100644
--- a/data/as/30173387/ws-services-calculation/Penalty.json
+++ b/data/as/30173387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173387/ws-services-calculation/WCBillingSlab.json b/data/as/30173387/ws-services-calculation/WCBillingSlab.json
index c1f327a07d..5711c3699f 100644
--- a/data/as/30173387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173395/ws-services-calculation/Penalty.json b/data/as/30173395/ws-services-calculation/Penalty.json
index 4c7da2af92..d417f98c98 100644
--- a/data/as/30173395/ws-services-calculation/Penalty.json
+++ b/data/as/30173395/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173395/ws-services-calculation/WCBillingSlab.json b/data/as/30173395/ws-services-calculation/WCBillingSlab.json
index 315847f2f6..e2d6d86a01 100644
--- a/data/as/30173395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173395/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173400/ws-services-calculation/Penalty.json b/data/as/30173400/ws-services-calculation/Penalty.json
index 9515f6c88e..c34854c1a2 100644
--- a/data/as/30173400/ws-services-calculation/Penalty.json
+++ b/data/as/30173400/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173400/ws-services-calculation/WCBillingSlab.json b/data/as/30173400/ws-services-calculation/WCBillingSlab.json
index c420212d90..9573366af4 100644
--- a/data/as/30173400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173400/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173409/ws-services-calculation/Penalty.json b/data/as/30173409/ws-services-calculation/Penalty.json
index b396e42dda..92fa65242a 100644
--- a/data/as/30173409/ws-services-calculation/Penalty.json
+++ b/data/as/30173409/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173409/ws-services-calculation/WCBillingSlab.json b/data/as/30173409/ws-services-calculation/WCBillingSlab.json
index 3d11d16718..594d1b3e1d 100644
--- a/data/as/30173409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173409/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173419/ws-services-calculation/Penalty.json b/data/as/30173419/ws-services-calculation/Penalty.json
index c35d44acc5..0e26980412 100644
--- a/data/as/30173419/ws-services-calculation/Penalty.json
+++ b/data/as/30173419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173419/ws-services-calculation/WCBillingSlab.json b/data/as/30173419/ws-services-calculation/WCBillingSlab.json
index 9ce14a3b72..2dceae1325 100644
--- a/data/as/30173419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173427/ws-services-calculation/Penalty.json b/data/as/30173427/ws-services-calculation/Penalty.json
index fc4cbcb97b..7ea04cc63a 100644
--- a/data/as/30173427/ws-services-calculation/Penalty.json
+++ b/data/as/30173427/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173427/ws-services-calculation/WCBillingSlab.json b/data/as/30173427/ws-services-calculation/WCBillingSlab.json
index b34ca41803..d1ed6270c0 100644
--- a/data/as/30173427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173427/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173442/ws-services-calculation/Penalty.json b/data/as/30173442/ws-services-calculation/Penalty.json
index 86699bf1ff..7b4e7117a0 100644
--- a/data/as/30173442/ws-services-calculation/Penalty.json
+++ b/data/as/30173442/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173442/ws-services-calculation/WCBillingSlab.json b/data/as/30173442/ws-services-calculation/WCBillingSlab.json
index 899ef3fa8d..5aece8943d 100644
--- a/data/as/30173442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173442/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173455/ws-services-calculation/Penalty.json b/data/as/30173455/ws-services-calculation/Penalty.json
index 792ab31f72..c0f9f3e137 100644
--- a/data/as/30173455/ws-services-calculation/Penalty.json
+++ b/data/as/30173455/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173455/ws-services-calculation/WCBillingSlab.json b/data/as/30173455/ws-services-calculation/WCBillingSlab.json
index 803c355406..a818b6fa9a 100644
--- a/data/as/30173455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173455/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173471/ws-services-calculation/Penalty.json b/data/as/30173471/ws-services-calculation/Penalty.json
index c070625150..dc51a91ca8 100644
--- a/data/as/30173471/ws-services-calculation/Penalty.json
+++ b/data/as/30173471/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173471/ws-services-calculation/WCBillingSlab.json b/data/as/30173471/ws-services-calculation/WCBillingSlab.json
index e085ca6e34..052c041ae8 100644
--- a/data/as/30173471/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173471/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173496/ws-services-calculation/Penalty.json b/data/as/30173496/ws-services-calculation/Penalty.json
index 14c516eb53..28066cfdf4 100644
--- a/data/as/30173496/ws-services-calculation/Penalty.json
+++ b/data/as/30173496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173496/ws-services-calculation/WCBillingSlab.json b/data/as/30173496/ws-services-calculation/WCBillingSlab.json
index 60a4112c55..f4c818cac5 100644
--- a/data/as/30173496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173509/ws-services-calculation/Penalty.json b/data/as/30173509/ws-services-calculation/Penalty.json
index ec6f2079d8..77dad5aa8e 100644
--- a/data/as/30173509/ws-services-calculation/Penalty.json
+++ b/data/as/30173509/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173509/ws-services-calculation/WCBillingSlab.json b/data/as/30173509/ws-services-calculation/WCBillingSlab.json
index 902dc17072..97f57e415d 100644
--- a/data/as/30173509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173509/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173535/ws-services-calculation/Penalty.json b/data/as/30173535/ws-services-calculation/Penalty.json
index e7c0f78456..252d25e5a4 100644
--- a/data/as/30173535/ws-services-calculation/Penalty.json
+++ b/data/as/30173535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173535/ws-services-calculation/WCBillingSlab.json b/data/as/30173535/ws-services-calculation/WCBillingSlab.json
index f6e98d5e0f..60f3aab266 100644
--- a/data/as/30173535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173679/ws-services-calculation/Penalty.json b/data/as/30173679/ws-services-calculation/Penalty.json
index 5cc5f5f9ad..c4276d8556 100644
--- a/data/as/30173679/ws-services-calculation/Penalty.json
+++ b/data/as/30173679/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173679/ws-services-calculation/WCBillingSlab.json b/data/as/30173679/ws-services-calculation/WCBillingSlab.json
index 27b12ed908..8f644ce11a 100644
--- a/data/as/30173679/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173679/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173688/ws-services-calculation/Penalty.json b/data/as/30173688/ws-services-calculation/Penalty.json
index b001604ee9..7139349727 100644
--- a/data/as/30173688/ws-services-calculation/Penalty.json
+++ b/data/as/30173688/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173688/ws-services-calculation/WCBillingSlab.json b/data/as/30173688/ws-services-calculation/WCBillingSlab.json
index e7bb44ce8f..7158b2b969 100644
--- a/data/as/30173688/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173688/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173698/ws-services-calculation/Penalty.json b/data/as/30173698/ws-services-calculation/Penalty.json
index 9f06fab823..b493e36a92 100644
--- a/data/as/30173698/ws-services-calculation/Penalty.json
+++ b/data/as/30173698/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173698/ws-services-calculation/WCBillingSlab.json b/data/as/30173698/ws-services-calculation/WCBillingSlab.json
index 7cc77e14f4..ae22b59b6e 100644
--- a/data/as/30173698/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173698/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173710/ws-services-calculation/Penalty.json b/data/as/30173710/ws-services-calculation/Penalty.json
index d6b443f27e..cc72dda3fc 100644
--- a/data/as/30173710/ws-services-calculation/Penalty.json
+++ b/data/as/30173710/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173710/ws-services-calculation/WCBillingSlab.json b/data/as/30173710/ws-services-calculation/WCBillingSlab.json
index efb0242d8f..91a1645d98 100644
--- a/data/as/30173710/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173710/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173740/ws-services-calculation/Penalty.json b/data/as/30173740/ws-services-calculation/Penalty.json
index 79539a03b1..2ce7c2bccc 100644
--- a/data/as/30173740/ws-services-calculation/Penalty.json
+++ b/data/as/30173740/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173740/ws-services-calculation/WCBillingSlab.json b/data/as/30173740/ws-services-calculation/WCBillingSlab.json
index 3994ec08ce..7654e53cea 100644
--- a/data/as/30173740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173740/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173753/ws-services-calculation/Penalty.json b/data/as/30173753/ws-services-calculation/Penalty.json
index 4e76f635b3..884faddc14 100644
--- a/data/as/30173753/ws-services-calculation/Penalty.json
+++ b/data/as/30173753/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173753/ws-services-calculation/WCBillingSlab.json b/data/as/30173753/ws-services-calculation/WCBillingSlab.json
index 270c488d88..b0e55143ea 100644
--- a/data/as/30173753/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173753/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173770/ws-services-calculation/Penalty.json b/data/as/30173770/ws-services-calculation/Penalty.json
index d7b372979c..47ed6086f2 100644
--- a/data/as/30173770/ws-services-calculation/Penalty.json
+++ b/data/as/30173770/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173770/ws-services-calculation/WCBillingSlab.json b/data/as/30173770/ws-services-calculation/WCBillingSlab.json
index 6a40f201c9..85e2f2852a 100644
--- a/data/as/30173770/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173770/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173782/ws-services-calculation/Penalty.json b/data/as/30173782/ws-services-calculation/Penalty.json
index 7584f21368..0120ad48c1 100644
--- a/data/as/30173782/ws-services-calculation/Penalty.json
+++ b/data/as/30173782/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173782/ws-services-calculation/WCBillingSlab.json b/data/as/30173782/ws-services-calculation/WCBillingSlab.json
index d9ca365e4c..a7b717b5c9 100644
--- a/data/as/30173782/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173782/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173794/ws-services-calculation/Penalty.json b/data/as/30173794/ws-services-calculation/Penalty.json
index 583f5b2cd5..e6a69e39ea 100644
--- a/data/as/30173794/ws-services-calculation/Penalty.json
+++ b/data/as/30173794/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173794/ws-services-calculation/WCBillingSlab.json b/data/as/30173794/ws-services-calculation/WCBillingSlab.json
index 515b5da4b5..4eeac3746d 100644
--- a/data/as/30173794/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173794/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173812/ws-services-calculation/Penalty.json b/data/as/30173812/ws-services-calculation/Penalty.json
index 8d45fd1034..bcb4d7bcad 100644
--- a/data/as/30173812/ws-services-calculation/Penalty.json
+++ b/data/as/30173812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173812/ws-services-calculation/WCBillingSlab.json b/data/as/30173812/ws-services-calculation/WCBillingSlab.json
index ecd1ba77f1..c421c2012f 100644
--- a/data/as/30173812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173814/ws-services-calculation/Penalty.json b/data/as/30173814/ws-services-calculation/Penalty.json
index 113c399d15..3f7f14271b 100644
--- a/data/as/30173814/ws-services-calculation/Penalty.json
+++ b/data/as/30173814/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173814/ws-services-calculation/WCBillingSlab.json b/data/as/30173814/ws-services-calculation/WCBillingSlab.json
index 89d7c9027a..5f02a517a9 100644
--- a/data/as/30173814/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173814/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173816/ws-services-calculation/Penalty.json b/data/as/30173816/ws-services-calculation/Penalty.json
index 60e6f63f2c..7c7420c010 100644
--- a/data/as/30173816/ws-services-calculation/Penalty.json
+++ b/data/as/30173816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173816/ws-services-calculation/WCBillingSlab.json b/data/as/30173816/ws-services-calculation/WCBillingSlab.json
index 7d53d8bd51..aeec6f21bd 100644
--- a/data/as/30173816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173961/ws-services-calculation/Penalty.json b/data/as/30173961/ws-services-calculation/Penalty.json
index 031f4ac1e0..76c10e0213 100644
--- a/data/as/30173961/ws-services-calculation/Penalty.json
+++ b/data/as/30173961/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173961/ws-services-calculation/WCBillingSlab.json b/data/as/30173961/ws-services-calculation/WCBillingSlab.json
index 3e6d318d09..6848e9e781 100644
--- a/data/as/30173961/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173961/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173962/ws-services-calculation/Penalty.json b/data/as/30173962/ws-services-calculation/Penalty.json
index 257ddf2549..0e2470d111 100644
--- a/data/as/30173962/ws-services-calculation/Penalty.json
+++ b/data/as/30173962/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173962/ws-services-calculation/WCBillingSlab.json b/data/as/30173962/ws-services-calculation/WCBillingSlab.json
index 1118ef81f8..d52816b06f 100644
--- a/data/as/30173962/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173962/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173963/ws-services-calculation/Penalty.json b/data/as/30173963/ws-services-calculation/Penalty.json
index 91f8bd3ed4..81f4101607 100644
--- a/data/as/30173963/ws-services-calculation/Penalty.json
+++ b/data/as/30173963/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173963/ws-services-calculation/WCBillingSlab.json b/data/as/30173963/ws-services-calculation/WCBillingSlab.json
index 9dcb32d731..dc3c4d623d 100644
--- a/data/as/30173963/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173963/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173965/ws-services-calculation/Penalty.json b/data/as/30173965/ws-services-calculation/Penalty.json
index 62cb3b1fef..0e293341b8 100644
--- a/data/as/30173965/ws-services-calculation/Penalty.json
+++ b/data/as/30173965/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173965/ws-services-calculation/WCBillingSlab.json b/data/as/30173965/ws-services-calculation/WCBillingSlab.json
index 73af42d8ae..1fff52c048 100644
--- a/data/as/30173965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173965/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173967/ws-services-calculation/Penalty.json b/data/as/30173967/ws-services-calculation/Penalty.json
index bc12725159..f77c8d6a7d 100644
--- a/data/as/30173967/ws-services-calculation/Penalty.json
+++ b/data/as/30173967/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173967/ws-services-calculation/WCBillingSlab.json b/data/as/30173967/ws-services-calculation/WCBillingSlab.json
index a39025e552..16f5464c82 100644
--- a/data/as/30173967/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173967/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173972/ws-services-calculation/Penalty.json b/data/as/30173972/ws-services-calculation/Penalty.json
index 7f8b1d0030..af4ba71a79 100644
--- a/data/as/30173972/ws-services-calculation/Penalty.json
+++ b/data/as/30173972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173972/ws-services-calculation/WCBillingSlab.json b/data/as/30173972/ws-services-calculation/WCBillingSlab.json
index a852114e28..377a5b069d 100644
--- a/data/as/30173972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173973/ws-services-calculation/Penalty.json b/data/as/30173973/ws-services-calculation/Penalty.json
index 551ff48011..874f47283f 100644
--- a/data/as/30173973/ws-services-calculation/Penalty.json
+++ b/data/as/30173973/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173973/ws-services-calculation/WCBillingSlab.json b/data/as/30173973/ws-services-calculation/WCBillingSlab.json
index c6a4b6b971..f1533ab0a7 100644
--- a/data/as/30173973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173973/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173975/ws-services-calculation/Penalty.json b/data/as/30173975/ws-services-calculation/Penalty.json
index 37c635c8d3..0265dd2ca9 100644
--- a/data/as/30173975/ws-services-calculation/Penalty.json
+++ b/data/as/30173975/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173975/ws-services-calculation/WCBillingSlab.json b/data/as/30173975/ws-services-calculation/WCBillingSlab.json
index f77890a09b..731956f9e4 100644
--- a/data/as/30173975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173975/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173977/ws-services-calculation/Penalty.json b/data/as/30173977/ws-services-calculation/Penalty.json
index 8e9f2ad588..410b198dcb 100644
--- a/data/as/30173977/ws-services-calculation/Penalty.json
+++ b/data/as/30173977/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173977/ws-services-calculation/WCBillingSlab.json b/data/as/30173977/ws-services-calculation/WCBillingSlab.json
index b00b79b284..6596991052 100644
--- a/data/as/30173977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173977/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173978/ws-services-calculation/Penalty.json b/data/as/30173978/ws-services-calculation/Penalty.json
index e009f99705..937de49556 100644
--- a/data/as/30173978/ws-services-calculation/Penalty.json
+++ b/data/as/30173978/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173978/ws-services-calculation/WCBillingSlab.json b/data/as/30173978/ws-services-calculation/WCBillingSlab.json
index 1be0e1a759..aad451d077 100644
--- a/data/as/30173978/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173978/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173979/ws-services-calculation/Penalty.json b/data/as/30173979/ws-services-calculation/Penalty.json
index de2bde49b9..7333e62ab4 100644
--- a/data/as/30173979/ws-services-calculation/Penalty.json
+++ b/data/as/30173979/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173979/ws-services-calculation/WCBillingSlab.json b/data/as/30173979/ws-services-calculation/WCBillingSlab.json
index 889a1f9601..7180c67f44 100644
--- a/data/as/30173979/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173979/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173980/ws-services-calculation/Penalty.json b/data/as/30173980/ws-services-calculation/Penalty.json
index 7a8929b163..96a8344b7c 100644
--- a/data/as/30173980/ws-services-calculation/Penalty.json
+++ b/data/as/30173980/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173980/ws-services-calculation/WCBillingSlab.json b/data/as/30173980/ws-services-calculation/WCBillingSlab.json
index 6d0b87ee95..f2f802e283 100644
--- a/data/as/30173980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173980/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173981/ws-services-calculation/Penalty.json b/data/as/30173981/ws-services-calculation/Penalty.json
index 875d119879..58ac3e841c 100644
--- a/data/as/30173981/ws-services-calculation/Penalty.json
+++ b/data/as/30173981/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173981/ws-services-calculation/WCBillingSlab.json b/data/as/30173981/ws-services-calculation/WCBillingSlab.json
index 76b886b42c..26c3ad43fa 100644
--- a/data/as/30173981/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173981/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173982/ws-services-calculation/Penalty.json b/data/as/30173982/ws-services-calculation/Penalty.json
index 3c97d207a3..a22cadf925 100644
--- a/data/as/30173982/ws-services-calculation/Penalty.json
+++ b/data/as/30173982/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173982/ws-services-calculation/WCBillingSlab.json b/data/as/30173982/ws-services-calculation/WCBillingSlab.json
index e349d0706f..2d2dbd0bd6 100644
--- a/data/as/30173982/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173982/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173983/ws-services-calculation/Penalty.json b/data/as/30173983/ws-services-calculation/Penalty.json
index d0834c61fb..8c046333f4 100644
--- a/data/as/30173983/ws-services-calculation/Penalty.json
+++ b/data/as/30173983/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173983/ws-services-calculation/WCBillingSlab.json b/data/as/30173983/ws-services-calculation/WCBillingSlab.json
index 58cff7178d..17385b3c00 100644
--- a/data/as/30173983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173983/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30173984/ws-services-calculation/Penalty.json b/data/as/30173984/ws-services-calculation/Penalty.json
index a3bbc3103d..8480422a5f 100644
--- a/data/as/30173984/ws-services-calculation/Penalty.json
+++ b/data/as/30173984/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173984/ws-services-calculation/WCBillingSlab.json b/data/as/30173984/ws-services-calculation/WCBillingSlab.json
index 5b7d51707c..717d6ba051 100644
--- a/data/as/30173984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173984/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174052/ws-services-calculation/Penalty.json b/data/as/30174052/ws-services-calculation/Penalty.json
index e8b1c93228..3bab6814c0 100644
--- a/data/as/30174052/ws-services-calculation/Penalty.json
+++ b/data/as/30174052/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174052/ws-services-calculation/WCBillingSlab.json b/data/as/30174052/ws-services-calculation/WCBillingSlab.json
index c299411dd5..f945a42c89 100644
--- a/data/as/30174052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174052/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174053/ws-services-calculation/Penalty.json b/data/as/30174053/ws-services-calculation/Penalty.json
index dab8cd1be2..31d017009c 100644
--- a/data/as/30174053/ws-services-calculation/Penalty.json
+++ b/data/as/30174053/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174053/ws-services-calculation/WCBillingSlab.json b/data/as/30174053/ws-services-calculation/WCBillingSlab.json
index efbd1cfae0..1e16e20884 100644
--- a/data/as/30174053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174053/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174055/ws-services-calculation/Penalty.json b/data/as/30174055/ws-services-calculation/Penalty.json
index 31362fd43c..c79ccaefc9 100644
--- a/data/as/30174055/ws-services-calculation/Penalty.json
+++ b/data/as/30174055/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174055/ws-services-calculation/WCBillingSlab.json b/data/as/30174055/ws-services-calculation/WCBillingSlab.json
index 10b9e64e31..7361511058 100644
--- a/data/as/30174055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174055/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174058/ws-services-calculation/Penalty.json b/data/as/30174058/ws-services-calculation/Penalty.json
index dc9c6a2dac..68019c0d83 100644
--- a/data/as/30174058/ws-services-calculation/Penalty.json
+++ b/data/as/30174058/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174058/ws-services-calculation/WCBillingSlab.json b/data/as/30174058/ws-services-calculation/WCBillingSlab.json
index 61116e197f..ef7892d1ea 100644
--- a/data/as/30174058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174058/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174059/ws-services-calculation/Penalty.json b/data/as/30174059/ws-services-calculation/Penalty.json
index 50a1bdb809..dd0f17e136 100644
--- a/data/as/30174059/ws-services-calculation/Penalty.json
+++ b/data/as/30174059/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174059/ws-services-calculation/WCBillingSlab.json b/data/as/30174059/ws-services-calculation/WCBillingSlab.json
index 51620f3ae2..efd7318e09 100644
--- a/data/as/30174059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174059/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174062/ws-services-calculation/Penalty.json b/data/as/30174062/ws-services-calculation/Penalty.json
index 93961f9e2d..6f7486609b 100644
--- a/data/as/30174062/ws-services-calculation/Penalty.json
+++ b/data/as/30174062/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174062/ws-services-calculation/WCBillingSlab.json b/data/as/30174062/ws-services-calculation/WCBillingSlab.json
index e73c437b43..3ca46508d5 100644
--- a/data/as/30174062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174062/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174064/ws-services-calculation/Penalty.json b/data/as/30174064/ws-services-calculation/Penalty.json
index 15faceb0d6..8ef9ef9b32 100644
--- a/data/as/30174064/ws-services-calculation/Penalty.json
+++ b/data/as/30174064/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174064/ws-services-calculation/WCBillingSlab.json b/data/as/30174064/ws-services-calculation/WCBillingSlab.json
index 9bee5c04de..60762d469f 100644
--- a/data/as/30174064/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174064/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174065/ws-services-calculation/Penalty.json b/data/as/30174065/ws-services-calculation/Penalty.json
index a441332070..3c3476549f 100644
--- a/data/as/30174065/ws-services-calculation/Penalty.json
+++ b/data/as/30174065/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174065/ws-services-calculation/WCBillingSlab.json b/data/as/30174065/ws-services-calculation/WCBillingSlab.json
index 1292df03ef..f1fa7641ef 100644
--- a/data/as/30174065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174065/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174068/ws-services-calculation/Penalty.json b/data/as/30174068/ws-services-calculation/Penalty.json
index 94b172c4de..e5a36bc5b5 100644
--- a/data/as/30174068/ws-services-calculation/Penalty.json
+++ b/data/as/30174068/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174068/ws-services-calculation/WCBillingSlab.json b/data/as/30174068/ws-services-calculation/WCBillingSlab.json
index 444206c853..25304c693f 100644
--- a/data/as/30174068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174068/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174070/ws-services-calculation/Penalty.json b/data/as/30174070/ws-services-calculation/Penalty.json
index fb6d26d4dd..9a28ef3b27 100644
--- a/data/as/30174070/ws-services-calculation/Penalty.json
+++ b/data/as/30174070/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174070/ws-services-calculation/WCBillingSlab.json b/data/as/30174070/ws-services-calculation/WCBillingSlab.json
index 1e618f5e23..faa89ae1ea 100644
--- a/data/as/30174070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174070/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174072/ws-services-calculation/Penalty.json b/data/as/30174072/ws-services-calculation/Penalty.json
index d2f044aa6c..6422dcdc1c 100644
--- a/data/as/30174072/ws-services-calculation/Penalty.json
+++ b/data/as/30174072/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174072/ws-services-calculation/WCBillingSlab.json b/data/as/30174072/ws-services-calculation/WCBillingSlab.json
index e172fe7c62..15057e5c72 100644
--- a/data/as/30174072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174072/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174082/ws-services-calculation/Penalty.json b/data/as/30174082/ws-services-calculation/Penalty.json
index 6bfa29496e..a3b5c7b1dc 100644
--- a/data/as/30174082/ws-services-calculation/Penalty.json
+++ b/data/as/30174082/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174082/ws-services-calculation/WCBillingSlab.json b/data/as/30174082/ws-services-calculation/WCBillingSlab.json
index 8406a1c4e8..c11aee1703 100644
--- a/data/as/30174082/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174082/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174084/ws-services-calculation/Penalty.json b/data/as/30174084/ws-services-calculation/Penalty.json
index 008610ea4e..47984a556a 100644
--- a/data/as/30174084/ws-services-calculation/Penalty.json
+++ b/data/as/30174084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174084/ws-services-calculation/WCBillingSlab.json b/data/as/30174084/ws-services-calculation/WCBillingSlab.json
index d0b05dfc87..98d2a81a28 100644
--- a/data/as/30174084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174085/ws-services-calculation/Penalty.json b/data/as/30174085/ws-services-calculation/Penalty.json
index 8543ccfed9..bc2376c0f0 100644
--- a/data/as/30174085/ws-services-calculation/Penalty.json
+++ b/data/as/30174085/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174085/ws-services-calculation/WCBillingSlab.json b/data/as/30174085/ws-services-calculation/WCBillingSlab.json
index 19aff23502..30b0647fd6 100644
--- a/data/as/30174085/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174085/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174088/ws-services-calculation/Penalty.json b/data/as/30174088/ws-services-calculation/Penalty.json
index aa96d5287f..b230388b46 100644
--- a/data/as/30174088/ws-services-calculation/Penalty.json
+++ b/data/as/30174088/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174088/ws-services-calculation/WCBillingSlab.json b/data/as/30174088/ws-services-calculation/WCBillingSlab.json
index c90afcfb43..1f71ed9510 100644
--- a/data/as/30174088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174088/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174094/ws-services-calculation/Penalty.json b/data/as/30174094/ws-services-calculation/Penalty.json
index 474ba3088f..56d7b721af 100644
--- a/data/as/30174094/ws-services-calculation/Penalty.json
+++ b/data/as/30174094/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174094/ws-services-calculation/WCBillingSlab.json b/data/as/30174094/ws-services-calculation/WCBillingSlab.json
index 68d60d2339..39b7934bb3 100644
--- a/data/as/30174094/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174094/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174097/ws-services-calculation/Penalty.json b/data/as/30174097/ws-services-calculation/Penalty.json
index d4ab1a6518..b0788e3b4f 100644
--- a/data/as/30174097/ws-services-calculation/Penalty.json
+++ b/data/as/30174097/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174097/ws-services-calculation/WCBillingSlab.json b/data/as/30174097/ws-services-calculation/WCBillingSlab.json
index 1b6c80b290..7dfde0d359 100644
--- a/data/as/30174097/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174097/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174123/ws-services-calculation/Penalty.json b/data/as/30174123/ws-services-calculation/Penalty.json
index ee27fb9ebb..2896b30d98 100644
--- a/data/as/30174123/ws-services-calculation/Penalty.json
+++ b/data/as/30174123/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174123/ws-services-calculation/WCBillingSlab.json b/data/as/30174123/ws-services-calculation/WCBillingSlab.json
index 1410b68a19..c2343254b3 100644
--- a/data/as/30174123/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174123/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174125/ws-services-calculation/Penalty.json b/data/as/30174125/ws-services-calculation/Penalty.json
index 0fd6797aa3..d8fab5c725 100644
--- a/data/as/30174125/ws-services-calculation/Penalty.json
+++ b/data/as/30174125/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174125/ws-services-calculation/WCBillingSlab.json b/data/as/30174125/ws-services-calculation/WCBillingSlab.json
index 03f7a68f8b..c57794359f 100644
--- a/data/as/30174125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174125/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174133/ws-services-calculation/Penalty.json b/data/as/30174133/ws-services-calculation/Penalty.json
index 2e561c2724..688ae5c799 100644
--- a/data/as/30174133/ws-services-calculation/Penalty.json
+++ b/data/as/30174133/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174133/ws-services-calculation/WCBillingSlab.json b/data/as/30174133/ws-services-calculation/WCBillingSlab.json
index 9fc34b0390..65582e704d 100644
--- a/data/as/30174133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174133/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174139/ws-services-calculation/Penalty.json b/data/as/30174139/ws-services-calculation/Penalty.json
index 5a6f9aaba5..519e3a4550 100644
--- a/data/as/30174139/ws-services-calculation/Penalty.json
+++ b/data/as/30174139/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174139/ws-services-calculation/WCBillingSlab.json b/data/as/30174139/ws-services-calculation/WCBillingSlab.json
index d558c7d2a1..d82664961a 100644
--- a/data/as/30174139/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174139/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174143/ws-services-calculation/Penalty.json b/data/as/30174143/ws-services-calculation/Penalty.json
index 61942d7f6f..50d50ff0d3 100644
--- a/data/as/30174143/ws-services-calculation/Penalty.json
+++ b/data/as/30174143/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174143/ws-services-calculation/WCBillingSlab.json b/data/as/30174143/ws-services-calculation/WCBillingSlab.json
index 91ae615eff..a4b52ff877 100644
--- a/data/as/30174143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174143/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174150/ws-services-calculation/Penalty.json b/data/as/30174150/ws-services-calculation/Penalty.json
index 63e3516b54..07cfcc8dd4 100644
--- a/data/as/30174150/ws-services-calculation/Penalty.json
+++ b/data/as/30174150/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174150/ws-services-calculation/WCBillingSlab.json b/data/as/30174150/ws-services-calculation/WCBillingSlab.json
index 8d6dba8ce7..cfe74f235a 100644
--- a/data/as/30174150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174150/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174158/ws-services-calculation/Penalty.json b/data/as/30174158/ws-services-calculation/Penalty.json
index 6bf0798427..c2e397e9b4 100644
--- a/data/as/30174158/ws-services-calculation/Penalty.json
+++ b/data/as/30174158/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174158/ws-services-calculation/WCBillingSlab.json b/data/as/30174158/ws-services-calculation/WCBillingSlab.json
index 1dafbf3fa6..b6f62e3723 100644
--- a/data/as/30174158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174158/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174165/ws-services-calculation/Penalty.json b/data/as/30174165/ws-services-calculation/Penalty.json
index dda08834bb..6dc88fc8d0 100644
--- a/data/as/30174165/ws-services-calculation/Penalty.json
+++ b/data/as/30174165/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174165/ws-services-calculation/WCBillingSlab.json b/data/as/30174165/ws-services-calculation/WCBillingSlab.json
index c72de25941..c9e77aff32 100644
--- a/data/as/30174165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174165/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174178/ws-services-calculation/Penalty.json b/data/as/30174178/ws-services-calculation/Penalty.json
index 958534243b..753c663358 100644
--- a/data/as/30174178/ws-services-calculation/Penalty.json
+++ b/data/as/30174178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174178/ws-services-calculation/WCBillingSlab.json b/data/as/30174178/ws-services-calculation/WCBillingSlab.json
index 3a1d091f93..7989794ead 100644
--- a/data/as/30174178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174186/ws-services-calculation/Penalty.json b/data/as/30174186/ws-services-calculation/Penalty.json
index a8ccd3d1bc..34c0445656 100644
--- a/data/as/30174186/ws-services-calculation/Penalty.json
+++ b/data/as/30174186/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174186/ws-services-calculation/WCBillingSlab.json b/data/as/30174186/ws-services-calculation/WCBillingSlab.json
index 738c0d70a3..af6ad2185e 100644
--- a/data/as/30174186/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174186/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174190/ws-services-calculation/Penalty.json b/data/as/30174190/ws-services-calculation/Penalty.json
index 0df90ea3d8..a41d112a72 100644
--- a/data/as/30174190/ws-services-calculation/Penalty.json
+++ b/data/as/30174190/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174190/ws-services-calculation/WCBillingSlab.json b/data/as/30174190/ws-services-calculation/WCBillingSlab.json
index 6dccf46195..f049332f2e 100644
--- a/data/as/30174190/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174190/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174199/ws-services-calculation/Penalty.json b/data/as/30174199/ws-services-calculation/Penalty.json
index 379a7efc00..8a2ad7bcd5 100644
--- a/data/as/30174199/ws-services-calculation/Penalty.json
+++ b/data/as/30174199/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174199/ws-services-calculation/WCBillingSlab.json b/data/as/30174199/ws-services-calculation/WCBillingSlab.json
index 3e16d23aca..11b3aff59c 100644
--- a/data/as/30174199/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174199/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174210/ws-services-calculation/Penalty.json b/data/as/30174210/ws-services-calculation/Penalty.json
index e33c345e13..2e3244032e 100644
--- a/data/as/30174210/ws-services-calculation/Penalty.json
+++ b/data/as/30174210/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174210/ws-services-calculation/WCBillingSlab.json b/data/as/30174210/ws-services-calculation/WCBillingSlab.json
index d8804a3f1c..b323fe1a88 100644
--- a/data/as/30174210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174210/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174211/ws-services-calculation/Penalty.json b/data/as/30174211/ws-services-calculation/Penalty.json
index fdbafc5ee2..ba773f581d 100644
--- a/data/as/30174211/ws-services-calculation/Penalty.json
+++ b/data/as/30174211/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174211/ws-services-calculation/WCBillingSlab.json b/data/as/30174211/ws-services-calculation/WCBillingSlab.json
index fb62838455..0e9c007227 100644
--- a/data/as/30174211/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174211/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174222/ws-services-calculation/Penalty.json b/data/as/30174222/ws-services-calculation/Penalty.json
index 86288743f2..299cf9d6e3 100644
--- a/data/as/30174222/ws-services-calculation/Penalty.json
+++ b/data/as/30174222/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174222/ws-services-calculation/WCBillingSlab.json b/data/as/30174222/ws-services-calculation/WCBillingSlab.json
index fa5d24252e..87ae37fb2c 100644
--- a/data/as/30174222/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174222/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174241/ws-services-calculation/Penalty.json b/data/as/30174241/ws-services-calculation/Penalty.json
index 5548b4ff1a..efe8fc1ae9 100644
--- a/data/as/30174241/ws-services-calculation/Penalty.json
+++ b/data/as/30174241/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174241/ws-services-calculation/WCBillingSlab.json b/data/as/30174241/ws-services-calculation/WCBillingSlab.json
index 284bb03d72..c98bdf907b 100644
--- a/data/as/30174241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174241/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174244/ws-services-calculation/Penalty.json b/data/as/30174244/ws-services-calculation/Penalty.json
index 324f93bce6..19d1829ed8 100644
--- a/data/as/30174244/ws-services-calculation/Penalty.json
+++ b/data/as/30174244/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174244/ws-services-calculation/WCBillingSlab.json b/data/as/30174244/ws-services-calculation/WCBillingSlab.json
index 8ef1e82dd1..81d11900a9 100644
--- a/data/as/30174244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174244/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174286/ws-services-calculation/Penalty.json b/data/as/30174286/ws-services-calculation/Penalty.json
index b23f21f1f0..665719be88 100644
--- a/data/as/30174286/ws-services-calculation/Penalty.json
+++ b/data/as/30174286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174286/ws-services-calculation/WCBillingSlab.json b/data/as/30174286/ws-services-calculation/WCBillingSlab.json
index 1151c56e26..54c8f0c849 100644
--- a/data/as/30174286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174291/ws-services-calculation/Penalty.json b/data/as/30174291/ws-services-calculation/Penalty.json
index 8d5711caeb..9d8a33aa2d 100644
--- a/data/as/30174291/ws-services-calculation/Penalty.json
+++ b/data/as/30174291/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174291/ws-services-calculation/WCBillingSlab.json b/data/as/30174291/ws-services-calculation/WCBillingSlab.json
index e661bec0ed..871b71b79f 100644
--- a/data/as/30174291/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174291/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174314/ws-services-calculation/Penalty.json b/data/as/30174314/ws-services-calculation/Penalty.json
index 12d6e945c8..4fd405e28f 100644
--- a/data/as/30174314/ws-services-calculation/Penalty.json
+++ b/data/as/30174314/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174314/ws-services-calculation/WCBillingSlab.json b/data/as/30174314/ws-services-calculation/WCBillingSlab.json
index 282d45d0cc..77800ba0b2 100644
--- a/data/as/30174314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174314/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174344/ws-services-calculation/Penalty.json b/data/as/30174344/ws-services-calculation/Penalty.json
index 3b6602f49a..3e781796d3 100644
--- a/data/as/30174344/ws-services-calculation/Penalty.json
+++ b/data/as/30174344/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174344/ws-services-calculation/WCBillingSlab.json b/data/as/30174344/ws-services-calculation/WCBillingSlab.json
index 33e40c19f0..9df19aa3e8 100644
--- a/data/as/30174344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174344/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174357/ws-services-calculation/Penalty.json b/data/as/30174357/ws-services-calculation/Penalty.json
index b74fbe75e8..b8ec6bbe70 100644
--- a/data/as/30174357/ws-services-calculation/Penalty.json
+++ b/data/as/30174357/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174357/ws-services-calculation/WCBillingSlab.json b/data/as/30174357/ws-services-calculation/WCBillingSlab.json
index 07d81d8192..093f137dbe 100644
--- a/data/as/30174357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174357/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174375/ws-services-calculation/Penalty.json b/data/as/30174375/ws-services-calculation/Penalty.json
index 2171452ef6..78540e370e 100644
--- a/data/as/30174375/ws-services-calculation/Penalty.json
+++ b/data/as/30174375/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174375/ws-services-calculation/WCBillingSlab.json b/data/as/30174375/ws-services-calculation/WCBillingSlab.json
index ac3b342096..7d0d66fd7b 100644
--- a/data/as/30174375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174375/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174407/ws-services-calculation/Penalty.json b/data/as/30174407/ws-services-calculation/Penalty.json
index 64d175a629..548684a4cf 100644
--- a/data/as/30174407/ws-services-calculation/Penalty.json
+++ b/data/as/30174407/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174407/ws-services-calculation/WCBillingSlab.json b/data/as/30174407/ws-services-calculation/WCBillingSlab.json
index 2e76a4c5cf..f732c596f4 100644
--- a/data/as/30174407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174407/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174416/ws-services-calculation/Penalty.json b/data/as/30174416/ws-services-calculation/Penalty.json
index 9814d3feaf..c756ea4250 100644
--- a/data/as/30174416/ws-services-calculation/Penalty.json
+++ b/data/as/30174416/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174416/ws-services-calculation/WCBillingSlab.json b/data/as/30174416/ws-services-calculation/WCBillingSlab.json
index 28f2426695..d1288ca26e 100644
--- a/data/as/30174416/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174416/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174419/ws-services-calculation/Penalty.json b/data/as/30174419/ws-services-calculation/Penalty.json
index c051d2e1f8..6acf70ce46 100644
--- a/data/as/30174419/ws-services-calculation/Penalty.json
+++ b/data/as/30174419/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174419/ws-services-calculation/WCBillingSlab.json b/data/as/30174419/ws-services-calculation/WCBillingSlab.json
index ede4e36a10..75a3dbab15 100644
--- a/data/as/30174419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174419/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174439/ws-services-calculation/Penalty.json b/data/as/30174439/ws-services-calculation/Penalty.json
index 1f64efc548..182ece4138 100644
--- a/data/as/30174439/ws-services-calculation/Penalty.json
+++ b/data/as/30174439/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174439/ws-services-calculation/WCBillingSlab.json b/data/as/30174439/ws-services-calculation/WCBillingSlab.json
index bc476b6573..0ea79a3fa9 100644
--- a/data/as/30174439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174439/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174442/ws-services-calculation/Penalty.json b/data/as/30174442/ws-services-calculation/Penalty.json
index 564507250b..552066fe05 100644
--- a/data/as/30174442/ws-services-calculation/Penalty.json
+++ b/data/as/30174442/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174442/ws-services-calculation/WCBillingSlab.json b/data/as/30174442/ws-services-calculation/WCBillingSlab.json
index 198df5ba80..45a94ce8c7 100644
--- a/data/as/30174442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174442/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174454/ws-services-calculation/Penalty.json b/data/as/30174454/ws-services-calculation/Penalty.json
index 390af3b45a..e3862bd7d7 100644
--- a/data/as/30174454/ws-services-calculation/Penalty.json
+++ b/data/as/30174454/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174454/ws-services-calculation/WCBillingSlab.json b/data/as/30174454/ws-services-calculation/WCBillingSlab.json
index da6f264431..812833df75 100644
--- a/data/as/30174454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174454/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174538/ws-services-calculation/Penalty.json b/data/as/30174538/ws-services-calculation/Penalty.json
index f78e06c3ba..3532ceefb2 100644
--- a/data/as/30174538/ws-services-calculation/Penalty.json
+++ b/data/as/30174538/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174538/ws-services-calculation/WCBillingSlab.json b/data/as/30174538/ws-services-calculation/WCBillingSlab.json
index c09a94f2a6..f7f4396a9b 100644
--- a/data/as/30174538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174538/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174541/ws-services-calculation/Penalty.json b/data/as/30174541/ws-services-calculation/Penalty.json
index 5a23a1218d..a436959ac5 100644
--- a/data/as/30174541/ws-services-calculation/Penalty.json
+++ b/data/as/30174541/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174541/ws-services-calculation/WCBillingSlab.json b/data/as/30174541/ws-services-calculation/WCBillingSlab.json
index 37d0113b64..f21506699f 100644
--- a/data/as/30174541/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174541/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174546/ws-services-calculation/Penalty.json b/data/as/30174546/ws-services-calculation/Penalty.json
index a211c06098..c83ded62cd 100644
--- a/data/as/30174546/ws-services-calculation/Penalty.json
+++ b/data/as/30174546/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174546/ws-services-calculation/WCBillingSlab.json b/data/as/30174546/ws-services-calculation/WCBillingSlab.json
index ed5e79e241..3a416824d0 100644
--- a/data/as/30174546/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174546/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174562/ws-services-calculation/Penalty.json b/data/as/30174562/ws-services-calculation/Penalty.json
index 7271d1a4a4..b089c9ba69 100644
--- a/data/as/30174562/ws-services-calculation/Penalty.json
+++ b/data/as/30174562/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174562/ws-services-calculation/WCBillingSlab.json b/data/as/30174562/ws-services-calculation/WCBillingSlab.json
index 0d34aad5e1..e36badd1ca 100644
--- a/data/as/30174562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174562/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174577/ws-services-calculation/Penalty.json b/data/as/30174577/ws-services-calculation/Penalty.json
index 9e54dc9d8c..79b611f740 100644
--- a/data/as/30174577/ws-services-calculation/Penalty.json
+++ b/data/as/30174577/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174577/ws-services-calculation/WCBillingSlab.json b/data/as/30174577/ws-services-calculation/WCBillingSlab.json
index b08fd8af54..1c5075a129 100644
--- a/data/as/30174577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174577/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174593/ws-services-calculation/Penalty.json b/data/as/30174593/ws-services-calculation/Penalty.json
index 2a009be310..a5fbab268a 100644
--- a/data/as/30174593/ws-services-calculation/Penalty.json
+++ b/data/as/30174593/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174593/ws-services-calculation/WCBillingSlab.json b/data/as/30174593/ws-services-calculation/WCBillingSlab.json
index b6e505248f..9a8d621bbd 100644
--- a/data/as/30174593/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174593/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174610/ws-services-calculation/Penalty.json b/data/as/30174610/ws-services-calculation/Penalty.json
index e7e45b4010..3d0a3fef92 100644
--- a/data/as/30174610/ws-services-calculation/Penalty.json
+++ b/data/as/30174610/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174610/ws-services-calculation/WCBillingSlab.json b/data/as/30174610/ws-services-calculation/WCBillingSlab.json
index 961135d78d..d1867adcb9 100644
--- a/data/as/30174610/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174610/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174622/ws-services-calculation/Penalty.json b/data/as/30174622/ws-services-calculation/Penalty.json
index 136e11a30c..32c4e0a873 100644
--- a/data/as/30174622/ws-services-calculation/Penalty.json
+++ b/data/as/30174622/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174622/ws-services-calculation/WCBillingSlab.json b/data/as/30174622/ws-services-calculation/WCBillingSlab.json
index 04757494ae..23578c4d24 100644
--- a/data/as/30174622/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174622/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174633/ws-services-calculation/Penalty.json b/data/as/30174633/ws-services-calculation/Penalty.json
index 72cee177e6..aeb12f9c18 100644
--- a/data/as/30174633/ws-services-calculation/Penalty.json
+++ b/data/as/30174633/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174633/ws-services-calculation/WCBillingSlab.json b/data/as/30174633/ws-services-calculation/WCBillingSlab.json
index ae5bbab3cc..1b606d47d1 100644
--- a/data/as/30174633/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174633/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174651/ws-services-calculation/Penalty.json b/data/as/30174651/ws-services-calculation/Penalty.json
index 308290c782..e7fb964b00 100644
--- a/data/as/30174651/ws-services-calculation/Penalty.json
+++ b/data/as/30174651/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174651/ws-services-calculation/WCBillingSlab.json b/data/as/30174651/ws-services-calculation/WCBillingSlab.json
index 988730988a..733c1bcf13 100644
--- a/data/as/30174651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174651/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174677/ws-services-calculation/Penalty.json b/data/as/30174677/ws-services-calculation/Penalty.json
index 64745682b6..b23b397950 100644
--- a/data/as/30174677/ws-services-calculation/Penalty.json
+++ b/data/as/30174677/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174677/ws-services-calculation/WCBillingSlab.json b/data/as/30174677/ws-services-calculation/WCBillingSlab.json
index 9f6ccd0333..e225f5aa29 100644
--- a/data/as/30174677/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174677/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174688/ws-services-calculation/Penalty.json b/data/as/30174688/ws-services-calculation/Penalty.json
index bd27e6744d..8db734c25e 100644
--- a/data/as/30174688/ws-services-calculation/Penalty.json
+++ b/data/as/30174688/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174688/ws-services-calculation/WCBillingSlab.json b/data/as/30174688/ws-services-calculation/WCBillingSlab.json
index 4839799d5c..cfb4250ec2 100644
--- a/data/as/30174688/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174688/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174694/ws-services-calculation/Penalty.json b/data/as/30174694/ws-services-calculation/Penalty.json
index 40dad8fb81..1202d7bc7c 100644
--- a/data/as/30174694/ws-services-calculation/Penalty.json
+++ b/data/as/30174694/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174694/ws-services-calculation/WCBillingSlab.json b/data/as/30174694/ws-services-calculation/WCBillingSlab.json
index a1cc1efb51..a30aac9b00 100644
--- a/data/as/30174694/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174694/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174699/ws-services-calculation/Penalty.json b/data/as/30174699/ws-services-calculation/Penalty.json
index 1eaa37985f..4dff0fa953 100644
--- a/data/as/30174699/ws-services-calculation/Penalty.json
+++ b/data/as/30174699/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174699/ws-services-calculation/WCBillingSlab.json b/data/as/30174699/ws-services-calculation/WCBillingSlab.json
index ac49a1b63b..ef8101dc1d 100644
--- a/data/as/30174699/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174699/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174700/ws-services-calculation/Penalty.json b/data/as/30174700/ws-services-calculation/Penalty.json
index 30a78b7eae..2cd26b185f 100644
--- a/data/as/30174700/ws-services-calculation/Penalty.json
+++ b/data/as/30174700/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174700/ws-services-calculation/WCBillingSlab.json b/data/as/30174700/ws-services-calculation/WCBillingSlab.json
index ddb0d108cf..d696f911e5 100644
--- a/data/as/30174700/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174700/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174721/ws-services-calculation/Penalty.json b/data/as/30174721/ws-services-calculation/Penalty.json
index 13c53ff68c..e038073012 100644
--- a/data/as/30174721/ws-services-calculation/Penalty.json
+++ b/data/as/30174721/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174721/ws-services-calculation/WCBillingSlab.json b/data/as/30174721/ws-services-calculation/WCBillingSlab.json
index 08fd08a52b..3d418b1d43 100644
--- a/data/as/30174721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174721/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174729/ws-services-calculation/Penalty.json b/data/as/30174729/ws-services-calculation/Penalty.json
index 6735474e95..3a0d3be282 100644
--- a/data/as/30174729/ws-services-calculation/Penalty.json
+++ b/data/as/30174729/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174729/ws-services-calculation/WCBillingSlab.json b/data/as/30174729/ws-services-calculation/WCBillingSlab.json
index 641f9dfbd6..6056f53aec 100644
--- a/data/as/30174729/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174729/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174732/ws-services-calculation/Penalty.json b/data/as/30174732/ws-services-calculation/Penalty.json
index 26ed0a93ef..e5768aa8a8 100644
--- a/data/as/30174732/ws-services-calculation/Penalty.json
+++ b/data/as/30174732/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174732/ws-services-calculation/WCBillingSlab.json b/data/as/30174732/ws-services-calculation/WCBillingSlab.json
index 813c677dd7..fb7786062e 100644
--- a/data/as/30174732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174732/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174740/ws-services-calculation/Penalty.json b/data/as/30174740/ws-services-calculation/Penalty.json
index 8dcf968978..ca32419d39 100644
--- a/data/as/30174740/ws-services-calculation/Penalty.json
+++ b/data/as/30174740/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174740/ws-services-calculation/WCBillingSlab.json b/data/as/30174740/ws-services-calculation/WCBillingSlab.json
index 345ba2222f..51b117eb14 100644
--- a/data/as/30174740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174740/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174745/ws-services-calculation/Penalty.json b/data/as/30174745/ws-services-calculation/Penalty.json
index 88e35ccc64..51b6fae564 100644
--- a/data/as/30174745/ws-services-calculation/Penalty.json
+++ b/data/as/30174745/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174745/ws-services-calculation/WCBillingSlab.json b/data/as/30174745/ws-services-calculation/WCBillingSlab.json
index 48b8138914..aa306cfc64 100644
--- a/data/as/30174745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174745/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174747/ws-services-calculation/Penalty.json b/data/as/30174747/ws-services-calculation/Penalty.json
index de2fee34c7..8dbb880197 100644
--- a/data/as/30174747/ws-services-calculation/Penalty.json
+++ b/data/as/30174747/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174747/ws-services-calculation/WCBillingSlab.json b/data/as/30174747/ws-services-calculation/WCBillingSlab.json
index a951e06f8d..8722b94dc5 100644
--- a/data/as/30174747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174747/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174796/ws-services-calculation/Penalty.json b/data/as/30174796/ws-services-calculation/Penalty.json
index ee9b13a863..01ff594db6 100644
--- a/data/as/30174796/ws-services-calculation/Penalty.json
+++ b/data/as/30174796/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174796/ws-services-calculation/WCBillingSlab.json b/data/as/30174796/ws-services-calculation/WCBillingSlab.json
index 8b34032afd..517b55570a 100644
--- a/data/as/30174796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174796/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174826/ws-services-calculation/Penalty.json b/data/as/30174826/ws-services-calculation/Penalty.json
index ef8a491fac..ae37653133 100644
--- a/data/as/30174826/ws-services-calculation/Penalty.json
+++ b/data/as/30174826/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174826/ws-services-calculation/WCBillingSlab.json b/data/as/30174826/ws-services-calculation/WCBillingSlab.json
index 7c53f96c90..e27b32a644 100644
--- a/data/as/30174826/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174826/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174847/ws-services-calculation/Penalty.json b/data/as/30174847/ws-services-calculation/Penalty.json
index 290a1113e0..a831a68d82 100644
--- a/data/as/30174847/ws-services-calculation/Penalty.json
+++ b/data/as/30174847/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174847/ws-services-calculation/WCBillingSlab.json b/data/as/30174847/ws-services-calculation/WCBillingSlab.json
index e14fc54c01..96915d5c34 100644
--- a/data/as/30174847/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174847/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174854/ws-services-calculation/Penalty.json b/data/as/30174854/ws-services-calculation/Penalty.json
index b1d30c5583..d3685458e4 100644
--- a/data/as/30174854/ws-services-calculation/Penalty.json
+++ b/data/as/30174854/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174854/ws-services-calculation/WCBillingSlab.json b/data/as/30174854/ws-services-calculation/WCBillingSlab.json
index 6f5039f57d..d3ff443bec 100644
--- a/data/as/30174854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174854/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174863/ws-services-calculation/Penalty.json b/data/as/30174863/ws-services-calculation/Penalty.json
index dfa89a5c8a..a4d852b878 100644
--- a/data/as/30174863/ws-services-calculation/Penalty.json
+++ b/data/as/30174863/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174863/ws-services-calculation/WCBillingSlab.json b/data/as/30174863/ws-services-calculation/WCBillingSlab.json
index 5c57aa5cbb..e551c73f4a 100644
--- a/data/as/30174863/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174863/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174870/ws-services-calculation/Penalty.json b/data/as/30174870/ws-services-calculation/Penalty.json
index 67321e8482..72bed50971 100644
--- a/data/as/30174870/ws-services-calculation/Penalty.json
+++ b/data/as/30174870/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174870/ws-services-calculation/WCBillingSlab.json b/data/as/30174870/ws-services-calculation/WCBillingSlab.json
index 5ec77140e1..a2afc5ee94 100644
--- a/data/as/30174870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174870/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174887/ws-services-calculation/Penalty.json b/data/as/30174887/ws-services-calculation/Penalty.json
index e08b530305..17c50faf51 100644
--- a/data/as/30174887/ws-services-calculation/Penalty.json
+++ b/data/as/30174887/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174887/ws-services-calculation/WCBillingSlab.json b/data/as/30174887/ws-services-calculation/WCBillingSlab.json
index 7de3e1c5ec..023e3e0cd2 100644
--- a/data/as/30174887/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174887/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174894/ws-services-calculation/Penalty.json b/data/as/30174894/ws-services-calculation/Penalty.json
index 5a3cd6c40c..7945ded969 100644
--- a/data/as/30174894/ws-services-calculation/Penalty.json
+++ b/data/as/30174894/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174894/ws-services-calculation/WCBillingSlab.json b/data/as/30174894/ws-services-calculation/WCBillingSlab.json
index 9243b631f8..633169be44 100644
--- a/data/as/30174894/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174894/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174961/ws-services-calculation/Penalty.json b/data/as/30174961/ws-services-calculation/Penalty.json
index 03fd61f5b0..324c1c9c66 100644
--- a/data/as/30174961/ws-services-calculation/Penalty.json
+++ b/data/as/30174961/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174961/ws-services-calculation/WCBillingSlab.json b/data/as/30174961/ws-services-calculation/WCBillingSlab.json
index 8f074ad6f0..aa5c322c09 100644
--- a/data/as/30174961/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174961/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30174977/ws-services-calculation/Penalty.json b/data/as/30174977/ws-services-calculation/Penalty.json
index d0e2116769..edbf9b1624 100644
--- a/data/as/30174977/ws-services-calculation/Penalty.json
+++ b/data/as/30174977/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174977/ws-services-calculation/WCBillingSlab.json b/data/as/30174977/ws-services-calculation/WCBillingSlab.json
index c1e4194ac6..778b713a23 100644
--- a/data/as/30174977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174977/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175021/ws-services-calculation/Penalty.json b/data/as/30175021/ws-services-calculation/Penalty.json
index 354126db3a..02b94635a2 100644
--- a/data/as/30175021/ws-services-calculation/Penalty.json
+++ b/data/as/30175021/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175021/ws-services-calculation/WCBillingSlab.json b/data/as/30175021/ws-services-calculation/WCBillingSlab.json
index ac0f449785..9e5ef2b7a2 100644
--- a/data/as/30175021/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175021/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175053/ws-services-calculation/Penalty.json b/data/as/30175053/ws-services-calculation/Penalty.json
index 6084d3ac58..7d495854c5 100644
--- a/data/as/30175053/ws-services-calculation/Penalty.json
+++ b/data/as/30175053/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175053/ws-services-calculation/WCBillingSlab.json b/data/as/30175053/ws-services-calculation/WCBillingSlab.json
index ecdf7c0e35..d16d31f7ef 100644
--- a/data/as/30175053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175053/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175075/ws-services-calculation/Penalty.json b/data/as/30175075/ws-services-calculation/Penalty.json
index 5410385d8e..0b99f160a4 100644
--- a/data/as/30175075/ws-services-calculation/Penalty.json
+++ b/data/as/30175075/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175075/ws-services-calculation/WCBillingSlab.json b/data/as/30175075/ws-services-calculation/WCBillingSlab.json
index b4b7f4d9a4..cc4c225d66 100644
--- a/data/as/30175075/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175075/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175155/ws-services-calculation/Penalty.json b/data/as/30175155/ws-services-calculation/Penalty.json
index 993ceeb42d..09b373fbd4 100644
--- a/data/as/30175155/ws-services-calculation/Penalty.json
+++ b/data/as/30175155/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175155/ws-services-calculation/WCBillingSlab.json b/data/as/30175155/ws-services-calculation/WCBillingSlab.json
index a992ab4941..38442a15d9 100644
--- a/data/as/30175155/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175155/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175169/ws-services-calculation/Penalty.json b/data/as/30175169/ws-services-calculation/Penalty.json
index 1eada6f61e..7a539669b0 100644
--- a/data/as/30175169/ws-services-calculation/Penalty.json
+++ b/data/as/30175169/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175169/ws-services-calculation/WCBillingSlab.json b/data/as/30175169/ws-services-calculation/WCBillingSlab.json
index a77fb6ab19..40c7bbf63a 100644
--- a/data/as/30175169/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175169/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175190/ws-services-calculation/Penalty.json b/data/as/30175190/ws-services-calculation/Penalty.json
index a384b4ea25..9238a22db2 100644
--- a/data/as/30175190/ws-services-calculation/Penalty.json
+++ b/data/as/30175190/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175190/ws-services-calculation/WCBillingSlab.json b/data/as/30175190/ws-services-calculation/WCBillingSlab.json
index 79bfcec6cf..2cf15ac66e 100644
--- a/data/as/30175190/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175190/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175203/ws-services-calculation/Penalty.json b/data/as/30175203/ws-services-calculation/Penalty.json
index 67e57926ac..ca04bb1b4b 100644
--- a/data/as/30175203/ws-services-calculation/Penalty.json
+++ b/data/as/30175203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175203/ws-services-calculation/WCBillingSlab.json b/data/as/30175203/ws-services-calculation/WCBillingSlab.json
index 92ee96f889..0c2ee2b4ec 100644
--- a/data/as/30175203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175204/ws-services-calculation/Penalty.json b/data/as/30175204/ws-services-calculation/Penalty.json
index 286e276c96..20f6ace6fe 100644
--- a/data/as/30175204/ws-services-calculation/Penalty.json
+++ b/data/as/30175204/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175204/ws-services-calculation/WCBillingSlab.json b/data/as/30175204/ws-services-calculation/WCBillingSlab.json
index 40a7328d02..1135da741b 100644
--- a/data/as/30175204/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175204/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175213/ws-services-calculation/Penalty.json b/data/as/30175213/ws-services-calculation/Penalty.json
index 9725522231..ba02f4032b 100644
--- a/data/as/30175213/ws-services-calculation/Penalty.json
+++ b/data/as/30175213/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175213/ws-services-calculation/WCBillingSlab.json b/data/as/30175213/ws-services-calculation/WCBillingSlab.json
index 4b65dd211b..3135fbc469 100644
--- a/data/as/30175213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175213/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175228/ws-services-calculation/Penalty.json b/data/as/30175228/ws-services-calculation/Penalty.json
index 9ce0d62919..7836b4f34a 100644
--- a/data/as/30175228/ws-services-calculation/Penalty.json
+++ b/data/as/30175228/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175228/ws-services-calculation/WCBillingSlab.json b/data/as/30175228/ws-services-calculation/WCBillingSlab.json
index b46c89c4e9..27d517ff00 100644
--- a/data/as/30175228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175228/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175239/ws-services-calculation/Penalty.json b/data/as/30175239/ws-services-calculation/Penalty.json
index 40bf0440d1..0a7ff9af1a 100644
--- a/data/as/30175239/ws-services-calculation/Penalty.json
+++ b/data/as/30175239/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175239/ws-services-calculation/WCBillingSlab.json b/data/as/30175239/ws-services-calculation/WCBillingSlab.json
index 2758ab7691..84c4c366e1 100644
--- a/data/as/30175239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175239/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175264/ws-services-calculation/Penalty.json b/data/as/30175264/ws-services-calculation/Penalty.json
index ac156382c0..248dd7cb6f 100644
--- a/data/as/30175264/ws-services-calculation/Penalty.json
+++ b/data/as/30175264/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175264/ws-services-calculation/WCBillingSlab.json b/data/as/30175264/ws-services-calculation/WCBillingSlab.json
index 0690a39eff..cd28319c7a 100644
--- a/data/as/30175264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175264/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175272/ws-services-calculation/Penalty.json b/data/as/30175272/ws-services-calculation/Penalty.json
index 145ce5cb46..45e9a2e3a2 100644
--- a/data/as/30175272/ws-services-calculation/Penalty.json
+++ b/data/as/30175272/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175272/ws-services-calculation/WCBillingSlab.json b/data/as/30175272/ws-services-calculation/WCBillingSlab.json
index 54ca532d8d..51344585b1 100644
--- a/data/as/30175272/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175272/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175295/ws-services-calculation/Penalty.json b/data/as/30175295/ws-services-calculation/Penalty.json
index 01d082038f..ba5833d559 100644
--- a/data/as/30175295/ws-services-calculation/Penalty.json
+++ b/data/as/30175295/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175295/ws-services-calculation/WCBillingSlab.json b/data/as/30175295/ws-services-calculation/WCBillingSlab.json
index e2416a591c..4c406e8915 100644
--- a/data/as/30175295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175295/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175334/ws-services-calculation/Penalty.json b/data/as/30175334/ws-services-calculation/Penalty.json
index 0fcba6e8d9..fd615c1d3f 100644
--- a/data/as/30175334/ws-services-calculation/Penalty.json
+++ b/data/as/30175334/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175334/ws-services-calculation/WCBillingSlab.json b/data/as/30175334/ws-services-calculation/WCBillingSlab.json
index c5cb420aae..7ced3be04a 100644
--- a/data/as/30175334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175334/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175367/ws-services-calculation/Penalty.json b/data/as/30175367/ws-services-calculation/Penalty.json
index 849508e5bd..0f9463f4f0 100644
--- a/data/as/30175367/ws-services-calculation/Penalty.json
+++ b/data/as/30175367/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175367/ws-services-calculation/WCBillingSlab.json b/data/as/30175367/ws-services-calculation/WCBillingSlab.json
index d8cb9f40fa..460fccab5f 100644
--- a/data/as/30175367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175367/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175392/ws-services-calculation/Penalty.json b/data/as/30175392/ws-services-calculation/Penalty.json
index aff5f8177c..769d6a7c68 100644
--- a/data/as/30175392/ws-services-calculation/Penalty.json
+++ b/data/as/30175392/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175392/ws-services-calculation/WCBillingSlab.json b/data/as/30175392/ws-services-calculation/WCBillingSlab.json
index 730de57fa6..1eeb06e2fd 100644
--- a/data/as/30175392/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175392/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175425/ws-services-calculation/Penalty.json b/data/as/30175425/ws-services-calculation/Penalty.json
index 121c29e68e..71bf6c1c6a 100644
--- a/data/as/30175425/ws-services-calculation/Penalty.json
+++ b/data/as/30175425/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175425/ws-services-calculation/WCBillingSlab.json b/data/as/30175425/ws-services-calculation/WCBillingSlab.json
index 54dfb7e408..81a3ef35d5 100644
--- a/data/as/30175425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175425/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175446/ws-services-calculation/Penalty.json b/data/as/30175446/ws-services-calculation/Penalty.json
index 1827f47d9a..e12fc53798 100644
--- a/data/as/30175446/ws-services-calculation/Penalty.json
+++ b/data/as/30175446/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175446/ws-services-calculation/WCBillingSlab.json b/data/as/30175446/ws-services-calculation/WCBillingSlab.json
index 72c7168b70..d3eaa4d7ac 100644
--- a/data/as/30175446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175446/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175464/ws-services-calculation/Penalty.json b/data/as/30175464/ws-services-calculation/Penalty.json
index b1bda1dbc0..0511613ad5 100644
--- a/data/as/30175464/ws-services-calculation/Penalty.json
+++ b/data/as/30175464/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175464/ws-services-calculation/WCBillingSlab.json b/data/as/30175464/ws-services-calculation/WCBillingSlab.json
index 4cef689795..b0f79a9327 100644
--- a/data/as/30175464/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175464/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175466/ws-services-calculation/Penalty.json b/data/as/30175466/ws-services-calculation/Penalty.json
index 8ee369fa76..11634f8b58 100644
--- a/data/as/30175466/ws-services-calculation/Penalty.json
+++ b/data/as/30175466/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175466/ws-services-calculation/WCBillingSlab.json b/data/as/30175466/ws-services-calculation/WCBillingSlab.json
index ca8b3a4207..e6555d77c2 100644
--- a/data/as/30175466/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175466/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175474/ws-services-calculation/Penalty.json b/data/as/30175474/ws-services-calculation/Penalty.json
index c6ff446a1f..2886b47e87 100644
--- a/data/as/30175474/ws-services-calculation/Penalty.json
+++ b/data/as/30175474/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175474/ws-services-calculation/WCBillingSlab.json b/data/as/30175474/ws-services-calculation/WCBillingSlab.json
index 5caa1b8016..42c6673c89 100644
--- a/data/as/30175474/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175474/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175490/ws-services-calculation/Penalty.json b/data/as/30175490/ws-services-calculation/Penalty.json
index 30e50fe6e1..2b362cc091 100644
--- a/data/as/30175490/ws-services-calculation/Penalty.json
+++ b/data/as/30175490/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175490/ws-services-calculation/WCBillingSlab.json b/data/as/30175490/ws-services-calculation/WCBillingSlab.json
index 8aa7b275aa..5f6263871c 100644
--- a/data/as/30175490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175490/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175493/ws-services-calculation/Penalty.json b/data/as/30175493/ws-services-calculation/Penalty.json
index d0482ee1c0..1af8bf1e78 100644
--- a/data/as/30175493/ws-services-calculation/Penalty.json
+++ b/data/as/30175493/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175493/ws-services-calculation/WCBillingSlab.json b/data/as/30175493/ws-services-calculation/WCBillingSlab.json
index 6a813b6a5e..4d57dc5ea6 100644
--- a/data/as/30175493/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175493/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175539/ws-services-calculation/Penalty.json b/data/as/30175539/ws-services-calculation/Penalty.json
index c836846097..34a75a8902 100644
--- a/data/as/30175539/ws-services-calculation/Penalty.json
+++ b/data/as/30175539/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175539/ws-services-calculation/WCBillingSlab.json b/data/as/30175539/ws-services-calculation/WCBillingSlab.json
index 38a43b1d8a..9ca6b146ac 100644
--- a/data/as/30175539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175539/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175554/ws-services-calculation/Penalty.json b/data/as/30175554/ws-services-calculation/Penalty.json
index 102343ef46..306801c942 100644
--- a/data/as/30175554/ws-services-calculation/Penalty.json
+++ b/data/as/30175554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175554/ws-services-calculation/WCBillingSlab.json b/data/as/30175554/ws-services-calculation/WCBillingSlab.json
index a4c4dca392..27b5789140 100644
--- a/data/as/30175554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175635/ws-services-calculation/Penalty.json b/data/as/30175635/ws-services-calculation/Penalty.json
index 758faa144e..f14819abc2 100644
--- a/data/as/30175635/ws-services-calculation/Penalty.json
+++ b/data/as/30175635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175635/ws-services-calculation/WCBillingSlab.json b/data/as/30175635/ws-services-calculation/WCBillingSlab.json
index 66a2c1a15f..790914b450 100644
--- a/data/as/30175635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175648/ws-services-calculation/Penalty.json b/data/as/30175648/ws-services-calculation/Penalty.json
index e674617a12..04b27d7f30 100644
--- a/data/as/30175648/ws-services-calculation/Penalty.json
+++ b/data/as/30175648/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175648/ws-services-calculation/WCBillingSlab.json b/data/as/30175648/ws-services-calculation/WCBillingSlab.json
index 3870f479fa..08d10b4db6 100644
--- a/data/as/30175648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175648/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175668/ws-services-calculation/Penalty.json b/data/as/30175668/ws-services-calculation/Penalty.json
index ab741f4b81..fa9a4a4be5 100644
--- a/data/as/30175668/ws-services-calculation/Penalty.json
+++ b/data/as/30175668/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175668/ws-services-calculation/WCBillingSlab.json b/data/as/30175668/ws-services-calculation/WCBillingSlab.json
index 56bf1ce3ac..6ad665ab39 100644
--- a/data/as/30175668/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175668/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175691/ws-services-calculation/Penalty.json b/data/as/30175691/ws-services-calculation/Penalty.json
index 91f8dfe961..4e9fa94e16 100644
--- a/data/as/30175691/ws-services-calculation/Penalty.json
+++ b/data/as/30175691/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175691/ws-services-calculation/WCBillingSlab.json b/data/as/30175691/ws-services-calculation/WCBillingSlab.json
index 12bd0ebe28..64f888f188 100644
--- a/data/as/30175691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175691/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175708/ws-services-calculation/Penalty.json b/data/as/30175708/ws-services-calculation/Penalty.json
index dc03ca24db..4979816ad6 100644
--- a/data/as/30175708/ws-services-calculation/Penalty.json
+++ b/data/as/30175708/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175708/ws-services-calculation/WCBillingSlab.json b/data/as/30175708/ws-services-calculation/WCBillingSlab.json
index 0a7a1d4d7a..b2d9750592 100644
--- a/data/as/30175708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175708/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175727/ws-services-calculation/Penalty.json b/data/as/30175727/ws-services-calculation/Penalty.json
index 898352a944..15f3962a88 100644
--- a/data/as/30175727/ws-services-calculation/Penalty.json
+++ b/data/as/30175727/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175727/ws-services-calculation/WCBillingSlab.json b/data/as/30175727/ws-services-calculation/WCBillingSlab.json
index 848f14dce5..0fb007f396 100644
--- a/data/as/30175727/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175727/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175767/ws-services-calculation/Penalty.json b/data/as/30175767/ws-services-calculation/Penalty.json
index 2d7d6f73c5..a4c9bfd58f 100644
--- a/data/as/30175767/ws-services-calculation/Penalty.json
+++ b/data/as/30175767/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175767/ws-services-calculation/WCBillingSlab.json b/data/as/30175767/ws-services-calculation/WCBillingSlab.json
index 1e3a57e565..eabe23b642 100644
--- a/data/as/30175767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175767/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175783/ws-services-calculation/Penalty.json b/data/as/30175783/ws-services-calculation/Penalty.json
index 567aecd418..8e1179e755 100644
--- a/data/as/30175783/ws-services-calculation/Penalty.json
+++ b/data/as/30175783/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175783/ws-services-calculation/WCBillingSlab.json b/data/as/30175783/ws-services-calculation/WCBillingSlab.json
index 91f52b30c5..0df17feab6 100644
--- a/data/as/30175783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175783/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175784/ws-services-calculation/Penalty.json b/data/as/30175784/ws-services-calculation/Penalty.json
index 5561432158..97fa779ba5 100644
--- a/data/as/30175784/ws-services-calculation/Penalty.json
+++ b/data/as/30175784/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175784/ws-services-calculation/WCBillingSlab.json b/data/as/30175784/ws-services-calculation/WCBillingSlab.json
index c6e629f86b..5859395050 100644
--- a/data/as/30175784/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175784/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175795/ws-services-calculation/Penalty.json b/data/as/30175795/ws-services-calculation/Penalty.json
index 9447eb5cd4..549b1789c6 100644
--- a/data/as/30175795/ws-services-calculation/Penalty.json
+++ b/data/as/30175795/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175795/ws-services-calculation/WCBillingSlab.json b/data/as/30175795/ws-services-calculation/WCBillingSlab.json
index b93e61f149..32d76035f4 100644
--- a/data/as/30175795/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175795/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175807/ws-services-calculation/Penalty.json b/data/as/30175807/ws-services-calculation/Penalty.json
index dc06a426a0..afa0f01bc4 100644
--- a/data/as/30175807/ws-services-calculation/Penalty.json
+++ b/data/as/30175807/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175807/ws-services-calculation/WCBillingSlab.json b/data/as/30175807/ws-services-calculation/WCBillingSlab.json
index fad4af1f63..e8df79da1e 100644
--- a/data/as/30175807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175807/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175812/ws-services-calculation/Penalty.json b/data/as/30175812/ws-services-calculation/Penalty.json
index de8326f985..d89e9abc0e 100644
--- a/data/as/30175812/ws-services-calculation/Penalty.json
+++ b/data/as/30175812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175812/ws-services-calculation/WCBillingSlab.json b/data/as/30175812/ws-services-calculation/WCBillingSlab.json
index 06f5f61c27..6b050d5ce9 100644
--- a/data/as/30175812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175821/ws-services-calculation/Penalty.json b/data/as/30175821/ws-services-calculation/Penalty.json
index e6e5c5bb3b..9630afd143 100644
--- a/data/as/30175821/ws-services-calculation/Penalty.json
+++ b/data/as/30175821/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175821/ws-services-calculation/WCBillingSlab.json b/data/as/30175821/ws-services-calculation/WCBillingSlab.json
index 5413dd782c..76ef45982b 100644
--- a/data/as/30175821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175821/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175827/ws-services-calculation/Penalty.json b/data/as/30175827/ws-services-calculation/Penalty.json
index 805785e8fc..294439d2bb 100644
--- a/data/as/30175827/ws-services-calculation/Penalty.json
+++ b/data/as/30175827/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175827/ws-services-calculation/WCBillingSlab.json b/data/as/30175827/ws-services-calculation/WCBillingSlab.json
index 636cabad50..593ea94f07 100644
--- a/data/as/30175827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175827/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175831/ws-services-calculation/Penalty.json b/data/as/30175831/ws-services-calculation/Penalty.json
index 43e3d7c435..627c7de1a3 100644
--- a/data/as/30175831/ws-services-calculation/Penalty.json
+++ b/data/as/30175831/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175831/ws-services-calculation/WCBillingSlab.json b/data/as/30175831/ws-services-calculation/WCBillingSlab.json
index 6689648707..f5ccbc4233 100644
--- a/data/as/30175831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175831/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175853/ws-services-calculation/Penalty.json b/data/as/30175853/ws-services-calculation/Penalty.json
index 5fdb6aabe7..c5320906ed 100644
--- a/data/as/30175853/ws-services-calculation/Penalty.json
+++ b/data/as/30175853/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175853/ws-services-calculation/WCBillingSlab.json b/data/as/30175853/ws-services-calculation/WCBillingSlab.json
index 93e5e6fe49..2ac7ebee7d 100644
--- a/data/as/30175853/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175853/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175854/ws-services-calculation/Penalty.json b/data/as/30175854/ws-services-calculation/Penalty.json
index 86e9f802bc..a163a3ad3b 100644
--- a/data/as/30175854/ws-services-calculation/Penalty.json
+++ b/data/as/30175854/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175854/ws-services-calculation/WCBillingSlab.json b/data/as/30175854/ws-services-calculation/WCBillingSlab.json
index de353c2059..422e5e1641 100644
--- a/data/as/30175854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175854/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175867/ws-services-calculation/Penalty.json b/data/as/30175867/ws-services-calculation/Penalty.json
index 229de9df02..2d40b7d5a2 100644
--- a/data/as/30175867/ws-services-calculation/Penalty.json
+++ b/data/as/30175867/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175867/ws-services-calculation/WCBillingSlab.json b/data/as/30175867/ws-services-calculation/WCBillingSlab.json
index 3c42b7ed31..6bb72a6f16 100644
--- a/data/as/30175867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175867/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175876/ws-services-calculation/Penalty.json b/data/as/30175876/ws-services-calculation/Penalty.json
index da9825dacb..852feea211 100644
--- a/data/as/30175876/ws-services-calculation/Penalty.json
+++ b/data/as/30175876/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175876/ws-services-calculation/WCBillingSlab.json b/data/as/30175876/ws-services-calculation/WCBillingSlab.json
index 20fa1af42b..b5e4b83b2e 100644
--- a/data/as/30175876/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175876/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175883/ws-services-calculation/Penalty.json b/data/as/30175883/ws-services-calculation/Penalty.json
index 7b566e11c2..f210b3ad0f 100644
--- a/data/as/30175883/ws-services-calculation/Penalty.json
+++ b/data/as/30175883/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175883/ws-services-calculation/WCBillingSlab.json b/data/as/30175883/ws-services-calculation/WCBillingSlab.json
index 47550694fa..bc89a17cd8 100644
--- a/data/as/30175883/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175883/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175888/ws-services-calculation/Penalty.json b/data/as/30175888/ws-services-calculation/Penalty.json
index df9d40ca79..59f79e6dd5 100644
--- a/data/as/30175888/ws-services-calculation/Penalty.json
+++ b/data/as/30175888/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175888/ws-services-calculation/WCBillingSlab.json b/data/as/30175888/ws-services-calculation/WCBillingSlab.json
index b31bc936aa..010f08a4d3 100644
--- a/data/as/30175888/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175888/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175891/ws-services-calculation/Penalty.json b/data/as/30175891/ws-services-calculation/Penalty.json
index 342a819a7d..123791aa38 100644
--- a/data/as/30175891/ws-services-calculation/Penalty.json
+++ b/data/as/30175891/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175891/ws-services-calculation/WCBillingSlab.json b/data/as/30175891/ws-services-calculation/WCBillingSlab.json
index 45abc4f1de..66a0f7505e 100644
--- a/data/as/30175891/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175891/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175904/ws-services-calculation/Penalty.json b/data/as/30175904/ws-services-calculation/Penalty.json
index 099c594019..9ff60ecfc9 100644
--- a/data/as/30175904/ws-services-calculation/Penalty.json
+++ b/data/as/30175904/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175904/ws-services-calculation/WCBillingSlab.json b/data/as/30175904/ws-services-calculation/WCBillingSlab.json
index 51a8e94a0d..4d924732ee 100644
--- a/data/as/30175904/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175904/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175917/ws-services-calculation/Penalty.json b/data/as/30175917/ws-services-calculation/Penalty.json
index 8532a1fc07..c675c3597b 100644
--- a/data/as/30175917/ws-services-calculation/Penalty.json
+++ b/data/as/30175917/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175917/ws-services-calculation/WCBillingSlab.json b/data/as/30175917/ws-services-calculation/WCBillingSlab.json
index a95691a3b2..eee9556ab6 100644
--- a/data/as/30175917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175917/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30175983/ws-services-calculation/Penalty.json b/data/as/30175983/ws-services-calculation/Penalty.json
index 1ab10939d0..7acb535a5d 100644
--- a/data/as/30175983/ws-services-calculation/Penalty.json
+++ b/data/as/30175983/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175983/ws-services-calculation/WCBillingSlab.json b/data/as/30175983/ws-services-calculation/WCBillingSlab.json
index d533e8e604..22ac68e8ec 100644
--- a/data/as/30175983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175983/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176038/ws-services-calculation/Penalty.json b/data/as/30176038/ws-services-calculation/Penalty.json
index 016d02919d..8510e8d83f 100644
--- a/data/as/30176038/ws-services-calculation/Penalty.json
+++ b/data/as/30176038/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176038/ws-services-calculation/WCBillingSlab.json b/data/as/30176038/ws-services-calculation/WCBillingSlab.json
index 67f2cc0082..410976ac35 100644
--- a/data/as/30176038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176038/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176114/ws-services-calculation/Penalty.json b/data/as/30176114/ws-services-calculation/Penalty.json
index c75564043b..a7df3e7a4f 100644
--- a/data/as/30176114/ws-services-calculation/Penalty.json
+++ b/data/as/30176114/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176114/ws-services-calculation/WCBillingSlab.json b/data/as/30176114/ws-services-calculation/WCBillingSlab.json
index 492563d859..135ccceaa7 100644
--- a/data/as/30176114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176114/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176117/ws-services-calculation/Penalty.json b/data/as/30176117/ws-services-calculation/Penalty.json
index cf16e68976..9d82317dc4 100644
--- a/data/as/30176117/ws-services-calculation/Penalty.json
+++ b/data/as/30176117/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176117/ws-services-calculation/WCBillingSlab.json b/data/as/30176117/ws-services-calculation/WCBillingSlab.json
index 529835f3c6..24bb9c9103 100644
--- a/data/as/30176117/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176117/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176156/ws-services-calculation/Penalty.json b/data/as/30176156/ws-services-calculation/Penalty.json
index 13bcb29c0e..5b89fd3e65 100644
--- a/data/as/30176156/ws-services-calculation/Penalty.json
+++ b/data/as/30176156/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176156/ws-services-calculation/WCBillingSlab.json b/data/as/30176156/ws-services-calculation/WCBillingSlab.json
index e25ae390b6..0907033575 100644
--- a/data/as/30176156/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176156/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176170/ws-services-calculation/Penalty.json b/data/as/30176170/ws-services-calculation/Penalty.json
index 314b7c743f..fd0a49d1d9 100644
--- a/data/as/30176170/ws-services-calculation/Penalty.json
+++ b/data/as/30176170/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176170/ws-services-calculation/WCBillingSlab.json b/data/as/30176170/ws-services-calculation/WCBillingSlab.json
index f96eabada6..159cca8ba3 100644
--- a/data/as/30176170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176170/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176178/ws-services-calculation/Penalty.json b/data/as/30176178/ws-services-calculation/Penalty.json
index 7f1d03a713..ffa02bfa81 100644
--- a/data/as/30176178/ws-services-calculation/Penalty.json
+++ b/data/as/30176178/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176178/ws-services-calculation/WCBillingSlab.json b/data/as/30176178/ws-services-calculation/WCBillingSlab.json
index 309d324d6e..6a6c0548c0 100644
--- a/data/as/30176178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176178/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176209/ws-services-calculation/Penalty.json b/data/as/30176209/ws-services-calculation/Penalty.json
index b4e31715b6..bab5dc3a0d 100644
--- a/data/as/30176209/ws-services-calculation/Penalty.json
+++ b/data/as/30176209/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176209/ws-services-calculation/WCBillingSlab.json b/data/as/30176209/ws-services-calculation/WCBillingSlab.json
index 6929b69895..8db4d75d1f 100644
--- a/data/as/30176209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176209/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176222/ws-services-calculation/Penalty.json b/data/as/30176222/ws-services-calculation/Penalty.json
index 5d57ddc7dd..4c16b42164 100644
--- a/data/as/30176222/ws-services-calculation/Penalty.json
+++ b/data/as/30176222/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176222/ws-services-calculation/WCBillingSlab.json b/data/as/30176222/ws-services-calculation/WCBillingSlab.json
index 6b33a1e354..b4f52bfc80 100644
--- a/data/as/30176222/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176222/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176252/ws-services-calculation/Penalty.json b/data/as/30176252/ws-services-calculation/Penalty.json
index 1b938364c1..dadf0167b9 100644
--- a/data/as/30176252/ws-services-calculation/Penalty.json
+++ b/data/as/30176252/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176252/ws-services-calculation/WCBillingSlab.json b/data/as/30176252/ws-services-calculation/WCBillingSlab.json
index 5292190c80..8e3cd33703 100644
--- a/data/as/30176252/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176252/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176279/ws-services-calculation/Penalty.json b/data/as/30176279/ws-services-calculation/Penalty.json
index 69ae015312..7431afcc55 100644
--- a/data/as/30176279/ws-services-calculation/Penalty.json
+++ b/data/as/30176279/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176279/ws-services-calculation/WCBillingSlab.json b/data/as/30176279/ws-services-calculation/WCBillingSlab.json
index 6b538122b3..a415df7294 100644
--- a/data/as/30176279/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176279/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176310/ws-services-calculation/Penalty.json b/data/as/30176310/ws-services-calculation/Penalty.json
index 6fa92db197..5e80f886a8 100644
--- a/data/as/30176310/ws-services-calculation/Penalty.json
+++ b/data/as/30176310/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176310/ws-services-calculation/WCBillingSlab.json b/data/as/30176310/ws-services-calculation/WCBillingSlab.json
index 59d91ff2b6..4a4ebbdcd7 100644
--- a/data/as/30176310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176310/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176350/ws-services-calculation/Penalty.json b/data/as/30176350/ws-services-calculation/Penalty.json
index e2bcf8769c..a39d9f8247 100644
--- a/data/as/30176350/ws-services-calculation/Penalty.json
+++ b/data/as/30176350/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176350/ws-services-calculation/WCBillingSlab.json b/data/as/30176350/ws-services-calculation/WCBillingSlab.json
index 4d804d62f7..c3775afdc9 100644
--- a/data/as/30176350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176350/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176394/ws-services-calculation/Penalty.json b/data/as/30176394/ws-services-calculation/Penalty.json
index 2ed1e5c3e4..bc1a3c716b 100644
--- a/data/as/30176394/ws-services-calculation/Penalty.json
+++ b/data/as/30176394/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176394/ws-services-calculation/WCBillingSlab.json b/data/as/30176394/ws-services-calculation/WCBillingSlab.json
index d8d7df42a7..3e653178b7 100644
--- a/data/as/30176394/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176394/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176403/ws-services-calculation/Penalty.json b/data/as/30176403/ws-services-calculation/Penalty.json
index 3c3d4901c2..a7bc91b8ec 100644
--- a/data/as/30176403/ws-services-calculation/Penalty.json
+++ b/data/as/30176403/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176403/ws-services-calculation/WCBillingSlab.json b/data/as/30176403/ws-services-calculation/WCBillingSlab.json
index 8119ee0ef7..94ceab86fa 100644
--- a/data/as/30176403/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176403/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176503/ws-services-calculation/Penalty.json b/data/as/30176503/ws-services-calculation/Penalty.json
index 6666e22e3d..0a2d412d99 100644
--- a/data/as/30176503/ws-services-calculation/Penalty.json
+++ b/data/as/30176503/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176503/ws-services-calculation/WCBillingSlab.json b/data/as/30176503/ws-services-calculation/WCBillingSlab.json
index 04a4fa1863..d83a867e13 100644
--- a/data/as/30176503/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176503/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176512/ws-services-calculation/Penalty.json b/data/as/30176512/ws-services-calculation/Penalty.json
index a00c877c2f..27423db7cc 100644
--- a/data/as/30176512/ws-services-calculation/Penalty.json
+++ b/data/as/30176512/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176512/ws-services-calculation/WCBillingSlab.json b/data/as/30176512/ws-services-calculation/WCBillingSlab.json
index 50f86e41cc..a4f9fce2ec 100644
--- a/data/as/30176512/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176512/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176517/ws-services-calculation/Penalty.json b/data/as/30176517/ws-services-calculation/Penalty.json
index 3fe628a48c..e86d07c8e7 100644
--- a/data/as/30176517/ws-services-calculation/Penalty.json
+++ b/data/as/30176517/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176517/ws-services-calculation/WCBillingSlab.json b/data/as/30176517/ws-services-calculation/WCBillingSlab.json
index 3adf626c6d..bfde0cd8e3 100644
--- a/data/as/30176517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176517/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176525/ws-services-calculation/Penalty.json b/data/as/30176525/ws-services-calculation/Penalty.json
index 75de39bd12..fde49db95f 100644
--- a/data/as/30176525/ws-services-calculation/Penalty.json
+++ b/data/as/30176525/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176525/ws-services-calculation/WCBillingSlab.json b/data/as/30176525/ws-services-calculation/WCBillingSlab.json
index aba8d8888b..8000357027 100644
--- a/data/as/30176525/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176525/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176539/ws-services-calculation/Penalty.json b/data/as/30176539/ws-services-calculation/Penalty.json
index 0cc93d0bd2..ddf8e58b0f 100644
--- a/data/as/30176539/ws-services-calculation/Penalty.json
+++ b/data/as/30176539/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176539/ws-services-calculation/WCBillingSlab.json b/data/as/30176539/ws-services-calculation/WCBillingSlab.json
index ec1334f08e..58736bdc45 100644
--- a/data/as/30176539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176539/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176552/ws-services-calculation/Penalty.json b/data/as/30176552/ws-services-calculation/Penalty.json
index 49344e3ebd..3e1e007e74 100644
--- a/data/as/30176552/ws-services-calculation/Penalty.json
+++ b/data/as/30176552/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176552/ws-services-calculation/WCBillingSlab.json b/data/as/30176552/ws-services-calculation/WCBillingSlab.json
index 46fabbf511..5d3567a88f 100644
--- a/data/as/30176552/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176552/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176563/ws-services-calculation/Penalty.json b/data/as/30176563/ws-services-calculation/Penalty.json
index 8f5ce62e76..358463ee08 100644
--- a/data/as/30176563/ws-services-calculation/Penalty.json
+++ b/data/as/30176563/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176563/ws-services-calculation/WCBillingSlab.json b/data/as/30176563/ws-services-calculation/WCBillingSlab.json
index b4f2cda798..7b95f83e31 100644
--- a/data/as/30176563/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176563/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176575/ws-services-calculation/Penalty.json b/data/as/30176575/ws-services-calculation/Penalty.json
index 270b59ae81..10c3eccf51 100644
--- a/data/as/30176575/ws-services-calculation/Penalty.json
+++ b/data/as/30176575/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176575/ws-services-calculation/WCBillingSlab.json b/data/as/30176575/ws-services-calculation/WCBillingSlab.json
index cb47e3cce7..f567eef4d2 100644
--- a/data/as/30176575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176575/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176589/ws-services-calculation/Penalty.json b/data/as/30176589/ws-services-calculation/Penalty.json
index e4651812c7..489ba8872f 100644
--- a/data/as/30176589/ws-services-calculation/Penalty.json
+++ b/data/as/30176589/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176589/ws-services-calculation/WCBillingSlab.json b/data/as/30176589/ws-services-calculation/WCBillingSlab.json
index 1f2371d9ae..961697d93b 100644
--- a/data/as/30176589/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176589/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176605/ws-services-calculation/Penalty.json b/data/as/30176605/ws-services-calculation/Penalty.json
index 7563e5375c..cb2f079040 100644
--- a/data/as/30176605/ws-services-calculation/Penalty.json
+++ b/data/as/30176605/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176605/ws-services-calculation/WCBillingSlab.json b/data/as/30176605/ws-services-calculation/WCBillingSlab.json
index 40df40683f..4e3054ba4d 100644
--- a/data/as/30176605/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176605/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176670/ws-services-calculation/Penalty.json b/data/as/30176670/ws-services-calculation/Penalty.json
index 2e0c657e2b..feda00dac2 100644
--- a/data/as/30176670/ws-services-calculation/Penalty.json
+++ b/data/as/30176670/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176670/ws-services-calculation/WCBillingSlab.json b/data/as/30176670/ws-services-calculation/WCBillingSlab.json
index 7c7fb45341..c3eca3f95e 100644
--- a/data/as/30176670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176670/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176673/ws-services-calculation/Penalty.json b/data/as/30176673/ws-services-calculation/Penalty.json
index 7f349491ab..5bcc83731e 100644
--- a/data/as/30176673/ws-services-calculation/Penalty.json
+++ b/data/as/30176673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176673/ws-services-calculation/WCBillingSlab.json b/data/as/30176673/ws-services-calculation/WCBillingSlab.json
index 8ab45c6624..ef2d7a74f7 100644
--- a/data/as/30176673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176676/ws-services-calculation/Penalty.json b/data/as/30176676/ws-services-calculation/Penalty.json
index e6fedb8917..e604592cba 100644
--- a/data/as/30176676/ws-services-calculation/Penalty.json
+++ b/data/as/30176676/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176676/ws-services-calculation/WCBillingSlab.json b/data/as/30176676/ws-services-calculation/WCBillingSlab.json
index 213f95f5a8..25fbb1939d 100644
--- a/data/as/30176676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176676/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176679/ws-services-calculation/Penalty.json b/data/as/30176679/ws-services-calculation/Penalty.json
index f28f603614..aefdedad39 100644
--- a/data/as/30176679/ws-services-calculation/Penalty.json
+++ b/data/as/30176679/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176679/ws-services-calculation/WCBillingSlab.json b/data/as/30176679/ws-services-calculation/WCBillingSlab.json
index 5a2ac15838..e5096440a1 100644
--- a/data/as/30176679/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176679/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176683/ws-services-calculation/Penalty.json b/data/as/30176683/ws-services-calculation/Penalty.json
index 979662014a..891ef00e4d 100644
--- a/data/as/30176683/ws-services-calculation/Penalty.json
+++ b/data/as/30176683/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176683/ws-services-calculation/WCBillingSlab.json b/data/as/30176683/ws-services-calculation/WCBillingSlab.json
index 69fead2097..4c07bc1d4a 100644
--- a/data/as/30176683/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176683/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176709/ws-services-calculation/Penalty.json b/data/as/30176709/ws-services-calculation/Penalty.json
index 273b4485ef..1282932aed 100644
--- a/data/as/30176709/ws-services-calculation/Penalty.json
+++ b/data/as/30176709/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176709/ws-services-calculation/WCBillingSlab.json b/data/as/30176709/ws-services-calculation/WCBillingSlab.json
index 9424368008..ac8269d8ef 100644
--- a/data/as/30176709/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176709/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176714/ws-services-calculation/Penalty.json b/data/as/30176714/ws-services-calculation/Penalty.json
index 90b511b620..aeb1f99ef9 100644
--- a/data/as/30176714/ws-services-calculation/Penalty.json
+++ b/data/as/30176714/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176714/ws-services-calculation/WCBillingSlab.json b/data/as/30176714/ws-services-calculation/WCBillingSlab.json
index 8b883d941c..5f645608e5 100644
--- a/data/as/30176714/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176714/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176720/ws-services-calculation/Penalty.json b/data/as/30176720/ws-services-calculation/Penalty.json
index 1108390d19..f4e26e7718 100644
--- a/data/as/30176720/ws-services-calculation/Penalty.json
+++ b/data/as/30176720/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176720/ws-services-calculation/WCBillingSlab.json b/data/as/30176720/ws-services-calculation/WCBillingSlab.json
index bf03d32854..49a2644e0c 100644
--- a/data/as/30176720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176720/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30176756/ws-services-calculation/Penalty.json b/data/as/30176756/ws-services-calculation/Penalty.json
index f456a68c62..d35a79aae3 100644
--- a/data/as/30176756/ws-services-calculation/Penalty.json
+++ b/data/as/30176756/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176756/ws-services-calculation/WCBillingSlab.json b/data/as/30176756/ws-services-calculation/WCBillingSlab.json
index 009a9cc31f..b6d9879abd 100644
--- a/data/as/30176756/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176756/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177227/ws-services-calculation/Penalty.json b/data/as/30177227/ws-services-calculation/Penalty.json
index 8bf6aa5e19..926f197498 100644
--- a/data/as/30177227/ws-services-calculation/Penalty.json
+++ b/data/as/30177227/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177227/ws-services-calculation/WCBillingSlab.json b/data/as/30177227/ws-services-calculation/WCBillingSlab.json
index 27d9ea5d1e..71298d8182 100644
--- a/data/as/30177227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177227/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177242/ws-services-calculation/Penalty.json b/data/as/30177242/ws-services-calculation/Penalty.json
index 3f696b5246..abd2cb3ed9 100644
--- a/data/as/30177242/ws-services-calculation/Penalty.json
+++ b/data/as/30177242/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177242/ws-services-calculation/WCBillingSlab.json b/data/as/30177242/ws-services-calculation/WCBillingSlab.json
index 1749996384..4dbc698f14 100644
--- a/data/as/30177242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177242/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177275/ws-services-calculation/Penalty.json b/data/as/30177275/ws-services-calculation/Penalty.json
index ad410eb82c..6526f7f02e 100644
--- a/data/as/30177275/ws-services-calculation/Penalty.json
+++ b/data/as/30177275/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177275/ws-services-calculation/WCBillingSlab.json b/data/as/30177275/ws-services-calculation/WCBillingSlab.json
index dc3ca15868..543568d9b9 100644
--- a/data/as/30177275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177275/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177297/ws-services-calculation/Penalty.json b/data/as/30177297/ws-services-calculation/Penalty.json
index b2924813a2..907086454d 100644
--- a/data/as/30177297/ws-services-calculation/Penalty.json
+++ b/data/as/30177297/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177297/ws-services-calculation/WCBillingSlab.json b/data/as/30177297/ws-services-calculation/WCBillingSlab.json
index 6a73fcb991..579cf85339 100644
--- a/data/as/30177297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177297/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177314/ws-services-calculation/Penalty.json b/data/as/30177314/ws-services-calculation/Penalty.json
index 9f359af788..f6f19fed7d 100644
--- a/data/as/30177314/ws-services-calculation/Penalty.json
+++ b/data/as/30177314/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177314/ws-services-calculation/WCBillingSlab.json b/data/as/30177314/ws-services-calculation/WCBillingSlab.json
index 4d72c93b1b..6afedbc10f 100644
--- a/data/as/30177314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177314/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177334/ws-services-calculation/Penalty.json b/data/as/30177334/ws-services-calculation/Penalty.json
index 3e7f1e0984..003f9ad5d5 100644
--- a/data/as/30177334/ws-services-calculation/Penalty.json
+++ b/data/as/30177334/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177334/ws-services-calculation/WCBillingSlab.json b/data/as/30177334/ws-services-calculation/WCBillingSlab.json
index 2834cbcacb..741653cbb1 100644
--- a/data/as/30177334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177334/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177375/ws-services-calculation/Penalty.json b/data/as/30177375/ws-services-calculation/Penalty.json
index 54bd4db717..0fda4d6265 100644
--- a/data/as/30177375/ws-services-calculation/Penalty.json
+++ b/data/as/30177375/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177375/ws-services-calculation/WCBillingSlab.json b/data/as/30177375/ws-services-calculation/WCBillingSlab.json
index 6c0b5534de..bba266746f 100644
--- a/data/as/30177375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177375/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177874/ws-services-calculation/Penalty.json b/data/as/30177874/ws-services-calculation/Penalty.json
index bf37a2705a..c7d30cbd20 100644
--- a/data/as/30177874/ws-services-calculation/Penalty.json
+++ b/data/as/30177874/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177874/ws-services-calculation/WCBillingSlab.json b/data/as/30177874/ws-services-calculation/WCBillingSlab.json
index 34e75a052b..b0f8e1fd03 100644
--- a/data/as/30177874/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177874/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177929/ws-services-calculation/Penalty.json b/data/as/30177929/ws-services-calculation/Penalty.json
index d93f8d192f..f5d7424192 100644
--- a/data/as/30177929/ws-services-calculation/Penalty.json
+++ b/data/as/30177929/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177929/ws-services-calculation/WCBillingSlab.json b/data/as/30177929/ws-services-calculation/WCBillingSlab.json
index e79c82ebfa..20a5b0ced8 100644
--- a/data/as/30177929/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177929/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177971/ws-services-calculation/Penalty.json b/data/as/30177971/ws-services-calculation/Penalty.json
index 4ee572b25c..0b24201cfa 100644
--- a/data/as/30177971/ws-services-calculation/Penalty.json
+++ b/data/as/30177971/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177971/ws-services-calculation/WCBillingSlab.json b/data/as/30177971/ws-services-calculation/WCBillingSlab.json
index 22cabbef0d..8e48d4aff6 100644
--- a/data/as/30177971/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177971/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30177999/ws-services-calculation/Penalty.json b/data/as/30177999/ws-services-calculation/Penalty.json
index 4ab77bc32a..3d92deb2c5 100644
--- a/data/as/30177999/ws-services-calculation/Penalty.json
+++ b/data/as/30177999/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177999/ws-services-calculation/WCBillingSlab.json b/data/as/30177999/ws-services-calculation/WCBillingSlab.json
index f4a4ee10a5..9be57d6fc4 100644
--- a/data/as/30177999/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177999/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178023/ws-services-calculation/Penalty.json b/data/as/30178023/ws-services-calculation/Penalty.json
index 042f58459d..af3862a1c5 100644
--- a/data/as/30178023/ws-services-calculation/Penalty.json
+++ b/data/as/30178023/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178023/ws-services-calculation/WCBillingSlab.json b/data/as/30178023/ws-services-calculation/WCBillingSlab.json
index 5009ee6b76..3e77a2a3ed 100644
--- a/data/as/30178023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178023/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178056/ws-services-calculation/Penalty.json b/data/as/30178056/ws-services-calculation/Penalty.json
index c1c26535af..f0939623e1 100644
--- a/data/as/30178056/ws-services-calculation/Penalty.json
+++ b/data/as/30178056/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178056/ws-services-calculation/WCBillingSlab.json b/data/as/30178056/ws-services-calculation/WCBillingSlab.json
index c088aa7578..585cd8ed68 100644
--- a/data/as/30178056/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178056/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178092/ws-services-calculation/Penalty.json b/data/as/30178092/ws-services-calculation/Penalty.json
index 2299bc7dc4..07314f900a 100644
--- a/data/as/30178092/ws-services-calculation/Penalty.json
+++ b/data/as/30178092/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178092/ws-services-calculation/WCBillingSlab.json b/data/as/30178092/ws-services-calculation/WCBillingSlab.json
index f581b156b8..f9506a9523 100644
--- a/data/as/30178092/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178092/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178124/ws-services-calculation/Penalty.json b/data/as/30178124/ws-services-calculation/Penalty.json
index 7f638f2774..d33f0c6f82 100644
--- a/data/as/30178124/ws-services-calculation/Penalty.json
+++ b/data/as/30178124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178124/ws-services-calculation/WCBillingSlab.json b/data/as/30178124/ws-services-calculation/WCBillingSlab.json
index 6ef18011b4..5ac4298d1c 100644
--- a/data/as/30178124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178175/ws-services-calculation/Penalty.json b/data/as/30178175/ws-services-calculation/Penalty.json
index 6bea81b6c2..8025f204f9 100644
--- a/data/as/30178175/ws-services-calculation/Penalty.json
+++ b/data/as/30178175/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178175/ws-services-calculation/WCBillingSlab.json b/data/as/30178175/ws-services-calculation/WCBillingSlab.json
index 180dfecfc3..6f4f75a5d0 100644
--- a/data/as/30178175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178175/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178287/ws-services-calculation/Penalty.json b/data/as/30178287/ws-services-calculation/Penalty.json
index a145052137..ad4a1fcba6 100644
--- a/data/as/30178287/ws-services-calculation/Penalty.json
+++ b/data/as/30178287/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178287/ws-services-calculation/WCBillingSlab.json b/data/as/30178287/ws-services-calculation/WCBillingSlab.json
index d17ddb1ebf..724e44c7d4 100644
--- a/data/as/30178287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178287/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178310/ws-services-calculation/Penalty.json b/data/as/30178310/ws-services-calculation/Penalty.json
index 9dda4ba0d8..69b89f7588 100644
--- a/data/as/30178310/ws-services-calculation/Penalty.json
+++ b/data/as/30178310/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178310/ws-services-calculation/WCBillingSlab.json b/data/as/30178310/ws-services-calculation/WCBillingSlab.json
index 59f686e7ef..a11e630d8f 100644
--- a/data/as/30178310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178310/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178331/ws-services-calculation/Penalty.json b/data/as/30178331/ws-services-calculation/Penalty.json
index 05b7a0fb99..8bfd4a1b63 100644
--- a/data/as/30178331/ws-services-calculation/Penalty.json
+++ b/data/as/30178331/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178331/ws-services-calculation/WCBillingSlab.json b/data/as/30178331/ws-services-calculation/WCBillingSlab.json
index 1c986e48f1..77b86b3f16 100644
--- a/data/as/30178331/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178331/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178371/ws-services-calculation/Penalty.json b/data/as/30178371/ws-services-calculation/Penalty.json
index 3cbb8ec053..d2c80691ec 100644
--- a/data/as/30178371/ws-services-calculation/Penalty.json
+++ b/data/as/30178371/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178371/ws-services-calculation/WCBillingSlab.json b/data/as/30178371/ws-services-calculation/WCBillingSlab.json
index 49147c58b3..d43191036a 100644
--- a/data/as/30178371/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178371/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178397/ws-services-calculation/Penalty.json b/data/as/30178397/ws-services-calculation/Penalty.json
index ce67236de5..4af2de9853 100644
--- a/data/as/30178397/ws-services-calculation/Penalty.json
+++ b/data/as/30178397/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178397/ws-services-calculation/WCBillingSlab.json b/data/as/30178397/ws-services-calculation/WCBillingSlab.json
index 31957fe914..1da1d7666b 100644
--- a/data/as/30178397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178397/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178423/ws-services-calculation/Penalty.json b/data/as/30178423/ws-services-calculation/Penalty.json
index bb9412ba0f..14d4784c2e 100644
--- a/data/as/30178423/ws-services-calculation/Penalty.json
+++ b/data/as/30178423/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178423/ws-services-calculation/WCBillingSlab.json b/data/as/30178423/ws-services-calculation/WCBillingSlab.json
index 6c70af171e..a1e11af13c 100644
--- a/data/as/30178423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178423/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178440/ws-services-calculation/Penalty.json b/data/as/30178440/ws-services-calculation/Penalty.json
index 553c79d1a5..aa6cd34620 100644
--- a/data/as/30178440/ws-services-calculation/Penalty.json
+++ b/data/as/30178440/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178440/ws-services-calculation/WCBillingSlab.json b/data/as/30178440/ws-services-calculation/WCBillingSlab.json
index be00fb7c0a..5a0074990e 100644
--- a/data/as/30178440/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178440/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178942/ws-services-calculation/Penalty.json b/data/as/30178942/ws-services-calculation/Penalty.json
index 72a42d369a..d89de6a825 100644
--- a/data/as/30178942/ws-services-calculation/Penalty.json
+++ b/data/as/30178942/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178942/ws-services-calculation/WCBillingSlab.json b/data/as/30178942/ws-services-calculation/WCBillingSlab.json
index 853a337d1d..9cdf810b59 100644
--- a/data/as/30178942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178942/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30178977/ws-services-calculation/Penalty.json b/data/as/30178977/ws-services-calculation/Penalty.json
index 48923a43c0..1e9f7c2d15 100644
--- a/data/as/30178977/ws-services-calculation/Penalty.json
+++ b/data/as/30178977/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178977/ws-services-calculation/WCBillingSlab.json b/data/as/30178977/ws-services-calculation/WCBillingSlab.json
index 6dafc2b0a8..95703b3f32 100644
--- a/data/as/30178977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178977/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179000/ws-services-calculation/Penalty.json b/data/as/30179000/ws-services-calculation/Penalty.json
index 9c2d557845..e462599ac5 100644
--- a/data/as/30179000/ws-services-calculation/Penalty.json
+++ b/data/as/30179000/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179000/ws-services-calculation/WCBillingSlab.json b/data/as/30179000/ws-services-calculation/WCBillingSlab.json
index 85dea5aab2..adf363bf0c 100644
--- a/data/as/30179000/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179000/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179124/ws-services-calculation/Penalty.json b/data/as/30179124/ws-services-calculation/Penalty.json
index 4e89501f7e..00cf6a6dbc 100644
--- a/data/as/30179124/ws-services-calculation/Penalty.json
+++ b/data/as/30179124/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179124/ws-services-calculation/WCBillingSlab.json b/data/as/30179124/ws-services-calculation/WCBillingSlab.json
index 2e636dbc63..b793ee25ce 100644
--- a/data/as/30179124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179124/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179165/ws-services-calculation/Penalty.json b/data/as/30179165/ws-services-calculation/Penalty.json
index 9464fb4e6e..86a38edd7b 100644
--- a/data/as/30179165/ws-services-calculation/Penalty.json
+++ b/data/as/30179165/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179165/ws-services-calculation/WCBillingSlab.json b/data/as/30179165/ws-services-calculation/WCBillingSlab.json
index 4f4ea3dcc0..6a87fe737a 100644
--- a/data/as/30179165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179165/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179209/ws-services-calculation/Penalty.json b/data/as/30179209/ws-services-calculation/Penalty.json
index 31a99ae893..f7bb1330b5 100644
--- a/data/as/30179209/ws-services-calculation/Penalty.json
+++ b/data/as/30179209/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179209/ws-services-calculation/WCBillingSlab.json b/data/as/30179209/ws-services-calculation/WCBillingSlab.json
index 78de743af9..11dc7b40dd 100644
--- a/data/as/30179209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179209/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179232/ws-services-calculation/Penalty.json b/data/as/30179232/ws-services-calculation/Penalty.json
index 38b2db6e2a..dbeaea1cd5 100644
--- a/data/as/30179232/ws-services-calculation/Penalty.json
+++ b/data/as/30179232/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179232/ws-services-calculation/WCBillingSlab.json b/data/as/30179232/ws-services-calculation/WCBillingSlab.json
index 641d769407..6dfee09bf8 100644
--- a/data/as/30179232/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179232/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179397/ws-services-calculation/Penalty.json b/data/as/30179397/ws-services-calculation/Penalty.json
index ef650d4859..dfad1cb883 100644
--- a/data/as/30179397/ws-services-calculation/Penalty.json
+++ b/data/as/30179397/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179397/ws-services-calculation/WCBillingSlab.json b/data/as/30179397/ws-services-calculation/WCBillingSlab.json
index 1c1a2a6a58..6f4b672690 100644
--- a/data/as/30179397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179397/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179439/ws-services-calculation/Penalty.json b/data/as/30179439/ws-services-calculation/Penalty.json
index 159186c325..3aab5c7d48 100644
--- a/data/as/30179439/ws-services-calculation/Penalty.json
+++ b/data/as/30179439/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179439/ws-services-calculation/WCBillingSlab.json b/data/as/30179439/ws-services-calculation/WCBillingSlab.json
index a6fce53c07..4492b02d3a 100644
--- a/data/as/30179439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179439/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179473/ws-services-calculation/Penalty.json b/data/as/30179473/ws-services-calculation/Penalty.json
index 43aacca6d4..f7cd9f3115 100644
--- a/data/as/30179473/ws-services-calculation/Penalty.json
+++ b/data/as/30179473/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179473/ws-services-calculation/WCBillingSlab.json b/data/as/30179473/ws-services-calculation/WCBillingSlab.json
index e7a93413aa..bc483f0c5d 100644
--- a/data/as/30179473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179473/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179510/ws-services-calculation/Penalty.json b/data/as/30179510/ws-services-calculation/Penalty.json
index efecf1428e..4295f5a03f 100644
--- a/data/as/30179510/ws-services-calculation/Penalty.json
+++ b/data/as/30179510/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179510/ws-services-calculation/WCBillingSlab.json b/data/as/30179510/ws-services-calculation/WCBillingSlab.json
index ad226dd820..75f7337086 100644
--- a/data/as/30179510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179510/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179533/ws-services-calculation/Penalty.json b/data/as/30179533/ws-services-calculation/Penalty.json
index ddd884cb71..489e660494 100644
--- a/data/as/30179533/ws-services-calculation/Penalty.json
+++ b/data/as/30179533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179533/ws-services-calculation/WCBillingSlab.json b/data/as/30179533/ws-services-calculation/WCBillingSlab.json
index 2d7a587e63..b1f69e64ce 100644
--- a/data/as/30179533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179578/ws-services-calculation/Penalty.json b/data/as/30179578/ws-services-calculation/Penalty.json
index 2f24f22c08..e896f6aa1a 100644
--- a/data/as/30179578/ws-services-calculation/Penalty.json
+++ b/data/as/30179578/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179578/ws-services-calculation/WCBillingSlab.json b/data/as/30179578/ws-services-calculation/WCBillingSlab.json
index 9e4a143cc8..41c1a61f51 100644
--- a/data/as/30179578/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179578/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179689/ws-services-calculation/Penalty.json b/data/as/30179689/ws-services-calculation/Penalty.json
index 99bc1ee80a..b81eab67e1 100644
--- a/data/as/30179689/ws-services-calculation/Penalty.json
+++ b/data/as/30179689/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179689/ws-services-calculation/WCBillingSlab.json b/data/as/30179689/ws-services-calculation/WCBillingSlab.json
index 15e1fe1b38..4c61bdd2ab 100644
--- a/data/as/30179689/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179689/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179724/ws-services-calculation/Penalty.json b/data/as/30179724/ws-services-calculation/Penalty.json
index f204e1d42f..5bb0eed656 100644
--- a/data/as/30179724/ws-services-calculation/Penalty.json
+++ b/data/as/30179724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179724/ws-services-calculation/WCBillingSlab.json b/data/as/30179724/ws-services-calculation/WCBillingSlab.json
index 62ab7c8031..1c4312347d 100644
--- a/data/as/30179724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179739/ws-services-calculation/Penalty.json b/data/as/30179739/ws-services-calculation/Penalty.json
index aacd689ae0..3f2f84908a 100644
--- a/data/as/30179739/ws-services-calculation/Penalty.json
+++ b/data/as/30179739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179739/ws-services-calculation/WCBillingSlab.json b/data/as/30179739/ws-services-calculation/WCBillingSlab.json
index 3901efdc87..592bb38aa4 100644
--- a/data/as/30179739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179767/ws-services-calculation/Penalty.json b/data/as/30179767/ws-services-calculation/Penalty.json
index c98095dd1a..485f7a82f4 100644
--- a/data/as/30179767/ws-services-calculation/Penalty.json
+++ b/data/as/30179767/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179767/ws-services-calculation/WCBillingSlab.json b/data/as/30179767/ws-services-calculation/WCBillingSlab.json
index 1e77a619ba..72f73348d9 100644
--- a/data/as/30179767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179767/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179793/ws-services-calculation/Penalty.json b/data/as/30179793/ws-services-calculation/Penalty.json
index 11ab94e63d..27c5949a63 100644
--- a/data/as/30179793/ws-services-calculation/Penalty.json
+++ b/data/as/30179793/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179793/ws-services-calculation/WCBillingSlab.json b/data/as/30179793/ws-services-calculation/WCBillingSlab.json
index 43914676ce..405a6949aa 100644
--- a/data/as/30179793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179793/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179802/ws-services-calculation/Penalty.json b/data/as/30179802/ws-services-calculation/Penalty.json
index 55a6889590..a06a6f0174 100644
--- a/data/as/30179802/ws-services-calculation/Penalty.json
+++ b/data/as/30179802/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179802/ws-services-calculation/WCBillingSlab.json b/data/as/30179802/ws-services-calculation/WCBillingSlab.json
index 141fe19904..5526f01a92 100644
--- a/data/as/30179802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179802/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179808/ws-services-calculation/Penalty.json b/data/as/30179808/ws-services-calculation/Penalty.json
index f4cfbe7ef9..c03be25b33 100644
--- a/data/as/30179808/ws-services-calculation/Penalty.json
+++ b/data/as/30179808/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179808/ws-services-calculation/WCBillingSlab.json b/data/as/30179808/ws-services-calculation/WCBillingSlab.json
index 9c5ea98627..cfa8f7236d 100644
--- a/data/as/30179808/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179808/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179812/ws-services-calculation/Penalty.json b/data/as/30179812/ws-services-calculation/Penalty.json
index c253b2850f..6b8ba31a98 100644
--- a/data/as/30179812/ws-services-calculation/Penalty.json
+++ b/data/as/30179812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179812/ws-services-calculation/WCBillingSlab.json b/data/as/30179812/ws-services-calculation/WCBillingSlab.json
index 40a3759e98..9b0db2599e 100644
--- a/data/as/30179812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179815/ws-services-calculation/Penalty.json b/data/as/30179815/ws-services-calculation/Penalty.json
index 479bda983b..d0b5d7b430 100644
--- a/data/as/30179815/ws-services-calculation/Penalty.json
+++ b/data/as/30179815/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179815/ws-services-calculation/WCBillingSlab.json b/data/as/30179815/ws-services-calculation/WCBillingSlab.json
index 5f786bbd6e..d494516f4d 100644
--- a/data/as/30179815/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179815/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30179821/ws-services-calculation/Penalty.json b/data/as/30179821/ws-services-calculation/Penalty.json
index 4175128a5c..0dcb9f79ac 100644
--- a/data/as/30179821/ws-services-calculation/Penalty.json
+++ b/data/as/30179821/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179821/ws-services-calculation/WCBillingSlab.json b/data/as/30179821/ws-services-calculation/WCBillingSlab.json
index 0ae52b511d..cb45078df1 100644
--- a/data/as/30179821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179821/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180631/ws-services-calculation/Penalty.json b/data/as/30180631/ws-services-calculation/Penalty.json
index ab5026faa7..686bac9746 100644
--- a/data/as/30180631/ws-services-calculation/Penalty.json
+++ b/data/as/30180631/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180631/ws-services-calculation/WCBillingSlab.json b/data/as/30180631/ws-services-calculation/WCBillingSlab.json
index c5163c11b0..d56ec45d25 100644
--- a/data/as/30180631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180631/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180654/ws-services-calculation/Penalty.json b/data/as/30180654/ws-services-calculation/Penalty.json
index 70ed7f3603..b4d101f953 100644
--- a/data/as/30180654/ws-services-calculation/Penalty.json
+++ b/data/as/30180654/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180654/ws-services-calculation/WCBillingSlab.json b/data/as/30180654/ws-services-calculation/WCBillingSlab.json
index 518765836c..6d11830f54 100644
--- a/data/as/30180654/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180654/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180663/ws-services-calculation/Penalty.json b/data/as/30180663/ws-services-calculation/Penalty.json
index 919100b51b..ed5aa83790 100644
--- a/data/as/30180663/ws-services-calculation/Penalty.json
+++ b/data/as/30180663/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180663/ws-services-calculation/WCBillingSlab.json b/data/as/30180663/ws-services-calculation/WCBillingSlab.json
index 78f7dbbc50..bc83777c28 100644
--- a/data/as/30180663/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180663/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180675/ws-services-calculation/Penalty.json b/data/as/30180675/ws-services-calculation/Penalty.json
index 94cbcc154e..5bb278f8c7 100644
--- a/data/as/30180675/ws-services-calculation/Penalty.json
+++ b/data/as/30180675/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180675/ws-services-calculation/WCBillingSlab.json b/data/as/30180675/ws-services-calculation/WCBillingSlab.json
index 8a8fd0db37..e377db791a 100644
--- a/data/as/30180675/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180675/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180698/ws-services-calculation/Penalty.json b/data/as/30180698/ws-services-calculation/Penalty.json
index d160746767..76265cc2b2 100644
--- a/data/as/30180698/ws-services-calculation/Penalty.json
+++ b/data/as/30180698/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180698/ws-services-calculation/WCBillingSlab.json b/data/as/30180698/ws-services-calculation/WCBillingSlab.json
index 4225b225d2..08acce0d0a 100644
--- a/data/as/30180698/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180698/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180724/ws-services-calculation/Penalty.json b/data/as/30180724/ws-services-calculation/Penalty.json
index 46f3fbfb3c..a69fb65350 100644
--- a/data/as/30180724/ws-services-calculation/Penalty.json
+++ b/data/as/30180724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180724/ws-services-calculation/WCBillingSlab.json b/data/as/30180724/ws-services-calculation/WCBillingSlab.json
index cec757e552..a1428e9e0b 100644
--- a/data/as/30180724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180855/ws-services-calculation/Penalty.json b/data/as/30180855/ws-services-calculation/Penalty.json
index 6f8149abdb..552d70236d 100644
--- a/data/as/30180855/ws-services-calculation/Penalty.json
+++ b/data/as/30180855/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180855/ws-services-calculation/WCBillingSlab.json b/data/as/30180855/ws-services-calculation/WCBillingSlab.json
index 0ad5b598b2..e00c6a0653 100644
--- a/data/as/30180855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180855/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180870/ws-services-calculation/Penalty.json b/data/as/30180870/ws-services-calculation/Penalty.json
index 3610d72ca8..bfcaccf0a3 100644
--- a/data/as/30180870/ws-services-calculation/Penalty.json
+++ b/data/as/30180870/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180870/ws-services-calculation/WCBillingSlab.json b/data/as/30180870/ws-services-calculation/WCBillingSlab.json
index 2d4a2304f5..e91a3593ce 100644
--- a/data/as/30180870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180870/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180952/ws-services-calculation/Penalty.json b/data/as/30180952/ws-services-calculation/Penalty.json
index f3106aa40a..d731272011 100644
--- a/data/as/30180952/ws-services-calculation/Penalty.json
+++ b/data/as/30180952/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180952/ws-services-calculation/WCBillingSlab.json b/data/as/30180952/ws-services-calculation/WCBillingSlab.json
index daa679fbb5..8ad45a610a 100644
--- a/data/as/30180952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180952/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30180965/ws-services-calculation/Penalty.json b/data/as/30180965/ws-services-calculation/Penalty.json
index 8262db70f8..d6866753ce 100644
--- a/data/as/30180965/ws-services-calculation/Penalty.json
+++ b/data/as/30180965/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180965/ws-services-calculation/WCBillingSlab.json b/data/as/30180965/ws-services-calculation/WCBillingSlab.json
index 7066aff7d0..8a6fff57c4 100644
--- a/data/as/30180965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180965/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181077/ws-services-calculation/Penalty.json b/data/as/30181077/ws-services-calculation/Penalty.json
index 1416e38c0a..af6c532341 100644
--- a/data/as/30181077/ws-services-calculation/Penalty.json
+++ b/data/as/30181077/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181077/ws-services-calculation/WCBillingSlab.json b/data/as/30181077/ws-services-calculation/WCBillingSlab.json
index 311c125954..0cd643f8d6 100644
--- a/data/as/30181077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181077/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181091/ws-services-calculation/Penalty.json b/data/as/30181091/ws-services-calculation/Penalty.json
index 6b891bd988..30db4352e3 100644
--- a/data/as/30181091/ws-services-calculation/Penalty.json
+++ b/data/as/30181091/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181091/ws-services-calculation/WCBillingSlab.json b/data/as/30181091/ws-services-calculation/WCBillingSlab.json
index c25b3d06c4..551334cde2 100644
--- a/data/as/30181091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181091/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181099/ws-services-calculation/Penalty.json b/data/as/30181099/ws-services-calculation/Penalty.json
index 4a39568ea4..bc94e2bfb9 100644
--- a/data/as/30181099/ws-services-calculation/Penalty.json
+++ b/data/as/30181099/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181099/ws-services-calculation/WCBillingSlab.json b/data/as/30181099/ws-services-calculation/WCBillingSlab.json
index 67938b3748..7b5d19e467 100644
--- a/data/as/30181099/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181099/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181126/ws-services-calculation/Penalty.json b/data/as/30181126/ws-services-calculation/Penalty.json
index 3b75bb280e..05e42acf1b 100644
--- a/data/as/30181126/ws-services-calculation/Penalty.json
+++ b/data/as/30181126/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181126/ws-services-calculation/WCBillingSlab.json b/data/as/30181126/ws-services-calculation/WCBillingSlab.json
index 0cdb095cd9..a8be2753ec 100644
--- a/data/as/30181126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181126/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181144/ws-services-calculation/Penalty.json b/data/as/30181144/ws-services-calculation/Penalty.json
index ce0a11b3f6..e49a6c063b 100644
--- a/data/as/30181144/ws-services-calculation/Penalty.json
+++ b/data/as/30181144/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181144/ws-services-calculation/WCBillingSlab.json b/data/as/30181144/ws-services-calculation/WCBillingSlab.json
index 77bb6ae9ec..6653960165 100644
--- a/data/as/30181144/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181144/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181145/ws-services-calculation/Penalty.json b/data/as/30181145/ws-services-calculation/Penalty.json
index 86e1640096..82bb58f960 100644
--- a/data/as/30181145/ws-services-calculation/Penalty.json
+++ b/data/as/30181145/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181145/ws-services-calculation/WCBillingSlab.json b/data/as/30181145/ws-services-calculation/WCBillingSlab.json
index e8c6b6760a..465521da2e 100644
--- a/data/as/30181145/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181145/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181168/ws-services-calculation/Penalty.json b/data/as/30181168/ws-services-calculation/Penalty.json
index e9fb2f7f2f..f518a041a6 100644
--- a/data/as/30181168/ws-services-calculation/Penalty.json
+++ b/data/as/30181168/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181168/ws-services-calculation/WCBillingSlab.json b/data/as/30181168/ws-services-calculation/WCBillingSlab.json
index ab45e7be32..7033f1437e 100644
--- a/data/as/30181168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181168/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181188/ws-services-calculation/Penalty.json b/data/as/30181188/ws-services-calculation/Penalty.json
index ca20db93e1..316dee48b2 100644
--- a/data/as/30181188/ws-services-calculation/Penalty.json
+++ b/data/as/30181188/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181188/ws-services-calculation/WCBillingSlab.json b/data/as/30181188/ws-services-calculation/WCBillingSlab.json
index 39afd22faf..b4bb2a1815 100644
--- a/data/as/30181188/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181188/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181246/ws-services-calculation/Penalty.json b/data/as/30181246/ws-services-calculation/Penalty.json
index 177e0dc3d8..a44d40189f 100644
--- a/data/as/30181246/ws-services-calculation/Penalty.json
+++ b/data/as/30181246/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181246/ws-services-calculation/WCBillingSlab.json b/data/as/30181246/ws-services-calculation/WCBillingSlab.json
index ee533f02e0..9482f76971 100644
--- a/data/as/30181246/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181246/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181257/ws-services-calculation/Penalty.json b/data/as/30181257/ws-services-calculation/Penalty.json
index 11d89397f2..33ae6ffa47 100644
--- a/data/as/30181257/ws-services-calculation/Penalty.json
+++ b/data/as/30181257/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181257/ws-services-calculation/WCBillingSlab.json b/data/as/30181257/ws-services-calculation/WCBillingSlab.json
index 1c5323735f..91b7b23be2 100644
--- a/data/as/30181257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181257/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181268/ws-services-calculation/Penalty.json b/data/as/30181268/ws-services-calculation/Penalty.json
index 006a2fea94..71dc73e430 100644
--- a/data/as/30181268/ws-services-calculation/Penalty.json
+++ b/data/as/30181268/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181268/ws-services-calculation/WCBillingSlab.json b/data/as/30181268/ws-services-calculation/WCBillingSlab.json
index 9854502133..d750d12336 100644
--- a/data/as/30181268/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181268/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181293/ws-services-calculation/Penalty.json b/data/as/30181293/ws-services-calculation/Penalty.json
index 19807cd706..baf7d0b2aa 100644
--- a/data/as/30181293/ws-services-calculation/Penalty.json
+++ b/data/as/30181293/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181293/ws-services-calculation/WCBillingSlab.json b/data/as/30181293/ws-services-calculation/WCBillingSlab.json
index 7e262fc120..8c0b9905c8 100644
--- a/data/as/30181293/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181293/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181327/ws-services-calculation/Penalty.json b/data/as/30181327/ws-services-calculation/Penalty.json
index 09c4b98401..36b36cef5f 100644
--- a/data/as/30181327/ws-services-calculation/Penalty.json
+++ b/data/as/30181327/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181327/ws-services-calculation/WCBillingSlab.json b/data/as/30181327/ws-services-calculation/WCBillingSlab.json
index 2c2175ea9b..0032d78b39 100644
--- a/data/as/30181327/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181327/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181400/ws-services-calculation/Penalty.json b/data/as/30181400/ws-services-calculation/Penalty.json
index 15e894bf7b..e8e7f97e89 100644
--- a/data/as/30181400/ws-services-calculation/Penalty.json
+++ b/data/as/30181400/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181400/ws-services-calculation/WCBillingSlab.json b/data/as/30181400/ws-services-calculation/WCBillingSlab.json
index f56d7207aa..e9be555fc3 100644
--- a/data/as/30181400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181400/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181411/ws-services-calculation/Penalty.json b/data/as/30181411/ws-services-calculation/Penalty.json
index eada7acd06..65de0513db 100644
--- a/data/as/30181411/ws-services-calculation/Penalty.json
+++ b/data/as/30181411/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181411/ws-services-calculation/WCBillingSlab.json b/data/as/30181411/ws-services-calculation/WCBillingSlab.json
index 0ca9648f00..59ee87f994 100644
--- a/data/as/30181411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181411/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181434/ws-services-calculation/Penalty.json b/data/as/30181434/ws-services-calculation/Penalty.json
index 4b5685af99..ec4f42bfab 100644
--- a/data/as/30181434/ws-services-calculation/Penalty.json
+++ b/data/as/30181434/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181434/ws-services-calculation/WCBillingSlab.json b/data/as/30181434/ws-services-calculation/WCBillingSlab.json
index 5c218ab71a..7c51eee2a7 100644
--- a/data/as/30181434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181434/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181444/ws-services-calculation/Penalty.json b/data/as/30181444/ws-services-calculation/Penalty.json
index 90fe3a0dc4..806fad5b5d 100644
--- a/data/as/30181444/ws-services-calculation/Penalty.json
+++ b/data/as/30181444/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181444/ws-services-calculation/WCBillingSlab.json b/data/as/30181444/ws-services-calculation/WCBillingSlab.json
index 232713d4dd..e1653bbccf 100644
--- a/data/as/30181444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181444/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181457/ws-services-calculation/Penalty.json b/data/as/30181457/ws-services-calculation/Penalty.json
index 40635773c1..7005897a39 100644
--- a/data/as/30181457/ws-services-calculation/Penalty.json
+++ b/data/as/30181457/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181457/ws-services-calculation/WCBillingSlab.json b/data/as/30181457/ws-services-calculation/WCBillingSlab.json
index 1b7823ec91..4e375b177c 100644
--- a/data/as/30181457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181457/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181562/ws-services-calculation/Penalty.json b/data/as/30181562/ws-services-calculation/Penalty.json
index c11a22bb58..597bc15b17 100644
--- a/data/as/30181562/ws-services-calculation/Penalty.json
+++ b/data/as/30181562/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181562/ws-services-calculation/WCBillingSlab.json b/data/as/30181562/ws-services-calculation/WCBillingSlab.json
index 19c942e7cf..e557fc5e78 100644
--- a/data/as/30181562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181562/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181575/ws-services-calculation/Penalty.json b/data/as/30181575/ws-services-calculation/Penalty.json
index 6f1e9d7da6..8c96be6676 100644
--- a/data/as/30181575/ws-services-calculation/Penalty.json
+++ b/data/as/30181575/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181575/ws-services-calculation/WCBillingSlab.json b/data/as/30181575/ws-services-calculation/WCBillingSlab.json
index 65645dd78a..22b95e8961 100644
--- a/data/as/30181575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181575/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181597/ws-services-calculation/Penalty.json b/data/as/30181597/ws-services-calculation/Penalty.json
index 917f816d11..7bf186ce6c 100644
--- a/data/as/30181597/ws-services-calculation/Penalty.json
+++ b/data/as/30181597/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181597/ws-services-calculation/WCBillingSlab.json b/data/as/30181597/ws-services-calculation/WCBillingSlab.json
index 0462cec1a2..c495f8d463 100644
--- a/data/as/30181597/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181597/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181604/ws-services-calculation/Penalty.json b/data/as/30181604/ws-services-calculation/Penalty.json
index 941c41f812..28b32e1a9b 100644
--- a/data/as/30181604/ws-services-calculation/Penalty.json
+++ b/data/as/30181604/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181604/ws-services-calculation/WCBillingSlab.json b/data/as/30181604/ws-services-calculation/WCBillingSlab.json
index ac8613786c..4a1aa4d43e 100644
--- a/data/as/30181604/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181604/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181615/ws-services-calculation/Penalty.json b/data/as/30181615/ws-services-calculation/Penalty.json
index db23f05e14..1083d47b1e 100644
--- a/data/as/30181615/ws-services-calculation/Penalty.json
+++ b/data/as/30181615/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181615/ws-services-calculation/WCBillingSlab.json b/data/as/30181615/ws-services-calculation/WCBillingSlab.json
index 100c65771b..cd9529486b 100644
--- a/data/as/30181615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181615/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181621/ws-services-calculation/Penalty.json b/data/as/30181621/ws-services-calculation/Penalty.json
index 1898d05309..bb01d780d0 100644
--- a/data/as/30181621/ws-services-calculation/Penalty.json
+++ b/data/as/30181621/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181621/ws-services-calculation/WCBillingSlab.json b/data/as/30181621/ws-services-calculation/WCBillingSlab.json
index 532df4c0bd..55d02b733b 100644
--- a/data/as/30181621/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181621/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181628/ws-services-calculation/Penalty.json b/data/as/30181628/ws-services-calculation/Penalty.json
index cecc1e746c..990efbfd4a 100644
--- a/data/as/30181628/ws-services-calculation/Penalty.json
+++ b/data/as/30181628/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181628/ws-services-calculation/WCBillingSlab.json b/data/as/30181628/ws-services-calculation/WCBillingSlab.json
index 7e40c92279..c1d5173700 100644
--- a/data/as/30181628/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181628/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181639/ws-services-calculation/Penalty.json b/data/as/30181639/ws-services-calculation/Penalty.json
index 681302ceb0..9ecb4e77ae 100644
--- a/data/as/30181639/ws-services-calculation/Penalty.json
+++ b/data/as/30181639/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181639/ws-services-calculation/WCBillingSlab.json b/data/as/30181639/ws-services-calculation/WCBillingSlab.json
index 40931b3010..f503384697 100644
--- a/data/as/30181639/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181639/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181769/ws-services-calculation/Penalty.json b/data/as/30181769/ws-services-calculation/Penalty.json
index f3cea954bf..41c0254137 100644
--- a/data/as/30181769/ws-services-calculation/Penalty.json
+++ b/data/as/30181769/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181769/ws-services-calculation/WCBillingSlab.json b/data/as/30181769/ws-services-calculation/WCBillingSlab.json
index 20700033bd..513eda653c 100644
--- a/data/as/30181769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181769/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181824/ws-services-calculation/Penalty.json b/data/as/30181824/ws-services-calculation/Penalty.json
index 826424dcc7..e8d8036b8b 100644
--- a/data/as/30181824/ws-services-calculation/Penalty.json
+++ b/data/as/30181824/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181824/ws-services-calculation/WCBillingSlab.json b/data/as/30181824/ws-services-calculation/WCBillingSlab.json
index 1363a323af..62ac09fab5 100644
--- a/data/as/30181824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181824/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181850/ws-services-calculation/Penalty.json b/data/as/30181850/ws-services-calculation/Penalty.json
index c1679fa5b4..ada8f75edc 100644
--- a/data/as/30181850/ws-services-calculation/Penalty.json
+++ b/data/as/30181850/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181850/ws-services-calculation/WCBillingSlab.json b/data/as/30181850/ws-services-calculation/WCBillingSlab.json
index 33692a2ac9..3f3bd2f9e8 100644
--- a/data/as/30181850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181850/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181892/ws-services-calculation/Penalty.json b/data/as/30181892/ws-services-calculation/Penalty.json
index b621ec619a..d58c78a262 100644
--- a/data/as/30181892/ws-services-calculation/Penalty.json
+++ b/data/as/30181892/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181892/ws-services-calculation/WCBillingSlab.json b/data/as/30181892/ws-services-calculation/WCBillingSlab.json
index ef373bc21f..b20658ca48 100644
--- a/data/as/30181892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181892/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From e873af9bef29ed3b30ac76d990396bf2d9ea25d9 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 16:10:11 +0530
Subject: [PATCH 16/23] Updated others data

---
 data/as/30181910/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181910/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181935/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181935/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181958/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181958/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30181970/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30181970/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182020/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182020/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182059/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182059/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182076/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182076/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182096/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182096/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182115/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182115/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182130/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182130/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182227/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182227/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182259/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182259/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182280/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182280/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182312/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182312/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182324/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182324/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182346/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182346/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182357/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182357/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182369/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182369/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182379/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182379/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182397/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182397/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182413/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182413/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182433/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182433/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182444/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182444/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182458/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182458/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182473/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182473/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182492/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182492/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30182502/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30182502/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183072/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183072/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183077/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183077/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183135/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183135/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183229/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183229/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183244/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183244/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183255/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183255/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183275/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183275/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183307/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183307/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183330/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183330/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183351/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183351/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183367/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183367/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183379/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183379/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183385/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183385/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183392/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183392/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183402/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183402/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183409/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183409/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183414/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183414/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183459/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183459/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183462/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183462/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183468/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183468/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183522/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183522/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183574/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183574/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183599/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183599/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183693/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183693/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183728/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183728/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183758/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183758/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183945/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183945/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183971/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183971/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30183980/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30183980/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30184382/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30184382/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30184383/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30184383/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30184384/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30184384/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30184386/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30184386/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30184393/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30184393/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30184401/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30184401/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30185152/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30185152/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30186115/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30186115/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30186145/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30186145/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30186206/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30186206/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30186275/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30186275/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30186307/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30186307/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188401/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188401/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188411/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188411/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188425/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188425/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188440/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188440/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188457/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188457/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188494/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188494/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188506/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188506/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188524/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188524/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188535/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188535/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188564/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188564/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188569/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188569/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188583/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188583/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188648/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188648/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188716/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188716/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188761/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188761/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188772/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188772/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188786/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188786/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188820/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188820/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30188848/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30188848/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189234/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189234/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189242/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189242/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189256/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189256/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189269/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189269/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189277/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189277/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189286/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189286/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189299/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189299/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189315/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189315/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189323/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189323/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189328/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189328/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189336/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189336/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189344/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189344/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189379/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189379/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189381/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189381/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189391/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189391/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189399/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189399/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189413/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189413/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189424/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189424/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189431/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189431/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189444/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189444/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189455/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189455/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189469/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189469/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189496/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189496/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189526/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189526/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189537/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189537/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189551/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189551/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189562/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189562/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189571/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189571/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189582/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189582/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189595/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189595/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30189615/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30189615/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191686/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191686/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191713/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191713/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191743/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191743/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191765/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191765/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191816/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191816/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191837/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191837/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191855/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191855/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191889/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191889/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191910/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191910/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191941/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191941/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30191974/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30191974/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30192001/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30192001/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30192026/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30192026/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30192045/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30192045/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30192070/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30192070/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30192093/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30192093/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30192129/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30192129/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30193693/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30193693/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30196401/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30196401/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30196757/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30196757/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30196783/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30196783/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30196788/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30196788/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30196800/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30196800/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30196806/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30196806/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30199561/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30199561/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30199580/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30199580/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30199609/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30199609/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30199656/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30199656/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200209/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200209/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200338/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200338/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200348/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200348/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200365/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200365/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200373/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200373/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200381/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200381/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200390/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200390/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30200395/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30200395/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201829/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201829/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201845/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201845/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201859/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201859/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201868/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201868/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201884/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201884/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201910/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201910/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201927/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201927/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201982/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201982/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30201998/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30201998/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202047/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202047/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202048/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202048/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202080/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202080/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202118/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202118/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202288/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202288/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202311/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202311/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202346/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202346/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202436/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202436/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202462/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202462/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202484/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202484/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202510/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202510/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202537/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202537/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202570/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202570/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202595/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202595/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202611/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202611/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202636/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202636/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202651/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202651/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202908/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202908/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30202964/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30202964/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30204586/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30204586/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207281/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207281/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207843/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207843/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207863/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207863/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207883/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207883/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207923/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207923/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207980/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207980/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207990/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207990/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30207996/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30207996/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208033/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208033/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208074/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208074/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208101/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208101/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208625/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208625/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208644/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208644/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208681/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208681/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30208803/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30208803/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211530/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211530/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211543/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211543/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211556/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211556/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211591/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211591/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211653/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211653/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211673/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211673/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211695/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211695/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211715/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211715/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211747/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211747/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30211881/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30211881/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212673/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212673/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212710/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212710/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212736/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212736/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212751/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212751/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212766/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212766/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212780/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212780/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212817/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212817/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212830/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212830/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212847/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212847/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212906/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212906/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212926/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212926/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212942/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212942/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212948/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212948/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212952/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212952/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212973/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212973/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212983/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212983/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30212996/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30212996/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213000/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213000/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213013/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213013/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213023/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213023/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213053/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213053/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213057/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213057/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213059/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213059/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213066/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213066/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213067/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213067/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213075/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213075/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213079/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213079/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213084/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213084/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213135/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213135/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213136/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213136/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213138/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213138/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213140/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213140/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213143/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213143/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213146/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213146/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213148/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213148/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213150/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213150/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213200/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213200/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213202/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213202/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213205/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213205/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213208/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213208/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213210/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213210/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213215/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213215/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213219/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213219/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213224/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213224/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213489/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213489/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213521/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213521/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213556/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213556/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213569/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213569/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213581/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213581/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213587/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213587/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213598/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213598/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213603/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213603/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213638/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213638/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213716/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213716/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213729/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213729/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213788/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213788/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213798/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213798/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213839/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213839/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213850/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213850/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213862/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213862/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213877/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213877/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213916/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213916/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30213935/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30213935/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214038/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214038/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214044/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214044/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214051/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214051/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214059/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214059/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214062/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214062/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214069/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214069/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214095/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214095/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214145/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214145/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214148/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214148/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214152/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214152/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214157/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214157/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214168/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214168/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214174/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214174/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214298/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214298/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214330/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214330/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214334/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214334/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214398/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214398/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214413/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214413/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214437/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214437/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214444/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214444/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214454/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214454/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214478/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214478/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214502/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214502/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214524/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214524/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214533/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214533/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214551/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214551/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214559/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214559/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214579/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214579/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214623/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214623/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214632/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214632/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214635/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214635/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214651/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214651/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214686/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214686/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214704/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214704/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30214731/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30214731/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30215695/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30215695/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30215708/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30215708/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216018/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216018/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216021/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216021/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216024/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216024/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216027/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216027/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216030/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216030/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216039/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216039/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216045/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216045/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216049/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216049/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216051/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216051/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216053/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216053/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216054/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216054/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216055/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216055/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216056/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216056/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216057/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216057/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216058/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216058/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216059/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216059/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216061/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216061/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216062/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216062/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216214/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216214/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216258/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216258/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216269/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216269/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216295/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216295/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216302/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216302/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216319/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216319/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216336/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216336/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216372/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216372/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216378/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216378/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216401/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216401/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216427/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216427/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216449/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216449/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216472/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216472/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216505/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216505/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216577/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216577/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216676/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216676/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216841/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216841/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216849/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216849/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216928/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216928/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216939/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216939/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30216955/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30216955/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30217247/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30217247/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30217255/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30217255/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30217976/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30217976/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218422/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218422/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218426/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218426/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218431/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218431/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218437/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218437/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218442/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218442/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218453/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218453/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218465/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218465/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218467/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218467/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218469/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218469/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218658/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218658/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218660/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218660/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218662/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218662/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218664/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218664/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218673/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218673/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218675/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218675/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218682/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218682/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218684/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218684/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218703/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218703/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218711/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218711/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218717/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218717/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218718/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218718/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218719/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218719/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218721/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218721/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218722/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218722/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218724/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218724/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218726/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218726/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218728/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218728/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218731/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218731/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218732/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218732/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218733/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218733/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218734/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218734/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218735/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218735/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218736/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218736/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218737/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218737/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218738/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218738/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218739/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218739/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218740/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218740/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218741/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218741/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218742/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218742/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218743/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218743/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218744/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218744/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218745/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218745/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218812/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218812/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218889/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218889/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30218974/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30218974/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219042/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219042/ws-services-calculation/WCBillingSlab.json | 4 ++--
 800 files changed, 1200 insertions(+), 1200 deletions(-)

diff --git a/data/as/30181910/ws-services-calculation/Penalty.json b/data/as/30181910/ws-services-calculation/Penalty.json
index eec55e9e90..6da1107370 100644
--- a/data/as/30181910/ws-services-calculation/Penalty.json
+++ b/data/as/30181910/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181910/ws-services-calculation/WCBillingSlab.json b/data/as/30181910/ws-services-calculation/WCBillingSlab.json
index 2cdf4b4080..aedd558987 100644
--- a/data/as/30181910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181910/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181935/ws-services-calculation/Penalty.json b/data/as/30181935/ws-services-calculation/Penalty.json
index e426d75a23..c8601ed35f 100644
--- a/data/as/30181935/ws-services-calculation/Penalty.json
+++ b/data/as/30181935/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181935/ws-services-calculation/WCBillingSlab.json b/data/as/30181935/ws-services-calculation/WCBillingSlab.json
index 456b407c27..226d826053 100644
--- a/data/as/30181935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181935/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181958/ws-services-calculation/Penalty.json b/data/as/30181958/ws-services-calculation/Penalty.json
index 7513136037..67dac56348 100644
--- a/data/as/30181958/ws-services-calculation/Penalty.json
+++ b/data/as/30181958/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181958/ws-services-calculation/WCBillingSlab.json b/data/as/30181958/ws-services-calculation/WCBillingSlab.json
index 4a0e54381c..f376560c2b 100644
--- a/data/as/30181958/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181958/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30181970/ws-services-calculation/Penalty.json b/data/as/30181970/ws-services-calculation/Penalty.json
index 051182a337..450f200f81 100644
--- a/data/as/30181970/ws-services-calculation/Penalty.json
+++ b/data/as/30181970/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181970/ws-services-calculation/WCBillingSlab.json b/data/as/30181970/ws-services-calculation/WCBillingSlab.json
index 840d9a6a40..592056333f 100644
--- a/data/as/30181970/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181970/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182020/ws-services-calculation/Penalty.json b/data/as/30182020/ws-services-calculation/Penalty.json
index 497c9b8e1e..3ebc50d04f 100644
--- a/data/as/30182020/ws-services-calculation/Penalty.json
+++ b/data/as/30182020/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182020/ws-services-calculation/WCBillingSlab.json b/data/as/30182020/ws-services-calculation/WCBillingSlab.json
index cd61d16e48..3864dfa814 100644
--- a/data/as/30182020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182020/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182059/ws-services-calculation/Penalty.json b/data/as/30182059/ws-services-calculation/Penalty.json
index 8fef8ad05c..fae8ba50ec 100644
--- a/data/as/30182059/ws-services-calculation/Penalty.json
+++ b/data/as/30182059/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182059/ws-services-calculation/WCBillingSlab.json b/data/as/30182059/ws-services-calculation/WCBillingSlab.json
index 0101843ee4..6e8c9f41e5 100644
--- a/data/as/30182059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182059/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182076/ws-services-calculation/Penalty.json b/data/as/30182076/ws-services-calculation/Penalty.json
index e4af222756..16e37121dd 100644
--- a/data/as/30182076/ws-services-calculation/Penalty.json
+++ b/data/as/30182076/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182076/ws-services-calculation/WCBillingSlab.json b/data/as/30182076/ws-services-calculation/WCBillingSlab.json
index 02d826f3e2..875bc35914 100644
--- a/data/as/30182076/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182076/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182096/ws-services-calculation/Penalty.json b/data/as/30182096/ws-services-calculation/Penalty.json
index f2fd796cf5..a64d855c16 100644
--- a/data/as/30182096/ws-services-calculation/Penalty.json
+++ b/data/as/30182096/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182096/ws-services-calculation/WCBillingSlab.json b/data/as/30182096/ws-services-calculation/WCBillingSlab.json
index 6271d6abaa..f633095e43 100644
--- a/data/as/30182096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182096/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182115/ws-services-calculation/Penalty.json b/data/as/30182115/ws-services-calculation/Penalty.json
index d13fcbe4a4..f7d5c574e0 100644
--- a/data/as/30182115/ws-services-calculation/Penalty.json
+++ b/data/as/30182115/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182115/ws-services-calculation/WCBillingSlab.json b/data/as/30182115/ws-services-calculation/WCBillingSlab.json
index ff8dbf56f2..6a36c3fe02 100644
--- a/data/as/30182115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182115/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182130/ws-services-calculation/Penalty.json b/data/as/30182130/ws-services-calculation/Penalty.json
index cd4cf00e51..3dc1329fca 100644
--- a/data/as/30182130/ws-services-calculation/Penalty.json
+++ b/data/as/30182130/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182130/ws-services-calculation/WCBillingSlab.json b/data/as/30182130/ws-services-calculation/WCBillingSlab.json
index 70c80a4461..d316a7f2b7 100644
--- a/data/as/30182130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182130/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182227/ws-services-calculation/Penalty.json b/data/as/30182227/ws-services-calculation/Penalty.json
index 4f0f288d5d..56c28c10f9 100644
--- a/data/as/30182227/ws-services-calculation/Penalty.json
+++ b/data/as/30182227/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182227/ws-services-calculation/WCBillingSlab.json b/data/as/30182227/ws-services-calculation/WCBillingSlab.json
index 7f8e924608..ebbff621ec 100644
--- a/data/as/30182227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182227/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182259/ws-services-calculation/Penalty.json b/data/as/30182259/ws-services-calculation/Penalty.json
index c19f141491..6f2985e508 100644
--- a/data/as/30182259/ws-services-calculation/Penalty.json
+++ b/data/as/30182259/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182259/ws-services-calculation/WCBillingSlab.json b/data/as/30182259/ws-services-calculation/WCBillingSlab.json
index 70bd43bb4a..6e86b80b0c 100644
--- a/data/as/30182259/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182259/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182280/ws-services-calculation/Penalty.json b/data/as/30182280/ws-services-calculation/Penalty.json
index 409fd8f2f1..5b1839bbe3 100644
--- a/data/as/30182280/ws-services-calculation/Penalty.json
+++ b/data/as/30182280/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182280/ws-services-calculation/WCBillingSlab.json b/data/as/30182280/ws-services-calculation/WCBillingSlab.json
index a5f7be152b..2a59ee9ad1 100644
--- a/data/as/30182280/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182280/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182312/ws-services-calculation/Penalty.json b/data/as/30182312/ws-services-calculation/Penalty.json
index 8934cd6214..1ed5df3cf0 100644
--- a/data/as/30182312/ws-services-calculation/Penalty.json
+++ b/data/as/30182312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182312/ws-services-calculation/WCBillingSlab.json b/data/as/30182312/ws-services-calculation/WCBillingSlab.json
index b3599e859a..edc65fedf7 100644
--- a/data/as/30182312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182324/ws-services-calculation/Penalty.json b/data/as/30182324/ws-services-calculation/Penalty.json
index 069bcff94d..445230ad67 100644
--- a/data/as/30182324/ws-services-calculation/Penalty.json
+++ b/data/as/30182324/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182324/ws-services-calculation/WCBillingSlab.json b/data/as/30182324/ws-services-calculation/WCBillingSlab.json
index 713952e6b0..987f355d4f 100644
--- a/data/as/30182324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182324/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182346/ws-services-calculation/Penalty.json b/data/as/30182346/ws-services-calculation/Penalty.json
index 932548715a..93e02e5bfb 100644
--- a/data/as/30182346/ws-services-calculation/Penalty.json
+++ b/data/as/30182346/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182346/ws-services-calculation/WCBillingSlab.json b/data/as/30182346/ws-services-calculation/WCBillingSlab.json
index 615cde46e4..925ffd224d 100644
--- a/data/as/30182346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182346/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182357/ws-services-calculation/Penalty.json b/data/as/30182357/ws-services-calculation/Penalty.json
index 0d442d24d3..9f51c86e63 100644
--- a/data/as/30182357/ws-services-calculation/Penalty.json
+++ b/data/as/30182357/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182357/ws-services-calculation/WCBillingSlab.json b/data/as/30182357/ws-services-calculation/WCBillingSlab.json
index 91944a3619..63c2343cb8 100644
--- a/data/as/30182357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182357/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182369/ws-services-calculation/Penalty.json b/data/as/30182369/ws-services-calculation/Penalty.json
index df599354d0..d95ce990e0 100644
--- a/data/as/30182369/ws-services-calculation/Penalty.json
+++ b/data/as/30182369/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182369/ws-services-calculation/WCBillingSlab.json b/data/as/30182369/ws-services-calculation/WCBillingSlab.json
index 077461e915..2936da4bc0 100644
--- a/data/as/30182369/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182369/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182379/ws-services-calculation/Penalty.json b/data/as/30182379/ws-services-calculation/Penalty.json
index dc40b59d8e..d00d71162a 100644
--- a/data/as/30182379/ws-services-calculation/Penalty.json
+++ b/data/as/30182379/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182379/ws-services-calculation/WCBillingSlab.json b/data/as/30182379/ws-services-calculation/WCBillingSlab.json
index de84bed4ad..3a25ac881e 100644
--- a/data/as/30182379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182379/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182397/ws-services-calculation/Penalty.json b/data/as/30182397/ws-services-calculation/Penalty.json
index 7894fea54f..6c04eadd73 100644
--- a/data/as/30182397/ws-services-calculation/Penalty.json
+++ b/data/as/30182397/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182397/ws-services-calculation/WCBillingSlab.json b/data/as/30182397/ws-services-calculation/WCBillingSlab.json
index 82f1b90de0..46ab321daa 100644
--- a/data/as/30182397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182397/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182413/ws-services-calculation/Penalty.json b/data/as/30182413/ws-services-calculation/Penalty.json
index f1cb74f327..2291bdbfab 100644
--- a/data/as/30182413/ws-services-calculation/Penalty.json
+++ b/data/as/30182413/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182413/ws-services-calculation/WCBillingSlab.json b/data/as/30182413/ws-services-calculation/WCBillingSlab.json
index a724899b71..d775aad525 100644
--- a/data/as/30182413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182413/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182433/ws-services-calculation/Penalty.json b/data/as/30182433/ws-services-calculation/Penalty.json
index 1d9bacab09..d07cc07f9c 100644
--- a/data/as/30182433/ws-services-calculation/Penalty.json
+++ b/data/as/30182433/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182433/ws-services-calculation/WCBillingSlab.json b/data/as/30182433/ws-services-calculation/WCBillingSlab.json
index f72089e26b..401bfa8adc 100644
--- a/data/as/30182433/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182433/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182444/ws-services-calculation/Penalty.json b/data/as/30182444/ws-services-calculation/Penalty.json
index 17922e0e84..32fb37ae52 100644
--- a/data/as/30182444/ws-services-calculation/Penalty.json
+++ b/data/as/30182444/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182444/ws-services-calculation/WCBillingSlab.json b/data/as/30182444/ws-services-calculation/WCBillingSlab.json
index 74ea05f592..d6bf3df2d2 100644
--- a/data/as/30182444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182444/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182458/ws-services-calculation/Penalty.json b/data/as/30182458/ws-services-calculation/Penalty.json
index bbc526cb95..c5760ea560 100644
--- a/data/as/30182458/ws-services-calculation/Penalty.json
+++ b/data/as/30182458/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182458/ws-services-calculation/WCBillingSlab.json b/data/as/30182458/ws-services-calculation/WCBillingSlab.json
index 0ab6381cc0..028fb84220 100644
--- a/data/as/30182458/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182458/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182473/ws-services-calculation/Penalty.json b/data/as/30182473/ws-services-calculation/Penalty.json
index f9d8cc6692..47078335b2 100644
--- a/data/as/30182473/ws-services-calculation/Penalty.json
+++ b/data/as/30182473/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182473/ws-services-calculation/WCBillingSlab.json b/data/as/30182473/ws-services-calculation/WCBillingSlab.json
index 91e031c414..97eec80ae3 100644
--- a/data/as/30182473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182473/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182492/ws-services-calculation/Penalty.json b/data/as/30182492/ws-services-calculation/Penalty.json
index a1640be3c3..d369d115a1 100644
--- a/data/as/30182492/ws-services-calculation/Penalty.json
+++ b/data/as/30182492/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182492/ws-services-calculation/WCBillingSlab.json b/data/as/30182492/ws-services-calculation/WCBillingSlab.json
index b97a5de9ac..1fafbe7110 100644
--- a/data/as/30182492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182492/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30182502/ws-services-calculation/Penalty.json b/data/as/30182502/ws-services-calculation/Penalty.json
index c057730011..f970f72e26 100644
--- a/data/as/30182502/ws-services-calculation/Penalty.json
+++ b/data/as/30182502/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182502/ws-services-calculation/WCBillingSlab.json b/data/as/30182502/ws-services-calculation/WCBillingSlab.json
index c5c87645ec..92b404ff6b 100644
--- a/data/as/30182502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182502/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183072/ws-services-calculation/Penalty.json b/data/as/30183072/ws-services-calculation/Penalty.json
index 581765bc70..e9818b648a 100644
--- a/data/as/30183072/ws-services-calculation/Penalty.json
+++ b/data/as/30183072/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183072/ws-services-calculation/WCBillingSlab.json b/data/as/30183072/ws-services-calculation/WCBillingSlab.json
index 743c0d17d3..4936bbef34 100644
--- a/data/as/30183072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183072/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183077/ws-services-calculation/Penalty.json b/data/as/30183077/ws-services-calculation/Penalty.json
index 7b0f5414df..b252f8c36f 100644
--- a/data/as/30183077/ws-services-calculation/Penalty.json
+++ b/data/as/30183077/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183077/ws-services-calculation/WCBillingSlab.json b/data/as/30183077/ws-services-calculation/WCBillingSlab.json
index b3f526ae16..9b7f12f1f7 100644
--- a/data/as/30183077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183077/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183135/ws-services-calculation/Penalty.json b/data/as/30183135/ws-services-calculation/Penalty.json
index 00ad21dac2..e1c966a2d7 100644
--- a/data/as/30183135/ws-services-calculation/Penalty.json
+++ b/data/as/30183135/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183135/ws-services-calculation/WCBillingSlab.json b/data/as/30183135/ws-services-calculation/WCBillingSlab.json
index 13ac4804b7..fc8df37f92 100644
--- a/data/as/30183135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183135/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183229/ws-services-calculation/Penalty.json b/data/as/30183229/ws-services-calculation/Penalty.json
index 6104f99c1f..bc028129b5 100644
--- a/data/as/30183229/ws-services-calculation/Penalty.json
+++ b/data/as/30183229/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183229/ws-services-calculation/WCBillingSlab.json b/data/as/30183229/ws-services-calculation/WCBillingSlab.json
index 22c9694a7a..d59352fa98 100644
--- a/data/as/30183229/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183229/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183244/ws-services-calculation/Penalty.json b/data/as/30183244/ws-services-calculation/Penalty.json
index 274420567d..a7d4d82d6e 100644
--- a/data/as/30183244/ws-services-calculation/Penalty.json
+++ b/data/as/30183244/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183244/ws-services-calculation/WCBillingSlab.json b/data/as/30183244/ws-services-calculation/WCBillingSlab.json
index 5974c8d766..ae3ddaa4d5 100644
--- a/data/as/30183244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183244/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183255/ws-services-calculation/Penalty.json b/data/as/30183255/ws-services-calculation/Penalty.json
index c885770901..06a9731327 100644
--- a/data/as/30183255/ws-services-calculation/Penalty.json
+++ b/data/as/30183255/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183255/ws-services-calculation/WCBillingSlab.json b/data/as/30183255/ws-services-calculation/WCBillingSlab.json
index 9f0a5f8acf..4c80b28d2a 100644
--- a/data/as/30183255/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183255/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183275/ws-services-calculation/Penalty.json b/data/as/30183275/ws-services-calculation/Penalty.json
index 5acc5d4a5d..95e8ebdfb0 100644
--- a/data/as/30183275/ws-services-calculation/Penalty.json
+++ b/data/as/30183275/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183275/ws-services-calculation/WCBillingSlab.json b/data/as/30183275/ws-services-calculation/WCBillingSlab.json
index 14375e6cbd..329b5898ec 100644
--- a/data/as/30183275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183275/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183307/ws-services-calculation/Penalty.json b/data/as/30183307/ws-services-calculation/Penalty.json
index 27b1a0edcd..e17dc339d5 100644
--- a/data/as/30183307/ws-services-calculation/Penalty.json
+++ b/data/as/30183307/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183307/ws-services-calculation/WCBillingSlab.json b/data/as/30183307/ws-services-calculation/WCBillingSlab.json
index 33b902b1c3..c1e3124023 100644
--- a/data/as/30183307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183307/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183330/ws-services-calculation/Penalty.json b/data/as/30183330/ws-services-calculation/Penalty.json
index f3f3b197f8..ff96674808 100644
--- a/data/as/30183330/ws-services-calculation/Penalty.json
+++ b/data/as/30183330/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183330/ws-services-calculation/WCBillingSlab.json b/data/as/30183330/ws-services-calculation/WCBillingSlab.json
index 9660170113..1ee3713cc8 100644
--- a/data/as/30183330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183330/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183351/ws-services-calculation/Penalty.json b/data/as/30183351/ws-services-calculation/Penalty.json
index bb452e41d3..b8b9114d6b 100644
--- a/data/as/30183351/ws-services-calculation/Penalty.json
+++ b/data/as/30183351/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183351/ws-services-calculation/WCBillingSlab.json b/data/as/30183351/ws-services-calculation/WCBillingSlab.json
index 249ce72612..cf2f83eade 100644
--- a/data/as/30183351/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183351/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183367/ws-services-calculation/Penalty.json b/data/as/30183367/ws-services-calculation/Penalty.json
index 6d52b02e2c..fc3b6914e7 100644
--- a/data/as/30183367/ws-services-calculation/Penalty.json
+++ b/data/as/30183367/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183367/ws-services-calculation/WCBillingSlab.json b/data/as/30183367/ws-services-calculation/WCBillingSlab.json
index d45db25263..112c7d3b24 100644
--- a/data/as/30183367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183367/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183379/ws-services-calculation/Penalty.json b/data/as/30183379/ws-services-calculation/Penalty.json
index af1a08bc99..235b88633c 100644
--- a/data/as/30183379/ws-services-calculation/Penalty.json
+++ b/data/as/30183379/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183379/ws-services-calculation/WCBillingSlab.json b/data/as/30183379/ws-services-calculation/WCBillingSlab.json
index e399b2e6bb..ea1bf13f4f 100644
--- a/data/as/30183379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183379/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183385/ws-services-calculation/Penalty.json b/data/as/30183385/ws-services-calculation/Penalty.json
index 12ba329dc4..dbd7748c34 100644
--- a/data/as/30183385/ws-services-calculation/Penalty.json
+++ b/data/as/30183385/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183385/ws-services-calculation/WCBillingSlab.json b/data/as/30183385/ws-services-calculation/WCBillingSlab.json
index 5fb57f77e6..9aee251edc 100644
--- a/data/as/30183385/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183385/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183392/ws-services-calculation/Penalty.json b/data/as/30183392/ws-services-calculation/Penalty.json
index 9598f721e2..26006565cd 100644
--- a/data/as/30183392/ws-services-calculation/Penalty.json
+++ b/data/as/30183392/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183392/ws-services-calculation/WCBillingSlab.json b/data/as/30183392/ws-services-calculation/WCBillingSlab.json
index 8f40d308a1..9151fdd49b 100644
--- a/data/as/30183392/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183392/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183402/ws-services-calculation/Penalty.json b/data/as/30183402/ws-services-calculation/Penalty.json
index 25db0932d9..b4ca68bf2a 100644
--- a/data/as/30183402/ws-services-calculation/Penalty.json
+++ b/data/as/30183402/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183402/ws-services-calculation/WCBillingSlab.json b/data/as/30183402/ws-services-calculation/WCBillingSlab.json
index 01ed90aa47..a1cd738882 100644
--- a/data/as/30183402/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183402/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183409/ws-services-calculation/Penalty.json b/data/as/30183409/ws-services-calculation/Penalty.json
index d5604fe542..fc53151f07 100644
--- a/data/as/30183409/ws-services-calculation/Penalty.json
+++ b/data/as/30183409/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183409/ws-services-calculation/WCBillingSlab.json b/data/as/30183409/ws-services-calculation/WCBillingSlab.json
index 992b5b1c6b..51851c0952 100644
--- a/data/as/30183409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183409/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183414/ws-services-calculation/Penalty.json b/data/as/30183414/ws-services-calculation/Penalty.json
index 29b7078923..064a6608e7 100644
--- a/data/as/30183414/ws-services-calculation/Penalty.json
+++ b/data/as/30183414/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183414/ws-services-calculation/WCBillingSlab.json b/data/as/30183414/ws-services-calculation/WCBillingSlab.json
index ebab028daa..9662fa4f2c 100644
--- a/data/as/30183414/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183414/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183459/ws-services-calculation/Penalty.json b/data/as/30183459/ws-services-calculation/Penalty.json
index 884e87fd2b..5b5c0bf31c 100644
--- a/data/as/30183459/ws-services-calculation/Penalty.json
+++ b/data/as/30183459/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183459/ws-services-calculation/WCBillingSlab.json b/data/as/30183459/ws-services-calculation/WCBillingSlab.json
index 79dfca30e6..59d2d75358 100644
--- a/data/as/30183459/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183459/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183462/ws-services-calculation/Penalty.json b/data/as/30183462/ws-services-calculation/Penalty.json
index 6738e69e93..efee65b3e8 100644
--- a/data/as/30183462/ws-services-calculation/Penalty.json
+++ b/data/as/30183462/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183462/ws-services-calculation/WCBillingSlab.json b/data/as/30183462/ws-services-calculation/WCBillingSlab.json
index 5a80204010..0539e5082b 100644
--- a/data/as/30183462/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183462/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183468/ws-services-calculation/Penalty.json b/data/as/30183468/ws-services-calculation/Penalty.json
index 446e26079e..222597eec4 100644
--- a/data/as/30183468/ws-services-calculation/Penalty.json
+++ b/data/as/30183468/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183468/ws-services-calculation/WCBillingSlab.json b/data/as/30183468/ws-services-calculation/WCBillingSlab.json
index 168af444c1..4f7e65154a 100644
--- a/data/as/30183468/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183468/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183496/ws-services-calculation/Penalty.json b/data/as/30183496/ws-services-calculation/Penalty.json
index 5b085075e4..e5c161e626 100644
--- a/data/as/30183496/ws-services-calculation/Penalty.json
+++ b/data/as/30183496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183496/ws-services-calculation/WCBillingSlab.json b/data/as/30183496/ws-services-calculation/WCBillingSlab.json
index 567a7579d1..7533b0fa51 100644
--- a/data/as/30183496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183522/ws-services-calculation/Penalty.json b/data/as/30183522/ws-services-calculation/Penalty.json
index 9e4b0d5dac..1260b7ef20 100644
--- a/data/as/30183522/ws-services-calculation/Penalty.json
+++ b/data/as/30183522/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183522/ws-services-calculation/WCBillingSlab.json b/data/as/30183522/ws-services-calculation/WCBillingSlab.json
index 2d32b6d4e8..ec08808014 100644
--- a/data/as/30183522/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183522/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183574/ws-services-calculation/Penalty.json b/data/as/30183574/ws-services-calculation/Penalty.json
index a6a8c77f87..f7175ff173 100644
--- a/data/as/30183574/ws-services-calculation/Penalty.json
+++ b/data/as/30183574/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183574/ws-services-calculation/WCBillingSlab.json b/data/as/30183574/ws-services-calculation/WCBillingSlab.json
index 9b380080c2..78b529ec92 100644
--- a/data/as/30183574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183574/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183599/ws-services-calculation/Penalty.json b/data/as/30183599/ws-services-calculation/Penalty.json
index 0d92dd9169..e2cdedbf1c 100644
--- a/data/as/30183599/ws-services-calculation/Penalty.json
+++ b/data/as/30183599/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183599/ws-services-calculation/WCBillingSlab.json b/data/as/30183599/ws-services-calculation/WCBillingSlab.json
index bad2e48c0d..90121750e5 100644
--- a/data/as/30183599/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183599/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183693/ws-services-calculation/Penalty.json b/data/as/30183693/ws-services-calculation/Penalty.json
index a122df62df..6d5e028c9e 100644
--- a/data/as/30183693/ws-services-calculation/Penalty.json
+++ b/data/as/30183693/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183693/ws-services-calculation/WCBillingSlab.json b/data/as/30183693/ws-services-calculation/WCBillingSlab.json
index 60399e4f6c..94d026150c 100644
--- a/data/as/30183693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183693/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183728/ws-services-calculation/Penalty.json b/data/as/30183728/ws-services-calculation/Penalty.json
index 521bd6df72..1b1c57353a 100644
--- a/data/as/30183728/ws-services-calculation/Penalty.json
+++ b/data/as/30183728/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183728/ws-services-calculation/WCBillingSlab.json b/data/as/30183728/ws-services-calculation/WCBillingSlab.json
index c33fb41f1d..8bed3430e3 100644
--- a/data/as/30183728/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183728/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183739/ws-services-calculation/Penalty.json b/data/as/30183739/ws-services-calculation/Penalty.json
index 1902a3876d..d9b073e2d8 100644
--- a/data/as/30183739/ws-services-calculation/Penalty.json
+++ b/data/as/30183739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183739/ws-services-calculation/WCBillingSlab.json b/data/as/30183739/ws-services-calculation/WCBillingSlab.json
index ee46e18fbc..4fe44af4f1 100644
--- a/data/as/30183739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183758/ws-services-calculation/Penalty.json b/data/as/30183758/ws-services-calculation/Penalty.json
index b36bd88218..642c916148 100644
--- a/data/as/30183758/ws-services-calculation/Penalty.json
+++ b/data/as/30183758/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183758/ws-services-calculation/WCBillingSlab.json b/data/as/30183758/ws-services-calculation/WCBillingSlab.json
index fe4f2373fc..5e674ae40e 100644
--- a/data/as/30183758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183758/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183945/ws-services-calculation/Penalty.json b/data/as/30183945/ws-services-calculation/Penalty.json
index c14696c961..0ad0104097 100644
--- a/data/as/30183945/ws-services-calculation/Penalty.json
+++ b/data/as/30183945/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183945/ws-services-calculation/WCBillingSlab.json b/data/as/30183945/ws-services-calculation/WCBillingSlab.json
index f67edbe1a7..4092db38ac 100644
--- a/data/as/30183945/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183945/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183971/ws-services-calculation/Penalty.json b/data/as/30183971/ws-services-calculation/Penalty.json
index 581742f908..3b3e263b58 100644
--- a/data/as/30183971/ws-services-calculation/Penalty.json
+++ b/data/as/30183971/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183971/ws-services-calculation/WCBillingSlab.json b/data/as/30183971/ws-services-calculation/WCBillingSlab.json
index a5e487e9f9..fa4d0194ab 100644
--- a/data/as/30183971/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183971/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30183980/ws-services-calculation/Penalty.json b/data/as/30183980/ws-services-calculation/Penalty.json
index 841fabaeca..06db70f7c6 100644
--- a/data/as/30183980/ws-services-calculation/Penalty.json
+++ b/data/as/30183980/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183980/ws-services-calculation/WCBillingSlab.json b/data/as/30183980/ws-services-calculation/WCBillingSlab.json
index 20cb51c3f5..62e040b80b 100644
--- a/data/as/30183980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183980/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30184382/ws-services-calculation/Penalty.json b/data/as/30184382/ws-services-calculation/Penalty.json
index 3eac420bc3..ccf44bfb41 100644
--- a/data/as/30184382/ws-services-calculation/Penalty.json
+++ b/data/as/30184382/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184382/ws-services-calculation/WCBillingSlab.json b/data/as/30184382/ws-services-calculation/WCBillingSlab.json
index 7346f59f72..d2c88a2a0d 100644
--- a/data/as/30184382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184382/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30184383/ws-services-calculation/Penalty.json b/data/as/30184383/ws-services-calculation/Penalty.json
index b71f11fa94..b814ad010a 100644
--- a/data/as/30184383/ws-services-calculation/Penalty.json
+++ b/data/as/30184383/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184383/ws-services-calculation/WCBillingSlab.json b/data/as/30184383/ws-services-calculation/WCBillingSlab.json
index aa4d63a906..091cfe7026 100644
--- a/data/as/30184383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184383/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30184384/ws-services-calculation/Penalty.json b/data/as/30184384/ws-services-calculation/Penalty.json
index 3fc8ccfa4c..1acbb620ec 100644
--- a/data/as/30184384/ws-services-calculation/Penalty.json
+++ b/data/as/30184384/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184384/ws-services-calculation/WCBillingSlab.json b/data/as/30184384/ws-services-calculation/WCBillingSlab.json
index a0ff506b68..df7ce962a8 100644
--- a/data/as/30184384/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184384/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30184386/ws-services-calculation/Penalty.json b/data/as/30184386/ws-services-calculation/Penalty.json
index a16b8ab53c..ad451a2e1b 100644
--- a/data/as/30184386/ws-services-calculation/Penalty.json
+++ b/data/as/30184386/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184386/ws-services-calculation/WCBillingSlab.json b/data/as/30184386/ws-services-calculation/WCBillingSlab.json
index bc3987ca15..4432631b2f 100644
--- a/data/as/30184386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184386/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30184393/ws-services-calculation/Penalty.json b/data/as/30184393/ws-services-calculation/Penalty.json
index 458151175e..a40f8a62b3 100644
--- a/data/as/30184393/ws-services-calculation/Penalty.json
+++ b/data/as/30184393/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184393/ws-services-calculation/WCBillingSlab.json b/data/as/30184393/ws-services-calculation/WCBillingSlab.json
index 6616ca25e0..7b043539ef 100644
--- a/data/as/30184393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184393/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30184401/ws-services-calculation/Penalty.json b/data/as/30184401/ws-services-calculation/Penalty.json
index 6f0dd34819..1d7428b705 100644
--- a/data/as/30184401/ws-services-calculation/Penalty.json
+++ b/data/as/30184401/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184401/ws-services-calculation/WCBillingSlab.json b/data/as/30184401/ws-services-calculation/WCBillingSlab.json
index 5a45045221..17a153ee9c 100644
--- a/data/as/30184401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184401/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30185152/ws-services-calculation/Penalty.json b/data/as/30185152/ws-services-calculation/Penalty.json
index 9a1e36ae54..e6eee20f83 100644
--- a/data/as/30185152/ws-services-calculation/Penalty.json
+++ b/data/as/30185152/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30185152/ws-services-calculation/WCBillingSlab.json b/data/as/30185152/ws-services-calculation/WCBillingSlab.json
index 756e189a4d..7a7b5510e1 100644
--- a/data/as/30185152/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30185152/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30186115/ws-services-calculation/Penalty.json b/data/as/30186115/ws-services-calculation/Penalty.json
index 454108f750..a512b6789c 100644
--- a/data/as/30186115/ws-services-calculation/Penalty.json
+++ b/data/as/30186115/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186115/ws-services-calculation/WCBillingSlab.json b/data/as/30186115/ws-services-calculation/WCBillingSlab.json
index cc541b9020..af97dd2c1b 100644
--- a/data/as/30186115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186115/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30186145/ws-services-calculation/Penalty.json b/data/as/30186145/ws-services-calculation/Penalty.json
index 01777a5fd6..b717ffa0ef 100644
--- a/data/as/30186145/ws-services-calculation/Penalty.json
+++ b/data/as/30186145/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186145/ws-services-calculation/WCBillingSlab.json b/data/as/30186145/ws-services-calculation/WCBillingSlab.json
index 908b309db5..e7475ab34d 100644
--- a/data/as/30186145/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186145/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30186206/ws-services-calculation/Penalty.json b/data/as/30186206/ws-services-calculation/Penalty.json
index c9dd389b0b..589992d4be 100644
--- a/data/as/30186206/ws-services-calculation/Penalty.json
+++ b/data/as/30186206/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186206/ws-services-calculation/WCBillingSlab.json b/data/as/30186206/ws-services-calculation/WCBillingSlab.json
index e3f937df9b..b3ebaede7b 100644
--- a/data/as/30186206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186206/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30186275/ws-services-calculation/Penalty.json b/data/as/30186275/ws-services-calculation/Penalty.json
index 2c354e41fa..99cab07d40 100644
--- a/data/as/30186275/ws-services-calculation/Penalty.json
+++ b/data/as/30186275/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186275/ws-services-calculation/WCBillingSlab.json b/data/as/30186275/ws-services-calculation/WCBillingSlab.json
index b95e90870f..9fdf9c84df 100644
--- a/data/as/30186275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186275/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30186307/ws-services-calculation/Penalty.json b/data/as/30186307/ws-services-calculation/Penalty.json
index f7aeaf021a..dc16e081dd 100644
--- a/data/as/30186307/ws-services-calculation/Penalty.json
+++ b/data/as/30186307/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186307/ws-services-calculation/WCBillingSlab.json b/data/as/30186307/ws-services-calculation/WCBillingSlab.json
index 952d081f42..ee39c9708b 100644
--- a/data/as/30186307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186307/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188401/ws-services-calculation/Penalty.json b/data/as/30188401/ws-services-calculation/Penalty.json
index a685eb80e5..de51023929 100644
--- a/data/as/30188401/ws-services-calculation/Penalty.json
+++ b/data/as/30188401/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188401/ws-services-calculation/WCBillingSlab.json b/data/as/30188401/ws-services-calculation/WCBillingSlab.json
index e1d44bea45..8269dd0cae 100644
--- a/data/as/30188401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188401/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188411/ws-services-calculation/Penalty.json b/data/as/30188411/ws-services-calculation/Penalty.json
index cecf57e0e7..7443e638be 100644
--- a/data/as/30188411/ws-services-calculation/Penalty.json
+++ b/data/as/30188411/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188411/ws-services-calculation/WCBillingSlab.json b/data/as/30188411/ws-services-calculation/WCBillingSlab.json
index 219c55b84e..fe9ad68818 100644
--- a/data/as/30188411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188411/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188425/ws-services-calculation/Penalty.json b/data/as/30188425/ws-services-calculation/Penalty.json
index c9a79a0c9e..136eed9d44 100644
--- a/data/as/30188425/ws-services-calculation/Penalty.json
+++ b/data/as/30188425/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188425/ws-services-calculation/WCBillingSlab.json b/data/as/30188425/ws-services-calculation/WCBillingSlab.json
index faaddafcac..99972d43fe 100644
--- a/data/as/30188425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188425/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188440/ws-services-calculation/Penalty.json b/data/as/30188440/ws-services-calculation/Penalty.json
index ee6ae269e4..7c56ecb6f9 100644
--- a/data/as/30188440/ws-services-calculation/Penalty.json
+++ b/data/as/30188440/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188440/ws-services-calculation/WCBillingSlab.json b/data/as/30188440/ws-services-calculation/WCBillingSlab.json
index 7e8dc900da..596061ffff 100644
--- a/data/as/30188440/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188440/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188457/ws-services-calculation/Penalty.json b/data/as/30188457/ws-services-calculation/Penalty.json
index 36f530ad88..40a23c05a7 100644
--- a/data/as/30188457/ws-services-calculation/Penalty.json
+++ b/data/as/30188457/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188457/ws-services-calculation/WCBillingSlab.json b/data/as/30188457/ws-services-calculation/WCBillingSlab.json
index a05c64ddb7..b7a70857f2 100644
--- a/data/as/30188457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188457/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188494/ws-services-calculation/Penalty.json b/data/as/30188494/ws-services-calculation/Penalty.json
index ab9ccce369..7e4863c112 100644
--- a/data/as/30188494/ws-services-calculation/Penalty.json
+++ b/data/as/30188494/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188494/ws-services-calculation/WCBillingSlab.json b/data/as/30188494/ws-services-calculation/WCBillingSlab.json
index 6a1b7f827a..4255eee749 100644
--- a/data/as/30188494/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188494/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188506/ws-services-calculation/Penalty.json b/data/as/30188506/ws-services-calculation/Penalty.json
index df36f660f7..a3c80d8e02 100644
--- a/data/as/30188506/ws-services-calculation/Penalty.json
+++ b/data/as/30188506/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188506/ws-services-calculation/WCBillingSlab.json b/data/as/30188506/ws-services-calculation/WCBillingSlab.json
index 27729aa54e..80aada1fdd 100644
--- a/data/as/30188506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188506/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188524/ws-services-calculation/Penalty.json b/data/as/30188524/ws-services-calculation/Penalty.json
index ee7b257956..2c49913065 100644
--- a/data/as/30188524/ws-services-calculation/Penalty.json
+++ b/data/as/30188524/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188524/ws-services-calculation/WCBillingSlab.json b/data/as/30188524/ws-services-calculation/WCBillingSlab.json
index 180b63dcfe..b9d5624760 100644
--- a/data/as/30188524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188524/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188535/ws-services-calculation/Penalty.json b/data/as/30188535/ws-services-calculation/Penalty.json
index 04b6dce8a6..66921a6ad8 100644
--- a/data/as/30188535/ws-services-calculation/Penalty.json
+++ b/data/as/30188535/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188535/ws-services-calculation/WCBillingSlab.json b/data/as/30188535/ws-services-calculation/WCBillingSlab.json
index b60d0c9233..ee727f0ec6 100644
--- a/data/as/30188535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188535/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188564/ws-services-calculation/Penalty.json b/data/as/30188564/ws-services-calculation/Penalty.json
index 426ceb0c15..cc7c9828de 100644
--- a/data/as/30188564/ws-services-calculation/Penalty.json
+++ b/data/as/30188564/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188564/ws-services-calculation/WCBillingSlab.json b/data/as/30188564/ws-services-calculation/WCBillingSlab.json
index 832d205b46..ed79daf59f 100644
--- a/data/as/30188564/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188564/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188569/ws-services-calculation/Penalty.json b/data/as/30188569/ws-services-calculation/Penalty.json
index 7cb6994048..346f3e7e29 100644
--- a/data/as/30188569/ws-services-calculation/Penalty.json
+++ b/data/as/30188569/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188569/ws-services-calculation/WCBillingSlab.json b/data/as/30188569/ws-services-calculation/WCBillingSlab.json
index 3fc2ec87b5..48595e9e9e 100644
--- a/data/as/30188569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188569/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188583/ws-services-calculation/Penalty.json b/data/as/30188583/ws-services-calculation/Penalty.json
index 0082cdf8b0..09707c05b7 100644
--- a/data/as/30188583/ws-services-calculation/Penalty.json
+++ b/data/as/30188583/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188583/ws-services-calculation/WCBillingSlab.json b/data/as/30188583/ws-services-calculation/WCBillingSlab.json
index 6b32186846..6d87b550e2 100644
--- a/data/as/30188583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188583/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188648/ws-services-calculation/Penalty.json b/data/as/30188648/ws-services-calculation/Penalty.json
index 5cfaee9c31..3ebbdcc913 100644
--- a/data/as/30188648/ws-services-calculation/Penalty.json
+++ b/data/as/30188648/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188648/ws-services-calculation/WCBillingSlab.json b/data/as/30188648/ws-services-calculation/WCBillingSlab.json
index 37b82ef7b6..2e318c8456 100644
--- a/data/as/30188648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188648/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188716/ws-services-calculation/Penalty.json b/data/as/30188716/ws-services-calculation/Penalty.json
index 19b2e18e63..0284b4b470 100644
--- a/data/as/30188716/ws-services-calculation/Penalty.json
+++ b/data/as/30188716/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188716/ws-services-calculation/WCBillingSlab.json b/data/as/30188716/ws-services-calculation/WCBillingSlab.json
index fa3dd4cef4..fe906d4d9d 100644
--- a/data/as/30188716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188716/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188739/ws-services-calculation/Penalty.json b/data/as/30188739/ws-services-calculation/Penalty.json
index 08201e791e..998b9adb6e 100644
--- a/data/as/30188739/ws-services-calculation/Penalty.json
+++ b/data/as/30188739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188739/ws-services-calculation/WCBillingSlab.json b/data/as/30188739/ws-services-calculation/WCBillingSlab.json
index 6c1667886f..5c9fc63f5b 100644
--- a/data/as/30188739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188761/ws-services-calculation/Penalty.json b/data/as/30188761/ws-services-calculation/Penalty.json
index b6a922f9c2..cf19c4adac 100644
--- a/data/as/30188761/ws-services-calculation/Penalty.json
+++ b/data/as/30188761/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188761/ws-services-calculation/WCBillingSlab.json b/data/as/30188761/ws-services-calculation/WCBillingSlab.json
index 8c7bfbc123..a74fe4e1b8 100644
--- a/data/as/30188761/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188761/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188772/ws-services-calculation/Penalty.json b/data/as/30188772/ws-services-calculation/Penalty.json
index 95c60f14b6..90fb666d79 100644
--- a/data/as/30188772/ws-services-calculation/Penalty.json
+++ b/data/as/30188772/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188772/ws-services-calculation/WCBillingSlab.json b/data/as/30188772/ws-services-calculation/WCBillingSlab.json
index a19ffacfc0..defac321c3 100644
--- a/data/as/30188772/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188772/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188786/ws-services-calculation/Penalty.json b/data/as/30188786/ws-services-calculation/Penalty.json
index ceb6f58acf..858e77c736 100644
--- a/data/as/30188786/ws-services-calculation/Penalty.json
+++ b/data/as/30188786/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188786/ws-services-calculation/WCBillingSlab.json b/data/as/30188786/ws-services-calculation/WCBillingSlab.json
index 03959cf0e0..43f83a06ad 100644
--- a/data/as/30188786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188786/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188820/ws-services-calculation/Penalty.json b/data/as/30188820/ws-services-calculation/Penalty.json
index ee4b5348f1..f27fe68bbe 100644
--- a/data/as/30188820/ws-services-calculation/Penalty.json
+++ b/data/as/30188820/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188820/ws-services-calculation/WCBillingSlab.json b/data/as/30188820/ws-services-calculation/WCBillingSlab.json
index 5fbe405aeb..84e846199b 100644
--- a/data/as/30188820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188820/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30188848/ws-services-calculation/Penalty.json b/data/as/30188848/ws-services-calculation/Penalty.json
index ea5fc5e9c5..505db20f41 100644
--- a/data/as/30188848/ws-services-calculation/Penalty.json
+++ b/data/as/30188848/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188848/ws-services-calculation/WCBillingSlab.json b/data/as/30188848/ws-services-calculation/WCBillingSlab.json
index 7b7ba0b694..d4794a8da8 100644
--- a/data/as/30188848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188848/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189208/ws-services-calculation/Penalty.json b/data/as/30189208/ws-services-calculation/Penalty.json
index cfb8d89b03..8505fa6659 100644
--- a/data/as/30189208/ws-services-calculation/Penalty.json
+++ b/data/as/30189208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189208/ws-services-calculation/WCBillingSlab.json b/data/as/30189208/ws-services-calculation/WCBillingSlab.json
index 7060e8edcb..ab15207eab 100644
--- a/data/as/30189208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189234/ws-services-calculation/Penalty.json b/data/as/30189234/ws-services-calculation/Penalty.json
index 22a9dea833..e6a77eda11 100644
--- a/data/as/30189234/ws-services-calculation/Penalty.json
+++ b/data/as/30189234/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189234/ws-services-calculation/WCBillingSlab.json b/data/as/30189234/ws-services-calculation/WCBillingSlab.json
index 05dd8546bb..b5a3563505 100644
--- a/data/as/30189234/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189234/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189242/ws-services-calculation/Penalty.json b/data/as/30189242/ws-services-calculation/Penalty.json
index 2657bea718..058b1e13ab 100644
--- a/data/as/30189242/ws-services-calculation/Penalty.json
+++ b/data/as/30189242/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189242/ws-services-calculation/WCBillingSlab.json b/data/as/30189242/ws-services-calculation/WCBillingSlab.json
index 000ae7c004..ef6b789e45 100644
--- a/data/as/30189242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189242/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189256/ws-services-calculation/Penalty.json b/data/as/30189256/ws-services-calculation/Penalty.json
index f6cf4891e3..c8ee31efc0 100644
--- a/data/as/30189256/ws-services-calculation/Penalty.json
+++ b/data/as/30189256/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189256/ws-services-calculation/WCBillingSlab.json b/data/as/30189256/ws-services-calculation/WCBillingSlab.json
index 67cefaa8cf..abab63bffb 100644
--- a/data/as/30189256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189256/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189269/ws-services-calculation/Penalty.json b/data/as/30189269/ws-services-calculation/Penalty.json
index 664a423fd1..169f125bb8 100644
--- a/data/as/30189269/ws-services-calculation/Penalty.json
+++ b/data/as/30189269/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189269/ws-services-calculation/WCBillingSlab.json b/data/as/30189269/ws-services-calculation/WCBillingSlab.json
index 67e93ff147..8ce447d943 100644
--- a/data/as/30189269/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189269/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189277/ws-services-calculation/Penalty.json b/data/as/30189277/ws-services-calculation/Penalty.json
index 0690d5e34a..993ee9009f 100644
--- a/data/as/30189277/ws-services-calculation/Penalty.json
+++ b/data/as/30189277/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189277/ws-services-calculation/WCBillingSlab.json b/data/as/30189277/ws-services-calculation/WCBillingSlab.json
index f442b8e6a9..e6be44cf07 100644
--- a/data/as/30189277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189277/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189286/ws-services-calculation/Penalty.json b/data/as/30189286/ws-services-calculation/Penalty.json
index f1a213eea9..fae7091be8 100644
--- a/data/as/30189286/ws-services-calculation/Penalty.json
+++ b/data/as/30189286/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189286/ws-services-calculation/WCBillingSlab.json b/data/as/30189286/ws-services-calculation/WCBillingSlab.json
index 5a078748bd..63ab766d23 100644
--- a/data/as/30189286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189286/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189299/ws-services-calculation/Penalty.json b/data/as/30189299/ws-services-calculation/Penalty.json
index c6ba9e1f3a..26cba62134 100644
--- a/data/as/30189299/ws-services-calculation/Penalty.json
+++ b/data/as/30189299/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189299/ws-services-calculation/WCBillingSlab.json b/data/as/30189299/ws-services-calculation/WCBillingSlab.json
index 3b34b57e39..43ee834335 100644
--- a/data/as/30189299/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189299/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189315/ws-services-calculation/Penalty.json b/data/as/30189315/ws-services-calculation/Penalty.json
index 91f9919128..6fcadb558b 100644
--- a/data/as/30189315/ws-services-calculation/Penalty.json
+++ b/data/as/30189315/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189315/ws-services-calculation/WCBillingSlab.json b/data/as/30189315/ws-services-calculation/WCBillingSlab.json
index e97e000ad3..8c88c964b7 100644
--- a/data/as/30189315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189315/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189323/ws-services-calculation/Penalty.json b/data/as/30189323/ws-services-calculation/Penalty.json
index d93edbd895..bf7e8431a0 100644
--- a/data/as/30189323/ws-services-calculation/Penalty.json
+++ b/data/as/30189323/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189323/ws-services-calculation/WCBillingSlab.json b/data/as/30189323/ws-services-calculation/WCBillingSlab.json
index 10538e0144..67be5ce59c 100644
--- a/data/as/30189323/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189323/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189328/ws-services-calculation/Penalty.json b/data/as/30189328/ws-services-calculation/Penalty.json
index ba95f0592e..a2677555b3 100644
--- a/data/as/30189328/ws-services-calculation/Penalty.json
+++ b/data/as/30189328/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189328/ws-services-calculation/WCBillingSlab.json b/data/as/30189328/ws-services-calculation/WCBillingSlab.json
index 52fbdfd6dd..9466acd634 100644
--- a/data/as/30189328/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189328/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189336/ws-services-calculation/Penalty.json b/data/as/30189336/ws-services-calculation/Penalty.json
index 453d828d65..720a3854c8 100644
--- a/data/as/30189336/ws-services-calculation/Penalty.json
+++ b/data/as/30189336/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189336/ws-services-calculation/WCBillingSlab.json b/data/as/30189336/ws-services-calculation/WCBillingSlab.json
index 7bdefdb848..05e891fef5 100644
--- a/data/as/30189336/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189336/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189344/ws-services-calculation/Penalty.json b/data/as/30189344/ws-services-calculation/Penalty.json
index 8864ec706d..5f54df72cb 100644
--- a/data/as/30189344/ws-services-calculation/Penalty.json
+++ b/data/as/30189344/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189344/ws-services-calculation/WCBillingSlab.json b/data/as/30189344/ws-services-calculation/WCBillingSlab.json
index 5bcece3ded..9dc97d9b1f 100644
--- a/data/as/30189344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189344/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189379/ws-services-calculation/Penalty.json b/data/as/30189379/ws-services-calculation/Penalty.json
index 5a736bf059..4a43eabdf8 100644
--- a/data/as/30189379/ws-services-calculation/Penalty.json
+++ b/data/as/30189379/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189379/ws-services-calculation/WCBillingSlab.json b/data/as/30189379/ws-services-calculation/WCBillingSlab.json
index 676a601440..3ccc1598d7 100644
--- a/data/as/30189379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189379/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189381/ws-services-calculation/Penalty.json b/data/as/30189381/ws-services-calculation/Penalty.json
index d4f9d3ec72..3e51c13ac3 100644
--- a/data/as/30189381/ws-services-calculation/Penalty.json
+++ b/data/as/30189381/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189381/ws-services-calculation/WCBillingSlab.json b/data/as/30189381/ws-services-calculation/WCBillingSlab.json
index a3e160a1a7..0c2c12c046 100644
--- a/data/as/30189381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189381/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189391/ws-services-calculation/Penalty.json b/data/as/30189391/ws-services-calculation/Penalty.json
index e8b0355cbc..5c950b917e 100644
--- a/data/as/30189391/ws-services-calculation/Penalty.json
+++ b/data/as/30189391/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189391/ws-services-calculation/WCBillingSlab.json b/data/as/30189391/ws-services-calculation/WCBillingSlab.json
index 515ee6816b..8dc1f51260 100644
--- a/data/as/30189391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189391/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189399/ws-services-calculation/Penalty.json b/data/as/30189399/ws-services-calculation/Penalty.json
index d837ad9f52..1fd6894ef2 100644
--- a/data/as/30189399/ws-services-calculation/Penalty.json
+++ b/data/as/30189399/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189399/ws-services-calculation/WCBillingSlab.json b/data/as/30189399/ws-services-calculation/WCBillingSlab.json
index def6fb455e..515c20286b 100644
--- a/data/as/30189399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189399/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189413/ws-services-calculation/Penalty.json b/data/as/30189413/ws-services-calculation/Penalty.json
index e6f6d825d0..4cf8bd232a 100644
--- a/data/as/30189413/ws-services-calculation/Penalty.json
+++ b/data/as/30189413/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189413/ws-services-calculation/WCBillingSlab.json b/data/as/30189413/ws-services-calculation/WCBillingSlab.json
index 28e2fe0914..b9ff1e93ca 100644
--- a/data/as/30189413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189413/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189424/ws-services-calculation/Penalty.json b/data/as/30189424/ws-services-calculation/Penalty.json
index d8d99d0953..23e79cf95a 100644
--- a/data/as/30189424/ws-services-calculation/Penalty.json
+++ b/data/as/30189424/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189424/ws-services-calculation/WCBillingSlab.json b/data/as/30189424/ws-services-calculation/WCBillingSlab.json
index 68dbac5a47..191f6cf06f 100644
--- a/data/as/30189424/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189424/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189431/ws-services-calculation/Penalty.json b/data/as/30189431/ws-services-calculation/Penalty.json
index de5fef290c..7c29ced537 100644
--- a/data/as/30189431/ws-services-calculation/Penalty.json
+++ b/data/as/30189431/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189431/ws-services-calculation/WCBillingSlab.json b/data/as/30189431/ws-services-calculation/WCBillingSlab.json
index b268e800ab..1d4c2c6898 100644
--- a/data/as/30189431/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189431/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189444/ws-services-calculation/Penalty.json b/data/as/30189444/ws-services-calculation/Penalty.json
index 62cffa4496..3b49827f57 100644
--- a/data/as/30189444/ws-services-calculation/Penalty.json
+++ b/data/as/30189444/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189444/ws-services-calculation/WCBillingSlab.json b/data/as/30189444/ws-services-calculation/WCBillingSlab.json
index 7e1057d166..7503742153 100644
--- a/data/as/30189444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189444/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189455/ws-services-calculation/Penalty.json b/data/as/30189455/ws-services-calculation/Penalty.json
index 82d2904bc2..e7e2a606e0 100644
--- a/data/as/30189455/ws-services-calculation/Penalty.json
+++ b/data/as/30189455/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189455/ws-services-calculation/WCBillingSlab.json b/data/as/30189455/ws-services-calculation/WCBillingSlab.json
index 8686bb7024..7ef8f9401e 100644
--- a/data/as/30189455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189455/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189469/ws-services-calculation/Penalty.json b/data/as/30189469/ws-services-calculation/Penalty.json
index a7a39501bb..63ce5a2daa 100644
--- a/data/as/30189469/ws-services-calculation/Penalty.json
+++ b/data/as/30189469/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189469/ws-services-calculation/WCBillingSlab.json b/data/as/30189469/ws-services-calculation/WCBillingSlab.json
index ceb02aa81f..d92027664e 100644
--- a/data/as/30189469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189469/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189496/ws-services-calculation/Penalty.json b/data/as/30189496/ws-services-calculation/Penalty.json
index 3b0eea81df..75fd782fe9 100644
--- a/data/as/30189496/ws-services-calculation/Penalty.json
+++ b/data/as/30189496/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189496/ws-services-calculation/WCBillingSlab.json b/data/as/30189496/ws-services-calculation/WCBillingSlab.json
index 7c19ea46b6..6337e86b20 100644
--- a/data/as/30189496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189496/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189526/ws-services-calculation/Penalty.json b/data/as/30189526/ws-services-calculation/Penalty.json
index 2294779b4b..94f1f0b1c0 100644
--- a/data/as/30189526/ws-services-calculation/Penalty.json
+++ b/data/as/30189526/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189526/ws-services-calculation/WCBillingSlab.json b/data/as/30189526/ws-services-calculation/WCBillingSlab.json
index ca9ccc1bf6..d21c538d8a 100644
--- a/data/as/30189526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189526/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189537/ws-services-calculation/Penalty.json b/data/as/30189537/ws-services-calculation/Penalty.json
index 821f233488..7b82d8a5f8 100644
--- a/data/as/30189537/ws-services-calculation/Penalty.json
+++ b/data/as/30189537/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189537/ws-services-calculation/WCBillingSlab.json b/data/as/30189537/ws-services-calculation/WCBillingSlab.json
index 584b9eef35..49d3e80372 100644
--- a/data/as/30189537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189537/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189551/ws-services-calculation/Penalty.json b/data/as/30189551/ws-services-calculation/Penalty.json
index cfb0367b24..0c54b7a7aa 100644
--- a/data/as/30189551/ws-services-calculation/Penalty.json
+++ b/data/as/30189551/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189551/ws-services-calculation/WCBillingSlab.json b/data/as/30189551/ws-services-calculation/WCBillingSlab.json
index bb32efa45a..498b92ccfd 100644
--- a/data/as/30189551/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189551/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189562/ws-services-calculation/Penalty.json b/data/as/30189562/ws-services-calculation/Penalty.json
index ee8141210c..793c77c4ca 100644
--- a/data/as/30189562/ws-services-calculation/Penalty.json
+++ b/data/as/30189562/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189562/ws-services-calculation/WCBillingSlab.json b/data/as/30189562/ws-services-calculation/WCBillingSlab.json
index f5d960fe83..3429816fca 100644
--- a/data/as/30189562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189562/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189571/ws-services-calculation/Penalty.json b/data/as/30189571/ws-services-calculation/Penalty.json
index 5ac9a08c42..95e2e6351c 100644
--- a/data/as/30189571/ws-services-calculation/Penalty.json
+++ b/data/as/30189571/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189571/ws-services-calculation/WCBillingSlab.json b/data/as/30189571/ws-services-calculation/WCBillingSlab.json
index e9a38f9eae..7f4a92c759 100644
--- a/data/as/30189571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189571/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189582/ws-services-calculation/Penalty.json b/data/as/30189582/ws-services-calculation/Penalty.json
index 7927f91a7f..d29e23c21e 100644
--- a/data/as/30189582/ws-services-calculation/Penalty.json
+++ b/data/as/30189582/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189582/ws-services-calculation/WCBillingSlab.json b/data/as/30189582/ws-services-calculation/WCBillingSlab.json
index c5e506bc30..3a100f2e44 100644
--- a/data/as/30189582/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189582/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189595/ws-services-calculation/Penalty.json b/data/as/30189595/ws-services-calculation/Penalty.json
index 9eb046071b..339d08f570 100644
--- a/data/as/30189595/ws-services-calculation/Penalty.json
+++ b/data/as/30189595/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189595/ws-services-calculation/WCBillingSlab.json b/data/as/30189595/ws-services-calculation/WCBillingSlab.json
index 621371ca5d..cea4a11f09 100644
--- a/data/as/30189595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189595/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30189615/ws-services-calculation/Penalty.json b/data/as/30189615/ws-services-calculation/Penalty.json
index 77b6fe2ea2..50702acd43 100644
--- a/data/as/30189615/ws-services-calculation/Penalty.json
+++ b/data/as/30189615/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189615/ws-services-calculation/WCBillingSlab.json b/data/as/30189615/ws-services-calculation/WCBillingSlab.json
index 7e96e19bba..280bc1e5be 100644
--- a/data/as/30189615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189615/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191686/ws-services-calculation/Penalty.json b/data/as/30191686/ws-services-calculation/Penalty.json
index 5975161725..51e67675e0 100644
--- a/data/as/30191686/ws-services-calculation/Penalty.json
+++ b/data/as/30191686/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191686/ws-services-calculation/WCBillingSlab.json b/data/as/30191686/ws-services-calculation/WCBillingSlab.json
index 40c7f2ffcd..3a5d233045 100644
--- a/data/as/30191686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191686/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191713/ws-services-calculation/Penalty.json b/data/as/30191713/ws-services-calculation/Penalty.json
index 300e6e5cfb..80228b8f78 100644
--- a/data/as/30191713/ws-services-calculation/Penalty.json
+++ b/data/as/30191713/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191713/ws-services-calculation/WCBillingSlab.json b/data/as/30191713/ws-services-calculation/WCBillingSlab.json
index fb78b3b8f9..ae2750ee9e 100644
--- a/data/as/30191713/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191713/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191743/ws-services-calculation/Penalty.json b/data/as/30191743/ws-services-calculation/Penalty.json
index 1f968f1e7e..0c68193a68 100644
--- a/data/as/30191743/ws-services-calculation/Penalty.json
+++ b/data/as/30191743/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191743/ws-services-calculation/WCBillingSlab.json b/data/as/30191743/ws-services-calculation/WCBillingSlab.json
index 4a68395838..2d32b86437 100644
--- a/data/as/30191743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191743/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191765/ws-services-calculation/Penalty.json b/data/as/30191765/ws-services-calculation/Penalty.json
index e825fb808d..a621cc8918 100644
--- a/data/as/30191765/ws-services-calculation/Penalty.json
+++ b/data/as/30191765/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191765/ws-services-calculation/WCBillingSlab.json b/data/as/30191765/ws-services-calculation/WCBillingSlab.json
index 5fdde0a88e..df1e5e88d6 100644
--- a/data/as/30191765/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191765/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191816/ws-services-calculation/Penalty.json b/data/as/30191816/ws-services-calculation/Penalty.json
index a1303cc635..8421d8a22e 100644
--- a/data/as/30191816/ws-services-calculation/Penalty.json
+++ b/data/as/30191816/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191816/ws-services-calculation/WCBillingSlab.json b/data/as/30191816/ws-services-calculation/WCBillingSlab.json
index 16978befa8..5d4bf47ee4 100644
--- a/data/as/30191816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191816/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191837/ws-services-calculation/Penalty.json b/data/as/30191837/ws-services-calculation/Penalty.json
index 5333422a0b..f3b0d7f2af 100644
--- a/data/as/30191837/ws-services-calculation/Penalty.json
+++ b/data/as/30191837/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191837/ws-services-calculation/WCBillingSlab.json b/data/as/30191837/ws-services-calculation/WCBillingSlab.json
index 399616b47b..74b44376a8 100644
--- a/data/as/30191837/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191837/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191855/ws-services-calculation/Penalty.json b/data/as/30191855/ws-services-calculation/Penalty.json
index 7fe802dde8..b7863a45d5 100644
--- a/data/as/30191855/ws-services-calculation/Penalty.json
+++ b/data/as/30191855/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191855/ws-services-calculation/WCBillingSlab.json b/data/as/30191855/ws-services-calculation/WCBillingSlab.json
index 3403b13447..3e763b60db 100644
--- a/data/as/30191855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191855/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191889/ws-services-calculation/Penalty.json b/data/as/30191889/ws-services-calculation/Penalty.json
index 760947384b..2bf1546d1b 100644
--- a/data/as/30191889/ws-services-calculation/Penalty.json
+++ b/data/as/30191889/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191889/ws-services-calculation/WCBillingSlab.json b/data/as/30191889/ws-services-calculation/WCBillingSlab.json
index 7fa40c4f5a..3263be36ad 100644
--- a/data/as/30191889/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191889/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191910/ws-services-calculation/Penalty.json b/data/as/30191910/ws-services-calculation/Penalty.json
index f5e29dba2c..112e8e479c 100644
--- a/data/as/30191910/ws-services-calculation/Penalty.json
+++ b/data/as/30191910/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191910/ws-services-calculation/WCBillingSlab.json b/data/as/30191910/ws-services-calculation/WCBillingSlab.json
index 947054f7ca..d9d685bd83 100644
--- a/data/as/30191910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191910/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191941/ws-services-calculation/Penalty.json b/data/as/30191941/ws-services-calculation/Penalty.json
index ea7326a75e..9bd43ee71a 100644
--- a/data/as/30191941/ws-services-calculation/Penalty.json
+++ b/data/as/30191941/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191941/ws-services-calculation/WCBillingSlab.json b/data/as/30191941/ws-services-calculation/WCBillingSlab.json
index 4c32d6ca32..479ecae5b6 100644
--- a/data/as/30191941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191941/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30191974/ws-services-calculation/Penalty.json b/data/as/30191974/ws-services-calculation/Penalty.json
index 4e591df13e..4cdb4c685b 100644
--- a/data/as/30191974/ws-services-calculation/Penalty.json
+++ b/data/as/30191974/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191974/ws-services-calculation/WCBillingSlab.json b/data/as/30191974/ws-services-calculation/WCBillingSlab.json
index 590c426ab3..e0b68cff59 100644
--- a/data/as/30191974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191974/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30192001/ws-services-calculation/Penalty.json b/data/as/30192001/ws-services-calculation/Penalty.json
index 950f151a9d..c5d3e53d18 100644
--- a/data/as/30192001/ws-services-calculation/Penalty.json
+++ b/data/as/30192001/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192001/ws-services-calculation/WCBillingSlab.json b/data/as/30192001/ws-services-calculation/WCBillingSlab.json
index 47e769d978..4910598ea7 100644
--- a/data/as/30192001/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192001/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30192026/ws-services-calculation/Penalty.json b/data/as/30192026/ws-services-calculation/Penalty.json
index dbf95f2b6c..e317eeee5d 100644
--- a/data/as/30192026/ws-services-calculation/Penalty.json
+++ b/data/as/30192026/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192026/ws-services-calculation/WCBillingSlab.json b/data/as/30192026/ws-services-calculation/WCBillingSlab.json
index 94299ed719..5aad848b77 100644
--- a/data/as/30192026/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192026/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30192045/ws-services-calculation/Penalty.json b/data/as/30192045/ws-services-calculation/Penalty.json
index 6789ab6bfa..1360ada5c1 100644
--- a/data/as/30192045/ws-services-calculation/Penalty.json
+++ b/data/as/30192045/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192045/ws-services-calculation/WCBillingSlab.json b/data/as/30192045/ws-services-calculation/WCBillingSlab.json
index 7a9063440e..56a779535e 100644
--- a/data/as/30192045/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192045/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30192070/ws-services-calculation/Penalty.json b/data/as/30192070/ws-services-calculation/Penalty.json
index 1002ce4d58..fb3e163271 100644
--- a/data/as/30192070/ws-services-calculation/Penalty.json
+++ b/data/as/30192070/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192070/ws-services-calculation/WCBillingSlab.json b/data/as/30192070/ws-services-calculation/WCBillingSlab.json
index ffaf3732cf..06ec121932 100644
--- a/data/as/30192070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192070/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30192093/ws-services-calculation/Penalty.json b/data/as/30192093/ws-services-calculation/Penalty.json
index 4e5571b9c3..b45c631e46 100644
--- a/data/as/30192093/ws-services-calculation/Penalty.json
+++ b/data/as/30192093/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192093/ws-services-calculation/WCBillingSlab.json b/data/as/30192093/ws-services-calculation/WCBillingSlab.json
index 418602be2a..9cf9cb7289 100644
--- a/data/as/30192093/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192093/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30192129/ws-services-calculation/Penalty.json b/data/as/30192129/ws-services-calculation/Penalty.json
index 6d83959d51..942d9c009c 100644
--- a/data/as/30192129/ws-services-calculation/Penalty.json
+++ b/data/as/30192129/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192129/ws-services-calculation/WCBillingSlab.json b/data/as/30192129/ws-services-calculation/WCBillingSlab.json
index 8a9d3d01d4..c22ff28ce2 100644
--- a/data/as/30192129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192129/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30193693/ws-services-calculation/Penalty.json b/data/as/30193693/ws-services-calculation/Penalty.json
index 7f1171e7c0..02ab9e2fa4 100644
--- a/data/as/30193693/ws-services-calculation/Penalty.json
+++ b/data/as/30193693/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30193693/ws-services-calculation/WCBillingSlab.json b/data/as/30193693/ws-services-calculation/WCBillingSlab.json
index 2723349c78..02e98bc456 100644
--- a/data/as/30193693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30193693/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30196401/ws-services-calculation/Penalty.json b/data/as/30196401/ws-services-calculation/Penalty.json
index 805bbccf6d..4619ed99ee 100644
--- a/data/as/30196401/ws-services-calculation/Penalty.json
+++ b/data/as/30196401/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196401/ws-services-calculation/WCBillingSlab.json b/data/as/30196401/ws-services-calculation/WCBillingSlab.json
index 02d0a2c410..ef807bf8cc 100644
--- a/data/as/30196401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196401/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30196757/ws-services-calculation/Penalty.json b/data/as/30196757/ws-services-calculation/Penalty.json
index c870a786bd..acfe12d6e4 100644
--- a/data/as/30196757/ws-services-calculation/Penalty.json
+++ b/data/as/30196757/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196757/ws-services-calculation/WCBillingSlab.json b/data/as/30196757/ws-services-calculation/WCBillingSlab.json
index df4d9a6d65..87ccd7f64b 100644
--- a/data/as/30196757/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196757/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30196783/ws-services-calculation/Penalty.json b/data/as/30196783/ws-services-calculation/Penalty.json
index 35018ff599..d2e457ea70 100644
--- a/data/as/30196783/ws-services-calculation/Penalty.json
+++ b/data/as/30196783/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196783/ws-services-calculation/WCBillingSlab.json b/data/as/30196783/ws-services-calculation/WCBillingSlab.json
index f4ee0a611c..c5c5a92b0a 100644
--- a/data/as/30196783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196783/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30196788/ws-services-calculation/Penalty.json b/data/as/30196788/ws-services-calculation/Penalty.json
index 8965334d6b..42dbba9578 100644
--- a/data/as/30196788/ws-services-calculation/Penalty.json
+++ b/data/as/30196788/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196788/ws-services-calculation/WCBillingSlab.json b/data/as/30196788/ws-services-calculation/WCBillingSlab.json
index 7601690ca4..a4dfa1fdd7 100644
--- a/data/as/30196788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196788/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30196800/ws-services-calculation/Penalty.json b/data/as/30196800/ws-services-calculation/Penalty.json
index 9ee5d55a60..27378c587b 100644
--- a/data/as/30196800/ws-services-calculation/Penalty.json
+++ b/data/as/30196800/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196800/ws-services-calculation/WCBillingSlab.json b/data/as/30196800/ws-services-calculation/WCBillingSlab.json
index 1e62e0955a..4183548ec4 100644
--- a/data/as/30196800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196800/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30196806/ws-services-calculation/Penalty.json b/data/as/30196806/ws-services-calculation/Penalty.json
index ca6e5f3b3c..8ad40ab344 100644
--- a/data/as/30196806/ws-services-calculation/Penalty.json
+++ b/data/as/30196806/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196806/ws-services-calculation/WCBillingSlab.json b/data/as/30196806/ws-services-calculation/WCBillingSlab.json
index 85bdf8d95d..7ed7cd1351 100644
--- a/data/as/30196806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196806/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30199561/ws-services-calculation/Penalty.json b/data/as/30199561/ws-services-calculation/Penalty.json
index 0d9607c49d..4ea3fcd710 100644
--- a/data/as/30199561/ws-services-calculation/Penalty.json
+++ b/data/as/30199561/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199561/ws-services-calculation/WCBillingSlab.json b/data/as/30199561/ws-services-calculation/WCBillingSlab.json
index d461c1712e..b2b00d2784 100644
--- a/data/as/30199561/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199561/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30199580/ws-services-calculation/Penalty.json b/data/as/30199580/ws-services-calculation/Penalty.json
index 79b254c569..04ece8826a 100644
--- a/data/as/30199580/ws-services-calculation/Penalty.json
+++ b/data/as/30199580/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199580/ws-services-calculation/WCBillingSlab.json b/data/as/30199580/ws-services-calculation/WCBillingSlab.json
index aba50d6eec..9249e2d1d8 100644
--- a/data/as/30199580/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199580/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30199609/ws-services-calculation/Penalty.json b/data/as/30199609/ws-services-calculation/Penalty.json
index 2ec26a9078..dbb31b5d18 100644
--- a/data/as/30199609/ws-services-calculation/Penalty.json
+++ b/data/as/30199609/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199609/ws-services-calculation/WCBillingSlab.json b/data/as/30199609/ws-services-calculation/WCBillingSlab.json
index df851a767f..f9dd53ba53 100644
--- a/data/as/30199609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199609/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30199656/ws-services-calculation/Penalty.json b/data/as/30199656/ws-services-calculation/Penalty.json
index d9660e5c90..5b6d6c1fbb 100644
--- a/data/as/30199656/ws-services-calculation/Penalty.json
+++ b/data/as/30199656/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199656/ws-services-calculation/WCBillingSlab.json b/data/as/30199656/ws-services-calculation/WCBillingSlab.json
index 89eef27bf3..793ba7f21f 100644
--- a/data/as/30199656/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199656/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200209/ws-services-calculation/Penalty.json b/data/as/30200209/ws-services-calculation/Penalty.json
index 3072603853..9592fef883 100644
--- a/data/as/30200209/ws-services-calculation/Penalty.json
+++ b/data/as/30200209/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200209/ws-services-calculation/WCBillingSlab.json b/data/as/30200209/ws-services-calculation/WCBillingSlab.json
index 14b347bdda..4096e28fda 100644
--- a/data/as/30200209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200209/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200338/ws-services-calculation/Penalty.json b/data/as/30200338/ws-services-calculation/Penalty.json
index 1b883809b8..3bc4d9bdb7 100644
--- a/data/as/30200338/ws-services-calculation/Penalty.json
+++ b/data/as/30200338/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200338/ws-services-calculation/WCBillingSlab.json b/data/as/30200338/ws-services-calculation/WCBillingSlab.json
index 29f7bbad0b..85b845c6ac 100644
--- a/data/as/30200338/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200338/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200348/ws-services-calculation/Penalty.json b/data/as/30200348/ws-services-calculation/Penalty.json
index 90f0d94928..ac7916fb26 100644
--- a/data/as/30200348/ws-services-calculation/Penalty.json
+++ b/data/as/30200348/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200348/ws-services-calculation/WCBillingSlab.json b/data/as/30200348/ws-services-calculation/WCBillingSlab.json
index c061f2a06b..122418307e 100644
--- a/data/as/30200348/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200348/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200365/ws-services-calculation/Penalty.json b/data/as/30200365/ws-services-calculation/Penalty.json
index a089430c6e..10620bad0b 100644
--- a/data/as/30200365/ws-services-calculation/Penalty.json
+++ b/data/as/30200365/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200365/ws-services-calculation/WCBillingSlab.json b/data/as/30200365/ws-services-calculation/WCBillingSlab.json
index 46ac308b2d..8ffb5c4d04 100644
--- a/data/as/30200365/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200365/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200373/ws-services-calculation/Penalty.json b/data/as/30200373/ws-services-calculation/Penalty.json
index ac9672436d..652d0711a4 100644
--- a/data/as/30200373/ws-services-calculation/Penalty.json
+++ b/data/as/30200373/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200373/ws-services-calculation/WCBillingSlab.json b/data/as/30200373/ws-services-calculation/WCBillingSlab.json
index 6f32248fe9..399e541108 100644
--- a/data/as/30200373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200373/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200381/ws-services-calculation/Penalty.json b/data/as/30200381/ws-services-calculation/Penalty.json
index 17d1d5b48e..8703926d46 100644
--- a/data/as/30200381/ws-services-calculation/Penalty.json
+++ b/data/as/30200381/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200381/ws-services-calculation/WCBillingSlab.json b/data/as/30200381/ws-services-calculation/WCBillingSlab.json
index 3f5716bd20..30cac5b819 100644
--- a/data/as/30200381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200381/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200390/ws-services-calculation/Penalty.json b/data/as/30200390/ws-services-calculation/Penalty.json
index 2db5033653..88d9a590b3 100644
--- a/data/as/30200390/ws-services-calculation/Penalty.json
+++ b/data/as/30200390/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200390/ws-services-calculation/WCBillingSlab.json b/data/as/30200390/ws-services-calculation/WCBillingSlab.json
index bd6a51b046..f45a1e34e2 100644
--- a/data/as/30200390/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200390/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30200395/ws-services-calculation/Penalty.json b/data/as/30200395/ws-services-calculation/Penalty.json
index 62c6afb059..09bdd1c19f 100644
--- a/data/as/30200395/ws-services-calculation/Penalty.json
+++ b/data/as/30200395/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200395/ws-services-calculation/WCBillingSlab.json b/data/as/30200395/ws-services-calculation/WCBillingSlab.json
index 71bb715883..44b87db062 100644
--- a/data/as/30200395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200395/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201829/ws-services-calculation/Penalty.json b/data/as/30201829/ws-services-calculation/Penalty.json
index 6cedbe3700..3a399e5181 100644
--- a/data/as/30201829/ws-services-calculation/Penalty.json
+++ b/data/as/30201829/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201829/ws-services-calculation/WCBillingSlab.json b/data/as/30201829/ws-services-calculation/WCBillingSlab.json
index 96b17a247f..c6b1e0a4c7 100644
--- a/data/as/30201829/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201829/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201845/ws-services-calculation/Penalty.json b/data/as/30201845/ws-services-calculation/Penalty.json
index ef90676d7b..706bd04803 100644
--- a/data/as/30201845/ws-services-calculation/Penalty.json
+++ b/data/as/30201845/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201845/ws-services-calculation/WCBillingSlab.json b/data/as/30201845/ws-services-calculation/WCBillingSlab.json
index c968c0b9c6..42e955458a 100644
--- a/data/as/30201845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201845/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201859/ws-services-calculation/Penalty.json b/data/as/30201859/ws-services-calculation/Penalty.json
index fd524ce20c..800d3e3c67 100644
--- a/data/as/30201859/ws-services-calculation/Penalty.json
+++ b/data/as/30201859/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201859/ws-services-calculation/WCBillingSlab.json b/data/as/30201859/ws-services-calculation/WCBillingSlab.json
index 5fe842eb08..92079ba507 100644
--- a/data/as/30201859/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201859/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201868/ws-services-calculation/Penalty.json b/data/as/30201868/ws-services-calculation/Penalty.json
index 6554b3dafc..5e24adc874 100644
--- a/data/as/30201868/ws-services-calculation/Penalty.json
+++ b/data/as/30201868/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201868/ws-services-calculation/WCBillingSlab.json b/data/as/30201868/ws-services-calculation/WCBillingSlab.json
index 508ef588b5..ffd1eb7c66 100644
--- a/data/as/30201868/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201868/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201884/ws-services-calculation/Penalty.json b/data/as/30201884/ws-services-calculation/Penalty.json
index eb1f803a1f..57c2985b3f 100644
--- a/data/as/30201884/ws-services-calculation/Penalty.json
+++ b/data/as/30201884/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201884/ws-services-calculation/WCBillingSlab.json b/data/as/30201884/ws-services-calculation/WCBillingSlab.json
index fc2a78a032..2a5371ca2c 100644
--- a/data/as/30201884/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201884/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201910/ws-services-calculation/Penalty.json b/data/as/30201910/ws-services-calculation/Penalty.json
index 9b828058ae..ce150fa6a0 100644
--- a/data/as/30201910/ws-services-calculation/Penalty.json
+++ b/data/as/30201910/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201910/ws-services-calculation/WCBillingSlab.json b/data/as/30201910/ws-services-calculation/WCBillingSlab.json
index fe05e340a3..2a3e7bec87 100644
--- a/data/as/30201910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201910/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201927/ws-services-calculation/Penalty.json b/data/as/30201927/ws-services-calculation/Penalty.json
index 04b244a865..51e68a0992 100644
--- a/data/as/30201927/ws-services-calculation/Penalty.json
+++ b/data/as/30201927/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201927/ws-services-calculation/WCBillingSlab.json b/data/as/30201927/ws-services-calculation/WCBillingSlab.json
index 00cc2d9ae0..d3a72250c2 100644
--- a/data/as/30201927/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201927/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201982/ws-services-calculation/Penalty.json b/data/as/30201982/ws-services-calculation/Penalty.json
index daceb86be7..974a86cd3a 100644
--- a/data/as/30201982/ws-services-calculation/Penalty.json
+++ b/data/as/30201982/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201982/ws-services-calculation/WCBillingSlab.json b/data/as/30201982/ws-services-calculation/WCBillingSlab.json
index e5415f300e..4985e3ce57 100644
--- a/data/as/30201982/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201982/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30201998/ws-services-calculation/Penalty.json b/data/as/30201998/ws-services-calculation/Penalty.json
index 6c073a458e..d62177ac60 100644
--- a/data/as/30201998/ws-services-calculation/Penalty.json
+++ b/data/as/30201998/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201998/ws-services-calculation/WCBillingSlab.json b/data/as/30201998/ws-services-calculation/WCBillingSlab.json
index b35fe73d92..e0d208355e 100644
--- a/data/as/30201998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201998/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202047/ws-services-calculation/Penalty.json b/data/as/30202047/ws-services-calculation/Penalty.json
index b16a12b0d3..60297e3d4f 100644
--- a/data/as/30202047/ws-services-calculation/Penalty.json
+++ b/data/as/30202047/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202047/ws-services-calculation/WCBillingSlab.json b/data/as/30202047/ws-services-calculation/WCBillingSlab.json
index 9a6f4299df..6925d1d3f1 100644
--- a/data/as/30202047/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202047/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202048/ws-services-calculation/Penalty.json b/data/as/30202048/ws-services-calculation/Penalty.json
index d659ccf00f..47e030deb2 100644
--- a/data/as/30202048/ws-services-calculation/Penalty.json
+++ b/data/as/30202048/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202048/ws-services-calculation/WCBillingSlab.json b/data/as/30202048/ws-services-calculation/WCBillingSlab.json
index f7fa1b50a5..6da6ba3eb1 100644
--- a/data/as/30202048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202048/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202080/ws-services-calculation/Penalty.json b/data/as/30202080/ws-services-calculation/Penalty.json
index d262a8b310..89c59cec78 100644
--- a/data/as/30202080/ws-services-calculation/Penalty.json
+++ b/data/as/30202080/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202080/ws-services-calculation/WCBillingSlab.json b/data/as/30202080/ws-services-calculation/WCBillingSlab.json
index 7925c21d94..e05e9044a6 100644
--- a/data/as/30202080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202080/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202118/ws-services-calculation/Penalty.json b/data/as/30202118/ws-services-calculation/Penalty.json
index b5b8145869..f597f15ec0 100644
--- a/data/as/30202118/ws-services-calculation/Penalty.json
+++ b/data/as/30202118/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202118/ws-services-calculation/WCBillingSlab.json b/data/as/30202118/ws-services-calculation/WCBillingSlab.json
index c86ac6ad83..9ff8e8c489 100644
--- a/data/as/30202118/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202118/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202288/ws-services-calculation/Penalty.json b/data/as/30202288/ws-services-calculation/Penalty.json
index dd4c54c36c..6e8b2ad5bd 100644
--- a/data/as/30202288/ws-services-calculation/Penalty.json
+++ b/data/as/30202288/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202288/ws-services-calculation/WCBillingSlab.json b/data/as/30202288/ws-services-calculation/WCBillingSlab.json
index d5e6f7b9bf..72b75efe65 100644
--- a/data/as/30202288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202288/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202311/ws-services-calculation/Penalty.json b/data/as/30202311/ws-services-calculation/Penalty.json
index 77ab41827e..ee71a45217 100644
--- a/data/as/30202311/ws-services-calculation/Penalty.json
+++ b/data/as/30202311/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202311/ws-services-calculation/WCBillingSlab.json b/data/as/30202311/ws-services-calculation/WCBillingSlab.json
index 8cd6ac3b5b..bd7f08e4d1 100644
--- a/data/as/30202311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202311/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202346/ws-services-calculation/Penalty.json b/data/as/30202346/ws-services-calculation/Penalty.json
index 37dd406fb1..e99c0baef5 100644
--- a/data/as/30202346/ws-services-calculation/Penalty.json
+++ b/data/as/30202346/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202346/ws-services-calculation/WCBillingSlab.json b/data/as/30202346/ws-services-calculation/WCBillingSlab.json
index 1406de16a2..4fe7b8b358 100644
--- a/data/as/30202346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202346/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202436/ws-services-calculation/Penalty.json b/data/as/30202436/ws-services-calculation/Penalty.json
index 45c77e82ad..df028374a7 100644
--- a/data/as/30202436/ws-services-calculation/Penalty.json
+++ b/data/as/30202436/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202436/ws-services-calculation/WCBillingSlab.json b/data/as/30202436/ws-services-calculation/WCBillingSlab.json
index 4dd4feb4f1..d16b31ec46 100644
--- a/data/as/30202436/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202436/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202462/ws-services-calculation/Penalty.json b/data/as/30202462/ws-services-calculation/Penalty.json
index f43f4155cf..94d80038cc 100644
--- a/data/as/30202462/ws-services-calculation/Penalty.json
+++ b/data/as/30202462/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202462/ws-services-calculation/WCBillingSlab.json b/data/as/30202462/ws-services-calculation/WCBillingSlab.json
index 151f23119b..86692f657b 100644
--- a/data/as/30202462/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202462/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202484/ws-services-calculation/Penalty.json b/data/as/30202484/ws-services-calculation/Penalty.json
index 7951fba785..10cca0c21f 100644
--- a/data/as/30202484/ws-services-calculation/Penalty.json
+++ b/data/as/30202484/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202484/ws-services-calculation/WCBillingSlab.json b/data/as/30202484/ws-services-calculation/WCBillingSlab.json
index c690c690d6..25f6796604 100644
--- a/data/as/30202484/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202484/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202510/ws-services-calculation/Penalty.json b/data/as/30202510/ws-services-calculation/Penalty.json
index faa3dc1e44..196b1ceb16 100644
--- a/data/as/30202510/ws-services-calculation/Penalty.json
+++ b/data/as/30202510/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202510/ws-services-calculation/WCBillingSlab.json b/data/as/30202510/ws-services-calculation/WCBillingSlab.json
index 73510371aa..3512189dbc 100644
--- a/data/as/30202510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202510/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202537/ws-services-calculation/Penalty.json b/data/as/30202537/ws-services-calculation/Penalty.json
index 3f2e6167b7..3314d280b4 100644
--- a/data/as/30202537/ws-services-calculation/Penalty.json
+++ b/data/as/30202537/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202537/ws-services-calculation/WCBillingSlab.json b/data/as/30202537/ws-services-calculation/WCBillingSlab.json
index bb5f6bc7c3..5e9bef82eb 100644
--- a/data/as/30202537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202537/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202570/ws-services-calculation/Penalty.json b/data/as/30202570/ws-services-calculation/Penalty.json
index c49796ca48..5d83aa257e 100644
--- a/data/as/30202570/ws-services-calculation/Penalty.json
+++ b/data/as/30202570/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202570/ws-services-calculation/WCBillingSlab.json b/data/as/30202570/ws-services-calculation/WCBillingSlab.json
index 88fa5cad15..eeb0d4b89c 100644
--- a/data/as/30202570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202570/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202595/ws-services-calculation/Penalty.json b/data/as/30202595/ws-services-calculation/Penalty.json
index 42b4b9c730..9e32670691 100644
--- a/data/as/30202595/ws-services-calculation/Penalty.json
+++ b/data/as/30202595/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202595/ws-services-calculation/WCBillingSlab.json b/data/as/30202595/ws-services-calculation/WCBillingSlab.json
index ae447a6d11..57ede980a4 100644
--- a/data/as/30202595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202595/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202611/ws-services-calculation/Penalty.json b/data/as/30202611/ws-services-calculation/Penalty.json
index a10c15a36b..7b5267b07b 100644
--- a/data/as/30202611/ws-services-calculation/Penalty.json
+++ b/data/as/30202611/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202611/ws-services-calculation/WCBillingSlab.json b/data/as/30202611/ws-services-calculation/WCBillingSlab.json
index 6d2f605663..2707a608d4 100644
--- a/data/as/30202611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202611/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202636/ws-services-calculation/Penalty.json b/data/as/30202636/ws-services-calculation/Penalty.json
index df541a4aae..7a6e05d7cf 100644
--- a/data/as/30202636/ws-services-calculation/Penalty.json
+++ b/data/as/30202636/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202636/ws-services-calculation/WCBillingSlab.json b/data/as/30202636/ws-services-calculation/WCBillingSlab.json
index 559ba64854..221c2b2669 100644
--- a/data/as/30202636/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202636/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202651/ws-services-calculation/Penalty.json b/data/as/30202651/ws-services-calculation/Penalty.json
index 14ad8c59a3..3a363c4975 100644
--- a/data/as/30202651/ws-services-calculation/Penalty.json
+++ b/data/as/30202651/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202651/ws-services-calculation/WCBillingSlab.json b/data/as/30202651/ws-services-calculation/WCBillingSlab.json
index 4199c3717f..1dcb88649e 100644
--- a/data/as/30202651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202651/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202908/ws-services-calculation/Penalty.json b/data/as/30202908/ws-services-calculation/Penalty.json
index b0d9e78a93..2ece70f5f6 100644
--- a/data/as/30202908/ws-services-calculation/Penalty.json
+++ b/data/as/30202908/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202908/ws-services-calculation/WCBillingSlab.json b/data/as/30202908/ws-services-calculation/WCBillingSlab.json
index 13c59d5f2b..4da389bb04 100644
--- a/data/as/30202908/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202908/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30202964/ws-services-calculation/Penalty.json b/data/as/30202964/ws-services-calculation/Penalty.json
index 98be631f9c..96f1a75e31 100644
--- a/data/as/30202964/ws-services-calculation/Penalty.json
+++ b/data/as/30202964/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202964/ws-services-calculation/WCBillingSlab.json b/data/as/30202964/ws-services-calculation/WCBillingSlab.json
index 5238ee24ed..45b1533301 100644
--- a/data/as/30202964/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202964/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30204586/ws-services-calculation/Penalty.json b/data/as/30204586/ws-services-calculation/Penalty.json
index d802f0fbca..d465f4c073 100644
--- a/data/as/30204586/ws-services-calculation/Penalty.json
+++ b/data/as/30204586/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30204586/ws-services-calculation/WCBillingSlab.json b/data/as/30204586/ws-services-calculation/WCBillingSlab.json
index e4fc76456c..c836d14cc5 100644
--- a/data/as/30204586/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30204586/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207281/ws-services-calculation/Penalty.json b/data/as/30207281/ws-services-calculation/Penalty.json
index b60af04ecf..a83a241710 100644
--- a/data/as/30207281/ws-services-calculation/Penalty.json
+++ b/data/as/30207281/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207281/ws-services-calculation/WCBillingSlab.json b/data/as/30207281/ws-services-calculation/WCBillingSlab.json
index 0af0ef40c1..a47f750ec2 100644
--- a/data/as/30207281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207281/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207843/ws-services-calculation/Penalty.json b/data/as/30207843/ws-services-calculation/Penalty.json
index a7837fcd90..585c0c5674 100644
--- a/data/as/30207843/ws-services-calculation/Penalty.json
+++ b/data/as/30207843/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207843/ws-services-calculation/WCBillingSlab.json b/data/as/30207843/ws-services-calculation/WCBillingSlab.json
index d1c9cde739..e94166620a 100644
--- a/data/as/30207843/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207843/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207863/ws-services-calculation/Penalty.json b/data/as/30207863/ws-services-calculation/Penalty.json
index 444319d77a..1c19b41c99 100644
--- a/data/as/30207863/ws-services-calculation/Penalty.json
+++ b/data/as/30207863/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207863/ws-services-calculation/WCBillingSlab.json b/data/as/30207863/ws-services-calculation/WCBillingSlab.json
index 1df461ecff..38f401b0ca 100644
--- a/data/as/30207863/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207863/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207883/ws-services-calculation/Penalty.json b/data/as/30207883/ws-services-calculation/Penalty.json
index f5cce2761a..8b384ca6ad 100644
--- a/data/as/30207883/ws-services-calculation/Penalty.json
+++ b/data/as/30207883/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207883/ws-services-calculation/WCBillingSlab.json b/data/as/30207883/ws-services-calculation/WCBillingSlab.json
index 3a95aa9d65..d0efb0cdb6 100644
--- a/data/as/30207883/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207883/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207923/ws-services-calculation/Penalty.json b/data/as/30207923/ws-services-calculation/Penalty.json
index fd4f0a76d7..a4f9d9894a 100644
--- a/data/as/30207923/ws-services-calculation/Penalty.json
+++ b/data/as/30207923/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207923/ws-services-calculation/WCBillingSlab.json b/data/as/30207923/ws-services-calculation/WCBillingSlab.json
index f230df5500..9328e01c97 100644
--- a/data/as/30207923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207923/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207980/ws-services-calculation/Penalty.json b/data/as/30207980/ws-services-calculation/Penalty.json
index 581e12b33d..b5b895e8e3 100644
--- a/data/as/30207980/ws-services-calculation/Penalty.json
+++ b/data/as/30207980/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207980/ws-services-calculation/WCBillingSlab.json b/data/as/30207980/ws-services-calculation/WCBillingSlab.json
index 441f9aa59a..7a02310198 100644
--- a/data/as/30207980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207980/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207990/ws-services-calculation/Penalty.json b/data/as/30207990/ws-services-calculation/Penalty.json
index 4014d5615f..e30ff363a4 100644
--- a/data/as/30207990/ws-services-calculation/Penalty.json
+++ b/data/as/30207990/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207990/ws-services-calculation/WCBillingSlab.json b/data/as/30207990/ws-services-calculation/WCBillingSlab.json
index d0415ac395..671edebb86 100644
--- a/data/as/30207990/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207990/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30207996/ws-services-calculation/Penalty.json b/data/as/30207996/ws-services-calculation/Penalty.json
index 01ca50f97e..1b893298bd 100644
--- a/data/as/30207996/ws-services-calculation/Penalty.json
+++ b/data/as/30207996/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207996/ws-services-calculation/WCBillingSlab.json b/data/as/30207996/ws-services-calculation/WCBillingSlab.json
index b0cd916f7f..c1f0ae86cc 100644
--- a/data/as/30207996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207996/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208033/ws-services-calculation/Penalty.json b/data/as/30208033/ws-services-calculation/Penalty.json
index 92857e4c39..b815a63e4f 100644
--- a/data/as/30208033/ws-services-calculation/Penalty.json
+++ b/data/as/30208033/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208033/ws-services-calculation/WCBillingSlab.json b/data/as/30208033/ws-services-calculation/WCBillingSlab.json
index 178a519153..94de18da22 100644
--- a/data/as/30208033/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208033/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208074/ws-services-calculation/Penalty.json b/data/as/30208074/ws-services-calculation/Penalty.json
index 9272b83a99..f803bc5ea3 100644
--- a/data/as/30208074/ws-services-calculation/Penalty.json
+++ b/data/as/30208074/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208074/ws-services-calculation/WCBillingSlab.json b/data/as/30208074/ws-services-calculation/WCBillingSlab.json
index 961571bb48..4354c95c3d 100644
--- a/data/as/30208074/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208074/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208101/ws-services-calculation/Penalty.json b/data/as/30208101/ws-services-calculation/Penalty.json
index ce42a422c1..0d721ed7b3 100644
--- a/data/as/30208101/ws-services-calculation/Penalty.json
+++ b/data/as/30208101/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208101/ws-services-calculation/WCBillingSlab.json b/data/as/30208101/ws-services-calculation/WCBillingSlab.json
index 0bb53cd760..f78d0ec05d 100644
--- a/data/as/30208101/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208101/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208625/ws-services-calculation/Penalty.json b/data/as/30208625/ws-services-calculation/Penalty.json
index 22e7ee3ecd..87fe062248 100644
--- a/data/as/30208625/ws-services-calculation/Penalty.json
+++ b/data/as/30208625/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208625/ws-services-calculation/WCBillingSlab.json b/data/as/30208625/ws-services-calculation/WCBillingSlab.json
index 0e9463501a..5c1f366596 100644
--- a/data/as/30208625/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208625/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208644/ws-services-calculation/Penalty.json b/data/as/30208644/ws-services-calculation/Penalty.json
index 650eafdc46..e083b8ad29 100644
--- a/data/as/30208644/ws-services-calculation/Penalty.json
+++ b/data/as/30208644/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208644/ws-services-calculation/WCBillingSlab.json b/data/as/30208644/ws-services-calculation/WCBillingSlab.json
index 1c6f1d241b..5d44b9c3c1 100644
--- a/data/as/30208644/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208644/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208681/ws-services-calculation/Penalty.json b/data/as/30208681/ws-services-calculation/Penalty.json
index 6545bc24d8..13fcb2e10d 100644
--- a/data/as/30208681/ws-services-calculation/Penalty.json
+++ b/data/as/30208681/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208681/ws-services-calculation/WCBillingSlab.json b/data/as/30208681/ws-services-calculation/WCBillingSlab.json
index 62bbd07ce4..9a9dad3842 100644
--- a/data/as/30208681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208681/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30208803/ws-services-calculation/Penalty.json b/data/as/30208803/ws-services-calculation/Penalty.json
index ee33a12485..99ff2e4a95 100644
--- a/data/as/30208803/ws-services-calculation/Penalty.json
+++ b/data/as/30208803/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208803/ws-services-calculation/WCBillingSlab.json b/data/as/30208803/ws-services-calculation/WCBillingSlab.json
index 1a244e1ce8..1fe31a7cd0 100644
--- a/data/as/30208803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208803/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211530/ws-services-calculation/Penalty.json b/data/as/30211530/ws-services-calculation/Penalty.json
index 9b6255e866..389b65f7f2 100644
--- a/data/as/30211530/ws-services-calculation/Penalty.json
+++ b/data/as/30211530/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211530/ws-services-calculation/WCBillingSlab.json b/data/as/30211530/ws-services-calculation/WCBillingSlab.json
index ad152a2b99..c4b3c880d0 100644
--- a/data/as/30211530/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211530/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211543/ws-services-calculation/Penalty.json b/data/as/30211543/ws-services-calculation/Penalty.json
index 7f35c2bd5c..80e29cb6a7 100644
--- a/data/as/30211543/ws-services-calculation/Penalty.json
+++ b/data/as/30211543/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211543/ws-services-calculation/WCBillingSlab.json b/data/as/30211543/ws-services-calculation/WCBillingSlab.json
index f3da2f69e1..0301fcf10f 100644
--- a/data/as/30211543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211543/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211556/ws-services-calculation/Penalty.json b/data/as/30211556/ws-services-calculation/Penalty.json
index 16a7d90fc2..ab43bc0612 100644
--- a/data/as/30211556/ws-services-calculation/Penalty.json
+++ b/data/as/30211556/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211556/ws-services-calculation/WCBillingSlab.json b/data/as/30211556/ws-services-calculation/WCBillingSlab.json
index f81eaa7cf6..37e15f8f09 100644
--- a/data/as/30211556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211556/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211591/ws-services-calculation/Penalty.json b/data/as/30211591/ws-services-calculation/Penalty.json
index 2219cd8a62..1872087070 100644
--- a/data/as/30211591/ws-services-calculation/Penalty.json
+++ b/data/as/30211591/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211591/ws-services-calculation/WCBillingSlab.json b/data/as/30211591/ws-services-calculation/WCBillingSlab.json
index be61df6348..2c1caae376 100644
--- a/data/as/30211591/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211591/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211653/ws-services-calculation/Penalty.json b/data/as/30211653/ws-services-calculation/Penalty.json
index f076ef06bc..e24c7f573d 100644
--- a/data/as/30211653/ws-services-calculation/Penalty.json
+++ b/data/as/30211653/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211653/ws-services-calculation/WCBillingSlab.json b/data/as/30211653/ws-services-calculation/WCBillingSlab.json
index 6880d27e48..147b1fb22e 100644
--- a/data/as/30211653/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211653/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211673/ws-services-calculation/Penalty.json b/data/as/30211673/ws-services-calculation/Penalty.json
index 9dc61c8114..483e227125 100644
--- a/data/as/30211673/ws-services-calculation/Penalty.json
+++ b/data/as/30211673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211673/ws-services-calculation/WCBillingSlab.json b/data/as/30211673/ws-services-calculation/WCBillingSlab.json
index e60dcf58c5..c64b8355a5 100644
--- a/data/as/30211673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211695/ws-services-calculation/Penalty.json b/data/as/30211695/ws-services-calculation/Penalty.json
index 98ee14546b..1d42902112 100644
--- a/data/as/30211695/ws-services-calculation/Penalty.json
+++ b/data/as/30211695/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211695/ws-services-calculation/WCBillingSlab.json b/data/as/30211695/ws-services-calculation/WCBillingSlab.json
index 263c15876f..fee0ac4125 100644
--- a/data/as/30211695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211695/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211715/ws-services-calculation/Penalty.json b/data/as/30211715/ws-services-calculation/Penalty.json
index ae383e720f..d822462573 100644
--- a/data/as/30211715/ws-services-calculation/Penalty.json
+++ b/data/as/30211715/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211715/ws-services-calculation/WCBillingSlab.json b/data/as/30211715/ws-services-calculation/WCBillingSlab.json
index 888414ef07..6cf690405e 100644
--- a/data/as/30211715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211715/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211747/ws-services-calculation/Penalty.json b/data/as/30211747/ws-services-calculation/Penalty.json
index 73ced798cd..5caa301cea 100644
--- a/data/as/30211747/ws-services-calculation/Penalty.json
+++ b/data/as/30211747/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211747/ws-services-calculation/WCBillingSlab.json b/data/as/30211747/ws-services-calculation/WCBillingSlab.json
index e8b3fcb3d3..262923bb64 100644
--- a/data/as/30211747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211747/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30211881/ws-services-calculation/Penalty.json b/data/as/30211881/ws-services-calculation/Penalty.json
index 1ab7542e61..6e47463f9d 100644
--- a/data/as/30211881/ws-services-calculation/Penalty.json
+++ b/data/as/30211881/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211881/ws-services-calculation/WCBillingSlab.json b/data/as/30211881/ws-services-calculation/WCBillingSlab.json
index 6d9151ba82..6d0791c012 100644
--- a/data/as/30211881/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211881/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212673/ws-services-calculation/Penalty.json b/data/as/30212673/ws-services-calculation/Penalty.json
index 48afb17b8a..b0638103ec 100644
--- a/data/as/30212673/ws-services-calculation/Penalty.json
+++ b/data/as/30212673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212673/ws-services-calculation/WCBillingSlab.json b/data/as/30212673/ws-services-calculation/WCBillingSlab.json
index 9819b284de..a964c4fbc1 100644
--- a/data/as/30212673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212710/ws-services-calculation/Penalty.json b/data/as/30212710/ws-services-calculation/Penalty.json
index bf9ec4e550..8511b1d3fc 100644
--- a/data/as/30212710/ws-services-calculation/Penalty.json
+++ b/data/as/30212710/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212710/ws-services-calculation/WCBillingSlab.json b/data/as/30212710/ws-services-calculation/WCBillingSlab.json
index 6e5873ac78..c3452386b8 100644
--- a/data/as/30212710/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212710/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212736/ws-services-calculation/Penalty.json b/data/as/30212736/ws-services-calculation/Penalty.json
index c67ea9ef07..5091fe628c 100644
--- a/data/as/30212736/ws-services-calculation/Penalty.json
+++ b/data/as/30212736/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212736/ws-services-calculation/WCBillingSlab.json b/data/as/30212736/ws-services-calculation/WCBillingSlab.json
index fef3b50781..e9b8577398 100644
--- a/data/as/30212736/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212736/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212751/ws-services-calculation/Penalty.json b/data/as/30212751/ws-services-calculation/Penalty.json
index 8b3d3b0220..c83ec5ecbd 100644
--- a/data/as/30212751/ws-services-calculation/Penalty.json
+++ b/data/as/30212751/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212751/ws-services-calculation/WCBillingSlab.json b/data/as/30212751/ws-services-calculation/WCBillingSlab.json
index 0352850863..7823ba00d4 100644
--- a/data/as/30212751/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212751/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212766/ws-services-calculation/Penalty.json b/data/as/30212766/ws-services-calculation/Penalty.json
index dc2f5d2cd0..d81a029212 100644
--- a/data/as/30212766/ws-services-calculation/Penalty.json
+++ b/data/as/30212766/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212766/ws-services-calculation/WCBillingSlab.json b/data/as/30212766/ws-services-calculation/WCBillingSlab.json
index 8f0e72eb5e..a80d8645f7 100644
--- a/data/as/30212766/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212766/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212780/ws-services-calculation/Penalty.json b/data/as/30212780/ws-services-calculation/Penalty.json
index 78a92561ac..f91498fd5c 100644
--- a/data/as/30212780/ws-services-calculation/Penalty.json
+++ b/data/as/30212780/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212780/ws-services-calculation/WCBillingSlab.json b/data/as/30212780/ws-services-calculation/WCBillingSlab.json
index 515601674c..af8fe1b513 100644
--- a/data/as/30212780/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212780/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212817/ws-services-calculation/Penalty.json b/data/as/30212817/ws-services-calculation/Penalty.json
index 55d1f7ae6e..86d147e39f 100644
--- a/data/as/30212817/ws-services-calculation/Penalty.json
+++ b/data/as/30212817/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212817/ws-services-calculation/WCBillingSlab.json b/data/as/30212817/ws-services-calculation/WCBillingSlab.json
index 8628aeb250..d0d422029f 100644
--- a/data/as/30212817/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212817/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212830/ws-services-calculation/Penalty.json b/data/as/30212830/ws-services-calculation/Penalty.json
index bacd3e1ab8..3b2c78dbeb 100644
--- a/data/as/30212830/ws-services-calculation/Penalty.json
+++ b/data/as/30212830/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212830/ws-services-calculation/WCBillingSlab.json b/data/as/30212830/ws-services-calculation/WCBillingSlab.json
index 5e8230dd3a..04fe8a10f2 100644
--- a/data/as/30212830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212830/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212847/ws-services-calculation/Penalty.json b/data/as/30212847/ws-services-calculation/Penalty.json
index 6a53929d8d..f06dc3ea8f 100644
--- a/data/as/30212847/ws-services-calculation/Penalty.json
+++ b/data/as/30212847/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212847/ws-services-calculation/WCBillingSlab.json b/data/as/30212847/ws-services-calculation/WCBillingSlab.json
index 8ee2bcebcd..2661a1ddd4 100644
--- a/data/as/30212847/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212847/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212906/ws-services-calculation/Penalty.json b/data/as/30212906/ws-services-calculation/Penalty.json
index 5fc485e858..cae3216789 100644
--- a/data/as/30212906/ws-services-calculation/Penalty.json
+++ b/data/as/30212906/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212906/ws-services-calculation/WCBillingSlab.json b/data/as/30212906/ws-services-calculation/WCBillingSlab.json
index 56bbc3e791..b4fbb3dd2d 100644
--- a/data/as/30212906/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212906/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212926/ws-services-calculation/Penalty.json b/data/as/30212926/ws-services-calculation/Penalty.json
index 3aa593fd63..40fd97e144 100644
--- a/data/as/30212926/ws-services-calculation/Penalty.json
+++ b/data/as/30212926/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212926/ws-services-calculation/WCBillingSlab.json b/data/as/30212926/ws-services-calculation/WCBillingSlab.json
index 03ecd67d66..bfb0c83bf2 100644
--- a/data/as/30212926/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212926/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212942/ws-services-calculation/Penalty.json b/data/as/30212942/ws-services-calculation/Penalty.json
index bf8267e59d..03061d199c 100644
--- a/data/as/30212942/ws-services-calculation/Penalty.json
+++ b/data/as/30212942/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212942/ws-services-calculation/WCBillingSlab.json b/data/as/30212942/ws-services-calculation/WCBillingSlab.json
index 03af55afe6..2b1acb4c6a 100644
--- a/data/as/30212942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212942/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212948/ws-services-calculation/Penalty.json b/data/as/30212948/ws-services-calculation/Penalty.json
index 42cd1de9c6..394ef851be 100644
--- a/data/as/30212948/ws-services-calculation/Penalty.json
+++ b/data/as/30212948/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212948/ws-services-calculation/WCBillingSlab.json b/data/as/30212948/ws-services-calculation/WCBillingSlab.json
index f651c42ee8..0217227578 100644
--- a/data/as/30212948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212948/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212952/ws-services-calculation/Penalty.json b/data/as/30212952/ws-services-calculation/Penalty.json
index 42bb837c6c..dd45232933 100644
--- a/data/as/30212952/ws-services-calculation/Penalty.json
+++ b/data/as/30212952/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212952/ws-services-calculation/WCBillingSlab.json b/data/as/30212952/ws-services-calculation/WCBillingSlab.json
index a0532ddea5..c38e0dc454 100644
--- a/data/as/30212952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212952/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212973/ws-services-calculation/Penalty.json b/data/as/30212973/ws-services-calculation/Penalty.json
index cd8428b62e..469eb12c4b 100644
--- a/data/as/30212973/ws-services-calculation/Penalty.json
+++ b/data/as/30212973/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212973/ws-services-calculation/WCBillingSlab.json b/data/as/30212973/ws-services-calculation/WCBillingSlab.json
index 37271f65d8..17928b3764 100644
--- a/data/as/30212973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212973/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212983/ws-services-calculation/Penalty.json b/data/as/30212983/ws-services-calculation/Penalty.json
index f3572720a2..3c7a1f8475 100644
--- a/data/as/30212983/ws-services-calculation/Penalty.json
+++ b/data/as/30212983/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212983/ws-services-calculation/WCBillingSlab.json b/data/as/30212983/ws-services-calculation/WCBillingSlab.json
index 48dc5ab588..86a16f40c2 100644
--- a/data/as/30212983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212983/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30212996/ws-services-calculation/Penalty.json b/data/as/30212996/ws-services-calculation/Penalty.json
index 9cbde65e47..33c7f4b890 100644
--- a/data/as/30212996/ws-services-calculation/Penalty.json
+++ b/data/as/30212996/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212996/ws-services-calculation/WCBillingSlab.json b/data/as/30212996/ws-services-calculation/WCBillingSlab.json
index f29a1bb73d..0304c4794e 100644
--- a/data/as/30212996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212996/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213000/ws-services-calculation/Penalty.json b/data/as/30213000/ws-services-calculation/Penalty.json
index 46ba1b48d5..fe27b6279e 100644
--- a/data/as/30213000/ws-services-calculation/Penalty.json
+++ b/data/as/30213000/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213000/ws-services-calculation/WCBillingSlab.json b/data/as/30213000/ws-services-calculation/WCBillingSlab.json
index 004c1918ee..45b76a5f6d 100644
--- a/data/as/30213000/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213000/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213013/ws-services-calculation/Penalty.json b/data/as/30213013/ws-services-calculation/Penalty.json
index 387d737e97..092825be08 100644
--- a/data/as/30213013/ws-services-calculation/Penalty.json
+++ b/data/as/30213013/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213013/ws-services-calculation/WCBillingSlab.json b/data/as/30213013/ws-services-calculation/WCBillingSlab.json
index ad36449978..7e4fa61da4 100644
--- a/data/as/30213013/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213013/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213023/ws-services-calculation/Penalty.json b/data/as/30213023/ws-services-calculation/Penalty.json
index 54611d5111..50764a8fe9 100644
--- a/data/as/30213023/ws-services-calculation/Penalty.json
+++ b/data/as/30213023/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213023/ws-services-calculation/WCBillingSlab.json b/data/as/30213023/ws-services-calculation/WCBillingSlab.json
index 863c7ef394..578031b389 100644
--- a/data/as/30213023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213023/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213053/ws-services-calculation/Penalty.json b/data/as/30213053/ws-services-calculation/Penalty.json
index bf7d20b30e..7cb902b166 100644
--- a/data/as/30213053/ws-services-calculation/Penalty.json
+++ b/data/as/30213053/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213053/ws-services-calculation/WCBillingSlab.json b/data/as/30213053/ws-services-calculation/WCBillingSlab.json
index 09f74548e4..38d0c1206e 100644
--- a/data/as/30213053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213053/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213057/ws-services-calculation/Penalty.json b/data/as/30213057/ws-services-calculation/Penalty.json
index 79fda9945a..c84eb07c63 100644
--- a/data/as/30213057/ws-services-calculation/Penalty.json
+++ b/data/as/30213057/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213057/ws-services-calculation/WCBillingSlab.json b/data/as/30213057/ws-services-calculation/WCBillingSlab.json
index f98a7ba1d8..d829d9c61e 100644
--- a/data/as/30213057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213057/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213059/ws-services-calculation/Penalty.json b/data/as/30213059/ws-services-calculation/Penalty.json
index 792d2956a7..8ad440476e 100644
--- a/data/as/30213059/ws-services-calculation/Penalty.json
+++ b/data/as/30213059/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213059/ws-services-calculation/WCBillingSlab.json b/data/as/30213059/ws-services-calculation/WCBillingSlab.json
index 758b91d349..5aea95dcec 100644
--- a/data/as/30213059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213059/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213066/ws-services-calculation/Penalty.json b/data/as/30213066/ws-services-calculation/Penalty.json
index 558ba4ecc3..49c20021fb 100644
--- a/data/as/30213066/ws-services-calculation/Penalty.json
+++ b/data/as/30213066/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213066/ws-services-calculation/WCBillingSlab.json b/data/as/30213066/ws-services-calculation/WCBillingSlab.json
index 1ba8bbe921..c747647097 100644
--- a/data/as/30213066/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213066/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213067/ws-services-calculation/Penalty.json b/data/as/30213067/ws-services-calculation/Penalty.json
index f6ee35c765..457f4e4ec5 100644
--- a/data/as/30213067/ws-services-calculation/Penalty.json
+++ b/data/as/30213067/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213067/ws-services-calculation/WCBillingSlab.json b/data/as/30213067/ws-services-calculation/WCBillingSlab.json
index 1240e4c5cd..901f5b145a 100644
--- a/data/as/30213067/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213067/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213075/ws-services-calculation/Penalty.json b/data/as/30213075/ws-services-calculation/Penalty.json
index d68a44377a..77b05a79a1 100644
--- a/data/as/30213075/ws-services-calculation/Penalty.json
+++ b/data/as/30213075/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213075/ws-services-calculation/WCBillingSlab.json b/data/as/30213075/ws-services-calculation/WCBillingSlab.json
index 65ed4755c3..b2e5e4e6c9 100644
--- a/data/as/30213075/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213075/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213079/ws-services-calculation/Penalty.json b/data/as/30213079/ws-services-calculation/Penalty.json
index b5b4cc7ec9..76c4ef8123 100644
--- a/data/as/30213079/ws-services-calculation/Penalty.json
+++ b/data/as/30213079/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213079/ws-services-calculation/WCBillingSlab.json b/data/as/30213079/ws-services-calculation/WCBillingSlab.json
index 5f9dcf7f2f..72855461f9 100644
--- a/data/as/30213079/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213079/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213084/ws-services-calculation/Penalty.json b/data/as/30213084/ws-services-calculation/Penalty.json
index 8be85bf419..28ed605896 100644
--- a/data/as/30213084/ws-services-calculation/Penalty.json
+++ b/data/as/30213084/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213084/ws-services-calculation/WCBillingSlab.json b/data/as/30213084/ws-services-calculation/WCBillingSlab.json
index 1da90ab80e..2a1aa0b029 100644
--- a/data/as/30213084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213084/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213135/ws-services-calculation/Penalty.json b/data/as/30213135/ws-services-calculation/Penalty.json
index 4560afdc10..b10308850f 100644
--- a/data/as/30213135/ws-services-calculation/Penalty.json
+++ b/data/as/30213135/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213135/ws-services-calculation/WCBillingSlab.json b/data/as/30213135/ws-services-calculation/WCBillingSlab.json
index 810a1ce95a..23a0357e7f 100644
--- a/data/as/30213135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213135/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213136/ws-services-calculation/Penalty.json b/data/as/30213136/ws-services-calculation/Penalty.json
index e11e4171f7..4b7fc2e7cf 100644
--- a/data/as/30213136/ws-services-calculation/Penalty.json
+++ b/data/as/30213136/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213136/ws-services-calculation/WCBillingSlab.json b/data/as/30213136/ws-services-calculation/WCBillingSlab.json
index 3b8b0bd4ac..ef2a3dff39 100644
--- a/data/as/30213136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213136/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213138/ws-services-calculation/Penalty.json b/data/as/30213138/ws-services-calculation/Penalty.json
index ac846de888..aed3462c43 100644
--- a/data/as/30213138/ws-services-calculation/Penalty.json
+++ b/data/as/30213138/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213138/ws-services-calculation/WCBillingSlab.json b/data/as/30213138/ws-services-calculation/WCBillingSlab.json
index 6527d26566..c7647acf5c 100644
--- a/data/as/30213138/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213138/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213140/ws-services-calculation/Penalty.json b/data/as/30213140/ws-services-calculation/Penalty.json
index cf1e30e0dd..74242a6fce 100644
--- a/data/as/30213140/ws-services-calculation/Penalty.json
+++ b/data/as/30213140/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213140/ws-services-calculation/WCBillingSlab.json b/data/as/30213140/ws-services-calculation/WCBillingSlab.json
index 54be76dc1f..635f20fa3a 100644
--- a/data/as/30213140/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213140/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213143/ws-services-calculation/Penalty.json b/data/as/30213143/ws-services-calculation/Penalty.json
index c012761520..01e797e801 100644
--- a/data/as/30213143/ws-services-calculation/Penalty.json
+++ b/data/as/30213143/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213143/ws-services-calculation/WCBillingSlab.json b/data/as/30213143/ws-services-calculation/WCBillingSlab.json
index 3523f78efe..3d26bbb8b8 100644
--- a/data/as/30213143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213143/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213146/ws-services-calculation/Penalty.json b/data/as/30213146/ws-services-calculation/Penalty.json
index 80c20a3492..e9c2f9167d 100644
--- a/data/as/30213146/ws-services-calculation/Penalty.json
+++ b/data/as/30213146/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213146/ws-services-calculation/WCBillingSlab.json b/data/as/30213146/ws-services-calculation/WCBillingSlab.json
index 61d7bf87ee..081233765d 100644
--- a/data/as/30213146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213146/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213148/ws-services-calculation/Penalty.json b/data/as/30213148/ws-services-calculation/Penalty.json
index 2d8e9481b6..d209c4302d 100644
--- a/data/as/30213148/ws-services-calculation/Penalty.json
+++ b/data/as/30213148/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213148/ws-services-calculation/WCBillingSlab.json b/data/as/30213148/ws-services-calculation/WCBillingSlab.json
index cdac1abdef..e09de246cc 100644
--- a/data/as/30213148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213148/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213150/ws-services-calculation/Penalty.json b/data/as/30213150/ws-services-calculation/Penalty.json
index a79d8f5636..5cba65ebd3 100644
--- a/data/as/30213150/ws-services-calculation/Penalty.json
+++ b/data/as/30213150/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213150/ws-services-calculation/WCBillingSlab.json b/data/as/30213150/ws-services-calculation/WCBillingSlab.json
index 498a172906..bf5196b83c 100644
--- a/data/as/30213150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213150/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213200/ws-services-calculation/Penalty.json b/data/as/30213200/ws-services-calculation/Penalty.json
index 0cbab36688..a1d1d007e7 100644
--- a/data/as/30213200/ws-services-calculation/Penalty.json
+++ b/data/as/30213200/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213200/ws-services-calculation/WCBillingSlab.json b/data/as/30213200/ws-services-calculation/WCBillingSlab.json
index 29fcc151a1..29f893a69f 100644
--- a/data/as/30213200/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213200/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213202/ws-services-calculation/Penalty.json b/data/as/30213202/ws-services-calculation/Penalty.json
index 02b1030d56..87d65358ad 100644
--- a/data/as/30213202/ws-services-calculation/Penalty.json
+++ b/data/as/30213202/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213202/ws-services-calculation/WCBillingSlab.json b/data/as/30213202/ws-services-calculation/WCBillingSlab.json
index 4f7c14faae..dbda56219a 100644
--- a/data/as/30213202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213202/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213205/ws-services-calculation/Penalty.json b/data/as/30213205/ws-services-calculation/Penalty.json
index a0f2801d69..e2454f1dd6 100644
--- a/data/as/30213205/ws-services-calculation/Penalty.json
+++ b/data/as/30213205/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213205/ws-services-calculation/WCBillingSlab.json b/data/as/30213205/ws-services-calculation/WCBillingSlab.json
index 0aaca76e06..bc7a268dfa 100644
--- a/data/as/30213205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213205/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213208/ws-services-calculation/Penalty.json b/data/as/30213208/ws-services-calculation/Penalty.json
index d15d8580d9..07d6fc404b 100644
--- a/data/as/30213208/ws-services-calculation/Penalty.json
+++ b/data/as/30213208/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213208/ws-services-calculation/WCBillingSlab.json b/data/as/30213208/ws-services-calculation/WCBillingSlab.json
index 81ea606e12..33d2bb2638 100644
--- a/data/as/30213208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213208/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213210/ws-services-calculation/Penalty.json b/data/as/30213210/ws-services-calculation/Penalty.json
index 152d3a3a79..3938848fb4 100644
--- a/data/as/30213210/ws-services-calculation/Penalty.json
+++ b/data/as/30213210/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213210/ws-services-calculation/WCBillingSlab.json b/data/as/30213210/ws-services-calculation/WCBillingSlab.json
index 537211c503..62540df71a 100644
--- a/data/as/30213210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213210/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213215/ws-services-calculation/Penalty.json b/data/as/30213215/ws-services-calculation/Penalty.json
index fd0c0a10be..bdf1caec76 100644
--- a/data/as/30213215/ws-services-calculation/Penalty.json
+++ b/data/as/30213215/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213215/ws-services-calculation/WCBillingSlab.json b/data/as/30213215/ws-services-calculation/WCBillingSlab.json
index 3889b80877..746259ab46 100644
--- a/data/as/30213215/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213215/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213219/ws-services-calculation/Penalty.json b/data/as/30213219/ws-services-calculation/Penalty.json
index 16f0b61900..807f63a3d9 100644
--- a/data/as/30213219/ws-services-calculation/Penalty.json
+++ b/data/as/30213219/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213219/ws-services-calculation/WCBillingSlab.json b/data/as/30213219/ws-services-calculation/WCBillingSlab.json
index ca1da51332..1bfbf70836 100644
--- a/data/as/30213219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213219/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213224/ws-services-calculation/Penalty.json b/data/as/30213224/ws-services-calculation/Penalty.json
index 48ed7474e4..6714e84a1b 100644
--- a/data/as/30213224/ws-services-calculation/Penalty.json
+++ b/data/as/30213224/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213224/ws-services-calculation/WCBillingSlab.json b/data/as/30213224/ws-services-calculation/WCBillingSlab.json
index 0b94c1b8b9..1777323a8c 100644
--- a/data/as/30213224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213224/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213489/ws-services-calculation/Penalty.json b/data/as/30213489/ws-services-calculation/Penalty.json
index 0ca124563a..777c4e0348 100644
--- a/data/as/30213489/ws-services-calculation/Penalty.json
+++ b/data/as/30213489/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213489/ws-services-calculation/WCBillingSlab.json b/data/as/30213489/ws-services-calculation/WCBillingSlab.json
index 9ba8354f47..7a89738e11 100644
--- a/data/as/30213489/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213489/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213521/ws-services-calculation/Penalty.json b/data/as/30213521/ws-services-calculation/Penalty.json
index fd91e8c2f4..f855b4a524 100644
--- a/data/as/30213521/ws-services-calculation/Penalty.json
+++ b/data/as/30213521/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213521/ws-services-calculation/WCBillingSlab.json b/data/as/30213521/ws-services-calculation/WCBillingSlab.json
index 69e89ccf89..ad5e1f1d3b 100644
--- a/data/as/30213521/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213521/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213556/ws-services-calculation/Penalty.json b/data/as/30213556/ws-services-calculation/Penalty.json
index d3b71b5eae..8c8097c2aa 100644
--- a/data/as/30213556/ws-services-calculation/Penalty.json
+++ b/data/as/30213556/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213556/ws-services-calculation/WCBillingSlab.json b/data/as/30213556/ws-services-calculation/WCBillingSlab.json
index 1ca9d97d9c..dd2b652332 100644
--- a/data/as/30213556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213556/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213569/ws-services-calculation/Penalty.json b/data/as/30213569/ws-services-calculation/Penalty.json
index 90b9f954d7..8da2ae53d0 100644
--- a/data/as/30213569/ws-services-calculation/Penalty.json
+++ b/data/as/30213569/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213569/ws-services-calculation/WCBillingSlab.json b/data/as/30213569/ws-services-calculation/WCBillingSlab.json
index 4869bfa8d9..7ea78bfdf3 100644
--- a/data/as/30213569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213569/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213581/ws-services-calculation/Penalty.json b/data/as/30213581/ws-services-calculation/Penalty.json
index d8c34cf31f..6dda7d8e08 100644
--- a/data/as/30213581/ws-services-calculation/Penalty.json
+++ b/data/as/30213581/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213581/ws-services-calculation/WCBillingSlab.json b/data/as/30213581/ws-services-calculation/WCBillingSlab.json
index 94af05910a..a3cbe7f344 100644
--- a/data/as/30213581/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213581/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213587/ws-services-calculation/Penalty.json b/data/as/30213587/ws-services-calculation/Penalty.json
index ab1562d930..b6b758c02b 100644
--- a/data/as/30213587/ws-services-calculation/Penalty.json
+++ b/data/as/30213587/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213587/ws-services-calculation/WCBillingSlab.json b/data/as/30213587/ws-services-calculation/WCBillingSlab.json
index 6256a2f06a..f5958c9023 100644
--- a/data/as/30213587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213587/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213598/ws-services-calculation/Penalty.json b/data/as/30213598/ws-services-calculation/Penalty.json
index f5644e5efb..40d6b32224 100644
--- a/data/as/30213598/ws-services-calculation/Penalty.json
+++ b/data/as/30213598/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213598/ws-services-calculation/WCBillingSlab.json b/data/as/30213598/ws-services-calculation/WCBillingSlab.json
index 5a2f71b4cc..b8850c9bf3 100644
--- a/data/as/30213598/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213598/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213603/ws-services-calculation/Penalty.json b/data/as/30213603/ws-services-calculation/Penalty.json
index 005f80c508..a423c4ed45 100644
--- a/data/as/30213603/ws-services-calculation/Penalty.json
+++ b/data/as/30213603/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213603/ws-services-calculation/WCBillingSlab.json b/data/as/30213603/ws-services-calculation/WCBillingSlab.json
index e4bd3d58fe..aab3ea8f76 100644
--- a/data/as/30213603/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213603/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213638/ws-services-calculation/Penalty.json b/data/as/30213638/ws-services-calculation/Penalty.json
index 0965b92861..919f3b5720 100644
--- a/data/as/30213638/ws-services-calculation/Penalty.json
+++ b/data/as/30213638/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213638/ws-services-calculation/WCBillingSlab.json b/data/as/30213638/ws-services-calculation/WCBillingSlab.json
index 7583e0ab02..8d35830736 100644
--- a/data/as/30213638/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213638/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213716/ws-services-calculation/Penalty.json b/data/as/30213716/ws-services-calculation/Penalty.json
index 44e4112384..8abc12de1c 100644
--- a/data/as/30213716/ws-services-calculation/Penalty.json
+++ b/data/as/30213716/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213716/ws-services-calculation/WCBillingSlab.json b/data/as/30213716/ws-services-calculation/WCBillingSlab.json
index 278624dda8..8c74511d64 100644
--- a/data/as/30213716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213716/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213729/ws-services-calculation/Penalty.json b/data/as/30213729/ws-services-calculation/Penalty.json
index b786ba63bb..14a4002dd7 100644
--- a/data/as/30213729/ws-services-calculation/Penalty.json
+++ b/data/as/30213729/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213729/ws-services-calculation/WCBillingSlab.json b/data/as/30213729/ws-services-calculation/WCBillingSlab.json
index 35369d5084..c2c7eac0c0 100644
--- a/data/as/30213729/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213729/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213788/ws-services-calculation/Penalty.json b/data/as/30213788/ws-services-calculation/Penalty.json
index c4ffa5fbdc..e1f6d48841 100644
--- a/data/as/30213788/ws-services-calculation/Penalty.json
+++ b/data/as/30213788/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213788/ws-services-calculation/WCBillingSlab.json b/data/as/30213788/ws-services-calculation/WCBillingSlab.json
index b530a96a13..4edaa70c19 100644
--- a/data/as/30213788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213788/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213798/ws-services-calculation/Penalty.json b/data/as/30213798/ws-services-calculation/Penalty.json
index 7adf551e1e..c4d4627fbb 100644
--- a/data/as/30213798/ws-services-calculation/Penalty.json
+++ b/data/as/30213798/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213798/ws-services-calculation/WCBillingSlab.json b/data/as/30213798/ws-services-calculation/WCBillingSlab.json
index 3a504cff8a..04e8f0d461 100644
--- a/data/as/30213798/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213798/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213839/ws-services-calculation/Penalty.json b/data/as/30213839/ws-services-calculation/Penalty.json
index 0ef3388aad..1357df5426 100644
--- a/data/as/30213839/ws-services-calculation/Penalty.json
+++ b/data/as/30213839/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213839/ws-services-calculation/WCBillingSlab.json b/data/as/30213839/ws-services-calculation/WCBillingSlab.json
index c42ef8589e..8c5c8426f0 100644
--- a/data/as/30213839/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213839/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213850/ws-services-calculation/Penalty.json b/data/as/30213850/ws-services-calculation/Penalty.json
index 369b663c27..db1edc9f12 100644
--- a/data/as/30213850/ws-services-calculation/Penalty.json
+++ b/data/as/30213850/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213850/ws-services-calculation/WCBillingSlab.json b/data/as/30213850/ws-services-calculation/WCBillingSlab.json
index c0f9c60a28..efdd91e2e1 100644
--- a/data/as/30213850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213850/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213862/ws-services-calculation/Penalty.json b/data/as/30213862/ws-services-calculation/Penalty.json
index a76028845d..c9f3d2fb32 100644
--- a/data/as/30213862/ws-services-calculation/Penalty.json
+++ b/data/as/30213862/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213862/ws-services-calculation/WCBillingSlab.json b/data/as/30213862/ws-services-calculation/WCBillingSlab.json
index de48c8f73d..1e25662ef4 100644
--- a/data/as/30213862/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213862/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213877/ws-services-calculation/Penalty.json b/data/as/30213877/ws-services-calculation/Penalty.json
index 2e52e92992..c485f473a3 100644
--- a/data/as/30213877/ws-services-calculation/Penalty.json
+++ b/data/as/30213877/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213877/ws-services-calculation/WCBillingSlab.json b/data/as/30213877/ws-services-calculation/WCBillingSlab.json
index e9dc0b15da..9e098fc313 100644
--- a/data/as/30213877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213877/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213916/ws-services-calculation/Penalty.json b/data/as/30213916/ws-services-calculation/Penalty.json
index 260b8d0518..f23b875185 100644
--- a/data/as/30213916/ws-services-calculation/Penalty.json
+++ b/data/as/30213916/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213916/ws-services-calculation/WCBillingSlab.json b/data/as/30213916/ws-services-calculation/WCBillingSlab.json
index 47fb9adf2c..35801d941e 100644
--- a/data/as/30213916/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213916/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30213935/ws-services-calculation/Penalty.json b/data/as/30213935/ws-services-calculation/Penalty.json
index e187cb614d..852756d8ce 100644
--- a/data/as/30213935/ws-services-calculation/Penalty.json
+++ b/data/as/30213935/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213935/ws-services-calculation/WCBillingSlab.json b/data/as/30213935/ws-services-calculation/WCBillingSlab.json
index 480ea458ec..4aa55d421f 100644
--- a/data/as/30213935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213935/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214038/ws-services-calculation/Penalty.json b/data/as/30214038/ws-services-calculation/Penalty.json
index 09830af7ba..1deaeac178 100644
--- a/data/as/30214038/ws-services-calculation/Penalty.json
+++ b/data/as/30214038/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214038/ws-services-calculation/WCBillingSlab.json b/data/as/30214038/ws-services-calculation/WCBillingSlab.json
index 2f25fa72e9..0ceab068d6 100644
--- a/data/as/30214038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214038/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214044/ws-services-calculation/Penalty.json b/data/as/30214044/ws-services-calculation/Penalty.json
index 0dcf91be26..bad35938e2 100644
--- a/data/as/30214044/ws-services-calculation/Penalty.json
+++ b/data/as/30214044/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214044/ws-services-calculation/WCBillingSlab.json b/data/as/30214044/ws-services-calculation/WCBillingSlab.json
index 74f75158a6..48484022ce 100644
--- a/data/as/30214044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214044/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214051/ws-services-calculation/Penalty.json b/data/as/30214051/ws-services-calculation/Penalty.json
index ad6ebdbcde..9e16c4c3dc 100644
--- a/data/as/30214051/ws-services-calculation/Penalty.json
+++ b/data/as/30214051/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214051/ws-services-calculation/WCBillingSlab.json b/data/as/30214051/ws-services-calculation/WCBillingSlab.json
index 8d244ed8ac..1277efb831 100644
--- a/data/as/30214051/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214051/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214059/ws-services-calculation/Penalty.json b/data/as/30214059/ws-services-calculation/Penalty.json
index f62fe4cca5..d0d470ebe4 100644
--- a/data/as/30214059/ws-services-calculation/Penalty.json
+++ b/data/as/30214059/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214059/ws-services-calculation/WCBillingSlab.json b/data/as/30214059/ws-services-calculation/WCBillingSlab.json
index d602c8cc26..45438b2d5e 100644
--- a/data/as/30214059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214059/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214062/ws-services-calculation/Penalty.json b/data/as/30214062/ws-services-calculation/Penalty.json
index 3a59e50459..358dfdc034 100644
--- a/data/as/30214062/ws-services-calculation/Penalty.json
+++ b/data/as/30214062/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214062/ws-services-calculation/WCBillingSlab.json b/data/as/30214062/ws-services-calculation/WCBillingSlab.json
index f586ccd162..99b8a6709b 100644
--- a/data/as/30214062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214062/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214069/ws-services-calculation/Penalty.json b/data/as/30214069/ws-services-calculation/Penalty.json
index 7077dd20e4..339277e01f 100644
--- a/data/as/30214069/ws-services-calculation/Penalty.json
+++ b/data/as/30214069/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214069/ws-services-calculation/WCBillingSlab.json b/data/as/30214069/ws-services-calculation/WCBillingSlab.json
index fb2e127677..8a15459d3a 100644
--- a/data/as/30214069/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214069/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214095/ws-services-calculation/Penalty.json b/data/as/30214095/ws-services-calculation/Penalty.json
index bbc931f6a2..022d196728 100644
--- a/data/as/30214095/ws-services-calculation/Penalty.json
+++ b/data/as/30214095/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214095/ws-services-calculation/WCBillingSlab.json b/data/as/30214095/ws-services-calculation/WCBillingSlab.json
index 91fc0f6ea6..7b93e2b608 100644
--- a/data/as/30214095/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214095/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214145/ws-services-calculation/Penalty.json b/data/as/30214145/ws-services-calculation/Penalty.json
index 902422d7be..54675e3ef7 100644
--- a/data/as/30214145/ws-services-calculation/Penalty.json
+++ b/data/as/30214145/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214145/ws-services-calculation/WCBillingSlab.json b/data/as/30214145/ws-services-calculation/WCBillingSlab.json
index 863689a097..26e6cbf5d0 100644
--- a/data/as/30214145/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214145/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214148/ws-services-calculation/Penalty.json b/data/as/30214148/ws-services-calculation/Penalty.json
index c58d31db2e..634fef89cd 100644
--- a/data/as/30214148/ws-services-calculation/Penalty.json
+++ b/data/as/30214148/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214148/ws-services-calculation/WCBillingSlab.json b/data/as/30214148/ws-services-calculation/WCBillingSlab.json
index ad89401445..50f215425a 100644
--- a/data/as/30214148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214148/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214152/ws-services-calculation/Penalty.json b/data/as/30214152/ws-services-calculation/Penalty.json
index 09942f132b..e7bcca7f5f 100644
--- a/data/as/30214152/ws-services-calculation/Penalty.json
+++ b/data/as/30214152/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214152/ws-services-calculation/WCBillingSlab.json b/data/as/30214152/ws-services-calculation/WCBillingSlab.json
index a1e6be5a62..0c4570f840 100644
--- a/data/as/30214152/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214152/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214157/ws-services-calculation/Penalty.json b/data/as/30214157/ws-services-calculation/Penalty.json
index 26d27fdd03..51044007ca 100644
--- a/data/as/30214157/ws-services-calculation/Penalty.json
+++ b/data/as/30214157/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214157/ws-services-calculation/WCBillingSlab.json b/data/as/30214157/ws-services-calculation/WCBillingSlab.json
index 71c52dd623..95d7cf3314 100644
--- a/data/as/30214157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214157/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214168/ws-services-calculation/Penalty.json b/data/as/30214168/ws-services-calculation/Penalty.json
index fc20d64713..dba202edf9 100644
--- a/data/as/30214168/ws-services-calculation/Penalty.json
+++ b/data/as/30214168/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214168/ws-services-calculation/WCBillingSlab.json b/data/as/30214168/ws-services-calculation/WCBillingSlab.json
index a1e32f10cb..92659db931 100644
--- a/data/as/30214168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214168/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214174/ws-services-calculation/Penalty.json b/data/as/30214174/ws-services-calculation/Penalty.json
index 0283acc511..c234d6b7ca 100644
--- a/data/as/30214174/ws-services-calculation/Penalty.json
+++ b/data/as/30214174/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214174/ws-services-calculation/WCBillingSlab.json b/data/as/30214174/ws-services-calculation/WCBillingSlab.json
index 8fa79a7d5e..28bbe8af79 100644
--- a/data/as/30214174/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214174/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214298/ws-services-calculation/Penalty.json b/data/as/30214298/ws-services-calculation/Penalty.json
index 47c2c33891..9d70e34ba4 100644
--- a/data/as/30214298/ws-services-calculation/Penalty.json
+++ b/data/as/30214298/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214298/ws-services-calculation/WCBillingSlab.json b/data/as/30214298/ws-services-calculation/WCBillingSlab.json
index b803c5be8f..60f99ce26d 100644
--- a/data/as/30214298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214298/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214330/ws-services-calculation/Penalty.json b/data/as/30214330/ws-services-calculation/Penalty.json
index 8f5823e287..d3d558b0a4 100644
--- a/data/as/30214330/ws-services-calculation/Penalty.json
+++ b/data/as/30214330/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214330/ws-services-calculation/WCBillingSlab.json b/data/as/30214330/ws-services-calculation/WCBillingSlab.json
index b29acd412f..4d0a3dc996 100644
--- a/data/as/30214330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214330/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214334/ws-services-calculation/Penalty.json b/data/as/30214334/ws-services-calculation/Penalty.json
index af682c0721..1cbd140f6b 100644
--- a/data/as/30214334/ws-services-calculation/Penalty.json
+++ b/data/as/30214334/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214334/ws-services-calculation/WCBillingSlab.json b/data/as/30214334/ws-services-calculation/WCBillingSlab.json
index 6ed681d1b0..e7091f68fc 100644
--- a/data/as/30214334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214334/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214398/ws-services-calculation/Penalty.json b/data/as/30214398/ws-services-calculation/Penalty.json
index ea94f0556a..f6059475f3 100644
--- a/data/as/30214398/ws-services-calculation/Penalty.json
+++ b/data/as/30214398/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214398/ws-services-calculation/WCBillingSlab.json b/data/as/30214398/ws-services-calculation/WCBillingSlab.json
index 92c7b46a16..5e9cc18b82 100644
--- a/data/as/30214398/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214398/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214413/ws-services-calculation/Penalty.json b/data/as/30214413/ws-services-calculation/Penalty.json
index 3fa16f5c20..fa77511d66 100644
--- a/data/as/30214413/ws-services-calculation/Penalty.json
+++ b/data/as/30214413/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214413/ws-services-calculation/WCBillingSlab.json b/data/as/30214413/ws-services-calculation/WCBillingSlab.json
index f68c25e076..65c57440d2 100644
--- a/data/as/30214413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214413/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214437/ws-services-calculation/Penalty.json b/data/as/30214437/ws-services-calculation/Penalty.json
index 3333b1ba5b..04a5b195c6 100644
--- a/data/as/30214437/ws-services-calculation/Penalty.json
+++ b/data/as/30214437/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214437/ws-services-calculation/WCBillingSlab.json b/data/as/30214437/ws-services-calculation/WCBillingSlab.json
index f9502ddf65..aa667cf764 100644
--- a/data/as/30214437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214437/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214444/ws-services-calculation/Penalty.json b/data/as/30214444/ws-services-calculation/Penalty.json
index 632c2c2a5f..1eacf2b19d 100644
--- a/data/as/30214444/ws-services-calculation/Penalty.json
+++ b/data/as/30214444/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214444/ws-services-calculation/WCBillingSlab.json b/data/as/30214444/ws-services-calculation/WCBillingSlab.json
index 107f7c8dc1..9b95f9426f 100644
--- a/data/as/30214444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214444/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214454/ws-services-calculation/Penalty.json b/data/as/30214454/ws-services-calculation/Penalty.json
index 948673edd3..d9b47e92e6 100644
--- a/data/as/30214454/ws-services-calculation/Penalty.json
+++ b/data/as/30214454/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214454/ws-services-calculation/WCBillingSlab.json b/data/as/30214454/ws-services-calculation/WCBillingSlab.json
index e692a0f975..d8aba146a0 100644
--- a/data/as/30214454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214454/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214478/ws-services-calculation/Penalty.json b/data/as/30214478/ws-services-calculation/Penalty.json
index e062dabb54..5df9468468 100644
--- a/data/as/30214478/ws-services-calculation/Penalty.json
+++ b/data/as/30214478/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214478/ws-services-calculation/WCBillingSlab.json b/data/as/30214478/ws-services-calculation/WCBillingSlab.json
index 3e7b6c4d1f..b670a5198b 100644
--- a/data/as/30214478/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214478/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214502/ws-services-calculation/Penalty.json b/data/as/30214502/ws-services-calculation/Penalty.json
index a132594ad7..b20067414f 100644
--- a/data/as/30214502/ws-services-calculation/Penalty.json
+++ b/data/as/30214502/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214502/ws-services-calculation/WCBillingSlab.json b/data/as/30214502/ws-services-calculation/WCBillingSlab.json
index 3647e8da06..d96d9a05f3 100644
--- a/data/as/30214502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214502/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214524/ws-services-calculation/Penalty.json b/data/as/30214524/ws-services-calculation/Penalty.json
index efa8bc0b5e..32917639c3 100644
--- a/data/as/30214524/ws-services-calculation/Penalty.json
+++ b/data/as/30214524/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214524/ws-services-calculation/WCBillingSlab.json b/data/as/30214524/ws-services-calculation/WCBillingSlab.json
index 59bb3cfcc6..505704bd49 100644
--- a/data/as/30214524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214524/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214533/ws-services-calculation/Penalty.json b/data/as/30214533/ws-services-calculation/Penalty.json
index ef1558c841..3dc96db52b 100644
--- a/data/as/30214533/ws-services-calculation/Penalty.json
+++ b/data/as/30214533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214533/ws-services-calculation/WCBillingSlab.json b/data/as/30214533/ws-services-calculation/WCBillingSlab.json
index aa5dbb974b..6c7d2b9520 100644
--- a/data/as/30214533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214551/ws-services-calculation/Penalty.json b/data/as/30214551/ws-services-calculation/Penalty.json
index 00cd839085..941616e9c6 100644
--- a/data/as/30214551/ws-services-calculation/Penalty.json
+++ b/data/as/30214551/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214551/ws-services-calculation/WCBillingSlab.json b/data/as/30214551/ws-services-calculation/WCBillingSlab.json
index 78a4816ff6..e219d05026 100644
--- a/data/as/30214551/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214551/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214559/ws-services-calculation/Penalty.json b/data/as/30214559/ws-services-calculation/Penalty.json
index ad77e40cf4..7ead831401 100644
--- a/data/as/30214559/ws-services-calculation/Penalty.json
+++ b/data/as/30214559/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214559/ws-services-calculation/WCBillingSlab.json b/data/as/30214559/ws-services-calculation/WCBillingSlab.json
index b6a7fd652a..22c20a84b6 100644
--- a/data/as/30214559/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214559/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214579/ws-services-calculation/Penalty.json b/data/as/30214579/ws-services-calculation/Penalty.json
index 8f87be53e9..90ba5f6a15 100644
--- a/data/as/30214579/ws-services-calculation/Penalty.json
+++ b/data/as/30214579/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214579/ws-services-calculation/WCBillingSlab.json b/data/as/30214579/ws-services-calculation/WCBillingSlab.json
index 15f7cd1080..4f921a9046 100644
--- a/data/as/30214579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214579/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214623/ws-services-calculation/Penalty.json b/data/as/30214623/ws-services-calculation/Penalty.json
index fe436ee7fc..5d6f5bfdc7 100644
--- a/data/as/30214623/ws-services-calculation/Penalty.json
+++ b/data/as/30214623/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214623/ws-services-calculation/WCBillingSlab.json b/data/as/30214623/ws-services-calculation/WCBillingSlab.json
index 198e09104b..ed32851480 100644
--- a/data/as/30214623/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214623/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214632/ws-services-calculation/Penalty.json b/data/as/30214632/ws-services-calculation/Penalty.json
index bfe9032a1b..71866dea91 100644
--- a/data/as/30214632/ws-services-calculation/Penalty.json
+++ b/data/as/30214632/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214632/ws-services-calculation/WCBillingSlab.json b/data/as/30214632/ws-services-calculation/WCBillingSlab.json
index a0e6e62b0c..1192dc6e72 100644
--- a/data/as/30214632/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214632/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214635/ws-services-calculation/Penalty.json b/data/as/30214635/ws-services-calculation/Penalty.json
index 560f337164..dacb3c662f 100644
--- a/data/as/30214635/ws-services-calculation/Penalty.json
+++ b/data/as/30214635/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214635/ws-services-calculation/WCBillingSlab.json b/data/as/30214635/ws-services-calculation/WCBillingSlab.json
index 4c7a5c7d11..5ff9db1bd2 100644
--- a/data/as/30214635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214635/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214651/ws-services-calculation/Penalty.json b/data/as/30214651/ws-services-calculation/Penalty.json
index 41fdd9f096..3a2acfea96 100644
--- a/data/as/30214651/ws-services-calculation/Penalty.json
+++ b/data/as/30214651/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214651/ws-services-calculation/WCBillingSlab.json b/data/as/30214651/ws-services-calculation/WCBillingSlab.json
index 15ea6001cb..2a975a03c9 100644
--- a/data/as/30214651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214651/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214686/ws-services-calculation/Penalty.json b/data/as/30214686/ws-services-calculation/Penalty.json
index de3499db7d..07f1fb91a1 100644
--- a/data/as/30214686/ws-services-calculation/Penalty.json
+++ b/data/as/30214686/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214686/ws-services-calculation/WCBillingSlab.json b/data/as/30214686/ws-services-calculation/WCBillingSlab.json
index d714c4f731..4b367f3fb1 100644
--- a/data/as/30214686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214686/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214704/ws-services-calculation/Penalty.json b/data/as/30214704/ws-services-calculation/Penalty.json
index a6af532b36..c020d430f1 100644
--- a/data/as/30214704/ws-services-calculation/Penalty.json
+++ b/data/as/30214704/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214704/ws-services-calculation/WCBillingSlab.json b/data/as/30214704/ws-services-calculation/WCBillingSlab.json
index 8c90ce0608..3a581c3df2 100644
--- a/data/as/30214704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214704/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30214731/ws-services-calculation/Penalty.json b/data/as/30214731/ws-services-calculation/Penalty.json
index b045c47ed2..2a589d6c12 100644
--- a/data/as/30214731/ws-services-calculation/Penalty.json
+++ b/data/as/30214731/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214731/ws-services-calculation/WCBillingSlab.json b/data/as/30214731/ws-services-calculation/WCBillingSlab.json
index ed1c224d76..0e51738acf 100644
--- a/data/as/30214731/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214731/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30215695/ws-services-calculation/Penalty.json b/data/as/30215695/ws-services-calculation/Penalty.json
index 861300968d..6f5f50500c 100644
--- a/data/as/30215695/ws-services-calculation/Penalty.json
+++ b/data/as/30215695/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30215695/ws-services-calculation/WCBillingSlab.json b/data/as/30215695/ws-services-calculation/WCBillingSlab.json
index 0bf346bf74..2b37fa2f9d 100644
--- a/data/as/30215695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30215695/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30215708/ws-services-calculation/Penalty.json b/data/as/30215708/ws-services-calculation/Penalty.json
index cd96aa9111..693ee8e341 100644
--- a/data/as/30215708/ws-services-calculation/Penalty.json
+++ b/data/as/30215708/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30215708/ws-services-calculation/WCBillingSlab.json b/data/as/30215708/ws-services-calculation/WCBillingSlab.json
index 9826d5874b..992d17f09d 100644
--- a/data/as/30215708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30215708/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216018/ws-services-calculation/Penalty.json b/data/as/30216018/ws-services-calculation/Penalty.json
index a58dbeea91..5f450322c5 100644
--- a/data/as/30216018/ws-services-calculation/Penalty.json
+++ b/data/as/30216018/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216018/ws-services-calculation/WCBillingSlab.json b/data/as/30216018/ws-services-calculation/WCBillingSlab.json
index 6fcf96e17f..0002a0d1e9 100644
--- a/data/as/30216018/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216018/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216021/ws-services-calculation/Penalty.json b/data/as/30216021/ws-services-calculation/Penalty.json
index 1277b2dd1f..7bc8aef8bf 100644
--- a/data/as/30216021/ws-services-calculation/Penalty.json
+++ b/data/as/30216021/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216021/ws-services-calculation/WCBillingSlab.json b/data/as/30216021/ws-services-calculation/WCBillingSlab.json
index ebe24d1f7b..d4d054d902 100644
--- a/data/as/30216021/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216021/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216024/ws-services-calculation/Penalty.json b/data/as/30216024/ws-services-calculation/Penalty.json
index a33a2d553e..43dce2a876 100644
--- a/data/as/30216024/ws-services-calculation/Penalty.json
+++ b/data/as/30216024/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216024/ws-services-calculation/WCBillingSlab.json b/data/as/30216024/ws-services-calculation/WCBillingSlab.json
index c1b093c008..757030c78c 100644
--- a/data/as/30216024/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216024/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216027/ws-services-calculation/Penalty.json b/data/as/30216027/ws-services-calculation/Penalty.json
index ab5f665850..b572dca298 100644
--- a/data/as/30216027/ws-services-calculation/Penalty.json
+++ b/data/as/30216027/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216027/ws-services-calculation/WCBillingSlab.json b/data/as/30216027/ws-services-calculation/WCBillingSlab.json
index beb1ef3707..ec48c06059 100644
--- a/data/as/30216027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216027/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216030/ws-services-calculation/Penalty.json b/data/as/30216030/ws-services-calculation/Penalty.json
index 76ba8d1bae..843f973cd8 100644
--- a/data/as/30216030/ws-services-calculation/Penalty.json
+++ b/data/as/30216030/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216030/ws-services-calculation/WCBillingSlab.json b/data/as/30216030/ws-services-calculation/WCBillingSlab.json
index 4d36ec0fcc..3dbd091464 100644
--- a/data/as/30216030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216030/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216039/ws-services-calculation/Penalty.json b/data/as/30216039/ws-services-calculation/Penalty.json
index b8e01372a7..8283a4a1c0 100644
--- a/data/as/30216039/ws-services-calculation/Penalty.json
+++ b/data/as/30216039/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216039/ws-services-calculation/WCBillingSlab.json b/data/as/30216039/ws-services-calculation/WCBillingSlab.json
index 1164bfa818..c6aba6f0fa 100644
--- a/data/as/30216039/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216039/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216045/ws-services-calculation/Penalty.json b/data/as/30216045/ws-services-calculation/Penalty.json
index 05393f8d1a..79b911def7 100644
--- a/data/as/30216045/ws-services-calculation/Penalty.json
+++ b/data/as/30216045/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216045/ws-services-calculation/WCBillingSlab.json b/data/as/30216045/ws-services-calculation/WCBillingSlab.json
index 702c7b3e71..924bc57b17 100644
--- a/data/as/30216045/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216045/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216049/ws-services-calculation/Penalty.json b/data/as/30216049/ws-services-calculation/Penalty.json
index 8097118375..6758e17ebe 100644
--- a/data/as/30216049/ws-services-calculation/Penalty.json
+++ b/data/as/30216049/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216049/ws-services-calculation/WCBillingSlab.json b/data/as/30216049/ws-services-calculation/WCBillingSlab.json
index cbab1c7641..3dc65a43e4 100644
--- a/data/as/30216049/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216049/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216051/ws-services-calculation/Penalty.json b/data/as/30216051/ws-services-calculation/Penalty.json
index 3b0be2f074..417715cbf3 100644
--- a/data/as/30216051/ws-services-calculation/Penalty.json
+++ b/data/as/30216051/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216051/ws-services-calculation/WCBillingSlab.json b/data/as/30216051/ws-services-calculation/WCBillingSlab.json
index 4cc996a740..fb3ae99d48 100644
--- a/data/as/30216051/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216051/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216053/ws-services-calculation/Penalty.json b/data/as/30216053/ws-services-calculation/Penalty.json
index c7a025642b..467d89911c 100644
--- a/data/as/30216053/ws-services-calculation/Penalty.json
+++ b/data/as/30216053/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216053/ws-services-calculation/WCBillingSlab.json b/data/as/30216053/ws-services-calculation/WCBillingSlab.json
index 41d91a4686..bf702677e4 100644
--- a/data/as/30216053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216053/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216054/ws-services-calculation/Penalty.json b/data/as/30216054/ws-services-calculation/Penalty.json
index 9ae259b6e0..3b2daade7b 100644
--- a/data/as/30216054/ws-services-calculation/Penalty.json
+++ b/data/as/30216054/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216054/ws-services-calculation/WCBillingSlab.json b/data/as/30216054/ws-services-calculation/WCBillingSlab.json
index bb1081ee0f..da0cfcc0b9 100644
--- a/data/as/30216054/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216054/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216055/ws-services-calculation/Penalty.json b/data/as/30216055/ws-services-calculation/Penalty.json
index 1289176715..f8ba3231c2 100644
--- a/data/as/30216055/ws-services-calculation/Penalty.json
+++ b/data/as/30216055/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216055/ws-services-calculation/WCBillingSlab.json b/data/as/30216055/ws-services-calculation/WCBillingSlab.json
index c19f89306c..b988829647 100644
--- a/data/as/30216055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216055/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216056/ws-services-calculation/Penalty.json b/data/as/30216056/ws-services-calculation/Penalty.json
index bf61464931..9d783c681b 100644
--- a/data/as/30216056/ws-services-calculation/Penalty.json
+++ b/data/as/30216056/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216056/ws-services-calculation/WCBillingSlab.json b/data/as/30216056/ws-services-calculation/WCBillingSlab.json
index 7aad2e1ac2..e09b8e95e5 100644
--- a/data/as/30216056/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216056/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216057/ws-services-calculation/Penalty.json b/data/as/30216057/ws-services-calculation/Penalty.json
index 99b41fee66..21d8aa4692 100644
--- a/data/as/30216057/ws-services-calculation/Penalty.json
+++ b/data/as/30216057/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216057/ws-services-calculation/WCBillingSlab.json b/data/as/30216057/ws-services-calculation/WCBillingSlab.json
index 6ea6c8c4a3..cd621e4eca 100644
--- a/data/as/30216057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216057/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216058/ws-services-calculation/Penalty.json b/data/as/30216058/ws-services-calculation/Penalty.json
index c21c31027e..8a1cc9bf1f 100644
--- a/data/as/30216058/ws-services-calculation/Penalty.json
+++ b/data/as/30216058/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216058/ws-services-calculation/WCBillingSlab.json b/data/as/30216058/ws-services-calculation/WCBillingSlab.json
index bd3c713c0e..793c04cbec 100644
--- a/data/as/30216058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216058/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216059/ws-services-calculation/Penalty.json b/data/as/30216059/ws-services-calculation/Penalty.json
index 2deb4d2eb3..401485eeb5 100644
--- a/data/as/30216059/ws-services-calculation/Penalty.json
+++ b/data/as/30216059/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216059/ws-services-calculation/WCBillingSlab.json b/data/as/30216059/ws-services-calculation/WCBillingSlab.json
index 2233ae078d..c699b5858f 100644
--- a/data/as/30216059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216059/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216061/ws-services-calculation/Penalty.json b/data/as/30216061/ws-services-calculation/Penalty.json
index 93629d3f56..4157245544 100644
--- a/data/as/30216061/ws-services-calculation/Penalty.json
+++ b/data/as/30216061/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216061/ws-services-calculation/WCBillingSlab.json b/data/as/30216061/ws-services-calculation/WCBillingSlab.json
index 15cbd8d504..457b0f8da1 100644
--- a/data/as/30216061/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216061/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216062/ws-services-calculation/Penalty.json b/data/as/30216062/ws-services-calculation/Penalty.json
index c27ae46bf3..46bf8e4f7a 100644
--- a/data/as/30216062/ws-services-calculation/Penalty.json
+++ b/data/as/30216062/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216062/ws-services-calculation/WCBillingSlab.json b/data/as/30216062/ws-services-calculation/WCBillingSlab.json
index af83297e97..720225be9c 100644
--- a/data/as/30216062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216062/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216214/ws-services-calculation/Penalty.json b/data/as/30216214/ws-services-calculation/Penalty.json
index dc3f834c18..8eda758a84 100644
--- a/data/as/30216214/ws-services-calculation/Penalty.json
+++ b/data/as/30216214/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216214/ws-services-calculation/WCBillingSlab.json b/data/as/30216214/ws-services-calculation/WCBillingSlab.json
index e9c5a6e9fa..e3020f3224 100644
--- a/data/as/30216214/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216214/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216258/ws-services-calculation/Penalty.json b/data/as/30216258/ws-services-calculation/Penalty.json
index 9fd80d3117..733333a8f5 100644
--- a/data/as/30216258/ws-services-calculation/Penalty.json
+++ b/data/as/30216258/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216258/ws-services-calculation/WCBillingSlab.json b/data/as/30216258/ws-services-calculation/WCBillingSlab.json
index 473d37e867..ffb276ba14 100644
--- a/data/as/30216258/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216258/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216269/ws-services-calculation/Penalty.json b/data/as/30216269/ws-services-calculation/Penalty.json
index f670f33130..a5f0d4eedc 100644
--- a/data/as/30216269/ws-services-calculation/Penalty.json
+++ b/data/as/30216269/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216269/ws-services-calculation/WCBillingSlab.json b/data/as/30216269/ws-services-calculation/WCBillingSlab.json
index bddb4aa4c7..0fd8b5f3bc 100644
--- a/data/as/30216269/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216269/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216295/ws-services-calculation/Penalty.json b/data/as/30216295/ws-services-calculation/Penalty.json
index f3635640a9..486a307497 100644
--- a/data/as/30216295/ws-services-calculation/Penalty.json
+++ b/data/as/30216295/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216295/ws-services-calculation/WCBillingSlab.json b/data/as/30216295/ws-services-calculation/WCBillingSlab.json
index a8f8d29d75..e054d3c7c4 100644
--- a/data/as/30216295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216295/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216302/ws-services-calculation/Penalty.json b/data/as/30216302/ws-services-calculation/Penalty.json
index 119702f325..7c0aa10dba 100644
--- a/data/as/30216302/ws-services-calculation/Penalty.json
+++ b/data/as/30216302/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216302/ws-services-calculation/WCBillingSlab.json b/data/as/30216302/ws-services-calculation/WCBillingSlab.json
index 419d71d2b1..39f3c362a6 100644
--- a/data/as/30216302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216302/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216319/ws-services-calculation/Penalty.json b/data/as/30216319/ws-services-calculation/Penalty.json
index 6276373745..29b1f9af89 100644
--- a/data/as/30216319/ws-services-calculation/Penalty.json
+++ b/data/as/30216319/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216319/ws-services-calculation/WCBillingSlab.json b/data/as/30216319/ws-services-calculation/WCBillingSlab.json
index c1e6fb7fa2..dbff748b19 100644
--- a/data/as/30216319/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216319/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216336/ws-services-calculation/Penalty.json b/data/as/30216336/ws-services-calculation/Penalty.json
index ca0df808cb..1435c44f62 100644
--- a/data/as/30216336/ws-services-calculation/Penalty.json
+++ b/data/as/30216336/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216336/ws-services-calculation/WCBillingSlab.json b/data/as/30216336/ws-services-calculation/WCBillingSlab.json
index 7464bfd1d7..2f0333a848 100644
--- a/data/as/30216336/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216336/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216372/ws-services-calculation/Penalty.json b/data/as/30216372/ws-services-calculation/Penalty.json
index c60a9e30b2..5a3a29851f 100644
--- a/data/as/30216372/ws-services-calculation/Penalty.json
+++ b/data/as/30216372/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216372/ws-services-calculation/WCBillingSlab.json b/data/as/30216372/ws-services-calculation/WCBillingSlab.json
index 7d1904e82c..4508d1312b 100644
--- a/data/as/30216372/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216372/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216378/ws-services-calculation/Penalty.json b/data/as/30216378/ws-services-calculation/Penalty.json
index 72d7bddfd2..85ebc0acb0 100644
--- a/data/as/30216378/ws-services-calculation/Penalty.json
+++ b/data/as/30216378/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216378/ws-services-calculation/WCBillingSlab.json b/data/as/30216378/ws-services-calculation/WCBillingSlab.json
index 13c860e8d1..030a3169ee 100644
--- a/data/as/30216378/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216378/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216401/ws-services-calculation/Penalty.json b/data/as/30216401/ws-services-calculation/Penalty.json
index f66305112f..6aecc5857e 100644
--- a/data/as/30216401/ws-services-calculation/Penalty.json
+++ b/data/as/30216401/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216401/ws-services-calculation/WCBillingSlab.json b/data/as/30216401/ws-services-calculation/WCBillingSlab.json
index 9a2ce51cd2..5687215c5d 100644
--- a/data/as/30216401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216401/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216427/ws-services-calculation/Penalty.json b/data/as/30216427/ws-services-calculation/Penalty.json
index 4d24df1ced..feb282aa32 100644
--- a/data/as/30216427/ws-services-calculation/Penalty.json
+++ b/data/as/30216427/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216427/ws-services-calculation/WCBillingSlab.json b/data/as/30216427/ws-services-calculation/WCBillingSlab.json
index 8ded0a2c10..d0d95a3e6b 100644
--- a/data/as/30216427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216427/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216449/ws-services-calculation/Penalty.json b/data/as/30216449/ws-services-calculation/Penalty.json
index 3fece993ff..909c8600ba 100644
--- a/data/as/30216449/ws-services-calculation/Penalty.json
+++ b/data/as/30216449/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216449/ws-services-calculation/WCBillingSlab.json b/data/as/30216449/ws-services-calculation/WCBillingSlab.json
index 2f0b295e24..0ee2527544 100644
--- a/data/as/30216449/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216449/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216472/ws-services-calculation/Penalty.json b/data/as/30216472/ws-services-calculation/Penalty.json
index dc73843a04..7c59ba9217 100644
--- a/data/as/30216472/ws-services-calculation/Penalty.json
+++ b/data/as/30216472/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216472/ws-services-calculation/WCBillingSlab.json b/data/as/30216472/ws-services-calculation/WCBillingSlab.json
index b6a3bc80d1..33cbda6f92 100644
--- a/data/as/30216472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216472/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216505/ws-services-calculation/Penalty.json b/data/as/30216505/ws-services-calculation/Penalty.json
index 21eb86f560..dc59ebf1c7 100644
--- a/data/as/30216505/ws-services-calculation/Penalty.json
+++ b/data/as/30216505/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216505/ws-services-calculation/WCBillingSlab.json b/data/as/30216505/ws-services-calculation/WCBillingSlab.json
index 412c62427d..c4ada70010 100644
--- a/data/as/30216505/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216505/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216577/ws-services-calculation/Penalty.json b/data/as/30216577/ws-services-calculation/Penalty.json
index c9c5e80a19..674bc97efb 100644
--- a/data/as/30216577/ws-services-calculation/Penalty.json
+++ b/data/as/30216577/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216577/ws-services-calculation/WCBillingSlab.json b/data/as/30216577/ws-services-calculation/WCBillingSlab.json
index ae8117a4f4..14ee7939d3 100644
--- a/data/as/30216577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216577/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216676/ws-services-calculation/Penalty.json b/data/as/30216676/ws-services-calculation/Penalty.json
index 5946fe885c..18296f8d0a 100644
--- a/data/as/30216676/ws-services-calculation/Penalty.json
+++ b/data/as/30216676/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216676/ws-services-calculation/WCBillingSlab.json b/data/as/30216676/ws-services-calculation/WCBillingSlab.json
index b88d008182..7ebbfd6605 100644
--- a/data/as/30216676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216676/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216841/ws-services-calculation/Penalty.json b/data/as/30216841/ws-services-calculation/Penalty.json
index b3e97dbfb5..65fb23fa9b 100644
--- a/data/as/30216841/ws-services-calculation/Penalty.json
+++ b/data/as/30216841/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216841/ws-services-calculation/WCBillingSlab.json b/data/as/30216841/ws-services-calculation/WCBillingSlab.json
index f99b7eccd4..0df3ed4a69 100644
--- a/data/as/30216841/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216841/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216849/ws-services-calculation/Penalty.json b/data/as/30216849/ws-services-calculation/Penalty.json
index 2d76b324a6..23c8f73997 100644
--- a/data/as/30216849/ws-services-calculation/Penalty.json
+++ b/data/as/30216849/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216849/ws-services-calculation/WCBillingSlab.json b/data/as/30216849/ws-services-calculation/WCBillingSlab.json
index ddf56de9b1..73fdcdf2dd 100644
--- a/data/as/30216849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216849/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216928/ws-services-calculation/Penalty.json b/data/as/30216928/ws-services-calculation/Penalty.json
index e4b2daea4b..f9953a17bb 100644
--- a/data/as/30216928/ws-services-calculation/Penalty.json
+++ b/data/as/30216928/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216928/ws-services-calculation/WCBillingSlab.json b/data/as/30216928/ws-services-calculation/WCBillingSlab.json
index f157f8c981..58832c84c0 100644
--- a/data/as/30216928/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216928/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216939/ws-services-calculation/Penalty.json b/data/as/30216939/ws-services-calculation/Penalty.json
index 6cd6ee4e0e..a840cd7143 100644
--- a/data/as/30216939/ws-services-calculation/Penalty.json
+++ b/data/as/30216939/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216939/ws-services-calculation/WCBillingSlab.json b/data/as/30216939/ws-services-calculation/WCBillingSlab.json
index 5820999f79..41affbd98c 100644
--- a/data/as/30216939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216939/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30216955/ws-services-calculation/Penalty.json b/data/as/30216955/ws-services-calculation/Penalty.json
index cc81672265..5543962cc7 100644
--- a/data/as/30216955/ws-services-calculation/Penalty.json
+++ b/data/as/30216955/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216955/ws-services-calculation/WCBillingSlab.json b/data/as/30216955/ws-services-calculation/WCBillingSlab.json
index bc6d0fec8a..11c20f7eeb 100644
--- a/data/as/30216955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216955/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30217247/ws-services-calculation/Penalty.json b/data/as/30217247/ws-services-calculation/Penalty.json
index 1166890f41..18ca254ada 100644
--- a/data/as/30217247/ws-services-calculation/Penalty.json
+++ b/data/as/30217247/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30217247/ws-services-calculation/WCBillingSlab.json b/data/as/30217247/ws-services-calculation/WCBillingSlab.json
index 80fac6169c..e9c72d1a68 100644
--- a/data/as/30217247/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30217247/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30217255/ws-services-calculation/Penalty.json b/data/as/30217255/ws-services-calculation/Penalty.json
index 35b972a577..705f2b1053 100644
--- a/data/as/30217255/ws-services-calculation/Penalty.json
+++ b/data/as/30217255/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30217255/ws-services-calculation/WCBillingSlab.json b/data/as/30217255/ws-services-calculation/WCBillingSlab.json
index 419d6a9dd6..1ef75575ae 100644
--- a/data/as/30217255/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30217255/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30217976/ws-services-calculation/Penalty.json b/data/as/30217976/ws-services-calculation/Penalty.json
index 4f6d343fcb..042ea008a0 100644
--- a/data/as/30217976/ws-services-calculation/Penalty.json
+++ b/data/as/30217976/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30217976/ws-services-calculation/WCBillingSlab.json b/data/as/30217976/ws-services-calculation/WCBillingSlab.json
index f48e471eb9..1ccde4c8d4 100644
--- a/data/as/30217976/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30217976/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218422/ws-services-calculation/Penalty.json b/data/as/30218422/ws-services-calculation/Penalty.json
index 78c6d7710e..1cf3593b98 100644
--- a/data/as/30218422/ws-services-calculation/Penalty.json
+++ b/data/as/30218422/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218422/ws-services-calculation/WCBillingSlab.json b/data/as/30218422/ws-services-calculation/WCBillingSlab.json
index 5c80798bf6..56f8a6314e 100644
--- a/data/as/30218422/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218422/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218426/ws-services-calculation/Penalty.json b/data/as/30218426/ws-services-calculation/Penalty.json
index 901a4a3f17..407703c5b3 100644
--- a/data/as/30218426/ws-services-calculation/Penalty.json
+++ b/data/as/30218426/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218426/ws-services-calculation/WCBillingSlab.json b/data/as/30218426/ws-services-calculation/WCBillingSlab.json
index f5ed3f61c1..3fc6c1a28c 100644
--- a/data/as/30218426/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218426/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218431/ws-services-calculation/Penalty.json b/data/as/30218431/ws-services-calculation/Penalty.json
index 5ac8449fdd..d215df735a 100644
--- a/data/as/30218431/ws-services-calculation/Penalty.json
+++ b/data/as/30218431/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218431/ws-services-calculation/WCBillingSlab.json b/data/as/30218431/ws-services-calculation/WCBillingSlab.json
index e38d168f06..2692fd7b17 100644
--- a/data/as/30218431/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218431/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218437/ws-services-calculation/Penalty.json b/data/as/30218437/ws-services-calculation/Penalty.json
index b365e5fc58..d998dcf0b8 100644
--- a/data/as/30218437/ws-services-calculation/Penalty.json
+++ b/data/as/30218437/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218437/ws-services-calculation/WCBillingSlab.json b/data/as/30218437/ws-services-calculation/WCBillingSlab.json
index 1c2c0a0e5f..5bd0d92c71 100644
--- a/data/as/30218437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218437/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218442/ws-services-calculation/Penalty.json b/data/as/30218442/ws-services-calculation/Penalty.json
index 12d56bd61d..e589d12070 100644
--- a/data/as/30218442/ws-services-calculation/Penalty.json
+++ b/data/as/30218442/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218442/ws-services-calculation/WCBillingSlab.json b/data/as/30218442/ws-services-calculation/WCBillingSlab.json
index a18052e426..5d36d0a10b 100644
--- a/data/as/30218442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218442/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218453/ws-services-calculation/Penalty.json b/data/as/30218453/ws-services-calculation/Penalty.json
index 5df4fd0643..ed9d6b1ccc 100644
--- a/data/as/30218453/ws-services-calculation/Penalty.json
+++ b/data/as/30218453/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218453/ws-services-calculation/WCBillingSlab.json b/data/as/30218453/ws-services-calculation/WCBillingSlab.json
index 31fca98b18..aefafd3581 100644
--- a/data/as/30218453/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218453/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218465/ws-services-calculation/Penalty.json b/data/as/30218465/ws-services-calculation/Penalty.json
index 045e3e3724..1ab66bdc67 100644
--- a/data/as/30218465/ws-services-calculation/Penalty.json
+++ b/data/as/30218465/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218465/ws-services-calculation/WCBillingSlab.json b/data/as/30218465/ws-services-calculation/WCBillingSlab.json
index 65527356e1..9383252fa8 100644
--- a/data/as/30218465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218465/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218467/ws-services-calculation/Penalty.json b/data/as/30218467/ws-services-calculation/Penalty.json
index 9f91f96093..5aa4985629 100644
--- a/data/as/30218467/ws-services-calculation/Penalty.json
+++ b/data/as/30218467/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218467/ws-services-calculation/WCBillingSlab.json b/data/as/30218467/ws-services-calculation/WCBillingSlab.json
index e21ed49d3b..75d37500be 100644
--- a/data/as/30218467/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218467/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218469/ws-services-calculation/Penalty.json b/data/as/30218469/ws-services-calculation/Penalty.json
index c2d500b055..89d15ec59d 100644
--- a/data/as/30218469/ws-services-calculation/Penalty.json
+++ b/data/as/30218469/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218469/ws-services-calculation/WCBillingSlab.json b/data/as/30218469/ws-services-calculation/WCBillingSlab.json
index 5429ebef53..2266ac22e9 100644
--- a/data/as/30218469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218469/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218658/ws-services-calculation/Penalty.json b/data/as/30218658/ws-services-calculation/Penalty.json
index c76bf25f8b..9d5e728388 100644
--- a/data/as/30218658/ws-services-calculation/Penalty.json
+++ b/data/as/30218658/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218658/ws-services-calculation/WCBillingSlab.json b/data/as/30218658/ws-services-calculation/WCBillingSlab.json
index 396b6d9b59..92d360b4da 100644
--- a/data/as/30218658/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218658/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218660/ws-services-calculation/Penalty.json b/data/as/30218660/ws-services-calculation/Penalty.json
index db92b7ceb8..d92c264f65 100644
--- a/data/as/30218660/ws-services-calculation/Penalty.json
+++ b/data/as/30218660/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218660/ws-services-calculation/WCBillingSlab.json b/data/as/30218660/ws-services-calculation/WCBillingSlab.json
index a316147621..8d319cd8a7 100644
--- a/data/as/30218660/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218660/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218662/ws-services-calculation/Penalty.json b/data/as/30218662/ws-services-calculation/Penalty.json
index 187ae1d332..5ec643b146 100644
--- a/data/as/30218662/ws-services-calculation/Penalty.json
+++ b/data/as/30218662/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218662/ws-services-calculation/WCBillingSlab.json b/data/as/30218662/ws-services-calculation/WCBillingSlab.json
index 15cde1d4ae..2b1778e715 100644
--- a/data/as/30218662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218662/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218664/ws-services-calculation/Penalty.json b/data/as/30218664/ws-services-calculation/Penalty.json
index 2df92860fa..eaba24ca8f 100644
--- a/data/as/30218664/ws-services-calculation/Penalty.json
+++ b/data/as/30218664/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218664/ws-services-calculation/WCBillingSlab.json b/data/as/30218664/ws-services-calculation/WCBillingSlab.json
index 9b4ad8aa47..6f88eb140f 100644
--- a/data/as/30218664/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218664/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218673/ws-services-calculation/Penalty.json b/data/as/30218673/ws-services-calculation/Penalty.json
index 84e25e2375..48820d217b 100644
--- a/data/as/30218673/ws-services-calculation/Penalty.json
+++ b/data/as/30218673/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218673/ws-services-calculation/WCBillingSlab.json b/data/as/30218673/ws-services-calculation/WCBillingSlab.json
index 71936c31ed..b3193b76a8 100644
--- a/data/as/30218673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218673/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218675/ws-services-calculation/Penalty.json b/data/as/30218675/ws-services-calculation/Penalty.json
index 1066c0d2a9..5a3f3f3ad8 100644
--- a/data/as/30218675/ws-services-calculation/Penalty.json
+++ b/data/as/30218675/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218675/ws-services-calculation/WCBillingSlab.json b/data/as/30218675/ws-services-calculation/WCBillingSlab.json
index 24391eff5a..0737508d27 100644
--- a/data/as/30218675/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218675/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218682/ws-services-calculation/Penalty.json b/data/as/30218682/ws-services-calculation/Penalty.json
index ac436aafb4..32b0605346 100644
--- a/data/as/30218682/ws-services-calculation/Penalty.json
+++ b/data/as/30218682/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218682/ws-services-calculation/WCBillingSlab.json b/data/as/30218682/ws-services-calculation/WCBillingSlab.json
index 2f2b51379d..f00e493977 100644
--- a/data/as/30218682/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218682/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218684/ws-services-calculation/Penalty.json b/data/as/30218684/ws-services-calculation/Penalty.json
index 11fc516ca0..5ea90cc64f 100644
--- a/data/as/30218684/ws-services-calculation/Penalty.json
+++ b/data/as/30218684/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218684/ws-services-calculation/WCBillingSlab.json b/data/as/30218684/ws-services-calculation/WCBillingSlab.json
index da0c2e3f17..e593a9c7e7 100644
--- a/data/as/30218684/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218684/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218703/ws-services-calculation/Penalty.json b/data/as/30218703/ws-services-calculation/Penalty.json
index d221ab1bc0..8ba8f21737 100644
--- a/data/as/30218703/ws-services-calculation/Penalty.json
+++ b/data/as/30218703/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218703/ws-services-calculation/WCBillingSlab.json b/data/as/30218703/ws-services-calculation/WCBillingSlab.json
index bd016279ac..58d2d8007a 100644
--- a/data/as/30218703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218703/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218711/ws-services-calculation/Penalty.json b/data/as/30218711/ws-services-calculation/Penalty.json
index f3a5b5837e..c5b3caf0a6 100644
--- a/data/as/30218711/ws-services-calculation/Penalty.json
+++ b/data/as/30218711/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218711/ws-services-calculation/WCBillingSlab.json b/data/as/30218711/ws-services-calculation/WCBillingSlab.json
index 6c1c08d524..376d5382ca 100644
--- a/data/as/30218711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218711/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218717/ws-services-calculation/Penalty.json b/data/as/30218717/ws-services-calculation/Penalty.json
index 9f605dcff7..50231e3ff2 100644
--- a/data/as/30218717/ws-services-calculation/Penalty.json
+++ b/data/as/30218717/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218717/ws-services-calculation/WCBillingSlab.json b/data/as/30218717/ws-services-calculation/WCBillingSlab.json
index 81fbfaad23..326aa6caaf 100644
--- a/data/as/30218717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218717/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218718/ws-services-calculation/Penalty.json b/data/as/30218718/ws-services-calculation/Penalty.json
index 13c1d90724..a03441780b 100644
--- a/data/as/30218718/ws-services-calculation/Penalty.json
+++ b/data/as/30218718/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218718/ws-services-calculation/WCBillingSlab.json b/data/as/30218718/ws-services-calculation/WCBillingSlab.json
index 2ea14abc4f..a3853b39aa 100644
--- a/data/as/30218718/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218718/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218719/ws-services-calculation/Penalty.json b/data/as/30218719/ws-services-calculation/Penalty.json
index f9722b24b3..87ddfce031 100644
--- a/data/as/30218719/ws-services-calculation/Penalty.json
+++ b/data/as/30218719/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218719/ws-services-calculation/WCBillingSlab.json b/data/as/30218719/ws-services-calculation/WCBillingSlab.json
index 8e65c69933..38dc518741 100644
--- a/data/as/30218719/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218719/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218721/ws-services-calculation/Penalty.json b/data/as/30218721/ws-services-calculation/Penalty.json
index a943dd00b0..086cdc4ac5 100644
--- a/data/as/30218721/ws-services-calculation/Penalty.json
+++ b/data/as/30218721/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218721/ws-services-calculation/WCBillingSlab.json b/data/as/30218721/ws-services-calculation/WCBillingSlab.json
index a51799d518..63bd9299e1 100644
--- a/data/as/30218721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218721/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218722/ws-services-calculation/Penalty.json b/data/as/30218722/ws-services-calculation/Penalty.json
index 2054886a11..48ce3f8e88 100644
--- a/data/as/30218722/ws-services-calculation/Penalty.json
+++ b/data/as/30218722/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218722/ws-services-calculation/WCBillingSlab.json b/data/as/30218722/ws-services-calculation/WCBillingSlab.json
index 4d009ce9c7..69bb193e76 100644
--- a/data/as/30218722/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218722/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218724/ws-services-calculation/Penalty.json b/data/as/30218724/ws-services-calculation/Penalty.json
index d35b566735..00096040c4 100644
--- a/data/as/30218724/ws-services-calculation/Penalty.json
+++ b/data/as/30218724/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218724/ws-services-calculation/WCBillingSlab.json b/data/as/30218724/ws-services-calculation/WCBillingSlab.json
index 7caae88abc..a8cad43e8f 100644
--- a/data/as/30218724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218724/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218726/ws-services-calculation/Penalty.json b/data/as/30218726/ws-services-calculation/Penalty.json
index 1a73e149d2..bb82059567 100644
--- a/data/as/30218726/ws-services-calculation/Penalty.json
+++ b/data/as/30218726/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218726/ws-services-calculation/WCBillingSlab.json b/data/as/30218726/ws-services-calculation/WCBillingSlab.json
index 2dca1ce2f7..46a9501c0c 100644
--- a/data/as/30218726/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218726/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218728/ws-services-calculation/Penalty.json b/data/as/30218728/ws-services-calculation/Penalty.json
index 5982ee458c..13477819ae 100644
--- a/data/as/30218728/ws-services-calculation/Penalty.json
+++ b/data/as/30218728/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218728/ws-services-calculation/WCBillingSlab.json b/data/as/30218728/ws-services-calculation/WCBillingSlab.json
index 8b8dcd3ff9..cb94697c0c 100644
--- a/data/as/30218728/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218728/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218731/ws-services-calculation/Penalty.json b/data/as/30218731/ws-services-calculation/Penalty.json
index 71fa185dad..fe79ea340a 100644
--- a/data/as/30218731/ws-services-calculation/Penalty.json
+++ b/data/as/30218731/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218731/ws-services-calculation/WCBillingSlab.json b/data/as/30218731/ws-services-calculation/WCBillingSlab.json
index 2d6b87fc60..bc84701bb2 100644
--- a/data/as/30218731/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218731/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218732/ws-services-calculation/Penalty.json b/data/as/30218732/ws-services-calculation/Penalty.json
index 441e291021..5dd7265a62 100644
--- a/data/as/30218732/ws-services-calculation/Penalty.json
+++ b/data/as/30218732/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218732/ws-services-calculation/WCBillingSlab.json b/data/as/30218732/ws-services-calculation/WCBillingSlab.json
index bfbbb6a0d1..9b87f35384 100644
--- a/data/as/30218732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218732/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218733/ws-services-calculation/Penalty.json b/data/as/30218733/ws-services-calculation/Penalty.json
index 7ecf818847..7eb931487c 100644
--- a/data/as/30218733/ws-services-calculation/Penalty.json
+++ b/data/as/30218733/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218733/ws-services-calculation/WCBillingSlab.json b/data/as/30218733/ws-services-calculation/WCBillingSlab.json
index 42f0afbbcf..265d3dc093 100644
--- a/data/as/30218733/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218733/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218734/ws-services-calculation/Penalty.json b/data/as/30218734/ws-services-calculation/Penalty.json
index 9f5b67cc03..b2b22e7f1f 100644
--- a/data/as/30218734/ws-services-calculation/Penalty.json
+++ b/data/as/30218734/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218734/ws-services-calculation/WCBillingSlab.json b/data/as/30218734/ws-services-calculation/WCBillingSlab.json
index 9831a0ddb9..94fedee02e 100644
--- a/data/as/30218734/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218734/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218735/ws-services-calculation/Penalty.json b/data/as/30218735/ws-services-calculation/Penalty.json
index d9cb61fa34..bd2e387aee 100644
--- a/data/as/30218735/ws-services-calculation/Penalty.json
+++ b/data/as/30218735/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218735/ws-services-calculation/WCBillingSlab.json b/data/as/30218735/ws-services-calculation/WCBillingSlab.json
index beba2bbd90..a1b142375b 100644
--- a/data/as/30218735/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218735/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218736/ws-services-calculation/Penalty.json b/data/as/30218736/ws-services-calculation/Penalty.json
index 564a4d32e2..bee6588b9c 100644
--- a/data/as/30218736/ws-services-calculation/Penalty.json
+++ b/data/as/30218736/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218736/ws-services-calculation/WCBillingSlab.json b/data/as/30218736/ws-services-calculation/WCBillingSlab.json
index 2a7dd5ed3c..f80af92f9d 100644
--- a/data/as/30218736/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218736/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218737/ws-services-calculation/Penalty.json b/data/as/30218737/ws-services-calculation/Penalty.json
index 746f1f41e5..543e12995c 100644
--- a/data/as/30218737/ws-services-calculation/Penalty.json
+++ b/data/as/30218737/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218737/ws-services-calculation/WCBillingSlab.json b/data/as/30218737/ws-services-calculation/WCBillingSlab.json
index f049e3a9b0..731631cc33 100644
--- a/data/as/30218737/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218737/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218738/ws-services-calculation/Penalty.json b/data/as/30218738/ws-services-calculation/Penalty.json
index f6fa80bdbb..b709e02857 100644
--- a/data/as/30218738/ws-services-calculation/Penalty.json
+++ b/data/as/30218738/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218738/ws-services-calculation/WCBillingSlab.json b/data/as/30218738/ws-services-calculation/WCBillingSlab.json
index 8c14b910a6..d9d62bfe40 100644
--- a/data/as/30218738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218738/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218739/ws-services-calculation/Penalty.json b/data/as/30218739/ws-services-calculation/Penalty.json
index 6d50f87cb6..acb654ceef 100644
--- a/data/as/30218739/ws-services-calculation/Penalty.json
+++ b/data/as/30218739/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218739/ws-services-calculation/WCBillingSlab.json b/data/as/30218739/ws-services-calculation/WCBillingSlab.json
index a6d5ec40f1..633fc925a6 100644
--- a/data/as/30218739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218739/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218740/ws-services-calculation/Penalty.json b/data/as/30218740/ws-services-calculation/Penalty.json
index 41212ce9b7..3333677f0a 100644
--- a/data/as/30218740/ws-services-calculation/Penalty.json
+++ b/data/as/30218740/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218740/ws-services-calculation/WCBillingSlab.json b/data/as/30218740/ws-services-calculation/WCBillingSlab.json
index 666e638464..8f8098ba0d 100644
--- a/data/as/30218740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218740/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218741/ws-services-calculation/Penalty.json b/data/as/30218741/ws-services-calculation/Penalty.json
index 2f4bbcaf02..415ee6aca7 100644
--- a/data/as/30218741/ws-services-calculation/Penalty.json
+++ b/data/as/30218741/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218741/ws-services-calculation/WCBillingSlab.json b/data/as/30218741/ws-services-calculation/WCBillingSlab.json
index ba6728093a..d2a3591f90 100644
--- a/data/as/30218741/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218741/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218742/ws-services-calculation/Penalty.json b/data/as/30218742/ws-services-calculation/Penalty.json
index 2f15561c29..aff0fec809 100644
--- a/data/as/30218742/ws-services-calculation/Penalty.json
+++ b/data/as/30218742/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218742/ws-services-calculation/WCBillingSlab.json b/data/as/30218742/ws-services-calculation/WCBillingSlab.json
index 6f49f5064a..82ceecc008 100644
--- a/data/as/30218742/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218742/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218743/ws-services-calculation/Penalty.json b/data/as/30218743/ws-services-calculation/Penalty.json
index 7d6ed7ef61..ec5eb4bd41 100644
--- a/data/as/30218743/ws-services-calculation/Penalty.json
+++ b/data/as/30218743/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218743/ws-services-calculation/WCBillingSlab.json b/data/as/30218743/ws-services-calculation/WCBillingSlab.json
index c837b28bff..e28ef79be0 100644
--- a/data/as/30218743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218743/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218744/ws-services-calculation/Penalty.json b/data/as/30218744/ws-services-calculation/Penalty.json
index 61415297a0..885a9cf317 100644
--- a/data/as/30218744/ws-services-calculation/Penalty.json
+++ b/data/as/30218744/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218744/ws-services-calculation/WCBillingSlab.json b/data/as/30218744/ws-services-calculation/WCBillingSlab.json
index 534018f002..353a862607 100644
--- a/data/as/30218744/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218744/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218745/ws-services-calculation/Penalty.json b/data/as/30218745/ws-services-calculation/Penalty.json
index e2dd927674..d807c482f9 100644
--- a/data/as/30218745/ws-services-calculation/Penalty.json
+++ b/data/as/30218745/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218745/ws-services-calculation/WCBillingSlab.json b/data/as/30218745/ws-services-calculation/WCBillingSlab.json
index ba006cadeb..e615760a9e 100644
--- a/data/as/30218745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218745/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218812/ws-services-calculation/Penalty.json b/data/as/30218812/ws-services-calculation/Penalty.json
index e9fc496e94..18b35ff44a 100644
--- a/data/as/30218812/ws-services-calculation/Penalty.json
+++ b/data/as/30218812/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218812/ws-services-calculation/WCBillingSlab.json b/data/as/30218812/ws-services-calculation/WCBillingSlab.json
index 47d3a19960..9d35add9f8 100644
--- a/data/as/30218812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218812/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218889/ws-services-calculation/Penalty.json b/data/as/30218889/ws-services-calculation/Penalty.json
index cbacfa632d..2211d6d9b5 100644
--- a/data/as/30218889/ws-services-calculation/Penalty.json
+++ b/data/as/30218889/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218889/ws-services-calculation/WCBillingSlab.json b/data/as/30218889/ws-services-calculation/WCBillingSlab.json
index cf5bac05b4..1ef5525faa 100644
--- a/data/as/30218889/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218889/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30218974/ws-services-calculation/Penalty.json b/data/as/30218974/ws-services-calculation/Penalty.json
index 5577362c28..fbaed588eb 100644
--- a/data/as/30218974/ws-services-calculation/Penalty.json
+++ b/data/as/30218974/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218974/ws-services-calculation/WCBillingSlab.json b/data/as/30218974/ws-services-calculation/WCBillingSlab.json
index 216406a229..aab542b2c6 100644
--- a/data/as/30218974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218974/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219042/ws-services-calculation/Penalty.json b/data/as/30219042/ws-services-calculation/Penalty.json
index 95e06e44a2..3f53c1e187 100644
--- a/data/as/30219042/ws-services-calculation/Penalty.json
+++ b/data/as/30219042/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219042/ws-services-calculation/WCBillingSlab.json b/data/as/30219042/ws-services-calculation/WCBillingSlab.json
index 904ea598af..dbd04e25a0 100644
--- a/data/as/30219042/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219042/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From fd4761a266a7cb9cd4337753274a62938652ae84 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 16:10:58 +0530
Subject: [PATCH 17/23] Updated others data

---
 data/as/30219068/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219068/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219089/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219089/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219100/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219100/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219362/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219362/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219371/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219371/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219382/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219382/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219434/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219434/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219447/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219447/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219463/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219463/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219482/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219482/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219492/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219492/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219505/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219505/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219515/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219515/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219532/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219532/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30219544/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30219544/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30220972/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30220972/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221079/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221079/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221116/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221116/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221135/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221135/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221148/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221148/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221164/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221164/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221189/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221189/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221203/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221203/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221221/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221221/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221249/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221249/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221256/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221256/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221262/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221262/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221312/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221312/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221327/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221327/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221330/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221330/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221335/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221335/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221339/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221339/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221352/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221352/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221370/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221370/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221379/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221379/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221387/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221387/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221395/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221395/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221411/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221411/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221525/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221525/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221530/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221530/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221533/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221533/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221545/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221545/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221554/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221554/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221603/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221603/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221622/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221622/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30221636/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30221636/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30222577/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30222577/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30222595/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30222595/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30222601/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30222601/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224592/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224592/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224594/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224594/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224596/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224596/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224601/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224601/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224607/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224607/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224611/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224611/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224621/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224621/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224626/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224626/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224629/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224629/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224634/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224634/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224638/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224638/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30224681/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30224681/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30226845/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30226845/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30231032/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30231032/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30235506/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30235506/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30244996/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30244996/ws-services-calculation/WCBillingSlab.json | 4 ++--
 data/as/30245010/ws-services-calculation/Penalty.json       | 2 +-
 data/as/30245010/ws-services-calculation/WCBillingSlab.json | 4 ++--
 132 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/data/as/30219068/ws-services-calculation/Penalty.json b/data/as/30219068/ws-services-calculation/Penalty.json
index 0b035f7f3f..fa0a7682ef 100644
--- a/data/as/30219068/ws-services-calculation/Penalty.json
+++ b/data/as/30219068/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219068/ws-services-calculation/WCBillingSlab.json b/data/as/30219068/ws-services-calculation/WCBillingSlab.json
index f2b315ddff..f755bbb8c9 100644
--- a/data/as/30219068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219068/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219089/ws-services-calculation/Penalty.json b/data/as/30219089/ws-services-calculation/Penalty.json
index a1413862e2..c1272ec344 100644
--- a/data/as/30219089/ws-services-calculation/Penalty.json
+++ b/data/as/30219089/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219089/ws-services-calculation/WCBillingSlab.json b/data/as/30219089/ws-services-calculation/WCBillingSlab.json
index 0f341e15cf..42295d208f 100644
--- a/data/as/30219089/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219089/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219100/ws-services-calculation/Penalty.json b/data/as/30219100/ws-services-calculation/Penalty.json
index bd9c34c053..b82ea6c44e 100644
--- a/data/as/30219100/ws-services-calculation/Penalty.json
+++ b/data/as/30219100/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219100/ws-services-calculation/WCBillingSlab.json b/data/as/30219100/ws-services-calculation/WCBillingSlab.json
index c6e09e1192..ea91a89b3d 100644
--- a/data/as/30219100/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219100/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219362/ws-services-calculation/Penalty.json b/data/as/30219362/ws-services-calculation/Penalty.json
index cd24177782..dd9a17e181 100644
--- a/data/as/30219362/ws-services-calculation/Penalty.json
+++ b/data/as/30219362/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219362/ws-services-calculation/WCBillingSlab.json b/data/as/30219362/ws-services-calculation/WCBillingSlab.json
index 927c508b9b..0d7d51fad8 100644
--- a/data/as/30219362/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219362/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219371/ws-services-calculation/Penalty.json b/data/as/30219371/ws-services-calculation/Penalty.json
index 1942b24898..ce4c3697c3 100644
--- a/data/as/30219371/ws-services-calculation/Penalty.json
+++ b/data/as/30219371/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219371/ws-services-calculation/WCBillingSlab.json b/data/as/30219371/ws-services-calculation/WCBillingSlab.json
index 8ef77f2972..b83dfaa97b 100644
--- a/data/as/30219371/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219371/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219382/ws-services-calculation/Penalty.json b/data/as/30219382/ws-services-calculation/Penalty.json
index 527729870f..ab9b0f8469 100644
--- a/data/as/30219382/ws-services-calculation/Penalty.json
+++ b/data/as/30219382/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219382/ws-services-calculation/WCBillingSlab.json b/data/as/30219382/ws-services-calculation/WCBillingSlab.json
index b55bc775f5..c31cc5ecce 100644
--- a/data/as/30219382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219382/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219434/ws-services-calculation/Penalty.json b/data/as/30219434/ws-services-calculation/Penalty.json
index 7ff16cc87b..b757c2d561 100644
--- a/data/as/30219434/ws-services-calculation/Penalty.json
+++ b/data/as/30219434/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219434/ws-services-calculation/WCBillingSlab.json b/data/as/30219434/ws-services-calculation/WCBillingSlab.json
index 293e1bf09e..6d5b7a44f2 100644
--- a/data/as/30219434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219434/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219447/ws-services-calculation/Penalty.json b/data/as/30219447/ws-services-calculation/Penalty.json
index 876e5d54a7..5e77befd27 100644
--- a/data/as/30219447/ws-services-calculation/Penalty.json
+++ b/data/as/30219447/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219447/ws-services-calculation/WCBillingSlab.json b/data/as/30219447/ws-services-calculation/WCBillingSlab.json
index 459a6bda31..35a7d65651 100644
--- a/data/as/30219447/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219447/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219463/ws-services-calculation/Penalty.json b/data/as/30219463/ws-services-calculation/Penalty.json
index dcc5c2d30a..d49d568bab 100644
--- a/data/as/30219463/ws-services-calculation/Penalty.json
+++ b/data/as/30219463/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219463/ws-services-calculation/WCBillingSlab.json b/data/as/30219463/ws-services-calculation/WCBillingSlab.json
index 4a7b7397df..1b0fdc5d51 100644
--- a/data/as/30219463/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219463/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219482/ws-services-calculation/Penalty.json b/data/as/30219482/ws-services-calculation/Penalty.json
index 9a60b8c60a..2987dc8326 100644
--- a/data/as/30219482/ws-services-calculation/Penalty.json
+++ b/data/as/30219482/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219482/ws-services-calculation/WCBillingSlab.json b/data/as/30219482/ws-services-calculation/WCBillingSlab.json
index dbf14d94ab..d508a8c947 100644
--- a/data/as/30219482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219482/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219492/ws-services-calculation/Penalty.json b/data/as/30219492/ws-services-calculation/Penalty.json
index dbcbe5b575..daf24a2a6c 100644
--- a/data/as/30219492/ws-services-calculation/Penalty.json
+++ b/data/as/30219492/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219492/ws-services-calculation/WCBillingSlab.json b/data/as/30219492/ws-services-calculation/WCBillingSlab.json
index 15986db4ca..2321c58220 100644
--- a/data/as/30219492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219492/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219505/ws-services-calculation/Penalty.json b/data/as/30219505/ws-services-calculation/Penalty.json
index 1a8f10362a..211ba1ea7c 100644
--- a/data/as/30219505/ws-services-calculation/Penalty.json
+++ b/data/as/30219505/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219505/ws-services-calculation/WCBillingSlab.json b/data/as/30219505/ws-services-calculation/WCBillingSlab.json
index 574a5c5438..f384318332 100644
--- a/data/as/30219505/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219505/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219515/ws-services-calculation/Penalty.json b/data/as/30219515/ws-services-calculation/Penalty.json
index afe9060fc1..d8c1f6438e 100644
--- a/data/as/30219515/ws-services-calculation/Penalty.json
+++ b/data/as/30219515/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219515/ws-services-calculation/WCBillingSlab.json b/data/as/30219515/ws-services-calculation/WCBillingSlab.json
index a1c983d64a..7b39d27a1f 100644
--- a/data/as/30219515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219515/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219532/ws-services-calculation/Penalty.json b/data/as/30219532/ws-services-calculation/Penalty.json
index af5e78f3bb..1fa89ae8e2 100644
--- a/data/as/30219532/ws-services-calculation/Penalty.json
+++ b/data/as/30219532/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219532/ws-services-calculation/WCBillingSlab.json b/data/as/30219532/ws-services-calculation/WCBillingSlab.json
index 9ca890ec81..ee59fa8576 100644
--- a/data/as/30219532/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219532/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30219544/ws-services-calculation/Penalty.json b/data/as/30219544/ws-services-calculation/Penalty.json
index ef4eca005e..a79a4480f1 100644
--- a/data/as/30219544/ws-services-calculation/Penalty.json
+++ b/data/as/30219544/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219544/ws-services-calculation/WCBillingSlab.json b/data/as/30219544/ws-services-calculation/WCBillingSlab.json
index 4accffa858..774724d72a 100644
--- a/data/as/30219544/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219544/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30220972/ws-services-calculation/Penalty.json b/data/as/30220972/ws-services-calculation/Penalty.json
index 54c408d63c..1adaf008a4 100644
--- a/data/as/30220972/ws-services-calculation/Penalty.json
+++ b/data/as/30220972/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30220972/ws-services-calculation/WCBillingSlab.json b/data/as/30220972/ws-services-calculation/WCBillingSlab.json
index 11273e1a62..11eb138e1e 100644
--- a/data/as/30220972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30220972/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221079/ws-services-calculation/Penalty.json b/data/as/30221079/ws-services-calculation/Penalty.json
index c1e2f1efa9..aea3836dde 100644
--- a/data/as/30221079/ws-services-calculation/Penalty.json
+++ b/data/as/30221079/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221079/ws-services-calculation/WCBillingSlab.json b/data/as/30221079/ws-services-calculation/WCBillingSlab.json
index c4059d8b6f..bd340e8b14 100644
--- a/data/as/30221079/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221079/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221116/ws-services-calculation/Penalty.json b/data/as/30221116/ws-services-calculation/Penalty.json
index 2f2968a218..52c3c4b20b 100644
--- a/data/as/30221116/ws-services-calculation/Penalty.json
+++ b/data/as/30221116/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221116/ws-services-calculation/WCBillingSlab.json b/data/as/30221116/ws-services-calculation/WCBillingSlab.json
index e6183170cb..581ac08585 100644
--- a/data/as/30221116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221116/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221135/ws-services-calculation/Penalty.json b/data/as/30221135/ws-services-calculation/Penalty.json
index d48fab6825..862cfc8e61 100644
--- a/data/as/30221135/ws-services-calculation/Penalty.json
+++ b/data/as/30221135/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221135/ws-services-calculation/WCBillingSlab.json b/data/as/30221135/ws-services-calculation/WCBillingSlab.json
index bd39e547c9..3fe33ec3bb 100644
--- a/data/as/30221135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221135/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221148/ws-services-calculation/Penalty.json b/data/as/30221148/ws-services-calculation/Penalty.json
index e96eae7c80..59acc35666 100644
--- a/data/as/30221148/ws-services-calculation/Penalty.json
+++ b/data/as/30221148/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221148/ws-services-calculation/WCBillingSlab.json b/data/as/30221148/ws-services-calculation/WCBillingSlab.json
index 2d1add7f17..05f6263060 100644
--- a/data/as/30221148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221148/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221164/ws-services-calculation/Penalty.json b/data/as/30221164/ws-services-calculation/Penalty.json
index 2468cb72dd..af75d6c2da 100644
--- a/data/as/30221164/ws-services-calculation/Penalty.json
+++ b/data/as/30221164/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221164/ws-services-calculation/WCBillingSlab.json b/data/as/30221164/ws-services-calculation/WCBillingSlab.json
index b1783bfa9f..8e62f5a940 100644
--- a/data/as/30221164/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221164/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221189/ws-services-calculation/Penalty.json b/data/as/30221189/ws-services-calculation/Penalty.json
index bcf979803d..256fe1931d 100644
--- a/data/as/30221189/ws-services-calculation/Penalty.json
+++ b/data/as/30221189/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221189/ws-services-calculation/WCBillingSlab.json b/data/as/30221189/ws-services-calculation/WCBillingSlab.json
index 7cbf9f25e7..14d3945814 100644
--- a/data/as/30221189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221189/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221203/ws-services-calculation/Penalty.json b/data/as/30221203/ws-services-calculation/Penalty.json
index 7a1f2c6325..9eb160dc2e 100644
--- a/data/as/30221203/ws-services-calculation/Penalty.json
+++ b/data/as/30221203/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221203/ws-services-calculation/WCBillingSlab.json b/data/as/30221203/ws-services-calculation/WCBillingSlab.json
index cc14ebcfa4..dea13f5625 100644
--- a/data/as/30221203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221203/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221221/ws-services-calculation/Penalty.json b/data/as/30221221/ws-services-calculation/Penalty.json
index 756e348be1..16acf3bc05 100644
--- a/data/as/30221221/ws-services-calculation/Penalty.json
+++ b/data/as/30221221/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221221/ws-services-calculation/WCBillingSlab.json b/data/as/30221221/ws-services-calculation/WCBillingSlab.json
index 9fc8eaa299..5df7973525 100644
--- a/data/as/30221221/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221221/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221249/ws-services-calculation/Penalty.json b/data/as/30221249/ws-services-calculation/Penalty.json
index 7eebf37746..d306b6e823 100644
--- a/data/as/30221249/ws-services-calculation/Penalty.json
+++ b/data/as/30221249/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221249/ws-services-calculation/WCBillingSlab.json b/data/as/30221249/ws-services-calculation/WCBillingSlab.json
index 77412f0071..a0fc6a008b 100644
--- a/data/as/30221249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221249/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221256/ws-services-calculation/Penalty.json b/data/as/30221256/ws-services-calculation/Penalty.json
index ffebc41816..bf7f4ca4f9 100644
--- a/data/as/30221256/ws-services-calculation/Penalty.json
+++ b/data/as/30221256/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221256/ws-services-calculation/WCBillingSlab.json b/data/as/30221256/ws-services-calculation/WCBillingSlab.json
index 22ad61d634..e18292e6c1 100644
--- a/data/as/30221256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221256/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221262/ws-services-calculation/Penalty.json b/data/as/30221262/ws-services-calculation/Penalty.json
index 598a8f1df8..65fe87e4be 100644
--- a/data/as/30221262/ws-services-calculation/Penalty.json
+++ b/data/as/30221262/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221262/ws-services-calculation/WCBillingSlab.json b/data/as/30221262/ws-services-calculation/WCBillingSlab.json
index 9ea5cfb06a..f031c53650 100644
--- a/data/as/30221262/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221262/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221312/ws-services-calculation/Penalty.json b/data/as/30221312/ws-services-calculation/Penalty.json
index 68ca41fcdb..b67769a621 100644
--- a/data/as/30221312/ws-services-calculation/Penalty.json
+++ b/data/as/30221312/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221312/ws-services-calculation/WCBillingSlab.json b/data/as/30221312/ws-services-calculation/WCBillingSlab.json
index 0c59fb5500..fab6aa82cc 100644
--- a/data/as/30221312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221312/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221327/ws-services-calculation/Penalty.json b/data/as/30221327/ws-services-calculation/Penalty.json
index 7f29e87449..1af1b0cb42 100644
--- a/data/as/30221327/ws-services-calculation/Penalty.json
+++ b/data/as/30221327/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221327/ws-services-calculation/WCBillingSlab.json b/data/as/30221327/ws-services-calculation/WCBillingSlab.json
index ff17956f52..df7889d67e 100644
--- a/data/as/30221327/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221327/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221330/ws-services-calculation/Penalty.json b/data/as/30221330/ws-services-calculation/Penalty.json
index 27c31e2102..e2d0f72ce7 100644
--- a/data/as/30221330/ws-services-calculation/Penalty.json
+++ b/data/as/30221330/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221330/ws-services-calculation/WCBillingSlab.json b/data/as/30221330/ws-services-calculation/WCBillingSlab.json
index 031f09e34b..e99acf43cd 100644
--- a/data/as/30221330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221330/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221335/ws-services-calculation/Penalty.json b/data/as/30221335/ws-services-calculation/Penalty.json
index 315dfdd391..cb306035e1 100644
--- a/data/as/30221335/ws-services-calculation/Penalty.json
+++ b/data/as/30221335/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221335/ws-services-calculation/WCBillingSlab.json b/data/as/30221335/ws-services-calculation/WCBillingSlab.json
index 9087f5d5c6..0da8342cde 100644
--- a/data/as/30221335/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221335/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221339/ws-services-calculation/Penalty.json b/data/as/30221339/ws-services-calculation/Penalty.json
index aab6af2dff..490217552b 100644
--- a/data/as/30221339/ws-services-calculation/Penalty.json
+++ b/data/as/30221339/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221339/ws-services-calculation/WCBillingSlab.json b/data/as/30221339/ws-services-calculation/WCBillingSlab.json
index de4c5c2ad6..d20ba0e2e4 100644
--- a/data/as/30221339/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221339/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221352/ws-services-calculation/Penalty.json b/data/as/30221352/ws-services-calculation/Penalty.json
index 91012ffd99..c890e0fd38 100644
--- a/data/as/30221352/ws-services-calculation/Penalty.json
+++ b/data/as/30221352/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221352/ws-services-calculation/WCBillingSlab.json b/data/as/30221352/ws-services-calculation/WCBillingSlab.json
index 9b6500d9df..2d60c5c820 100644
--- a/data/as/30221352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221352/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221370/ws-services-calculation/Penalty.json b/data/as/30221370/ws-services-calculation/Penalty.json
index 11db1ef4df..1d62892112 100644
--- a/data/as/30221370/ws-services-calculation/Penalty.json
+++ b/data/as/30221370/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221370/ws-services-calculation/WCBillingSlab.json b/data/as/30221370/ws-services-calculation/WCBillingSlab.json
index d301355aae..9891dda4f3 100644
--- a/data/as/30221370/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221370/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221379/ws-services-calculation/Penalty.json b/data/as/30221379/ws-services-calculation/Penalty.json
index dec65132c8..5d133abe95 100644
--- a/data/as/30221379/ws-services-calculation/Penalty.json
+++ b/data/as/30221379/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221379/ws-services-calculation/WCBillingSlab.json b/data/as/30221379/ws-services-calculation/WCBillingSlab.json
index 3021a75b18..b924ab8fa9 100644
--- a/data/as/30221379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221379/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221387/ws-services-calculation/Penalty.json b/data/as/30221387/ws-services-calculation/Penalty.json
index 65349380ec..34cafc4466 100644
--- a/data/as/30221387/ws-services-calculation/Penalty.json
+++ b/data/as/30221387/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221387/ws-services-calculation/WCBillingSlab.json b/data/as/30221387/ws-services-calculation/WCBillingSlab.json
index b195946bf9..98b923f998 100644
--- a/data/as/30221387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221387/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221395/ws-services-calculation/Penalty.json b/data/as/30221395/ws-services-calculation/Penalty.json
index a640aae0c8..e0c5623390 100644
--- a/data/as/30221395/ws-services-calculation/Penalty.json
+++ b/data/as/30221395/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221395/ws-services-calculation/WCBillingSlab.json b/data/as/30221395/ws-services-calculation/WCBillingSlab.json
index 6b62d35b04..5b15def150 100644
--- a/data/as/30221395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221395/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221411/ws-services-calculation/Penalty.json b/data/as/30221411/ws-services-calculation/Penalty.json
index 7c90df26c3..febb2efda6 100644
--- a/data/as/30221411/ws-services-calculation/Penalty.json
+++ b/data/as/30221411/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221411/ws-services-calculation/WCBillingSlab.json b/data/as/30221411/ws-services-calculation/WCBillingSlab.json
index 33ab1a1a07..99b0d772ab 100644
--- a/data/as/30221411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221411/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221525/ws-services-calculation/Penalty.json b/data/as/30221525/ws-services-calculation/Penalty.json
index 78e6875612..793df7eeca 100644
--- a/data/as/30221525/ws-services-calculation/Penalty.json
+++ b/data/as/30221525/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221525/ws-services-calculation/WCBillingSlab.json b/data/as/30221525/ws-services-calculation/WCBillingSlab.json
index d9f9865c00..6c33f4cce3 100644
--- a/data/as/30221525/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221525/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221530/ws-services-calculation/Penalty.json b/data/as/30221530/ws-services-calculation/Penalty.json
index dd7e59f171..b8df82d66c 100644
--- a/data/as/30221530/ws-services-calculation/Penalty.json
+++ b/data/as/30221530/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221530/ws-services-calculation/WCBillingSlab.json b/data/as/30221530/ws-services-calculation/WCBillingSlab.json
index 80d91c8bba..a497e79c29 100644
--- a/data/as/30221530/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221530/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221533/ws-services-calculation/Penalty.json b/data/as/30221533/ws-services-calculation/Penalty.json
index d2990e06d2..a43fb4bbd7 100644
--- a/data/as/30221533/ws-services-calculation/Penalty.json
+++ b/data/as/30221533/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221533/ws-services-calculation/WCBillingSlab.json b/data/as/30221533/ws-services-calculation/WCBillingSlab.json
index ee24375cd3..092fe9717c 100644
--- a/data/as/30221533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221533/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221545/ws-services-calculation/Penalty.json b/data/as/30221545/ws-services-calculation/Penalty.json
index 8304c4fff4..29a85bffa3 100644
--- a/data/as/30221545/ws-services-calculation/Penalty.json
+++ b/data/as/30221545/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221545/ws-services-calculation/WCBillingSlab.json b/data/as/30221545/ws-services-calculation/WCBillingSlab.json
index 862a804be0..0f9fbcc373 100644
--- a/data/as/30221545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221545/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221554/ws-services-calculation/Penalty.json b/data/as/30221554/ws-services-calculation/Penalty.json
index 0417fa7b6b..4ef681c6b9 100644
--- a/data/as/30221554/ws-services-calculation/Penalty.json
+++ b/data/as/30221554/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221554/ws-services-calculation/WCBillingSlab.json b/data/as/30221554/ws-services-calculation/WCBillingSlab.json
index d262f5003d..89a6944fd1 100644
--- a/data/as/30221554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221554/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221603/ws-services-calculation/Penalty.json b/data/as/30221603/ws-services-calculation/Penalty.json
index b56905d7bb..229f148166 100644
--- a/data/as/30221603/ws-services-calculation/Penalty.json
+++ b/data/as/30221603/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221603/ws-services-calculation/WCBillingSlab.json b/data/as/30221603/ws-services-calculation/WCBillingSlab.json
index 614c0be604..49f5144da3 100644
--- a/data/as/30221603/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221603/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221622/ws-services-calculation/Penalty.json b/data/as/30221622/ws-services-calculation/Penalty.json
index a75ff17860..2ae26bbbf1 100644
--- a/data/as/30221622/ws-services-calculation/Penalty.json
+++ b/data/as/30221622/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221622/ws-services-calculation/WCBillingSlab.json b/data/as/30221622/ws-services-calculation/WCBillingSlab.json
index 1ebe75d4d1..4e6c943449 100644
--- a/data/as/30221622/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221622/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30221636/ws-services-calculation/Penalty.json b/data/as/30221636/ws-services-calculation/Penalty.json
index 41408e1b32..77775f2669 100644
--- a/data/as/30221636/ws-services-calculation/Penalty.json
+++ b/data/as/30221636/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221636/ws-services-calculation/WCBillingSlab.json b/data/as/30221636/ws-services-calculation/WCBillingSlab.json
index 3003091ac0..cf8db0aa96 100644
--- a/data/as/30221636/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221636/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30222577/ws-services-calculation/Penalty.json b/data/as/30222577/ws-services-calculation/Penalty.json
index ed70f139b2..f0337b2bf1 100644
--- a/data/as/30222577/ws-services-calculation/Penalty.json
+++ b/data/as/30222577/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30222577/ws-services-calculation/WCBillingSlab.json b/data/as/30222577/ws-services-calculation/WCBillingSlab.json
index 4f873e82f1..9b5ec055d1 100644
--- a/data/as/30222577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30222577/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30222595/ws-services-calculation/Penalty.json b/data/as/30222595/ws-services-calculation/Penalty.json
index a8d5e335b6..66c93d060c 100644
--- a/data/as/30222595/ws-services-calculation/Penalty.json
+++ b/data/as/30222595/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30222595/ws-services-calculation/WCBillingSlab.json b/data/as/30222595/ws-services-calculation/WCBillingSlab.json
index a61fe4ff9a..f15a6da7bc 100644
--- a/data/as/30222595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30222595/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30222601/ws-services-calculation/Penalty.json b/data/as/30222601/ws-services-calculation/Penalty.json
index 71adc34793..0f7d3ed42b 100644
--- a/data/as/30222601/ws-services-calculation/Penalty.json
+++ b/data/as/30222601/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30222601/ws-services-calculation/WCBillingSlab.json b/data/as/30222601/ws-services-calculation/WCBillingSlab.json
index 7bbaf67494..7d42c182de 100644
--- a/data/as/30222601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30222601/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224592/ws-services-calculation/Penalty.json b/data/as/30224592/ws-services-calculation/Penalty.json
index aefa7264f2..250413bbc5 100644
--- a/data/as/30224592/ws-services-calculation/Penalty.json
+++ b/data/as/30224592/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224592/ws-services-calculation/WCBillingSlab.json b/data/as/30224592/ws-services-calculation/WCBillingSlab.json
index 5cf7dabe88..4402de03f2 100644
--- a/data/as/30224592/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224592/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224594/ws-services-calculation/Penalty.json b/data/as/30224594/ws-services-calculation/Penalty.json
index 4d8fda79d8..c65cde5964 100644
--- a/data/as/30224594/ws-services-calculation/Penalty.json
+++ b/data/as/30224594/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224594/ws-services-calculation/WCBillingSlab.json b/data/as/30224594/ws-services-calculation/WCBillingSlab.json
index 0200206f4e..36d0501775 100644
--- a/data/as/30224594/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224594/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224596/ws-services-calculation/Penalty.json b/data/as/30224596/ws-services-calculation/Penalty.json
index d4875f7bd5..092fe78787 100644
--- a/data/as/30224596/ws-services-calculation/Penalty.json
+++ b/data/as/30224596/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224596/ws-services-calculation/WCBillingSlab.json b/data/as/30224596/ws-services-calculation/WCBillingSlab.json
index 653c7cae3f..e8f18caf5a 100644
--- a/data/as/30224596/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224596/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224601/ws-services-calculation/Penalty.json b/data/as/30224601/ws-services-calculation/Penalty.json
index 2f076bde39..da3c56083f 100644
--- a/data/as/30224601/ws-services-calculation/Penalty.json
+++ b/data/as/30224601/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224601/ws-services-calculation/WCBillingSlab.json b/data/as/30224601/ws-services-calculation/WCBillingSlab.json
index 48a8c106b9..7c89f5a44b 100644
--- a/data/as/30224601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224601/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224607/ws-services-calculation/Penalty.json b/data/as/30224607/ws-services-calculation/Penalty.json
index 8e90086417..19974a9a03 100644
--- a/data/as/30224607/ws-services-calculation/Penalty.json
+++ b/data/as/30224607/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224607/ws-services-calculation/WCBillingSlab.json b/data/as/30224607/ws-services-calculation/WCBillingSlab.json
index 1f6c3c2493..c51465c004 100644
--- a/data/as/30224607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224607/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224611/ws-services-calculation/Penalty.json b/data/as/30224611/ws-services-calculation/Penalty.json
index bff3060440..d0b56b114a 100644
--- a/data/as/30224611/ws-services-calculation/Penalty.json
+++ b/data/as/30224611/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224611/ws-services-calculation/WCBillingSlab.json b/data/as/30224611/ws-services-calculation/WCBillingSlab.json
index ba6551d539..d2b5b46dbb 100644
--- a/data/as/30224611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224611/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224621/ws-services-calculation/Penalty.json b/data/as/30224621/ws-services-calculation/Penalty.json
index fe3ebe165d..90708b5759 100644
--- a/data/as/30224621/ws-services-calculation/Penalty.json
+++ b/data/as/30224621/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224621/ws-services-calculation/WCBillingSlab.json b/data/as/30224621/ws-services-calculation/WCBillingSlab.json
index 2432198691..707c67dd25 100644
--- a/data/as/30224621/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224621/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224626/ws-services-calculation/Penalty.json b/data/as/30224626/ws-services-calculation/Penalty.json
index 94e0629bd4..1503a13d05 100644
--- a/data/as/30224626/ws-services-calculation/Penalty.json
+++ b/data/as/30224626/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224626/ws-services-calculation/WCBillingSlab.json b/data/as/30224626/ws-services-calculation/WCBillingSlab.json
index c651992312..89784dd0fd 100644
--- a/data/as/30224626/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224626/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224629/ws-services-calculation/Penalty.json b/data/as/30224629/ws-services-calculation/Penalty.json
index f0930f249a..40fe1e70b0 100644
--- a/data/as/30224629/ws-services-calculation/Penalty.json
+++ b/data/as/30224629/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224629/ws-services-calculation/WCBillingSlab.json b/data/as/30224629/ws-services-calculation/WCBillingSlab.json
index 5c8bd9feda..a68bb68f81 100644
--- a/data/as/30224629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224629/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224634/ws-services-calculation/Penalty.json b/data/as/30224634/ws-services-calculation/Penalty.json
index bd8eb23d18..1791b56c2e 100644
--- a/data/as/30224634/ws-services-calculation/Penalty.json
+++ b/data/as/30224634/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224634/ws-services-calculation/WCBillingSlab.json b/data/as/30224634/ws-services-calculation/WCBillingSlab.json
index f2ab94b1f7..1e23e12981 100644
--- a/data/as/30224634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224634/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224638/ws-services-calculation/Penalty.json b/data/as/30224638/ws-services-calculation/Penalty.json
index 08c0ef1a31..e35fa9736e 100644
--- a/data/as/30224638/ws-services-calculation/Penalty.json
+++ b/data/as/30224638/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224638/ws-services-calculation/WCBillingSlab.json b/data/as/30224638/ws-services-calculation/WCBillingSlab.json
index bb5cc57115..28bda5f088 100644
--- a/data/as/30224638/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224638/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30224681/ws-services-calculation/Penalty.json b/data/as/30224681/ws-services-calculation/Penalty.json
index 1601c93369..97bfa56f2c 100644
--- a/data/as/30224681/ws-services-calculation/Penalty.json
+++ b/data/as/30224681/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224681/ws-services-calculation/WCBillingSlab.json b/data/as/30224681/ws-services-calculation/WCBillingSlab.json
index e5f68d7575..479ee13a35 100644
--- a/data/as/30224681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224681/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30226845/ws-services-calculation/Penalty.json b/data/as/30226845/ws-services-calculation/Penalty.json
index 7c874d2432..c4e774e760 100644
--- a/data/as/30226845/ws-services-calculation/Penalty.json
+++ b/data/as/30226845/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30226845/ws-services-calculation/WCBillingSlab.json b/data/as/30226845/ws-services-calculation/WCBillingSlab.json
index eb4cce7662..3ced1a4340 100644
--- a/data/as/30226845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30226845/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30231032/ws-services-calculation/Penalty.json b/data/as/30231032/ws-services-calculation/Penalty.json
index fe4ff2509d..25bafc97bf 100644
--- a/data/as/30231032/ws-services-calculation/Penalty.json
+++ b/data/as/30231032/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30231032/ws-services-calculation/WCBillingSlab.json b/data/as/30231032/ws-services-calculation/WCBillingSlab.json
index 6406f12279..8921897bd3 100644
--- a/data/as/30231032/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30231032/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30235506/ws-services-calculation/Penalty.json b/data/as/30235506/ws-services-calculation/Penalty.json
index 0c0749ed27..0edbf8ac1b 100644
--- a/data/as/30235506/ws-services-calculation/Penalty.json
+++ b/data/as/30235506/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30235506/ws-services-calculation/WCBillingSlab.json b/data/as/30235506/ws-services-calculation/WCBillingSlab.json
index fc03e1d13c..03a71b0814 100644
--- a/data/as/30235506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30235506/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30244996/ws-services-calculation/Penalty.json b/data/as/30244996/ws-services-calculation/Penalty.json
index aa375336fb..b3ab62100e 100644
--- a/data/as/30244996/ws-services-calculation/Penalty.json
+++ b/data/as/30244996/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30244996/ws-services-calculation/WCBillingSlab.json b/data/as/30244996/ws-services-calculation/WCBillingSlab.json
index 9424affb0e..b79f2add70 100644
--- a/data/as/30244996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30244996/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
diff --git a/data/as/30245010/ws-services-calculation/Penalty.json b/data/as/30245010/ws-services-calculation/Penalty.json
index 44f29acbaa..7d020cc816 100644
--- a/data/as/30245010/ws-services-calculation/Penalty.json
+++ b/data/as/30245010/ws-services-calculation/Penalty.json
@@ -11,7 +11,7 @@
             "applicableAfterDays": 10,
             "flatAmount": null,
             "fromFY": "2023-24",
-            "startingDay": "1/04/2023"
+            "startingDay": "01/04/2023"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30245010/ws-services-calculation/WCBillingSlab.json b/data/as/30245010/ws-services-calculation/WCBillingSlab.json
index 44c6e9a932..f024d22552 100644
--- a/data/as/30245010/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30245010/ws-services-calculation/WCBillingSlab.json
@@ -24,7 +24,7 @@
             ]
         },
         {
-            "id": 2,
+            "id": "2",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",
@@ -45,7 +45,7 @@
             ]
         },
         {
-            "id": 3,
+            "id": "3",
             "buildingType": "MIXED",
             "calculationAttribute": "Water consumption",
             "connectionType": "Metered",

From aee06a6c8976d0c9b9e28f7e6988e8b37f75b656 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 17:13:39 +0530
Subject: [PATCH 18/23] updated minimumCharge 0.0 to 0

---
 .../as/1050454/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1429340/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1432067/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1439931/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1441030/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1450901/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1758972/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1759034/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1761428/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1763377/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1764917/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1769128/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1769703/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1770771/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1770808/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1771140/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1774472/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1774711/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1774890/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1775011/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1779266/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1783019/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1783754/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1784430/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1784527/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1784979/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1803054/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1812780/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1817138/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1817302/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1819835/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1830310/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1841150/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842161/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842244/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842301/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842378/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842423/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842653/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1842776/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1843088/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1843358/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1843430/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1844212/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1844228/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1844235/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1845373/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1845703/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1845765/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1845900/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1846063/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1846172/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1846500/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1846605/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1846743/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1852364/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1852774/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1852987/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1853306/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1853326/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1853350/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1853501/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1853696/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1854331/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1854436/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1858924/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1859895/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1860965/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1861320/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1861420/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1872281/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1872304/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1872337/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1936743/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937513/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937533/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937549/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937556/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937635/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937654/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937787/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937816/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937849/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937917/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937928/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937948/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1937960/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1941516/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1941535/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1941750/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1941769/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1941788/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1941850/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/1970469/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2404395/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2404401/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2404437/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2405228/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2406004/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2421895/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2421903/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2421911/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2421922/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2423434/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2426035/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2429111/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2433896/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2443383/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2480357/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2480363/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2484676/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2484678/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2486691/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2491893/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2495922/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2496124/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2496136/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2497758/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2515923/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2515942/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2515998/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516005/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516013/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516019/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516135/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516159/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516189/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516326/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516787/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516881/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2516940/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2517189/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2517201/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2517213/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2517242/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2517248/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2517256/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2520036/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2520181/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2581909/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2582386/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2582460/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/2615100/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3164535/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3319750/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3321276/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3321879/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3327425/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3328455/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3328647/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3328767/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3328873/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3333586/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3359758/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3370880/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3372158/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3373443/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3374529/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3375170/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3375765/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3378587/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3384885/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3384921/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3385844/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3385946/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3385982/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386123/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386146/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386204/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386236/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386289/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386322/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386356/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386386/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386407/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386435/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386445/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386466/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386515/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386526/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386540/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386544/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386664/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3386695/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/3800160/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4516012/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4516046/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4516419/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/452628/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/452685/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/452697/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/453185/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/454276/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/455214/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/455219/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/455220/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/455374/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4566832/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567143/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567157/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567167/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567203/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567253/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567258/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567264/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4567271/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4627074/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4627137/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4637354/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4637711/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4637724/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4637728/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4638859/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4639802/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4639900/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4639926/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4639994/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4640433/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4640480/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4642317/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4642337/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4651600/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4652293/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4653590/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4654670/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4655460/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4655542/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4655617/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4656070/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4656202/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4656990/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4657126/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4657150/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4657189/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4657198/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4657250/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4658923/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4658962/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4659024/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4659210/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4668398/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4869442/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4870166/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4870229/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4870250/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4870307/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872574/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872595/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872646/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872699/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872806/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872849/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4872988/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873102/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873166/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873607/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873634/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873695/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873715/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873739/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873771/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873867/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4873898/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4887720/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4887740/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4887755/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4887898/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4887947/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4888080/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4888114/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4888263/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4888294/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492155/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492158/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492161/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492165/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492168/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492177/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/492182/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/4963515/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5072706/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5072752/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5072807/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5072821/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5072838/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5072844/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5073321/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5073330/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5073372/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5073861/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5073879/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5073951/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5074126/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5074129/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5074133/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/50796/ws-services-calculation/WCBillingSlab.json  | 8 ++++----
 .../as/5102401/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5102996/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5103007/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/51526/ws-services-calculation/WCBillingSlab.json  | 8 ++++----
 data/as/51536/ws-services-calculation/WCBillingSlab.json  | 8 ++++----
 .../as/5182812/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5183548/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5183964/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5184373/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185351/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185356/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185535/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185541/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185549/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185556/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185570/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185575/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185587/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185591/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185615/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185635/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185650/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185655/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185659/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185665/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185685/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185693/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185707/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185717/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5185887/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186387/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186420/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186446/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186457/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186463/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186493/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186499/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186506/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5186513/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5206914/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5230312/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5230346/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5230398/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/52793/ws-services-calculation/WCBillingSlab.json  | 8 ++++----
 .../as/5344027/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5349626/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5349656/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5349682/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5357091/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5362300/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5362332/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5379654/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5379810/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5404892/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5404904/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5404932/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5407809/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5407828/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5407846/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5407857/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408096/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408108/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408187/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408224/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408248/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408300/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408316/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408332/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408704/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408793/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408854/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5408891/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5464190/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5464241/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5464278/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5464342/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5464413/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5464439/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5475220/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5519133/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5519203/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5523260/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5527478/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5528384/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5531603/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5532932/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5533989/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5534043/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5534657/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5544794/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547805/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547815/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547824/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547832/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547843/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/600587/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/603120/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/603277/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/603538/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/729083/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/729086/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/874344/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/877925/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 data/as/877934/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 400 files changed, 1600 insertions(+), 1600 deletions(-)

diff --git a/data/as/1050454/ws-services-calculation/WCBillingSlab.json b/data/as/1050454/ws-services-calculation/WCBillingSlab.json
index 68ddfefb1c..67e73512cd 100644
--- a/data/as/1050454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1050454/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1429340/ws-services-calculation/WCBillingSlab.json b/data/as/1429340/ws-services-calculation/WCBillingSlab.json
index 091f6891ac..39663c0bea 100644
--- a/data/as/1429340/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1429340/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1432067/ws-services-calculation/WCBillingSlab.json b/data/as/1432067/ws-services-calculation/WCBillingSlab.json
index 0bc6f75581..26d86b1603 100644
--- a/data/as/1432067/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1432067/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1439931/ws-services-calculation/WCBillingSlab.json b/data/as/1439931/ws-services-calculation/WCBillingSlab.json
index 3d72ed099b..1ccaa834a4 100644
--- a/data/as/1439931/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1439931/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1441030/ws-services-calculation/WCBillingSlab.json b/data/as/1441030/ws-services-calculation/WCBillingSlab.json
index 2689d67045..32164f3f15 100644
--- a/data/as/1441030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1441030/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1450901/ws-services-calculation/WCBillingSlab.json b/data/as/1450901/ws-services-calculation/WCBillingSlab.json
index 83effe8d9b..2a78981737 100644
--- a/data/as/1450901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1450901/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1758972/ws-services-calculation/WCBillingSlab.json b/data/as/1758972/ws-services-calculation/WCBillingSlab.json
index e9da285dfa..eff6b79e42 100644
--- a/data/as/1758972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1758972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1759034/ws-services-calculation/WCBillingSlab.json b/data/as/1759034/ws-services-calculation/WCBillingSlab.json
index 70acc0a531..c4fe42bc8b 100644
--- a/data/as/1759034/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1759034/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1761428/ws-services-calculation/WCBillingSlab.json b/data/as/1761428/ws-services-calculation/WCBillingSlab.json
index 25b0371ddc..4d475d5280 100644
--- a/data/as/1761428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1761428/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1763377/ws-services-calculation/WCBillingSlab.json b/data/as/1763377/ws-services-calculation/WCBillingSlab.json
index 25738c86d4..a1ebd04b23 100644
--- a/data/as/1763377/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1763377/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1764917/ws-services-calculation/WCBillingSlab.json b/data/as/1764917/ws-services-calculation/WCBillingSlab.json
index 1324e107e1..2da99b1959 100644
--- a/data/as/1764917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1764917/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1769128/ws-services-calculation/WCBillingSlab.json b/data/as/1769128/ws-services-calculation/WCBillingSlab.json
index a9c1e6997c..73e63cad3c 100644
--- a/data/as/1769128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1769128/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1769703/ws-services-calculation/WCBillingSlab.json b/data/as/1769703/ws-services-calculation/WCBillingSlab.json
index 20a4593eca..47ea541b77 100644
--- a/data/as/1769703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1769703/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1770771/ws-services-calculation/WCBillingSlab.json b/data/as/1770771/ws-services-calculation/WCBillingSlab.json
index 8f00ad23fe..d1e52feba3 100644
--- a/data/as/1770771/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1770771/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1770808/ws-services-calculation/WCBillingSlab.json b/data/as/1770808/ws-services-calculation/WCBillingSlab.json
index b77efb0c24..a9eafbbe02 100644
--- a/data/as/1770808/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1770808/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1771140/ws-services-calculation/WCBillingSlab.json b/data/as/1771140/ws-services-calculation/WCBillingSlab.json
index 3c8a09bd00..3a6adef28d 100644
--- a/data/as/1771140/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1771140/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1774472/ws-services-calculation/WCBillingSlab.json b/data/as/1774472/ws-services-calculation/WCBillingSlab.json
index 2434e820b4..93b78a2ae6 100644
--- a/data/as/1774472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1774472/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1774711/ws-services-calculation/WCBillingSlab.json b/data/as/1774711/ws-services-calculation/WCBillingSlab.json
index 7efd7faeb7..dd1fbd8178 100644
--- a/data/as/1774711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1774711/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1774890/ws-services-calculation/WCBillingSlab.json b/data/as/1774890/ws-services-calculation/WCBillingSlab.json
index 73204fd142..814ac0404b 100644
--- a/data/as/1774890/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1774890/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1775011/ws-services-calculation/WCBillingSlab.json b/data/as/1775011/ws-services-calculation/WCBillingSlab.json
index 8a5813bd66..19c1773ad0 100644
--- a/data/as/1775011/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1775011/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1779266/ws-services-calculation/WCBillingSlab.json b/data/as/1779266/ws-services-calculation/WCBillingSlab.json
index 1e663a0c1b..613de8447d 100644
--- a/data/as/1779266/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1779266/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1783019/ws-services-calculation/WCBillingSlab.json b/data/as/1783019/ws-services-calculation/WCBillingSlab.json
index ce07ea17ae..abc906b0a0 100644
--- a/data/as/1783019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1783019/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1783754/ws-services-calculation/WCBillingSlab.json b/data/as/1783754/ws-services-calculation/WCBillingSlab.json
index f7fdf99e1c..53bd6be842 100644
--- a/data/as/1783754/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1783754/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1784430/ws-services-calculation/WCBillingSlab.json b/data/as/1784430/ws-services-calculation/WCBillingSlab.json
index 1a3dddb6a7..906041da89 100644
--- a/data/as/1784430/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1784430/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1784527/ws-services-calculation/WCBillingSlab.json b/data/as/1784527/ws-services-calculation/WCBillingSlab.json
index 0734fbbb17..271ded146e 100644
--- a/data/as/1784527/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1784527/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1784979/ws-services-calculation/WCBillingSlab.json b/data/as/1784979/ws-services-calculation/WCBillingSlab.json
index ce2b54a232..765866c711 100644
--- a/data/as/1784979/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1784979/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1803054/ws-services-calculation/WCBillingSlab.json b/data/as/1803054/ws-services-calculation/WCBillingSlab.json
index 170c0bce43..327b683a60 100644
--- a/data/as/1803054/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1803054/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1812780/ws-services-calculation/WCBillingSlab.json b/data/as/1812780/ws-services-calculation/WCBillingSlab.json
index e572da9fb2..5a6871e358 100644
--- a/data/as/1812780/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1812780/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1817138/ws-services-calculation/WCBillingSlab.json b/data/as/1817138/ws-services-calculation/WCBillingSlab.json
index e9c95339c6..4279efabd9 100644
--- a/data/as/1817138/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1817138/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1817302/ws-services-calculation/WCBillingSlab.json b/data/as/1817302/ws-services-calculation/WCBillingSlab.json
index 5717dfcbb0..ef99648d8a 100644
--- a/data/as/1817302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1817302/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1819835/ws-services-calculation/WCBillingSlab.json b/data/as/1819835/ws-services-calculation/WCBillingSlab.json
index 281f71be01..4ad99c9751 100644
--- a/data/as/1819835/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1819835/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1830310/ws-services-calculation/WCBillingSlab.json b/data/as/1830310/ws-services-calculation/WCBillingSlab.json
index d2109b3768..2655f54098 100644
--- a/data/as/1830310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1830310/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1841150/ws-services-calculation/WCBillingSlab.json b/data/as/1841150/ws-services-calculation/WCBillingSlab.json
index 7a825827e4..7a6da40dc4 100644
--- a/data/as/1841150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1841150/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842161/ws-services-calculation/WCBillingSlab.json b/data/as/1842161/ws-services-calculation/WCBillingSlab.json
index 59c16d94e0..31853f61c7 100644
--- a/data/as/1842161/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842161/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842244/ws-services-calculation/WCBillingSlab.json b/data/as/1842244/ws-services-calculation/WCBillingSlab.json
index 28113b3576..1d6d767c27 100644
--- a/data/as/1842244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842244/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842301/ws-services-calculation/WCBillingSlab.json b/data/as/1842301/ws-services-calculation/WCBillingSlab.json
index 3bb4f8f29d..038b602275 100644
--- a/data/as/1842301/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842301/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842378/ws-services-calculation/WCBillingSlab.json b/data/as/1842378/ws-services-calculation/WCBillingSlab.json
index 78971d9019..32f05adf2a 100644
--- a/data/as/1842378/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842378/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842423/ws-services-calculation/WCBillingSlab.json b/data/as/1842423/ws-services-calculation/WCBillingSlab.json
index 08be916e61..c2e5569885 100644
--- a/data/as/1842423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842423/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842653/ws-services-calculation/WCBillingSlab.json b/data/as/1842653/ws-services-calculation/WCBillingSlab.json
index a4a76635bd..5626113fde 100644
--- a/data/as/1842653/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842653/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1842776/ws-services-calculation/WCBillingSlab.json b/data/as/1842776/ws-services-calculation/WCBillingSlab.json
index 2068b9ce03..58abc94a70 100644
--- a/data/as/1842776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1842776/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1843088/ws-services-calculation/WCBillingSlab.json b/data/as/1843088/ws-services-calculation/WCBillingSlab.json
index 7dc37559b9..3156a59150 100644
--- a/data/as/1843088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1843088/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1843358/ws-services-calculation/WCBillingSlab.json b/data/as/1843358/ws-services-calculation/WCBillingSlab.json
index 2dd2a37fbd..522b66d9e3 100644
--- a/data/as/1843358/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1843358/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1843430/ws-services-calculation/WCBillingSlab.json b/data/as/1843430/ws-services-calculation/WCBillingSlab.json
index b0bb063edd..485df744ea 100644
--- a/data/as/1843430/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1843430/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1844212/ws-services-calculation/WCBillingSlab.json b/data/as/1844212/ws-services-calculation/WCBillingSlab.json
index 3b133cc330..26bba8e0fc 100644
--- a/data/as/1844212/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1844212/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1844228/ws-services-calculation/WCBillingSlab.json b/data/as/1844228/ws-services-calculation/WCBillingSlab.json
index 8875252ef5..ee27ae2e4e 100644
--- a/data/as/1844228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1844228/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1844235/ws-services-calculation/WCBillingSlab.json b/data/as/1844235/ws-services-calculation/WCBillingSlab.json
index f73ea92001..8d91066528 100644
--- a/data/as/1844235/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1844235/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845373/ws-services-calculation/WCBillingSlab.json b/data/as/1845373/ws-services-calculation/WCBillingSlab.json
index 0a9ae6fe8c..fd0188f78d 100644
--- a/data/as/1845373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845373/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845703/ws-services-calculation/WCBillingSlab.json b/data/as/1845703/ws-services-calculation/WCBillingSlab.json
index f5bbc93099..a8cc4a44ad 100644
--- a/data/as/1845703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845703/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845765/ws-services-calculation/WCBillingSlab.json b/data/as/1845765/ws-services-calculation/WCBillingSlab.json
index e30d97e110..80b855a02f 100644
--- a/data/as/1845765/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845765/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1845900/ws-services-calculation/WCBillingSlab.json b/data/as/1845900/ws-services-calculation/WCBillingSlab.json
index bafac3f0b0..4fa48f4942 100644
--- a/data/as/1845900/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1845900/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846063/ws-services-calculation/WCBillingSlab.json b/data/as/1846063/ws-services-calculation/WCBillingSlab.json
index 0752fc76f2..4eaf7baeea 100644
--- a/data/as/1846063/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846063/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846172/ws-services-calculation/WCBillingSlab.json b/data/as/1846172/ws-services-calculation/WCBillingSlab.json
index b36e99a93b..cca5b38fb6 100644
--- a/data/as/1846172/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846172/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846500/ws-services-calculation/WCBillingSlab.json b/data/as/1846500/ws-services-calculation/WCBillingSlab.json
index 3111fd3555..3e501465c0 100644
--- a/data/as/1846500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846500/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846605/ws-services-calculation/WCBillingSlab.json b/data/as/1846605/ws-services-calculation/WCBillingSlab.json
index 4fa1ea7b91..b73667e9e9 100644
--- a/data/as/1846605/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846605/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1846743/ws-services-calculation/WCBillingSlab.json b/data/as/1846743/ws-services-calculation/WCBillingSlab.json
index 431d656cb8..2fe63aaf27 100644
--- a/data/as/1846743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1846743/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1852364/ws-services-calculation/WCBillingSlab.json b/data/as/1852364/ws-services-calculation/WCBillingSlab.json
index e84ebe31d3..0421012315 100644
--- a/data/as/1852364/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1852364/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1852774/ws-services-calculation/WCBillingSlab.json b/data/as/1852774/ws-services-calculation/WCBillingSlab.json
index 0a9713ac00..447ae775c0 100644
--- a/data/as/1852774/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1852774/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1852987/ws-services-calculation/WCBillingSlab.json b/data/as/1852987/ws-services-calculation/WCBillingSlab.json
index 8d61bea731..5e86d90e3e 100644
--- a/data/as/1852987/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1852987/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853306/ws-services-calculation/WCBillingSlab.json b/data/as/1853306/ws-services-calculation/WCBillingSlab.json
index 3e5bf71085..3e07262222 100644
--- a/data/as/1853306/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853306/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853326/ws-services-calculation/WCBillingSlab.json b/data/as/1853326/ws-services-calculation/WCBillingSlab.json
index ec96075da4..1a9fc3458e 100644
--- a/data/as/1853326/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853326/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853350/ws-services-calculation/WCBillingSlab.json b/data/as/1853350/ws-services-calculation/WCBillingSlab.json
index b9e98a5384..44a2fca384 100644
--- a/data/as/1853350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853501/ws-services-calculation/WCBillingSlab.json b/data/as/1853501/ws-services-calculation/WCBillingSlab.json
index 1cdda7cb9c..dfb44f775d 100644
--- a/data/as/1853501/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853501/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1853696/ws-services-calculation/WCBillingSlab.json b/data/as/1853696/ws-services-calculation/WCBillingSlab.json
index 3f3b99ace8..bbd5c97e82 100644
--- a/data/as/1853696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1853696/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1854331/ws-services-calculation/WCBillingSlab.json b/data/as/1854331/ws-services-calculation/WCBillingSlab.json
index d1d3888581..48764e2922 100644
--- a/data/as/1854331/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1854331/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1854436/ws-services-calculation/WCBillingSlab.json b/data/as/1854436/ws-services-calculation/WCBillingSlab.json
index 21845fdd9e..212b2cf871 100644
--- a/data/as/1854436/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1854436/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1858924/ws-services-calculation/WCBillingSlab.json b/data/as/1858924/ws-services-calculation/WCBillingSlab.json
index c6aa46f653..3c603d4c7f 100644
--- a/data/as/1858924/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1858924/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1859895/ws-services-calculation/WCBillingSlab.json b/data/as/1859895/ws-services-calculation/WCBillingSlab.json
index 65c078ea87..016edf9c41 100644
--- a/data/as/1859895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1859895/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1860965/ws-services-calculation/WCBillingSlab.json b/data/as/1860965/ws-services-calculation/WCBillingSlab.json
index ca944ce81e..8723dab9cf 100644
--- a/data/as/1860965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1860965/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1861320/ws-services-calculation/WCBillingSlab.json b/data/as/1861320/ws-services-calculation/WCBillingSlab.json
index b39b826b0c..7fe1744996 100644
--- a/data/as/1861320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1861320/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1861420/ws-services-calculation/WCBillingSlab.json b/data/as/1861420/ws-services-calculation/WCBillingSlab.json
index 36f08d3b62..67d7ef05dc 100644
--- a/data/as/1861420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1861420/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1872281/ws-services-calculation/WCBillingSlab.json b/data/as/1872281/ws-services-calculation/WCBillingSlab.json
index 450714002f..4c8a4a8210 100644
--- a/data/as/1872281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1872281/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1872304/ws-services-calculation/WCBillingSlab.json b/data/as/1872304/ws-services-calculation/WCBillingSlab.json
index b0fc719bce..1bae31f0f7 100644
--- a/data/as/1872304/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1872304/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1872337/ws-services-calculation/WCBillingSlab.json b/data/as/1872337/ws-services-calculation/WCBillingSlab.json
index dd5d3c9a80..0ed76042dc 100644
--- a/data/as/1872337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1872337/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1936743/ws-services-calculation/WCBillingSlab.json b/data/as/1936743/ws-services-calculation/WCBillingSlab.json
index 5c07b2c16c..b11b93381f 100644
--- a/data/as/1936743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1936743/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937513/ws-services-calculation/WCBillingSlab.json b/data/as/1937513/ws-services-calculation/WCBillingSlab.json
index ae5afbf1c4..9955a465cd 100644
--- a/data/as/1937513/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937513/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937533/ws-services-calculation/WCBillingSlab.json b/data/as/1937533/ws-services-calculation/WCBillingSlab.json
index 459173a3d1..cee5ee78ac 100644
--- a/data/as/1937533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937549/ws-services-calculation/WCBillingSlab.json b/data/as/1937549/ws-services-calculation/WCBillingSlab.json
index 06670c15d9..e53a3542af 100644
--- a/data/as/1937549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937549/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937556/ws-services-calculation/WCBillingSlab.json b/data/as/1937556/ws-services-calculation/WCBillingSlab.json
index 8ec51aa7ab..1573a07151 100644
--- a/data/as/1937556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937556/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937635/ws-services-calculation/WCBillingSlab.json b/data/as/1937635/ws-services-calculation/WCBillingSlab.json
index 5a61ffb99b..0e785b0280 100644
--- a/data/as/1937635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937654/ws-services-calculation/WCBillingSlab.json b/data/as/1937654/ws-services-calculation/WCBillingSlab.json
index eef8f24c08..8bd5b32749 100644
--- a/data/as/1937654/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937654/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937787/ws-services-calculation/WCBillingSlab.json b/data/as/1937787/ws-services-calculation/WCBillingSlab.json
index b2ee0ee3de..faa4f41cbb 100644
--- a/data/as/1937787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937787/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937816/ws-services-calculation/WCBillingSlab.json b/data/as/1937816/ws-services-calculation/WCBillingSlab.json
index 5f08b84c5d..ebf5eefe4f 100644
--- a/data/as/1937816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937849/ws-services-calculation/WCBillingSlab.json b/data/as/1937849/ws-services-calculation/WCBillingSlab.json
index 5265a2b613..e9d5aff7f2 100644
--- a/data/as/1937849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937849/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937917/ws-services-calculation/WCBillingSlab.json b/data/as/1937917/ws-services-calculation/WCBillingSlab.json
index 1bc46b8a90..93cc92adab 100644
--- a/data/as/1937917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937917/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937928/ws-services-calculation/WCBillingSlab.json b/data/as/1937928/ws-services-calculation/WCBillingSlab.json
index 626400869b..8e3eaa714b 100644
--- a/data/as/1937928/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937928/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937948/ws-services-calculation/WCBillingSlab.json b/data/as/1937948/ws-services-calculation/WCBillingSlab.json
index cc543e02bb..34c0abc8d6 100644
--- a/data/as/1937948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937948/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1937960/ws-services-calculation/WCBillingSlab.json b/data/as/1937960/ws-services-calculation/WCBillingSlab.json
index 7f8629e918..dc2e6ca1eb 100644
--- a/data/as/1937960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1937960/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941516/ws-services-calculation/WCBillingSlab.json b/data/as/1941516/ws-services-calculation/WCBillingSlab.json
index 555bec7959..3d69223c4b 100644
--- a/data/as/1941516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941516/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941535/ws-services-calculation/WCBillingSlab.json b/data/as/1941535/ws-services-calculation/WCBillingSlab.json
index 6830f39f52..c788b987d2 100644
--- a/data/as/1941535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941750/ws-services-calculation/WCBillingSlab.json b/data/as/1941750/ws-services-calculation/WCBillingSlab.json
index fe27063921..084269ef27 100644
--- a/data/as/1941750/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941750/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941769/ws-services-calculation/WCBillingSlab.json b/data/as/1941769/ws-services-calculation/WCBillingSlab.json
index 8ed6c8c608..af3e1bc53f 100644
--- a/data/as/1941769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941769/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941788/ws-services-calculation/WCBillingSlab.json b/data/as/1941788/ws-services-calculation/WCBillingSlab.json
index 4713dffcf9..d43c3fd3d6 100644
--- a/data/as/1941788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941788/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1941850/ws-services-calculation/WCBillingSlab.json b/data/as/1941850/ws-services-calculation/WCBillingSlab.json
index 16bbafd23d..9f42fe5dd8 100644
--- a/data/as/1941850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1941850/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/1970469/ws-services-calculation/WCBillingSlab.json b/data/as/1970469/ws-services-calculation/WCBillingSlab.json
index c8b9e92d0c..8878940116 100644
--- a/data/as/1970469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/1970469/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2404395/ws-services-calculation/WCBillingSlab.json b/data/as/2404395/ws-services-calculation/WCBillingSlab.json
index 3b452b5c62..2f182c52e1 100644
--- a/data/as/2404395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2404395/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2404401/ws-services-calculation/WCBillingSlab.json b/data/as/2404401/ws-services-calculation/WCBillingSlab.json
index 3534322daf..e51e90d4dd 100644
--- a/data/as/2404401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2404401/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2404437/ws-services-calculation/WCBillingSlab.json b/data/as/2404437/ws-services-calculation/WCBillingSlab.json
index d3523f0237..afa9854f24 100644
--- a/data/as/2404437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2404437/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2405228/ws-services-calculation/WCBillingSlab.json b/data/as/2405228/ws-services-calculation/WCBillingSlab.json
index 5756a73cca..35419d5db0 100644
--- a/data/as/2405228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2405228/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2406004/ws-services-calculation/WCBillingSlab.json b/data/as/2406004/ws-services-calculation/WCBillingSlab.json
index 87349c4a29..2314a142c6 100644
--- a/data/as/2406004/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2406004/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421895/ws-services-calculation/WCBillingSlab.json b/data/as/2421895/ws-services-calculation/WCBillingSlab.json
index 69cef68dbd..2c5a9c78e9 100644
--- a/data/as/2421895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421895/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421903/ws-services-calculation/WCBillingSlab.json b/data/as/2421903/ws-services-calculation/WCBillingSlab.json
index bbc545c3d8..ead6960ddb 100644
--- a/data/as/2421903/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421903/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421911/ws-services-calculation/WCBillingSlab.json b/data/as/2421911/ws-services-calculation/WCBillingSlab.json
index b435639854..a53520be14 100644
--- a/data/as/2421911/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421911/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2421922/ws-services-calculation/WCBillingSlab.json b/data/as/2421922/ws-services-calculation/WCBillingSlab.json
index 9388e9187c..eb4528f3f3 100644
--- a/data/as/2421922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2421922/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2423434/ws-services-calculation/WCBillingSlab.json b/data/as/2423434/ws-services-calculation/WCBillingSlab.json
index 22fe74e59b..c457b805ff 100644
--- a/data/as/2423434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2423434/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2426035/ws-services-calculation/WCBillingSlab.json b/data/as/2426035/ws-services-calculation/WCBillingSlab.json
index 8117bca70a..e9b50b580d 100644
--- a/data/as/2426035/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2426035/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2429111/ws-services-calculation/WCBillingSlab.json b/data/as/2429111/ws-services-calculation/WCBillingSlab.json
index 76af6fc02c..e84bc16eff 100644
--- a/data/as/2429111/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2429111/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2433896/ws-services-calculation/WCBillingSlab.json b/data/as/2433896/ws-services-calculation/WCBillingSlab.json
index 0071ce36a1..7cc5a5d710 100644
--- a/data/as/2433896/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2433896/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2443383/ws-services-calculation/WCBillingSlab.json b/data/as/2443383/ws-services-calculation/WCBillingSlab.json
index edb34e8671..5abb5e7239 100644
--- a/data/as/2443383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2443383/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2480357/ws-services-calculation/WCBillingSlab.json b/data/as/2480357/ws-services-calculation/WCBillingSlab.json
index 4e8d11feff..057ca00171 100644
--- a/data/as/2480357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2480357/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2480363/ws-services-calculation/WCBillingSlab.json b/data/as/2480363/ws-services-calculation/WCBillingSlab.json
index ea638262a0..05b3a8bba6 100644
--- a/data/as/2480363/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2480363/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2484676/ws-services-calculation/WCBillingSlab.json b/data/as/2484676/ws-services-calculation/WCBillingSlab.json
index d63278dc61..574cfd1a94 100644
--- a/data/as/2484676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2484676/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2484678/ws-services-calculation/WCBillingSlab.json b/data/as/2484678/ws-services-calculation/WCBillingSlab.json
index 491fb0ea44..c26e1d1e74 100644
--- a/data/as/2484678/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2484678/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2486691/ws-services-calculation/WCBillingSlab.json b/data/as/2486691/ws-services-calculation/WCBillingSlab.json
index e49fffc435..5a793c36e6 100644
--- a/data/as/2486691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2486691/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2491893/ws-services-calculation/WCBillingSlab.json b/data/as/2491893/ws-services-calculation/WCBillingSlab.json
index cbffb55b95..a4a671fc1e 100644
--- a/data/as/2491893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2491893/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2495922/ws-services-calculation/WCBillingSlab.json b/data/as/2495922/ws-services-calculation/WCBillingSlab.json
index 96d1aa2d13..2b6251ea23 100644
--- a/data/as/2495922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2495922/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2496124/ws-services-calculation/WCBillingSlab.json b/data/as/2496124/ws-services-calculation/WCBillingSlab.json
index 4944adb61c..fb1e73ea3a 100644
--- a/data/as/2496124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2496124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2496136/ws-services-calculation/WCBillingSlab.json b/data/as/2496136/ws-services-calculation/WCBillingSlab.json
index b7efe608a1..b270f92f23 100644
--- a/data/as/2496136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2496136/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2497758/ws-services-calculation/WCBillingSlab.json b/data/as/2497758/ws-services-calculation/WCBillingSlab.json
index 46bae0cefe..d70dcc0262 100644
--- a/data/as/2497758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2497758/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2515923/ws-services-calculation/WCBillingSlab.json b/data/as/2515923/ws-services-calculation/WCBillingSlab.json
index 6ddcba46c8..428bc62465 100644
--- a/data/as/2515923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2515923/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2515942/ws-services-calculation/WCBillingSlab.json b/data/as/2515942/ws-services-calculation/WCBillingSlab.json
index 23fe406c82..0f726b390e 100644
--- a/data/as/2515942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2515942/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2515998/ws-services-calculation/WCBillingSlab.json b/data/as/2515998/ws-services-calculation/WCBillingSlab.json
index 76177c03ca..100bb44b78 100644
--- a/data/as/2515998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2515998/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516005/ws-services-calculation/WCBillingSlab.json b/data/as/2516005/ws-services-calculation/WCBillingSlab.json
index a85a3c900e..cc32bdd7a0 100644
--- a/data/as/2516005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516005/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516013/ws-services-calculation/WCBillingSlab.json b/data/as/2516013/ws-services-calculation/WCBillingSlab.json
index 4eba1aa10c..e661dece55 100644
--- a/data/as/2516013/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516013/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516019/ws-services-calculation/WCBillingSlab.json b/data/as/2516019/ws-services-calculation/WCBillingSlab.json
index 0711088ee7..59e5b48976 100644
--- a/data/as/2516019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516019/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516135/ws-services-calculation/WCBillingSlab.json b/data/as/2516135/ws-services-calculation/WCBillingSlab.json
index 9cc3735e50..3be414939b 100644
--- a/data/as/2516135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516135/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516159/ws-services-calculation/WCBillingSlab.json b/data/as/2516159/ws-services-calculation/WCBillingSlab.json
index 0ab735a03b..7631858c0d 100644
--- a/data/as/2516159/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516159/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516189/ws-services-calculation/WCBillingSlab.json b/data/as/2516189/ws-services-calculation/WCBillingSlab.json
index a585ca8e74..66d2b7e44a 100644
--- a/data/as/2516189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516189/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516326/ws-services-calculation/WCBillingSlab.json b/data/as/2516326/ws-services-calculation/WCBillingSlab.json
index 047fc487d5..84437df5ed 100644
--- a/data/as/2516326/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516326/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516787/ws-services-calculation/WCBillingSlab.json b/data/as/2516787/ws-services-calculation/WCBillingSlab.json
index e59d257a98..a2eff4865c 100644
--- a/data/as/2516787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516787/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516881/ws-services-calculation/WCBillingSlab.json b/data/as/2516881/ws-services-calculation/WCBillingSlab.json
index aff5e1d0f6..af4c67b0a0 100644
--- a/data/as/2516881/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516881/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2516940/ws-services-calculation/WCBillingSlab.json b/data/as/2516940/ws-services-calculation/WCBillingSlab.json
index 219d2433de..bbcbdc7be5 100644
--- a/data/as/2516940/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2516940/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517189/ws-services-calculation/WCBillingSlab.json b/data/as/2517189/ws-services-calculation/WCBillingSlab.json
index 0e83fbf72a..2de92657fd 100644
--- a/data/as/2517189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517189/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517201/ws-services-calculation/WCBillingSlab.json b/data/as/2517201/ws-services-calculation/WCBillingSlab.json
index 725a4acdfb..aac07bb015 100644
--- a/data/as/2517201/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517201/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517213/ws-services-calculation/WCBillingSlab.json b/data/as/2517213/ws-services-calculation/WCBillingSlab.json
index 2f7b536af4..4ae6a51329 100644
--- a/data/as/2517213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517213/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517242/ws-services-calculation/WCBillingSlab.json b/data/as/2517242/ws-services-calculation/WCBillingSlab.json
index f0453847a4..d31bba5679 100644
--- a/data/as/2517242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517242/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517248/ws-services-calculation/WCBillingSlab.json b/data/as/2517248/ws-services-calculation/WCBillingSlab.json
index 90b9b60b47..cc11eb3984 100644
--- a/data/as/2517248/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517248/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2517256/ws-services-calculation/WCBillingSlab.json b/data/as/2517256/ws-services-calculation/WCBillingSlab.json
index 6ce94bbf71..9df3bd5eaf 100644
--- a/data/as/2517256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2517256/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2520036/ws-services-calculation/WCBillingSlab.json b/data/as/2520036/ws-services-calculation/WCBillingSlab.json
index ee5a0a971b..fa2b96ff75 100644
--- a/data/as/2520036/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2520036/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2520181/ws-services-calculation/WCBillingSlab.json b/data/as/2520181/ws-services-calculation/WCBillingSlab.json
index 7a408648b6..15957065ce 100644
--- a/data/as/2520181/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2520181/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2581909/ws-services-calculation/WCBillingSlab.json b/data/as/2581909/ws-services-calculation/WCBillingSlab.json
index 3fab30d894..15ff0be3e4 100644
--- a/data/as/2581909/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2581909/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2582386/ws-services-calculation/WCBillingSlab.json b/data/as/2582386/ws-services-calculation/WCBillingSlab.json
index e9b0ce9968..99dc3d3193 100644
--- a/data/as/2582386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2582386/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2582460/ws-services-calculation/WCBillingSlab.json b/data/as/2582460/ws-services-calculation/WCBillingSlab.json
index a898d3390a..42438719e2 100644
--- a/data/as/2582460/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2582460/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/2615100/ws-services-calculation/WCBillingSlab.json b/data/as/2615100/ws-services-calculation/WCBillingSlab.json
index d40e2700bf..e21385d8f3 100644
--- a/data/as/2615100/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/2615100/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3164535/ws-services-calculation/WCBillingSlab.json b/data/as/3164535/ws-services-calculation/WCBillingSlab.json
index 59024df306..a1d28ddb79 100644
--- a/data/as/3164535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3164535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3319750/ws-services-calculation/WCBillingSlab.json b/data/as/3319750/ws-services-calculation/WCBillingSlab.json
index 41b1840f9a..1641de4d21 100644
--- a/data/as/3319750/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3319750/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3321276/ws-services-calculation/WCBillingSlab.json b/data/as/3321276/ws-services-calculation/WCBillingSlab.json
index 1fbc85e394..d496d6419b 100644
--- a/data/as/3321276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3321276/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3321879/ws-services-calculation/WCBillingSlab.json b/data/as/3321879/ws-services-calculation/WCBillingSlab.json
index 5f51a17d14..d09dda037f 100644
--- a/data/as/3321879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3321879/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3327425/ws-services-calculation/WCBillingSlab.json b/data/as/3327425/ws-services-calculation/WCBillingSlab.json
index 7d668f6a5e..1250caa236 100644
--- a/data/as/3327425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3327425/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328455/ws-services-calculation/WCBillingSlab.json b/data/as/3328455/ws-services-calculation/WCBillingSlab.json
index 9481bf45c7..04a86f9985 100644
--- a/data/as/3328455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328455/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328647/ws-services-calculation/WCBillingSlab.json b/data/as/3328647/ws-services-calculation/WCBillingSlab.json
index 7fb13e44a9..e50a4cbc2b 100644
--- a/data/as/3328647/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328647/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328767/ws-services-calculation/WCBillingSlab.json b/data/as/3328767/ws-services-calculation/WCBillingSlab.json
index 7e03162026..c351512a37 100644
--- a/data/as/3328767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328767/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3328873/ws-services-calculation/WCBillingSlab.json b/data/as/3328873/ws-services-calculation/WCBillingSlab.json
index d2e14c006c..d23ffb366d 100644
--- a/data/as/3328873/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3328873/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3333586/ws-services-calculation/WCBillingSlab.json b/data/as/3333586/ws-services-calculation/WCBillingSlab.json
index 548d8e670c..095c64f783 100644
--- a/data/as/3333586/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3333586/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3359758/ws-services-calculation/WCBillingSlab.json b/data/as/3359758/ws-services-calculation/WCBillingSlab.json
index affe85a3db..106da2dacf 100644
--- a/data/as/3359758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3359758/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3370880/ws-services-calculation/WCBillingSlab.json b/data/as/3370880/ws-services-calculation/WCBillingSlab.json
index 1aaabe77e8..77047ee77e 100644
--- a/data/as/3370880/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3370880/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3372158/ws-services-calculation/WCBillingSlab.json b/data/as/3372158/ws-services-calculation/WCBillingSlab.json
index 4d6a645036..f57633395a 100644
--- a/data/as/3372158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3372158/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3373443/ws-services-calculation/WCBillingSlab.json b/data/as/3373443/ws-services-calculation/WCBillingSlab.json
index bfd3023685..bda1681568 100644
--- a/data/as/3373443/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3373443/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3374529/ws-services-calculation/WCBillingSlab.json b/data/as/3374529/ws-services-calculation/WCBillingSlab.json
index c86716a449..8c73e0e2bc 100644
--- a/data/as/3374529/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3374529/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3375170/ws-services-calculation/WCBillingSlab.json b/data/as/3375170/ws-services-calculation/WCBillingSlab.json
index 20f54974a3..233b27d6f1 100644
--- a/data/as/3375170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3375170/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3375765/ws-services-calculation/WCBillingSlab.json b/data/as/3375765/ws-services-calculation/WCBillingSlab.json
index 8b9950d415..051fe6a5b1 100644
--- a/data/as/3375765/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3375765/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3378587/ws-services-calculation/WCBillingSlab.json b/data/as/3378587/ws-services-calculation/WCBillingSlab.json
index 57eb587981..5aa70250e1 100644
--- a/data/as/3378587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3378587/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3384885/ws-services-calculation/WCBillingSlab.json b/data/as/3384885/ws-services-calculation/WCBillingSlab.json
index ced805dbcb..0e9c60c005 100644
--- a/data/as/3384885/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3384885/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3384921/ws-services-calculation/WCBillingSlab.json b/data/as/3384921/ws-services-calculation/WCBillingSlab.json
index 54c9164ccf..086919cd5e 100644
--- a/data/as/3384921/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3384921/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3385844/ws-services-calculation/WCBillingSlab.json b/data/as/3385844/ws-services-calculation/WCBillingSlab.json
index eeabf5751a..98db3117f3 100644
--- a/data/as/3385844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3385844/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3385946/ws-services-calculation/WCBillingSlab.json b/data/as/3385946/ws-services-calculation/WCBillingSlab.json
index c47ce0d2cd..eaafa85320 100644
--- a/data/as/3385946/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3385946/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3385982/ws-services-calculation/WCBillingSlab.json b/data/as/3385982/ws-services-calculation/WCBillingSlab.json
index da53afcf19..df9dab7403 100644
--- a/data/as/3385982/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3385982/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386123/ws-services-calculation/WCBillingSlab.json b/data/as/3386123/ws-services-calculation/WCBillingSlab.json
index ebc17ae498..473b99b512 100644
--- a/data/as/3386123/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386123/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386146/ws-services-calculation/WCBillingSlab.json b/data/as/3386146/ws-services-calculation/WCBillingSlab.json
index 28da8f55b2..68ee516f83 100644
--- a/data/as/3386146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386146/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386204/ws-services-calculation/WCBillingSlab.json b/data/as/3386204/ws-services-calculation/WCBillingSlab.json
index 9c8d165804..22465e1492 100644
--- a/data/as/3386204/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386204/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386236/ws-services-calculation/WCBillingSlab.json b/data/as/3386236/ws-services-calculation/WCBillingSlab.json
index 4e63e0eb9d..3448407cf6 100644
--- a/data/as/3386236/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386236/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386289/ws-services-calculation/WCBillingSlab.json b/data/as/3386289/ws-services-calculation/WCBillingSlab.json
index 9ee9375749..69ac2639ad 100644
--- a/data/as/3386289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386289/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386322/ws-services-calculation/WCBillingSlab.json b/data/as/3386322/ws-services-calculation/WCBillingSlab.json
index f3bbb767de..d6f5d09b55 100644
--- a/data/as/3386322/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386322/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386356/ws-services-calculation/WCBillingSlab.json b/data/as/3386356/ws-services-calculation/WCBillingSlab.json
index c2d6404d5a..70b91e33e9 100644
--- a/data/as/3386356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386356/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386386/ws-services-calculation/WCBillingSlab.json b/data/as/3386386/ws-services-calculation/WCBillingSlab.json
index e998c3c19f..f9161bb025 100644
--- a/data/as/3386386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386386/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386407/ws-services-calculation/WCBillingSlab.json b/data/as/3386407/ws-services-calculation/WCBillingSlab.json
index 8c0901fa51..fcb1685469 100644
--- a/data/as/3386407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386407/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386435/ws-services-calculation/WCBillingSlab.json b/data/as/3386435/ws-services-calculation/WCBillingSlab.json
index d9a84c5aff..20671ffb89 100644
--- a/data/as/3386435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386435/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386445/ws-services-calculation/WCBillingSlab.json b/data/as/3386445/ws-services-calculation/WCBillingSlab.json
index 6ed82cf772..b26cffb20d 100644
--- a/data/as/3386445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386445/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386466/ws-services-calculation/WCBillingSlab.json b/data/as/3386466/ws-services-calculation/WCBillingSlab.json
index a7f80ae63b..af7ba3c897 100644
--- a/data/as/3386466/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386466/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386515/ws-services-calculation/WCBillingSlab.json b/data/as/3386515/ws-services-calculation/WCBillingSlab.json
index d96160d229..8a596349d3 100644
--- a/data/as/3386515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386515/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386526/ws-services-calculation/WCBillingSlab.json b/data/as/3386526/ws-services-calculation/WCBillingSlab.json
index 2dd2fda703..64177b6778 100644
--- a/data/as/3386526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386526/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386540/ws-services-calculation/WCBillingSlab.json b/data/as/3386540/ws-services-calculation/WCBillingSlab.json
index 4b30835aa1..69fb86419d 100644
--- a/data/as/3386540/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386540/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386544/ws-services-calculation/WCBillingSlab.json b/data/as/3386544/ws-services-calculation/WCBillingSlab.json
index 4828edc9ad..4b4eb6525b 100644
--- a/data/as/3386544/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386544/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386664/ws-services-calculation/WCBillingSlab.json b/data/as/3386664/ws-services-calculation/WCBillingSlab.json
index 0c071b9794..6cc4df296f 100644
--- a/data/as/3386664/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386664/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3386695/ws-services-calculation/WCBillingSlab.json b/data/as/3386695/ws-services-calculation/WCBillingSlab.json
index e7a428f003..d51a3b922c 100644
--- a/data/as/3386695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3386695/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/3800160/ws-services-calculation/WCBillingSlab.json b/data/as/3800160/ws-services-calculation/WCBillingSlab.json
index 369a7d1cf8..f2d0a54713 100644
--- a/data/as/3800160/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/3800160/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4516012/ws-services-calculation/WCBillingSlab.json b/data/as/4516012/ws-services-calculation/WCBillingSlab.json
index c4c778eb7d..cb0e20efde 100644
--- a/data/as/4516012/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4516012/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4516046/ws-services-calculation/WCBillingSlab.json b/data/as/4516046/ws-services-calculation/WCBillingSlab.json
index 914ca45e18..79c6376ba3 100644
--- a/data/as/4516046/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4516046/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4516419/ws-services-calculation/WCBillingSlab.json b/data/as/4516419/ws-services-calculation/WCBillingSlab.json
index f5d7d711ee..6f77da21ab 100644
--- a/data/as/4516419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4516419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/452628/ws-services-calculation/WCBillingSlab.json b/data/as/452628/ws-services-calculation/WCBillingSlab.json
index 01efe20212..deb61d2845 100644
--- a/data/as/452628/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/452628/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/452685/ws-services-calculation/WCBillingSlab.json b/data/as/452685/ws-services-calculation/WCBillingSlab.json
index 206080de35..9aaa0edb30 100644
--- a/data/as/452685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/452685/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/452697/ws-services-calculation/WCBillingSlab.json b/data/as/452697/ws-services-calculation/WCBillingSlab.json
index 7ddf4613b9..e866634113 100644
--- a/data/as/452697/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/452697/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/453185/ws-services-calculation/WCBillingSlab.json b/data/as/453185/ws-services-calculation/WCBillingSlab.json
index 595bd5e9a5..6460f33e7b 100644
--- a/data/as/453185/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/453185/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/454276/ws-services-calculation/WCBillingSlab.json b/data/as/454276/ws-services-calculation/WCBillingSlab.json
index 1f48d53485..d625f1bebc 100644
--- a/data/as/454276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/454276/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455214/ws-services-calculation/WCBillingSlab.json b/data/as/455214/ws-services-calculation/WCBillingSlab.json
index 3262cc0bb4..bc57a0f240 100644
--- a/data/as/455214/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455214/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455219/ws-services-calculation/WCBillingSlab.json b/data/as/455219/ws-services-calculation/WCBillingSlab.json
index 430416d827..cbaf69a791 100644
--- a/data/as/455219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455219/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455220/ws-services-calculation/WCBillingSlab.json b/data/as/455220/ws-services-calculation/WCBillingSlab.json
index dcfd3d3e72..4ae78d1080 100644
--- a/data/as/455220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455220/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/455374/ws-services-calculation/WCBillingSlab.json b/data/as/455374/ws-services-calculation/WCBillingSlab.json
index 2061e04d30..8a1faca18e 100644
--- a/data/as/455374/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/455374/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4566832/ws-services-calculation/WCBillingSlab.json b/data/as/4566832/ws-services-calculation/WCBillingSlab.json
index 94814a5260..fac6a2a0e7 100644
--- a/data/as/4566832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4566832/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567143/ws-services-calculation/WCBillingSlab.json b/data/as/4567143/ws-services-calculation/WCBillingSlab.json
index 9318e3673c..e680859aca 100644
--- a/data/as/4567143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567143/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567157/ws-services-calculation/WCBillingSlab.json b/data/as/4567157/ws-services-calculation/WCBillingSlab.json
index e982b35bc2..9fb2b9be24 100644
--- a/data/as/4567157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567157/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567167/ws-services-calculation/WCBillingSlab.json b/data/as/4567167/ws-services-calculation/WCBillingSlab.json
index 0dfc71e0fb..86c700092d 100644
--- a/data/as/4567167/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567167/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567203/ws-services-calculation/WCBillingSlab.json b/data/as/4567203/ws-services-calculation/WCBillingSlab.json
index bbc4ff5f25..a8c3fc8aaa 100644
--- a/data/as/4567203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567253/ws-services-calculation/WCBillingSlab.json b/data/as/4567253/ws-services-calculation/WCBillingSlab.json
index c43634cab7..c683e40f99 100644
--- a/data/as/4567253/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567253/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567258/ws-services-calculation/WCBillingSlab.json b/data/as/4567258/ws-services-calculation/WCBillingSlab.json
index 2c165ea849..f9d4ac0313 100644
--- a/data/as/4567258/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567258/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567264/ws-services-calculation/WCBillingSlab.json b/data/as/4567264/ws-services-calculation/WCBillingSlab.json
index 2f52d6bd42..9e0a0a18f5 100644
--- a/data/as/4567264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567264/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4567271/ws-services-calculation/WCBillingSlab.json b/data/as/4567271/ws-services-calculation/WCBillingSlab.json
index b3b8a4af4b..b17c230d43 100644
--- a/data/as/4567271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4567271/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4627074/ws-services-calculation/WCBillingSlab.json b/data/as/4627074/ws-services-calculation/WCBillingSlab.json
index 88b3517c99..5650a4668b 100644
--- a/data/as/4627074/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4627074/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4627137/ws-services-calculation/WCBillingSlab.json b/data/as/4627137/ws-services-calculation/WCBillingSlab.json
index 58bcba2f1f..90b7491046 100644
--- a/data/as/4627137/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4627137/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637354/ws-services-calculation/WCBillingSlab.json b/data/as/4637354/ws-services-calculation/WCBillingSlab.json
index 974555b3ba..3b34402e8f 100644
--- a/data/as/4637354/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637354/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637711/ws-services-calculation/WCBillingSlab.json b/data/as/4637711/ws-services-calculation/WCBillingSlab.json
index e1e1c1d2ec..cda4d0dbc8 100644
--- a/data/as/4637711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637711/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637724/ws-services-calculation/WCBillingSlab.json b/data/as/4637724/ws-services-calculation/WCBillingSlab.json
index fb838c943a..3facedc72f 100644
--- a/data/as/4637724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4637728/ws-services-calculation/WCBillingSlab.json b/data/as/4637728/ws-services-calculation/WCBillingSlab.json
index fc6035d243..ef0ca66e68 100644
--- a/data/as/4637728/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4637728/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4638859/ws-services-calculation/WCBillingSlab.json b/data/as/4638859/ws-services-calculation/WCBillingSlab.json
index 46c78c2a78..b474d458eb 100644
--- a/data/as/4638859/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4638859/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639802/ws-services-calculation/WCBillingSlab.json b/data/as/4639802/ws-services-calculation/WCBillingSlab.json
index f87555111b..c92771aa0d 100644
--- a/data/as/4639802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639802/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639900/ws-services-calculation/WCBillingSlab.json b/data/as/4639900/ws-services-calculation/WCBillingSlab.json
index b8dbe807d7..4825f38407 100644
--- a/data/as/4639900/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639900/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639926/ws-services-calculation/WCBillingSlab.json b/data/as/4639926/ws-services-calculation/WCBillingSlab.json
index ec2c0c2949..59d64bbedd 100644
--- a/data/as/4639926/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639926/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4639994/ws-services-calculation/WCBillingSlab.json b/data/as/4639994/ws-services-calculation/WCBillingSlab.json
index d9ea6fb6a4..9731520c08 100644
--- a/data/as/4639994/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4639994/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4640433/ws-services-calculation/WCBillingSlab.json b/data/as/4640433/ws-services-calculation/WCBillingSlab.json
index 2c342c5833..e076954a07 100644
--- a/data/as/4640433/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4640433/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4640480/ws-services-calculation/WCBillingSlab.json b/data/as/4640480/ws-services-calculation/WCBillingSlab.json
index 26bf309f5f..1c1db09bc6 100644
--- a/data/as/4640480/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4640480/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4642317/ws-services-calculation/WCBillingSlab.json b/data/as/4642317/ws-services-calculation/WCBillingSlab.json
index e3304aff4a..5c163a21b6 100644
--- a/data/as/4642317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4642317/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4642337/ws-services-calculation/WCBillingSlab.json b/data/as/4642337/ws-services-calculation/WCBillingSlab.json
index 4cb6fe4f84..308d436193 100644
--- a/data/as/4642337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4642337/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4651600/ws-services-calculation/WCBillingSlab.json b/data/as/4651600/ws-services-calculation/WCBillingSlab.json
index 1b8b097ba2..9c5a2f3f12 100644
--- a/data/as/4651600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4651600/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4652293/ws-services-calculation/WCBillingSlab.json b/data/as/4652293/ws-services-calculation/WCBillingSlab.json
index e85e4289e9..975a7a4af9 100644
--- a/data/as/4652293/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4652293/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4653590/ws-services-calculation/WCBillingSlab.json b/data/as/4653590/ws-services-calculation/WCBillingSlab.json
index 8bf6632fe8..bfafc899d7 100644
--- a/data/as/4653590/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4653590/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4654670/ws-services-calculation/WCBillingSlab.json b/data/as/4654670/ws-services-calculation/WCBillingSlab.json
index e317a8f440..162613bc7d 100644
--- a/data/as/4654670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4654670/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4655460/ws-services-calculation/WCBillingSlab.json b/data/as/4655460/ws-services-calculation/WCBillingSlab.json
index 2eb50c1655..cd8f6768fb 100644
--- a/data/as/4655460/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4655460/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4655542/ws-services-calculation/WCBillingSlab.json b/data/as/4655542/ws-services-calculation/WCBillingSlab.json
index d0a70f62d5..a9d4a95020 100644
--- a/data/as/4655542/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4655542/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4655617/ws-services-calculation/WCBillingSlab.json b/data/as/4655617/ws-services-calculation/WCBillingSlab.json
index 29acdef764..3c406e0500 100644
--- a/data/as/4655617/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4655617/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4656070/ws-services-calculation/WCBillingSlab.json b/data/as/4656070/ws-services-calculation/WCBillingSlab.json
index cd9dbfca78..b5d9c14da8 100644
--- a/data/as/4656070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4656070/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4656202/ws-services-calculation/WCBillingSlab.json b/data/as/4656202/ws-services-calculation/WCBillingSlab.json
index cd6ad4b89b..e71368bd05 100644
--- a/data/as/4656202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4656202/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4656990/ws-services-calculation/WCBillingSlab.json b/data/as/4656990/ws-services-calculation/WCBillingSlab.json
index aa114c2cae..f4c85b7888 100644
--- a/data/as/4656990/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4656990/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657126/ws-services-calculation/WCBillingSlab.json b/data/as/4657126/ws-services-calculation/WCBillingSlab.json
index b2d2abe01f..fce5ca5bdc 100644
--- a/data/as/4657126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657126/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657150/ws-services-calculation/WCBillingSlab.json b/data/as/4657150/ws-services-calculation/WCBillingSlab.json
index 5838f8c84c..d19600c7a0 100644
--- a/data/as/4657150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657150/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657189/ws-services-calculation/WCBillingSlab.json b/data/as/4657189/ws-services-calculation/WCBillingSlab.json
index a70188a8e9..44a9f94de0 100644
--- a/data/as/4657189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657189/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657198/ws-services-calculation/WCBillingSlab.json b/data/as/4657198/ws-services-calculation/WCBillingSlab.json
index da33aa5cc1..244af4cf50 100644
--- a/data/as/4657198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657198/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4657250/ws-services-calculation/WCBillingSlab.json b/data/as/4657250/ws-services-calculation/WCBillingSlab.json
index 4fbb482d4e..f4b641ab64 100644
--- a/data/as/4657250/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4657250/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4658923/ws-services-calculation/WCBillingSlab.json b/data/as/4658923/ws-services-calculation/WCBillingSlab.json
index e1d6680c4e..83b8a0ebeb 100644
--- a/data/as/4658923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4658923/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4658962/ws-services-calculation/WCBillingSlab.json b/data/as/4658962/ws-services-calculation/WCBillingSlab.json
index af91f601e3..8d3ba1c1e8 100644
--- a/data/as/4658962/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4658962/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4659024/ws-services-calculation/WCBillingSlab.json b/data/as/4659024/ws-services-calculation/WCBillingSlab.json
index c44318188b..61cb19a41a 100644
--- a/data/as/4659024/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4659024/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4659210/ws-services-calculation/WCBillingSlab.json b/data/as/4659210/ws-services-calculation/WCBillingSlab.json
index f9cee57f70..cc4b17b5f8 100644
--- a/data/as/4659210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4659210/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4668398/ws-services-calculation/WCBillingSlab.json b/data/as/4668398/ws-services-calculation/WCBillingSlab.json
index 284ed7c807..03b873ce47 100644
--- a/data/as/4668398/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4668398/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4869442/ws-services-calculation/WCBillingSlab.json b/data/as/4869442/ws-services-calculation/WCBillingSlab.json
index befbdca0f6..cf988d7184 100644
--- a/data/as/4869442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4869442/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870166/ws-services-calculation/WCBillingSlab.json b/data/as/4870166/ws-services-calculation/WCBillingSlab.json
index b7e63bff08..d4dccf91d9 100644
--- a/data/as/4870166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870166/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870229/ws-services-calculation/WCBillingSlab.json b/data/as/4870229/ws-services-calculation/WCBillingSlab.json
index 8e5b158190..39f567b70a 100644
--- a/data/as/4870229/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870229/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870250/ws-services-calculation/WCBillingSlab.json b/data/as/4870250/ws-services-calculation/WCBillingSlab.json
index 05813db4ab..1d71527baf 100644
--- a/data/as/4870250/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870250/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4870307/ws-services-calculation/WCBillingSlab.json b/data/as/4870307/ws-services-calculation/WCBillingSlab.json
index ad99b716fd..93ef09db1e 100644
--- a/data/as/4870307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4870307/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872574/ws-services-calculation/WCBillingSlab.json b/data/as/4872574/ws-services-calculation/WCBillingSlab.json
index 47037cccbd..cc2b0ec7b0 100644
--- a/data/as/4872574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872574/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872595/ws-services-calculation/WCBillingSlab.json b/data/as/4872595/ws-services-calculation/WCBillingSlab.json
index 3e92cf3c81..106d2fab1d 100644
--- a/data/as/4872595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872595/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872646/ws-services-calculation/WCBillingSlab.json b/data/as/4872646/ws-services-calculation/WCBillingSlab.json
index 8eab10d41d..2d610f4429 100644
--- a/data/as/4872646/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872646/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872699/ws-services-calculation/WCBillingSlab.json b/data/as/4872699/ws-services-calculation/WCBillingSlab.json
index 91d4397367..90a0b3490a 100644
--- a/data/as/4872699/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872699/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872806/ws-services-calculation/WCBillingSlab.json b/data/as/4872806/ws-services-calculation/WCBillingSlab.json
index 938f812e40..dba01173d2 100644
--- a/data/as/4872806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872806/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872849/ws-services-calculation/WCBillingSlab.json b/data/as/4872849/ws-services-calculation/WCBillingSlab.json
index a2d2853a67..793e784307 100644
--- a/data/as/4872849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872849/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4872988/ws-services-calculation/WCBillingSlab.json b/data/as/4872988/ws-services-calculation/WCBillingSlab.json
index a497923066..fc40f7bf9d 100644
--- a/data/as/4872988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4872988/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873102/ws-services-calculation/WCBillingSlab.json b/data/as/4873102/ws-services-calculation/WCBillingSlab.json
index 82bce495a7..4ba883a2d6 100644
--- a/data/as/4873102/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873102/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873166/ws-services-calculation/WCBillingSlab.json b/data/as/4873166/ws-services-calculation/WCBillingSlab.json
index abfb185528..000e910c80 100644
--- a/data/as/4873166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873166/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873607/ws-services-calculation/WCBillingSlab.json b/data/as/4873607/ws-services-calculation/WCBillingSlab.json
index 4146663d74..253116f437 100644
--- a/data/as/4873607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873607/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873634/ws-services-calculation/WCBillingSlab.json b/data/as/4873634/ws-services-calculation/WCBillingSlab.json
index d6462e18ed..36ce5888bd 100644
--- a/data/as/4873634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873634/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873695/ws-services-calculation/WCBillingSlab.json b/data/as/4873695/ws-services-calculation/WCBillingSlab.json
index b17402085d..c0b99b84fe 100644
--- a/data/as/4873695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873695/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873715/ws-services-calculation/WCBillingSlab.json b/data/as/4873715/ws-services-calculation/WCBillingSlab.json
index 22258dec44..a69e394ea1 100644
--- a/data/as/4873715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873715/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873739/ws-services-calculation/WCBillingSlab.json b/data/as/4873739/ws-services-calculation/WCBillingSlab.json
index 046e4f01ea..7832885204 100644
--- a/data/as/4873739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873771/ws-services-calculation/WCBillingSlab.json b/data/as/4873771/ws-services-calculation/WCBillingSlab.json
index d51cb188c6..99b29f06ce 100644
--- a/data/as/4873771/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873771/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873867/ws-services-calculation/WCBillingSlab.json b/data/as/4873867/ws-services-calculation/WCBillingSlab.json
index 308fb1ae95..47605d006f 100644
--- a/data/as/4873867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873867/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4873898/ws-services-calculation/WCBillingSlab.json b/data/as/4873898/ws-services-calculation/WCBillingSlab.json
index a14a207c2e..09c77f8633 100644
--- a/data/as/4873898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4873898/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887720/ws-services-calculation/WCBillingSlab.json b/data/as/4887720/ws-services-calculation/WCBillingSlab.json
index 3b116b0a8e..774fd9f8a0 100644
--- a/data/as/4887720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887720/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887740/ws-services-calculation/WCBillingSlab.json b/data/as/4887740/ws-services-calculation/WCBillingSlab.json
index f10d3da73c..c8dbbf7570 100644
--- a/data/as/4887740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887740/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887755/ws-services-calculation/WCBillingSlab.json b/data/as/4887755/ws-services-calculation/WCBillingSlab.json
index a091d222e4..7edc9d0bbc 100644
--- a/data/as/4887755/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887755/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887898/ws-services-calculation/WCBillingSlab.json b/data/as/4887898/ws-services-calculation/WCBillingSlab.json
index 776cca19be..b7a991b446 100644
--- a/data/as/4887898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887898/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4887947/ws-services-calculation/WCBillingSlab.json b/data/as/4887947/ws-services-calculation/WCBillingSlab.json
index e1fc6092bd..79702814ba 100644
--- a/data/as/4887947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4887947/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888080/ws-services-calculation/WCBillingSlab.json b/data/as/4888080/ws-services-calculation/WCBillingSlab.json
index 227005d31e..de7df5c817 100644
--- a/data/as/4888080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888080/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888114/ws-services-calculation/WCBillingSlab.json b/data/as/4888114/ws-services-calculation/WCBillingSlab.json
index bae25e505f..aac40c3e0e 100644
--- a/data/as/4888114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888114/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888263/ws-services-calculation/WCBillingSlab.json b/data/as/4888263/ws-services-calculation/WCBillingSlab.json
index ea57325dc4..f43fd841b1 100644
--- a/data/as/4888263/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888263/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4888294/ws-services-calculation/WCBillingSlab.json b/data/as/4888294/ws-services-calculation/WCBillingSlab.json
index 82f485cb7f..fabeb9bacc 100644
--- a/data/as/4888294/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4888294/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492155/ws-services-calculation/WCBillingSlab.json b/data/as/492155/ws-services-calculation/WCBillingSlab.json
index 9ac7a0220e..f5bb9fe8ce 100644
--- a/data/as/492155/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492155/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492158/ws-services-calculation/WCBillingSlab.json b/data/as/492158/ws-services-calculation/WCBillingSlab.json
index 17a73da5ba..aca83fa6c8 100644
--- a/data/as/492158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492158/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492161/ws-services-calculation/WCBillingSlab.json b/data/as/492161/ws-services-calculation/WCBillingSlab.json
index e27f3eb9df..b45d32c01b 100644
--- a/data/as/492161/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492161/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492165/ws-services-calculation/WCBillingSlab.json b/data/as/492165/ws-services-calculation/WCBillingSlab.json
index 293d45e13b..de768dbfee 100644
--- a/data/as/492165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492165/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492168/ws-services-calculation/WCBillingSlab.json b/data/as/492168/ws-services-calculation/WCBillingSlab.json
index e04a105f87..ecf2484fc4 100644
--- a/data/as/492168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492168/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492177/ws-services-calculation/WCBillingSlab.json b/data/as/492177/ws-services-calculation/WCBillingSlab.json
index 270b61a1db..0bc1373cb7 100644
--- a/data/as/492177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492177/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/492182/ws-services-calculation/WCBillingSlab.json b/data/as/492182/ws-services-calculation/WCBillingSlab.json
index 2cbc2f78d3..ea2e89a5bb 100644
--- a/data/as/492182/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/492182/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/4963515/ws-services-calculation/WCBillingSlab.json b/data/as/4963515/ws-services-calculation/WCBillingSlab.json
index 4eced1821b..9005ce55ba 100644
--- a/data/as/4963515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/4963515/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072706/ws-services-calculation/WCBillingSlab.json b/data/as/5072706/ws-services-calculation/WCBillingSlab.json
index 3cf4ab7afb..4c53b3eed8 100644
--- a/data/as/5072706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072706/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072752/ws-services-calculation/WCBillingSlab.json b/data/as/5072752/ws-services-calculation/WCBillingSlab.json
index cd6aca02e9..f923d62ab9 100644
--- a/data/as/5072752/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072752/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072807/ws-services-calculation/WCBillingSlab.json b/data/as/5072807/ws-services-calculation/WCBillingSlab.json
index f83b577b0b..495b81d158 100644
--- a/data/as/5072807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072807/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072821/ws-services-calculation/WCBillingSlab.json b/data/as/5072821/ws-services-calculation/WCBillingSlab.json
index ca495bb937..d835938f43 100644
--- a/data/as/5072821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072821/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072838/ws-services-calculation/WCBillingSlab.json b/data/as/5072838/ws-services-calculation/WCBillingSlab.json
index b077cc4c7f..57168c2349 100644
--- a/data/as/5072838/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072838/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5072844/ws-services-calculation/WCBillingSlab.json b/data/as/5072844/ws-services-calculation/WCBillingSlab.json
index 6858b6a325..baa0228c0a 100644
--- a/data/as/5072844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5072844/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073321/ws-services-calculation/WCBillingSlab.json b/data/as/5073321/ws-services-calculation/WCBillingSlab.json
index 3fab316551..f4747a8d90 100644
--- a/data/as/5073321/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073321/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073330/ws-services-calculation/WCBillingSlab.json b/data/as/5073330/ws-services-calculation/WCBillingSlab.json
index 159d0c6211..a64be5c3f4 100644
--- a/data/as/5073330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073330/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073372/ws-services-calculation/WCBillingSlab.json b/data/as/5073372/ws-services-calculation/WCBillingSlab.json
index e678172d48..a757ac1ebf 100644
--- a/data/as/5073372/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073372/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073861/ws-services-calculation/WCBillingSlab.json b/data/as/5073861/ws-services-calculation/WCBillingSlab.json
index 98357863d2..8072fa0ceb 100644
--- a/data/as/5073861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073861/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073879/ws-services-calculation/WCBillingSlab.json b/data/as/5073879/ws-services-calculation/WCBillingSlab.json
index 6fe51a694b..767751319f 100644
--- a/data/as/5073879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073879/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5073951/ws-services-calculation/WCBillingSlab.json b/data/as/5073951/ws-services-calculation/WCBillingSlab.json
index b348bdfd7f..bac635f05d 100644
--- a/data/as/5073951/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5073951/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5074126/ws-services-calculation/WCBillingSlab.json b/data/as/5074126/ws-services-calculation/WCBillingSlab.json
index 69c79c13c6..908a50351c 100644
--- a/data/as/5074126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5074126/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5074129/ws-services-calculation/WCBillingSlab.json b/data/as/5074129/ws-services-calculation/WCBillingSlab.json
index cf76da1df8..3760019b3e 100644
--- a/data/as/5074129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5074129/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5074133/ws-services-calculation/WCBillingSlab.json b/data/as/5074133/ws-services-calculation/WCBillingSlab.json
index add1607e6f..ae3159c293 100644
--- a/data/as/5074133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5074133/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/50796/ws-services-calculation/WCBillingSlab.json b/data/as/50796/ws-services-calculation/WCBillingSlab.json
index 16799faf81..4d356da1fa 100644
--- a/data/as/50796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/50796/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5102401/ws-services-calculation/WCBillingSlab.json b/data/as/5102401/ws-services-calculation/WCBillingSlab.json
index a6eda05272..c94b74e862 100644
--- a/data/as/5102401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5102401/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5102996/ws-services-calculation/WCBillingSlab.json b/data/as/5102996/ws-services-calculation/WCBillingSlab.json
index 3083c3597c..6b5cf26b95 100644
--- a/data/as/5102996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5102996/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5103007/ws-services-calculation/WCBillingSlab.json b/data/as/5103007/ws-services-calculation/WCBillingSlab.json
index 4d6ee4a6a0..c9dedab29b 100644
--- a/data/as/5103007/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5103007/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/51526/ws-services-calculation/WCBillingSlab.json b/data/as/51526/ws-services-calculation/WCBillingSlab.json
index f8b1aa1c23..99cceb1152 100644
--- a/data/as/51526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/51526/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/51536/ws-services-calculation/WCBillingSlab.json b/data/as/51536/ws-services-calculation/WCBillingSlab.json
index aab6205429..67476a20b4 100644
--- a/data/as/51536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/51536/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5182812/ws-services-calculation/WCBillingSlab.json b/data/as/5182812/ws-services-calculation/WCBillingSlab.json
index 54ae8648b4..9e787fcd97 100644
--- a/data/as/5182812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5182812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5183548/ws-services-calculation/WCBillingSlab.json b/data/as/5183548/ws-services-calculation/WCBillingSlab.json
index e48de759c6..74dcadd6f0 100644
--- a/data/as/5183548/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5183548/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5183964/ws-services-calculation/WCBillingSlab.json b/data/as/5183964/ws-services-calculation/WCBillingSlab.json
index 443f6b1cf2..5247bcdbb2 100644
--- a/data/as/5183964/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5183964/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5184373/ws-services-calculation/WCBillingSlab.json b/data/as/5184373/ws-services-calculation/WCBillingSlab.json
index 46dce7bf73..689d7ad4f4 100644
--- a/data/as/5184373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5184373/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185351/ws-services-calculation/WCBillingSlab.json b/data/as/5185351/ws-services-calculation/WCBillingSlab.json
index 7e90a82b26..ed6cc04e41 100644
--- a/data/as/5185351/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185351/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185356/ws-services-calculation/WCBillingSlab.json b/data/as/5185356/ws-services-calculation/WCBillingSlab.json
index 101075886a..b9159874d3 100644
--- a/data/as/5185356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185356/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185535/ws-services-calculation/WCBillingSlab.json b/data/as/5185535/ws-services-calculation/WCBillingSlab.json
index 507a92c2ef..10f1dc559a 100644
--- a/data/as/5185535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185541/ws-services-calculation/WCBillingSlab.json b/data/as/5185541/ws-services-calculation/WCBillingSlab.json
index e9965b3506..8196519b6c 100644
--- a/data/as/5185541/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185541/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185549/ws-services-calculation/WCBillingSlab.json b/data/as/5185549/ws-services-calculation/WCBillingSlab.json
index e2339cc0a4..5657006a31 100644
--- a/data/as/5185549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185549/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185556/ws-services-calculation/WCBillingSlab.json b/data/as/5185556/ws-services-calculation/WCBillingSlab.json
index def5201ed1..be6cb29be3 100644
--- a/data/as/5185556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185556/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185570/ws-services-calculation/WCBillingSlab.json b/data/as/5185570/ws-services-calculation/WCBillingSlab.json
index d0475c74c8..fa59d72050 100644
--- a/data/as/5185570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185570/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185575/ws-services-calculation/WCBillingSlab.json b/data/as/5185575/ws-services-calculation/WCBillingSlab.json
index 7e21ee0e7d..b118ac5362 100644
--- a/data/as/5185575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185575/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185587/ws-services-calculation/WCBillingSlab.json b/data/as/5185587/ws-services-calculation/WCBillingSlab.json
index 4a737adf0a..55e38e3869 100644
--- a/data/as/5185587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185587/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185591/ws-services-calculation/WCBillingSlab.json b/data/as/5185591/ws-services-calculation/WCBillingSlab.json
index ca54a5f08a..433f56d77a 100644
--- a/data/as/5185591/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185591/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185615/ws-services-calculation/WCBillingSlab.json b/data/as/5185615/ws-services-calculation/WCBillingSlab.json
index 814ae358d1..dec3367db8 100644
--- a/data/as/5185615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185615/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185635/ws-services-calculation/WCBillingSlab.json b/data/as/5185635/ws-services-calculation/WCBillingSlab.json
index 3467adc150..7ae6ce5e60 100644
--- a/data/as/5185635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185650/ws-services-calculation/WCBillingSlab.json b/data/as/5185650/ws-services-calculation/WCBillingSlab.json
index ca06152e28..4d2c68a077 100644
--- a/data/as/5185650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185650/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185655/ws-services-calculation/WCBillingSlab.json b/data/as/5185655/ws-services-calculation/WCBillingSlab.json
index 04f0c0f51f..e2908b4ddd 100644
--- a/data/as/5185655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185655/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185659/ws-services-calculation/WCBillingSlab.json b/data/as/5185659/ws-services-calculation/WCBillingSlab.json
index 50d772dd27..a857d09d71 100644
--- a/data/as/5185659/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185659/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185665/ws-services-calculation/WCBillingSlab.json b/data/as/5185665/ws-services-calculation/WCBillingSlab.json
index 80439b2065..fdc2594d99 100644
--- a/data/as/5185665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185665/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185685/ws-services-calculation/WCBillingSlab.json b/data/as/5185685/ws-services-calculation/WCBillingSlab.json
index d9cdbc9861..71d8309d3e 100644
--- a/data/as/5185685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185685/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185693/ws-services-calculation/WCBillingSlab.json b/data/as/5185693/ws-services-calculation/WCBillingSlab.json
index 94d6ff8100..aa1b834dce 100644
--- a/data/as/5185693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185693/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185707/ws-services-calculation/WCBillingSlab.json b/data/as/5185707/ws-services-calculation/WCBillingSlab.json
index cab9903386..dfa95c5f8d 100644
--- a/data/as/5185707/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185707/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185717/ws-services-calculation/WCBillingSlab.json b/data/as/5185717/ws-services-calculation/WCBillingSlab.json
index 3e52e83596..dbfd05a416 100644
--- a/data/as/5185717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185717/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5185887/ws-services-calculation/WCBillingSlab.json b/data/as/5185887/ws-services-calculation/WCBillingSlab.json
index b73cdb5003..edf3e924f5 100644
--- a/data/as/5185887/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5185887/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186387/ws-services-calculation/WCBillingSlab.json b/data/as/5186387/ws-services-calculation/WCBillingSlab.json
index ac8d38b6da..ae27275390 100644
--- a/data/as/5186387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186420/ws-services-calculation/WCBillingSlab.json b/data/as/5186420/ws-services-calculation/WCBillingSlab.json
index 41e7a9f407..58a9ab268b 100644
--- a/data/as/5186420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186420/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186446/ws-services-calculation/WCBillingSlab.json b/data/as/5186446/ws-services-calculation/WCBillingSlab.json
index 30191d73f2..1106d6a462 100644
--- a/data/as/5186446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186446/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186457/ws-services-calculation/WCBillingSlab.json b/data/as/5186457/ws-services-calculation/WCBillingSlab.json
index 0b03f30191..857d8736e3 100644
--- a/data/as/5186457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186457/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186463/ws-services-calculation/WCBillingSlab.json b/data/as/5186463/ws-services-calculation/WCBillingSlab.json
index ed2e85ca92..1f5c6e13e1 100644
--- a/data/as/5186463/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186463/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186493/ws-services-calculation/WCBillingSlab.json b/data/as/5186493/ws-services-calculation/WCBillingSlab.json
index dbcb926d6e..b388ed9aea 100644
--- a/data/as/5186493/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186493/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186499/ws-services-calculation/WCBillingSlab.json b/data/as/5186499/ws-services-calculation/WCBillingSlab.json
index 98826af57a..486082b469 100644
--- a/data/as/5186499/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186499/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186506/ws-services-calculation/WCBillingSlab.json b/data/as/5186506/ws-services-calculation/WCBillingSlab.json
index f30ee9496b..7927ec2796 100644
--- a/data/as/5186506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186506/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5186513/ws-services-calculation/WCBillingSlab.json b/data/as/5186513/ws-services-calculation/WCBillingSlab.json
index 0cb4142bdb..102c35ef4c 100644
--- a/data/as/5186513/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5186513/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5206914/ws-services-calculation/WCBillingSlab.json b/data/as/5206914/ws-services-calculation/WCBillingSlab.json
index 0258cd910b..c4f35ad2c7 100644
--- a/data/as/5206914/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5206914/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5230312/ws-services-calculation/WCBillingSlab.json b/data/as/5230312/ws-services-calculation/WCBillingSlab.json
index 422462699d..365044be30 100644
--- a/data/as/5230312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5230312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5230346/ws-services-calculation/WCBillingSlab.json b/data/as/5230346/ws-services-calculation/WCBillingSlab.json
index 1dae4a7756..ef2a43851c 100644
--- a/data/as/5230346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5230346/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5230398/ws-services-calculation/WCBillingSlab.json b/data/as/5230398/ws-services-calculation/WCBillingSlab.json
index 5e8df6dc59..d3ae4a969a 100644
--- a/data/as/5230398/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5230398/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/52793/ws-services-calculation/WCBillingSlab.json b/data/as/52793/ws-services-calculation/WCBillingSlab.json
index 941b1d6da2..e02bb5a990 100644
--- a/data/as/52793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/52793/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5344027/ws-services-calculation/WCBillingSlab.json b/data/as/5344027/ws-services-calculation/WCBillingSlab.json
index fc1c8bb1d2..2ceafb9a83 100644
--- a/data/as/5344027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5344027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5349626/ws-services-calculation/WCBillingSlab.json b/data/as/5349626/ws-services-calculation/WCBillingSlab.json
index 9e8afe6ca3..c8ef3b2f0b 100644
--- a/data/as/5349626/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5349626/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5349656/ws-services-calculation/WCBillingSlab.json b/data/as/5349656/ws-services-calculation/WCBillingSlab.json
index b828367c1a..5bc2e8786f 100644
--- a/data/as/5349656/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5349656/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5349682/ws-services-calculation/WCBillingSlab.json b/data/as/5349682/ws-services-calculation/WCBillingSlab.json
index 170f277d50..5e040225c7 100644
--- a/data/as/5349682/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5349682/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5357091/ws-services-calculation/WCBillingSlab.json b/data/as/5357091/ws-services-calculation/WCBillingSlab.json
index c9c8ed10eb..cac86af0bc 100644
--- a/data/as/5357091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5357091/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5362300/ws-services-calculation/WCBillingSlab.json b/data/as/5362300/ws-services-calculation/WCBillingSlab.json
index bbdd29e769..907e189748 100644
--- a/data/as/5362300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5362300/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5362332/ws-services-calculation/WCBillingSlab.json b/data/as/5362332/ws-services-calculation/WCBillingSlab.json
index 5b92f58ad1..386dc48f79 100644
--- a/data/as/5362332/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5362332/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5379654/ws-services-calculation/WCBillingSlab.json b/data/as/5379654/ws-services-calculation/WCBillingSlab.json
index 61a132d8c0..435b029bfb 100644
--- a/data/as/5379654/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5379654/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5379810/ws-services-calculation/WCBillingSlab.json b/data/as/5379810/ws-services-calculation/WCBillingSlab.json
index 17fe5b58aa..cd90cdc545 100644
--- a/data/as/5379810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5379810/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5404892/ws-services-calculation/WCBillingSlab.json b/data/as/5404892/ws-services-calculation/WCBillingSlab.json
index 1c72ad5c35..53dadc9900 100644
--- a/data/as/5404892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5404892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5404904/ws-services-calculation/WCBillingSlab.json b/data/as/5404904/ws-services-calculation/WCBillingSlab.json
index 11b10da0e7..e6e1357786 100644
--- a/data/as/5404904/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5404904/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5404932/ws-services-calculation/WCBillingSlab.json b/data/as/5404932/ws-services-calculation/WCBillingSlab.json
index 697f9db08f..069ab3a417 100644
--- a/data/as/5404932/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5404932/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407809/ws-services-calculation/WCBillingSlab.json b/data/as/5407809/ws-services-calculation/WCBillingSlab.json
index da53237544..8cf49103cb 100644
--- a/data/as/5407809/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407809/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407828/ws-services-calculation/WCBillingSlab.json b/data/as/5407828/ws-services-calculation/WCBillingSlab.json
index b784604536..864e0fae87 100644
--- a/data/as/5407828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407828/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407846/ws-services-calculation/WCBillingSlab.json b/data/as/5407846/ws-services-calculation/WCBillingSlab.json
index 24c07b8c34..74da8f3965 100644
--- a/data/as/5407846/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407846/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5407857/ws-services-calculation/WCBillingSlab.json b/data/as/5407857/ws-services-calculation/WCBillingSlab.json
index 1a41b39c59..186066695f 100644
--- a/data/as/5407857/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5407857/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408096/ws-services-calculation/WCBillingSlab.json b/data/as/5408096/ws-services-calculation/WCBillingSlab.json
index 3889789a67..d8a6b38903 100644
--- a/data/as/5408096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408096/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408108/ws-services-calculation/WCBillingSlab.json b/data/as/5408108/ws-services-calculation/WCBillingSlab.json
index c09f4c7651..5b10b5996a 100644
--- a/data/as/5408108/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408108/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408187/ws-services-calculation/WCBillingSlab.json b/data/as/5408187/ws-services-calculation/WCBillingSlab.json
index e8ded96f2d..e479306a91 100644
--- a/data/as/5408187/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408187/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408224/ws-services-calculation/WCBillingSlab.json b/data/as/5408224/ws-services-calculation/WCBillingSlab.json
index 723b8dce17..492cc02792 100644
--- a/data/as/5408224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408224/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408248/ws-services-calculation/WCBillingSlab.json b/data/as/5408248/ws-services-calculation/WCBillingSlab.json
index d1b5c661e9..6ac0ad7585 100644
--- a/data/as/5408248/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408248/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408300/ws-services-calculation/WCBillingSlab.json b/data/as/5408300/ws-services-calculation/WCBillingSlab.json
index 0e6bbe2e11..d3d2576150 100644
--- a/data/as/5408300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408300/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408316/ws-services-calculation/WCBillingSlab.json b/data/as/5408316/ws-services-calculation/WCBillingSlab.json
index f8903d059f..7c9bbcb9cf 100644
--- a/data/as/5408316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408316/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408332/ws-services-calculation/WCBillingSlab.json b/data/as/5408332/ws-services-calculation/WCBillingSlab.json
index 73eda5ea54..db8282f686 100644
--- a/data/as/5408332/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408332/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408704/ws-services-calculation/WCBillingSlab.json b/data/as/5408704/ws-services-calculation/WCBillingSlab.json
index 7ce8f090be..52b79f6948 100644
--- a/data/as/5408704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408793/ws-services-calculation/WCBillingSlab.json b/data/as/5408793/ws-services-calculation/WCBillingSlab.json
index f5a4465843..74f2675682 100644
--- a/data/as/5408793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408793/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408854/ws-services-calculation/WCBillingSlab.json b/data/as/5408854/ws-services-calculation/WCBillingSlab.json
index 0576377855..8e703fa650 100644
--- a/data/as/5408854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408854/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5408891/ws-services-calculation/WCBillingSlab.json b/data/as/5408891/ws-services-calculation/WCBillingSlab.json
index a069f0d941..573b056cb1 100644
--- a/data/as/5408891/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5408891/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464190/ws-services-calculation/WCBillingSlab.json b/data/as/5464190/ws-services-calculation/WCBillingSlab.json
index 9622999b49..38d19b0423 100644
--- a/data/as/5464190/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464190/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464241/ws-services-calculation/WCBillingSlab.json b/data/as/5464241/ws-services-calculation/WCBillingSlab.json
index ef8518f6ba..5d345a0ac5 100644
--- a/data/as/5464241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464241/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464278/ws-services-calculation/WCBillingSlab.json b/data/as/5464278/ws-services-calculation/WCBillingSlab.json
index 63e711c1ed..44fdc26bb7 100644
--- a/data/as/5464278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464278/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464342/ws-services-calculation/WCBillingSlab.json b/data/as/5464342/ws-services-calculation/WCBillingSlab.json
index 45ebabdf7a..ed95de8793 100644
--- a/data/as/5464342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464342/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464413/ws-services-calculation/WCBillingSlab.json b/data/as/5464413/ws-services-calculation/WCBillingSlab.json
index 60d31a78d0..e80c9571ea 100644
--- a/data/as/5464413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464413/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5464439/ws-services-calculation/WCBillingSlab.json b/data/as/5464439/ws-services-calculation/WCBillingSlab.json
index a6432ad1e9..fd969e7323 100644
--- a/data/as/5464439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5464439/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5475220/ws-services-calculation/WCBillingSlab.json b/data/as/5475220/ws-services-calculation/WCBillingSlab.json
index 4cc6d519f7..8176f085eb 100644
--- a/data/as/5475220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5475220/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5519133/ws-services-calculation/WCBillingSlab.json b/data/as/5519133/ws-services-calculation/WCBillingSlab.json
index c2f8938ece..9fbb2e1f7b 100644
--- a/data/as/5519133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5519133/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5519203/ws-services-calculation/WCBillingSlab.json b/data/as/5519203/ws-services-calculation/WCBillingSlab.json
index 1f7d153ed2..8dbd43c255 100644
--- a/data/as/5519203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5519203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5523260/ws-services-calculation/WCBillingSlab.json b/data/as/5523260/ws-services-calculation/WCBillingSlab.json
index a7ea730804..1796ee3e06 100644
--- a/data/as/5523260/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5523260/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5527478/ws-services-calculation/WCBillingSlab.json b/data/as/5527478/ws-services-calculation/WCBillingSlab.json
index 822f630fec..5ea9e7bbb1 100644
--- a/data/as/5527478/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5527478/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5528384/ws-services-calculation/WCBillingSlab.json b/data/as/5528384/ws-services-calculation/WCBillingSlab.json
index eff9499f05..5d4d38a236 100644
--- a/data/as/5528384/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5528384/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5531603/ws-services-calculation/WCBillingSlab.json b/data/as/5531603/ws-services-calculation/WCBillingSlab.json
index fe2d302b77..42e5b5b296 100644
--- a/data/as/5531603/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5531603/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5532932/ws-services-calculation/WCBillingSlab.json b/data/as/5532932/ws-services-calculation/WCBillingSlab.json
index 0a037da622..3fd175102f 100644
--- a/data/as/5532932/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5532932/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5533989/ws-services-calculation/WCBillingSlab.json b/data/as/5533989/ws-services-calculation/WCBillingSlab.json
index c9deacf884..fb77eccf06 100644
--- a/data/as/5533989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5533989/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5534043/ws-services-calculation/WCBillingSlab.json b/data/as/5534043/ws-services-calculation/WCBillingSlab.json
index 8763bee531..31e92b4d8b 100644
--- a/data/as/5534043/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5534043/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5534657/ws-services-calculation/WCBillingSlab.json b/data/as/5534657/ws-services-calculation/WCBillingSlab.json
index 76dbb1faa9..49f4b19f64 100644
--- a/data/as/5534657/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5534657/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5544794/ws-services-calculation/WCBillingSlab.json b/data/as/5544794/ws-services-calculation/WCBillingSlab.json
index 363647550f..6ee7e9796f 100644
--- a/data/as/5544794/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5544794/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547805/ws-services-calculation/WCBillingSlab.json b/data/as/5547805/ws-services-calculation/WCBillingSlab.json
index 50d0512dbb..b3d3a3dd65 100644
--- a/data/as/5547805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547805/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547815/ws-services-calculation/WCBillingSlab.json b/data/as/5547815/ws-services-calculation/WCBillingSlab.json
index e27383669d..b0f2fef4e9 100644
--- a/data/as/5547815/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547815/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547824/ws-services-calculation/WCBillingSlab.json b/data/as/5547824/ws-services-calculation/WCBillingSlab.json
index 09d6cf5f30..663497990a 100644
--- a/data/as/5547824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547824/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547832/ws-services-calculation/WCBillingSlab.json b/data/as/5547832/ws-services-calculation/WCBillingSlab.json
index 86236433e9..93d30ba641 100644
--- a/data/as/5547832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547832/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547843/ws-services-calculation/WCBillingSlab.json b/data/as/5547843/ws-services-calculation/WCBillingSlab.json
index 4583204b49..2d990111b1 100644
--- a/data/as/5547843/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547843/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/600587/ws-services-calculation/WCBillingSlab.json b/data/as/600587/ws-services-calculation/WCBillingSlab.json
index 812d9b0f3f..9e6830c6f6 100644
--- a/data/as/600587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/600587/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/603120/ws-services-calculation/WCBillingSlab.json b/data/as/603120/ws-services-calculation/WCBillingSlab.json
index 41273bf3cd..98d31a7356 100644
--- a/data/as/603120/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/603120/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/603277/ws-services-calculation/WCBillingSlab.json b/data/as/603277/ws-services-calculation/WCBillingSlab.json
index 8af793b5da..90f69f6666 100644
--- a/data/as/603277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/603277/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/603538/ws-services-calculation/WCBillingSlab.json b/data/as/603538/ws-services-calculation/WCBillingSlab.json
index 50664e2d5f..c512cf0f44 100644
--- a/data/as/603538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/603538/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/729083/ws-services-calculation/WCBillingSlab.json b/data/as/729083/ws-services-calculation/WCBillingSlab.json
index e5afa70a3c..2ef8b596c7 100644
--- a/data/as/729083/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/729083/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/729086/ws-services-calculation/WCBillingSlab.json b/data/as/729086/ws-services-calculation/WCBillingSlab.json
index 4441bcab5b..f8f426c048 100644
--- a/data/as/729086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/729086/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/874344/ws-services-calculation/WCBillingSlab.json b/data/as/874344/ws-services-calculation/WCBillingSlab.json
index 79d3258055..3a5258e82e 100644
--- a/data/as/874344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/874344/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/877925/ws-services-calculation/WCBillingSlab.json b/data/as/877925/ws-services-calculation/WCBillingSlab.json
index c177075678..c6d819dcfa 100644
--- a/data/as/877925/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/877925/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/877934/ws-services-calculation/WCBillingSlab.json b/data/as/877934/ws-services-calculation/WCBillingSlab.json
index 9cf21fc66a..506436ad65 100644
--- a/data/as/877934/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/877934/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file

From cd0cb79491bea2425d7c2e6c67d50afd8b555a75 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 17:25:11 +0530
Subject: [PATCH 19/23] updated minimumCharge 0.0 to 0

---
 .../as/5547867/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547870/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547877/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5547899/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5548125/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5548175/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5548215/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5548227/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5548257/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5548360/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5550489/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5550585/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5552472/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5552515/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5552526/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5552540/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5557007/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5568316/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5569781/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5569877/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5571455/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5571465/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5571476/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5571515/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5573206/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5573300/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5599446/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5641311/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5803027/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/5849473/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6054046/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6054138/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6054477/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6054503/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6055529/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6055543/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6055984/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6136397/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6136635/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6136706/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6145361/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6145500/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6145716/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6149983/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6150005/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6150033/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6150048/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6151001/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6166571/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6166583/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6173095/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175393/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175413/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175518/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175537/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175631/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175645/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6175650/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6189857/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6189867/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6233420/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6234085/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6241704/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6241823/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6241939/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6242561/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6242604/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6242836/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6242875/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6242892/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259479/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259651/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259713/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259850/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259888/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259908/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259933/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6259975/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6260027/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6260773/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6260844/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6260923/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6347427/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6349286/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6350831/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6350854/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385531/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385536/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385545/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385554/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385567/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385905/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385915/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6385925/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6502957/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6503042/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6515973/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6516224/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6517821/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6520124/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6524893/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6524935/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6526507/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6526593/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6526646/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6852674/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6858112/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6858114/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6861545/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6861639/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/6861642/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7341547/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7343676/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7347016/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7347032/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7347122/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7637384/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7893876/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7894596/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898565/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898568/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898570/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898571/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898573/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898574/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7898575/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7971619/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/7971866/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8036124/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8036130/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8131608/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132115/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132124/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132128/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132750/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132803/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132805/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132840/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132845/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132847/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132850/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132861/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132866/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132870/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8132892/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8137635/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8138120/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8138164/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8140993/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141044/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141062/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141109/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141554/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141566/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141583/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141619/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141631/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141643/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141666/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141686/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141704/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141716/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141733/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141761/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141785/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141831/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141923/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8141972/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148068/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148081/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148097/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148105/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148116/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148125/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148137/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148159/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148173/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148181/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148193/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148198/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8148257/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153195/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153198/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153201/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153205/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153209/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153214/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153219/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153224/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153228/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153230/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153234/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153241/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153248/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153287/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153302/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153320/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153337/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153355/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153374/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153399/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153482/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153639/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153665/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153690/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153703/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153723/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153746/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153766/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153777/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153800/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153823/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8153844/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8154251/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155025/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155026/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155041/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155049/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155055/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155070/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155090/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155168/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155206/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155271/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155279/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8155344/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156157/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156180/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156193/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156208/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156216/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156220/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156223/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156231/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156241/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156244/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156253/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156257/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156263/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156271/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156274/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156288/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156289/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156315/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156393/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156410/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156419/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156424/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156430/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8156440/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8157519/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8157593/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8157595/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8157600/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8157602/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8157739/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159295/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159645/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159671/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159680/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159691/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159704/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159717/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159727/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159738/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159747/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159851/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159874/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159939/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159954/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8159963/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160000/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160005/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160019/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160027/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160039/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160338/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160353/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160367/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160379/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160387/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160400/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160409/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160417/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160423/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160451/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160455/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160460/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160467/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160474/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160796/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160817/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160827/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160840/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160852/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160864/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160875/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160897/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8160910/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161016/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161774/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161776/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161778/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161779/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161782/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161786/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161790/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161794/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161801/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161808/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161819/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161828/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161841/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161861/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161882/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161897/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161907/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161918/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161943/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161960/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161985/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8161998/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8162013/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8162057/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8162079/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8162125/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8162166/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171324/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171366/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171388/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171415/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171462/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171475/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171505/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171518/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171531/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171572/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171735/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171834/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171872/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171904/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171945/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171970/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8171989/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8172016/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8172071/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175220/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175227/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175232/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175237/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175241/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175267/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8175588/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8176558/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8176578/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8176607/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8176627/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8177941/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178172/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178282/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178343/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178428/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178783/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178821/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178861/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178895/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8178929/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8181830/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8181848/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8181875/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8181912/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8183542/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8183933/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8184246/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8184256/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8184281/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8184539/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185128/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185176/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185212/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185242/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185270/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185286/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185317/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185354/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185387/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185418/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185772/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185789/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185807/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8185824/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8186783/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8186803/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187077/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187084/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187090/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187146/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187153/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187157/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187165/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 400 files changed, 1600 insertions(+), 1600 deletions(-)

diff --git a/data/as/5547867/ws-services-calculation/WCBillingSlab.json b/data/as/5547867/ws-services-calculation/WCBillingSlab.json
index 977f64e15a..8f90221b46 100644
--- a/data/as/5547867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547867/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547870/ws-services-calculation/WCBillingSlab.json b/data/as/5547870/ws-services-calculation/WCBillingSlab.json
index 2da992281f..5fe4903599 100644
--- a/data/as/5547870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547870/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547877/ws-services-calculation/WCBillingSlab.json b/data/as/5547877/ws-services-calculation/WCBillingSlab.json
index cc87ec6353..7f021bd87a 100644
--- a/data/as/5547877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547877/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5547899/ws-services-calculation/WCBillingSlab.json b/data/as/5547899/ws-services-calculation/WCBillingSlab.json
index fda57e80fd..573e113220 100644
--- a/data/as/5547899/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5547899/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548125/ws-services-calculation/WCBillingSlab.json b/data/as/5548125/ws-services-calculation/WCBillingSlab.json
index 7aa0ef0023..48731b3c07 100644
--- a/data/as/5548125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548125/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548175/ws-services-calculation/WCBillingSlab.json b/data/as/5548175/ws-services-calculation/WCBillingSlab.json
index 5ec3fed604..dda30315ef 100644
--- a/data/as/5548175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548175/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548215/ws-services-calculation/WCBillingSlab.json b/data/as/5548215/ws-services-calculation/WCBillingSlab.json
index f6f6daf570..350d7e7bdc 100644
--- a/data/as/5548215/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548215/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548227/ws-services-calculation/WCBillingSlab.json b/data/as/5548227/ws-services-calculation/WCBillingSlab.json
index 1ca0ab0960..cc1ff92fe9 100644
--- a/data/as/5548227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548227/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548257/ws-services-calculation/WCBillingSlab.json b/data/as/5548257/ws-services-calculation/WCBillingSlab.json
index 0d790f34c2..80e8e74739 100644
--- a/data/as/5548257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548257/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5548360/ws-services-calculation/WCBillingSlab.json b/data/as/5548360/ws-services-calculation/WCBillingSlab.json
index 91d364c713..f5d3c09ddf 100644
--- a/data/as/5548360/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5548360/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5550489/ws-services-calculation/WCBillingSlab.json b/data/as/5550489/ws-services-calculation/WCBillingSlab.json
index d16746a1f6..1ff9d8c4e8 100644
--- a/data/as/5550489/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5550489/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5550585/ws-services-calculation/WCBillingSlab.json b/data/as/5550585/ws-services-calculation/WCBillingSlab.json
index 92ec15e021..92b0759822 100644
--- a/data/as/5550585/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5550585/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552472/ws-services-calculation/WCBillingSlab.json b/data/as/5552472/ws-services-calculation/WCBillingSlab.json
index 383a023fd8..87d5532ff8 100644
--- a/data/as/5552472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552472/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552515/ws-services-calculation/WCBillingSlab.json b/data/as/5552515/ws-services-calculation/WCBillingSlab.json
index bbd014fff8..419a7222a2 100644
--- a/data/as/5552515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552515/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552526/ws-services-calculation/WCBillingSlab.json b/data/as/5552526/ws-services-calculation/WCBillingSlab.json
index 1c8c3edabf..c3e376f5bd 100644
--- a/data/as/5552526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552526/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5552540/ws-services-calculation/WCBillingSlab.json b/data/as/5552540/ws-services-calculation/WCBillingSlab.json
index ac29bfaee9..e67978e4da 100644
--- a/data/as/5552540/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5552540/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5557007/ws-services-calculation/WCBillingSlab.json b/data/as/5557007/ws-services-calculation/WCBillingSlab.json
index 2a36308d38..f94a218837 100644
--- a/data/as/5557007/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5557007/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5568316/ws-services-calculation/WCBillingSlab.json b/data/as/5568316/ws-services-calculation/WCBillingSlab.json
index 9fa43696d9..4e88087a8a 100644
--- a/data/as/5568316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5568316/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5569781/ws-services-calculation/WCBillingSlab.json b/data/as/5569781/ws-services-calculation/WCBillingSlab.json
index b2d5320ff2..5f842f1848 100644
--- a/data/as/5569781/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5569781/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5569877/ws-services-calculation/WCBillingSlab.json b/data/as/5569877/ws-services-calculation/WCBillingSlab.json
index 519da59a14..21e164325f 100644
--- a/data/as/5569877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5569877/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571455/ws-services-calculation/WCBillingSlab.json b/data/as/5571455/ws-services-calculation/WCBillingSlab.json
index c041766888..da55aa61d1 100644
--- a/data/as/5571455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571455/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571465/ws-services-calculation/WCBillingSlab.json b/data/as/5571465/ws-services-calculation/WCBillingSlab.json
index 53e7f94c42..f22c67516c 100644
--- a/data/as/5571465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571465/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571476/ws-services-calculation/WCBillingSlab.json b/data/as/5571476/ws-services-calculation/WCBillingSlab.json
index 0c30c92a49..ae3c11e8dc 100644
--- a/data/as/5571476/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571476/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5571515/ws-services-calculation/WCBillingSlab.json b/data/as/5571515/ws-services-calculation/WCBillingSlab.json
index 894bed56d4..52c4dcb656 100644
--- a/data/as/5571515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5571515/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5573206/ws-services-calculation/WCBillingSlab.json b/data/as/5573206/ws-services-calculation/WCBillingSlab.json
index 295b25dd1c..88ddcfe18b 100644
--- a/data/as/5573206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5573206/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5573300/ws-services-calculation/WCBillingSlab.json b/data/as/5573300/ws-services-calculation/WCBillingSlab.json
index 5dc2e64076..dfbcc46ca3 100644
--- a/data/as/5573300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5573300/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5599446/ws-services-calculation/WCBillingSlab.json b/data/as/5599446/ws-services-calculation/WCBillingSlab.json
index 7fdefc3770..54f1269aa4 100644
--- a/data/as/5599446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5599446/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5641311/ws-services-calculation/WCBillingSlab.json b/data/as/5641311/ws-services-calculation/WCBillingSlab.json
index 755f456e40..3dc9be04fc 100644
--- a/data/as/5641311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5641311/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5803027/ws-services-calculation/WCBillingSlab.json b/data/as/5803027/ws-services-calculation/WCBillingSlab.json
index f493270550..5ef6dc7b71 100644
--- a/data/as/5803027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5803027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/5849473/ws-services-calculation/WCBillingSlab.json b/data/as/5849473/ws-services-calculation/WCBillingSlab.json
index d63aa48cd4..fbba006021 100644
--- a/data/as/5849473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/5849473/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054046/ws-services-calculation/WCBillingSlab.json b/data/as/6054046/ws-services-calculation/WCBillingSlab.json
index 5fc9532a3f..610c8276e0 100644
--- a/data/as/6054046/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054046/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054138/ws-services-calculation/WCBillingSlab.json b/data/as/6054138/ws-services-calculation/WCBillingSlab.json
index 6b279cdc4b..5f720f130c 100644
--- a/data/as/6054138/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054138/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054477/ws-services-calculation/WCBillingSlab.json b/data/as/6054477/ws-services-calculation/WCBillingSlab.json
index 15ca44105f..954a3da6e0 100644
--- a/data/as/6054477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054477/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6054503/ws-services-calculation/WCBillingSlab.json b/data/as/6054503/ws-services-calculation/WCBillingSlab.json
index 79d4469cd5..441baf27ed 100644
--- a/data/as/6054503/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6054503/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6055529/ws-services-calculation/WCBillingSlab.json b/data/as/6055529/ws-services-calculation/WCBillingSlab.json
index 170c369915..e2e87a3fbe 100644
--- a/data/as/6055529/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6055529/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6055543/ws-services-calculation/WCBillingSlab.json b/data/as/6055543/ws-services-calculation/WCBillingSlab.json
index 758c2d2007..d0a8989f11 100644
--- a/data/as/6055543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6055543/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6055984/ws-services-calculation/WCBillingSlab.json b/data/as/6055984/ws-services-calculation/WCBillingSlab.json
index dfa2bff699..2ebfc7c0a4 100644
--- a/data/as/6055984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6055984/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6136397/ws-services-calculation/WCBillingSlab.json b/data/as/6136397/ws-services-calculation/WCBillingSlab.json
index e067411eac..90418e9f8b 100644
--- a/data/as/6136397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6136397/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6136635/ws-services-calculation/WCBillingSlab.json b/data/as/6136635/ws-services-calculation/WCBillingSlab.json
index 5378df51a6..65ae0ca5bf 100644
--- a/data/as/6136635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6136635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6136706/ws-services-calculation/WCBillingSlab.json b/data/as/6136706/ws-services-calculation/WCBillingSlab.json
index d0c2d249c0..38710e0cc9 100644
--- a/data/as/6136706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6136706/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6145361/ws-services-calculation/WCBillingSlab.json b/data/as/6145361/ws-services-calculation/WCBillingSlab.json
index 22ff419b8a..241e22c8cf 100644
--- a/data/as/6145361/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6145361/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6145500/ws-services-calculation/WCBillingSlab.json b/data/as/6145500/ws-services-calculation/WCBillingSlab.json
index d084eee39e..9c502e8650 100644
--- a/data/as/6145500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6145500/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6145716/ws-services-calculation/WCBillingSlab.json b/data/as/6145716/ws-services-calculation/WCBillingSlab.json
index b49898b132..230a12ad82 100644
--- a/data/as/6145716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6145716/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6149983/ws-services-calculation/WCBillingSlab.json b/data/as/6149983/ws-services-calculation/WCBillingSlab.json
index da0dd05e06..1671ca8052 100644
--- a/data/as/6149983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6149983/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6150005/ws-services-calculation/WCBillingSlab.json b/data/as/6150005/ws-services-calculation/WCBillingSlab.json
index 824d839d82..4f5d59b30d 100644
--- a/data/as/6150005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6150005/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6150033/ws-services-calculation/WCBillingSlab.json b/data/as/6150033/ws-services-calculation/WCBillingSlab.json
index 20c3f39f24..b25fd92fc8 100644
--- a/data/as/6150033/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6150033/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6150048/ws-services-calculation/WCBillingSlab.json b/data/as/6150048/ws-services-calculation/WCBillingSlab.json
index ab2b1520c2..578c14f1a9 100644
--- a/data/as/6150048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6150048/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6151001/ws-services-calculation/WCBillingSlab.json b/data/as/6151001/ws-services-calculation/WCBillingSlab.json
index a769879741..3e27d10be8 100644
--- a/data/as/6151001/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6151001/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6166571/ws-services-calculation/WCBillingSlab.json b/data/as/6166571/ws-services-calculation/WCBillingSlab.json
index 2534a60047..8aeda716e6 100644
--- a/data/as/6166571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6166571/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6166583/ws-services-calculation/WCBillingSlab.json b/data/as/6166583/ws-services-calculation/WCBillingSlab.json
index 08ce8781de..e5a085b1e7 100644
--- a/data/as/6166583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6166583/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6173095/ws-services-calculation/WCBillingSlab.json b/data/as/6173095/ws-services-calculation/WCBillingSlab.json
index c5da0df473..796b25b322 100644
--- a/data/as/6173095/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6173095/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175393/ws-services-calculation/WCBillingSlab.json b/data/as/6175393/ws-services-calculation/WCBillingSlab.json
index daf9bfe2bb..450a37bc35 100644
--- a/data/as/6175393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175393/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175413/ws-services-calculation/WCBillingSlab.json b/data/as/6175413/ws-services-calculation/WCBillingSlab.json
index 3dd2296fb2..ee9a9d5d18 100644
--- a/data/as/6175413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175413/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175518/ws-services-calculation/WCBillingSlab.json b/data/as/6175518/ws-services-calculation/WCBillingSlab.json
index 6eefd517a0..f28b26add1 100644
--- a/data/as/6175518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175518/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175537/ws-services-calculation/WCBillingSlab.json b/data/as/6175537/ws-services-calculation/WCBillingSlab.json
index e620496daf..b93f99aecc 100644
--- a/data/as/6175537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175537/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175631/ws-services-calculation/WCBillingSlab.json b/data/as/6175631/ws-services-calculation/WCBillingSlab.json
index 11543ee1ce..7fcce41fab 100644
--- a/data/as/6175631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175631/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175645/ws-services-calculation/WCBillingSlab.json b/data/as/6175645/ws-services-calculation/WCBillingSlab.json
index a18b4c7d34..f22c054b26 100644
--- a/data/as/6175645/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175645/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6175650/ws-services-calculation/WCBillingSlab.json b/data/as/6175650/ws-services-calculation/WCBillingSlab.json
index c1f90a310c..3dcad80977 100644
--- a/data/as/6175650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6175650/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6189857/ws-services-calculation/WCBillingSlab.json b/data/as/6189857/ws-services-calculation/WCBillingSlab.json
index 2de32acdef..5d8d371e94 100644
--- a/data/as/6189857/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6189857/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6189867/ws-services-calculation/WCBillingSlab.json b/data/as/6189867/ws-services-calculation/WCBillingSlab.json
index a7d9f6afc6..bbe35cf588 100644
--- a/data/as/6189867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6189867/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6233420/ws-services-calculation/WCBillingSlab.json b/data/as/6233420/ws-services-calculation/WCBillingSlab.json
index 1eecc51bae..3fa75de78b 100644
--- a/data/as/6233420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6233420/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6234085/ws-services-calculation/WCBillingSlab.json b/data/as/6234085/ws-services-calculation/WCBillingSlab.json
index a921b4c40e..23504963e9 100644
--- a/data/as/6234085/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6234085/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6241704/ws-services-calculation/WCBillingSlab.json b/data/as/6241704/ws-services-calculation/WCBillingSlab.json
index dd109ace39..dd950cd3e1 100644
--- a/data/as/6241704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6241704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6241823/ws-services-calculation/WCBillingSlab.json b/data/as/6241823/ws-services-calculation/WCBillingSlab.json
index 5af171ad4e..f1ad941244 100644
--- a/data/as/6241823/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6241823/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6241939/ws-services-calculation/WCBillingSlab.json b/data/as/6241939/ws-services-calculation/WCBillingSlab.json
index 3163bfe10f..49c74361aa 100644
--- a/data/as/6241939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6241939/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242561/ws-services-calculation/WCBillingSlab.json b/data/as/6242561/ws-services-calculation/WCBillingSlab.json
index 8dd79d8f12..a816514c1d 100644
--- a/data/as/6242561/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242561/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242604/ws-services-calculation/WCBillingSlab.json b/data/as/6242604/ws-services-calculation/WCBillingSlab.json
index b19ded478f..e13cd449a7 100644
--- a/data/as/6242604/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242604/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242836/ws-services-calculation/WCBillingSlab.json b/data/as/6242836/ws-services-calculation/WCBillingSlab.json
index 9177e44bbd..db4185d951 100644
--- a/data/as/6242836/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242836/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242875/ws-services-calculation/WCBillingSlab.json b/data/as/6242875/ws-services-calculation/WCBillingSlab.json
index 9a018faf2e..a8788c14b3 100644
--- a/data/as/6242875/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242875/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6242892/ws-services-calculation/WCBillingSlab.json b/data/as/6242892/ws-services-calculation/WCBillingSlab.json
index 8d1c9f8a13..e43fde765e 100644
--- a/data/as/6242892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6242892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259479/ws-services-calculation/WCBillingSlab.json b/data/as/6259479/ws-services-calculation/WCBillingSlab.json
index 4f3fbc621f..6ea676fb25 100644
--- a/data/as/6259479/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259479/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259651/ws-services-calculation/WCBillingSlab.json b/data/as/6259651/ws-services-calculation/WCBillingSlab.json
index 6deffeb544..ac46184070 100644
--- a/data/as/6259651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259651/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259713/ws-services-calculation/WCBillingSlab.json b/data/as/6259713/ws-services-calculation/WCBillingSlab.json
index 92cb2e51ee..3cf6089bdd 100644
--- a/data/as/6259713/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259713/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259850/ws-services-calculation/WCBillingSlab.json b/data/as/6259850/ws-services-calculation/WCBillingSlab.json
index 553a4dae5f..09bd4fc818 100644
--- a/data/as/6259850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259850/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259888/ws-services-calculation/WCBillingSlab.json b/data/as/6259888/ws-services-calculation/WCBillingSlab.json
index b412e7b659..4ba3ce33e6 100644
--- a/data/as/6259888/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259888/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259908/ws-services-calculation/WCBillingSlab.json b/data/as/6259908/ws-services-calculation/WCBillingSlab.json
index 253660f8a7..6f6f1b8799 100644
--- a/data/as/6259908/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259908/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259933/ws-services-calculation/WCBillingSlab.json b/data/as/6259933/ws-services-calculation/WCBillingSlab.json
index 00abf493f1..a8bbbcf978 100644
--- a/data/as/6259933/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259933/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6259975/ws-services-calculation/WCBillingSlab.json b/data/as/6259975/ws-services-calculation/WCBillingSlab.json
index 60f43c7252..bc24329ac1 100644
--- a/data/as/6259975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6259975/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260027/ws-services-calculation/WCBillingSlab.json b/data/as/6260027/ws-services-calculation/WCBillingSlab.json
index e42335c8c4..963987a57c 100644
--- a/data/as/6260027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260773/ws-services-calculation/WCBillingSlab.json b/data/as/6260773/ws-services-calculation/WCBillingSlab.json
index 68b5986a21..ee572899a7 100644
--- a/data/as/6260773/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260773/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260844/ws-services-calculation/WCBillingSlab.json b/data/as/6260844/ws-services-calculation/WCBillingSlab.json
index 0ae06dac3b..d6d009689e 100644
--- a/data/as/6260844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260844/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6260923/ws-services-calculation/WCBillingSlab.json b/data/as/6260923/ws-services-calculation/WCBillingSlab.json
index f52f3b492c..e6b4607ff4 100644
--- a/data/as/6260923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6260923/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6347427/ws-services-calculation/WCBillingSlab.json b/data/as/6347427/ws-services-calculation/WCBillingSlab.json
index b1607c8570..03890ccea3 100644
--- a/data/as/6347427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6347427/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6349286/ws-services-calculation/WCBillingSlab.json b/data/as/6349286/ws-services-calculation/WCBillingSlab.json
index 27661d9c94..60e22dcd53 100644
--- a/data/as/6349286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6349286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6350831/ws-services-calculation/WCBillingSlab.json b/data/as/6350831/ws-services-calculation/WCBillingSlab.json
index 3845621857..4679479ff0 100644
--- a/data/as/6350831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6350831/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6350854/ws-services-calculation/WCBillingSlab.json b/data/as/6350854/ws-services-calculation/WCBillingSlab.json
index b97d86ee35..edaadf5c61 100644
--- a/data/as/6350854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6350854/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385531/ws-services-calculation/WCBillingSlab.json b/data/as/6385531/ws-services-calculation/WCBillingSlab.json
index db202025e1..ff6f1038b2 100644
--- a/data/as/6385531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385531/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385536/ws-services-calculation/WCBillingSlab.json b/data/as/6385536/ws-services-calculation/WCBillingSlab.json
index 1b98fbc005..c274e5eb7a 100644
--- a/data/as/6385536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385536/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385545/ws-services-calculation/WCBillingSlab.json b/data/as/6385545/ws-services-calculation/WCBillingSlab.json
index 1c95b5372a..272c5809e7 100644
--- a/data/as/6385545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385545/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385554/ws-services-calculation/WCBillingSlab.json b/data/as/6385554/ws-services-calculation/WCBillingSlab.json
index 15a0dff521..8c24cca16b 100644
--- a/data/as/6385554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385567/ws-services-calculation/WCBillingSlab.json b/data/as/6385567/ws-services-calculation/WCBillingSlab.json
index 8be578f9dc..8f845a0458 100644
--- a/data/as/6385567/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385567/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385905/ws-services-calculation/WCBillingSlab.json b/data/as/6385905/ws-services-calculation/WCBillingSlab.json
index dff254e21d..7afa75d7d7 100644
--- a/data/as/6385905/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385905/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385915/ws-services-calculation/WCBillingSlab.json b/data/as/6385915/ws-services-calculation/WCBillingSlab.json
index fdd97fe01c..f08e80064d 100644
--- a/data/as/6385915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385915/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6385925/ws-services-calculation/WCBillingSlab.json b/data/as/6385925/ws-services-calculation/WCBillingSlab.json
index 0eea2e4d7e..a4fe6deef8 100644
--- a/data/as/6385925/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6385925/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6502957/ws-services-calculation/WCBillingSlab.json b/data/as/6502957/ws-services-calculation/WCBillingSlab.json
index 3a9c20da1a..f2e96ad390 100644
--- a/data/as/6502957/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6502957/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6503042/ws-services-calculation/WCBillingSlab.json b/data/as/6503042/ws-services-calculation/WCBillingSlab.json
index 22e74b48da..8a2c9e98e6 100644
--- a/data/as/6503042/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6503042/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6515973/ws-services-calculation/WCBillingSlab.json b/data/as/6515973/ws-services-calculation/WCBillingSlab.json
index 13bd37e004..9c5a77a921 100644
--- a/data/as/6515973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6515973/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6516224/ws-services-calculation/WCBillingSlab.json b/data/as/6516224/ws-services-calculation/WCBillingSlab.json
index e4610fb16c..a2c499ac97 100644
--- a/data/as/6516224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6516224/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6517821/ws-services-calculation/WCBillingSlab.json b/data/as/6517821/ws-services-calculation/WCBillingSlab.json
index 2c727a5043..3ab25e6631 100644
--- a/data/as/6517821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6517821/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6520124/ws-services-calculation/WCBillingSlab.json b/data/as/6520124/ws-services-calculation/WCBillingSlab.json
index 9559395310..4dc61b65f1 100644
--- a/data/as/6520124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6520124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6524893/ws-services-calculation/WCBillingSlab.json b/data/as/6524893/ws-services-calculation/WCBillingSlab.json
index 58f284123b..47c3ed33c9 100644
--- a/data/as/6524893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6524893/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6524935/ws-services-calculation/WCBillingSlab.json b/data/as/6524935/ws-services-calculation/WCBillingSlab.json
index f62b300b5b..2ebfc8d256 100644
--- a/data/as/6524935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6524935/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6526507/ws-services-calculation/WCBillingSlab.json b/data/as/6526507/ws-services-calculation/WCBillingSlab.json
index e2187410b3..b4aa217ffa 100644
--- a/data/as/6526507/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6526507/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6526593/ws-services-calculation/WCBillingSlab.json b/data/as/6526593/ws-services-calculation/WCBillingSlab.json
index dee42ff26d..a9ad964d15 100644
--- a/data/as/6526593/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6526593/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6526646/ws-services-calculation/WCBillingSlab.json b/data/as/6526646/ws-services-calculation/WCBillingSlab.json
index 4a4f45c4dd..fb6ee7950f 100644
--- a/data/as/6526646/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6526646/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6852674/ws-services-calculation/WCBillingSlab.json b/data/as/6852674/ws-services-calculation/WCBillingSlab.json
index 4aa1f43b8c..412fd7f6c5 100644
--- a/data/as/6852674/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6852674/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6858112/ws-services-calculation/WCBillingSlab.json b/data/as/6858112/ws-services-calculation/WCBillingSlab.json
index 73de1afc8d..85d87c4eb1 100644
--- a/data/as/6858112/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6858112/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6858114/ws-services-calculation/WCBillingSlab.json b/data/as/6858114/ws-services-calculation/WCBillingSlab.json
index 00b411a276..760b6a2a12 100644
--- a/data/as/6858114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6858114/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6861545/ws-services-calculation/WCBillingSlab.json b/data/as/6861545/ws-services-calculation/WCBillingSlab.json
index 10a28d546e..5bb5ee2b81 100644
--- a/data/as/6861545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6861545/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6861639/ws-services-calculation/WCBillingSlab.json b/data/as/6861639/ws-services-calculation/WCBillingSlab.json
index ad83600484..9a2ddda83d 100644
--- a/data/as/6861639/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6861639/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/6861642/ws-services-calculation/WCBillingSlab.json b/data/as/6861642/ws-services-calculation/WCBillingSlab.json
index a4905f44e6..38608af8f2 100644
--- a/data/as/6861642/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/6861642/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7341547/ws-services-calculation/WCBillingSlab.json b/data/as/7341547/ws-services-calculation/WCBillingSlab.json
index cc34f7e524..47cc4e1c8a 100644
--- a/data/as/7341547/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7341547/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7343676/ws-services-calculation/WCBillingSlab.json b/data/as/7343676/ws-services-calculation/WCBillingSlab.json
index 5ad85a8f17..7b9eb13068 100644
--- a/data/as/7343676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7343676/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7347016/ws-services-calculation/WCBillingSlab.json b/data/as/7347016/ws-services-calculation/WCBillingSlab.json
index e5ff16f30d..1c9d67c870 100644
--- a/data/as/7347016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7347016/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7347032/ws-services-calculation/WCBillingSlab.json b/data/as/7347032/ws-services-calculation/WCBillingSlab.json
index ff6df45594..35703ca0ad 100644
--- a/data/as/7347032/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7347032/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7347122/ws-services-calculation/WCBillingSlab.json b/data/as/7347122/ws-services-calculation/WCBillingSlab.json
index c17cef58a2..ff44a16824 100644
--- a/data/as/7347122/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7347122/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7637384/ws-services-calculation/WCBillingSlab.json b/data/as/7637384/ws-services-calculation/WCBillingSlab.json
index bc348900f5..4cbc9b2c19 100644
--- a/data/as/7637384/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7637384/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7893876/ws-services-calculation/WCBillingSlab.json b/data/as/7893876/ws-services-calculation/WCBillingSlab.json
index 2d2e8a5e77..25d949f300 100644
--- a/data/as/7893876/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7893876/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7894596/ws-services-calculation/WCBillingSlab.json b/data/as/7894596/ws-services-calculation/WCBillingSlab.json
index 3fb31a2edd..60c666d2d1 100644
--- a/data/as/7894596/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7894596/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898565/ws-services-calculation/WCBillingSlab.json b/data/as/7898565/ws-services-calculation/WCBillingSlab.json
index 6e3b7edf99..f864c678f5 100644
--- a/data/as/7898565/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898565/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898568/ws-services-calculation/WCBillingSlab.json b/data/as/7898568/ws-services-calculation/WCBillingSlab.json
index b1c019390b..a968f206b7 100644
--- a/data/as/7898568/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898568/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898570/ws-services-calculation/WCBillingSlab.json b/data/as/7898570/ws-services-calculation/WCBillingSlab.json
index 72ffc68e34..08d47881ca 100644
--- a/data/as/7898570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898570/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898571/ws-services-calculation/WCBillingSlab.json b/data/as/7898571/ws-services-calculation/WCBillingSlab.json
index 18e3b69273..72a85402d5 100644
--- a/data/as/7898571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898571/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898573/ws-services-calculation/WCBillingSlab.json b/data/as/7898573/ws-services-calculation/WCBillingSlab.json
index 2a474a57e5..fbb5fbc23f 100644
--- a/data/as/7898573/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898573/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898574/ws-services-calculation/WCBillingSlab.json b/data/as/7898574/ws-services-calculation/WCBillingSlab.json
index 3e21b49f54..d92b025b5e 100644
--- a/data/as/7898574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898574/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7898575/ws-services-calculation/WCBillingSlab.json b/data/as/7898575/ws-services-calculation/WCBillingSlab.json
index fbf04a34ca..cd06c6ce4c 100644
--- a/data/as/7898575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7898575/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7971619/ws-services-calculation/WCBillingSlab.json b/data/as/7971619/ws-services-calculation/WCBillingSlab.json
index edb0ea3cd9..d8ee562630 100644
--- a/data/as/7971619/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7971619/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/7971866/ws-services-calculation/WCBillingSlab.json b/data/as/7971866/ws-services-calculation/WCBillingSlab.json
index c7c600526b..da5e118c61 100644
--- a/data/as/7971866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/7971866/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8036124/ws-services-calculation/WCBillingSlab.json b/data/as/8036124/ws-services-calculation/WCBillingSlab.json
index 0839aaa02d..174b618e74 100644
--- a/data/as/8036124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8036124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8036130/ws-services-calculation/WCBillingSlab.json b/data/as/8036130/ws-services-calculation/WCBillingSlab.json
index 8f94458ca1..72aff7f618 100644
--- a/data/as/8036130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8036130/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8131608/ws-services-calculation/WCBillingSlab.json b/data/as/8131608/ws-services-calculation/WCBillingSlab.json
index 9b9fdcf479..88c847e007 100644
--- a/data/as/8131608/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8131608/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132115/ws-services-calculation/WCBillingSlab.json b/data/as/8132115/ws-services-calculation/WCBillingSlab.json
index 144562e122..6be86d22da 100644
--- a/data/as/8132115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132115/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132124/ws-services-calculation/WCBillingSlab.json b/data/as/8132124/ws-services-calculation/WCBillingSlab.json
index 25d57f18a0..a15cab63e8 100644
--- a/data/as/8132124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132128/ws-services-calculation/WCBillingSlab.json b/data/as/8132128/ws-services-calculation/WCBillingSlab.json
index b031d734ac..d7bb589734 100644
--- a/data/as/8132128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132128/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132750/ws-services-calculation/WCBillingSlab.json b/data/as/8132750/ws-services-calculation/WCBillingSlab.json
index fdad344f21..43a10923dd 100644
--- a/data/as/8132750/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132750/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132803/ws-services-calculation/WCBillingSlab.json b/data/as/8132803/ws-services-calculation/WCBillingSlab.json
index 1676c73ce6..4d51fc452a 100644
--- a/data/as/8132803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132803/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132805/ws-services-calculation/WCBillingSlab.json b/data/as/8132805/ws-services-calculation/WCBillingSlab.json
index d3fab1b0f1..20c3dad70b 100644
--- a/data/as/8132805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132805/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132840/ws-services-calculation/WCBillingSlab.json b/data/as/8132840/ws-services-calculation/WCBillingSlab.json
index 82e437513e..b641d0abe8 100644
--- a/data/as/8132840/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132840/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132845/ws-services-calculation/WCBillingSlab.json b/data/as/8132845/ws-services-calculation/WCBillingSlab.json
index d1fddbc55d..64746f910e 100644
--- a/data/as/8132845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132845/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132847/ws-services-calculation/WCBillingSlab.json b/data/as/8132847/ws-services-calculation/WCBillingSlab.json
index 9d68fbd28d..34041bf50c 100644
--- a/data/as/8132847/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132847/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132850/ws-services-calculation/WCBillingSlab.json b/data/as/8132850/ws-services-calculation/WCBillingSlab.json
index f3d4ba2f18..91524d5545 100644
--- a/data/as/8132850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132850/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132861/ws-services-calculation/WCBillingSlab.json b/data/as/8132861/ws-services-calculation/WCBillingSlab.json
index 55e3ff80cd..37f926bc65 100644
--- a/data/as/8132861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132861/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132866/ws-services-calculation/WCBillingSlab.json b/data/as/8132866/ws-services-calculation/WCBillingSlab.json
index 40ccf2042f..d25febdb79 100644
--- a/data/as/8132866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132866/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132870/ws-services-calculation/WCBillingSlab.json b/data/as/8132870/ws-services-calculation/WCBillingSlab.json
index dc7eb13cb2..5833ee74a6 100644
--- a/data/as/8132870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132870/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8132892/ws-services-calculation/WCBillingSlab.json b/data/as/8132892/ws-services-calculation/WCBillingSlab.json
index 91f3578290..a1b59af926 100644
--- a/data/as/8132892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8132892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8137635/ws-services-calculation/WCBillingSlab.json b/data/as/8137635/ws-services-calculation/WCBillingSlab.json
index 4fe55e1bbc..94637b2196 100644
--- a/data/as/8137635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8137635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8138120/ws-services-calculation/WCBillingSlab.json b/data/as/8138120/ws-services-calculation/WCBillingSlab.json
index 0615bcfcab..81b6546ec9 100644
--- a/data/as/8138120/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8138120/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8138164/ws-services-calculation/WCBillingSlab.json b/data/as/8138164/ws-services-calculation/WCBillingSlab.json
index 1fbf25dc84..2da7ba135a 100644
--- a/data/as/8138164/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8138164/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8140993/ws-services-calculation/WCBillingSlab.json b/data/as/8140993/ws-services-calculation/WCBillingSlab.json
index aabaa83145..73363f7c7c 100644
--- a/data/as/8140993/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8140993/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141044/ws-services-calculation/WCBillingSlab.json b/data/as/8141044/ws-services-calculation/WCBillingSlab.json
index c9f086e61f..afc5206ddd 100644
--- a/data/as/8141044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141044/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141062/ws-services-calculation/WCBillingSlab.json b/data/as/8141062/ws-services-calculation/WCBillingSlab.json
index fda7a684c9..8122e4e850 100644
--- a/data/as/8141062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141062/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141109/ws-services-calculation/WCBillingSlab.json b/data/as/8141109/ws-services-calculation/WCBillingSlab.json
index a6d3f1a021..46e1784a1c 100644
--- a/data/as/8141109/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141109/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141554/ws-services-calculation/WCBillingSlab.json b/data/as/8141554/ws-services-calculation/WCBillingSlab.json
index 15b6fa74e0..25db493e9e 100644
--- a/data/as/8141554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141566/ws-services-calculation/WCBillingSlab.json b/data/as/8141566/ws-services-calculation/WCBillingSlab.json
index e8578e7520..b4264b3578 100644
--- a/data/as/8141566/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141566/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141583/ws-services-calculation/WCBillingSlab.json b/data/as/8141583/ws-services-calculation/WCBillingSlab.json
index 1a7c09dc11..106353e42b 100644
--- a/data/as/8141583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141583/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141619/ws-services-calculation/WCBillingSlab.json b/data/as/8141619/ws-services-calculation/WCBillingSlab.json
index b462f96e69..2acf42f268 100644
--- a/data/as/8141619/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141619/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141631/ws-services-calculation/WCBillingSlab.json b/data/as/8141631/ws-services-calculation/WCBillingSlab.json
index d769f7ba57..17676646a6 100644
--- a/data/as/8141631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141631/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141643/ws-services-calculation/WCBillingSlab.json b/data/as/8141643/ws-services-calculation/WCBillingSlab.json
index 71b62f9f2d..71eeceb2fe 100644
--- a/data/as/8141643/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141643/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141666/ws-services-calculation/WCBillingSlab.json b/data/as/8141666/ws-services-calculation/WCBillingSlab.json
index 33909fe530..f35146c86c 100644
--- a/data/as/8141666/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141666/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141686/ws-services-calculation/WCBillingSlab.json b/data/as/8141686/ws-services-calculation/WCBillingSlab.json
index 71c05050a1..5a0aca6c4f 100644
--- a/data/as/8141686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141686/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141704/ws-services-calculation/WCBillingSlab.json b/data/as/8141704/ws-services-calculation/WCBillingSlab.json
index 679c7c1067..ed1bce1292 100644
--- a/data/as/8141704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141716/ws-services-calculation/WCBillingSlab.json b/data/as/8141716/ws-services-calculation/WCBillingSlab.json
index a3cac30d51..56a2138974 100644
--- a/data/as/8141716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141716/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141733/ws-services-calculation/WCBillingSlab.json b/data/as/8141733/ws-services-calculation/WCBillingSlab.json
index f95347892a..265815b380 100644
--- a/data/as/8141733/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141733/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141761/ws-services-calculation/WCBillingSlab.json b/data/as/8141761/ws-services-calculation/WCBillingSlab.json
index cbddad5bb5..20b78db165 100644
--- a/data/as/8141761/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141761/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141785/ws-services-calculation/WCBillingSlab.json b/data/as/8141785/ws-services-calculation/WCBillingSlab.json
index 07cca69642..de76913e98 100644
--- a/data/as/8141785/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141785/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141831/ws-services-calculation/WCBillingSlab.json b/data/as/8141831/ws-services-calculation/WCBillingSlab.json
index 707f34debb..89f0a423a1 100644
--- a/data/as/8141831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141831/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141923/ws-services-calculation/WCBillingSlab.json b/data/as/8141923/ws-services-calculation/WCBillingSlab.json
index 2a3717ffce..4f64bd9ae1 100644
--- a/data/as/8141923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141923/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8141972/ws-services-calculation/WCBillingSlab.json b/data/as/8141972/ws-services-calculation/WCBillingSlab.json
index 73cfc0411a..51ba7d67b1 100644
--- a/data/as/8141972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8141972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148068/ws-services-calculation/WCBillingSlab.json b/data/as/8148068/ws-services-calculation/WCBillingSlab.json
index b453cf6e6b..26d9ff3bc0 100644
--- a/data/as/8148068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148068/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148081/ws-services-calculation/WCBillingSlab.json b/data/as/8148081/ws-services-calculation/WCBillingSlab.json
index 74af209d66..b90b98d487 100644
--- a/data/as/8148081/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148081/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148097/ws-services-calculation/WCBillingSlab.json b/data/as/8148097/ws-services-calculation/WCBillingSlab.json
index a688238a11..6d01bf4896 100644
--- a/data/as/8148097/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148097/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148105/ws-services-calculation/WCBillingSlab.json b/data/as/8148105/ws-services-calculation/WCBillingSlab.json
index ef47ea7bb1..6832842a06 100644
--- a/data/as/8148105/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148105/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148116/ws-services-calculation/WCBillingSlab.json b/data/as/8148116/ws-services-calculation/WCBillingSlab.json
index c8d4ee30ec..1ab3644081 100644
--- a/data/as/8148116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148116/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148125/ws-services-calculation/WCBillingSlab.json b/data/as/8148125/ws-services-calculation/WCBillingSlab.json
index 60562c3129..4b59ceecc6 100644
--- a/data/as/8148125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148125/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148137/ws-services-calculation/WCBillingSlab.json b/data/as/8148137/ws-services-calculation/WCBillingSlab.json
index 63dd3dddf0..64cb30fc47 100644
--- a/data/as/8148137/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148137/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148159/ws-services-calculation/WCBillingSlab.json b/data/as/8148159/ws-services-calculation/WCBillingSlab.json
index 8179effb47..c190e03763 100644
--- a/data/as/8148159/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148159/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148173/ws-services-calculation/WCBillingSlab.json b/data/as/8148173/ws-services-calculation/WCBillingSlab.json
index 7abce006d2..08bfd9c414 100644
--- a/data/as/8148173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148181/ws-services-calculation/WCBillingSlab.json b/data/as/8148181/ws-services-calculation/WCBillingSlab.json
index 90aa6cd0f9..fe7fe9fdfe 100644
--- a/data/as/8148181/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148181/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148193/ws-services-calculation/WCBillingSlab.json b/data/as/8148193/ws-services-calculation/WCBillingSlab.json
index cd7f4995cc..cbdb03030a 100644
--- a/data/as/8148193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148193/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148198/ws-services-calculation/WCBillingSlab.json b/data/as/8148198/ws-services-calculation/WCBillingSlab.json
index 4a0293a333..13a8ca09f7 100644
--- a/data/as/8148198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148198/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8148257/ws-services-calculation/WCBillingSlab.json b/data/as/8148257/ws-services-calculation/WCBillingSlab.json
index 287548e3c9..e92ec621c4 100644
--- a/data/as/8148257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8148257/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153195/ws-services-calculation/WCBillingSlab.json b/data/as/8153195/ws-services-calculation/WCBillingSlab.json
index 815cc5ec25..67cba8bfef 100644
--- a/data/as/8153195/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153195/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153198/ws-services-calculation/WCBillingSlab.json b/data/as/8153198/ws-services-calculation/WCBillingSlab.json
index 00af3a71f8..dec3d64dfc 100644
--- a/data/as/8153198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153198/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153201/ws-services-calculation/WCBillingSlab.json b/data/as/8153201/ws-services-calculation/WCBillingSlab.json
index af3826f4d2..d6c155b2e0 100644
--- a/data/as/8153201/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153201/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153205/ws-services-calculation/WCBillingSlab.json b/data/as/8153205/ws-services-calculation/WCBillingSlab.json
index 7970caf479..277486c2e5 100644
--- a/data/as/8153205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153205/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153209/ws-services-calculation/WCBillingSlab.json b/data/as/8153209/ws-services-calculation/WCBillingSlab.json
index 28872c844c..6d0fc2cee7 100644
--- a/data/as/8153209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153209/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153214/ws-services-calculation/WCBillingSlab.json b/data/as/8153214/ws-services-calculation/WCBillingSlab.json
index 091111df19..bf4c38779a 100644
--- a/data/as/8153214/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153214/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153219/ws-services-calculation/WCBillingSlab.json b/data/as/8153219/ws-services-calculation/WCBillingSlab.json
index 025058a671..b76e54667e 100644
--- a/data/as/8153219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153219/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153224/ws-services-calculation/WCBillingSlab.json b/data/as/8153224/ws-services-calculation/WCBillingSlab.json
index 3117a9372d..e12c21088d 100644
--- a/data/as/8153224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153224/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153228/ws-services-calculation/WCBillingSlab.json b/data/as/8153228/ws-services-calculation/WCBillingSlab.json
index 87c1fe55ba..1b6f5d3d83 100644
--- a/data/as/8153228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153228/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153230/ws-services-calculation/WCBillingSlab.json b/data/as/8153230/ws-services-calculation/WCBillingSlab.json
index 6ddcdd24aa..977418ede3 100644
--- a/data/as/8153230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153230/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153234/ws-services-calculation/WCBillingSlab.json b/data/as/8153234/ws-services-calculation/WCBillingSlab.json
index 3ec10471d3..adaaa289ad 100644
--- a/data/as/8153234/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153234/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153241/ws-services-calculation/WCBillingSlab.json b/data/as/8153241/ws-services-calculation/WCBillingSlab.json
index 2293957bdd..bb858a25dd 100644
--- a/data/as/8153241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153241/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153248/ws-services-calculation/WCBillingSlab.json b/data/as/8153248/ws-services-calculation/WCBillingSlab.json
index 3bf3caeb8e..65ce6afd43 100644
--- a/data/as/8153248/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153248/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153287/ws-services-calculation/WCBillingSlab.json b/data/as/8153287/ws-services-calculation/WCBillingSlab.json
index fbb970554d..b556c4b563 100644
--- a/data/as/8153287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153287/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153302/ws-services-calculation/WCBillingSlab.json b/data/as/8153302/ws-services-calculation/WCBillingSlab.json
index 488bd45006..8184745437 100644
--- a/data/as/8153302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153302/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153320/ws-services-calculation/WCBillingSlab.json b/data/as/8153320/ws-services-calculation/WCBillingSlab.json
index 3badf8d541..73408c0550 100644
--- a/data/as/8153320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153320/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153337/ws-services-calculation/WCBillingSlab.json b/data/as/8153337/ws-services-calculation/WCBillingSlab.json
index ac861ce535..2683879bcd 100644
--- a/data/as/8153337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153337/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153355/ws-services-calculation/WCBillingSlab.json b/data/as/8153355/ws-services-calculation/WCBillingSlab.json
index 8db47da082..e410bd4979 100644
--- a/data/as/8153355/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153355/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153374/ws-services-calculation/WCBillingSlab.json b/data/as/8153374/ws-services-calculation/WCBillingSlab.json
index a9bc62363b..8a09f1c0fe 100644
--- a/data/as/8153374/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153374/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153399/ws-services-calculation/WCBillingSlab.json b/data/as/8153399/ws-services-calculation/WCBillingSlab.json
index 46ca459522..c5ccc0cfc8 100644
--- a/data/as/8153399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153399/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153482/ws-services-calculation/WCBillingSlab.json b/data/as/8153482/ws-services-calculation/WCBillingSlab.json
index 65c7a81a64..81450c6928 100644
--- a/data/as/8153482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153482/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153639/ws-services-calculation/WCBillingSlab.json b/data/as/8153639/ws-services-calculation/WCBillingSlab.json
index b87ec95274..da19998312 100644
--- a/data/as/8153639/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153639/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153665/ws-services-calculation/WCBillingSlab.json b/data/as/8153665/ws-services-calculation/WCBillingSlab.json
index d30643381e..fedd0dacf0 100644
--- a/data/as/8153665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153665/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153690/ws-services-calculation/WCBillingSlab.json b/data/as/8153690/ws-services-calculation/WCBillingSlab.json
index 76be3a2460..edc97a35fb 100644
--- a/data/as/8153690/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153690/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153703/ws-services-calculation/WCBillingSlab.json b/data/as/8153703/ws-services-calculation/WCBillingSlab.json
index 4cf8e41f7d..7cf2f41878 100644
--- a/data/as/8153703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153703/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153723/ws-services-calculation/WCBillingSlab.json b/data/as/8153723/ws-services-calculation/WCBillingSlab.json
index 9fd2cf9d79..d3b5768f29 100644
--- a/data/as/8153723/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153723/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153746/ws-services-calculation/WCBillingSlab.json b/data/as/8153746/ws-services-calculation/WCBillingSlab.json
index b4c213dfe7..b9286b61b8 100644
--- a/data/as/8153746/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153746/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153766/ws-services-calculation/WCBillingSlab.json b/data/as/8153766/ws-services-calculation/WCBillingSlab.json
index 39849049b0..12374cbe76 100644
--- a/data/as/8153766/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153766/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153777/ws-services-calculation/WCBillingSlab.json b/data/as/8153777/ws-services-calculation/WCBillingSlab.json
index fb9cc9ea9c..5a48dcfb35 100644
--- a/data/as/8153777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153777/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153800/ws-services-calculation/WCBillingSlab.json b/data/as/8153800/ws-services-calculation/WCBillingSlab.json
index 59ee60524f..1e44f2f961 100644
--- a/data/as/8153800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153800/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153823/ws-services-calculation/WCBillingSlab.json b/data/as/8153823/ws-services-calculation/WCBillingSlab.json
index 30144be4df..f74c8fa4be 100644
--- a/data/as/8153823/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153823/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8153844/ws-services-calculation/WCBillingSlab.json b/data/as/8153844/ws-services-calculation/WCBillingSlab.json
index 0280ede8d9..ccb4e2b283 100644
--- a/data/as/8153844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8153844/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8154251/ws-services-calculation/WCBillingSlab.json b/data/as/8154251/ws-services-calculation/WCBillingSlab.json
index 71231058ac..628c136d69 100644
--- a/data/as/8154251/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8154251/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155025/ws-services-calculation/WCBillingSlab.json b/data/as/8155025/ws-services-calculation/WCBillingSlab.json
index 907c5000c8..7327897737 100644
--- a/data/as/8155025/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155025/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155026/ws-services-calculation/WCBillingSlab.json b/data/as/8155026/ws-services-calculation/WCBillingSlab.json
index 1b6875ec9d..e6f553f0d8 100644
--- a/data/as/8155026/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155026/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155041/ws-services-calculation/WCBillingSlab.json b/data/as/8155041/ws-services-calculation/WCBillingSlab.json
index 0d2544d184..029939a2f3 100644
--- a/data/as/8155041/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155041/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155049/ws-services-calculation/WCBillingSlab.json b/data/as/8155049/ws-services-calculation/WCBillingSlab.json
index e78e47b17d..6eab57b806 100644
--- a/data/as/8155049/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155049/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155055/ws-services-calculation/WCBillingSlab.json b/data/as/8155055/ws-services-calculation/WCBillingSlab.json
index 8171896124..f9fdb6be77 100644
--- a/data/as/8155055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155055/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155070/ws-services-calculation/WCBillingSlab.json b/data/as/8155070/ws-services-calculation/WCBillingSlab.json
index 53541b26ac..4204ed2895 100644
--- a/data/as/8155070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155070/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155090/ws-services-calculation/WCBillingSlab.json b/data/as/8155090/ws-services-calculation/WCBillingSlab.json
index 9cf31115e3..8308a11677 100644
--- a/data/as/8155090/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155090/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155168/ws-services-calculation/WCBillingSlab.json b/data/as/8155168/ws-services-calculation/WCBillingSlab.json
index 034e0e8865..7a79a0085b 100644
--- a/data/as/8155168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155168/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155206/ws-services-calculation/WCBillingSlab.json b/data/as/8155206/ws-services-calculation/WCBillingSlab.json
index 3ac96831ac..c4127ef637 100644
--- a/data/as/8155206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155206/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155271/ws-services-calculation/WCBillingSlab.json b/data/as/8155271/ws-services-calculation/WCBillingSlab.json
index 6b390fdd51..89bd09efb9 100644
--- a/data/as/8155271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155271/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155279/ws-services-calculation/WCBillingSlab.json b/data/as/8155279/ws-services-calculation/WCBillingSlab.json
index e73380692e..a971f567a1 100644
--- a/data/as/8155279/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155279/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8155344/ws-services-calculation/WCBillingSlab.json b/data/as/8155344/ws-services-calculation/WCBillingSlab.json
index b836ab1328..7c11abc8fc 100644
--- a/data/as/8155344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8155344/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156157/ws-services-calculation/WCBillingSlab.json b/data/as/8156157/ws-services-calculation/WCBillingSlab.json
index 01bf5f1d8c..3b3618a245 100644
--- a/data/as/8156157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156157/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156180/ws-services-calculation/WCBillingSlab.json b/data/as/8156180/ws-services-calculation/WCBillingSlab.json
index dd490de0ef..7cd21e8bec 100644
--- a/data/as/8156180/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156180/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156193/ws-services-calculation/WCBillingSlab.json b/data/as/8156193/ws-services-calculation/WCBillingSlab.json
index d240209f03..8fede31d4e 100644
--- a/data/as/8156193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156193/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156208/ws-services-calculation/WCBillingSlab.json b/data/as/8156208/ws-services-calculation/WCBillingSlab.json
index f7c8827a39..8cf1e167ab 100644
--- a/data/as/8156208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156216/ws-services-calculation/WCBillingSlab.json b/data/as/8156216/ws-services-calculation/WCBillingSlab.json
index 1dea6b06da..e51f959190 100644
--- a/data/as/8156216/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156216/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156220/ws-services-calculation/WCBillingSlab.json b/data/as/8156220/ws-services-calculation/WCBillingSlab.json
index 9281304599..25c9c848e1 100644
--- a/data/as/8156220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156220/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156223/ws-services-calculation/WCBillingSlab.json b/data/as/8156223/ws-services-calculation/WCBillingSlab.json
index 6051a33762..25d2bc5570 100644
--- a/data/as/8156223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156231/ws-services-calculation/WCBillingSlab.json b/data/as/8156231/ws-services-calculation/WCBillingSlab.json
index 7e60044bc8..eb235542ad 100644
--- a/data/as/8156231/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156231/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156241/ws-services-calculation/WCBillingSlab.json b/data/as/8156241/ws-services-calculation/WCBillingSlab.json
index a5427a17a0..62ba3bebf2 100644
--- a/data/as/8156241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156241/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156244/ws-services-calculation/WCBillingSlab.json b/data/as/8156244/ws-services-calculation/WCBillingSlab.json
index 5c2e8625b5..a57f3f6b16 100644
--- a/data/as/8156244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156244/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156253/ws-services-calculation/WCBillingSlab.json b/data/as/8156253/ws-services-calculation/WCBillingSlab.json
index e36af638f3..1e8ddd4ac0 100644
--- a/data/as/8156253/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156253/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156257/ws-services-calculation/WCBillingSlab.json b/data/as/8156257/ws-services-calculation/WCBillingSlab.json
index f000dd9625..c06a9e9c8e 100644
--- a/data/as/8156257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156257/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156263/ws-services-calculation/WCBillingSlab.json b/data/as/8156263/ws-services-calculation/WCBillingSlab.json
index b5fdcfd97a..6b7756f361 100644
--- a/data/as/8156263/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156263/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156271/ws-services-calculation/WCBillingSlab.json b/data/as/8156271/ws-services-calculation/WCBillingSlab.json
index 8c54da8dbd..aed18163bf 100644
--- a/data/as/8156271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156271/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156274/ws-services-calculation/WCBillingSlab.json b/data/as/8156274/ws-services-calculation/WCBillingSlab.json
index fc2a59189d..612925db0d 100644
--- a/data/as/8156274/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156274/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156288/ws-services-calculation/WCBillingSlab.json b/data/as/8156288/ws-services-calculation/WCBillingSlab.json
index bd8d5eb846..9667f8eb0c 100644
--- a/data/as/8156288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156288/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156289/ws-services-calculation/WCBillingSlab.json b/data/as/8156289/ws-services-calculation/WCBillingSlab.json
index 86803c959d..c5f3ef69a4 100644
--- a/data/as/8156289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156289/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156315/ws-services-calculation/WCBillingSlab.json b/data/as/8156315/ws-services-calculation/WCBillingSlab.json
index a1acdfbb75..bd5c30f700 100644
--- a/data/as/8156315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156315/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156393/ws-services-calculation/WCBillingSlab.json b/data/as/8156393/ws-services-calculation/WCBillingSlab.json
index a2024cc954..6627443370 100644
--- a/data/as/8156393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156393/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156410/ws-services-calculation/WCBillingSlab.json b/data/as/8156410/ws-services-calculation/WCBillingSlab.json
index 7feb058c93..ecb1ff43e4 100644
--- a/data/as/8156410/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156410/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156419/ws-services-calculation/WCBillingSlab.json b/data/as/8156419/ws-services-calculation/WCBillingSlab.json
index 2ccf334a0e..48ded99c62 100644
--- a/data/as/8156419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156424/ws-services-calculation/WCBillingSlab.json b/data/as/8156424/ws-services-calculation/WCBillingSlab.json
index ca617e0fdf..113caab0b2 100644
--- a/data/as/8156424/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156424/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156430/ws-services-calculation/WCBillingSlab.json b/data/as/8156430/ws-services-calculation/WCBillingSlab.json
index 10c32e972f..78cd873b17 100644
--- a/data/as/8156430/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156430/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8156440/ws-services-calculation/WCBillingSlab.json b/data/as/8156440/ws-services-calculation/WCBillingSlab.json
index 52d425b9af..acdb1cf5e3 100644
--- a/data/as/8156440/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8156440/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157519/ws-services-calculation/WCBillingSlab.json b/data/as/8157519/ws-services-calculation/WCBillingSlab.json
index f78bcb0762..292885f9f5 100644
--- a/data/as/8157519/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157519/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157593/ws-services-calculation/WCBillingSlab.json b/data/as/8157593/ws-services-calculation/WCBillingSlab.json
index edf1a66289..6dd241d858 100644
--- a/data/as/8157593/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157593/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157595/ws-services-calculation/WCBillingSlab.json b/data/as/8157595/ws-services-calculation/WCBillingSlab.json
index 65c53d6338..b55b2aace0 100644
--- a/data/as/8157595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157595/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157600/ws-services-calculation/WCBillingSlab.json b/data/as/8157600/ws-services-calculation/WCBillingSlab.json
index 662aa80ccd..4cf4383b3d 100644
--- a/data/as/8157600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157600/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157602/ws-services-calculation/WCBillingSlab.json b/data/as/8157602/ws-services-calculation/WCBillingSlab.json
index a338ad972e..ccea5979d6 100644
--- a/data/as/8157602/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157602/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8157739/ws-services-calculation/WCBillingSlab.json b/data/as/8157739/ws-services-calculation/WCBillingSlab.json
index 3a2bfcc88e..4ed8dca926 100644
--- a/data/as/8157739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8157739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159295/ws-services-calculation/WCBillingSlab.json b/data/as/8159295/ws-services-calculation/WCBillingSlab.json
index 1143d2d02e..256b10e537 100644
--- a/data/as/8159295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159295/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159645/ws-services-calculation/WCBillingSlab.json b/data/as/8159645/ws-services-calculation/WCBillingSlab.json
index 1787c3968f..eceb331193 100644
--- a/data/as/8159645/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159645/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159671/ws-services-calculation/WCBillingSlab.json b/data/as/8159671/ws-services-calculation/WCBillingSlab.json
index 12538d664a..92aafee107 100644
--- a/data/as/8159671/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159671/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159680/ws-services-calculation/WCBillingSlab.json b/data/as/8159680/ws-services-calculation/WCBillingSlab.json
index a7166992a9..2c1fbbd9cb 100644
--- a/data/as/8159680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159680/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159691/ws-services-calculation/WCBillingSlab.json b/data/as/8159691/ws-services-calculation/WCBillingSlab.json
index 7bd7356d33..f1545b49fd 100644
--- a/data/as/8159691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159691/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159704/ws-services-calculation/WCBillingSlab.json b/data/as/8159704/ws-services-calculation/WCBillingSlab.json
index 61b85656d2..54ed3ad9c3 100644
--- a/data/as/8159704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159717/ws-services-calculation/WCBillingSlab.json b/data/as/8159717/ws-services-calculation/WCBillingSlab.json
index bf2c1114ae..390f1600cc 100644
--- a/data/as/8159717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159717/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159727/ws-services-calculation/WCBillingSlab.json b/data/as/8159727/ws-services-calculation/WCBillingSlab.json
index 296f7f80a9..802b7d466d 100644
--- a/data/as/8159727/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159727/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159738/ws-services-calculation/WCBillingSlab.json b/data/as/8159738/ws-services-calculation/WCBillingSlab.json
index 214bdbc0b9..321d5fd743 100644
--- a/data/as/8159738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159738/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159747/ws-services-calculation/WCBillingSlab.json b/data/as/8159747/ws-services-calculation/WCBillingSlab.json
index ffc82330e5..fa9fa52227 100644
--- a/data/as/8159747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159747/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159851/ws-services-calculation/WCBillingSlab.json b/data/as/8159851/ws-services-calculation/WCBillingSlab.json
index b74fb9d713..5a02797f93 100644
--- a/data/as/8159851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159851/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159874/ws-services-calculation/WCBillingSlab.json b/data/as/8159874/ws-services-calculation/WCBillingSlab.json
index f647ed6e3d..6fc5a71be0 100644
--- a/data/as/8159874/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159874/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159939/ws-services-calculation/WCBillingSlab.json b/data/as/8159939/ws-services-calculation/WCBillingSlab.json
index 1fb2b3fbc5..a731f5fc57 100644
--- a/data/as/8159939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159939/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159954/ws-services-calculation/WCBillingSlab.json b/data/as/8159954/ws-services-calculation/WCBillingSlab.json
index 9fd7c8cadb..6653b3ce91 100644
--- a/data/as/8159954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159954/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8159963/ws-services-calculation/WCBillingSlab.json b/data/as/8159963/ws-services-calculation/WCBillingSlab.json
index d2442d59eb..2ade84fe84 100644
--- a/data/as/8159963/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8159963/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160000/ws-services-calculation/WCBillingSlab.json b/data/as/8160000/ws-services-calculation/WCBillingSlab.json
index 34dfe509e0..9628cefa21 100644
--- a/data/as/8160000/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160000/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160005/ws-services-calculation/WCBillingSlab.json b/data/as/8160005/ws-services-calculation/WCBillingSlab.json
index 67246bb48e..085a1f4379 100644
--- a/data/as/8160005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160005/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160019/ws-services-calculation/WCBillingSlab.json b/data/as/8160019/ws-services-calculation/WCBillingSlab.json
index f22a1f9951..43678ac99b 100644
--- a/data/as/8160019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160019/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160027/ws-services-calculation/WCBillingSlab.json b/data/as/8160027/ws-services-calculation/WCBillingSlab.json
index f65af03469..51bca6f17f 100644
--- a/data/as/8160027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160039/ws-services-calculation/WCBillingSlab.json b/data/as/8160039/ws-services-calculation/WCBillingSlab.json
index abb994d659..9119ab453b 100644
--- a/data/as/8160039/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160039/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160338/ws-services-calculation/WCBillingSlab.json b/data/as/8160338/ws-services-calculation/WCBillingSlab.json
index e8a8f1bf2b..3ab116a0e4 100644
--- a/data/as/8160338/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160338/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160353/ws-services-calculation/WCBillingSlab.json b/data/as/8160353/ws-services-calculation/WCBillingSlab.json
index dec59dc33b..cf84575ec4 100644
--- a/data/as/8160353/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160353/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160367/ws-services-calculation/WCBillingSlab.json b/data/as/8160367/ws-services-calculation/WCBillingSlab.json
index a4bef7d004..27a247127b 100644
--- a/data/as/8160367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160367/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160379/ws-services-calculation/WCBillingSlab.json b/data/as/8160379/ws-services-calculation/WCBillingSlab.json
index c4c378e0b0..a7ac71a300 100644
--- a/data/as/8160379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160379/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160387/ws-services-calculation/WCBillingSlab.json b/data/as/8160387/ws-services-calculation/WCBillingSlab.json
index de3868ecd6..df2756acce 100644
--- a/data/as/8160387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160400/ws-services-calculation/WCBillingSlab.json b/data/as/8160400/ws-services-calculation/WCBillingSlab.json
index b5e47e4929..bc6ba368d2 100644
--- a/data/as/8160400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160400/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160409/ws-services-calculation/WCBillingSlab.json b/data/as/8160409/ws-services-calculation/WCBillingSlab.json
index 81f96682fd..54d9d82dc6 100644
--- a/data/as/8160409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160409/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160417/ws-services-calculation/WCBillingSlab.json b/data/as/8160417/ws-services-calculation/WCBillingSlab.json
index e3dfcb2d5a..1037683ab3 100644
--- a/data/as/8160417/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160417/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160423/ws-services-calculation/WCBillingSlab.json b/data/as/8160423/ws-services-calculation/WCBillingSlab.json
index cb51490365..cbb92a0998 100644
--- a/data/as/8160423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160423/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160451/ws-services-calculation/WCBillingSlab.json b/data/as/8160451/ws-services-calculation/WCBillingSlab.json
index 6f336b0d4b..8fb60e8981 100644
--- a/data/as/8160451/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160451/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160455/ws-services-calculation/WCBillingSlab.json b/data/as/8160455/ws-services-calculation/WCBillingSlab.json
index 81f8b22306..fc01ee759d 100644
--- a/data/as/8160455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160455/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160460/ws-services-calculation/WCBillingSlab.json b/data/as/8160460/ws-services-calculation/WCBillingSlab.json
index ef05067a3c..584a24c271 100644
--- a/data/as/8160460/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160460/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160467/ws-services-calculation/WCBillingSlab.json b/data/as/8160467/ws-services-calculation/WCBillingSlab.json
index bebb6f5a13..fd2918cba3 100644
--- a/data/as/8160467/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160467/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160474/ws-services-calculation/WCBillingSlab.json b/data/as/8160474/ws-services-calculation/WCBillingSlab.json
index bccea8e9c7..f1336fecfa 100644
--- a/data/as/8160474/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160474/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160796/ws-services-calculation/WCBillingSlab.json b/data/as/8160796/ws-services-calculation/WCBillingSlab.json
index 7eefa1a8d0..57d64d8fc6 100644
--- a/data/as/8160796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160796/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160817/ws-services-calculation/WCBillingSlab.json b/data/as/8160817/ws-services-calculation/WCBillingSlab.json
index 2798b07b55..cafb552e20 100644
--- a/data/as/8160817/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160817/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160827/ws-services-calculation/WCBillingSlab.json b/data/as/8160827/ws-services-calculation/WCBillingSlab.json
index 0e13f8cc90..501a917e1d 100644
--- a/data/as/8160827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160827/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160840/ws-services-calculation/WCBillingSlab.json b/data/as/8160840/ws-services-calculation/WCBillingSlab.json
index cdac898cb1..2ecb3f7f8d 100644
--- a/data/as/8160840/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160840/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160852/ws-services-calculation/WCBillingSlab.json b/data/as/8160852/ws-services-calculation/WCBillingSlab.json
index ee4a267797..6040d2403c 100644
--- a/data/as/8160852/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160852/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160864/ws-services-calculation/WCBillingSlab.json b/data/as/8160864/ws-services-calculation/WCBillingSlab.json
index 8c6a389490..0c60b7e28e 100644
--- a/data/as/8160864/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160864/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160875/ws-services-calculation/WCBillingSlab.json b/data/as/8160875/ws-services-calculation/WCBillingSlab.json
index 6c750b602f..525145dab1 100644
--- a/data/as/8160875/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160875/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160897/ws-services-calculation/WCBillingSlab.json b/data/as/8160897/ws-services-calculation/WCBillingSlab.json
index 12d480edaa..60828777a1 100644
--- a/data/as/8160897/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160897/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8160910/ws-services-calculation/WCBillingSlab.json b/data/as/8160910/ws-services-calculation/WCBillingSlab.json
index 684615870d..5dc017fe43 100644
--- a/data/as/8160910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8160910/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161016/ws-services-calculation/WCBillingSlab.json b/data/as/8161016/ws-services-calculation/WCBillingSlab.json
index 4efbfafcaa..87097ccdf4 100644
--- a/data/as/8161016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161016/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161774/ws-services-calculation/WCBillingSlab.json b/data/as/8161774/ws-services-calculation/WCBillingSlab.json
index be592e0cd8..e2b937c266 100644
--- a/data/as/8161774/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161774/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161776/ws-services-calculation/WCBillingSlab.json b/data/as/8161776/ws-services-calculation/WCBillingSlab.json
index ea38321740..43ef3194fc 100644
--- a/data/as/8161776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161776/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161778/ws-services-calculation/WCBillingSlab.json b/data/as/8161778/ws-services-calculation/WCBillingSlab.json
index 7a30d5c980..c6a6f47b78 100644
--- a/data/as/8161778/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161778/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161779/ws-services-calculation/WCBillingSlab.json b/data/as/8161779/ws-services-calculation/WCBillingSlab.json
index 111cb36006..e6c8271d56 100644
--- a/data/as/8161779/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161779/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161782/ws-services-calculation/WCBillingSlab.json b/data/as/8161782/ws-services-calculation/WCBillingSlab.json
index 6a12153ad6..dbea619e92 100644
--- a/data/as/8161782/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161782/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161786/ws-services-calculation/WCBillingSlab.json b/data/as/8161786/ws-services-calculation/WCBillingSlab.json
index 0072284282..df1b2514b9 100644
--- a/data/as/8161786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161786/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161790/ws-services-calculation/WCBillingSlab.json b/data/as/8161790/ws-services-calculation/WCBillingSlab.json
index 55ef36d4e0..31f3e7fd66 100644
--- a/data/as/8161790/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161790/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161794/ws-services-calculation/WCBillingSlab.json b/data/as/8161794/ws-services-calculation/WCBillingSlab.json
index 9a43a76918..b6085fea73 100644
--- a/data/as/8161794/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161794/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161801/ws-services-calculation/WCBillingSlab.json b/data/as/8161801/ws-services-calculation/WCBillingSlab.json
index 499ba8e90b..7eb14cde0f 100644
--- a/data/as/8161801/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161801/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161808/ws-services-calculation/WCBillingSlab.json b/data/as/8161808/ws-services-calculation/WCBillingSlab.json
index 167aac90b5..2ebb1182b3 100644
--- a/data/as/8161808/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161808/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161819/ws-services-calculation/WCBillingSlab.json b/data/as/8161819/ws-services-calculation/WCBillingSlab.json
index d7f816989a..05b46c3b95 100644
--- a/data/as/8161819/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161819/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161828/ws-services-calculation/WCBillingSlab.json b/data/as/8161828/ws-services-calculation/WCBillingSlab.json
index e2fc371192..8188193455 100644
--- a/data/as/8161828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161828/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161841/ws-services-calculation/WCBillingSlab.json b/data/as/8161841/ws-services-calculation/WCBillingSlab.json
index 27ce5edd7e..23bff969c1 100644
--- a/data/as/8161841/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161841/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161861/ws-services-calculation/WCBillingSlab.json b/data/as/8161861/ws-services-calculation/WCBillingSlab.json
index 1163dc21d9..e62b118644 100644
--- a/data/as/8161861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161861/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161882/ws-services-calculation/WCBillingSlab.json b/data/as/8161882/ws-services-calculation/WCBillingSlab.json
index ffa3267b3c..6bb6deb2ca 100644
--- a/data/as/8161882/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161882/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161897/ws-services-calculation/WCBillingSlab.json b/data/as/8161897/ws-services-calculation/WCBillingSlab.json
index 35682b6527..f7d645ddbb 100644
--- a/data/as/8161897/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161897/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161907/ws-services-calculation/WCBillingSlab.json b/data/as/8161907/ws-services-calculation/WCBillingSlab.json
index 043e42c412..33f03b2f3a 100644
--- a/data/as/8161907/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161907/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161918/ws-services-calculation/WCBillingSlab.json b/data/as/8161918/ws-services-calculation/WCBillingSlab.json
index e2b53eea0f..ff7db3eb48 100644
--- a/data/as/8161918/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161918/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161943/ws-services-calculation/WCBillingSlab.json b/data/as/8161943/ws-services-calculation/WCBillingSlab.json
index 90f17ccd0c..e3ab3efc07 100644
--- a/data/as/8161943/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161943/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161960/ws-services-calculation/WCBillingSlab.json b/data/as/8161960/ws-services-calculation/WCBillingSlab.json
index d4c29227bb..fc4348c2f3 100644
--- a/data/as/8161960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161960/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161985/ws-services-calculation/WCBillingSlab.json b/data/as/8161985/ws-services-calculation/WCBillingSlab.json
index 2b4b19cb61..7515765147 100644
--- a/data/as/8161985/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161985/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8161998/ws-services-calculation/WCBillingSlab.json b/data/as/8161998/ws-services-calculation/WCBillingSlab.json
index c8372df6ce..e7a2d8277e 100644
--- a/data/as/8161998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8161998/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162013/ws-services-calculation/WCBillingSlab.json b/data/as/8162013/ws-services-calculation/WCBillingSlab.json
index 4993877600..22cdcab78a 100644
--- a/data/as/8162013/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162013/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162057/ws-services-calculation/WCBillingSlab.json b/data/as/8162057/ws-services-calculation/WCBillingSlab.json
index a9650ffddf..ff0fdc51be 100644
--- a/data/as/8162057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162057/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162079/ws-services-calculation/WCBillingSlab.json b/data/as/8162079/ws-services-calculation/WCBillingSlab.json
index 58ba637021..12d25ad5a6 100644
--- a/data/as/8162079/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162079/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162125/ws-services-calculation/WCBillingSlab.json b/data/as/8162125/ws-services-calculation/WCBillingSlab.json
index cb8f716888..dd53b2a544 100644
--- a/data/as/8162125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162125/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8162166/ws-services-calculation/WCBillingSlab.json b/data/as/8162166/ws-services-calculation/WCBillingSlab.json
index 0769ddfce6..2274f10e6e 100644
--- a/data/as/8162166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8162166/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171324/ws-services-calculation/WCBillingSlab.json b/data/as/8171324/ws-services-calculation/WCBillingSlab.json
index 38d285b76c..7de9c3435a 100644
--- a/data/as/8171324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171324/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171366/ws-services-calculation/WCBillingSlab.json b/data/as/8171366/ws-services-calculation/WCBillingSlab.json
index 223ff4753e..a3d6349367 100644
--- a/data/as/8171366/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171366/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171388/ws-services-calculation/WCBillingSlab.json b/data/as/8171388/ws-services-calculation/WCBillingSlab.json
index 1de46d54b2..cf1c792481 100644
--- a/data/as/8171388/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171388/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171415/ws-services-calculation/WCBillingSlab.json b/data/as/8171415/ws-services-calculation/WCBillingSlab.json
index c20d0382ba..2295bcd452 100644
--- a/data/as/8171415/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171415/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171462/ws-services-calculation/WCBillingSlab.json b/data/as/8171462/ws-services-calculation/WCBillingSlab.json
index cba6492de6..cccc7dcbf4 100644
--- a/data/as/8171462/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171462/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171475/ws-services-calculation/WCBillingSlab.json b/data/as/8171475/ws-services-calculation/WCBillingSlab.json
index 19b2ff9f38..b2fb463c32 100644
--- a/data/as/8171475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171475/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171505/ws-services-calculation/WCBillingSlab.json b/data/as/8171505/ws-services-calculation/WCBillingSlab.json
index a8794cb9be..b91f710d3c 100644
--- a/data/as/8171505/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171505/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171518/ws-services-calculation/WCBillingSlab.json b/data/as/8171518/ws-services-calculation/WCBillingSlab.json
index 9f2836a239..1f9a550961 100644
--- a/data/as/8171518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171518/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171531/ws-services-calculation/WCBillingSlab.json b/data/as/8171531/ws-services-calculation/WCBillingSlab.json
index 7b72104058..f737d30ca9 100644
--- a/data/as/8171531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171531/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171572/ws-services-calculation/WCBillingSlab.json b/data/as/8171572/ws-services-calculation/WCBillingSlab.json
index 91535d87fa..f75201dd19 100644
--- a/data/as/8171572/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171572/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171735/ws-services-calculation/WCBillingSlab.json b/data/as/8171735/ws-services-calculation/WCBillingSlab.json
index 8d73f78dd7..54bddeb8f6 100644
--- a/data/as/8171735/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171735/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171834/ws-services-calculation/WCBillingSlab.json b/data/as/8171834/ws-services-calculation/WCBillingSlab.json
index be76c0ee20..e26941b13d 100644
--- a/data/as/8171834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171834/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171872/ws-services-calculation/WCBillingSlab.json b/data/as/8171872/ws-services-calculation/WCBillingSlab.json
index 5eb13a24d7..dfb0bc1819 100644
--- a/data/as/8171872/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171872/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171904/ws-services-calculation/WCBillingSlab.json b/data/as/8171904/ws-services-calculation/WCBillingSlab.json
index 3eb028fce8..69bc8ed52d 100644
--- a/data/as/8171904/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171904/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171945/ws-services-calculation/WCBillingSlab.json b/data/as/8171945/ws-services-calculation/WCBillingSlab.json
index dd8b75eb24..de3e31a965 100644
--- a/data/as/8171945/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171945/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171970/ws-services-calculation/WCBillingSlab.json b/data/as/8171970/ws-services-calculation/WCBillingSlab.json
index deeb24989e..70cba56659 100644
--- a/data/as/8171970/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171970/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8171989/ws-services-calculation/WCBillingSlab.json b/data/as/8171989/ws-services-calculation/WCBillingSlab.json
index d615dde13a..e69901b5eb 100644
--- a/data/as/8171989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8171989/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8172016/ws-services-calculation/WCBillingSlab.json b/data/as/8172016/ws-services-calculation/WCBillingSlab.json
index 78506ef990..a2d668617f 100644
--- a/data/as/8172016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8172016/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8172071/ws-services-calculation/WCBillingSlab.json b/data/as/8172071/ws-services-calculation/WCBillingSlab.json
index b3caa9ad34..0897dd577a 100644
--- a/data/as/8172071/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8172071/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175220/ws-services-calculation/WCBillingSlab.json b/data/as/8175220/ws-services-calculation/WCBillingSlab.json
index 65a1aded0c..172342b6eb 100644
--- a/data/as/8175220/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175220/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175227/ws-services-calculation/WCBillingSlab.json b/data/as/8175227/ws-services-calculation/WCBillingSlab.json
index e9d0b163a9..6f0a717563 100644
--- a/data/as/8175227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175227/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175232/ws-services-calculation/WCBillingSlab.json b/data/as/8175232/ws-services-calculation/WCBillingSlab.json
index a0beb86583..cf8a01fb76 100644
--- a/data/as/8175232/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175232/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175237/ws-services-calculation/WCBillingSlab.json b/data/as/8175237/ws-services-calculation/WCBillingSlab.json
index af5ab5afa6..8ab1b7665e 100644
--- a/data/as/8175237/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175237/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175241/ws-services-calculation/WCBillingSlab.json b/data/as/8175241/ws-services-calculation/WCBillingSlab.json
index a746704eb4..9ecb969e9b 100644
--- a/data/as/8175241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175241/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175267/ws-services-calculation/WCBillingSlab.json b/data/as/8175267/ws-services-calculation/WCBillingSlab.json
index f2ce78ba1e..14bb9048f0 100644
--- a/data/as/8175267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175267/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8175588/ws-services-calculation/WCBillingSlab.json b/data/as/8175588/ws-services-calculation/WCBillingSlab.json
index c258cd0cb5..f5bf0b53a3 100644
--- a/data/as/8175588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8175588/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176558/ws-services-calculation/WCBillingSlab.json b/data/as/8176558/ws-services-calculation/WCBillingSlab.json
index 425905ce5b..c5e3bb3f7a 100644
--- a/data/as/8176558/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176558/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176578/ws-services-calculation/WCBillingSlab.json b/data/as/8176578/ws-services-calculation/WCBillingSlab.json
index e2ef80bda1..b9549b665e 100644
--- a/data/as/8176578/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176578/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176607/ws-services-calculation/WCBillingSlab.json b/data/as/8176607/ws-services-calculation/WCBillingSlab.json
index f03e85b8a1..ff71bc2fd3 100644
--- a/data/as/8176607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176607/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8176627/ws-services-calculation/WCBillingSlab.json b/data/as/8176627/ws-services-calculation/WCBillingSlab.json
index b8a0fc1077..39141efd84 100644
--- a/data/as/8176627/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8176627/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8177941/ws-services-calculation/WCBillingSlab.json b/data/as/8177941/ws-services-calculation/WCBillingSlab.json
index bea2a5dff4..e31480e7f5 100644
--- a/data/as/8177941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8177941/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178172/ws-services-calculation/WCBillingSlab.json b/data/as/8178172/ws-services-calculation/WCBillingSlab.json
index 45729a14dd..1933f7c007 100644
--- a/data/as/8178172/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178172/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178282/ws-services-calculation/WCBillingSlab.json b/data/as/8178282/ws-services-calculation/WCBillingSlab.json
index f80813f1c7..6d9d0794ba 100644
--- a/data/as/8178282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178282/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178343/ws-services-calculation/WCBillingSlab.json b/data/as/8178343/ws-services-calculation/WCBillingSlab.json
index ce6f721424..99022258e8 100644
--- a/data/as/8178343/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178343/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178428/ws-services-calculation/WCBillingSlab.json b/data/as/8178428/ws-services-calculation/WCBillingSlab.json
index a992774cc6..0b05439cf4 100644
--- a/data/as/8178428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178428/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178783/ws-services-calculation/WCBillingSlab.json b/data/as/8178783/ws-services-calculation/WCBillingSlab.json
index 0544abfd33..fb85f2f1f3 100644
--- a/data/as/8178783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178783/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178821/ws-services-calculation/WCBillingSlab.json b/data/as/8178821/ws-services-calculation/WCBillingSlab.json
index 61772d2ce7..af4a084649 100644
--- a/data/as/8178821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178821/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178861/ws-services-calculation/WCBillingSlab.json b/data/as/8178861/ws-services-calculation/WCBillingSlab.json
index cb86ecff62..cc1d28c0f5 100644
--- a/data/as/8178861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178861/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178895/ws-services-calculation/WCBillingSlab.json b/data/as/8178895/ws-services-calculation/WCBillingSlab.json
index d42e5a75a7..d5b8f952c3 100644
--- a/data/as/8178895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178895/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8178929/ws-services-calculation/WCBillingSlab.json b/data/as/8178929/ws-services-calculation/WCBillingSlab.json
index f5881448df..54bda855dc 100644
--- a/data/as/8178929/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8178929/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181830/ws-services-calculation/WCBillingSlab.json b/data/as/8181830/ws-services-calculation/WCBillingSlab.json
index 183b2576f2..c1fd32c737 100644
--- a/data/as/8181830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181830/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181848/ws-services-calculation/WCBillingSlab.json b/data/as/8181848/ws-services-calculation/WCBillingSlab.json
index cdd30230ac..2a2faa8b61 100644
--- a/data/as/8181848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181848/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181875/ws-services-calculation/WCBillingSlab.json b/data/as/8181875/ws-services-calculation/WCBillingSlab.json
index eaa5002925..52b818c996 100644
--- a/data/as/8181875/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181875/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8181912/ws-services-calculation/WCBillingSlab.json b/data/as/8181912/ws-services-calculation/WCBillingSlab.json
index 33ca14b891..5036bb3116 100644
--- a/data/as/8181912/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8181912/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8183542/ws-services-calculation/WCBillingSlab.json b/data/as/8183542/ws-services-calculation/WCBillingSlab.json
index c39f2c1cd4..eb79dd7582 100644
--- a/data/as/8183542/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8183542/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8183933/ws-services-calculation/WCBillingSlab.json b/data/as/8183933/ws-services-calculation/WCBillingSlab.json
index 54b1309a50..1db5764af9 100644
--- a/data/as/8183933/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8183933/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184246/ws-services-calculation/WCBillingSlab.json b/data/as/8184246/ws-services-calculation/WCBillingSlab.json
index 329c4334ba..07fc18c62d 100644
--- a/data/as/8184246/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184246/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184256/ws-services-calculation/WCBillingSlab.json b/data/as/8184256/ws-services-calculation/WCBillingSlab.json
index f86419c9e8..e0d9171132 100644
--- a/data/as/8184256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184256/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184281/ws-services-calculation/WCBillingSlab.json b/data/as/8184281/ws-services-calculation/WCBillingSlab.json
index 236766ce2f..4af092e872 100644
--- a/data/as/8184281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184281/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8184539/ws-services-calculation/WCBillingSlab.json b/data/as/8184539/ws-services-calculation/WCBillingSlab.json
index 222a653df2..35b4d7b6f5 100644
--- a/data/as/8184539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8184539/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185128/ws-services-calculation/WCBillingSlab.json b/data/as/8185128/ws-services-calculation/WCBillingSlab.json
index f8f824de16..03538ee9bf 100644
--- a/data/as/8185128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185128/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185176/ws-services-calculation/WCBillingSlab.json b/data/as/8185176/ws-services-calculation/WCBillingSlab.json
index b39db932f5..08deb9786f 100644
--- a/data/as/8185176/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185176/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185212/ws-services-calculation/WCBillingSlab.json b/data/as/8185212/ws-services-calculation/WCBillingSlab.json
index 40abceed4b..eb02b46201 100644
--- a/data/as/8185212/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185212/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185242/ws-services-calculation/WCBillingSlab.json b/data/as/8185242/ws-services-calculation/WCBillingSlab.json
index 7759814b99..e9689518ad 100644
--- a/data/as/8185242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185242/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185270/ws-services-calculation/WCBillingSlab.json b/data/as/8185270/ws-services-calculation/WCBillingSlab.json
index 30a58762b9..ba4f4eccb7 100644
--- a/data/as/8185270/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185270/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185286/ws-services-calculation/WCBillingSlab.json b/data/as/8185286/ws-services-calculation/WCBillingSlab.json
index 89c0f9b1b0..e6db644603 100644
--- a/data/as/8185286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185317/ws-services-calculation/WCBillingSlab.json b/data/as/8185317/ws-services-calculation/WCBillingSlab.json
index d3eceba0e0..9fe948c20f 100644
--- a/data/as/8185317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185317/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185354/ws-services-calculation/WCBillingSlab.json b/data/as/8185354/ws-services-calculation/WCBillingSlab.json
index da367f8cff..0d346981d0 100644
--- a/data/as/8185354/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185354/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185387/ws-services-calculation/WCBillingSlab.json b/data/as/8185387/ws-services-calculation/WCBillingSlab.json
index 2fe5669215..6ddc0c9760 100644
--- a/data/as/8185387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185418/ws-services-calculation/WCBillingSlab.json b/data/as/8185418/ws-services-calculation/WCBillingSlab.json
index 64c5fbd534..3351b418ba 100644
--- a/data/as/8185418/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185418/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185772/ws-services-calculation/WCBillingSlab.json b/data/as/8185772/ws-services-calculation/WCBillingSlab.json
index 0c9a3e7742..ce694165ec 100644
--- a/data/as/8185772/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185772/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185789/ws-services-calculation/WCBillingSlab.json b/data/as/8185789/ws-services-calculation/WCBillingSlab.json
index 0381d42c93..03ff94d57b 100644
--- a/data/as/8185789/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185789/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185807/ws-services-calculation/WCBillingSlab.json b/data/as/8185807/ws-services-calculation/WCBillingSlab.json
index ea95756acd..2cce1e8615 100644
--- a/data/as/8185807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185807/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8185824/ws-services-calculation/WCBillingSlab.json b/data/as/8185824/ws-services-calculation/WCBillingSlab.json
index 6f8f599250..d4203eed87 100644
--- a/data/as/8185824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8185824/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8186783/ws-services-calculation/WCBillingSlab.json b/data/as/8186783/ws-services-calculation/WCBillingSlab.json
index 96b6117ab4..1e36a94fcb 100644
--- a/data/as/8186783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8186783/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8186803/ws-services-calculation/WCBillingSlab.json b/data/as/8186803/ws-services-calculation/WCBillingSlab.json
index 5b060cad8b..b83a01ef6f 100644
--- a/data/as/8186803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8186803/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187077/ws-services-calculation/WCBillingSlab.json b/data/as/8187077/ws-services-calculation/WCBillingSlab.json
index 14c00837db..044cca1086 100644
--- a/data/as/8187077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187077/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187084/ws-services-calculation/WCBillingSlab.json b/data/as/8187084/ws-services-calculation/WCBillingSlab.json
index 4d6e438359..e41e406e3e 100644
--- a/data/as/8187084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187090/ws-services-calculation/WCBillingSlab.json b/data/as/8187090/ws-services-calculation/WCBillingSlab.json
index 0428c6ced5..2796b3728b 100644
--- a/data/as/8187090/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187090/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187146/ws-services-calculation/WCBillingSlab.json b/data/as/8187146/ws-services-calculation/WCBillingSlab.json
index 8ef3033139..a05eefab8c 100644
--- a/data/as/8187146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187146/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187153/ws-services-calculation/WCBillingSlab.json b/data/as/8187153/ws-services-calculation/WCBillingSlab.json
index b73d01c9f7..1901ad6405 100644
--- a/data/as/8187153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187153/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187157/ws-services-calculation/WCBillingSlab.json b/data/as/8187157/ws-services-calculation/WCBillingSlab.json
index b89302ef53..34cec5aea8 100644
--- a/data/as/8187157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187157/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187165/ws-services-calculation/WCBillingSlab.json b/data/as/8187165/ws-services-calculation/WCBillingSlab.json
index 85b4545d46..84ca8ab28b 100644
--- a/data/as/8187165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187165/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file

From 7107818961d0c188fefd135608f5c66abd7e02ed Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 17:33:35 +0530
Subject: [PATCH 20/23] updated minimumCharge 0.0 to 0

---
 .../30001504/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30002704/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30002810/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30002848/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30002858/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30003558/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30003616/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30003640/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30003730/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30003828/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30003829/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004161/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004629/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004648/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004669/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004691/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004720/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004770/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004793/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004828/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004842/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004862/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004901/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004921/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004976/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004991/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30004999/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005115/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005154/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005283/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005412/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005420/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005441/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005445/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005446/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005536/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005781/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30005988/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30006456/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30006497/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30006954/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30007373/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30007375/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30009532/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30009627/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010046/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010156/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010193/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010223/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010291/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010494/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010625/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010634/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010783/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30010828/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011048/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011084/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011088/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011133/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011141/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011158/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011173/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011609/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011655/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011866/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30011891/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012177/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012178/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012221/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012439/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012517/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012531/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012538/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30012662/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013177/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013179/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013181/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013193/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013208/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013223/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013392/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013404/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013810/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013820/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013836/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013839/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013844/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013848/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013853/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013855/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013863/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30013915/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014184/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014239/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014264/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014427/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014441/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014445/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014448/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014450/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014452/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014454/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014658/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014663/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014666/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014668/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014669/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014670/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014671/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014698/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014701/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014915/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014971/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014990/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014991/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30014992/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30015050/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30015700/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016452/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016458/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016472/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016510/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016693/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016720/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016724/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016755/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016761/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../as/8187171/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187175/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187179/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187185/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187193/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187270/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187278/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187290/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187298/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187307/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187315/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187323/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187332/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187337/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187344/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187350/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187548/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8187585/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8188301/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8188715/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8189136/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8189158/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192257/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192432/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192456/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192523/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192570/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192597/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192615/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192622/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192631/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192655/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192673/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8192716/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8195888/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8195974/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196020/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196023/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196027/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196029/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196038/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196756/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196774/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196779/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196786/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196792/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196816/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196837/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196871/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196879/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196894/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196903/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196910/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196914/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196954/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196972/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8196995/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197005/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197023/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197028/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197048/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197059/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197069/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197098/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197113/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197243/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8197282/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198168/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198173/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198179/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198205/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198213/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198223/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8198230/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8201977/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8201983/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8202008/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8202014/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8202020/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8202025/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8202278/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8202287/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203051/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203064/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203128/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203162/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203178/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203211/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203233/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203251/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203271/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203278/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203286/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203579/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203589/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203592/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203614/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203629/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203647/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203683/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203689/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203693/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203703/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203721/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203725/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203729/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203732/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203748/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203764/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203786/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203804/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203816/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203835/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203855/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203872/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203902/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203915/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203942/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8203947/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8204267/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205058/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205077/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205087/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205096/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205107/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205116/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205127/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205153/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205176/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205265/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205277/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205283/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205289/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205290/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205310/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205339/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205350/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205362/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205375/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205382/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205387/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8205395/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206044/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206058/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206068/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206074/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206091/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206111/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206116/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206170/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206177/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206194/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206219/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206280/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206284/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206297/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206302/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206316/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206425/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206436/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206445/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206457/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206469/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206477/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206486/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206496/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206510/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206524/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206535/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206542/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206547/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206554/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206558/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206789/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206800/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206811/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206824/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206834/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8206851/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215102/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215107/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215197/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215261/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215283/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215285/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215403/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215406/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215411/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215655/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215753/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215757/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215759/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215762/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215767/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215769/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8215771/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8218304/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8218315/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8218486/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8218509/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8218510/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222042/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222249/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222264/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222276/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222311/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222322/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222342/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222348/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222352/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222366/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8222386/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8227638/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8228162/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8228342/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8228352/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8228831/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8228832/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8230806/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8234493/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8234543/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8234577/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235302/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235314/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235328/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235338/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235347/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235358/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235371/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235387/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235394/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235405/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235411/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235421/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8235807/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237353/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237367/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237390/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237435/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237444/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237467/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237495/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237534/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237554/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237581/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237588/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237606/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8237611/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8239822/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8246724/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8250038/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8250626/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8252919/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8255134/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8257091/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8261500/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8261877/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8261995/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8264422/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8265409/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8266441/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8273083/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8279762/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8286607/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8298009/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8307469/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8310456/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8312752/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8320434/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8325212/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8326277/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8326909/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 .../as/8365758/ws-services-calculation/WCBillingSlab.json | 8 ++++----
 400 files changed, 1600 insertions(+), 1600 deletions(-)

diff --git a/data/as/30001504/ws-services-calculation/WCBillingSlab.json b/data/as/30001504/ws-services-calculation/WCBillingSlab.json
index 4d384a38a9..c7be61cbcf 100644
--- a/data/as/30001504/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30001504/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002704/ws-services-calculation/WCBillingSlab.json b/data/as/30002704/ws-services-calculation/WCBillingSlab.json
index 0503aeacff..cb8106eb56 100644
--- a/data/as/30002704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002810/ws-services-calculation/WCBillingSlab.json b/data/as/30002810/ws-services-calculation/WCBillingSlab.json
index 150bedd29e..256aa0c453 100644
--- a/data/as/30002810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002810/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002848/ws-services-calculation/WCBillingSlab.json b/data/as/30002848/ws-services-calculation/WCBillingSlab.json
index a6b1a97900..8a3741f714 100644
--- a/data/as/30002848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002848/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30002858/ws-services-calculation/WCBillingSlab.json b/data/as/30002858/ws-services-calculation/WCBillingSlab.json
index 0a25a62bcf..2ed7ee40dd 100644
--- a/data/as/30002858/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30002858/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003558/ws-services-calculation/WCBillingSlab.json b/data/as/30003558/ws-services-calculation/WCBillingSlab.json
index 26ca00bcf6..0365cc9e19 100644
--- a/data/as/30003558/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003558/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003616/ws-services-calculation/WCBillingSlab.json b/data/as/30003616/ws-services-calculation/WCBillingSlab.json
index eb4d4a957c..738bdb6b6c 100644
--- a/data/as/30003616/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003616/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003640/ws-services-calculation/WCBillingSlab.json b/data/as/30003640/ws-services-calculation/WCBillingSlab.json
index 950db3b607..fa9d84acd2 100644
--- a/data/as/30003640/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003640/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003730/ws-services-calculation/WCBillingSlab.json b/data/as/30003730/ws-services-calculation/WCBillingSlab.json
index 489ccae2f0..30bbd3dd56 100644
--- a/data/as/30003730/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003730/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003828/ws-services-calculation/WCBillingSlab.json b/data/as/30003828/ws-services-calculation/WCBillingSlab.json
index ef1a443739..21126c13ad 100644
--- a/data/as/30003828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003828/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30003829/ws-services-calculation/WCBillingSlab.json b/data/as/30003829/ws-services-calculation/WCBillingSlab.json
index c79b2f943f..5cbdafec42 100644
--- a/data/as/30003829/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30003829/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004161/ws-services-calculation/WCBillingSlab.json b/data/as/30004161/ws-services-calculation/WCBillingSlab.json
index 2fc2c53704..0124abe336 100644
--- a/data/as/30004161/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004161/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004629/ws-services-calculation/WCBillingSlab.json b/data/as/30004629/ws-services-calculation/WCBillingSlab.json
index dec4615531..08779fddad 100644
--- a/data/as/30004629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004629/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004648/ws-services-calculation/WCBillingSlab.json b/data/as/30004648/ws-services-calculation/WCBillingSlab.json
index 7c816368ae..d6d295919a 100644
--- a/data/as/30004648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004648/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004669/ws-services-calculation/WCBillingSlab.json b/data/as/30004669/ws-services-calculation/WCBillingSlab.json
index bf8cf2490d..1994602b3d 100644
--- a/data/as/30004669/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004669/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004691/ws-services-calculation/WCBillingSlab.json b/data/as/30004691/ws-services-calculation/WCBillingSlab.json
index 20c0b6fe6f..4148d70838 100644
--- a/data/as/30004691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004691/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004720/ws-services-calculation/WCBillingSlab.json b/data/as/30004720/ws-services-calculation/WCBillingSlab.json
index 68ebd47dfd..7d67b87c9a 100644
--- a/data/as/30004720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004720/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004770/ws-services-calculation/WCBillingSlab.json b/data/as/30004770/ws-services-calculation/WCBillingSlab.json
index e97d1f8e82..8a9aa6dca1 100644
--- a/data/as/30004770/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004770/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004793/ws-services-calculation/WCBillingSlab.json b/data/as/30004793/ws-services-calculation/WCBillingSlab.json
index d3c8a1a042..deb86868be 100644
--- a/data/as/30004793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004793/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004828/ws-services-calculation/WCBillingSlab.json b/data/as/30004828/ws-services-calculation/WCBillingSlab.json
index 672ec246ee..aee1be0562 100644
--- a/data/as/30004828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004828/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004842/ws-services-calculation/WCBillingSlab.json b/data/as/30004842/ws-services-calculation/WCBillingSlab.json
index 4940b52120..0cacf8486d 100644
--- a/data/as/30004842/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004842/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004862/ws-services-calculation/WCBillingSlab.json b/data/as/30004862/ws-services-calculation/WCBillingSlab.json
index 38f5798a48..daab80a6bd 100644
--- a/data/as/30004862/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004862/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004901/ws-services-calculation/WCBillingSlab.json b/data/as/30004901/ws-services-calculation/WCBillingSlab.json
index efeeca0b11..b41618428c 100644
--- a/data/as/30004901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004901/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004921/ws-services-calculation/WCBillingSlab.json b/data/as/30004921/ws-services-calculation/WCBillingSlab.json
index d6cec6495b..e5fe68bee7 100644
--- a/data/as/30004921/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004921/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004976/ws-services-calculation/WCBillingSlab.json b/data/as/30004976/ws-services-calculation/WCBillingSlab.json
index 190777699b..4e4587ebcf 100644
--- a/data/as/30004976/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004976/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004991/ws-services-calculation/WCBillingSlab.json b/data/as/30004991/ws-services-calculation/WCBillingSlab.json
index bd762df0c8..179795b06b 100644
--- a/data/as/30004991/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004991/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30004999/ws-services-calculation/WCBillingSlab.json b/data/as/30004999/ws-services-calculation/WCBillingSlab.json
index 4a531d37ca..ee035cde7b 100644
--- a/data/as/30004999/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30004999/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005115/ws-services-calculation/WCBillingSlab.json b/data/as/30005115/ws-services-calculation/WCBillingSlab.json
index 437192d4a4..aae6427d13 100644
--- a/data/as/30005115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005115/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005154/ws-services-calculation/WCBillingSlab.json b/data/as/30005154/ws-services-calculation/WCBillingSlab.json
index dfddf6deb7..ad56d8f95a 100644
--- a/data/as/30005154/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005154/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005283/ws-services-calculation/WCBillingSlab.json b/data/as/30005283/ws-services-calculation/WCBillingSlab.json
index 3894feb9eb..979376f801 100644
--- a/data/as/30005283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005283/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005412/ws-services-calculation/WCBillingSlab.json b/data/as/30005412/ws-services-calculation/WCBillingSlab.json
index 2472689d33..814728626f 100644
--- a/data/as/30005412/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005412/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005420/ws-services-calculation/WCBillingSlab.json b/data/as/30005420/ws-services-calculation/WCBillingSlab.json
index e0fa39f8a3..4bf912837a 100644
--- a/data/as/30005420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005420/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005441/ws-services-calculation/WCBillingSlab.json b/data/as/30005441/ws-services-calculation/WCBillingSlab.json
index 513f9b3419..6760f03202 100644
--- a/data/as/30005441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005441/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005445/ws-services-calculation/WCBillingSlab.json b/data/as/30005445/ws-services-calculation/WCBillingSlab.json
index 1db02ed10b..a9b9c8eb89 100644
--- a/data/as/30005445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005445/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005446/ws-services-calculation/WCBillingSlab.json b/data/as/30005446/ws-services-calculation/WCBillingSlab.json
index 78bff9f638..ea203db177 100644
--- a/data/as/30005446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005446/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005536/ws-services-calculation/WCBillingSlab.json b/data/as/30005536/ws-services-calculation/WCBillingSlab.json
index fb88874db3..378fd65e03 100644
--- a/data/as/30005536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005536/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005781/ws-services-calculation/WCBillingSlab.json b/data/as/30005781/ws-services-calculation/WCBillingSlab.json
index 6ad4093b08..14be53df4b 100644
--- a/data/as/30005781/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005781/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30005988/ws-services-calculation/WCBillingSlab.json b/data/as/30005988/ws-services-calculation/WCBillingSlab.json
index 2b0536fce2..f0c1d20eb9 100644
--- a/data/as/30005988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30005988/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30006456/ws-services-calculation/WCBillingSlab.json b/data/as/30006456/ws-services-calculation/WCBillingSlab.json
index 885d111871..2396159b4b 100644
--- a/data/as/30006456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30006456/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30006497/ws-services-calculation/WCBillingSlab.json b/data/as/30006497/ws-services-calculation/WCBillingSlab.json
index 2065446855..72bd205df3 100644
--- a/data/as/30006497/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30006497/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30006954/ws-services-calculation/WCBillingSlab.json b/data/as/30006954/ws-services-calculation/WCBillingSlab.json
index d2877f217d..66cb2011ef 100644
--- a/data/as/30006954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30006954/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30007373/ws-services-calculation/WCBillingSlab.json b/data/as/30007373/ws-services-calculation/WCBillingSlab.json
index 01a855049a..d236cbfabe 100644
--- a/data/as/30007373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30007373/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30007375/ws-services-calculation/WCBillingSlab.json b/data/as/30007375/ws-services-calculation/WCBillingSlab.json
index e68a7be85f..e90118620c 100644
--- a/data/as/30007375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30007375/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30009532/ws-services-calculation/WCBillingSlab.json b/data/as/30009532/ws-services-calculation/WCBillingSlab.json
index 06d10cfe0e..a6b146f301 100644
--- a/data/as/30009532/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30009532/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30009627/ws-services-calculation/WCBillingSlab.json b/data/as/30009627/ws-services-calculation/WCBillingSlab.json
index 29889f8c3a..47f221b131 100644
--- a/data/as/30009627/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30009627/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010046/ws-services-calculation/WCBillingSlab.json b/data/as/30010046/ws-services-calculation/WCBillingSlab.json
index 3a17c1d890..af3ad5fb62 100644
--- a/data/as/30010046/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010046/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010156/ws-services-calculation/WCBillingSlab.json b/data/as/30010156/ws-services-calculation/WCBillingSlab.json
index 6ca84d9ef0..883a919193 100644
--- a/data/as/30010156/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010156/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010193/ws-services-calculation/WCBillingSlab.json b/data/as/30010193/ws-services-calculation/WCBillingSlab.json
index bedb25de65..93726a443f 100644
--- a/data/as/30010193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010193/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010223/ws-services-calculation/WCBillingSlab.json b/data/as/30010223/ws-services-calculation/WCBillingSlab.json
index 768945a30d..b764d63138 100644
--- a/data/as/30010223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010291/ws-services-calculation/WCBillingSlab.json b/data/as/30010291/ws-services-calculation/WCBillingSlab.json
index 12752a39fc..850fe23180 100644
--- a/data/as/30010291/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010291/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010494/ws-services-calculation/WCBillingSlab.json b/data/as/30010494/ws-services-calculation/WCBillingSlab.json
index 1a5d2f57eb..2684516f28 100644
--- a/data/as/30010494/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010494/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010625/ws-services-calculation/WCBillingSlab.json b/data/as/30010625/ws-services-calculation/WCBillingSlab.json
index 9bda33a72b..154e52f0a8 100644
--- a/data/as/30010625/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010625/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010634/ws-services-calculation/WCBillingSlab.json b/data/as/30010634/ws-services-calculation/WCBillingSlab.json
index 49e0a70cd4..e15448d5db 100644
--- a/data/as/30010634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010634/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010783/ws-services-calculation/WCBillingSlab.json b/data/as/30010783/ws-services-calculation/WCBillingSlab.json
index 6921f72099..93210cb99a 100644
--- a/data/as/30010783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010783/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30010828/ws-services-calculation/WCBillingSlab.json b/data/as/30010828/ws-services-calculation/WCBillingSlab.json
index 4e7b540462..c1b54f082d 100644
--- a/data/as/30010828/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30010828/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011048/ws-services-calculation/WCBillingSlab.json b/data/as/30011048/ws-services-calculation/WCBillingSlab.json
index 9246a65703..510a0b19b5 100644
--- a/data/as/30011048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011048/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011084/ws-services-calculation/WCBillingSlab.json b/data/as/30011084/ws-services-calculation/WCBillingSlab.json
index 9f5b05f81c..6769baeb60 100644
--- a/data/as/30011084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011088/ws-services-calculation/WCBillingSlab.json b/data/as/30011088/ws-services-calculation/WCBillingSlab.json
index 079f81d833..be782466bd 100644
--- a/data/as/30011088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011088/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011133/ws-services-calculation/WCBillingSlab.json b/data/as/30011133/ws-services-calculation/WCBillingSlab.json
index 7fdea8514f..1709bd7294 100644
--- a/data/as/30011133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011133/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011141/ws-services-calculation/WCBillingSlab.json b/data/as/30011141/ws-services-calculation/WCBillingSlab.json
index 74da28de22..ebbc1b715f 100644
--- a/data/as/30011141/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011141/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011158/ws-services-calculation/WCBillingSlab.json b/data/as/30011158/ws-services-calculation/WCBillingSlab.json
index 72f479a33e..c910e670e4 100644
--- a/data/as/30011158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011158/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011173/ws-services-calculation/WCBillingSlab.json b/data/as/30011173/ws-services-calculation/WCBillingSlab.json
index 2e7025e035..7d5fba49b5 100644
--- a/data/as/30011173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011609/ws-services-calculation/WCBillingSlab.json b/data/as/30011609/ws-services-calculation/WCBillingSlab.json
index fd9e0c5b2e..e827730b89 100644
--- a/data/as/30011609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011609/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011655/ws-services-calculation/WCBillingSlab.json b/data/as/30011655/ws-services-calculation/WCBillingSlab.json
index 936e530bf3..dc38557226 100644
--- a/data/as/30011655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011655/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011866/ws-services-calculation/WCBillingSlab.json b/data/as/30011866/ws-services-calculation/WCBillingSlab.json
index 5224e11cb6..ca4379b44a 100644
--- a/data/as/30011866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011866/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30011891/ws-services-calculation/WCBillingSlab.json b/data/as/30011891/ws-services-calculation/WCBillingSlab.json
index beb902c873..3355721ffe 100644
--- a/data/as/30011891/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30011891/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012177/ws-services-calculation/WCBillingSlab.json b/data/as/30012177/ws-services-calculation/WCBillingSlab.json
index 3b8da7c5d1..06afa0e200 100644
--- a/data/as/30012177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012177/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012178/ws-services-calculation/WCBillingSlab.json b/data/as/30012178/ws-services-calculation/WCBillingSlab.json
index 6b4b541a74..1f434f23b3 100644
--- a/data/as/30012178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012221/ws-services-calculation/WCBillingSlab.json b/data/as/30012221/ws-services-calculation/WCBillingSlab.json
index 22900bd068..529d17eebc 100644
--- a/data/as/30012221/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012221/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012439/ws-services-calculation/WCBillingSlab.json b/data/as/30012439/ws-services-calculation/WCBillingSlab.json
index 2de5254689..67d0285324 100644
--- a/data/as/30012439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012439/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012517/ws-services-calculation/WCBillingSlab.json b/data/as/30012517/ws-services-calculation/WCBillingSlab.json
index e8fb9b4999..c654889abb 100644
--- a/data/as/30012517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012517/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012531/ws-services-calculation/WCBillingSlab.json b/data/as/30012531/ws-services-calculation/WCBillingSlab.json
index f67c765bb9..9e48f96ecf 100644
--- a/data/as/30012531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012531/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012538/ws-services-calculation/WCBillingSlab.json b/data/as/30012538/ws-services-calculation/WCBillingSlab.json
index 27192c2e76..6446c61e84 100644
--- a/data/as/30012538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012538/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30012662/ws-services-calculation/WCBillingSlab.json b/data/as/30012662/ws-services-calculation/WCBillingSlab.json
index f8e76f23ee..c4c6b5d056 100644
--- a/data/as/30012662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30012662/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013177/ws-services-calculation/WCBillingSlab.json b/data/as/30013177/ws-services-calculation/WCBillingSlab.json
index 7d3412b5c5..8e3513cc28 100644
--- a/data/as/30013177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013177/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013179/ws-services-calculation/WCBillingSlab.json b/data/as/30013179/ws-services-calculation/WCBillingSlab.json
index 086a3fd366..d09062964a 100644
--- a/data/as/30013179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013179/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013181/ws-services-calculation/WCBillingSlab.json b/data/as/30013181/ws-services-calculation/WCBillingSlab.json
index a1fc514a1c..39c6ad6147 100644
--- a/data/as/30013181/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013181/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013193/ws-services-calculation/WCBillingSlab.json b/data/as/30013193/ws-services-calculation/WCBillingSlab.json
index 8b04ed09f7..3cb44ae81b 100644
--- a/data/as/30013193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013193/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013208/ws-services-calculation/WCBillingSlab.json b/data/as/30013208/ws-services-calculation/WCBillingSlab.json
index 04492a1be9..a9761903f5 100644
--- a/data/as/30013208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013223/ws-services-calculation/WCBillingSlab.json b/data/as/30013223/ws-services-calculation/WCBillingSlab.json
index a1fd0b513a..2f582af540 100644
--- a/data/as/30013223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013392/ws-services-calculation/WCBillingSlab.json b/data/as/30013392/ws-services-calculation/WCBillingSlab.json
index 607750f8bd..44210aadf4 100644
--- a/data/as/30013392/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013392/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013404/ws-services-calculation/WCBillingSlab.json b/data/as/30013404/ws-services-calculation/WCBillingSlab.json
index c417e71292..f1c9a80cd6 100644
--- a/data/as/30013404/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013404/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013810/ws-services-calculation/WCBillingSlab.json b/data/as/30013810/ws-services-calculation/WCBillingSlab.json
index d364f9f245..d999a79105 100644
--- a/data/as/30013810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013810/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013820/ws-services-calculation/WCBillingSlab.json b/data/as/30013820/ws-services-calculation/WCBillingSlab.json
index 40c90356fd..035ba4f1cf 100644
--- a/data/as/30013820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013820/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013836/ws-services-calculation/WCBillingSlab.json b/data/as/30013836/ws-services-calculation/WCBillingSlab.json
index c327dd55a8..0bdc1ec689 100644
--- a/data/as/30013836/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013836/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013839/ws-services-calculation/WCBillingSlab.json b/data/as/30013839/ws-services-calculation/WCBillingSlab.json
index ff780e5cdf..0f1684c263 100644
--- a/data/as/30013839/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013839/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013844/ws-services-calculation/WCBillingSlab.json b/data/as/30013844/ws-services-calculation/WCBillingSlab.json
index bbb93d0b9f..44576650a1 100644
--- a/data/as/30013844/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013844/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013848/ws-services-calculation/WCBillingSlab.json b/data/as/30013848/ws-services-calculation/WCBillingSlab.json
index 316de7d3ac..fbe3e95d69 100644
--- a/data/as/30013848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013848/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013853/ws-services-calculation/WCBillingSlab.json b/data/as/30013853/ws-services-calculation/WCBillingSlab.json
index bdf22ab1db..9cb168e397 100644
--- a/data/as/30013853/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013853/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013855/ws-services-calculation/WCBillingSlab.json b/data/as/30013855/ws-services-calculation/WCBillingSlab.json
index 21c1c46662..1d1bd99744 100644
--- a/data/as/30013855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013855/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013863/ws-services-calculation/WCBillingSlab.json b/data/as/30013863/ws-services-calculation/WCBillingSlab.json
index 09b7546830..56912ddac3 100644
--- a/data/as/30013863/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013863/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30013915/ws-services-calculation/WCBillingSlab.json b/data/as/30013915/ws-services-calculation/WCBillingSlab.json
index 4d26afa448..7c8dfabc54 100644
--- a/data/as/30013915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30013915/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014184/ws-services-calculation/WCBillingSlab.json b/data/as/30014184/ws-services-calculation/WCBillingSlab.json
index cfb554339f..0663626717 100644
--- a/data/as/30014184/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014184/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014239/ws-services-calculation/WCBillingSlab.json b/data/as/30014239/ws-services-calculation/WCBillingSlab.json
index 2e9527f9eb..7ae0ac96de 100644
--- a/data/as/30014239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014239/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014264/ws-services-calculation/WCBillingSlab.json b/data/as/30014264/ws-services-calculation/WCBillingSlab.json
index 4fd9677a11..ee04958006 100644
--- a/data/as/30014264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014264/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014427/ws-services-calculation/WCBillingSlab.json b/data/as/30014427/ws-services-calculation/WCBillingSlab.json
index 8bf60e133d..460a3f1d06 100644
--- a/data/as/30014427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014427/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014441/ws-services-calculation/WCBillingSlab.json b/data/as/30014441/ws-services-calculation/WCBillingSlab.json
index 060a906303..d869021a6a 100644
--- a/data/as/30014441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014441/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014445/ws-services-calculation/WCBillingSlab.json b/data/as/30014445/ws-services-calculation/WCBillingSlab.json
index ac50374962..cfad314239 100644
--- a/data/as/30014445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014445/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014448/ws-services-calculation/WCBillingSlab.json b/data/as/30014448/ws-services-calculation/WCBillingSlab.json
index ecbada0077..2a7ee23824 100644
--- a/data/as/30014448/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014448/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014450/ws-services-calculation/WCBillingSlab.json b/data/as/30014450/ws-services-calculation/WCBillingSlab.json
index e53a801d9d..203a56f921 100644
--- a/data/as/30014450/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014450/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014452/ws-services-calculation/WCBillingSlab.json b/data/as/30014452/ws-services-calculation/WCBillingSlab.json
index 920b94e6eb..cf34411cff 100644
--- a/data/as/30014452/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014452/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014454/ws-services-calculation/WCBillingSlab.json b/data/as/30014454/ws-services-calculation/WCBillingSlab.json
index 7d6d03a054..30f23e7354 100644
--- a/data/as/30014454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014454/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014658/ws-services-calculation/WCBillingSlab.json b/data/as/30014658/ws-services-calculation/WCBillingSlab.json
index 3fa80c3e32..a2d04de906 100644
--- a/data/as/30014658/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014658/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014663/ws-services-calculation/WCBillingSlab.json b/data/as/30014663/ws-services-calculation/WCBillingSlab.json
index 22050357b2..573af89655 100644
--- a/data/as/30014663/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014663/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014666/ws-services-calculation/WCBillingSlab.json b/data/as/30014666/ws-services-calculation/WCBillingSlab.json
index 2f1623334c..c5044c6cea 100644
--- a/data/as/30014666/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014666/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014668/ws-services-calculation/WCBillingSlab.json b/data/as/30014668/ws-services-calculation/WCBillingSlab.json
index 3e15cf14fe..8cb1cc6fd3 100644
--- a/data/as/30014668/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014668/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014669/ws-services-calculation/WCBillingSlab.json b/data/as/30014669/ws-services-calculation/WCBillingSlab.json
index a8ea759cf6..2446f6309f 100644
--- a/data/as/30014669/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014669/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014670/ws-services-calculation/WCBillingSlab.json b/data/as/30014670/ws-services-calculation/WCBillingSlab.json
index a93ccdb31e..cfc8642bf7 100644
--- a/data/as/30014670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014670/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014671/ws-services-calculation/WCBillingSlab.json b/data/as/30014671/ws-services-calculation/WCBillingSlab.json
index 328f2ceb74..97a8444185 100644
--- a/data/as/30014671/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014671/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014698/ws-services-calculation/WCBillingSlab.json b/data/as/30014698/ws-services-calculation/WCBillingSlab.json
index e888301413..9ee659ecbf 100644
--- a/data/as/30014698/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014698/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014701/ws-services-calculation/WCBillingSlab.json b/data/as/30014701/ws-services-calculation/WCBillingSlab.json
index 29d57e9fa7..8962d5cef3 100644
--- a/data/as/30014701/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014701/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014915/ws-services-calculation/WCBillingSlab.json b/data/as/30014915/ws-services-calculation/WCBillingSlab.json
index 6e07feb3cf..2c6bfe6f3f 100644
--- a/data/as/30014915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014915/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014971/ws-services-calculation/WCBillingSlab.json b/data/as/30014971/ws-services-calculation/WCBillingSlab.json
index f1b7047d7e..ae791d8667 100644
--- a/data/as/30014971/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014971/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014990/ws-services-calculation/WCBillingSlab.json b/data/as/30014990/ws-services-calculation/WCBillingSlab.json
index 1044ea78e1..029b0e53a9 100644
--- a/data/as/30014990/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014990/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014991/ws-services-calculation/WCBillingSlab.json b/data/as/30014991/ws-services-calculation/WCBillingSlab.json
index 3046c5f229..cf7790f80c 100644
--- a/data/as/30014991/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014991/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30014992/ws-services-calculation/WCBillingSlab.json b/data/as/30014992/ws-services-calculation/WCBillingSlab.json
index a28ac28d33..4db5c476dc 100644
--- a/data/as/30014992/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30014992/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30015050/ws-services-calculation/WCBillingSlab.json b/data/as/30015050/ws-services-calculation/WCBillingSlab.json
index c6ae10783b..5e6fbace6b 100644
--- a/data/as/30015050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30015050/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30015700/ws-services-calculation/WCBillingSlab.json b/data/as/30015700/ws-services-calculation/WCBillingSlab.json
index f199377625..17efd14856 100644
--- a/data/as/30015700/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30015700/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016452/ws-services-calculation/WCBillingSlab.json b/data/as/30016452/ws-services-calculation/WCBillingSlab.json
index b3dcd55842..1ede196714 100644
--- a/data/as/30016452/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016452/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016458/ws-services-calculation/WCBillingSlab.json b/data/as/30016458/ws-services-calculation/WCBillingSlab.json
index 880160d592..e45f241ffd 100644
--- a/data/as/30016458/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016458/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016472/ws-services-calculation/WCBillingSlab.json b/data/as/30016472/ws-services-calculation/WCBillingSlab.json
index bc9dda09d0..2de52cba27 100644
--- a/data/as/30016472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016472/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016510/ws-services-calculation/WCBillingSlab.json b/data/as/30016510/ws-services-calculation/WCBillingSlab.json
index f7f3654da6..2efb64000f 100644
--- a/data/as/30016510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016510/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016693/ws-services-calculation/WCBillingSlab.json b/data/as/30016693/ws-services-calculation/WCBillingSlab.json
index b40750d4bd..4011ead0cd 100644
--- a/data/as/30016693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016693/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016720/ws-services-calculation/WCBillingSlab.json b/data/as/30016720/ws-services-calculation/WCBillingSlab.json
index baa61f5b1b..f27cc68ede 100644
--- a/data/as/30016720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016720/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016724/ws-services-calculation/WCBillingSlab.json b/data/as/30016724/ws-services-calculation/WCBillingSlab.json
index 14a9804c03..bf49a19647 100644
--- a/data/as/30016724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016755/ws-services-calculation/WCBillingSlab.json b/data/as/30016755/ws-services-calculation/WCBillingSlab.json
index 154bdfde88..31764b2b64 100644
--- a/data/as/30016755/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016755/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016761/ws-services-calculation/WCBillingSlab.json b/data/as/30016761/ws-services-calculation/WCBillingSlab.json
index 8e0042b37e..baabee2ec6 100644
--- a/data/as/30016761/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016761/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187171/ws-services-calculation/WCBillingSlab.json b/data/as/8187171/ws-services-calculation/WCBillingSlab.json
index 6a1268d66d..61a94a2880 100644
--- a/data/as/8187171/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187171/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187175/ws-services-calculation/WCBillingSlab.json b/data/as/8187175/ws-services-calculation/WCBillingSlab.json
index ced5284b74..fc10749897 100644
--- a/data/as/8187175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187175/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187179/ws-services-calculation/WCBillingSlab.json b/data/as/8187179/ws-services-calculation/WCBillingSlab.json
index a6272fa7b7..21a1e6db2d 100644
--- a/data/as/8187179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187179/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187185/ws-services-calculation/WCBillingSlab.json b/data/as/8187185/ws-services-calculation/WCBillingSlab.json
index 7ebd7afa07..a441740969 100644
--- a/data/as/8187185/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187185/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187193/ws-services-calculation/WCBillingSlab.json b/data/as/8187193/ws-services-calculation/WCBillingSlab.json
index c839c78b1c..98fcfaf7e2 100644
--- a/data/as/8187193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187193/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187270/ws-services-calculation/WCBillingSlab.json b/data/as/8187270/ws-services-calculation/WCBillingSlab.json
index 51e81ca3b5..0fac96baf0 100644
--- a/data/as/8187270/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187270/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187278/ws-services-calculation/WCBillingSlab.json b/data/as/8187278/ws-services-calculation/WCBillingSlab.json
index 0b64b9b5cf..4990fe11f4 100644
--- a/data/as/8187278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187278/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187290/ws-services-calculation/WCBillingSlab.json b/data/as/8187290/ws-services-calculation/WCBillingSlab.json
index fd6a5df328..aa67115e1a 100644
--- a/data/as/8187290/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187290/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187298/ws-services-calculation/WCBillingSlab.json b/data/as/8187298/ws-services-calculation/WCBillingSlab.json
index 43d63a2e5b..bc04665182 100644
--- a/data/as/8187298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187298/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187307/ws-services-calculation/WCBillingSlab.json b/data/as/8187307/ws-services-calculation/WCBillingSlab.json
index 9be6ed140b..4243af82a8 100644
--- a/data/as/8187307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187307/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187315/ws-services-calculation/WCBillingSlab.json b/data/as/8187315/ws-services-calculation/WCBillingSlab.json
index cfe12c79e1..cbeba23efa 100644
--- a/data/as/8187315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187315/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187323/ws-services-calculation/WCBillingSlab.json b/data/as/8187323/ws-services-calculation/WCBillingSlab.json
index f526eb9bd8..e867ecac67 100644
--- a/data/as/8187323/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187323/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187332/ws-services-calculation/WCBillingSlab.json b/data/as/8187332/ws-services-calculation/WCBillingSlab.json
index 3001e9e66c..ce4cb4879b 100644
--- a/data/as/8187332/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187332/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187337/ws-services-calculation/WCBillingSlab.json b/data/as/8187337/ws-services-calculation/WCBillingSlab.json
index c4237fd07a..1e581791b3 100644
--- a/data/as/8187337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187337/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187344/ws-services-calculation/WCBillingSlab.json b/data/as/8187344/ws-services-calculation/WCBillingSlab.json
index ae14b9958b..682122d2dc 100644
--- a/data/as/8187344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187344/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187350/ws-services-calculation/WCBillingSlab.json b/data/as/8187350/ws-services-calculation/WCBillingSlab.json
index 3171dbcaf9..2923fc0ca7 100644
--- a/data/as/8187350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187548/ws-services-calculation/WCBillingSlab.json b/data/as/8187548/ws-services-calculation/WCBillingSlab.json
index ded2c2c052..8730824448 100644
--- a/data/as/8187548/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187548/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8187585/ws-services-calculation/WCBillingSlab.json b/data/as/8187585/ws-services-calculation/WCBillingSlab.json
index b7ce94c377..49839ac21c 100644
--- a/data/as/8187585/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8187585/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8188301/ws-services-calculation/WCBillingSlab.json b/data/as/8188301/ws-services-calculation/WCBillingSlab.json
index 66a5b6bba2..8d853054de 100644
--- a/data/as/8188301/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8188301/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8188715/ws-services-calculation/WCBillingSlab.json b/data/as/8188715/ws-services-calculation/WCBillingSlab.json
index b120dca546..0845ee1986 100644
--- a/data/as/8188715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8188715/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8189136/ws-services-calculation/WCBillingSlab.json b/data/as/8189136/ws-services-calculation/WCBillingSlab.json
index 114c5b1d52..f9107462eb 100644
--- a/data/as/8189136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8189136/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8189158/ws-services-calculation/WCBillingSlab.json b/data/as/8189158/ws-services-calculation/WCBillingSlab.json
index cbeb78668a..8e2456f35c 100644
--- a/data/as/8189158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8189158/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192257/ws-services-calculation/WCBillingSlab.json b/data/as/8192257/ws-services-calculation/WCBillingSlab.json
index caef0edd9d..17463d98e1 100644
--- a/data/as/8192257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192257/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192432/ws-services-calculation/WCBillingSlab.json b/data/as/8192432/ws-services-calculation/WCBillingSlab.json
index 5fdf3afff9..77c75d1ee8 100644
--- a/data/as/8192432/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192432/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192456/ws-services-calculation/WCBillingSlab.json b/data/as/8192456/ws-services-calculation/WCBillingSlab.json
index 3c9f7625db..b0526bb0ff 100644
--- a/data/as/8192456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192456/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192523/ws-services-calculation/WCBillingSlab.json b/data/as/8192523/ws-services-calculation/WCBillingSlab.json
index 991783e6f0..bcec1bfcf8 100644
--- a/data/as/8192523/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192523/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192570/ws-services-calculation/WCBillingSlab.json b/data/as/8192570/ws-services-calculation/WCBillingSlab.json
index 7b667e84a9..358147b44a 100644
--- a/data/as/8192570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192570/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192597/ws-services-calculation/WCBillingSlab.json b/data/as/8192597/ws-services-calculation/WCBillingSlab.json
index 9043cf3681..49de0d9ecb 100644
--- a/data/as/8192597/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192597/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192615/ws-services-calculation/WCBillingSlab.json b/data/as/8192615/ws-services-calculation/WCBillingSlab.json
index 740cbb3291..a202e479e2 100644
--- a/data/as/8192615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192615/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192622/ws-services-calculation/WCBillingSlab.json b/data/as/8192622/ws-services-calculation/WCBillingSlab.json
index 4c09db171c..9a491f451a 100644
--- a/data/as/8192622/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192622/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192631/ws-services-calculation/WCBillingSlab.json b/data/as/8192631/ws-services-calculation/WCBillingSlab.json
index cf4c53bc88..846ecda4f9 100644
--- a/data/as/8192631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192631/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192655/ws-services-calculation/WCBillingSlab.json b/data/as/8192655/ws-services-calculation/WCBillingSlab.json
index 4434995777..d5108cd49b 100644
--- a/data/as/8192655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192655/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192673/ws-services-calculation/WCBillingSlab.json b/data/as/8192673/ws-services-calculation/WCBillingSlab.json
index 38b2ae307a..f61e3789b5 100644
--- a/data/as/8192673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8192716/ws-services-calculation/WCBillingSlab.json b/data/as/8192716/ws-services-calculation/WCBillingSlab.json
index 1ea3c7cc16..8c7f1f3612 100644
--- a/data/as/8192716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8192716/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8195888/ws-services-calculation/WCBillingSlab.json b/data/as/8195888/ws-services-calculation/WCBillingSlab.json
index c599c2da92..af5f3a3bc3 100644
--- a/data/as/8195888/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8195888/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8195974/ws-services-calculation/WCBillingSlab.json b/data/as/8195974/ws-services-calculation/WCBillingSlab.json
index 237b649e16..809e18afa2 100644
--- a/data/as/8195974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8195974/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196020/ws-services-calculation/WCBillingSlab.json b/data/as/8196020/ws-services-calculation/WCBillingSlab.json
index 5f3a13a638..1d8aeb4a2f 100644
--- a/data/as/8196020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196020/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196023/ws-services-calculation/WCBillingSlab.json b/data/as/8196023/ws-services-calculation/WCBillingSlab.json
index 2994c0efef..a90477f3bb 100644
--- a/data/as/8196023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196023/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196027/ws-services-calculation/WCBillingSlab.json b/data/as/8196027/ws-services-calculation/WCBillingSlab.json
index 4dd24aa77f..e7d64a966f 100644
--- a/data/as/8196027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196029/ws-services-calculation/WCBillingSlab.json b/data/as/8196029/ws-services-calculation/WCBillingSlab.json
index 1b9a140f2a..1e0ee99659 100644
--- a/data/as/8196029/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196029/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196038/ws-services-calculation/WCBillingSlab.json b/data/as/8196038/ws-services-calculation/WCBillingSlab.json
index d3fcc8c8af..834df37d60 100644
--- a/data/as/8196038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196038/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196756/ws-services-calculation/WCBillingSlab.json b/data/as/8196756/ws-services-calculation/WCBillingSlab.json
index 256b3f8b5b..25b7e63440 100644
--- a/data/as/8196756/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196756/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196774/ws-services-calculation/WCBillingSlab.json b/data/as/8196774/ws-services-calculation/WCBillingSlab.json
index 7982dfd7dc..16a491f0e7 100644
--- a/data/as/8196774/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196774/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196779/ws-services-calculation/WCBillingSlab.json b/data/as/8196779/ws-services-calculation/WCBillingSlab.json
index c451fe5fbe..1428cd68cd 100644
--- a/data/as/8196779/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196779/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196786/ws-services-calculation/WCBillingSlab.json b/data/as/8196786/ws-services-calculation/WCBillingSlab.json
index e9c26104b2..914056ebe5 100644
--- a/data/as/8196786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196786/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196792/ws-services-calculation/WCBillingSlab.json b/data/as/8196792/ws-services-calculation/WCBillingSlab.json
index fb1e4d53ae..72145d6f5f 100644
--- a/data/as/8196792/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196792/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196816/ws-services-calculation/WCBillingSlab.json b/data/as/8196816/ws-services-calculation/WCBillingSlab.json
index e20d01127f..514245186e 100644
--- a/data/as/8196816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196837/ws-services-calculation/WCBillingSlab.json b/data/as/8196837/ws-services-calculation/WCBillingSlab.json
index c154a58768..d12be55125 100644
--- a/data/as/8196837/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196837/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196871/ws-services-calculation/WCBillingSlab.json b/data/as/8196871/ws-services-calculation/WCBillingSlab.json
index 48fb6b2475..7da61225ff 100644
--- a/data/as/8196871/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196871/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196879/ws-services-calculation/WCBillingSlab.json b/data/as/8196879/ws-services-calculation/WCBillingSlab.json
index 701ada453c..212db1cb0f 100644
--- a/data/as/8196879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196879/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196894/ws-services-calculation/WCBillingSlab.json b/data/as/8196894/ws-services-calculation/WCBillingSlab.json
index 34cb63bec9..f8e477ad56 100644
--- a/data/as/8196894/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196894/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196903/ws-services-calculation/WCBillingSlab.json b/data/as/8196903/ws-services-calculation/WCBillingSlab.json
index 0b108511bb..c45b34b5b2 100644
--- a/data/as/8196903/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196903/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196910/ws-services-calculation/WCBillingSlab.json b/data/as/8196910/ws-services-calculation/WCBillingSlab.json
index 6fd0104525..fae338f099 100644
--- a/data/as/8196910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196910/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196914/ws-services-calculation/WCBillingSlab.json b/data/as/8196914/ws-services-calculation/WCBillingSlab.json
index e4a54417dd..a54e57ce7f 100644
--- a/data/as/8196914/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196914/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196954/ws-services-calculation/WCBillingSlab.json b/data/as/8196954/ws-services-calculation/WCBillingSlab.json
index f5f95a440f..2ae6a38f1d 100644
--- a/data/as/8196954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196954/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196972/ws-services-calculation/WCBillingSlab.json b/data/as/8196972/ws-services-calculation/WCBillingSlab.json
index 7948abb791..cb890842c3 100644
--- a/data/as/8196972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8196995/ws-services-calculation/WCBillingSlab.json b/data/as/8196995/ws-services-calculation/WCBillingSlab.json
index 27ac2dd3fb..83d5916935 100644
--- a/data/as/8196995/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8196995/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197005/ws-services-calculation/WCBillingSlab.json b/data/as/8197005/ws-services-calculation/WCBillingSlab.json
index d1d9aee91d..b31edf83e0 100644
--- a/data/as/8197005/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197005/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197023/ws-services-calculation/WCBillingSlab.json b/data/as/8197023/ws-services-calculation/WCBillingSlab.json
index b0acad48b1..427e4a74e4 100644
--- a/data/as/8197023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197023/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197028/ws-services-calculation/WCBillingSlab.json b/data/as/8197028/ws-services-calculation/WCBillingSlab.json
index 1e9bccddbe..990d1bd579 100644
--- a/data/as/8197028/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197028/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197048/ws-services-calculation/WCBillingSlab.json b/data/as/8197048/ws-services-calculation/WCBillingSlab.json
index 13fef5d444..dff19451ea 100644
--- a/data/as/8197048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197048/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197059/ws-services-calculation/WCBillingSlab.json b/data/as/8197059/ws-services-calculation/WCBillingSlab.json
index ed1de07b4b..7c34465999 100644
--- a/data/as/8197059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197059/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197069/ws-services-calculation/WCBillingSlab.json b/data/as/8197069/ws-services-calculation/WCBillingSlab.json
index 9754ac6504..e75dcddbc7 100644
--- a/data/as/8197069/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197069/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197098/ws-services-calculation/WCBillingSlab.json b/data/as/8197098/ws-services-calculation/WCBillingSlab.json
index 93926039ea..0800f03c74 100644
--- a/data/as/8197098/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197098/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197113/ws-services-calculation/WCBillingSlab.json b/data/as/8197113/ws-services-calculation/WCBillingSlab.json
index 439de209f2..c2a2ff66dc 100644
--- a/data/as/8197113/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197113/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197243/ws-services-calculation/WCBillingSlab.json b/data/as/8197243/ws-services-calculation/WCBillingSlab.json
index be69dce653..94b6aaa4f0 100644
--- a/data/as/8197243/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197243/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8197282/ws-services-calculation/WCBillingSlab.json b/data/as/8197282/ws-services-calculation/WCBillingSlab.json
index b295a2228e..a02da00590 100644
--- a/data/as/8197282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8197282/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198168/ws-services-calculation/WCBillingSlab.json b/data/as/8198168/ws-services-calculation/WCBillingSlab.json
index b9990a29af..33296b31a6 100644
--- a/data/as/8198168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198168/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198173/ws-services-calculation/WCBillingSlab.json b/data/as/8198173/ws-services-calculation/WCBillingSlab.json
index bd1b8c01b6..c2443a8f0d 100644
--- a/data/as/8198173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198179/ws-services-calculation/WCBillingSlab.json b/data/as/8198179/ws-services-calculation/WCBillingSlab.json
index fade4b1914..8d36524927 100644
--- a/data/as/8198179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198179/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198205/ws-services-calculation/WCBillingSlab.json b/data/as/8198205/ws-services-calculation/WCBillingSlab.json
index 0561a27a49..1e62d9f123 100644
--- a/data/as/8198205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198205/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198213/ws-services-calculation/WCBillingSlab.json b/data/as/8198213/ws-services-calculation/WCBillingSlab.json
index 889cd5e5c0..72d300769e 100644
--- a/data/as/8198213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198213/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198223/ws-services-calculation/WCBillingSlab.json b/data/as/8198223/ws-services-calculation/WCBillingSlab.json
index 19e9850246..c280b665d9 100644
--- a/data/as/8198223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8198230/ws-services-calculation/WCBillingSlab.json b/data/as/8198230/ws-services-calculation/WCBillingSlab.json
index ea3ae222a4..7d67c248b4 100644
--- a/data/as/8198230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8198230/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8201977/ws-services-calculation/WCBillingSlab.json b/data/as/8201977/ws-services-calculation/WCBillingSlab.json
index b78cd0b96e..4116493a36 100644
--- a/data/as/8201977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8201977/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8201983/ws-services-calculation/WCBillingSlab.json b/data/as/8201983/ws-services-calculation/WCBillingSlab.json
index 23452f7ca3..c4b181c12a 100644
--- a/data/as/8201983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8201983/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202008/ws-services-calculation/WCBillingSlab.json b/data/as/8202008/ws-services-calculation/WCBillingSlab.json
index d2080a4e7a..e2c058dce3 100644
--- a/data/as/8202008/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202008/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202014/ws-services-calculation/WCBillingSlab.json b/data/as/8202014/ws-services-calculation/WCBillingSlab.json
index c62892c30f..c4bab34d84 100644
--- a/data/as/8202014/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202014/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202020/ws-services-calculation/WCBillingSlab.json b/data/as/8202020/ws-services-calculation/WCBillingSlab.json
index 4aba332269..feac2141ce 100644
--- a/data/as/8202020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202020/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202025/ws-services-calculation/WCBillingSlab.json b/data/as/8202025/ws-services-calculation/WCBillingSlab.json
index 1df6cc82c8..505d68615f 100644
--- a/data/as/8202025/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202025/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202278/ws-services-calculation/WCBillingSlab.json b/data/as/8202278/ws-services-calculation/WCBillingSlab.json
index 06f148bbe3..35c0117006 100644
--- a/data/as/8202278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202278/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8202287/ws-services-calculation/WCBillingSlab.json b/data/as/8202287/ws-services-calculation/WCBillingSlab.json
index 59aea0ad47..381aab3860 100644
--- a/data/as/8202287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8202287/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203051/ws-services-calculation/WCBillingSlab.json b/data/as/8203051/ws-services-calculation/WCBillingSlab.json
index 15e4bfecae..3f43c258a1 100644
--- a/data/as/8203051/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203051/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203064/ws-services-calculation/WCBillingSlab.json b/data/as/8203064/ws-services-calculation/WCBillingSlab.json
index 132b5cedb9..22ec5f441c 100644
--- a/data/as/8203064/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203064/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203128/ws-services-calculation/WCBillingSlab.json b/data/as/8203128/ws-services-calculation/WCBillingSlab.json
index 1f782d9acd..990df8b9a2 100644
--- a/data/as/8203128/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203128/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203162/ws-services-calculation/WCBillingSlab.json b/data/as/8203162/ws-services-calculation/WCBillingSlab.json
index bb8765d985..c97bf8817e 100644
--- a/data/as/8203162/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203162/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203178/ws-services-calculation/WCBillingSlab.json b/data/as/8203178/ws-services-calculation/WCBillingSlab.json
index 91e7b562d2..490b832795 100644
--- a/data/as/8203178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203211/ws-services-calculation/WCBillingSlab.json b/data/as/8203211/ws-services-calculation/WCBillingSlab.json
index 8752c352e0..334f27f8c3 100644
--- a/data/as/8203211/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203211/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203233/ws-services-calculation/WCBillingSlab.json b/data/as/8203233/ws-services-calculation/WCBillingSlab.json
index 06fa3224a0..82969e8ffb 100644
--- a/data/as/8203233/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203233/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203251/ws-services-calculation/WCBillingSlab.json b/data/as/8203251/ws-services-calculation/WCBillingSlab.json
index c74f815801..f47da9b016 100644
--- a/data/as/8203251/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203251/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203271/ws-services-calculation/WCBillingSlab.json b/data/as/8203271/ws-services-calculation/WCBillingSlab.json
index 624952c1ed..8144b78dd6 100644
--- a/data/as/8203271/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203271/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203278/ws-services-calculation/WCBillingSlab.json b/data/as/8203278/ws-services-calculation/WCBillingSlab.json
index a690916a93..7454ab3bb9 100644
--- a/data/as/8203278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203278/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203286/ws-services-calculation/WCBillingSlab.json b/data/as/8203286/ws-services-calculation/WCBillingSlab.json
index 1486cce277..2fc37dd532 100644
--- a/data/as/8203286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203579/ws-services-calculation/WCBillingSlab.json b/data/as/8203579/ws-services-calculation/WCBillingSlab.json
index c3bbdfdf39..4309074b78 100644
--- a/data/as/8203579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203579/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203589/ws-services-calculation/WCBillingSlab.json b/data/as/8203589/ws-services-calculation/WCBillingSlab.json
index b694e31177..a651062cd2 100644
--- a/data/as/8203589/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203589/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203592/ws-services-calculation/WCBillingSlab.json b/data/as/8203592/ws-services-calculation/WCBillingSlab.json
index 6855017bf2..9465145132 100644
--- a/data/as/8203592/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203592/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203614/ws-services-calculation/WCBillingSlab.json b/data/as/8203614/ws-services-calculation/WCBillingSlab.json
index 8e466c5bf6..c352cccbe1 100644
--- a/data/as/8203614/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203614/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203629/ws-services-calculation/WCBillingSlab.json b/data/as/8203629/ws-services-calculation/WCBillingSlab.json
index 00647ab092..951fed7f4d 100644
--- a/data/as/8203629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203629/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203647/ws-services-calculation/WCBillingSlab.json b/data/as/8203647/ws-services-calculation/WCBillingSlab.json
index dc598f8eb8..5acb08f241 100644
--- a/data/as/8203647/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203647/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203683/ws-services-calculation/WCBillingSlab.json b/data/as/8203683/ws-services-calculation/WCBillingSlab.json
index e97e91b55b..abae2d0e66 100644
--- a/data/as/8203683/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203683/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203689/ws-services-calculation/WCBillingSlab.json b/data/as/8203689/ws-services-calculation/WCBillingSlab.json
index 85da731a57..303a747154 100644
--- a/data/as/8203689/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203689/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203693/ws-services-calculation/WCBillingSlab.json b/data/as/8203693/ws-services-calculation/WCBillingSlab.json
index 7901648985..bbc8595606 100644
--- a/data/as/8203693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203693/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203703/ws-services-calculation/WCBillingSlab.json b/data/as/8203703/ws-services-calculation/WCBillingSlab.json
index 5fda087751..dc15eabeab 100644
--- a/data/as/8203703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203703/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203721/ws-services-calculation/WCBillingSlab.json b/data/as/8203721/ws-services-calculation/WCBillingSlab.json
index fa80d4742a..041f9808c5 100644
--- a/data/as/8203721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203721/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203725/ws-services-calculation/WCBillingSlab.json b/data/as/8203725/ws-services-calculation/WCBillingSlab.json
index 72b5c821fd..4e2a0f79d8 100644
--- a/data/as/8203725/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203725/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203729/ws-services-calculation/WCBillingSlab.json b/data/as/8203729/ws-services-calculation/WCBillingSlab.json
index 5fe55c4f50..cdb1abda9e 100644
--- a/data/as/8203729/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203729/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203732/ws-services-calculation/WCBillingSlab.json b/data/as/8203732/ws-services-calculation/WCBillingSlab.json
index 138d86c35c..9c5997bf39 100644
--- a/data/as/8203732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203732/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203748/ws-services-calculation/WCBillingSlab.json b/data/as/8203748/ws-services-calculation/WCBillingSlab.json
index 2d9cee04ba..c8a868124f 100644
--- a/data/as/8203748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203748/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203764/ws-services-calculation/WCBillingSlab.json b/data/as/8203764/ws-services-calculation/WCBillingSlab.json
index ded90b2fda..34827307bb 100644
--- a/data/as/8203764/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203764/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203786/ws-services-calculation/WCBillingSlab.json b/data/as/8203786/ws-services-calculation/WCBillingSlab.json
index 2e3575cc90..f455a7435c 100644
--- a/data/as/8203786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203786/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203804/ws-services-calculation/WCBillingSlab.json b/data/as/8203804/ws-services-calculation/WCBillingSlab.json
index 1fc3a51f07..162ef96081 100644
--- a/data/as/8203804/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203804/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203816/ws-services-calculation/WCBillingSlab.json b/data/as/8203816/ws-services-calculation/WCBillingSlab.json
index c1a8797924..4dc8040bdc 100644
--- a/data/as/8203816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203835/ws-services-calculation/WCBillingSlab.json b/data/as/8203835/ws-services-calculation/WCBillingSlab.json
index daa36f53f5..1aeebb7742 100644
--- a/data/as/8203835/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203835/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203855/ws-services-calculation/WCBillingSlab.json b/data/as/8203855/ws-services-calculation/WCBillingSlab.json
index ceb13709de..a6adbabe39 100644
--- a/data/as/8203855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203855/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203872/ws-services-calculation/WCBillingSlab.json b/data/as/8203872/ws-services-calculation/WCBillingSlab.json
index 77fd5d1069..a3d7332cac 100644
--- a/data/as/8203872/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203872/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203902/ws-services-calculation/WCBillingSlab.json b/data/as/8203902/ws-services-calculation/WCBillingSlab.json
index 7be2453637..59606c9453 100644
--- a/data/as/8203902/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203902/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203915/ws-services-calculation/WCBillingSlab.json b/data/as/8203915/ws-services-calculation/WCBillingSlab.json
index f571492bcf..a114dafc2e 100644
--- a/data/as/8203915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203915/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203942/ws-services-calculation/WCBillingSlab.json b/data/as/8203942/ws-services-calculation/WCBillingSlab.json
index 117c71a8aa..52524b87c8 100644
--- a/data/as/8203942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203942/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8203947/ws-services-calculation/WCBillingSlab.json b/data/as/8203947/ws-services-calculation/WCBillingSlab.json
index 51e510c054..0765bc7048 100644
--- a/data/as/8203947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8203947/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8204267/ws-services-calculation/WCBillingSlab.json b/data/as/8204267/ws-services-calculation/WCBillingSlab.json
index ef72583410..929561fa78 100644
--- a/data/as/8204267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8204267/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205058/ws-services-calculation/WCBillingSlab.json b/data/as/8205058/ws-services-calculation/WCBillingSlab.json
index b3ce11c356..fb0e503d1f 100644
--- a/data/as/8205058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205058/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205077/ws-services-calculation/WCBillingSlab.json b/data/as/8205077/ws-services-calculation/WCBillingSlab.json
index 089d294c24..7edd86f988 100644
--- a/data/as/8205077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205077/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205087/ws-services-calculation/WCBillingSlab.json b/data/as/8205087/ws-services-calculation/WCBillingSlab.json
index e00241ccda..9a8deec4a7 100644
--- a/data/as/8205087/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205087/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205096/ws-services-calculation/WCBillingSlab.json b/data/as/8205096/ws-services-calculation/WCBillingSlab.json
index 7616d96c46..8c8f703f1c 100644
--- a/data/as/8205096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205096/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205107/ws-services-calculation/WCBillingSlab.json b/data/as/8205107/ws-services-calculation/WCBillingSlab.json
index 8bfba85ad4..ba90602195 100644
--- a/data/as/8205107/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205107/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205116/ws-services-calculation/WCBillingSlab.json b/data/as/8205116/ws-services-calculation/WCBillingSlab.json
index 1f509f4e1e..a4673d59e8 100644
--- a/data/as/8205116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205116/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205127/ws-services-calculation/WCBillingSlab.json b/data/as/8205127/ws-services-calculation/WCBillingSlab.json
index 0c73d0be27..9e1e8e562c 100644
--- a/data/as/8205127/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205127/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205153/ws-services-calculation/WCBillingSlab.json b/data/as/8205153/ws-services-calculation/WCBillingSlab.json
index b9d1afbbe9..3c7dbbe053 100644
--- a/data/as/8205153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205153/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205176/ws-services-calculation/WCBillingSlab.json b/data/as/8205176/ws-services-calculation/WCBillingSlab.json
index c659607572..c9112df7e6 100644
--- a/data/as/8205176/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205176/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205265/ws-services-calculation/WCBillingSlab.json b/data/as/8205265/ws-services-calculation/WCBillingSlab.json
index d83098df98..e5a4d075d7 100644
--- a/data/as/8205265/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205265/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205277/ws-services-calculation/WCBillingSlab.json b/data/as/8205277/ws-services-calculation/WCBillingSlab.json
index 421ce4e96b..51130f467e 100644
--- a/data/as/8205277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205277/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205283/ws-services-calculation/WCBillingSlab.json b/data/as/8205283/ws-services-calculation/WCBillingSlab.json
index 7bfc2fc1f0..ecd996296c 100644
--- a/data/as/8205283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205283/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205289/ws-services-calculation/WCBillingSlab.json b/data/as/8205289/ws-services-calculation/WCBillingSlab.json
index b701decc90..2cf723018a 100644
--- a/data/as/8205289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205289/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205290/ws-services-calculation/WCBillingSlab.json b/data/as/8205290/ws-services-calculation/WCBillingSlab.json
index ede3b65747..c959f2ff4e 100644
--- a/data/as/8205290/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205290/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205310/ws-services-calculation/WCBillingSlab.json b/data/as/8205310/ws-services-calculation/WCBillingSlab.json
index ddd98fc1d0..b3304480b4 100644
--- a/data/as/8205310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205310/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205339/ws-services-calculation/WCBillingSlab.json b/data/as/8205339/ws-services-calculation/WCBillingSlab.json
index 91d9e21512..a42a321cba 100644
--- a/data/as/8205339/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205339/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205350/ws-services-calculation/WCBillingSlab.json b/data/as/8205350/ws-services-calculation/WCBillingSlab.json
index aa1e915c72..24c61a4d09 100644
--- a/data/as/8205350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205362/ws-services-calculation/WCBillingSlab.json b/data/as/8205362/ws-services-calculation/WCBillingSlab.json
index c8d896a4d0..d1dd77d848 100644
--- a/data/as/8205362/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205362/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205375/ws-services-calculation/WCBillingSlab.json b/data/as/8205375/ws-services-calculation/WCBillingSlab.json
index 76c9798f68..8a59457cc5 100644
--- a/data/as/8205375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205375/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205382/ws-services-calculation/WCBillingSlab.json b/data/as/8205382/ws-services-calculation/WCBillingSlab.json
index afaab48dff..04995fb360 100644
--- a/data/as/8205382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205382/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205387/ws-services-calculation/WCBillingSlab.json b/data/as/8205387/ws-services-calculation/WCBillingSlab.json
index e4a6f0edab..0b1be6bb99 100644
--- a/data/as/8205387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8205395/ws-services-calculation/WCBillingSlab.json b/data/as/8205395/ws-services-calculation/WCBillingSlab.json
index 8b5c3ed3ad..39f9efa832 100644
--- a/data/as/8205395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8205395/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206044/ws-services-calculation/WCBillingSlab.json b/data/as/8206044/ws-services-calculation/WCBillingSlab.json
index 82460802fd..7776c405a0 100644
--- a/data/as/8206044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206044/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206058/ws-services-calculation/WCBillingSlab.json b/data/as/8206058/ws-services-calculation/WCBillingSlab.json
index 603edaf9d5..ab7883098e 100644
--- a/data/as/8206058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206058/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206068/ws-services-calculation/WCBillingSlab.json b/data/as/8206068/ws-services-calculation/WCBillingSlab.json
index 8ab4f06b60..d3593f9b66 100644
--- a/data/as/8206068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206068/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206074/ws-services-calculation/WCBillingSlab.json b/data/as/8206074/ws-services-calculation/WCBillingSlab.json
index 27f43b668b..8b27a3f13e 100644
--- a/data/as/8206074/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206074/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206091/ws-services-calculation/WCBillingSlab.json b/data/as/8206091/ws-services-calculation/WCBillingSlab.json
index 59f89a8018..d91da019f7 100644
--- a/data/as/8206091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206091/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206111/ws-services-calculation/WCBillingSlab.json b/data/as/8206111/ws-services-calculation/WCBillingSlab.json
index c6dc2443ca..5f3b16e287 100644
--- a/data/as/8206111/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206111/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206116/ws-services-calculation/WCBillingSlab.json b/data/as/8206116/ws-services-calculation/WCBillingSlab.json
index 0dd252a1df..1fd911197e 100644
--- a/data/as/8206116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206116/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206170/ws-services-calculation/WCBillingSlab.json b/data/as/8206170/ws-services-calculation/WCBillingSlab.json
index 5b376729c4..590ab5034c 100644
--- a/data/as/8206170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206170/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206177/ws-services-calculation/WCBillingSlab.json b/data/as/8206177/ws-services-calculation/WCBillingSlab.json
index 2d998e9bfe..3bc10765ff 100644
--- a/data/as/8206177/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206177/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206194/ws-services-calculation/WCBillingSlab.json b/data/as/8206194/ws-services-calculation/WCBillingSlab.json
index 875443c679..c5b0b162ed 100644
--- a/data/as/8206194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206194/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206219/ws-services-calculation/WCBillingSlab.json b/data/as/8206219/ws-services-calculation/WCBillingSlab.json
index e767737a10..599f47d702 100644
--- a/data/as/8206219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206219/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206280/ws-services-calculation/WCBillingSlab.json b/data/as/8206280/ws-services-calculation/WCBillingSlab.json
index 191c80955b..f6ac93d12c 100644
--- a/data/as/8206280/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206280/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206284/ws-services-calculation/WCBillingSlab.json b/data/as/8206284/ws-services-calculation/WCBillingSlab.json
index 1bbb715c45..8c5cce68d1 100644
--- a/data/as/8206284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206284/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206297/ws-services-calculation/WCBillingSlab.json b/data/as/8206297/ws-services-calculation/WCBillingSlab.json
index b237e3710b..9df538603b 100644
--- a/data/as/8206297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206297/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206302/ws-services-calculation/WCBillingSlab.json b/data/as/8206302/ws-services-calculation/WCBillingSlab.json
index 2f8736f4e2..f8924feff0 100644
--- a/data/as/8206302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206302/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206316/ws-services-calculation/WCBillingSlab.json b/data/as/8206316/ws-services-calculation/WCBillingSlab.json
index 43856af336..423212fa73 100644
--- a/data/as/8206316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206316/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206425/ws-services-calculation/WCBillingSlab.json b/data/as/8206425/ws-services-calculation/WCBillingSlab.json
index 85f4c94ce8..49279888b8 100644
--- a/data/as/8206425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206425/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206436/ws-services-calculation/WCBillingSlab.json b/data/as/8206436/ws-services-calculation/WCBillingSlab.json
index d8c31fbc0a..74771921be 100644
--- a/data/as/8206436/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206436/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206445/ws-services-calculation/WCBillingSlab.json b/data/as/8206445/ws-services-calculation/WCBillingSlab.json
index 45c7c479e2..f833a46a08 100644
--- a/data/as/8206445/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206445/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206457/ws-services-calculation/WCBillingSlab.json b/data/as/8206457/ws-services-calculation/WCBillingSlab.json
index dc6a727e39..124a42fdef 100644
--- a/data/as/8206457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206457/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206469/ws-services-calculation/WCBillingSlab.json b/data/as/8206469/ws-services-calculation/WCBillingSlab.json
index aa847f4954..d58b0a231c 100644
--- a/data/as/8206469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206469/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206477/ws-services-calculation/WCBillingSlab.json b/data/as/8206477/ws-services-calculation/WCBillingSlab.json
index d555428f5b..4dc749c411 100644
--- a/data/as/8206477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206477/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206486/ws-services-calculation/WCBillingSlab.json b/data/as/8206486/ws-services-calculation/WCBillingSlab.json
index c8bb6d83db..fcb46c2c49 100644
--- a/data/as/8206486/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206486/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206496/ws-services-calculation/WCBillingSlab.json b/data/as/8206496/ws-services-calculation/WCBillingSlab.json
index fefe95f0b4..9631982dc2 100644
--- a/data/as/8206496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206510/ws-services-calculation/WCBillingSlab.json b/data/as/8206510/ws-services-calculation/WCBillingSlab.json
index 8cdbefaa7d..6f192d8d53 100644
--- a/data/as/8206510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206510/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206524/ws-services-calculation/WCBillingSlab.json b/data/as/8206524/ws-services-calculation/WCBillingSlab.json
index afdc427b74..ea4985da2d 100644
--- a/data/as/8206524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206524/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206535/ws-services-calculation/WCBillingSlab.json b/data/as/8206535/ws-services-calculation/WCBillingSlab.json
index d10888a1ae..99e87b32dc 100644
--- a/data/as/8206535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206542/ws-services-calculation/WCBillingSlab.json b/data/as/8206542/ws-services-calculation/WCBillingSlab.json
index 6ed27ced6b..db211f35a2 100644
--- a/data/as/8206542/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206542/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206547/ws-services-calculation/WCBillingSlab.json b/data/as/8206547/ws-services-calculation/WCBillingSlab.json
index d6842e4143..a1583bcd67 100644
--- a/data/as/8206547/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206547/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206554/ws-services-calculation/WCBillingSlab.json b/data/as/8206554/ws-services-calculation/WCBillingSlab.json
index 9132e4884c..8d15431649 100644
--- a/data/as/8206554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206558/ws-services-calculation/WCBillingSlab.json b/data/as/8206558/ws-services-calculation/WCBillingSlab.json
index 415435e94a..9452d3162d 100644
--- a/data/as/8206558/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206558/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206789/ws-services-calculation/WCBillingSlab.json b/data/as/8206789/ws-services-calculation/WCBillingSlab.json
index b10dd44970..ffeb0018a9 100644
--- a/data/as/8206789/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206789/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206800/ws-services-calculation/WCBillingSlab.json b/data/as/8206800/ws-services-calculation/WCBillingSlab.json
index d867641ebc..3687db8672 100644
--- a/data/as/8206800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206800/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206811/ws-services-calculation/WCBillingSlab.json b/data/as/8206811/ws-services-calculation/WCBillingSlab.json
index c69b79ed46..1e814b9f26 100644
--- a/data/as/8206811/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206811/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206824/ws-services-calculation/WCBillingSlab.json b/data/as/8206824/ws-services-calculation/WCBillingSlab.json
index 99cedbf653..1b6c83314c 100644
--- a/data/as/8206824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206824/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206834/ws-services-calculation/WCBillingSlab.json b/data/as/8206834/ws-services-calculation/WCBillingSlab.json
index ac32e87ed6..d0c03904be 100644
--- a/data/as/8206834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206834/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8206851/ws-services-calculation/WCBillingSlab.json b/data/as/8206851/ws-services-calculation/WCBillingSlab.json
index 2551228b85..572b5b6cad 100644
--- a/data/as/8206851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8206851/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215102/ws-services-calculation/WCBillingSlab.json b/data/as/8215102/ws-services-calculation/WCBillingSlab.json
index 485e658725..082e40843a 100644
--- a/data/as/8215102/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215102/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215107/ws-services-calculation/WCBillingSlab.json b/data/as/8215107/ws-services-calculation/WCBillingSlab.json
index 77c00d2043..7d23aa8367 100644
--- a/data/as/8215107/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215107/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215197/ws-services-calculation/WCBillingSlab.json b/data/as/8215197/ws-services-calculation/WCBillingSlab.json
index d72a7bc600..0c130ec124 100644
--- a/data/as/8215197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215197/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215261/ws-services-calculation/WCBillingSlab.json b/data/as/8215261/ws-services-calculation/WCBillingSlab.json
index a7da33e0b7..73cc98e222 100644
--- a/data/as/8215261/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215261/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215283/ws-services-calculation/WCBillingSlab.json b/data/as/8215283/ws-services-calculation/WCBillingSlab.json
index 81cab1bb2a..c30856a35c 100644
--- a/data/as/8215283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215283/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215285/ws-services-calculation/WCBillingSlab.json b/data/as/8215285/ws-services-calculation/WCBillingSlab.json
index 4affd12b03..4b714f7bde 100644
--- a/data/as/8215285/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215285/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215403/ws-services-calculation/WCBillingSlab.json b/data/as/8215403/ws-services-calculation/WCBillingSlab.json
index e6689cd8ad..4c863057ea 100644
--- a/data/as/8215403/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215403/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215406/ws-services-calculation/WCBillingSlab.json b/data/as/8215406/ws-services-calculation/WCBillingSlab.json
index d3a8b1460d..da1957cfba 100644
--- a/data/as/8215406/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215406/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215411/ws-services-calculation/WCBillingSlab.json b/data/as/8215411/ws-services-calculation/WCBillingSlab.json
index 79290f3f21..33b41e2d77 100644
--- a/data/as/8215411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215411/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215655/ws-services-calculation/WCBillingSlab.json b/data/as/8215655/ws-services-calculation/WCBillingSlab.json
index 928e79d1d1..5c14264621 100644
--- a/data/as/8215655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215655/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215753/ws-services-calculation/WCBillingSlab.json b/data/as/8215753/ws-services-calculation/WCBillingSlab.json
index ca44b25285..c9fc5fb9f0 100644
--- a/data/as/8215753/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215753/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215757/ws-services-calculation/WCBillingSlab.json b/data/as/8215757/ws-services-calculation/WCBillingSlab.json
index 0b0c83291f..3bddcd1ebe 100644
--- a/data/as/8215757/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215757/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215759/ws-services-calculation/WCBillingSlab.json b/data/as/8215759/ws-services-calculation/WCBillingSlab.json
index 0f1c52e9d7..103a734970 100644
--- a/data/as/8215759/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215759/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215762/ws-services-calculation/WCBillingSlab.json b/data/as/8215762/ws-services-calculation/WCBillingSlab.json
index 5b4c9e6460..ce914c9009 100644
--- a/data/as/8215762/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215762/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215767/ws-services-calculation/WCBillingSlab.json b/data/as/8215767/ws-services-calculation/WCBillingSlab.json
index 5e84d3553d..0de193a1d3 100644
--- a/data/as/8215767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215767/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215769/ws-services-calculation/WCBillingSlab.json b/data/as/8215769/ws-services-calculation/WCBillingSlab.json
index eff305e1c4..ccd41a10a7 100644
--- a/data/as/8215769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215769/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8215771/ws-services-calculation/WCBillingSlab.json b/data/as/8215771/ws-services-calculation/WCBillingSlab.json
index 70df52602e..5fafd057c8 100644
--- a/data/as/8215771/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8215771/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218304/ws-services-calculation/WCBillingSlab.json b/data/as/8218304/ws-services-calculation/WCBillingSlab.json
index eff54c07f8..84013a08f5 100644
--- a/data/as/8218304/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218304/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218315/ws-services-calculation/WCBillingSlab.json b/data/as/8218315/ws-services-calculation/WCBillingSlab.json
index bb5afc0e63..c9c2dd71d8 100644
--- a/data/as/8218315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218315/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218486/ws-services-calculation/WCBillingSlab.json b/data/as/8218486/ws-services-calculation/WCBillingSlab.json
index 3c3655fa43..631e2b22e2 100644
--- a/data/as/8218486/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218486/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218509/ws-services-calculation/WCBillingSlab.json b/data/as/8218509/ws-services-calculation/WCBillingSlab.json
index f2631ca295..13c1f36809 100644
--- a/data/as/8218509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218509/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8218510/ws-services-calculation/WCBillingSlab.json b/data/as/8218510/ws-services-calculation/WCBillingSlab.json
index 666ffce94d..0da2b85c66 100644
--- a/data/as/8218510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8218510/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222042/ws-services-calculation/WCBillingSlab.json b/data/as/8222042/ws-services-calculation/WCBillingSlab.json
index 6f9b7adaf2..b4213c40d2 100644
--- a/data/as/8222042/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222042/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222249/ws-services-calculation/WCBillingSlab.json b/data/as/8222249/ws-services-calculation/WCBillingSlab.json
index 853d884e67..d3f809f018 100644
--- a/data/as/8222249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222249/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222264/ws-services-calculation/WCBillingSlab.json b/data/as/8222264/ws-services-calculation/WCBillingSlab.json
index 9126b2391a..8b0358ad61 100644
--- a/data/as/8222264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222264/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222276/ws-services-calculation/WCBillingSlab.json b/data/as/8222276/ws-services-calculation/WCBillingSlab.json
index a3226d79cb..9720234585 100644
--- a/data/as/8222276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222276/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222311/ws-services-calculation/WCBillingSlab.json b/data/as/8222311/ws-services-calculation/WCBillingSlab.json
index 1e7d0ba976..e94bc9d6a3 100644
--- a/data/as/8222311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222311/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222322/ws-services-calculation/WCBillingSlab.json b/data/as/8222322/ws-services-calculation/WCBillingSlab.json
index 5fbf2eeb6e..8752710bbf 100644
--- a/data/as/8222322/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222322/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222342/ws-services-calculation/WCBillingSlab.json b/data/as/8222342/ws-services-calculation/WCBillingSlab.json
index cc80ba68d8..c64ae53800 100644
--- a/data/as/8222342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222342/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222348/ws-services-calculation/WCBillingSlab.json b/data/as/8222348/ws-services-calculation/WCBillingSlab.json
index 8c3208e0fd..d0c55fcbde 100644
--- a/data/as/8222348/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222348/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222352/ws-services-calculation/WCBillingSlab.json b/data/as/8222352/ws-services-calculation/WCBillingSlab.json
index 99aefbdd6b..38636f2195 100644
--- a/data/as/8222352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222352/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222366/ws-services-calculation/WCBillingSlab.json b/data/as/8222366/ws-services-calculation/WCBillingSlab.json
index 00c8ef60c2..63f3950649 100644
--- a/data/as/8222366/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222366/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8222386/ws-services-calculation/WCBillingSlab.json b/data/as/8222386/ws-services-calculation/WCBillingSlab.json
index f9a8d90f56..0a8d58f5ae 100644
--- a/data/as/8222386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8222386/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8227638/ws-services-calculation/WCBillingSlab.json b/data/as/8227638/ws-services-calculation/WCBillingSlab.json
index 93d67d1a2d..aaf1b24a6c 100644
--- a/data/as/8227638/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8227638/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228162/ws-services-calculation/WCBillingSlab.json b/data/as/8228162/ws-services-calculation/WCBillingSlab.json
index af7445045f..cd564b2cd5 100644
--- a/data/as/8228162/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228162/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228342/ws-services-calculation/WCBillingSlab.json b/data/as/8228342/ws-services-calculation/WCBillingSlab.json
index 92fdfc7953..31e1c89a44 100644
--- a/data/as/8228342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228342/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228352/ws-services-calculation/WCBillingSlab.json b/data/as/8228352/ws-services-calculation/WCBillingSlab.json
index a7886195d9..9b7050e71d 100644
--- a/data/as/8228352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228352/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228831/ws-services-calculation/WCBillingSlab.json b/data/as/8228831/ws-services-calculation/WCBillingSlab.json
index d46c38a856..09086ab3eb 100644
--- a/data/as/8228831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228831/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8228832/ws-services-calculation/WCBillingSlab.json b/data/as/8228832/ws-services-calculation/WCBillingSlab.json
index 4d0def9271..04a27505d0 100644
--- a/data/as/8228832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8228832/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8230806/ws-services-calculation/WCBillingSlab.json b/data/as/8230806/ws-services-calculation/WCBillingSlab.json
index 0a78d7c916..a3660993c2 100644
--- a/data/as/8230806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8230806/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8234493/ws-services-calculation/WCBillingSlab.json b/data/as/8234493/ws-services-calculation/WCBillingSlab.json
index 00aa68171c..8a8cdb0785 100644
--- a/data/as/8234493/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8234493/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8234543/ws-services-calculation/WCBillingSlab.json b/data/as/8234543/ws-services-calculation/WCBillingSlab.json
index 61da3cb276..374f6541c3 100644
--- a/data/as/8234543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8234543/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8234577/ws-services-calculation/WCBillingSlab.json b/data/as/8234577/ws-services-calculation/WCBillingSlab.json
index 06491211ac..c9dea5fd60 100644
--- a/data/as/8234577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8234577/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235302/ws-services-calculation/WCBillingSlab.json b/data/as/8235302/ws-services-calculation/WCBillingSlab.json
index 3029289973..13eb5e9efe 100644
--- a/data/as/8235302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235302/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235314/ws-services-calculation/WCBillingSlab.json b/data/as/8235314/ws-services-calculation/WCBillingSlab.json
index b46ed6fdb1..6d7fb0ad93 100644
--- a/data/as/8235314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235314/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235328/ws-services-calculation/WCBillingSlab.json b/data/as/8235328/ws-services-calculation/WCBillingSlab.json
index 48ae45b844..aa1617a16c 100644
--- a/data/as/8235328/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235328/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235338/ws-services-calculation/WCBillingSlab.json b/data/as/8235338/ws-services-calculation/WCBillingSlab.json
index 603eab0825..5a691965d6 100644
--- a/data/as/8235338/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235338/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235347/ws-services-calculation/WCBillingSlab.json b/data/as/8235347/ws-services-calculation/WCBillingSlab.json
index ebe8bb8e25..421d02e131 100644
--- a/data/as/8235347/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235347/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235358/ws-services-calculation/WCBillingSlab.json b/data/as/8235358/ws-services-calculation/WCBillingSlab.json
index dc90e63178..8885b3fed2 100644
--- a/data/as/8235358/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235358/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235371/ws-services-calculation/WCBillingSlab.json b/data/as/8235371/ws-services-calculation/WCBillingSlab.json
index 1904899615..6289d1cfd7 100644
--- a/data/as/8235371/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235371/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235387/ws-services-calculation/WCBillingSlab.json b/data/as/8235387/ws-services-calculation/WCBillingSlab.json
index 59cdbca612..1af3bd1952 100644
--- a/data/as/8235387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235394/ws-services-calculation/WCBillingSlab.json b/data/as/8235394/ws-services-calculation/WCBillingSlab.json
index c0aefe4ffe..91ba41f003 100644
--- a/data/as/8235394/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235394/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235405/ws-services-calculation/WCBillingSlab.json b/data/as/8235405/ws-services-calculation/WCBillingSlab.json
index 85f72c7167..398a212006 100644
--- a/data/as/8235405/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235405/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235411/ws-services-calculation/WCBillingSlab.json b/data/as/8235411/ws-services-calculation/WCBillingSlab.json
index 7fa2327666..0bca572dc2 100644
--- a/data/as/8235411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235411/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235421/ws-services-calculation/WCBillingSlab.json b/data/as/8235421/ws-services-calculation/WCBillingSlab.json
index 634068b678..185b86f322 100644
--- a/data/as/8235421/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235421/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8235807/ws-services-calculation/WCBillingSlab.json b/data/as/8235807/ws-services-calculation/WCBillingSlab.json
index e40b28f663..9888715fdf 100644
--- a/data/as/8235807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8235807/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237353/ws-services-calculation/WCBillingSlab.json b/data/as/8237353/ws-services-calculation/WCBillingSlab.json
index 80a2749964..843662e2fb 100644
--- a/data/as/8237353/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237353/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237367/ws-services-calculation/WCBillingSlab.json b/data/as/8237367/ws-services-calculation/WCBillingSlab.json
index bfe899bed7..bffc0155a9 100644
--- a/data/as/8237367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237367/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237390/ws-services-calculation/WCBillingSlab.json b/data/as/8237390/ws-services-calculation/WCBillingSlab.json
index 00b91c2db5..6dab830906 100644
--- a/data/as/8237390/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237390/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237435/ws-services-calculation/WCBillingSlab.json b/data/as/8237435/ws-services-calculation/WCBillingSlab.json
index abdde5b7de..8370336143 100644
--- a/data/as/8237435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237435/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237444/ws-services-calculation/WCBillingSlab.json b/data/as/8237444/ws-services-calculation/WCBillingSlab.json
index 0931f41411..3d7b55204d 100644
--- a/data/as/8237444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237444/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237467/ws-services-calculation/WCBillingSlab.json b/data/as/8237467/ws-services-calculation/WCBillingSlab.json
index c24529d021..239525d4b8 100644
--- a/data/as/8237467/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237467/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237495/ws-services-calculation/WCBillingSlab.json b/data/as/8237495/ws-services-calculation/WCBillingSlab.json
index e47538675c..e12b096019 100644
--- a/data/as/8237495/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237495/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237534/ws-services-calculation/WCBillingSlab.json b/data/as/8237534/ws-services-calculation/WCBillingSlab.json
index 6e3a809ff1..3185ad89c1 100644
--- a/data/as/8237534/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237534/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237554/ws-services-calculation/WCBillingSlab.json b/data/as/8237554/ws-services-calculation/WCBillingSlab.json
index cc5f10367c..015b02976b 100644
--- a/data/as/8237554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237581/ws-services-calculation/WCBillingSlab.json b/data/as/8237581/ws-services-calculation/WCBillingSlab.json
index b8e9012109..2d7fd671d7 100644
--- a/data/as/8237581/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237581/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237588/ws-services-calculation/WCBillingSlab.json b/data/as/8237588/ws-services-calculation/WCBillingSlab.json
index 29124f5fc9..98b42cfcff 100644
--- a/data/as/8237588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237588/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237606/ws-services-calculation/WCBillingSlab.json b/data/as/8237606/ws-services-calculation/WCBillingSlab.json
index e8be286b30..ec5d67584c 100644
--- a/data/as/8237606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237606/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8237611/ws-services-calculation/WCBillingSlab.json b/data/as/8237611/ws-services-calculation/WCBillingSlab.json
index d01a920553..6d95980e95 100644
--- a/data/as/8237611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8237611/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8239822/ws-services-calculation/WCBillingSlab.json b/data/as/8239822/ws-services-calculation/WCBillingSlab.json
index ddbc58d4db..abc62c3b19 100644
--- a/data/as/8239822/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8239822/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8246724/ws-services-calculation/WCBillingSlab.json b/data/as/8246724/ws-services-calculation/WCBillingSlab.json
index 2d53c8cfdb..bc0bccd1d4 100644
--- a/data/as/8246724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8246724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8250038/ws-services-calculation/WCBillingSlab.json b/data/as/8250038/ws-services-calculation/WCBillingSlab.json
index 89bbc42d4c..1cb017ea0c 100644
--- a/data/as/8250038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8250038/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8250626/ws-services-calculation/WCBillingSlab.json b/data/as/8250626/ws-services-calculation/WCBillingSlab.json
index 3f943ac6ad..0ea208fd49 100644
--- a/data/as/8250626/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8250626/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8252919/ws-services-calculation/WCBillingSlab.json b/data/as/8252919/ws-services-calculation/WCBillingSlab.json
index d263df429e..500de88ebf 100644
--- a/data/as/8252919/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8252919/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8255134/ws-services-calculation/WCBillingSlab.json b/data/as/8255134/ws-services-calculation/WCBillingSlab.json
index dea3ed4b6d..3d7afc878d 100644
--- a/data/as/8255134/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8255134/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8257091/ws-services-calculation/WCBillingSlab.json b/data/as/8257091/ws-services-calculation/WCBillingSlab.json
index 806419931a..e0dd8b87bb 100644
--- a/data/as/8257091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8257091/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8261500/ws-services-calculation/WCBillingSlab.json b/data/as/8261500/ws-services-calculation/WCBillingSlab.json
index 004f58cdea..62fa88dd46 100644
--- a/data/as/8261500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8261500/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8261877/ws-services-calculation/WCBillingSlab.json b/data/as/8261877/ws-services-calculation/WCBillingSlab.json
index ae6a6f24fd..93ffcac583 100644
--- a/data/as/8261877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8261877/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8261995/ws-services-calculation/WCBillingSlab.json b/data/as/8261995/ws-services-calculation/WCBillingSlab.json
index 3dc5a2362e..486ce82de4 100644
--- a/data/as/8261995/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8261995/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8264422/ws-services-calculation/WCBillingSlab.json b/data/as/8264422/ws-services-calculation/WCBillingSlab.json
index 9e70c316d8..40e00820d5 100644
--- a/data/as/8264422/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8264422/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8265409/ws-services-calculation/WCBillingSlab.json b/data/as/8265409/ws-services-calculation/WCBillingSlab.json
index b92fa75052..9ea0d3eb93 100644
--- a/data/as/8265409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8265409/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8266441/ws-services-calculation/WCBillingSlab.json b/data/as/8266441/ws-services-calculation/WCBillingSlab.json
index 0a339b4403..56a3814c9f 100644
--- a/data/as/8266441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8266441/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8273083/ws-services-calculation/WCBillingSlab.json b/data/as/8273083/ws-services-calculation/WCBillingSlab.json
index e3654d7be9..f67655b7cb 100644
--- a/data/as/8273083/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8273083/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8279762/ws-services-calculation/WCBillingSlab.json b/data/as/8279762/ws-services-calculation/WCBillingSlab.json
index c2c7e3a5a8..e3c61d57a6 100644
--- a/data/as/8279762/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8279762/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8286607/ws-services-calculation/WCBillingSlab.json b/data/as/8286607/ws-services-calculation/WCBillingSlab.json
index 6623b42c84..c074c9789b 100644
--- a/data/as/8286607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8286607/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8298009/ws-services-calculation/WCBillingSlab.json b/data/as/8298009/ws-services-calculation/WCBillingSlab.json
index 3d2e79283d..7ef076d816 100644
--- a/data/as/8298009/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8298009/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8307469/ws-services-calculation/WCBillingSlab.json b/data/as/8307469/ws-services-calculation/WCBillingSlab.json
index 1142094b66..ec03256848 100644
--- a/data/as/8307469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8307469/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8310456/ws-services-calculation/WCBillingSlab.json b/data/as/8310456/ws-services-calculation/WCBillingSlab.json
index dc6a55fc18..b735030d74 100644
--- a/data/as/8310456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8310456/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8312752/ws-services-calculation/WCBillingSlab.json b/data/as/8312752/ws-services-calculation/WCBillingSlab.json
index 589d022267..b0d3572f5b 100644
--- a/data/as/8312752/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8312752/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8320434/ws-services-calculation/WCBillingSlab.json b/data/as/8320434/ws-services-calculation/WCBillingSlab.json
index 0742390eef..807b2cf10b 100644
--- a/data/as/8320434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8320434/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8325212/ws-services-calculation/WCBillingSlab.json b/data/as/8325212/ws-services-calculation/WCBillingSlab.json
index df4446dcd2..60c2d785b3 100644
--- a/data/as/8325212/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8325212/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8326277/ws-services-calculation/WCBillingSlab.json b/data/as/8326277/ws-services-calculation/WCBillingSlab.json
index 896ae836b2..7e4af0b34b 100644
--- a/data/as/8326277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8326277/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8326909/ws-services-calculation/WCBillingSlab.json b/data/as/8326909/ws-services-calculation/WCBillingSlab.json
index f4d5368d06..d4bd93740c 100644
--- a/data/as/8326909/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8326909/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/8365758/ws-services-calculation/WCBillingSlab.json b/data/as/8365758/ws-services-calculation/WCBillingSlab.json
index 135c3ff795..4019af56b2 100644
--- a/data/as/8365758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/8365758/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file

From 8bc47c5781ea6ac1e18eafcc2e015dedb690f5ce Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 17:35:21 +0530
Subject: [PATCH 21/23] updated minimumCharge 0.0 to 0

---
 .../30016769/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016773/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016776/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016777/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016779/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016893/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30016917/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017080/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017213/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017259/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017426/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017520/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017697/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017715/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017720/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017735/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017892/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017895/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30017896/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018185/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018227/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018243/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018312/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018441/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018712/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018720/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018721/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018738/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018739/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018741/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018824/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018921/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018935/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30018941/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019121/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019130/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019135/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019139/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019144/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019151/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019154/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019163/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019166/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019168/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019170/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019171/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019173/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019266/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019465/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019506/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019535/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019544/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019572/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019680/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019686/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019793/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019799/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019826/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30019832/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020076/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020201/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020202/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020369/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020383/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020502/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020635/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020637/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020760/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020766/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020777/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30020972/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30021055/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30021475/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30021482/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30021560/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30021973/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30021987/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022258/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022299/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022418/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022523/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022537/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022693/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022702/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022721/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022760/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022777/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022787/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022800/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022816/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022851/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022854/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022858/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022862/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022947/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022975/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30022986/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023075/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023084/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023147/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023196/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023283/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023298/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023308/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023317/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023324/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023337/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023347/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023360/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023708/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023894/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023984/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30023999/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30027151/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30027153/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30027587/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30027681/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30030288/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30030309/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30030458/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30031382/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30033116/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036349/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036685/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036696/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036706/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036712/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036747/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036796/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036799/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30036923/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037050/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037052/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037053/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037055/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037056/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037057/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037058/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037282/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037284/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037286/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037287/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037289/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037516/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037943/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037947/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037948/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037949/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037950/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037951/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037952/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037953/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037954/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037955/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30037960/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038014/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038150/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038176/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038197/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038208/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038633/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038634/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038635/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038636/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038738/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038913/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038945/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038960/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30038988/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30039003/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30039714/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30039715/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30039748/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30040182/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30040815/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041202/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041203/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041386/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041849/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041850/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041853/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041854/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041859/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041866/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041873/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041886/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041901/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30041907/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042788/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042793/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042799/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042803/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042807/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042812/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042816/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042819/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042954/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042955/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042957/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042959/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042961/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042963/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30042965/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043286/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043298/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043311/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043314/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043321/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043327/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043330/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043335/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043343/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043349/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043358/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043557/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043601/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043606/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043782/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043797/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043820/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043846/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043851/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30043879/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30044254/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30044293/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30044481/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30044491/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30045140/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30045632/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30045635/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30046142/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30046178/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30046241/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30046274/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30046286/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30046465/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048127/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048267/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048408/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048644/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048673/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048680/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048696/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048776/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048965/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048987/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30048994/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049004/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049048/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049049/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049050/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049081/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049228/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049262/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049278/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049299/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049604/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049608/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049610/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049624/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049625/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049629/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049631/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049632/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049922/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049941/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30049949/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30050030/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30050223/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30050805/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30050939/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30050952/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051014/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051018/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051021/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051023/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051099/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051263/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051272/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051276/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051373/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051391/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051400/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051407/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051492/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051495/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051497/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051501/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051507/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051529/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051562/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051569/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051624/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30051683/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30052428/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30052432/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30052437/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30052518/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30052737/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30052787/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30053173/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30053615/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30053688/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054045/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054048/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054057/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054383/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054393/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054598/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30054601/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055210/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055216/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055275/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055680/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055696/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055718/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055724/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055929/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30055936/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056016/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056027/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056041/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056050/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056072/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056080/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056087/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056104/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056141/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056146/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056407/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056412/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056417/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056425/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056431/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056433/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056435/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056490/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056609/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056640/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056810/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056913/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056918/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30056922/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057164/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057166/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057174/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057288/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057297/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057361/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057363/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057369/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057524/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057641/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057745/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057746/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057748/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057972/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057974/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057979/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057983/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057985/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057989/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30057993/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058019/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058023/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058044/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058047/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058052/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058057/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058109/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058320/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058339/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30058545/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059252/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059318/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059391/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059490/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059492/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059495/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059497/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059500/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059502/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059510/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059517/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30059589/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060114/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060116/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060146/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060151/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060155/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060169/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060173/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060178/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060179/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060206/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060256/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060309/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060313/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060518/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060621/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 400 files changed, 1600 insertions(+), 1600 deletions(-)

diff --git a/data/as/30016769/ws-services-calculation/WCBillingSlab.json b/data/as/30016769/ws-services-calculation/WCBillingSlab.json
index 0a301a008b..4a239307b4 100644
--- a/data/as/30016769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016769/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016773/ws-services-calculation/WCBillingSlab.json b/data/as/30016773/ws-services-calculation/WCBillingSlab.json
index 29941544c0..6d34a63477 100644
--- a/data/as/30016773/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016773/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016776/ws-services-calculation/WCBillingSlab.json b/data/as/30016776/ws-services-calculation/WCBillingSlab.json
index f45f0fd614..99975a8089 100644
--- a/data/as/30016776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016776/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016777/ws-services-calculation/WCBillingSlab.json b/data/as/30016777/ws-services-calculation/WCBillingSlab.json
index 664d8794f4..5f9b1c3456 100644
--- a/data/as/30016777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016777/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016779/ws-services-calculation/WCBillingSlab.json b/data/as/30016779/ws-services-calculation/WCBillingSlab.json
index 027848da34..7ca2451536 100644
--- a/data/as/30016779/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016779/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016893/ws-services-calculation/WCBillingSlab.json b/data/as/30016893/ws-services-calculation/WCBillingSlab.json
index 2ff6480bdc..31bb92375b 100644
--- a/data/as/30016893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016893/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30016917/ws-services-calculation/WCBillingSlab.json b/data/as/30016917/ws-services-calculation/WCBillingSlab.json
index 50e7bbcd99..2c873b0777 100644
--- a/data/as/30016917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30016917/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017080/ws-services-calculation/WCBillingSlab.json b/data/as/30017080/ws-services-calculation/WCBillingSlab.json
index dfdc129e94..9273447720 100644
--- a/data/as/30017080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017080/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017213/ws-services-calculation/WCBillingSlab.json b/data/as/30017213/ws-services-calculation/WCBillingSlab.json
index 30790aa5b9..7bf6f8dae8 100644
--- a/data/as/30017213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017213/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017259/ws-services-calculation/WCBillingSlab.json b/data/as/30017259/ws-services-calculation/WCBillingSlab.json
index 4053bbef5f..04a9512082 100644
--- a/data/as/30017259/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017259/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017426/ws-services-calculation/WCBillingSlab.json b/data/as/30017426/ws-services-calculation/WCBillingSlab.json
index 450d19fe01..451efc9a07 100644
--- a/data/as/30017426/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017426/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017520/ws-services-calculation/WCBillingSlab.json b/data/as/30017520/ws-services-calculation/WCBillingSlab.json
index 15c134bc1f..245f2b422c 100644
--- a/data/as/30017520/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017520/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017697/ws-services-calculation/WCBillingSlab.json b/data/as/30017697/ws-services-calculation/WCBillingSlab.json
index 37d2310ba3..4ec14f9311 100644
--- a/data/as/30017697/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017697/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017715/ws-services-calculation/WCBillingSlab.json b/data/as/30017715/ws-services-calculation/WCBillingSlab.json
index e76ec30865..d6b241f024 100644
--- a/data/as/30017715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017715/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017720/ws-services-calculation/WCBillingSlab.json b/data/as/30017720/ws-services-calculation/WCBillingSlab.json
index f7a3295ebf..d0a7f7b010 100644
--- a/data/as/30017720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017720/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017735/ws-services-calculation/WCBillingSlab.json b/data/as/30017735/ws-services-calculation/WCBillingSlab.json
index b593c31272..942ca1ee95 100644
--- a/data/as/30017735/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017735/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017892/ws-services-calculation/WCBillingSlab.json b/data/as/30017892/ws-services-calculation/WCBillingSlab.json
index 99b44f28f7..9718dc45d8 100644
--- a/data/as/30017892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017895/ws-services-calculation/WCBillingSlab.json b/data/as/30017895/ws-services-calculation/WCBillingSlab.json
index 369c751054..a98e9c758b 100644
--- a/data/as/30017895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017895/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30017896/ws-services-calculation/WCBillingSlab.json b/data/as/30017896/ws-services-calculation/WCBillingSlab.json
index 95fb68815e..2c99a56296 100644
--- a/data/as/30017896/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30017896/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018185/ws-services-calculation/WCBillingSlab.json b/data/as/30018185/ws-services-calculation/WCBillingSlab.json
index 53c400cfed..5fbb11282c 100644
--- a/data/as/30018185/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018185/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018227/ws-services-calculation/WCBillingSlab.json b/data/as/30018227/ws-services-calculation/WCBillingSlab.json
index 74ecf9da21..71c2abe8ea 100644
--- a/data/as/30018227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018227/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018243/ws-services-calculation/WCBillingSlab.json b/data/as/30018243/ws-services-calculation/WCBillingSlab.json
index d370e2a988..1ffd2f98de 100644
--- a/data/as/30018243/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018243/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018312/ws-services-calculation/WCBillingSlab.json b/data/as/30018312/ws-services-calculation/WCBillingSlab.json
index 78e5f27140..0778a13a64 100644
--- a/data/as/30018312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018441/ws-services-calculation/WCBillingSlab.json b/data/as/30018441/ws-services-calculation/WCBillingSlab.json
index 4957e5da11..f4899ae1e9 100644
--- a/data/as/30018441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018441/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018712/ws-services-calculation/WCBillingSlab.json b/data/as/30018712/ws-services-calculation/WCBillingSlab.json
index 010c422b96..b821ff9924 100644
--- a/data/as/30018712/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018712/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018720/ws-services-calculation/WCBillingSlab.json b/data/as/30018720/ws-services-calculation/WCBillingSlab.json
index cfdcfba6ef..570579a45e 100644
--- a/data/as/30018720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018720/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018721/ws-services-calculation/WCBillingSlab.json b/data/as/30018721/ws-services-calculation/WCBillingSlab.json
index 5be6e7f116..75c74b8642 100644
--- a/data/as/30018721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018721/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018738/ws-services-calculation/WCBillingSlab.json b/data/as/30018738/ws-services-calculation/WCBillingSlab.json
index 585eccd886..10d03a34dc 100644
--- a/data/as/30018738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018738/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018739/ws-services-calculation/WCBillingSlab.json b/data/as/30018739/ws-services-calculation/WCBillingSlab.json
index dbf79ab6b5..7cf1a00bf8 100644
--- a/data/as/30018739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018741/ws-services-calculation/WCBillingSlab.json b/data/as/30018741/ws-services-calculation/WCBillingSlab.json
index ccadb4c1c2..85eab31378 100644
--- a/data/as/30018741/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018741/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018824/ws-services-calculation/WCBillingSlab.json b/data/as/30018824/ws-services-calculation/WCBillingSlab.json
index 69020a0a1e..6d76f99289 100644
--- a/data/as/30018824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018824/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018921/ws-services-calculation/WCBillingSlab.json b/data/as/30018921/ws-services-calculation/WCBillingSlab.json
index d3eaf773d3..8cc73ece4e 100644
--- a/data/as/30018921/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018921/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018935/ws-services-calculation/WCBillingSlab.json b/data/as/30018935/ws-services-calculation/WCBillingSlab.json
index a35741f3b5..cd90687d70 100644
--- a/data/as/30018935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018935/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30018941/ws-services-calculation/WCBillingSlab.json b/data/as/30018941/ws-services-calculation/WCBillingSlab.json
index aecc994736..e809bb1884 100644
--- a/data/as/30018941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30018941/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019121/ws-services-calculation/WCBillingSlab.json b/data/as/30019121/ws-services-calculation/WCBillingSlab.json
index b4bb203335..460fa6bcce 100644
--- a/data/as/30019121/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019121/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019130/ws-services-calculation/WCBillingSlab.json b/data/as/30019130/ws-services-calculation/WCBillingSlab.json
index 3856b9d029..9e4057afab 100644
--- a/data/as/30019130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019130/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019135/ws-services-calculation/WCBillingSlab.json b/data/as/30019135/ws-services-calculation/WCBillingSlab.json
index e3a823cd78..5e0f8d9458 100644
--- a/data/as/30019135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019135/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019139/ws-services-calculation/WCBillingSlab.json b/data/as/30019139/ws-services-calculation/WCBillingSlab.json
index 926785c51f..e650eb3edb 100644
--- a/data/as/30019139/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019139/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019144/ws-services-calculation/WCBillingSlab.json b/data/as/30019144/ws-services-calculation/WCBillingSlab.json
index 517ef7df6a..d86257cca8 100644
--- a/data/as/30019144/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019144/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019151/ws-services-calculation/WCBillingSlab.json b/data/as/30019151/ws-services-calculation/WCBillingSlab.json
index 095955ddb6..714b0db8c3 100644
--- a/data/as/30019151/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019151/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019154/ws-services-calculation/WCBillingSlab.json b/data/as/30019154/ws-services-calculation/WCBillingSlab.json
index 483f2d5fb7..bbae092952 100644
--- a/data/as/30019154/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019154/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019163/ws-services-calculation/WCBillingSlab.json b/data/as/30019163/ws-services-calculation/WCBillingSlab.json
index f04819cbc8..9fb0877c54 100644
--- a/data/as/30019163/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019163/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019166/ws-services-calculation/WCBillingSlab.json b/data/as/30019166/ws-services-calculation/WCBillingSlab.json
index 9d8e6ca58e..f85788af05 100644
--- a/data/as/30019166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019166/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019168/ws-services-calculation/WCBillingSlab.json b/data/as/30019168/ws-services-calculation/WCBillingSlab.json
index 64fb384ad9..7287ccafc7 100644
--- a/data/as/30019168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019168/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019170/ws-services-calculation/WCBillingSlab.json b/data/as/30019170/ws-services-calculation/WCBillingSlab.json
index 7247af4950..a99eebdc0c 100644
--- a/data/as/30019170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019170/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019171/ws-services-calculation/WCBillingSlab.json b/data/as/30019171/ws-services-calculation/WCBillingSlab.json
index 98817d86f8..96875571c7 100644
--- a/data/as/30019171/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019171/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019173/ws-services-calculation/WCBillingSlab.json b/data/as/30019173/ws-services-calculation/WCBillingSlab.json
index 5c7d42c513..7ad5a00e95 100644
--- a/data/as/30019173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019266/ws-services-calculation/WCBillingSlab.json b/data/as/30019266/ws-services-calculation/WCBillingSlab.json
index b8170b0c55..57f80fe483 100644
--- a/data/as/30019266/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019266/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019465/ws-services-calculation/WCBillingSlab.json b/data/as/30019465/ws-services-calculation/WCBillingSlab.json
index 2b89fdd314..d1cc7c3df9 100644
--- a/data/as/30019465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019465/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019506/ws-services-calculation/WCBillingSlab.json b/data/as/30019506/ws-services-calculation/WCBillingSlab.json
index bbc14768b3..26a66790bd 100644
--- a/data/as/30019506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019506/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019535/ws-services-calculation/WCBillingSlab.json b/data/as/30019535/ws-services-calculation/WCBillingSlab.json
index 299faa615c..c63f3f290f 100644
--- a/data/as/30019535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019544/ws-services-calculation/WCBillingSlab.json b/data/as/30019544/ws-services-calculation/WCBillingSlab.json
index d482816f5a..2c81b3a27c 100644
--- a/data/as/30019544/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019544/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019572/ws-services-calculation/WCBillingSlab.json b/data/as/30019572/ws-services-calculation/WCBillingSlab.json
index 401a22b469..dd0db77c8a 100644
--- a/data/as/30019572/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019572/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019680/ws-services-calculation/WCBillingSlab.json b/data/as/30019680/ws-services-calculation/WCBillingSlab.json
index c53c1d227f..63985f5543 100644
--- a/data/as/30019680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019680/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019686/ws-services-calculation/WCBillingSlab.json b/data/as/30019686/ws-services-calculation/WCBillingSlab.json
index 582c41c980..44db50fd3f 100644
--- a/data/as/30019686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019686/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019793/ws-services-calculation/WCBillingSlab.json b/data/as/30019793/ws-services-calculation/WCBillingSlab.json
index 740569a3aa..ad6151f212 100644
--- a/data/as/30019793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019793/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019799/ws-services-calculation/WCBillingSlab.json b/data/as/30019799/ws-services-calculation/WCBillingSlab.json
index bb131b4be4..75f7812aa8 100644
--- a/data/as/30019799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019799/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019826/ws-services-calculation/WCBillingSlab.json b/data/as/30019826/ws-services-calculation/WCBillingSlab.json
index 6ba19a57be..b329f63e46 100644
--- a/data/as/30019826/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019826/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30019832/ws-services-calculation/WCBillingSlab.json b/data/as/30019832/ws-services-calculation/WCBillingSlab.json
index 77a216dc42..77877a5a41 100644
--- a/data/as/30019832/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30019832/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020076/ws-services-calculation/WCBillingSlab.json b/data/as/30020076/ws-services-calculation/WCBillingSlab.json
index 290b688e74..3e24c19b7d 100644
--- a/data/as/30020076/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020076/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020201/ws-services-calculation/WCBillingSlab.json b/data/as/30020201/ws-services-calculation/WCBillingSlab.json
index c8d4faad4b..a8daf99f94 100644
--- a/data/as/30020201/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020201/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020202/ws-services-calculation/WCBillingSlab.json b/data/as/30020202/ws-services-calculation/WCBillingSlab.json
index 5265a5630a..47adb882d4 100644
--- a/data/as/30020202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020202/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020369/ws-services-calculation/WCBillingSlab.json b/data/as/30020369/ws-services-calculation/WCBillingSlab.json
index 90cddfcd39..832d7c96fc 100644
--- a/data/as/30020369/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020369/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020383/ws-services-calculation/WCBillingSlab.json b/data/as/30020383/ws-services-calculation/WCBillingSlab.json
index d7f34ac6fb..bbb21bb670 100644
--- a/data/as/30020383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020383/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020502/ws-services-calculation/WCBillingSlab.json b/data/as/30020502/ws-services-calculation/WCBillingSlab.json
index f176f9d82c..130e6b2cc1 100644
--- a/data/as/30020502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020502/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020635/ws-services-calculation/WCBillingSlab.json b/data/as/30020635/ws-services-calculation/WCBillingSlab.json
index 2090b8d038..19972a6789 100644
--- a/data/as/30020635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020637/ws-services-calculation/WCBillingSlab.json b/data/as/30020637/ws-services-calculation/WCBillingSlab.json
index f5391dcaf0..7e106d18be 100644
--- a/data/as/30020637/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020637/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020760/ws-services-calculation/WCBillingSlab.json b/data/as/30020760/ws-services-calculation/WCBillingSlab.json
index 4c342799bc..c1fd7ae5a6 100644
--- a/data/as/30020760/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020760/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020766/ws-services-calculation/WCBillingSlab.json b/data/as/30020766/ws-services-calculation/WCBillingSlab.json
index c8acf2de06..996563de44 100644
--- a/data/as/30020766/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020766/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020777/ws-services-calculation/WCBillingSlab.json b/data/as/30020777/ws-services-calculation/WCBillingSlab.json
index 538e51a755..58c61548a6 100644
--- a/data/as/30020777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020777/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30020972/ws-services-calculation/WCBillingSlab.json b/data/as/30020972/ws-services-calculation/WCBillingSlab.json
index 9a40dea16c..c2cb9dd3cd 100644
--- a/data/as/30020972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30020972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021055/ws-services-calculation/WCBillingSlab.json b/data/as/30021055/ws-services-calculation/WCBillingSlab.json
index 3430acec62..0a66a33353 100644
--- a/data/as/30021055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021055/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021475/ws-services-calculation/WCBillingSlab.json b/data/as/30021475/ws-services-calculation/WCBillingSlab.json
index b215717637..51506f6365 100644
--- a/data/as/30021475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021475/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021482/ws-services-calculation/WCBillingSlab.json b/data/as/30021482/ws-services-calculation/WCBillingSlab.json
index 3e903f5f20..55f2f02301 100644
--- a/data/as/30021482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021482/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021560/ws-services-calculation/WCBillingSlab.json b/data/as/30021560/ws-services-calculation/WCBillingSlab.json
index 8fcca32269..6f94ace43c 100644
--- a/data/as/30021560/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021560/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021973/ws-services-calculation/WCBillingSlab.json b/data/as/30021973/ws-services-calculation/WCBillingSlab.json
index 0659c35d9a..77d993c81d 100644
--- a/data/as/30021973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021973/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30021987/ws-services-calculation/WCBillingSlab.json b/data/as/30021987/ws-services-calculation/WCBillingSlab.json
index 500e7bc8ea..87bfaf765e 100644
--- a/data/as/30021987/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30021987/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022258/ws-services-calculation/WCBillingSlab.json b/data/as/30022258/ws-services-calculation/WCBillingSlab.json
index 1de801ece6..8640c5ab42 100644
--- a/data/as/30022258/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022258/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022299/ws-services-calculation/WCBillingSlab.json b/data/as/30022299/ws-services-calculation/WCBillingSlab.json
index ec31b24c35..9ebf58d289 100644
--- a/data/as/30022299/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022299/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022418/ws-services-calculation/WCBillingSlab.json b/data/as/30022418/ws-services-calculation/WCBillingSlab.json
index 3b22f21a17..f33ae43617 100644
--- a/data/as/30022418/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022418/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022523/ws-services-calculation/WCBillingSlab.json b/data/as/30022523/ws-services-calculation/WCBillingSlab.json
index 74695afd75..6fd9974fc5 100644
--- a/data/as/30022523/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022523/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022537/ws-services-calculation/WCBillingSlab.json b/data/as/30022537/ws-services-calculation/WCBillingSlab.json
index 2c6a29d0a6..5fad79635d 100644
--- a/data/as/30022537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022537/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022693/ws-services-calculation/WCBillingSlab.json b/data/as/30022693/ws-services-calculation/WCBillingSlab.json
index e56d841bef..95afafb162 100644
--- a/data/as/30022693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022693/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022702/ws-services-calculation/WCBillingSlab.json b/data/as/30022702/ws-services-calculation/WCBillingSlab.json
index 77419bf373..03c547705f 100644
--- a/data/as/30022702/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022702/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022721/ws-services-calculation/WCBillingSlab.json b/data/as/30022721/ws-services-calculation/WCBillingSlab.json
index 576153d023..5af9615f50 100644
--- a/data/as/30022721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022721/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022760/ws-services-calculation/WCBillingSlab.json b/data/as/30022760/ws-services-calculation/WCBillingSlab.json
index 2f9586f311..58e4f5ad9c 100644
--- a/data/as/30022760/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022760/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022777/ws-services-calculation/WCBillingSlab.json b/data/as/30022777/ws-services-calculation/WCBillingSlab.json
index b5dfeb5a93..18a87c743e 100644
--- a/data/as/30022777/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022777/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022787/ws-services-calculation/WCBillingSlab.json b/data/as/30022787/ws-services-calculation/WCBillingSlab.json
index 854621236d..577d74d7c3 100644
--- a/data/as/30022787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022787/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022800/ws-services-calculation/WCBillingSlab.json b/data/as/30022800/ws-services-calculation/WCBillingSlab.json
index 12f63c9e55..6610628572 100644
--- a/data/as/30022800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022800/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022816/ws-services-calculation/WCBillingSlab.json b/data/as/30022816/ws-services-calculation/WCBillingSlab.json
index f739b941e0..f9a91a60b3 100644
--- a/data/as/30022816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022851/ws-services-calculation/WCBillingSlab.json b/data/as/30022851/ws-services-calculation/WCBillingSlab.json
index d1d303735e..351f49bed8 100644
--- a/data/as/30022851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022851/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022854/ws-services-calculation/WCBillingSlab.json b/data/as/30022854/ws-services-calculation/WCBillingSlab.json
index 4e47661011..0718c5094c 100644
--- a/data/as/30022854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022854/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022858/ws-services-calculation/WCBillingSlab.json b/data/as/30022858/ws-services-calculation/WCBillingSlab.json
index 372529c9a5..32b6524fad 100644
--- a/data/as/30022858/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022858/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022862/ws-services-calculation/WCBillingSlab.json b/data/as/30022862/ws-services-calculation/WCBillingSlab.json
index 8645fa1d3c..da2ce63d0b 100644
--- a/data/as/30022862/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022862/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022947/ws-services-calculation/WCBillingSlab.json b/data/as/30022947/ws-services-calculation/WCBillingSlab.json
index 1011b4eda2..03da71dec8 100644
--- a/data/as/30022947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022947/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022975/ws-services-calculation/WCBillingSlab.json b/data/as/30022975/ws-services-calculation/WCBillingSlab.json
index 8d0e87086e..374ef3dcdb 100644
--- a/data/as/30022975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022975/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30022986/ws-services-calculation/WCBillingSlab.json b/data/as/30022986/ws-services-calculation/WCBillingSlab.json
index 0cd72f8455..6b3eac885b 100644
--- a/data/as/30022986/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30022986/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023075/ws-services-calculation/WCBillingSlab.json b/data/as/30023075/ws-services-calculation/WCBillingSlab.json
index 719cb748cd..442467a75c 100644
--- a/data/as/30023075/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023075/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023084/ws-services-calculation/WCBillingSlab.json b/data/as/30023084/ws-services-calculation/WCBillingSlab.json
index 464b6b3aa9..2fee1d4ae5 100644
--- a/data/as/30023084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023147/ws-services-calculation/WCBillingSlab.json b/data/as/30023147/ws-services-calculation/WCBillingSlab.json
index 1ea4b4deb5..6cdf4b5b0a 100644
--- a/data/as/30023147/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023147/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023196/ws-services-calculation/WCBillingSlab.json b/data/as/30023196/ws-services-calculation/WCBillingSlab.json
index d768085197..2bd25540ee 100644
--- a/data/as/30023196/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023196/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023283/ws-services-calculation/WCBillingSlab.json b/data/as/30023283/ws-services-calculation/WCBillingSlab.json
index 2d0c625cab..a001fe48ab 100644
--- a/data/as/30023283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023283/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023298/ws-services-calculation/WCBillingSlab.json b/data/as/30023298/ws-services-calculation/WCBillingSlab.json
index 109ee0ace9..b9f4318b5a 100644
--- a/data/as/30023298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023298/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023308/ws-services-calculation/WCBillingSlab.json b/data/as/30023308/ws-services-calculation/WCBillingSlab.json
index 629f3545d0..d5a600617f 100644
--- a/data/as/30023308/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023308/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023317/ws-services-calculation/WCBillingSlab.json b/data/as/30023317/ws-services-calculation/WCBillingSlab.json
index 1005f2027b..08a5035254 100644
--- a/data/as/30023317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023317/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023324/ws-services-calculation/WCBillingSlab.json b/data/as/30023324/ws-services-calculation/WCBillingSlab.json
index 914ace0210..34f8d4b10c 100644
--- a/data/as/30023324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023324/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023337/ws-services-calculation/WCBillingSlab.json b/data/as/30023337/ws-services-calculation/WCBillingSlab.json
index 96eac2de2c..fdb7b579c9 100644
--- a/data/as/30023337/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023337/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023347/ws-services-calculation/WCBillingSlab.json b/data/as/30023347/ws-services-calculation/WCBillingSlab.json
index 2e5536db06..5789e6e556 100644
--- a/data/as/30023347/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023347/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023360/ws-services-calculation/WCBillingSlab.json b/data/as/30023360/ws-services-calculation/WCBillingSlab.json
index e21afb1626..a26e216558 100644
--- a/data/as/30023360/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023360/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023708/ws-services-calculation/WCBillingSlab.json b/data/as/30023708/ws-services-calculation/WCBillingSlab.json
index 5b4ce34a37..6259e4e9b9 100644
--- a/data/as/30023708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023708/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023894/ws-services-calculation/WCBillingSlab.json b/data/as/30023894/ws-services-calculation/WCBillingSlab.json
index 4d90fe1fe8..e9b3824468 100644
--- a/data/as/30023894/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023894/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023984/ws-services-calculation/WCBillingSlab.json b/data/as/30023984/ws-services-calculation/WCBillingSlab.json
index 5fb33b102c..aba69dfac8 100644
--- a/data/as/30023984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023984/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30023999/ws-services-calculation/WCBillingSlab.json b/data/as/30023999/ws-services-calculation/WCBillingSlab.json
index 7c70ad9499..f123614d47 100644
--- a/data/as/30023999/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30023999/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027151/ws-services-calculation/WCBillingSlab.json b/data/as/30027151/ws-services-calculation/WCBillingSlab.json
index cfb257e682..7380fa310f 100644
--- a/data/as/30027151/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027151/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027153/ws-services-calculation/WCBillingSlab.json b/data/as/30027153/ws-services-calculation/WCBillingSlab.json
index 45ba9f73c7..b14ddd5d23 100644
--- a/data/as/30027153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027153/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027587/ws-services-calculation/WCBillingSlab.json b/data/as/30027587/ws-services-calculation/WCBillingSlab.json
index cb521ec6ab..2fff9ed15d 100644
--- a/data/as/30027587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027587/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30027681/ws-services-calculation/WCBillingSlab.json b/data/as/30027681/ws-services-calculation/WCBillingSlab.json
index 270db79a4d..10aa4016df 100644
--- a/data/as/30027681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30027681/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30030288/ws-services-calculation/WCBillingSlab.json b/data/as/30030288/ws-services-calculation/WCBillingSlab.json
index ed79287df0..92894fc67d 100644
--- a/data/as/30030288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30030288/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30030309/ws-services-calculation/WCBillingSlab.json b/data/as/30030309/ws-services-calculation/WCBillingSlab.json
index e09cee07bc..9d0ac717e0 100644
--- a/data/as/30030309/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30030309/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30030458/ws-services-calculation/WCBillingSlab.json b/data/as/30030458/ws-services-calculation/WCBillingSlab.json
index ce632ce65a..754abc0619 100644
--- a/data/as/30030458/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30030458/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30031382/ws-services-calculation/WCBillingSlab.json b/data/as/30031382/ws-services-calculation/WCBillingSlab.json
index fb4b821fae..5dfe74d039 100644
--- a/data/as/30031382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30031382/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30033116/ws-services-calculation/WCBillingSlab.json b/data/as/30033116/ws-services-calculation/WCBillingSlab.json
index 90a09da303..4b1ca3c20d 100644
--- a/data/as/30033116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30033116/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036349/ws-services-calculation/WCBillingSlab.json b/data/as/30036349/ws-services-calculation/WCBillingSlab.json
index 42958c120a..6011901236 100644
--- a/data/as/30036349/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036349/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036685/ws-services-calculation/WCBillingSlab.json b/data/as/30036685/ws-services-calculation/WCBillingSlab.json
index 99fb6d702d..fd51ea984b 100644
--- a/data/as/30036685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036685/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036696/ws-services-calculation/WCBillingSlab.json b/data/as/30036696/ws-services-calculation/WCBillingSlab.json
index 5b72ce7be4..31843f7968 100644
--- a/data/as/30036696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036696/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036706/ws-services-calculation/WCBillingSlab.json b/data/as/30036706/ws-services-calculation/WCBillingSlab.json
index 0719e6958a..73815e2757 100644
--- a/data/as/30036706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036706/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036712/ws-services-calculation/WCBillingSlab.json b/data/as/30036712/ws-services-calculation/WCBillingSlab.json
index c030b225db..0d1b9197b4 100644
--- a/data/as/30036712/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036712/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036747/ws-services-calculation/WCBillingSlab.json b/data/as/30036747/ws-services-calculation/WCBillingSlab.json
index 5458a0fa94..eb8f15df80 100644
--- a/data/as/30036747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036747/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036796/ws-services-calculation/WCBillingSlab.json b/data/as/30036796/ws-services-calculation/WCBillingSlab.json
index f024c93b36..116dd28ab5 100644
--- a/data/as/30036796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036796/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036799/ws-services-calculation/WCBillingSlab.json b/data/as/30036799/ws-services-calculation/WCBillingSlab.json
index d0da44db3d..8489ef78c9 100644
--- a/data/as/30036799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036799/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30036923/ws-services-calculation/WCBillingSlab.json b/data/as/30036923/ws-services-calculation/WCBillingSlab.json
index 9c2b15fc04..bf740434a8 100644
--- a/data/as/30036923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30036923/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037050/ws-services-calculation/WCBillingSlab.json b/data/as/30037050/ws-services-calculation/WCBillingSlab.json
index 06737b51a2..c9ad760ed7 100644
--- a/data/as/30037050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037050/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037052/ws-services-calculation/WCBillingSlab.json b/data/as/30037052/ws-services-calculation/WCBillingSlab.json
index 56ef5ea1bf..1c85a8853e 100644
--- a/data/as/30037052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037052/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037053/ws-services-calculation/WCBillingSlab.json b/data/as/30037053/ws-services-calculation/WCBillingSlab.json
index e3a783fdca..3eaf171596 100644
--- a/data/as/30037053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037053/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037055/ws-services-calculation/WCBillingSlab.json b/data/as/30037055/ws-services-calculation/WCBillingSlab.json
index 52e7e579af..2fc7ddded2 100644
--- a/data/as/30037055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037055/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037056/ws-services-calculation/WCBillingSlab.json b/data/as/30037056/ws-services-calculation/WCBillingSlab.json
index 3b81e6d87a..4c2b8f8a5d 100644
--- a/data/as/30037056/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037056/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037057/ws-services-calculation/WCBillingSlab.json b/data/as/30037057/ws-services-calculation/WCBillingSlab.json
index 430addd9f6..4ba92cd983 100644
--- a/data/as/30037057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037057/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037058/ws-services-calculation/WCBillingSlab.json b/data/as/30037058/ws-services-calculation/WCBillingSlab.json
index cc08fed2ef..80a06415de 100644
--- a/data/as/30037058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037058/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037282/ws-services-calculation/WCBillingSlab.json b/data/as/30037282/ws-services-calculation/WCBillingSlab.json
index 6f6b97e097..a491a5e0bc 100644
--- a/data/as/30037282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037282/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037284/ws-services-calculation/WCBillingSlab.json b/data/as/30037284/ws-services-calculation/WCBillingSlab.json
index 0f5cc943bc..a76201c9ba 100644
--- a/data/as/30037284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037284/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037286/ws-services-calculation/WCBillingSlab.json b/data/as/30037286/ws-services-calculation/WCBillingSlab.json
index 908729d1cb..d0dd697a43 100644
--- a/data/as/30037286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037287/ws-services-calculation/WCBillingSlab.json b/data/as/30037287/ws-services-calculation/WCBillingSlab.json
index ce8250bcc2..8b184eadb4 100644
--- a/data/as/30037287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037287/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037289/ws-services-calculation/WCBillingSlab.json b/data/as/30037289/ws-services-calculation/WCBillingSlab.json
index b22c4aabb9..7f7fcb0d1f 100644
--- a/data/as/30037289/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037289/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037516/ws-services-calculation/WCBillingSlab.json b/data/as/30037516/ws-services-calculation/WCBillingSlab.json
index 15e0bf4abb..4e6c15723d 100644
--- a/data/as/30037516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037516/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037943/ws-services-calculation/WCBillingSlab.json b/data/as/30037943/ws-services-calculation/WCBillingSlab.json
index 1a14136314..af536637aa 100644
--- a/data/as/30037943/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037943/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037947/ws-services-calculation/WCBillingSlab.json b/data/as/30037947/ws-services-calculation/WCBillingSlab.json
index 1125487516..83dc625b58 100644
--- a/data/as/30037947/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037947/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037948/ws-services-calculation/WCBillingSlab.json b/data/as/30037948/ws-services-calculation/WCBillingSlab.json
index 0474ade96d..c6a8a13de8 100644
--- a/data/as/30037948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037948/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037949/ws-services-calculation/WCBillingSlab.json b/data/as/30037949/ws-services-calculation/WCBillingSlab.json
index 20092fb8d7..f64b8022b4 100644
--- a/data/as/30037949/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037949/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037950/ws-services-calculation/WCBillingSlab.json b/data/as/30037950/ws-services-calculation/WCBillingSlab.json
index 579163f4df..9390fdbcd6 100644
--- a/data/as/30037950/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037950/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037951/ws-services-calculation/WCBillingSlab.json b/data/as/30037951/ws-services-calculation/WCBillingSlab.json
index d0873f0625..feb181227f 100644
--- a/data/as/30037951/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037951/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037952/ws-services-calculation/WCBillingSlab.json b/data/as/30037952/ws-services-calculation/WCBillingSlab.json
index d9326900f3..f3d83a39f7 100644
--- a/data/as/30037952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037952/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037953/ws-services-calculation/WCBillingSlab.json b/data/as/30037953/ws-services-calculation/WCBillingSlab.json
index 01ac7e84a1..039f866f8a 100644
--- a/data/as/30037953/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037953/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037954/ws-services-calculation/WCBillingSlab.json b/data/as/30037954/ws-services-calculation/WCBillingSlab.json
index 4476a6417e..c7e39117fc 100644
--- a/data/as/30037954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037954/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037955/ws-services-calculation/WCBillingSlab.json b/data/as/30037955/ws-services-calculation/WCBillingSlab.json
index 83bad02818..d8c94a4e64 100644
--- a/data/as/30037955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037955/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30037960/ws-services-calculation/WCBillingSlab.json b/data/as/30037960/ws-services-calculation/WCBillingSlab.json
index bc9f0efce1..fc839da1ff 100644
--- a/data/as/30037960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30037960/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038014/ws-services-calculation/WCBillingSlab.json b/data/as/30038014/ws-services-calculation/WCBillingSlab.json
index 96237e35fa..8de2a23b78 100644
--- a/data/as/30038014/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038014/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038150/ws-services-calculation/WCBillingSlab.json b/data/as/30038150/ws-services-calculation/WCBillingSlab.json
index 42f7e096cb..233289034a 100644
--- a/data/as/30038150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038150/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038176/ws-services-calculation/WCBillingSlab.json b/data/as/30038176/ws-services-calculation/WCBillingSlab.json
index a13cf839e8..8185bcb9b6 100644
--- a/data/as/30038176/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038176/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038197/ws-services-calculation/WCBillingSlab.json b/data/as/30038197/ws-services-calculation/WCBillingSlab.json
index ed4d8039ab..74bdd7f48a 100644
--- a/data/as/30038197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038197/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038208/ws-services-calculation/WCBillingSlab.json b/data/as/30038208/ws-services-calculation/WCBillingSlab.json
index 71de09e3d5..8bd005641a 100644
--- a/data/as/30038208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038633/ws-services-calculation/WCBillingSlab.json b/data/as/30038633/ws-services-calculation/WCBillingSlab.json
index c4e9a65d99..0659573d2f 100644
--- a/data/as/30038633/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038633/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038634/ws-services-calculation/WCBillingSlab.json b/data/as/30038634/ws-services-calculation/WCBillingSlab.json
index 8824d90185..d0b873c614 100644
--- a/data/as/30038634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038634/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038635/ws-services-calculation/WCBillingSlab.json b/data/as/30038635/ws-services-calculation/WCBillingSlab.json
index 86618e9f1d..7e2541c09b 100644
--- a/data/as/30038635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038636/ws-services-calculation/WCBillingSlab.json b/data/as/30038636/ws-services-calculation/WCBillingSlab.json
index 4faffdbcb7..85f1e36976 100644
--- a/data/as/30038636/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038636/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038738/ws-services-calculation/WCBillingSlab.json b/data/as/30038738/ws-services-calculation/WCBillingSlab.json
index 35a65492d2..464f8ecc4a 100644
--- a/data/as/30038738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038738/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038913/ws-services-calculation/WCBillingSlab.json b/data/as/30038913/ws-services-calculation/WCBillingSlab.json
index 419f3c1998..132e9e5564 100644
--- a/data/as/30038913/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038913/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038945/ws-services-calculation/WCBillingSlab.json b/data/as/30038945/ws-services-calculation/WCBillingSlab.json
index c690a53e63..1a565dc403 100644
--- a/data/as/30038945/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038945/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038960/ws-services-calculation/WCBillingSlab.json b/data/as/30038960/ws-services-calculation/WCBillingSlab.json
index 4a48e2929c..48b7bbf597 100644
--- a/data/as/30038960/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038960/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30038988/ws-services-calculation/WCBillingSlab.json b/data/as/30038988/ws-services-calculation/WCBillingSlab.json
index 79a8982b38..4bab5af68f 100644
--- a/data/as/30038988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30038988/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039003/ws-services-calculation/WCBillingSlab.json b/data/as/30039003/ws-services-calculation/WCBillingSlab.json
index 71d52e6948..805595ae06 100644
--- a/data/as/30039003/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039003/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039714/ws-services-calculation/WCBillingSlab.json b/data/as/30039714/ws-services-calculation/WCBillingSlab.json
index e42ba15f93..d995b0a62e 100644
--- a/data/as/30039714/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039714/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039715/ws-services-calculation/WCBillingSlab.json b/data/as/30039715/ws-services-calculation/WCBillingSlab.json
index 224db75465..2e75b71440 100644
--- a/data/as/30039715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039715/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30039748/ws-services-calculation/WCBillingSlab.json b/data/as/30039748/ws-services-calculation/WCBillingSlab.json
index ed7e19934d..d468c7f6e3 100644
--- a/data/as/30039748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30039748/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30040182/ws-services-calculation/WCBillingSlab.json b/data/as/30040182/ws-services-calculation/WCBillingSlab.json
index 30e4d29966..e08740070e 100644
--- a/data/as/30040182/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30040182/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30040815/ws-services-calculation/WCBillingSlab.json b/data/as/30040815/ws-services-calculation/WCBillingSlab.json
index 6fce488441..c83ba9c71a 100644
--- a/data/as/30040815/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30040815/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041202/ws-services-calculation/WCBillingSlab.json b/data/as/30041202/ws-services-calculation/WCBillingSlab.json
index 45b5953405..2461d69a35 100644
--- a/data/as/30041202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041202/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041203/ws-services-calculation/WCBillingSlab.json b/data/as/30041203/ws-services-calculation/WCBillingSlab.json
index ccb59046d6..c95002548b 100644
--- a/data/as/30041203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041386/ws-services-calculation/WCBillingSlab.json b/data/as/30041386/ws-services-calculation/WCBillingSlab.json
index c31c14eaf6..1fa66c4bd8 100644
--- a/data/as/30041386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041386/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041849/ws-services-calculation/WCBillingSlab.json b/data/as/30041849/ws-services-calculation/WCBillingSlab.json
index accdec3891..f20d567871 100644
--- a/data/as/30041849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041849/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041850/ws-services-calculation/WCBillingSlab.json b/data/as/30041850/ws-services-calculation/WCBillingSlab.json
index f2a3ffe3a2..56a3846935 100644
--- a/data/as/30041850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041850/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041853/ws-services-calculation/WCBillingSlab.json b/data/as/30041853/ws-services-calculation/WCBillingSlab.json
index 959e21fd71..337304465e 100644
--- a/data/as/30041853/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041853/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041854/ws-services-calculation/WCBillingSlab.json b/data/as/30041854/ws-services-calculation/WCBillingSlab.json
index 1645298c1a..f2b0e5a924 100644
--- a/data/as/30041854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041854/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041859/ws-services-calculation/WCBillingSlab.json b/data/as/30041859/ws-services-calculation/WCBillingSlab.json
index 1d6362b212..f866b7a52b 100644
--- a/data/as/30041859/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041859/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041866/ws-services-calculation/WCBillingSlab.json b/data/as/30041866/ws-services-calculation/WCBillingSlab.json
index d2591f5439..633c62443a 100644
--- a/data/as/30041866/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041866/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041873/ws-services-calculation/WCBillingSlab.json b/data/as/30041873/ws-services-calculation/WCBillingSlab.json
index 9d56a2fa6b..d26781806f 100644
--- a/data/as/30041873/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041873/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041886/ws-services-calculation/WCBillingSlab.json b/data/as/30041886/ws-services-calculation/WCBillingSlab.json
index 58c2191b7b..1dc35d5571 100644
--- a/data/as/30041886/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041886/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041901/ws-services-calculation/WCBillingSlab.json b/data/as/30041901/ws-services-calculation/WCBillingSlab.json
index 36c9ed032a..779d69b99b 100644
--- a/data/as/30041901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041901/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30041907/ws-services-calculation/WCBillingSlab.json b/data/as/30041907/ws-services-calculation/WCBillingSlab.json
index b6dd369551..d8fe681611 100644
--- a/data/as/30041907/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30041907/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042788/ws-services-calculation/WCBillingSlab.json b/data/as/30042788/ws-services-calculation/WCBillingSlab.json
index 4d8504f880..fed0cc7e01 100644
--- a/data/as/30042788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042788/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042793/ws-services-calculation/WCBillingSlab.json b/data/as/30042793/ws-services-calculation/WCBillingSlab.json
index 8bc38dc3da..06fe380599 100644
--- a/data/as/30042793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042793/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042799/ws-services-calculation/WCBillingSlab.json b/data/as/30042799/ws-services-calculation/WCBillingSlab.json
index d511598fca..67a4695a84 100644
--- a/data/as/30042799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042799/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042803/ws-services-calculation/WCBillingSlab.json b/data/as/30042803/ws-services-calculation/WCBillingSlab.json
index 5e657673aa..06e194abd0 100644
--- a/data/as/30042803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042803/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042807/ws-services-calculation/WCBillingSlab.json b/data/as/30042807/ws-services-calculation/WCBillingSlab.json
index e214b3a2e5..2529382b29 100644
--- a/data/as/30042807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042807/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042812/ws-services-calculation/WCBillingSlab.json b/data/as/30042812/ws-services-calculation/WCBillingSlab.json
index cfbbed4eab..66a4b22751 100644
--- a/data/as/30042812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042816/ws-services-calculation/WCBillingSlab.json b/data/as/30042816/ws-services-calculation/WCBillingSlab.json
index c022dd78cc..1563b383a7 100644
--- a/data/as/30042816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042819/ws-services-calculation/WCBillingSlab.json b/data/as/30042819/ws-services-calculation/WCBillingSlab.json
index e6b6b54f61..e3a4379443 100644
--- a/data/as/30042819/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042819/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042954/ws-services-calculation/WCBillingSlab.json b/data/as/30042954/ws-services-calculation/WCBillingSlab.json
index fc03f440a4..cffc17ce90 100644
--- a/data/as/30042954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042954/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042955/ws-services-calculation/WCBillingSlab.json b/data/as/30042955/ws-services-calculation/WCBillingSlab.json
index a851a631ce..7537f0b788 100644
--- a/data/as/30042955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042955/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042957/ws-services-calculation/WCBillingSlab.json b/data/as/30042957/ws-services-calculation/WCBillingSlab.json
index 0f08b707ef..da3774baa3 100644
--- a/data/as/30042957/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042957/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042959/ws-services-calculation/WCBillingSlab.json b/data/as/30042959/ws-services-calculation/WCBillingSlab.json
index 68502da530..022d6a95e8 100644
--- a/data/as/30042959/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042959/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042961/ws-services-calculation/WCBillingSlab.json b/data/as/30042961/ws-services-calculation/WCBillingSlab.json
index ef934f6460..9dd0c6b74e 100644
--- a/data/as/30042961/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042961/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042963/ws-services-calculation/WCBillingSlab.json b/data/as/30042963/ws-services-calculation/WCBillingSlab.json
index 424e182a51..e22372d489 100644
--- a/data/as/30042963/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042963/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30042965/ws-services-calculation/WCBillingSlab.json b/data/as/30042965/ws-services-calculation/WCBillingSlab.json
index 5bbd38f12b..0decb7a421 100644
--- a/data/as/30042965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30042965/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043286/ws-services-calculation/WCBillingSlab.json b/data/as/30043286/ws-services-calculation/WCBillingSlab.json
index 2a9ee921fe..840322acc6 100644
--- a/data/as/30043286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043298/ws-services-calculation/WCBillingSlab.json b/data/as/30043298/ws-services-calculation/WCBillingSlab.json
index b5d89527d8..132c35af65 100644
--- a/data/as/30043298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043298/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043311/ws-services-calculation/WCBillingSlab.json b/data/as/30043311/ws-services-calculation/WCBillingSlab.json
index e75cd8d90b..88a50e470e 100644
--- a/data/as/30043311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043311/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043314/ws-services-calculation/WCBillingSlab.json b/data/as/30043314/ws-services-calculation/WCBillingSlab.json
index 5fc65376c0..b8943541b7 100644
--- a/data/as/30043314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043314/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043321/ws-services-calculation/WCBillingSlab.json b/data/as/30043321/ws-services-calculation/WCBillingSlab.json
index 6d7d5d40c0..754e10bf5a 100644
--- a/data/as/30043321/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043321/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043327/ws-services-calculation/WCBillingSlab.json b/data/as/30043327/ws-services-calculation/WCBillingSlab.json
index 679d73d102..7ce786a51e 100644
--- a/data/as/30043327/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043327/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043330/ws-services-calculation/WCBillingSlab.json b/data/as/30043330/ws-services-calculation/WCBillingSlab.json
index 6687fdad6d..85dc9d7564 100644
--- a/data/as/30043330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043330/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043335/ws-services-calculation/WCBillingSlab.json b/data/as/30043335/ws-services-calculation/WCBillingSlab.json
index 8ce0151a72..7558eb0457 100644
--- a/data/as/30043335/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043335/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043343/ws-services-calculation/WCBillingSlab.json b/data/as/30043343/ws-services-calculation/WCBillingSlab.json
index 5410bdb66b..1102e9c43d 100644
--- a/data/as/30043343/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043343/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043349/ws-services-calculation/WCBillingSlab.json b/data/as/30043349/ws-services-calculation/WCBillingSlab.json
index d3d03c661a..e5c77db379 100644
--- a/data/as/30043349/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043349/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043358/ws-services-calculation/WCBillingSlab.json b/data/as/30043358/ws-services-calculation/WCBillingSlab.json
index 0e065aef71..cfd58effcb 100644
--- a/data/as/30043358/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043358/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043557/ws-services-calculation/WCBillingSlab.json b/data/as/30043557/ws-services-calculation/WCBillingSlab.json
index cdf80716bb..715d929419 100644
--- a/data/as/30043557/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043557/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043601/ws-services-calculation/WCBillingSlab.json b/data/as/30043601/ws-services-calculation/WCBillingSlab.json
index 51ddcd57bc..3db93f0aa2 100644
--- a/data/as/30043601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043601/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043606/ws-services-calculation/WCBillingSlab.json b/data/as/30043606/ws-services-calculation/WCBillingSlab.json
index 08882341f5..72f83c288d 100644
--- a/data/as/30043606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043606/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043782/ws-services-calculation/WCBillingSlab.json b/data/as/30043782/ws-services-calculation/WCBillingSlab.json
index 4f71b1bc15..f306367a4c 100644
--- a/data/as/30043782/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043782/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043797/ws-services-calculation/WCBillingSlab.json b/data/as/30043797/ws-services-calculation/WCBillingSlab.json
index 24b7523f20..0811f36c93 100644
--- a/data/as/30043797/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043797/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043820/ws-services-calculation/WCBillingSlab.json b/data/as/30043820/ws-services-calculation/WCBillingSlab.json
index c63f65d412..972b38a268 100644
--- a/data/as/30043820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043820/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043846/ws-services-calculation/WCBillingSlab.json b/data/as/30043846/ws-services-calculation/WCBillingSlab.json
index daf8d2d0e5..03c07a9101 100644
--- a/data/as/30043846/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043846/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043851/ws-services-calculation/WCBillingSlab.json b/data/as/30043851/ws-services-calculation/WCBillingSlab.json
index 149c63d68b..b0560b98b4 100644
--- a/data/as/30043851/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043851/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30043879/ws-services-calculation/WCBillingSlab.json b/data/as/30043879/ws-services-calculation/WCBillingSlab.json
index 12b14fb9c0..37e6d5c14d 100644
--- a/data/as/30043879/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30043879/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044254/ws-services-calculation/WCBillingSlab.json b/data/as/30044254/ws-services-calculation/WCBillingSlab.json
index b365d25453..9f69c47c6c 100644
--- a/data/as/30044254/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044254/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044293/ws-services-calculation/WCBillingSlab.json b/data/as/30044293/ws-services-calculation/WCBillingSlab.json
index f6ae464bde..cbdd5ad872 100644
--- a/data/as/30044293/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044293/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044481/ws-services-calculation/WCBillingSlab.json b/data/as/30044481/ws-services-calculation/WCBillingSlab.json
index 1604daad3f..aefa9d9889 100644
--- a/data/as/30044481/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044481/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30044491/ws-services-calculation/WCBillingSlab.json b/data/as/30044491/ws-services-calculation/WCBillingSlab.json
index cf4890e307..c0b63d3ed2 100644
--- a/data/as/30044491/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30044491/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30045140/ws-services-calculation/WCBillingSlab.json b/data/as/30045140/ws-services-calculation/WCBillingSlab.json
index 40f4417a90..a1f7057add 100644
--- a/data/as/30045140/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30045140/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30045632/ws-services-calculation/WCBillingSlab.json b/data/as/30045632/ws-services-calculation/WCBillingSlab.json
index 08c88465e7..b069cab1ea 100644
--- a/data/as/30045632/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30045632/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30045635/ws-services-calculation/WCBillingSlab.json b/data/as/30045635/ws-services-calculation/WCBillingSlab.json
index b6dc4f88e5..19b2eb0e41 100644
--- a/data/as/30045635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30045635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046142/ws-services-calculation/WCBillingSlab.json b/data/as/30046142/ws-services-calculation/WCBillingSlab.json
index db524fc5cb..d623877d1d 100644
--- a/data/as/30046142/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046142/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046178/ws-services-calculation/WCBillingSlab.json b/data/as/30046178/ws-services-calculation/WCBillingSlab.json
index c83d149166..3aa9e6662c 100644
--- a/data/as/30046178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046241/ws-services-calculation/WCBillingSlab.json b/data/as/30046241/ws-services-calculation/WCBillingSlab.json
index 7868b90bf1..262fc0038e 100644
--- a/data/as/30046241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046241/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046274/ws-services-calculation/WCBillingSlab.json b/data/as/30046274/ws-services-calculation/WCBillingSlab.json
index c9ad6f5607..95189ecf28 100644
--- a/data/as/30046274/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046274/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046286/ws-services-calculation/WCBillingSlab.json b/data/as/30046286/ws-services-calculation/WCBillingSlab.json
index b8bb6d6fd3..f17d6be9a2 100644
--- a/data/as/30046286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30046465/ws-services-calculation/WCBillingSlab.json b/data/as/30046465/ws-services-calculation/WCBillingSlab.json
index 1fe3422597..c77a760fd6 100644
--- a/data/as/30046465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30046465/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048127/ws-services-calculation/WCBillingSlab.json b/data/as/30048127/ws-services-calculation/WCBillingSlab.json
index 370d40ec03..cfb777c722 100644
--- a/data/as/30048127/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048127/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048267/ws-services-calculation/WCBillingSlab.json b/data/as/30048267/ws-services-calculation/WCBillingSlab.json
index be7da0b909..381f77c4c2 100644
--- a/data/as/30048267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048267/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048408/ws-services-calculation/WCBillingSlab.json b/data/as/30048408/ws-services-calculation/WCBillingSlab.json
index 289c758f5b..9599636190 100644
--- a/data/as/30048408/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048408/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048644/ws-services-calculation/WCBillingSlab.json b/data/as/30048644/ws-services-calculation/WCBillingSlab.json
index b9b5653fc7..e65a0ff757 100644
--- a/data/as/30048644/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048644/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048673/ws-services-calculation/WCBillingSlab.json b/data/as/30048673/ws-services-calculation/WCBillingSlab.json
index e9b29bdb1b..1c22ff258d 100644
--- a/data/as/30048673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048680/ws-services-calculation/WCBillingSlab.json b/data/as/30048680/ws-services-calculation/WCBillingSlab.json
index 5b101d0e2e..5d00200713 100644
--- a/data/as/30048680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048680/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048696/ws-services-calculation/WCBillingSlab.json b/data/as/30048696/ws-services-calculation/WCBillingSlab.json
index da4b6729b7..cd6de9bdd7 100644
--- a/data/as/30048696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048696/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048776/ws-services-calculation/WCBillingSlab.json b/data/as/30048776/ws-services-calculation/WCBillingSlab.json
index 28a72dfde3..469245f570 100644
--- a/data/as/30048776/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048776/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048965/ws-services-calculation/WCBillingSlab.json b/data/as/30048965/ws-services-calculation/WCBillingSlab.json
index 7363fc8173..7a2fdc0527 100644
--- a/data/as/30048965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048965/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048987/ws-services-calculation/WCBillingSlab.json b/data/as/30048987/ws-services-calculation/WCBillingSlab.json
index 081447074d..177eac8491 100644
--- a/data/as/30048987/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048987/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30048994/ws-services-calculation/WCBillingSlab.json b/data/as/30048994/ws-services-calculation/WCBillingSlab.json
index 560ac51299..d23cbdf122 100644
--- a/data/as/30048994/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30048994/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049004/ws-services-calculation/WCBillingSlab.json b/data/as/30049004/ws-services-calculation/WCBillingSlab.json
index e08c21d1b2..cfc45c59f6 100644
--- a/data/as/30049004/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049004/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049048/ws-services-calculation/WCBillingSlab.json b/data/as/30049048/ws-services-calculation/WCBillingSlab.json
index 95b96fcae6..fb0e217c88 100644
--- a/data/as/30049048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049048/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049049/ws-services-calculation/WCBillingSlab.json b/data/as/30049049/ws-services-calculation/WCBillingSlab.json
index 89750bbc85..9db197476b 100644
--- a/data/as/30049049/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049049/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049050/ws-services-calculation/WCBillingSlab.json b/data/as/30049050/ws-services-calculation/WCBillingSlab.json
index 3f003a78d8..68ae4ac246 100644
--- a/data/as/30049050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049050/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049081/ws-services-calculation/WCBillingSlab.json b/data/as/30049081/ws-services-calculation/WCBillingSlab.json
index d3ee35cc3b..f090cc0c74 100644
--- a/data/as/30049081/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049081/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049228/ws-services-calculation/WCBillingSlab.json b/data/as/30049228/ws-services-calculation/WCBillingSlab.json
index 48e4dc7fc0..7c9583924e 100644
--- a/data/as/30049228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049228/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049262/ws-services-calculation/WCBillingSlab.json b/data/as/30049262/ws-services-calculation/WCBillingSlab.json
index e2dc91a773..aec9a3914c 100644
--- a/data/as/30049262/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049262/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049278/ws-services-calculation/WCBillingSlab.json b/data/as/30049278/ws-services-calculation/WCBillingSlab.json
index 4404886577..c6d1333762 100644
--- a/data/as/30049278/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049278/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049299/ws-services-calculation/WCBillingSlab.json b/data/as/30049299/ws-services-calculation/WCBillingSlab.json
index a678ef8398..d5c5b189d5 100644
--- a/data/as/30049299/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049299/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049604/ws-services-calculation/WCBillingSlab.json b/data/as/30049604/ws-services-calculation/WCBillingSlab.json
index 6cdced999d..bd532910ce 100644
--- a/data/as/30049604/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049604/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049608/ws-services-calculation/WCBillingSlab.json b/data/as/30049608/ws-services-calculation/WCBillingSlab.json
index 4f0f0531ba..dc10e1ed5a 100644
--- a/data/as/30049608/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049608/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049610/ws-services-calculation/WCBillingSlab.json b/data/as/30049610/ws-services-calculation/WCBillingSlab.json
index b1312fb982..cdcce5cf5e 100644
--- a/data/as/30049610/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049610/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049624/ws-services-calculation/WCBillingSlab.json b/data/as/30049624/ws-services-calculation/WCBillingSlab.json
index 47ffc9b212..1cbf8e1373 100644
--- a/data/as/30049624/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049624/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049625/ws-services-calculation/WCBillingSlab.json b/data/as/30049625/ws-services-calculation/WCBillingSlab.json
index 7fbec785e1..101f749f8c 100644
--- a/data/as/30049625/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049625/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049629/ws-services-calculation/WCBillingSlab.json b/data/as/30049629/ws-services-calculation/WCBillingSlab.json
index 3d59292de9..3229f7b515 100644
--- a/data/as/30049629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049629/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049631/ws-services-calculation/WCBillingSlab.json b/data/as/30049631/ws-services-calculation/WCBillingSlab.json
index 3ce74d81a9..f5b432bff7 100644
--- a/data/as/30049631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049631/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049632/ws-services-calculation/WCBillingSlab.json b/data/as/30049632/ws-services-calculation/WCBillingSlab.json
index 4e1d984a89..64877242f4 100644
--- a/data/as/30049632/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049632/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049922/ws-services-calculation/WCBillingSlab.json b/data/as/30049922/ws-services-calculation/WCBillingSlab.json
index ac32518ae1..c646c935f8 100644
--- a/data/as/30049922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049922/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049941/ws-services-calculation/WCBillingSlab.json b/data/as/30049941/ws-services-calculation/WCBillingSlab.json
index 0c96bf7565..8ae807b974 100644
--- a/data/as/30049941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049941/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30049949/ws-services-calculation/WCBillingSlab.json b/data/as/30049949/ws-services-calculation/WCBillingSlab.json
index fb2974308c..1cd1a2d250 100644
--- a/data/as/30049949/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30049949/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050030/ws-services-calculation/WCBillingSlab.json b/data/as/30050030/ws-services-calculation/WCBillingSlab.json
index c05e11b194..99caab18f1 100644
--- a/data/as/30050030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050030/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050223/ws-services-calculation/WCBillingSlab.json b/data/as/30050223/ws-services-calculation/WCBillingSlab.json
index 45ef579faa..4d99753aae 100644
--- a/data/as/30050223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050805/ws-services-calculation/WCBillingSlab.json b/data/as/30050805/ws-services-calculation/WCBillingSlab.json
index 5eb92ce12c..ab4d0ea4aa 100644
--- a/data/as/30050805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050805/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050939/ws-services-calculation/WCBillingSlab.json b/data/as/30050939/ws-services-calculation/WCBillingSlab.json
index a948143094..5c0fde85f3 100644
--- a/data/as/30050939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050939/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30050952/ws-services-calculation/WCBillingSlab.json b/data/as/30050952/ws-services-calculation/WCBillingSlab.json
index d8f76660e8..0e7a7ef318 100644
--- a/data/as/30050952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30050952/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051014/ws-services-calculation/WCBillingSlab.json b/data/as/30051014/ws-services-calculation/WCBillingSlab.json
index 89fe508471..f647615724 100644
--- a/data/as/30051014/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051014/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051018/ws-services-calculation/WCBillingSlab.json b/data/as/30051018/ws-services-calculation/WCBillingSlab.json
index 94a717ffee..e15be8abcf 100644
--- a/data/as/30051018/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051018/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051021/ws-services-calculation/WCBillingSlab.json b/data/as/30051021/ws-services-calculation/WCBillingSlab.json
index 431f77506d..d6ba3f33ea 100644
--- a/data/as/30051021/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051021/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051023/ws-services-calculation/WCBillingSlab.json b/data/as/30051023/ws-services-calculation/WCBillingSlab.json
index e8cbaedd7d..3c0b6918e6 100644
--- a/data/as/30051023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051023/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051099/ws-services-calculation/WCBillingSlab.json b/data/as/30051099/ws-services-calculation/WCBillingSlab.json
index efce5e3a50..69c572abab 100644
--- a/data/as/30051099/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051099/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051263/ws-services-calculation/WCBillingSlab.json b/data/as/30051263/ws-services-calculation/WCBillingSlab.json
index 2c04891316..2e4424ceae 100644
--- a/data/as/30051263/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051263/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051272/ws-services-calculation/WCBillingSlab.json b/data/as/30051272/ws-services-calculation/WCBillingSlab.json
index 58c7f7360e..48578f1691 100644
--- a/data/as/30051272/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051272/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051276/ws-services-calculation/WCBillingSlab.json b/data/as/30051276/ws-services-calculation/WCBillingSlab.json
index a508db6181..4157f6f00f 100644
--- a/data/as/30051276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051276/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051373/ws-services-calculation/WCBillingSlab.json b/data/as/30051373/ws-services-calculation/WCBillingSlab.json
index a919d11552..1dd41beede 100644
--- a/data/as/30051373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051373/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051391/ws-services-calculation/WCBillingSlab.json b/data/as/30051391/ws-services-calculation/WCBillingSlab.json
index 75a15bd73c..1e9ac5dc23 100644
--- a/data/as/30051391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051391/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051400/ws-services-calculation/WCBillingSlab.json b/data/as/30051400/ws-services-calculation/WCBillingSlab.json
index 11d015586d..854d82bed8 100644
--- a/data/as/30051400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051400/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051407/ws-services-calculation/WCBillingSlab.json b/data/as/30051407/ws-services-calculation/WCBillingSlab.json
index 9d0aeb531c..7b3c7e15b4 100644
--- a/data/as/30051407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051407/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051492/ws-services-calculation/WCBillingSlab.json b/data/as/30051492/ws-services-calculation/WCBillingSlab.json
index 05cb384c1c..36f96e4da2 100644
--- a/data/as/30051492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051492/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051495/ws-services-calculation/WCBillingSlab.json b/data/as/30051495/ws-services-calculation/WCBillingSlab.json
index 7970175ea7..8121ee8ab8 100644
--- a/data/as/30051495/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051495/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051497/ws-services-calculation/WCBillingSlab.json b/data/as/30051497/ws-services-calculation/WCBillingSlab.json
index a21dcbfa8c..f8a871d5d4 100644
--- a/data/as/30051497/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051497/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051501/ws-services-calculation/WCBillingSlab.json b/data/as/30051501/ws-services-calculation/WCBillingSlab.json
index c126a2c251..c8b12558fb 100644
--- a/data/as/30051501/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051501/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051507/ws-services-calculation/WCBillingSlab.json b/data/as/30051507/ws-services-calculation/WCBillingSlab.json
index fd87af5efe..fc27b02324 100644
--- a/data/as/30051507/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051507/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051529/ws-services-calculation/WCBillingSlab.json b/data/as/30051529/ws-services-calculation/WCBillingSlab.json
index 1554415863..750dbac2c0 100644
--- a/data/as/30051529/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051529/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051562/ws-services-calculation/WCBillingSlab.json b/data/as/30051562/ws-services-calculation/WCBillingSlab.json
index b2c12846be..f6eb64df06 100644
--- a/data/as/30051562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051562/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051569/ws-services-calculation/WCBillingSlab.json b/data/as/30051569/ws-services-calculation/WCBillingSlab.json
index 5291d7a2bb..4e856e9a99 100644
--- a/data/as/30051569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051569/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051624/ws-services-calculation/WCBillingSlab.json b/data/as/30051624/ws-services-calculation/WCBillingSlab.json
index 00a79034be..209378e30b 100644
--- a/data/as/30051624/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051624/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30051683/ws-services-calculation/WCBillingSlab.json b/data/as/30051683/ws-services-calculation/WCBillingSlab.json
index 0df5f6139c..fc47f93aca 100644
--- a/data/as/30051683/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30051683/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052428/ws-services-calculation/WCBillingSlab.json b/data/as/30052428/ws-services-calculation/WCBillingSlab.json
index 9110f5598b..2fe01ca48e 100644
--- a/data/as/30052428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052428/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052432/ws-services-calculation/WCBillingSlab.json b/data/as/30052432/ws-services-calculation/WCBillingSlab.json
index 7ed3ee728f..3db84bbe62 100644
--- a/data/as/30052432/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052432/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052437/ws-services-calculation/WCBillingSlab.json b/data/as/30052437/ws-services-calculation/WCBillingSlab.json
index 347a2d76e0..55daf436f4 100644
--- a/data/as/30052437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052437/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052518/ws-services-calculation/WCBillingSlab.json b/data/as/30052518/ws-services-calculation/WCBillingSlab.json
index 059b892c77..100e09d5f2 100644
--- a/data/as/30052518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052518/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052737/ws-services-calculation/WCBillingSlab.json b/data/as/30052737/ws-services-calculation/WCBillingSlab.json
index a29bf0bc94..5f8f341fe5 100644
--- a/data/as/30052737/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052737/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30052787/ws-services-calculation/WCBillingSlab.json b/data/as/30052787/ws-services-calculation/WCBillingSlab.json
index b228fd28fc..f7cb3f0208 100644
--- a/data/as/30052787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30052787/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30053173/ws-services-calculation/WCBillingSlab.json b/data/as/30053173/ws-services-calculation/WCBillingSlab.json
index 5c6c3c0460..8b4c038586 100644
--- a/data/as/30053173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30053173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30053615/ws-services-calculation/WCBillingSlab.json b/data/as/30053615/ws-services-calculation/WCBillingSlab.json
index e0d5b8cd2e..2b5cd251d4 100644
--- a/data/as/30053615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30053615/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30053688/ws-services-calculation/WCBillingSlab.json b/data/as/30053688/ws-services-calculation/WCBillingSlab.json
index 2c1edada95..5b2afba087 100644
--- a/data/as/30053688/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30053688/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054045/ws-services-calculation/WCBillingSlab.json b/data/as/30054045/ws-services-calculation/WCBillingSlab.json
index 4da41fb30e..2a11006524 100644
--- a/data/as/30054045/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054045/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054048/ws-services-calculation/WCBillingSlab.json b/data/as/30054048/ws-services-calculation/WCBillingSlab.json
index 3a1ad3d2cc..bd9b538de0 100644
--- a/data/as/30054048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054048/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054057/ws-services-calculation/WCBillingSlab.json b/data/as/30054057/ws-services-calculation/WCBillingSlab.json
index 45e4f26ea4..ad1734a51f 100644
--- a/data/as/30054057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054057/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054383/ws-services-calculation/WCBillingSlab.json b/data/as/30054383/ws-services-calculation/WCBillingSlab.json
index 3ff4eecec1..da9989f253 100644
--- a/data/as/30054383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054383/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054393/ws-services-calculation/WCBillingSlab.json b/data/as/30054393/ws-services-calculation/WCBillingSlab.json
index 20d3e7f8b2..5bc719ac4d 100644
--- a/data/as/30054393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054393/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054598/ws-services-calculation/WCBillingSlab.json b/data/as/30054598/ws-services-calculation/WCBillingSlab.json
index b7939c5332..7023359b55 100644
--- a/data/as/30054598/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054598/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30054601/ws-services-calculation/WCBillingSlab.json b/data/as/30054601/ws-services-calculation/WCBillingSlab.json
index 869d70e239..f83f46e631 100644
--- a/data/as/30054601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30054601/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055210/ws-services-calculation/WCBillingSlab.json b/data/as/30055210/ws-services-calculation/WCBillingSlab.json
index 44d3664c76..2f2dbfcd19 100644
--- a/data/as/30055210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055210/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055216/ws-services-calculation/WCBillingSlab.json b/data/as/30055216/ws-services-calculation/WCBillingSlab.json
index 0a1ce22c77..6ada338771 100644
--- a/data/as/30055216/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055216/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055275/ws-services-calculation/WCBillingSlab.json b/data/as/30055275/ws-services-calculation/WCBillingSlab.json
index 0f6e0f5bfd..ebddcb265d 100644
--- a/data/as/30055275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055275/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055680/ws-services-calculation/WCBillingSlab.json b/data/as/30055680/ws-services-calculation/WCBillingSlab.json
index c3a5255aee..93b146c7ea 100644
--- a/data/as/30055680/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055680/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055696/ws-services-calculation/WCBillingSlab.json b/data/as/30055696/ws-services-calculation/WCBillingSlab.json
index 5b2d8987e8..750e60fa48 100644
--- a/data/as/30055696/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055696/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055718/ws-services-calculation/WCBillingSlab.json b/data/as/30055718/ws-services-calculation/WCBillingSlab.json
index dffa096ad9..1155a6d29a 100644
--- a/data/as/30055718/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055718/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055724/ws-services-calculation/WCBillingSlab.json b/data/as/30055724/ws-services-calculation/WCBillingSlab.json
index 3a43b2cb62..e8d97a9d69 100644
--- a/data/as/30055724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055929/ws-services-calculation/WCBillingSlab.json b/data/as/30055929/ws-services-calculation/WCBillingSlab.json
index c94552ac4e..b77c79831d 100644
--- a/data/as/30055929/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055929/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30055936/ws-services-calculation/WCBillingSlab.json b/data/as/30055936/ws-services-calculation/WCBillingSlab.json
index 1ee875c7e7..fcc58cefc6 100644
--- a/data/as/30055936/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30055936/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056016/ws-services-calculation/WCBillingSlab.json b/data/as/30056016/ws-services-calculation/WCBillingSlab.json
index 343d720c4e..0ef449ee86 100644
--- a/data/as/30056016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056016/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056027/ws-services-calculation/WCBillingSlab.json b/data/as/30056027/ws-services-calculation/WCBillingSlab.json
index 625e897d7b..68c243b92d 100644
--- a/data/as/30056027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056041/ws-services-calculation/WCBillingSlab.json b/data/as/30056041/ws-services-calculation/WCBillingSlab.json
index 4a8fa2924b..06630c8130 100644
--- a/data/as/30056041/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056041/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056050/ws-services-calculation/WCBillingSlab.json b/data/as/30056050/ws-services-calculation/WCBillingSlab.json
index 1dd60773fe..51c41b0ac3 100644
--- a/data/as/30056050/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056050/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056072/ws-services-calculation/WCBillingSlab.json b/data/as/30056072/ws-services-calculation/WCBillingSlab.json
index 4da76eccf1..e4a87b1b15 100644
--- a/data/as/30056072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056072/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056080/ws-services-calculation/WCBillingSlab.json b/data/as/30056080/ws-services-calculation/WCBillingSlab.json
index ac5ff13551..844a1c3daa 100644
--- a/data/as/30056080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056080/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056087/ws-services-calculation/WCBillingSlab.json b/data/as/30056087/ws-services-calculation/WCBillingSlab.json
index 62def6db38..73cc44b2ad 100644
--- a/data/as/30056087/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056087/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056104/ws-services-calculation/WCBillingSlab.json b/data/as/30056104/ws-services-calculation/WCBillingSlab.json
index d4e6ad1573..51ee7b9ccd 100644
--- a/data/as/30056104/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056104/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056141/ws-services-calculation/WCBillingSlab.json b/data/as/30056141/ws-services-calculation/WCBillingSlab.json
index 2988d1b9d6..064912796a 100644
--- a/data/as/30056141/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056141/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056146/ws-services-calculation/WCBillingSlab.json b/data/as/30056146/ws-services-calculation/WCBillingSlab.json
index ffe24beef5..98a7a7c909 100644
--- a/data/as/30056146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056146/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056407/ws-services-calculation/WCBillingSlab.json b/data/as/30056407/ws-services-calculation/WCBillingSlab.json
index f8b05b3062..4e93baa7ec 100644
--- a/data/as/30056407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056407/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056412/ws-services-calculation/WCBillingSlab.json b/data/as/30056412/ws-services-calculation/WCBillingSlab.json
index dd428cddc9..0f532dde5c 100644
--- a/data/as/30056412/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056412/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056417/ws-services-calculation/WCBillingSlab.json b/data/as/30056417/ws-services-calculation/WCBillingSlab.json
index 571cfa059d..4bec1167d3 100644
--- a/data/as/30056417/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056417/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056425/ws-services-calculation/WCBillingSlab.json b/data/as/30056425/ws-services-calculation/WCBillingSlab.json
index acb0174206..3c8ffb5ec7 100644
--- a/data/as/30056425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056425/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056431/ws-services-calculation/WCBillingSlab.json b/data/as/30056431/ws-services-calculation/WCBillingSlab.json
index 78a41a3634..fa718a26cb 100644
--- a/data/as/30056431/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056431/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056433/ws-services-calculation/WCBillingSlab.json b/data/as/30056433/ws-services-calculation/WCBillingSlab.json
index 89b358c668..19effad1b8 100644
--- a/data/as/30056433/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056433/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056435/ws-services-calculation/WCBillingSlab.json b/data/as/30056435/ws-services-calculation/WCBillingSlab.json
index f155b1813e..97d3ec58a5 100644
--- a/data/as/30056435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056435/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056490/ws-services-calculation/WCBillingSlab.json b/data/as/30056490/ws-services-calculation/WCBillingSlab.json
index c6ba320b36..3cc4887805 100644
--- a/data/as/30056490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056490/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056609/ws-services-calculation/WCBillingSlab.json b/data/as/30056609/ws-services-calculation/WCBillingSlab.json
index c4f8294ab3..ccc1500b63 100644
--- a/data/as/30056609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056609/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056640/ws-services-calculation/WCBillingSlab.json b/data/as/30056640/ws-services-calculation/WCBillingSlab.json
index 56f8571644..09b7bd946e 100644
--- a/data/as/30056640/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056640/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056810/ws-services-calculation/WCBillingSlab.json b/data/as/30056810/ws-services-calculation/WCBillingSlab.json
index 086fe1ffd0..a84d8ac10e 100644
--- a/data/as/30056810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056810/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056913/ws-services-calculation/WCBillingSlab.json b/data/as/30056913/ws-services-calculation/WCBillingSlab.json
index 6773f2c082..f3d79d5d26 100644
--- a/data/as/30056913/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056913/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056918/ws-services-calculation/WCBillingSlab.json b/data/as/30056918/ws-services-calculation/WCBillingSlab.json
index 815192542d..1d71cfad16 100644
--- a/data/as/30056918/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056918/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30056922/ws-services-calculation/WCBillingSlab.json b/data/as/30056922/ws-services-calculation/WCBillingSlab.json
index 870cde4579..25afcd6add 100644
--- a/data/as/30056922/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30056922/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057164/ws-services-calculation/WCBillingSlab.json b/data/as/30057164/ws-services-calculation/WCBillingSlab.json
index 647c3b0add..92a4f2584a 100644
--- a/data/as/30057164/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057164/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057166/ws-services-calculation/WCBillingSlab.json b/data/as/30057166/ws-services-calculation/WCBillingSlab.json
index 9c40a6869d..a7f0ebca5f 100644
--- a/data/as/30057166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057166/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057174/ws-services-calculation/WCBillingSlab.json b/data/as/30057174/ws-services-calculation/WCBillingSlab.json
index 7fd265ee1e..43978bac73 100644
--- a/data/as/30057174/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057174/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057288/ws-services-calculation/WCBillingSlab.json b/data/as/30057288/ws-services-calculation/WCBillingSlab.json
index 149fe9495e..9eeeabd80e 100644
--- a/data/as/30057288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057288/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057297/ws-services-calculation/WCBillingSlab.json b/data/as/30057297/ws-services-calculation/WCBillingSlab.json
index a0f3e78c42..7355b9c9e3 100644
--- a/data/as/30057297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057297/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057361/ws-services-calculation/WCBillingSlab.json b/data/as/30057361/ws-services-calculation/WCBillingSlab.json
index 38fce70843..7ba6b364d7 100644
--- a/data/as/30057361/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057361/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057363/ws-services-calculation/WCBillingSlab.json b/data/as/30057363/ws-services-calculation/WCBillingSlab.json
index e6eb09d458..88dad58d32 100644
--- a/data/as/30057363/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057363/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057369/ws-services-calculation/WCBillingSlab.json b/data/as/30057369/ws-services-calculation/WCBillingSlab.json
index 8507fc5dd0..8bced24745 100644
--- a/data/as/30057369/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057369/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057524/ws-services-calculation/WCBillingSlab.json b/data/as/30057524/ws-services-calculation/WCBillingSlab.json
index c6c5d14ba7..a876a818cc 100644
--- a/data/as/30057524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057524/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057641/ws-services-calculation/WCBillingSlab.json b/data/as/30057641/ws-services-calculation/WCBillingSlab.json
index d917fabb72..52f8cf529c 100644
--- a/data/as/30057641/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057641/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057745/ws-services-calculation/WCBillingSlab.json b/data/as/30057745/ws-services-calculation/WCBillingSlab.json
index 917c4c2bbb..b257a8db1d 100644
--- a/data/as/30057745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057745/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057746/ws-services-calculation/WCBillingSlab.json b/data/as/30057746/ws-services-calculation/WCBillingSlab.json
index be52ade618..603cd0bd34 100644
--- a/data/as/30057746/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057746/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057748/ws-services-calculation/WCBillingSlab.json b/data/as/30057748/ws-services-calculation/WCBillingSlab.json
index 61423be2cb..480c476b76 100644
--- a/data/as/30057748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057748/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057972/ws-services-calculation/WCBillingSlab.json b/data/as/30057972/ws-services-calculation/WCBillingSlab.json
index db6cf81c94..df1a6a5c7f 100644
--- a/data/as/30057972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057974/ws-services-calculation/WCBillingSlab.json b/data/as/30057974/ws-services-calculation/WCBillingSlab.json
index 683fcddf2a..b932e0fee4 100644
--- a/data/as/30057974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057974/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057979/ws-services-calculation/WCBillingSlab.json b/data/as/30057979/ws-services-calculation/WCBillingSlab.json
index 24f4c6a1ad..bfbb81f830 100644
--- a/data/as/30057979/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057979/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057983/ws-services-calculation/WCBillingSlab.json b/data/as/30057983/ws-services-calculation/WCBillingSlab.json
index 1a5a0a5dda..27d77a05a7 100644
--- a/data/as/30057983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057983/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057985/ws-services-calculation/WCBillingSlab.json b/data/as/30057985/ws-services-calculation/WCBillingSlab.json
index bad91cd1e2..dc29ca8087 100644
--- a/data/as/30057985/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057985/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057989/ws-services-calculation/WCBillingSlab.json b/data/as/30057989/ws-services-calculation/WCBillingSlab.json
index 7dcf9fb205..e8f1951408 100644
--- a/data/as/30057989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057989/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30057993/ws-services-calculation/WCBillingSlab.json b/data/as/30057993/ws-services-calculation/WCBillingSlab.json
index dc034e585d..367c0b96f8 100644
--- a/data/as/30057993/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30057993/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058019/ws-services-calculation/WCBillingSlab.json b/data/as/30058019/ws-services-calculation/WCBillingSlab.json
index eae29f7ac5..e9cf51ae1a 100644
--- a/data/as/30058019/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058019/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058023/ws-services-calculation/WCBillingSlab.json b/data/as/30058023/ws-services-calculation/WCBillingSlab.json
index 7138912b1d..32d8656bc3 100644
--- a/data/as/30058023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058023/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058044/ws-services-calculation/WCBillingSlab.json b/data/as/30058044/ws-services-calculation/WCBillingSlab.json
index 2dd12e7617..dbc3c10614 100644
--- a/data/as/30058044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058044/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058047/ws-services-calculation/WCBillingSlab.json b/data/as/30058047/ws-services-calculation/WCBillingSlab.json
index 9614d03870..04b88c24c5 100644
--- a/data/as/30058047/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058047/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058052/ws-services-calculation/WCBillingSlab.json b/data/as/30058052/ws-services-calculation/WCBillingSlab.json
index ab62f61bf1..a9b5232dc7 100644
--- a/data/as/30058052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058052/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058057/ws-services-calculation/WCBillingSlab.json b/data/as/30058057/ws-services-calculation/WCBillingSlab.json
index eefe6cae1c..0713c6571c 100644
--- a/data/as/30058057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058057/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058109/ws-services-calculation/WCBillingSlab.json b/data/as/30058109/ws-services-calculation/WCBillingSlab.json
index 837c2f358f..b6aa7cccb2 100644
--- a/data/as/30058109/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058109/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058320/ws-services-calculation/WCBillingSlab.json b/data/as/30058320/ws-services-calculation/WCBillingSlab.json
index 4d3851aa65..55b3e62584 100644
--- a/data/as/30058320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058320/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058339/ws-services-calculation/WCBillingSlab.json b/data/as/30058339/ws-services-calculation/WCBillingSlab.json
index e48346affe..8d72a42096 100644
--- a/data/as/30058339/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058339/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30058545/ws-services-calculation/WCBillingSlab.json b/data/as/30058545/ws-services-calculation/WCBillingSlab.json
index ea19cb6829..f2926ef0ba 100644
--- a/data/as/30058545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30058545/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059252/ws-services-calculation/WCBillingSlab.json b/data/as/30059252/ws-services-calculation/WCBillingSlab.json
index 69b9beaebf..e58b69eb2d 100644
--- a/data/as/30059252/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059252/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059318/ws-services-calculation/WCBillingSlab.json b/data/as/30059318/ws-services-calculation/WCBillingSlab.json
index cd66275819..bf53b3dd05 100644
--- a/data/as/30059318/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059318/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059391/ws-services-calculation/WCBillingSlab.json b/data/as/30059391/ws-services-calculation/WCBillingSlab.json
index 3f921dbc05..99de8553cb 100644
--- a/data/as/30059391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059391/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059490/ws-services-calculation/WCBillingSlab.json b/data/as/30059490/ws-services-calculation/WCBillingSlab.json
index 04158867a4..10521237e8 100644
--- a/data/as/30059490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059490/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059492/ws-services-calculation/WCBillingSlab.json b/data/as/30059492/ws-services-calculation/WCBillingSlab.json
index 6001692d63..8cd5273345 100644
--- a/data/as/30059492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059492/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059495/ws-services-calculation/WCBillingSlab.json b/data/as/30059495/ws-services-calculation/WCBillingSlab.json
index 7210e6c654..4add21d48b 100644
--- a/data/as/30059495/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059495/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059497/ws-services-calculation/WCBillingSlab.json b/data/as/30059497/ws-services-calculation/WCBillingSlab.json
index 133614edc6..a60dd9c30c 100644
--- a/data/as/30059497/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059497/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059500/ws-services-calculation/WCBillingSlab.json b/data/as/30059500/ws-services-calculation/WCBillingSlab.json
index b693a67471..f3b0f783ba 100644
--- a/data/as/30059500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059500/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059502/ws-services-calculation/WCBillingSlab.json b/data/as/30059502/ws-services-calculation/WCBillingSlab.json
index 45c35a9aa5..416021072d 100644
--- a/data/as/30059502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059502/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059510/ws-services-calculation/WCBillingSlab.json b/data/as/30059510/ws-services-calculation/WCBillingSlab.json
index e095509d3a..5e0192d6ac 100644
--- a/data/as/30059510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059510/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059517/ws-services-calculation/WCBillingSlab.json b/data/as/30059517/ws-services-calculation/WCBillingSlab.json
index 0fffa7849a..d035160f06 100644
--- a/data/as/30059517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059517/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30059589/ws-services-calculation/WCBillingSlab.json b/data/as/30059589/ws-services-calculation/WCBillingSlab.json
index a83af0570f..500cbe1723 100644
--- a/data/as/30059589/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30059589/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060114/ws-services-calculation/WCBillingSlab.json b/data/as/30060114/ws-services-calculation/WCBillingSlab.json
index a5b396c6d3..efb3000d8d 100644
--- a/data/as/30060114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060114/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060116/ws-services-calculation/WCBillingSlab.json b/data/as/30060116/ws-services-calculation/WCBillingSlab.json
index 934e7b0a49..516199ff1b 100644
--- a/data/as/30060116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060116/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060146/ws-services-calculation/WCBillingSlab.json b/data/as/30060146/ws-services-calculation/WCBillingSlab.json
index f3c17c0f32..91bf74cc6e 100644
--- a/data/as/30060146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060146/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060151/ws-services-calculation/WCBillingSlab.json b/data/as/30060151/ws-services-calculation/WCBillingSlab.json
index 7120c78d40..693ebe04cf 100644
--- a/data/as/30060151/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060151/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060155/ws-services-calculation/WCBillingSlab.json b/data/as/30060155/ws-services-calculation/WCBillingSlab.json
index 2456abd591..9d15f07a31 100644
--- a/data/as/30060155/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060155/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060169/ws-services-calculation/WCBillingSlab.json b/data/as/30060169/ws-services-calculation/WCBillingSlab.json
index a71eecebe8..b1db3210b9 100644
--- a/data/as/30060169/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060169/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060173/ws-services-calculation/WCBillingSlab.json b/data/as/30060173/ws-services-calculation/WCBillingSlab.json
index 4f067d0144..999a9a6d5b 100644
--- a/data/as/30060173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060178/ws-services-calculation/WCBillingSlab.json b/data/as/30060178/ws-services-calculation/WCBillingSlab.json
index 7f23ef9903..907c40fc11 100644
--- a/data/as/30060178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060179/ws-services-calculation/WCBillingSlab.json b/data/as/30060179/ws-services-calculation/WCBillingSlab.json
index e7bfab1311..833ed8af54 100644
--- a/data/as/30060179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060179/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060206/ws-services-calculation/WCBillingSlab.json b/data/as/30060206/ws-services-calculation/WCBillingSlab.json
index a6602ef973..978cc3abe9 100644
--- a/data/as/30060206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060206/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060256/ws-services-calculation/WCBillingSlab.json b/data/as/30060256/ws-services-calculation/WCBillingSlab.json
index 409dcb919b..0ea219c7b2 100644
--- a/data/as/30060256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060256/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060309/ws-services-calculation/WCBillingSlab.json b/data/as/30060309/ws-services-calculation/WCBillingSlab.json
index f0aaf9415d..d7f30337fc 100644
--- a/data/as/30060309/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060309/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060313/ws-services-calculation/WCBillingSlab.json b/data/as/30060313/ws-services-calculation/WCBillingSlab.json
index 75ce1535c9..0313be15b5 100644
--- a/data/as/30060313/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060313/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060518/ws-services-calculation/WCBillingSlab.json b/data/as/30060518/ws-services-calculation/WCBillingSlab.json
index 57293e4031..ba932b09f2 100644
--- a/data/as/30060518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060518/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060621/ws-services-calculation/WCBillingSlab.json b/data/as/30060621/ws-services-calculation/WCBillingSlab.json
index 79017b25d0..75d410774d 100644
--- a/data/as/30060621/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060621/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file

From e1833138d08eb01e667212673ccdcfc3e348ba6c Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 17:38:29 +0530
Subject: [PATCH 22/23] updated minimumCharge 0.0 to 0

---
 .../30060637/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060647/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060667/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060692/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060709/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060718/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060740/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060825/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060872/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060887/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060892/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060893/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060898/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060901/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30060910/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30061011/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30061020/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30061025/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30062203/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30062205/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30062312/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30062320/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30062583/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063118/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063119/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063143/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063149/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063152/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063223/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063228/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063239/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063240/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063285/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063294/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063300/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30063426/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30064069/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30064490/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30064646/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30064830/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30065052/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30065285/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30065673/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30065681/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30065865/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30065876/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30066198/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30066211/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30066318/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30066345/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067036/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067040/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067065/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067067/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067084/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067086/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067101/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067113/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067122/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067179/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067304/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067307/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067308/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067407/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067418/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067441/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067449/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067468/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067475/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067509/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067518/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067536/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067611/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067623/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067699/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067707/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067709/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067714/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067748/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067790/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067803/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067829/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067830/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067861/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067915/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067928/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067938/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067942/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067950/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067958/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067962/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067985/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30067989/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068077/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068088/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068096/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068187/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068194/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068198/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068210/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068218/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068225/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068229/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068331/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068340/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068345/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068356/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068380/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068419/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068422/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068427/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068428/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068533/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068606/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068609/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068614/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068620/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068648/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068650/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068669/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30068672/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069086/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069093/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069124/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069136/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069142/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069148/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069157/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069165/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069183/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069223/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069230/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069261/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069267/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069282/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069283/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069284/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069296/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069733/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069738/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069742/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30069820/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070165/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070166/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070207/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070230/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070236/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070239/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070243/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070267/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070269/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070276/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070288/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070302/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070309/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070314/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070342/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070344/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070346/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070350/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070357/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070365/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070375/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070386/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070406/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070419/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070464/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070470/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070477/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070483/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070590/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070600/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070606/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070609/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070611/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070613/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070620/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30070802/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071063/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071098/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071129/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071139/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071148/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071202/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071208/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071569/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071579/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071722/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071743/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071758/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071787/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071801/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071806/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071827/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071830/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30071861/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072127/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072402/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072569/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072574/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072592/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072599/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072650/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072651/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072655/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072656/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072662/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072834/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072841/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072843/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072845/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072880/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072900/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072901/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30072996/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073350/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073352/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073354/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073356/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073357/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073473/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073477/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073481/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073483/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073485/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073492/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30073521/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074179/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074189/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074675/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074706/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074732/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074827/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074916/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074975/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074989/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30074995/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075002/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075008/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075655/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075682/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075685/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075704/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075708/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075836/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075842/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30075998/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076178/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076404/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076417/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076423/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076442/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076501/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076546/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076588/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076595/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30076911/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077015/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077065/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077169/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077173/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077183/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077189/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077362/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077383/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077387/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077405/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077516/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077531/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077533/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30077538/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30078496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30078499/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30079129/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30079143/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30079150/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30079745/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30079783/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30080314/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30080792/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30080805/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30080812/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30081191/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30081194/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30081197/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30081199/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30081237/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30082029/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30082892/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30083052/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30083450/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30090984/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30091027/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30091086/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30091137/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30091277/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30091350/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30092981/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30093053/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30093085/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30093111/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096216/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096276/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096403/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096485/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096579/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096711/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30096898/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30097297/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30105174/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30105196/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30105223/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30113305/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30113852/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30115191/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30115208/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30115249/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30115981/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30116153/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30116490/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30116536/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30117305/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30117521/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30117549/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30117565/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30117571/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30119702/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30125919/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30125926/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30125970/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30125974/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30125980/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126191/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126197/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126217/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126233/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126239/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126308/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126312/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126316/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126334/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126487/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126500/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126582/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30126590/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30127284/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30127356/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30127370/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30127414/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30128175/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30128194/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30128549/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30128554/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30128895/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30128902/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30129324/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30129329/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30129382/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30129385/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30129475/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30129479/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30130374/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30130381/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30130399/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30130411/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30130420/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30130435/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132498/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132532/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132548/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132559/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132588/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132620/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132648/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132661/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30132799/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30137902/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30137931/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30137946/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30137988/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30138003/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30138012/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30138032/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30139203/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30139213/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140232/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140242/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140254/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140608/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140613/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140620/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30140642/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30141038/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30141193/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30141195/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143283/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143295/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143305/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143323/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143328/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143504/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143512/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30143523/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30144955/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30145080/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30146239/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30146477/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30146517/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30146665/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30148255/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30148279/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30148838/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30148938/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30148954/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30149001/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30149016/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30149044/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30149093/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30149113/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150209/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150213/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150234/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150700/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150737/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150785/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150803/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30150834/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158066/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158126/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158312/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158662/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158694/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158752/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30158825/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30159298/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30159329/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30163627/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30163652/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30163717/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166511/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166533/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166583/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166670/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166739/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166762/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30166822/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167065/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167107/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167121/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167130/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167292/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167319/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167381/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167391/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167408/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167439/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167463/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167486/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30167823/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169470/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169472/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169516/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169525/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169537/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169560/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169583/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169600/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169629/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169643/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169657/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169665/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169790/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169802/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169825/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30169988/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170226/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170237/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170249/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170262/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170419/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170429/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170784/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170810/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30170948/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30171030/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172407/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172409/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172412/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172420/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172437/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172442/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172452/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172456/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172473/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172482/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172498/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172503/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172507/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172509/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172538/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172543/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30172573/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173072/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173084/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173097/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173162/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173172/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173251/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173284/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173317/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173387/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173395/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173400/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173409/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173419/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173427/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173442/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173455/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173471/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173509/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173535/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173679/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173688/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173698/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173710/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173740/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173753/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173770/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173782/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173794/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173812/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173814/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173816/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173961/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173962/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173963/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173965/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173967/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173972/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173973/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173975/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173977/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173978/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173979/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173980/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173981/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173982/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173983/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30173984/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174052/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174053/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174055/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174058/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174059/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174062/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174064/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174065/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174068/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174070/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174072/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174082/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174084/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174085/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174088/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174094/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174097/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174123/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174125/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174133/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174139/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174143/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174150/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174158/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174165/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174178/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174186/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174190/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174199/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174210/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174211/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174222/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174241/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174244/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174286/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174291/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174314/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174344/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174357/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174375/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174407/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174416/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174419/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174439/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174442/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174454/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174538/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174541/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174546/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174562/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174577/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174593/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174610/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174622/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174633/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174651/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174677/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174688/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174694/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174699/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174700/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174721/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174729/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174732/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174740/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174745/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174747/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174796/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174826/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174847/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174854/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174863/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174870/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174887/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174894/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174961/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30174977/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175021/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175053/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175075/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175155/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175169/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175190/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175203/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175204/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175213/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175228/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175239/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175264/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175272/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175295/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175334/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175367/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175392/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175425/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175446/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175464/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175466/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175474/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175490/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175493/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175539/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175554/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175635/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175648/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175668/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175691/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175708/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175727/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175767/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175783/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175784/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175795/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175807/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175812/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175821/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175827/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175831/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175853/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175854/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175867/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175876/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175883/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175888/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175891/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175904/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175917/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30175983/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176038/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176114/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176117/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176156/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176170/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176178/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176209/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176222/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176252/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176279/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176310/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176350/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176394/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176403/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176503/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176512/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176517/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176525/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176539/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176552/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176563/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176575/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176589/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176605/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176670/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176673/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176676/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176679/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176683/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176709/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176714/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176720/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30176756/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177227/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177242/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177275/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177297/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177314/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177334/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177375/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177874/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177929/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177971/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30177999/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178023/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178056/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178092/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178124/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178175/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178287/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178310/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178331/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178371/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178397/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178423/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178440/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178942/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30178977/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179000/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179124/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179165/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179209/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179232/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179397/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179439/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179473/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179510/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179533/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179578/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179689/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179724/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179739/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179767/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179793/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179802/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179808/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179812/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179815/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30179821/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180631/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180654/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180663/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180675/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180698/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180724/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180855/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180870/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180952/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30180965/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181077/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181091/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181099/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181126/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181144/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181145/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181168/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181188/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181246/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181257/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181268/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181293/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181327/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181400/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181411/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181434/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181444/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181457/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181562/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181575/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181597/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181604/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181615/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181621/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181628/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181639/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181769/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181824/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181850/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181892/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181910/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181935/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181958/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30181970/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182020/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182059/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182076/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182096/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182115/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182130/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182227/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182259/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182280/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182312/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182324/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182346/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182357/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182369/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182379/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182397/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182413/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182433/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182444/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182458/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182473/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182492/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30182502/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183072/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183077/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183135/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183229/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183244/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183255/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183275/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183307/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183330/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183351/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183367/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183379/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183385/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183392/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183402/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183409/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183414/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183459/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183462/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183468/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183522/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183574/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183599/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183693/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183728/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183739/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183758/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183945/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183971/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30183980/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30184382/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30184383/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30184384/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30184386/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30184393/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30184401/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30185152/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30186115/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30186145/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30186206/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30186275/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30186307/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188401/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188411/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188425/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188440/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188457/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188494/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188506/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188524/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188535/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188564/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188569/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188583/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188648/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188716/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188739/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188761/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188772/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188786/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188820/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30188848/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189208/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189234/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189242/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189256/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189269/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189277/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189286/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189299/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189315/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189323/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189328/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189336/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189344/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189379/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189381/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189391/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189399/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189413/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189424/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189431/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189444/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189455/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189469/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189496/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189526/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189537/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189551/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189562/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189571/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189582/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189595/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30189615/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191686/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191713/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191743/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191765/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191816/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191837/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191855/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191889/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191910/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191941/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30191974/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30192001/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30192026/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30192045/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30192070/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30192093/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30192129/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30193693/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30196401/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30196757/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30196783/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30196788/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30196800/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30196806/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30199561/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30199580/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30199609/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30199656/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200209/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200338/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200348/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200365/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200373/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200381/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200390/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30200395/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201829/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201845/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201859/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201868/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201884/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201910/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201927/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201982/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30201998/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202047/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202048/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202080/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202118/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202288/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202311/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202346/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202436/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202462/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202484/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202510/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202537/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202570/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202595/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202611/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202636/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202651/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202908/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30202964/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30204586/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207281/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207843/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207863/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207883/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207923/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207980/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207990/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30207996/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30208033/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30208074/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30208101/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30208625/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 999 files changed, 3996 insertions(+), 3996 deletions(-)

diff --git a/data/as/30060637/ws-services-calculation/WCBillingSlab.json b/data/as/30060637/ws-services-calculation/WCBillingSlab.json
index 289861ad34..1e801d35f1 100644
--- a/data/as/30060637/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060637/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060647/ws-services-calculation/WCBillingSlab.json b/data/as/30060647/ws-services-calculation/WCBillingSlab.json
index e99e56cb83..e8ed2ba920 100644
--- a/data/as/30060647/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060647/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060667/ws-services-calculation/WCBillingSlab.json b/data/as/30060667/ws-services-calculation/WCBillingSlab.json
index 940de1a9bc..4cf11dacac 100644
--- a/data/as/30060667/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060667/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060692/ws-services-calculation/WCBillingSlab.json b/data/as/30060692/ws-services-calculation/WCBillingSlab.json
index 039843f52b..63b5874dc7 100644
--- a/data/as/30060692/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060692/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060709/ws-services-calculation/WCBillingSlab.json b/data/as/30060709/ws-services-calculation/WCBillingSlab.json
index c98a9281fa..460b86447e 100644
--- a/data/as/30060709/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060709/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060718/ws-services-calculation/WCBillingSlab.json b/data/as/30060718/ws-services-calculation/WCBillingSlab.json
index b59ba3022a..4af8bb0a18 100644
--- a/data/as/30060718/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060718/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060740/ws-services-calculation/WCBillingSlab.json b/data/as/30060740/ws-services-calculation/WCBillingSlab.json
index d0bbce5f3c..46690c2c0d 100644
--- a/data/as/30060740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060740/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060825/ws-services-calculation/WCBillingSlab.json b/data/as/30060825/ws-services-calculation/WCBillingSlab.json
index a81099eb26..ab8fbe2d99 100644
--- a/data/as/30060825/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060825/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060872/ws-services-calculation/WCBillingSlab.json b/data/as/30060872/ws-services-calculation/WCBillingSlab.json
index 27099e5bbb..1f49602ec2 100644
--- a/data/as/30060872/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060872/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060887/ws-services-calculation/WCBillingSlab.json b/data/as/30060887/ws-services-calculation/WCBillingSlab.json
index 61f019e8d4..baa1d9dd4a 100644
--- a/data/as/30060887/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060887/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060892/ws-services-calculation/WCBillingSlab.json b/data/as/30060892/ws-services-calculation/WCBillingSlab.json
index 86304af3ee..484488e590 100644
--- a/data/as/30060892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060893/ws-services-calculation/WCBillingSlab.json b/data/as/30060893/ws-services-calculation/WCBillingSlab.json
index 93b906a9f5..25dee43de7 100644
--- a/data/as/30060893/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060893/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060898/ws-services-calculation/WCBillingSlab.json b/data/as/30060898/ws-services-calculation/WCBillingSlab.json
index 5c2cdaf9b6..0aed2a53ea 100644
--- a/data/as/30060898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060898/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060901/ws-services-calculation/WCBillingSlab.json b/data/as/30060901/ws-services-calculation/WCBillingSlab.json
index 2c3eb8ae0a..e942149d6a 100644
--- a/data/as/30060901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060901/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30060910/ws-services-calculation/WCBillingSlab.json b/data/as/30060910/ws-services-calculation/WCBillingSlab.json
index a6d55db722..619627c7b1 100644
--- a/data/as/30060910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30060910/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30061011/ws-services-calculation/WCBillingSlab.json b/data/as/30061011/ws-services-calculation/WCBillingSlab.json
index 4d27caab75..194cc6487d 100644
--- a/data/as/30061011/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30061011/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30061020/ws-services-calculation/WCBillingSlab.json b/data/as/30061020/ws-services-calculation/WCBillingSlab.json
index 9328d66b8f..3eae57ae41 100644
--- a/data/as/30061020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30061020/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30061025/ws-services-calculation/WCBillingSlab.json b/data/as/30061025/ws-services-calculation/WCBillingSlab.json
index 9ab17f37ca..0419ec63e0 100644
--- a/data/as/30061025/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30061025/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062203/ws-services-calculation/WCBillingSlab.json b/data/as/30062203/ws-services-calculation/WCBillingSlab.json
index 29f8b2096a..1a5f0a9a23 100644
--- a/data/as/30062203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062205/ws-services-calculation/WCBillingSlab.json b/data/as/30062205/ws-services-calculation/WCBillingSlab.json
index dc671486ea..0b2b28481e 100644
--- a/data/as/30062205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062205/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062312/ws-services-calculation/WCBillingSlab.json b/data/as/30062312/ws-services-calculation/WCBillingSlab.json
index 325f9b0f6d..5dddaee4d3 100644
--- a/data/as/30062312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062320/ws-services-calculation/WCBillingSlab.json b/data/as/30062320/ws-services-calculation/WCBillingSlab.json
index b9d2c3c9d8..2a4d51fdb6 100644
--- a/data/as/30062320/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062320/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30062583/ws-services-calculation/WCBillingSlab.json b/data/as/30062583/ws-services-calculation/WCBillingSlab.json
index 5d516ec5dd..c8a5a24fbc 100644
--- a/data/as/30062583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30062583/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063118/ws-services-calculation/WCBillingSlab.json b/data/as/30063118/ws-services-calculation/WCBillingSlab.json
index 50b268c5a2..2ee0892348 100644
--- a/data/as/30063118/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063118/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063119/ws-services-calculation/WCBillingSlab.json b/data/as/30063119/ws-services-calculation/WCBillingSlab.json
index c94f1a5c1b..c71b4411f6 100644
--- a/data/as/30063119/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063119/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063143/ws-services-calculation/WCBillingSlab.json b/data/as/30063143/ws-services-calculation/WCBillingSlab.json
index fac68d20a9..eebdbdc43b 100644
--- a/data/as/30063143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063143/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063149/ws-services-calculation/WCBillingSlab.json b/data/as/30063149/ws-services-calculation/WCBillingSlab.json
index ae233083be..265aee3fe8 100644
--- a/data/as/30063149/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063149/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063152/ws-services-calculation/WCBillingSlab.json b/data/as/30063152/ws-services-calculation/WCBillingSlab.json
index 45f2c623a1..67e8e26fbb 100644
--- a/data/as/30063152/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063152/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063223/ws-services-calculation/WCBillingSlab.json b/data/as/30063223/ws-services-calculation/WCBillingSlab.json
index 7d5f5da879..1e64f3c462 100644
--- a/data/as/30063223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063228/ws-services-calculation/WCBillingSlab.json b/data/as/30063228/ws-services-calculation/WCBillingSlab.json
index 09fb121edf..74e1f0522d 100644
--- a/data/as/30063228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063228/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063239/ws-services-calculation/WCBillingSlab.json b/data/as/30063239/ws-services-calculation/WCBillingSlab.json
index 7410597bf4..eb99b6b734 100644
--- a/data/as/30063239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063239/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063240/ws-services-calculation/WCBillingSlab.json b/data/as/30063240/ws-services-calculation/WCBillingSlab.json
index 83866cb057..cc277be694 100644
--- a/data/as/30063240/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063240/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063285/ws-services-calculation/WCBillingSlab.json b/data/as/30063285/ws-services-calculation/WCBillingSlab.json
index a516c9f369..5aeb2a36e2 100644
--- a/data/as/30063285/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063285/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063294/ws-services-calculation/WCBillingSlab.json b/data/as/30063294/ws-services-calculation/WCBillingSlab.json
index 99e075f20d..d81d61291e 100644
--- a/data/as/30063294/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063294/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063300/ws-services-calculation/WCBillingSlab.json b/data/as/30063300/ws-services-calculation/WCBillingSlab.json
index 4abee414fb..6e40a04231 100644
--- a/data/as/30063300/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063300/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30063426/ws-services-calculation/WCBillingSlab.json b/data/as/30063426/ws-services-calculation/WCBillingSlab.json
index 63a837491b..78efcc9513 100644
--- a/data/as/30063426/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30063426/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064069/ws-services-calculation/WCBillingSlab.json b/data/as/30064069/ws-services-calculation/WCBillingSlab.json
index 569cfc69b8..f2414d33b1 100644
--- a/data/as/30064069/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064069/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064490/ws-services-calculation/WCBillingSlab.json b/data/as/30064490/ws-services-calculation/WCBillingSlab.json
index 04addc7663..6fa2d0ff05 100644
--- a/data/as/30064490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064490/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064646/ws-services-calculation/WCBillingSlab.json b/data/as/30064646/ws-services-calculation/WCBillingSlab.json
index 5279d2f0da..cd0163ca09 100644
--- a/data/as/30064646/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064646/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30064830/ws-services-calculation/WCBillingSlab.json b/data/as/30064830/ws-services-calculation/WCBillingSlab.json
index bf2478168c..f86aed5af8 100644
--- a/data/as/30064830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30064830/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065052/ws-services-calculation/WCBillingSlab.json b/data/as/30065052/ws-services-calculation/WCBillingSlab.json
index 99d11997ee..8983fcf7ed 100644
--- a/data/as/30065052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065052/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065285/ws-services-calculation/WCBillingSlab.json b/data/as/30065285/ws-services-calculation/WCBillingSlab.json
index bff45f0c2c..2a44545ab6 100644
--- a/data/as/30065285/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065285/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065673/ws-services-calculation/WCBillingSlab.json b/data/as/30065673/ws-services-calculation/WCBillingSlab.json
index 4572637fc3..8dff5eb9a7 100644
--- a/data/as/30065673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065681/ws-services-calculation/WCBillingSlab.json b/data/as/30065681/ws-services-calculation/WCBillingSlab.json
index dc60435055..3bbf156d08 100644
--- a/data/as/30065681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065681/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065865/ws-services-calculation/WCBillingSlab.json b/data/as/30065865/ws-services-calculation/WCBillingSlab.json
index 6ff774201c..f85a1b2765 100644
--- a/data/as/30065865/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065865/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30065876/ws-services-calculation/WCBillingSlab.json b/data/as/30065876/ws-services-calculation/WCBillingSlab.json
index 601c7d74d4..e87d23062d 100644
--- a/data/as/30065876/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30065876/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066198/ws-services-calculation/WCBillingSlab.json b/data/as/30066198/ws-services-calculation/WCBillingSlab.json
index 61a25847d2..284437c043 100644
--- a/data/as/30066198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066198/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066211/ws-services-calculation/WCBillingSlab.json b/data/as/30066211/ws-services-calculation/WCBillingSlab.json
index ef7590608f..f54d592057 100644
--- a/data/as/30066211/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066211/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066318/ws-services-calculation/WCBillingSlab.json b/data/as/30066318/ws-services-calculation/WCBillingSlab.json
index e18df652d1..622be97f1b 100644
--- a/data/as/30066318/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066318/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30066345/ws-services-calculation/WCBillingSlab.json b/data/as/30066345/ws-services-calculation/WCBillingSlab.json
index 25fcdee0b1..b069249f2a 100644
--- a/data/as/30066345/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30066345/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067036/ws-services-calculation/WCBillingSlab.json b/data/as/30067036/ws-services-calculation/WCBillingSlab.json
index 70e61952e0..886920905d 100644
--- a/data/as/30067036/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067036/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067040/ws-services-calculation/WCBillingSlab.json b/data/as/30067040/ws-services-calculation/WCBillingSlab.json
index c501c19657..0c85e71224 100644
--- a/data/as/30067040/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067040/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067065/ws-services-calculation/WCBillingSlab.json b/data/as/30067065/ws-services-calculation/WCBillingSlab.json
index 0143f1dad5..99775ffb8a 100644
--- a/data/as/30067065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067065/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067067/ws-services-calculation/WCBillingSlab.json b/data/as/30067067/ws-services-calculation/WCBillingSlab.json
index bbf65da9af..1ae9524bdb 100644
--- a/data/as/30067067/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067067/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067084/ws-services-calculation/WCBillingSlab.json b/data/as/30067084/ws-services-calculation/WCBillingSlab.json
index 13eb618ae3..7e2b6f5777 100644
--- a/data/as/30067084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067086/ws-services-calculation/WCBillingSlab.json b/data/as/30067086/ws-services-calculation/WCBillingSlab.json
index fcba5be324..6fc317d505 100644
--- a/data/as/30067086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067086/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067101/ws-services-calculation/WCBillingSlab.json b/data/as/30067101/ws-services-calculation/WCBillingSlab.json
index 1e585d388b..8ae44720d5 100644
--- a/data/as/30067101/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067101/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067113/ws-services-calculation/WCBillingSlab.json b/data/as/30067113/ws-services-calculation/WCBillingSlab.json
index a8c7562e14..55012aa952 100644
--- a/data/as/30067113/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067113/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067122/ws-services-calculation/WCBillingSlab.json b/data/as/30067122/ws-services-calculation/WCBillingSlab.json
index d6637b0daf..0f61a2838c 100644
--- a/data/as/30067122/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067122/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067179/ws-services-calculation/WCBillingSlab.json b/data/as/30067179/ws-services-calculation/WCBillingSlab.json
index 282954da46..9bde9ecfae 100644
--- a/data/as/30067179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067179/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067304/ws-services-calculation/WCBillingSlab.json b/data/as/30067304/ws-services-calculation/WCBillingSlab.json
index 1a4505dcec..d6fef3e1a4 100644
--- a/data/as/30067304/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067304/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067307/ws-services-calculation/WCBillingSlab.json b/data/as/30067307/ws-services-calculation/WCBillingSlab.json
index c50dbec57d..98b8de5769 100644
--- a/data/as/30067307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067307/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067308/ws-services-calculation/WCBillingSlab.json b/data/as/30067308/ws-services-calculation/WCBillingSlab.json
index 87b8203750..e21d9f7aea 100644
--- a/data/as/30067308/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067308/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067407/ws-services-calculation/WCBillingSlab.json b/data/as/30067407/ws-services-calculation/WCBillingSlab.json
index d94deee530..8bb87320b7 100644
--- a/data/as/30067407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067407/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067418/ws-services-calculation/WCBillingSlab.json b/data/as/30067418/ws-services-calculation/WCBillingSlab.json
index 5a67770328..d8e493546c 100644
--- a/data/as/30067418/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067418/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067441/ws-services-calculation/WCBillingSlab.json b/data/as/30067441/ws-services-calculation/WCBillingSlab.json
index 0ac9ed1c0e..f87dbbb34f 100644
--- a/data/as/30067441/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067441/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067449/ws-services-calculation/WCBillingSlab.json b/data/as/30067449/ws-services-calculation/WCBillingSlab.json
index 2814008762..9ca3634fba 100644
--- a/data/as/30067449/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067449/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067468/ws-services-calculation/WCBillingSlab.json b/data/as/30067468/ws-services-calculation/WCBillingSlab.json
index 15cd9634ae..412364bec8 100644
--- a/data/as/30067468/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067468/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067475/ws-services-calculation/WCBillingSlab.json b/data/as/30067475/ws-services-calculation/WCBillingSlab.json
index 501317a8bc..93d1bf797a 100644
--- a/data/as/30067475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067475/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067509/ws-services-calculation/WCBillingSlab.json b/data/as/30067509/ws-services-calculation/WCBillingSlab.json
index 8c4137353b..e314263fa7 100644
--- a/data/as/30067509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067509/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067518/ws-services-calculation/WCBillingSlab.json b/data/as/30067518/ws-services-calculation/WCBillingSlab.json
index de6690a92b..1ae372b9c6 100644
--- a/data/as/30067518/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067518/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067536/ws-services-calculation/WCBillingSlab.json b/data/as/30067536/ws-services-calculation/WCBillingSlab.json
index f1cc11e249..6bc603a6af 100644
--- a/data/as/30067536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067536/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067611/ws-services-calculation/WCBillingSlab.json b/data/as/30067611/ws-services-calculation/WCBillingSlab.json
index 8932b1c85b..2fe290ee29 100644
--- a/data/as/30067611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067611/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067623/ws-services-calculation/WCBillingSlab.json b/data/as/30067623/ws-services-calculation/WCBillingSlab.json
index 311755b30b..a3e209c9c0 100644
--- a/data/as/30067623/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067623/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067699/ws-services-calculation/WCBillingSlab.json b/data/as/30067699/ws-services-calculation/WCBillingSlab.json
index 49ae05495d..ecf5606831 100644
--- a/data/as/30067699/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067699/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067707/ws-services-calculation/WCBillingSlab.json b/data/as/30067707/ws-services-calculation/WCBillingSlab.json
index c627f710d3..98c82b001f 100644
--- a/data/as/30067707/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067707/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067709/ws-services-calculation/WCBillingSlab.json b/data/as/30067709/ws-services-calculation/WCBillingSlab.json
index 2bc8e00057..41eec4c700 100644
--- a/data/as/30067709/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067709/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067714/ws-services-calculation/WCBillingSlab.json b/data/as/30067714/ws-services-calculation/WCBillingSlab.json
index f585905180..ddf14d2b0d 100644
--- a/data/as/30067714/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067714/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067748/ws-services-calculation/WCBillingSlab.json b/data/as/30067748/ws-services-calculation/WCBillingSlab.json
index 311583deae..a8f0ae1b6d 100644
--- a/data/as/30067748/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067748/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067790/ws-services-calculation/WCBillingSlab.json b/data/as/30067790/ws-services-calculation/WCBillingSlab.json
index 4cbbee1ef2..59af1b244c 100644
--- a/data/as/30067790/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067790/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067803/ws-services-calculation/WCBillingSlab.json b/data/as/30067803/ws-services-calculation/WCBillingSlab.json
index 949f11c87a..e7939e3acf 100644
--- a/data/as/30067803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067803/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067829/ws-services-calculation/WCBillingSlab.json b/data/as/30067829/ws-services-calculation/WCBillingSlab.json
index c56bbede10..da83c2a577 100644
--- a/data/as/30067829/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067829/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067830/ws-services-calculation/WCBillingSlab.json b/data/as/30067830/ws-services-calculation/WCBillingSlab.json
index 0374f61697..2020b4f13d 100644
--- a/data/as/30067830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067830/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067861/ws-services-calculation/WCBillingSlab.json b/data/as/30067861/ws-services-calculation/WCBillingSlab.json
index 7fc58fda13..b94427c187 100644
--- a/data/as/30067861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067861/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067915/ws-services-calculation/WCBillingSlab.json b/data/as/30067915/ws-services-calculation/WCBillingSlab.json
index c5489fafc8..506709f4ea 100644
--- a/data/as/30067915/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067915/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067928/ws-services-calculation/WCBillingSlab.json b/data/as/30067928/ws-services-calculation/WCBillingSlab.json
index 627d9c9a8b..acb6f1fb0f 100644
--- a/data/as/30067928/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067928/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067938/ws-services-calculation/WCBillingSlab.json b/data/as/30067938/ws-services-calculation/WCBillingSlab.json
index 68abf6934a..46c876d367 100644
--- a/data/as/30067938/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067938/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067942/ws-services-calculation/WCBillingSlab.json b/data/as/30067942/ws-services-calculation/WCBillingSlab.json
index 603b832f01..c552ee2da4 100644
--- a/data/as/30067942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067942/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067950/ws-services-calculation/WCBillingSlab.json b/data/as/30067950/ws-services-calculation/WCBillingSlab.json
index 3fc0dc15b5..94639894dc 100644
--- a/data/as/30067950/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067950/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067958/ws-services-calculation/WCBillingSlab.json b/data/as/30067958/ws-services-calculation/WCBillingSlab.json
index 53c74ccd2b..590ff73be6 100644
--- a/data/as/30067958/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067958/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067962/ws-services-calculation/WCBillingSlab.json b/data/as/30067962/ws-services-calculation/WCBillingSlab.json
index 30c2cf6de2..d447a7c829 100644
--- a/data/as/30067962/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067962/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067985/ws-services-calculation/WCBillingSlab.json b/data/as/30067985/ws-services-calculation/WCBillingSlab.json
index cb6e997a84..02da538508 100644
--- a/data/as/30067985/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067985/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30067989/ws-services-calculation/WCBillingSlab.json b/data/as/30067989/ws-services-calculation/WCBillingSlab.json
index 090dd91f68..7c56455db7 100644
--- a/data/as/30067989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30067989/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068077/ws-services-calculation/WCBillingSlab.json b/data/as/30068077/ws-services-calculation/WCBillingSlab.json
index 16001cc7f4..33c407c20a 100644
--- a/data/as/30068077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068077/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068088/ws-services-calculation/WCBillingSlab.json b/data/as/30068088/ws-services-calculation/WCBillingSlab.json
index 8964cffaf3..4b55b5d017 100644
--- a/data/as/30068088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068088/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068096/ws-services-calculation/WCBillingSlab.json b/data/as/30068096/ws-services-calculation/WCBillingSlab.json
index d60fe1059c..321f56ce23 100644
--- a/data/as/30068096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068096/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068187/ws-services-calculation/WCBillingSlab.json b/data/as/30068187/ws-services-calculation/WCBillingSlab.json
index b8ec69f053..b45c29d927 100644
--- a/data/as/30068187/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068187/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068194/ws-services-calculation/WCBillingSlab.json b/data/as/30068194/ws-services-calculation/WCBillingSlab.json
index 818d356db5..00276fe39b 100644
--- a/data/as/30068194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068194/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068198/ws-services-calculation/WCBillingSlab.json b/data/as/30068198/ws-services-calculation/WCBillingSlab.json
index 533c13199a..255a14b8f2 100644
--- a/data/as/30068198/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068198/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068210/ws-services-calculation/WCBillingSlab.json b/data/as/30068210/ws-services-calculation/WCBillingSlab.json
index de83a5573a..c612897372 100644
--- a/data/as/30068210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068210/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068218/ws-services-calculation/WCBillingSlab.json b/data/as/30068218/ws-services-calculation/WCBillingSlab.json
index 3a484633b5..479e5742e3 100644
--- a/data/as/30068218/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068218/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068225/ws-services-calculation/WCBillingSlab.json b/data/as/30068225/ws-services-calculation/WCBillingSlab.json
index a0e614bcac..19359fa74b 100644
--- a/data/as/30068225/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068225/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068229/ws-services-calculation/WCBillingSlab.json b/data/as/30068229/ws-services-calculation/WCBillingSlab.json
index 3fe2f354de..19d29b4b00 100644
--- a/data/as/30068229/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068229/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068331/ws-services-calculation/WCBillingSlab.json b/data/as/30068331/ws-services-calculation/WCBillingSlab.json
index 229ed6273f..69ae79dfb3 100644
--- a/data/as/30068331/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068331/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068340/ws-services-calculation/WCBillingSlab.json b/data/as/30068340/ws-services-calculation/WCBillingSlab.json
index 398a9143b1..17d342a4f8 100644
--- a/data/as/30068340/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068340/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068345/ws-services-calculation/WCBillingSlab.json b/data/as/30068345/ws-services-calculation/WCBillingSlab.json
index 1b2fe8a8ce..f625e8f101 100644
--- a/data/as/30068345/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068345/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068356/ws-services-calculation/WCBillingSlab.json b/data/as/30068356/ws-services-calculation/WCBillingSlab.json
index d85fe1b32c..cf4a9baef7 100644
--- a/data/as/30068356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068356/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068380/ws-services-calculation/WCBillingSlab.json b/data/as/30068380/ws-services-calculation/WCBillingSlab.json
index 4e593d8db2..8d39b0539f 100644
--- a/data/as/30068380/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068380/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068419/ws-services-calculation/WCBillingSlab.json b/data/as/30068419/ws-services-calculation/WCBillingSlab.json
index b4b08eb28f..c303e42602 100644
--- a/data/as/30068419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068422/ws-services-calculation/WCBillingSlab.json b/data/as/30068422/ws-services-calculation/WCBillingSlab.json
index ad57a53e64..4d91363d4e 100644
--- a/data/as/30068422/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068422/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068427/ws-services-calculation/WCBillingSlab.json b/data/as/30068427/ws-services-calculation/WCBillingSlab.json
index c5a17751dd..f717de0bfd 100644
--- a/data/as/30068427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068427/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068428/ws-services-calculation/WCBillingSlab.json b/data/as/30068428/ws-services-calculation/WCBillingSlab.json
index 13d422b4ab..9d3b3b67fe 100644
--- a/data/as/30068428/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068428/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068533/ws-services-calculation/WCBillingSlab.json b/data/as/30068533/ws-services-calculation/WCBillingSlab.json
index 02d0c5adbe..c285ce73ac 100644
--- a/data/as/30068533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068606/ws-services-calculation/WCBillingSlab.json b/data/as/30068606/ws-services-calculation/WCBillingSlab.json
index 73d0abcd3a..6eedc4ea69 100644
--- a/data/as/30068606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068606/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068609/ws-services-calculation/WCBillingSlab.json b/data/as/30068609/ws-services-calculation/WCBillingSlab.json
index f12dc83521..7c95f4ae0a 100644
--- a/data/as/30068609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068609/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068614/ws-services-calculation/WCBillingSlab.json b/data/as/30068614/ws-services-calculation/WCBillingSlab.json
index 0070bde52c..b1497a5c62 100644
--- a/data/as/30068614/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068614/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068620/ws-services-calculation/WCBillingSlab.json b/data/as/30068620/ws-services-calculation/WCBillingSlab.json
index ad1f957c04..b43230d9c6 100644
--- a/data/as/30068620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068620/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068648/ws-services-calculation/WCBillingSlab.json b/data/as/30068648/ws-services-calculation/WCBillingSlab.json
index a031a32cd1..eefe16d92d 100644
--- a/data/as/30068648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068648/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068650/ws-services-calculation/WCBillingSlab.json b/data/as/30068650/ws-services-calculation/WCBillingSlab.json
index 220428157b..4433c9921f 100644
--- a/data/as/30068650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068650/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068669/ws-services-calculation/WCBillingSlab.json b/data/as/30068669/ws-services-calculation/WCBillingSlab.json
index 0f2f4508bd..18174e9a62 100644
--- a/data/as/30068669/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068669/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30068672/ws-services-calculation/WCBillingSlab.json b/data/as/30068672/ws-services-calculation/WCBillingSlab.json
index 559678e41d..2b17b657ab 100644
--- a/data/as/30068672/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30068672/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069086/ws-services-calculation/WCBillingSlab.json b/data/as/30069086/ws-services-calculation/WCBillingSlab.json
index 2b15d398a7..9eec92d532 100644
--- a/data/as/30069086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069086/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069093/ws-services-calculation/WCBillingSlab.json b/data/as/30069093/ws-services-calculation/WCBillingSlab.json
index 43baef9069..5950629ff2 100644
--- a/data/as/30069093/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069093/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069124/ws-services-calculation/WCBillingSlab.json b/data/as/30069124/ws-services-calculation/WCBillingSlab.json
index 2508eeae66..b003264b10 100644
--- a/data/as/30069124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069136/ws-services-calculation/WCBillingSlab.json b/data/as/30069136/ws-services-calculation/WCBillingSlab.json
index 8bcaa8b1e4..0f2afc62bf 100644
--- a/data/as/30069136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069136/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069142/ws-services-calculation/WCBillingSlab.json b/data/as/30069142/ws-services-calculation/WCBillingSlab.json
index 1fe3464562..c15239192b 100644
--- a/data/as/30069142/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069142/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069148/ws-services-calculation/WCBillingSlab.json b/data/as/30069148/ws-services-calculation/WCBillingSlab.json
index 4f1775aa59..aae359eef7 100644
--- a/data/as/30069148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069148/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069157/ws-services-calculation/WCBillingSlab.json b/data/as/30069157/ws-services-calculation/WCBillingSlab.json
index 83831cf7ad..d8127fcda7 100644
--- a/data/as/30069157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069157/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069165/ws-services-calculation/WCBillingSlab.json b/data/as/30069165/ws-services-calculation/WCBillingSlab.json
index ff0045151b..95ebacd510 100644
--- a/data/as/30069165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069165/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069183/ws-services-calculation/WCBillingSlab.json b/data/as/30069183/ws-services-calculation/WCBillingSlab.json
index 5a7267bd67..e997dac37a 100644
--- a/data/as/30069183/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069183/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069223/ws-services-calculation/WCBillingSlab.json b/data/as/30069223/ws-services-calculation/WCBillingSlab.json
index b0458b83ac..82031dd2a0 100644
--- a/data/as/30069223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069230/ws-services-calculation/WCBillingSlab.json b/data/as/30069230/ws-services-calculation/WCBillingSlab.json
index 4cde8f0311..0da2e12adc 100644
--- a/data/as/30069230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069230/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069261/ws-services-calculation/WCBillingSlab.json b/data/as/30069261/ws-services-calculation/WCBillingSlab.json
index d3189d0bee..e4fdfb4d4a 100644
--- a/data/as/30069261/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069261/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069267/ws-services-calculation/WCBillingSlab.json b/data/as/30069267/ws-services-calculation/WCBillingSlab.json
index f1b8bcb1d0..6997cc6781 100644
--- a/data/as/30069267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069267/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069282/ws-services-calculation/WCBillingSlab.json b/data/as/30069282/ws-services-calculation/WCBillingSlab.json
index 5f334839da..c9751b65af 100644
--- a/data/as/30069282/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069282/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069283/ws-services-calculation/WCBillingSlab.json b/data/as/30069283/ws-services-calculation/WCBillingSlab.json
index f4f67c0233..5701173331 100644
--- a/data/as/30069283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069283/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069284/ws-services-calculation/WCBillingSlab.json b/data/as/30069284/ws-services-calculation/WCBillingSlab.json
index 0a27a1505f..4302adcaae 100644
--- a/data/as/30069284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069284/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069296/ws-services-calculation/WCBillingSlab.json b/data/as/30069296/ws-services-calculation/WCBillingSlab.json
index 71a259fb7d..38743e863c 100644
--- a/data/as/30069296/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069296/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069733/ws-services-calculation/WCBillingSlab.json b/data/as/30069733/ws-services-calculation/WCBillingSlab.json
index f3584593a7..0e1b4c5fe3 100644
--- a/data/as/30069733/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069733/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069738/ws-services-calculation/WCBillingSlab.json b/data/as/30069738/ws-services-calculation/WCBillingSlab.json
index 5c7e78643f..b29b617f32 100644
--- a/data/as/30069738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069738/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069742/ws-services-calculation/WCBillingSlab.json b/data/as/30069742/ws-services-calculation/WCBillingSlab.json
index aceaf38c92..35dccbea30 100644
--- a/data/as/30069742/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069742/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30069820/ws-services-calculation/WCBillingSlab.json b/data/as/30069820/ws-services-calculation/WCBillingSlab.json
index 86825f738f..7a9b87c16c 100644
--- a/data/as/30069820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30069820/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070165/ws-services-calculation/WCBillingSlab.json b/data/as/30070165/ws-services-calculation/WCBillingSlab.json
index 50f4a1de3f..7c69d583ed 100644
--- a/data/as/30070165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070165/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070166/ws-services-calculation/WCBillingSlab.json b/data/as/30070166/ws-services-calculation/WCBillingSlab.json
index 16e27b6889..08824d474e 100644
--- a/data/as/30070166/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070166/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070207/ws-services-calculation/WCBillingSlab.json b/data/as/30070207/ws-services-calculation/WCBillingSlab.json
index 2349ceca60..1e0081efde 100644
--- a/data/as/30070207/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070207/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070230/ws-services-calculation/WCBillingSlab.json b/data/as/30070230/ws-services-calculation/WCBillingSlab.json
index 906ce2f099..22b003b539 100644
--- a/data/as/30070230/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070230/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070236/ws-services-calculation/WCBillingSlab.json b/data/as/30070236/ws-services-calculation/WCBillingSlab.json
index ba983d05ab..adb44bf073 100644
--- a/data/as/30070236/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070236/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070239/ws-services-calculation/WCBillingSlab.json b/data/as/30070239/ws-services-calculation/WCBillingSlab.json
index cbaa854d7e..e7d45f0150 100644
--- a/data/as/30070239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070239/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070243/ws-services-calculation/WCBillingSlab.json b/data/as/30070243/ws-services-calculation/WCBillingSlab.json
index 67b1bf12f0..c1b85535a2 100644
--- a/data/as/30070243/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070243/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070267/ws-services-calculation/WCBillingSlab.json b/data/as/30070267/ws-services-calculation/WCBillingSlab.json
index c6d49975cc..ccd86e2ba5 100644
--- a/data/as/30070267/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070267/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070269/ws-services-calculation/WCBillingSlab.json b/data/as/30070269/ws-services-calculation/WCBillingSlab.json
index 7bc19a3535..057f573ea1 100644
--- a/data/as/30070269/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070269/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070276/ws-services-calculation/WCBillingSlab.json b/data/as/30070276/ws-services-calculation/WCBillingSlab.json
index a1f61bcc28..64fb02da62 100644
--- a/data/as/30070276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070276/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070288/ws-services-calculation/WCBillingSlab.json b/data/as/30070288/ws-services-calculation/WCBillingSlab.json
index 9f3f478b0d..90281de574 100644
--- a/data/as/30070288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070288/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070302/ws-services-calculation/WCBillingSlab.json b/data/as/30070302/ws-services-calculation/WCBillingSlab.json
index 46b2bea2ae..e1d4f38566 100644
--- a/data/as/30070302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070302/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070309/ws-services-calculation/WCBillingSlab.json b/data/as/30070309/ws-services-calculation/WCBillingSlab.json
index 086d96f326..1f11509917 100644
--- a/data/as/30070309/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070309/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070314/ws-services-calculation/WCBillingSlab.json b/data/as/30070314/ws-services-calculation/WCBillingSlab.json
index c7891dce72..75795a6196 100644
--- a/data/as/30070314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070314/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070342/ws-services-calculation/WCBillingSlab.json b/data/as/30070342/ws-services-calculation/WCBillingSlab.json
index ca79d62d5f..eacc3b5dd5 100644
--- a/data/as/30070342/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070342/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070344/ws-services-calculation/WCBillingSlab.json b/data/as/30070344/ws-services-calculation/WCBillingSlab.json
index 9a628375c0..34d0c0eab3 100644
--- a/data/as/30070344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070344/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070346/ws-services-calculation/WCBillingSlab.json b/data/as/30070346/ws-services-calculation/WCBillingSlab.json
index 72a2b39ae5..c6e1fe8705 100644
--- a/data/as/30070346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070346/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070350/ws-services-calculation/WCBillingSlab.json b/data/as/30070350/ws-services-calculation/WCBillingSlab.json
index 2fc3e16dc5..a30c8087fa 100644
--- a/data/as/30070350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070357/ws-services-calculation/WCBillingSlab.json b/data/as/30070357/ws-services-calculation/WCBillingSlab.json
index b2f80b1484..290fd3b254 100644
--- a/data/as/30070357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070357/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070365/ws-services-calculation/WCBillingSlab.json b/data/as/30070365/ws-services-calculation/WCBillingSlab.json
index 1b96be6057..f7dfbe31f4 100644
--- a/data/as/30070365/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070365/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070375/ws-services-calculation/WCBillingSlab.json b/data/as/30070375/ws-services-calculation/WCBillingSlab.json
index 1b750b0158..2869d7a32c 100644
--- a/data/as/30070375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070375/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070386/ws-services-calculation/WCBillingSlab.json b/data/as/30070386/ws-services-calculation/WCBillingSlab.json
index 9954a6af46..105a301f43 100644
--- a/data/as/30070386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070386/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070406/ws-services-calculation/WCBillingSlab.json b/data/as/30070406/ws-services-calculation/WCBillingSlab.json
index da838a5558..606bca4637 100644
--- a/data/as/30070406/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070406/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070419/ws-services-calculation/WCBillingSlab.json b/data/as/30070419/ws-services-calculation/WCBillingSlab.json
index 6707045cc3..5bd303d2c7 100644
--- a/data/as/30070419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070464/ws-services-calculation/WCBillingSlab.json b/data/as/30070464/ws-services-calculation/WCBillingSlab.json
index 8337963b6c..7b444e99b0 100644
--- a/data/as/30070464/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070464/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070470/ws-services-calculation/WCBillingSlab.json b/data/as/30070470/ws-services-calculation/WCBillingSlab.json
index 7f7be93fbb..35d3a180b9 100644
--- a/data/as/30070470/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070470/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070477/ws-services-calculation/WCBillingSlab.json b/data/as/30070477/ws-services-calculation/WCBillingSlab.json
index 5f241f4576..b674dc8b75 100644
--- a/data/as/30070477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070477/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070483/ws-services-calculation/WCBillingSlab.json b/data/as/30070483/ws-services-calculation/WCBillingSlab.json
index 082e67f92c..9619e70450 100644
--- a/data/as/30070483/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070483/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070590/ws-services-calculation/WCBillingSlab.json b/data/as/30070590/ws-services-calculation/WCBillingSlab.json
index 875017e021..911fd2bfde 100644
--- a/data/as/30070590/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070590/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070600/ws-services-calculation/WCBillingSlab.json b/data/as/30070600/ws-services-calculation/WCBillingSlab.json
index ba77281642..97c734a18d 100644
--- a/data/as/30070600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070600/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070606/ws-services-calculation/WCBillingSlab.json b/data/as/30070606/ws-services-calculation/WCBillingSlab.json
index d54e301941..49d84e79f2 100644
--- a/data/as/30070606/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070606/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070609/ws-services-calculation/WCBillingSlab.json b/data/as/30070609/ws-services-calculation/WCBillingSlab.json
index f64402210d..015e4a6232 100644
--- a/data/as/30070609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070609/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070611/ws-services-calculation/WCBillingSlab.json b/data/as/30070611/ws-services-calculation/WCBillingSlab.json
index f1b4e93a7e..f8675e8221 100644
--- a/data/as/30070611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070611/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070613/ws-services-calculation/WCBillingSlab.json b/data/as/30070613/ws-services-calculation/WCBillingSlab.json
index 81d1a3f4f7..8d9bbca931 100644
--- a/data/as/30070613/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070613/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070620/ws-services-calculation/WCBillingSlab.json b/data/as/30070620/ws-services-calculation/WCBillingSlab.json
index fbbe125c82..01d9907e59 100644
--- a/data/as/30070620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070620/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30070802/ws-services-calculation/WCBillingSlab.json b/data/as/30070802/ws-services-calculation/WCBillingSlab.json
index 71191b58c2..5280ad9506 100644
--- a/data/as/30070802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30070802/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071063/ws-services-calculation/WCBillingSlab.json b/data/as/30071063/ws-services-calculation/WCBillingSlab.json
index 808d900a29..fd9aa0f1e9 100644
--- a/data/as/30071063/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071063/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071098/ws-services-calculation/WCBillingSlab.json b/data/as/30071098/ws-services-calculation/WCBillingSlab.json
index 6adbc770e0..f6138d5376 100644
--- a/data/as/30071098/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071098/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071129/ws-services-calculation/WCBillingSlab.json b/data/as/30071129/ws-services-calculation/WCBillingSlab.json
index cbe2a39700..88bb0ff0ae 100644
--- a/data/as/30071129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071129/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071139/ws-services-calculation/WCBillingSlab.json b/data/as/30071139/ws-services-calculation/WCBillingSlab.json
index 8658089c54..4c3793bc79 100644
--- a/data/as/30071139/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071139/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071148/ws-services-calculation/WCBillingSlab.json b/data/as/30071148/ws-services-calculation/WCBillingSlab.json
index 6ea0ac309c..e0e8554538 100644
--- a/data/as/30071148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071148/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071202/ws-services-calculation/WCBillingSlab.json b/data/as/30071202/ws-services-calculation/WCBillingSlab.json
index 9e92a32b88..6145831343 100644
--- a/data/as/30071202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071202/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071208/ws-services-calculation/WCBillingSlab.json b/data/as/30071208/ws-services-calculation/WCBillingSlab.json
index f0c1ab34f6..c9b066758a 100644
--- a/data/as/30071208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071569/ws-services-calculation/WCBillingSlab.json b/data/as/30071569/ws-services-calculation/WCBillingSlab.json
index bed54106ad..5faf47ccf2 100644
--- a/data/as/30071569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071569/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071579/ws-services-calculation/WCBillingSlab.json b/data/as/30071579/ws-services-calculation/WCBillingSlab.json
index 70199f3510..7d0bfdb921 100644
--- a/data/as/30071579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071579/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071722/ws-services-calculation/WCBillingSlab.json b/data/as/30071722/ws-services-calculation/WCBillingSlab.json
index 0b7833ed42..2eca9064e9 100644
--- a/data/as/30071722/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071722/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071743/ws-services-calculation/WCBillingSlab.json b/data/as/30071743/ws-services-calculation/WCBillingSlab.json
index 29694eeb26..40cd0783fc 100644
--- a/data/as/30071743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071743/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071758/ws-services-calculation/WCBillingSlab.json b/data/as/30071758/ws-services-calculation/WCBillingSlab.json
index e317488c29..c06e0947bf 100644
--- a/data/as/30071758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071758/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071787/ws-services-calculation/WCBillingSlab.json b/data/as/30071787/ws-services-calculation/WCBillingSlab.json
index 7f1ba23ba8..732bbbed6f 100644
--- a/data/as/30071787/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071787/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071801/ws-services-calculation/WCBillingSlab.json b/data/as/30071801/ws-services-calculation/WCBillingSlab.json
index 503a3d3ed9..f6a685a654 100644
--- a/data/as/30071801/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071801/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071806/ws-services-calculation/WCBillingSlab.json b/data/as/30071806/ws-services-calculation/WCBillingSlab.json
index 9ce0f2cc17..058139f2b7 100644
--- a/data/as/30071806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071806/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071827/ws-services-calculation/WCBillingSlab.json b/data/as/30071827/ws-services-calculation/WCBillingSlab.json
index 652a1d0db3..9968fcbb91 100644
--- a/data/as/30071827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071827/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071830/ws-services-calculation/WCBillingSlab.json b/data/as/30071830/ws-services-calculation/WCBillingSlab.json
index d04ac99286..884c0e2b6f 100644
--- a/data/as/30071830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071830/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30071861/ws-services-calculation/WCBillingSlab.json b/data/as/30071861/ws-services-calculation/WCBillingSlab.json
index 574e28437f..4559699a2a 100644
--- a/data/as/30071861/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30071861/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072127/ws-services-calculation/WCBillingSlab.json b/data/as/30072127/ws-services-calculation/WCBillingSlab.json
index 4d350d2a66..4087c587e4 100644
--- a/data/as/30072127/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072127/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072402/ws-services-calculation/WCBillingSlab.json b/data/as/30072402/ws-services-calculation/WCBillingSlab.json
index 113105f9bd..7d75779685 100644
--- a/data/as/30072402/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072402/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072569/ws-services-calculation/WCBillingSlab.json b/data/as/30072569/ws-services-calculation/WCBillingSlab.json
index 53d8747dac..72a4467c40 100644
--- a/data/as/30072569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072569/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072574/ws-services-calculation/WCBillingSlab.json b/data/as/30072574/ws-services-calculation/WCBillingSlab.json
index d96c0dba3c..377efe1b8b 100644
--- a/data/as/30072574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072574/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072592/ws-services-calculation/WCBillingSlab.json b/data/as/30072592/ws-services-calculation/WCBillingSlab.json
index 5cfca1e12b..5adf71a85c 100644
--- a/data/as/30072592/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072592/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072599/ws-services-calculation/WCBillingSlab.json b/data/as/30072599/ws-services-calculation/WCBillingSlab.json
index 26ba924553..759d28a568 100644
--- a/data/as/30072599/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072599/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072650/ws-services-calculation/WCBillingSlab.json b/data/as/30072650/ws-services-calculation/WCBillingSlab.json
index e6534db857..abe8056822 100644
--- a/data/as/30072650/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072650/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072651/ws-services-calculation/WCBillingSlab.json b/data/as/30072651/ws-services-calculation/WCBillingSlab.json
index 5fa5f3c71c..4f523524b5 100644
--- a/data/as/30072651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072651/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072655/ws-services-calculation/WCBillingSlab.json b/data/as/30072655/ws-services-calculation/WCBillingSlab.json
index 298869777e..16c2cfa661 100644
--- a/data/as/30072655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072655/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072656/ws-services-calculation/WCBillingSlab.json b/data/as/30072656/ws-services-calculation/WCBillingSlab.json
index ee8ab51a5a..b25dbc1a82 100644
--- a/data/as/30072656/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072656/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072662/ws-services-calculation/WCBillingSlab.json b/data/as/30072662/ws-services-calculation/WCBillingSlab.json
index 7419f8c31d..f1314aa1d3 100644
--- a/data/as/30072662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072662/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072834/ws-services-calculation/WCBillingSlab.json b/data/as/30072834/ws-services-calculation/WCBillingSlab.json
index 1ff6a637db..636e61478d 100644
--- a/data/as/30072834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072834/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072841/ws-services-calculation/WCBillingSlab.json b/data/as/30072841/ws-services-calculation/WCBillingSlab.json
index 4cde7e4179..e8b21366ba 100644
--- a/data/as/30072841/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072841/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072843/ws-services-calculation/WCBillingSlab.json b/data/as/30072843/ws-services-calculation/WCBillingSlab.json
index e322ebe941..e2cfb79087 100644
--- a/data/as/30072843/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072843/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072845/ws-services-calculation/WCBillingSlab.json b/data/as/30072845/ws-services-calculation/WCBillingSlab.json
index 3bc4f5981d..a3357186d8 100644
--- a/data/as/30072845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072845/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072880/ws-services-calculation/WCBillingSlab.json b/data/as/30072880/ws-services-calculation/WCBillingSlab.json
index 8f83bda1cd..8b7e32c776 100644
--- a/data/as/30072880/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072880/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072900/ws-services-calculation/WCBillingSlab.json b/data/as/30072900/ws-services-calculation/WCBillingSlab.json
index 90c2f19f3a..69fd4cd99a 100644
--- a/data/as/30072900/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072900/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072901/ws-services-calculation/WCBillingSlab.json b/data/as/30072901/ws-services-calculation/WCBillingSlab.json
index e7f1c4ad49..8b2002dd61 100644
--- a/data/as/30072901/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072901/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30072996/ws-services-calculation/WCBillingSlab.json b/data/as/30072996/ws-services-calculation/WCBillingSlab.json
index e4e4de01db..bf4301154c 100644
--- a/data/as/30072996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30072996/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073350/ws-services-calculation/WCBillingSlab.json b/data/as/30073350/ws-services-calculation/WCBillingSlab.json
index 1f1f0fc8df..7eb1bd0071 100644
--- a/data/as/30073350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073352/ws-services-calculation/WCBillingSlab.json b/data/as/30073352/ws-services-calculation/WCBillingSlab.json
index cc00e73588..97d669280d 100644
--- a/data/as/30073352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073352/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073354/ws-services-calculation/WCBillingSlab.json b/data/as/30073354/ws-services-calculation/WCBillingSlab.json
index b23add32e9..c44835c343 100644
--- a/data/as/30073354/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073354/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073356/ws-services-calculation/WCBillingSlab.json b/data/as/30073356/ws-services-calculation/WCBillingSlab.json
index 7dd1e55d73..e0f917f71e 100644
--- a/data/as/30073356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073356/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073357/ws-services-calculation/WCBillingSlab.json b/data/as/30073357/ws-services-calculation/WCBillingSlab.json
index d075858246..ad32f6705c 100644
--- a/data/as/30073357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073357/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073473/ws-services-calculation/WCBillingSlab.json b/data/as/30073473/ws-services-calculation/WCBillingSlab.json
index a9bb79cfe8..113787e02e 100644
--- a/data/as/30073473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073473/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073477/ws-services-calculation/WCBillingSlab.json b/data/as/30073477/ws-services-calculation/WCBillingSlab.json
index 8d050119b8..59d4517ef8 100644
--- a/data/as/30073477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073477/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073481/ws-services-calculation/WCBillingSlab.json b/data/as/30073481/ws-services-calculation/WCBillingSlab.json
index 9b400a691a..625ade8843 100644
--- a/data/as/30073481/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073481/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073483/ws-services-calculation/WCBillingSlab.json b/data/as/30073483/ws-services-calculation/WCBillingSlab.json
index bce704cc95..f48ecd12e7 100644
--- a/data/as/30073483/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073483/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073485/ws-services-calculation/WCBillingSlab.json b/data/as/30073485/ws-services-calculation/WCBillingSlab.json
index 4928ebc21e..6c801b5e25 100644
--- a/data/as/30073485/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073485/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073492/ws-services-calculation/WCBillingSlab.json b/data/as/30073492/ws-services-calculation/WCBillingSlab.json
index c099734ede..4c8b1a495d 100644
--- a/data/as/30073492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073492/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30073521/ws-services-calculation/WCBillingSlab.json b/data/as/30073521/ws-services-calculation/WCBillingSlab.json
index 2cfe0a4b77..e34ba328a7 100644
--- a/data/as/30073521/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30073521/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074179/ws-services-calculation/WCBillingSlab.json b/data/as/30074179/ws-services-calculation/WCBillingSlab.json
index e4c5cc8460..bec92fb7fa 100644
--- a/data/as/30074179/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074179/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074189/ws-services-calculation/WCBillingSlab.json b/data/as/30074189/ws-services-calculation/WCBillingSlab.json
index e492773135..ee77a21dd7 100644
--- a/data/as/30074189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074189/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074675/ws-services-calculation/WCBillingSlab.json b/data/as/30074675/ws-services-calculation/WCBillingSlab.json
index b21b8c77dd..30acb9a152 100644
--- a/data/as/30074675/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074675/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074706/ws-services-calculation/WCBillingSlab.json b/data/as/30074706/ws-services-calculation/WCBillingSlab.json
index 12e4e81a38..430124dfe8 100644
--- a/data/as/30074706/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074706/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074732/ws-services-calculation/WCBillingSlab.json b/data/as/30074732/ws-services-calculation/WCBillingSlab.json
index 21b3c2a5cd..a4cee2b606 100644
--- a/data/as/30074732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074732/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074827/ws-services-calculation/WCBillingSlab.json b/data/as/30074827/ws-services-calculation/WCBillingSlab.json
index 760a511269..4617d3b3fc 100644
--- a/data/as/30074827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074827/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074916/ws-services-calculation/WCBillingSlab.json b/data/as/30074916/ws-services-calculation/WCBillingSlab.json
index 7857c23aa0..b65ae9cd08 100644
--- a/data/as/30074916/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074916/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074975/ws-services-calculation/WCBillingSlab.json b/data/as/30074975/ws-services-calculation/WCBillingSlab.json
index 4181dc4d91..e6eab0d152 100644
--- a/data/as/30074975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074975/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074989/ws-services-calculation/WCBillingSlab.json b/data/as/30074989/ws-services-calculation/WCBillingSlab.json
index 6d9b9e5fd2..f9fcf6d7e9 100644
--- a/data/as/30074989/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074989/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30074995/ws-services-calculation/WCBillingSlab.json b/data/as/30074995/ws-services-calculation/WCBillingSlab.json
index bfb079e779..20e584d386 100644
--- a/data/as/30074995/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30074995/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075002/ws-services-calculation/WCBillingSlab.json b/data/as/30075002/ws-services-calculation/WCBillingSlab.json
index ef85d909be..5b117f841d 100644
--- a/data/as/30075002/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075002/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075008/ws-services-calculation/WCBillingSlab.json b/data/as/30075008/ws-services-calculation/WCBillingSlab.json
index b44792a396..774f032c10 100644
--- a/data/as/30075008/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075008/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075655/ws-services-calculation/WCBillingSlab.json b/data/as/30075655/ws-services-calculation/WCBillingSlab.json
index 3173458b14..5457b00627 100644
--- a/data/as/30075655/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075655/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075682/ws-services-calculation/WCBillingSlab.json b/data/as/30075682/ws-services-calculation/WCBillingSlab.json
index a35c0bdd39..4307b3f1ed 100644
--- a/data/as/30075682/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075682/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075685/ws-services-calculation/WCBillingSlab.json b/data/as/30075685/ws-services-calculation/WCBillingSlab.json
index 5b392f4371..ce0c0ef797 100644
--- a/data/as/30075685/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075685/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075704/ws-services-calculation/WCBillingSlab.json b/data/as/30075704/ws-services-calculation/WCBillingSlab.json
index 7b3addf39d..4da5f95a28 100644
--- a/data/as/30075704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075708/ws-services-calculation/WCBillingSlab.json b/data/as/30075708/ws-services-calculation/WCBillingSlab.json
index 66ff333688..57bcf8bc81 100644
--- a/data/as/30075708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075708/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075836/ws-services-calculation/WCBillingSlab.json b/data/as/30075836/ws-services-calculation/WCBillingSlab.json
index 4e62a837e8..f9f76870e9 100644
--- a/data/as/30075836/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075836/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075842/ws-services-calculation/WCBillingSlab.json b/data/as/30075842/ws-services-calculation/WCBillingSlab.json
index 46e0ae273d..d0878d24eb 100644
--- a/data/as/30075842/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075842/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30075998/ws-services-calculation/WCBillingSlab.json b/data/as/30075998/ws-services-calculation/WCBillingSlab.json
index 3ed7fa8952..1fa2f0c641 100644
--- a/data/as/30075998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30075998/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076178/ws-services-calculation/WCBillingSlab.json b/data/as/30076178/ws-services-calculation/WCBillingSlab.json
index fe6758a5a7..11f002fff5 100644
--- a/data/as/30076178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076404/ws-services-calculation/WCBillingSlab.json b/data/as/30076404/ws-services-calculation/WCBillingSlab.json
index d98678de76..d052b4e253 100644
--- a/data/as/30076404/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076404/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076417/ws-services-calculation/WCBillingSlab.json b/data/as/30076417/ws-services-calculation/WCBillingSlab.json
index e720892979..18d76faf5a 100644
--- a/data/as/30076417/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076417/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076423/ws-services-calculation/WCBillingSlab.json b/data/as/30076423/ws-services-calculation/WCBillingSlab.json
index 903a8e0c9a..b09303c1ad 100644
--- a/data/as/30076423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076423/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076442/ws-services-calculation/WCBillingSlab.json b/data/as/30076442/ws-services-calculation/WCBillingSlab.json
index 9246a52c3a..ce529db17f 100644
--- a/data/as/30076442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076442/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076496/ws-services-calculation/WCBillingSlab.json b/data/as/30076496/ws-services-calculation/WCBillingSlab.json
index 6a6292f16e..f9b72b488a 100644
--- a/data/as/30076496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076501/ws-services-calculation/WCBillingSlab.json b/data/as/30076501/ws-services-calculation/WCBillingSlab.json
index 7d77c2a390..4501d71b37 100644
--- a/data/as/30076501/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076501/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076546/ws-services-calculation/WCBillingSlab.json b/data/as/30076546/ws-services-calculation/WCBillingSlab.json
index e50eced010..eea61c7547 100644
--- a/data/as/30076546/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076546/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076588/ws-services-calculation/WCBillingSlab.json b/data/as/30076588/ws-services-calculation/WCBillingSlab.json
index 32f5c170f2..1f0a02a383 100644
--- a/data/as/30076588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076588/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076595/ws-services-calculation/WCBillingSlab.json b/data/as/30076595/ws-services-calculation/WCBillingSlab.json
index 7af60a0865..234290c696 100644
--- a/data/as/30076595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076595/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30076911/ws-services-calculation/WCBillingSlab.json b/data/as/30076911/ws-services-calculation/WCBillingSlab.json
index f88bb7e04d..59a01171a6 100644
--- a/data/as/30076911/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30076911/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077015/ws-services-calculation/WCBillingSlab.json b/data/as/30077015/ws-services-calculation/WCBillingSlab.json
index d5f96f12c2..247dc1968f 100644
--- a/data/as/30077015/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077015/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077065/ws-services-calculation/WCBillingSlab.json b/data/as/30077065/ws-services-calculation/WCBillingSlab.json
index d8b6af9d5f..7257810b6c 100644
--- a/data/as/30077065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077065/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077169/ws-services-calculation/WCBillingSlab.json b/data/as/30077169/ws-services-calculation/WCBillingSlab.json
index 6727970cab..6064101c02 100644
--- a/data/as/30077169/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077169/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077173/ws-services-calculation/WCBillingSlab.json b/data/as/30077173/ws-services-calculation/WCBillingSlab.json
index 12c232fd57..79409ed4c1 100644
--- a/data/as/30077173/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077173/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077183/ws-services-calculation/WCBillingSlab.json b/data/as/30077183/ws-services-calculation/WCBillingSlab.json
index f5037ea846..ae08068119 100644
--- a/data/as/30077183/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077183/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077189/ws-services-calculation/WCBillingSlab.json b/data/as/30077189/ws-services-calculation/WCBillingSlab.json
index 6c3cbc3871..1870f09c71 100644
--- a/data/as/30077189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077189/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077362/ws-services-calculation/WCBillingSlab.json b/data/as/30077362/ws-services-calculation/WCBillingSlab.json
index cdfe1356c1..135742eb96 100644
--- a/data/as/30077362/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077362/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077383/ws-services-calculation/WCBillingSlab.json b/data/as/30077383/ws-services-calculation/WCBillingSlab.json
index 4210fb600a..23c78230a7 100644
--- a/data/as/30077383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077383/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077387/ws-services-calculation/WCBillingSlab.json b/data/as/30077387/ws-services-calculation/WCBillingSlab.json
index b231f18d53..6ef3f1a1af 100644
--- a/data/as/30077387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077405/ws-services-calculation/WCBillingSlab.json b/data/as/30077405/ws-services-calculation/WCBillingSlab.json
index 854c489348..be67e885b5 100644
--- a/data/as/30077405/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077405/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077516/ws-services-calculation/WCBillingSlab.json b/data/as/30077516/ws-services-calculation/WCBillingSlab.json
index ac33d26e71..45c901e299 100644
--- a/data/as/30077516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077516/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077531/ws-services-calculation/WCBillingSlab.json b/data/as/30077531/ws-services-calculation/WCBillingSlab.json
index d2533ab513..3b9ebc8e42 100644
--- a/data/as/30077531/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077531/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077533/ws-services-calculation/WCBillingSlab.json b/data/as/30077533/ws-services-calculation/WCBillingSlab.json
index 94a494c186..340cb1c582 100644
--- a/data/as/30077533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30077538/ws-services-calculation/WCBillingSlab.json b/data/as/30077538/ws-services-calculation/WCBillingSlab.json
index 43dc797167..02653a48fd 100644
--- a/data/as/30077538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30077538/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30078496/ws-services-calculation/WCBillingSlab.json b/data/as/30078496/ws-services-calculation/WCBillingSlab.json
index 0e9bfea7b7..46c364c72f 100644
--- a/data/as/30078496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30078496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30078499/ws-services-calculation/WCBillingSlab.json b/data/as/30078499/ws-services-calculation/WCBillingSlab.json
index 165820af44..a80b9ba032 100644
--- a/data/as/30078499/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30078499/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079129/ws-services-calculation/WCBillingSlab.json b/data/as/30079129/ws-services-calculation/WCBillingSlab.json
index 626d992275..bf6aa5263d 100644
--- a/data/as/30079129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079129/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079143/ws-services-calculation/WCBillingSlab.json b/data/as/30079143/ws-services-calculation/WCBillingSlab.json
index 77c7930cbe..86611653d0 100644
--- a/data/as/30079143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079143/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079150/ws-services-calculation/WCBillingSlab.json b/data/as/30079150/ws-services-calculation/WCBillingSlab.json
index 84c03ce89e..c077dde817 100644
--- a/data/as/30079150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079150/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079745/ws-services-calculation/WCBillingSlab.json b/data/as/30079745/ws-services-calculation/WCBillingSlab.json
index b43ed63ef3..2ddda2f8d5 100644
--- a/data/as/30079745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079745/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30079783/ws-services-calculation/WCBillingSlab.json b/data/as/30079783/ws-services-calculation/WCBillingSlab.json
index 3e30105eb5..bad859dfb2 100644
--- a/data/as/30079783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30079783/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080314/ws-services-calculation/WCBillingSlab.json b/data/as/30080314/ws-services-calculation/WCBillingSlab.json
index 4949fe8d2e..dd4d345dd6 100644
--- a/data/as/30080314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080314/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080792/ws-services-calculation/WCBillingSlab.json b/data/as/30080792/ws-services-calculation/WCBillingSlab.json
index 271333e288..f7d9755c3c 100644
--- a/data/as/30080792/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080792/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080805/ws-services-calculation/WCBillingSlab.json b/data/as/30080805/ws-services-calculation/WCBillingSlab.json
index 2ad82a4f47..fb02556648 100644
--- a/data/as/30080805/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080805/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30080812/ws-services-calculation/WCBillingSlab.json b/data/as/30080812/ws-services-calculation/WCBillingSlab.json
index f2b28462e0..cc331a3515 100644
--- a/data/as/30080812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30080812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081191/ws-services-calculation/WCBillingSlab.json b/data/as/30081191/ws-services-calculation/WCBillingSlab.json
index e869e9cfea..03ae50aae1 100644
--- a/data/as/30081191/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081191/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081194/ws-services-calculation/WCBillingSlab.json b/data/as/30081194/ws-services-calculation/WCBillingSlab.json
index 4a56afa521..0dd957cde5 100644
--- a/data/as/30081194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081194/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081197/ws-services-calculation/WCBillingSlab.json b/data/as/30081197/ws-services-calculation/WCBillingSlab.json
index 12f19c240e..cdf73504de 100644
--- a/data/as/30081197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081197/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081199/ws-services-calculation/WCBillingSlab.json b/data/as/30081199/ws-services-calculation/WCBillingSlab.json
index 86af2f6fcf..7f99fbeb8c 100644
--- a/data/as/30081199/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081199/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30081237/ws-services-calculation/WCBillingSlab.json b/data/as/30081237/ws-services-calculation/WCBillingSlab.json
index 4483b00fa6..a5e2a6b3d4 100644
--- a/data/as/30081237/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30081237/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30082029/ws-services-calculation/WCBillingSlab.json b/data/as/30082029/ws-services-calculation/WCBillingSlab.json
index d42f95b941..d7da5a648e 100644
--- a/data/as/30082029/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30082029/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30082892/ws-services-calculation/WCBillingSlab.json b/data/as/30082892/ws-services-calculation/WCBillingSlab.json
index 05e198e1ce..13e7f5cbb3 100644
--- a/data/as/30082892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30082892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30083052/ws-services-calculation/WCBillingSlab.json b/data/as/30083052/ws-services-calculation/WCBillingSlab.json
index a88c0d5820..47f0f78d8c 100644
--- a/data/as/30083052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30083052/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30083450/ws-services-calculation/WCBillingSlab.json b/data/as/30083450/ws-services-calculation/WCBillingSlab.json
index 094230ed5e..cba620d9bb 100644
--- a/data/as/30083450/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30083450/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30090984/ws-services-calculation/WCBillingSlab.json b/data/as/30090984/ws-services-calculation/WCBillingSlab.json
index 121dd3a596..cdc668ebc7 100644
--- a/data/as/30090984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30090984/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091027/ws-services-calculation/WCBillingSlab.json b/data/as/30091027/ws-services-calculation/WCBillingSlab.json
index 8a11e4e63e..0b726a925f 100644
--- a/data/as/30091027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091086/ws-services-calculation/WCBillingSlab.json b/data/as/30091086/ws-services-calculation/WCBillingSlab.json
index 1640574e5d..5fa9ece37a 100644
--- a/data/as/30091086/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091086/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091137/ws-services-calculation/WCBillingSlab.json b/data/as/30091137/ws-services-calculation/WCBillingSlab.json
index b065eab2fc..8c61b17ea2 100644
--- a/data/as/30091137/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091137/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091277/ws-services-calculation/WCBillingSlab.json b/data/as/30091277/ws-services-calculation/WCBillingSlab.json
index cdc7ff08c9..a13966bea4 100644
--- a/data/as/30091277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091277/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30091350/ws-services-calculation/WCBillingSlab.json b/data/as/30091350/ws-services-calculation/WCBillingSlab.json
index bb9e97e5ac..b73d1f448b 100644
--- a/data/as/30091350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30091350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30092981/ws-services-calculation/WCBillingSlab.json b/data/as/30092981/ws-services-calculation/WCBillingSlab.json
index 11ea725b21..c1316f3c4b 100644
--- a/data/as/30092981/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30092981/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30093053/ws-services-calculation/WCBillingSlab.json b/data/as/30093053/ws-services-calculation/WCBillingSlab.json
index 91c57152db..469ce065c1 100644
--- a/data/as/30093053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30093053/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30093085/ws-services-calculation/WCBillingSlab.json b/data/as/30093085/ws-services-calculation/WCBillingSlab.json
index 9ff2367c60..1bc197e7a1 100644
--- a/data/as/30093085/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30093085/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30093111/ws-services-calculation/WCBillingSlab.json b/data/as/30093111/ws-services-calculation/WCBillingSlab.json
index a729a5f511..03be1de97f 100644
--- a/data/as/30093111/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30093111/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096216/ws-services-calculation/WCBillingSlab.json b/data/as/30096216/ws-services-calculation/WCBillingSlab.json
index d41fc2fadf..601e77addb 100644
--- a/data/as/30096216/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096216/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096276/ws-services-calculation/WCBillingSlab.json b/data/as/30096276/ws-services-calculation/WCBillingSlab.json
index d6fed59196..fa061d7365 100644
--- a/data/as/30096276/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096276/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096403/ws-services-calculation/WCBillingSlab.json b/data/as/30096403/ws-services-calculation/WCBillingSlab.json
index 76275fabce..fc017146f2 100644
--- a/data/as/30096403/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096403/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096485/ws-services-calculation/WCBillingSlab.json b/data/as/30096485/ws-services-calculation/WCBillingSlab.json
index 4bdb205fcf..86d81833a1 100644
--- a/data/as/30096485/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096485/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096579/ws-services-calculation/WCBillingSlab.json b/data/as/30096579/ws-services-calculation/WCBillingSlab.json
index 846649deb5..221b86d290 100644
--- a/data/as/30096579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096579/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096711/ws-services-calculation/WCBillingSlab.json b/data/as/30096711/ws-services-calculation/WCBillingSlab.json
index 8a12c133fd..4fa66ab7ae 100644
--- a/data/as/30096711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096711/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30096898/ws-services-calculation/WCBillingSlab.json b/data/as/30096898/ws-services-calculation/WCBillingSlab.json
index a098319efc..498a02fd09 100644
--- a/data/as/30096898/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30096898/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30097297/ws-services-calculation/WCBillingSlab.json b/data/as/30097297/ws-services-calculation/WCBillingSlab.json
index 483ea84639..e06ee37b53 100644
--- a/data/as/30097297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30097297/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30105174/ws-services-calculation/WCBillingSlab.json b/data/as/30105174/ws-services-calculation/WCBillingSlab.json
index 7f91f2177a..a27ca391cd 100644
--- a/data/as/30105174/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30105174/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30105196/ws-services-calculation/WCBillingSlab.json b/data/as/30105196/ws-services-calculation/WCBillingSlab.json
index ab8a745d2f..20cb221c26 100644
--- a/data/as/30105196/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30105196/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30105223/ws-services-calculation/WCBillingSlab.json b/data/as/30105223/ws-services-calculation/WCBillingSlab.json
index 6433ea4a78..901bdf1c90 100644
--- a/data/as/30105223/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30105223/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30113305/ws-services-calculation/WCBillingSlab.json b/data/as/30113305/ws-services-calculation/WCBillingSlab.json
index 653d7706ed..2cf0c2688a 100644
--- a/data/as/30113305/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30113305/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30113852/ws-services-calculation/WCBillingSlab.json b/data/as/30113852/ws-services-calculation/WCBillingSlab.json
index bdfd1fa5eb..88b92a339a 100644
--- a/data/as/30113852/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30113852/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115191/ws-services-calculation/WCBillingSlab.json b/data/as/30115191/ws-services-calculation/WCBillingSlab.json
index 73dee14c17..9d1f2313c5 100644
--- a/data/as/30115191/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115191/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115208/ws-services-calculation/WCBillingSlab.json b/data/as/30115208/ws-services-calculation/WCBillingSlab.json
index d762bf5e1a..ca6c072f4c 100644
--- a/data/as/30115208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115249/ws-services-calculation/WCBillingSlab.json b/data/as/30115249/ws-services-calculation/WCBillingSlab.json
index 9aa46c6a0c..1cbaf095bd 100644
--- a/data/as/30115249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115249/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30115981/ws-services-calculation/WCBillingSlab.json b/data/as/30115981/ws-services-calculation/WCBillingSlab.json
index 48a5fcaccf..fa373a70c3 100644
--- a/data/as/30115981/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30115981/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30116153/ws-services-calculation/WCBillingSlab.json b/data/as/30116153/ws-services-calculation/WCBillingSlab.json
index c1052c2502..082da3dcfa 100644
--- a/data/as/30116153/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30116153/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30116490/ws-services-calculation/WCBillingSlab.json b/data/as/30116490/ws-services-calculation/WCBillingSlab.json
index e0b2860c15..e367b18a2a 100644
--- a/data/as/30116490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30116490/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30116536/ws-services-calculation/WCBillingSlab.json b/data/as/30116536/ws-services-calculation/WCBillingSlab.json
index 74efdcc847..7efb6901c8 100644
--- a/data/as/30116536/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30116536/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117305/ws-services-calculation/WCBillingSlab.json b/data/as/30117305/ws-services-calculation/WCBillingSlab.json
index 88c0320e2f..3000198491 100644
--- a/data/as/30117305/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117305/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117521/ws-services-calculation/WCBillingSlab.json b/data/as/30117521/ws-services-calculation/WCBillingSlab.json
index f2a0e43ab9..2bed9da306 100644
--- a/data/as/30117521/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117521/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117549/ws-services-calculation/WCBillingSlab.json b/data/as/30117549/ws-services-calculation/WCBillingSlab.json
index 0472d6b94c..be560f2577 100644
--- a/data/as/30117549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117549/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117565/ws-services-calculation/WCBillingSlab.json b/data/as/30117565/ws-services-calculation/WCBillingSlab.json
index a391e4d697..2f1ff42b5e 100644
--- a/data/as/30117565/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117565/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30117571/ws-services-calculation/WCBillingSlab.json b/data/as/30117571/ws-services-calculation/WCBillingSlab.json
index bf0e226301..1cd1dea4e1 100644
--- a/data/as/30117571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30117571/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30119702/ws-services-calculation/WCBillingSlab.json b/data/as/30119702/ws-services-calculation/WCBillingSlab.json
index cb0ce64f16..825e83497a 100644
--- a/data/as/30119702/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30119702/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125919/ws-services-calculation/WCBillingSlab.json b/data/as/30125919/ws-services-calculation/WCBillingSlab.json
index fae0fe04ba..6a3ae3c95d 100644
--- a/data/as/30125919/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125919/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125926/ws-services-calculation/WCBillingSlab.json b/data/as/30125926/ws-services-calculation/WCBillingSlab.json
index 89338330c8..ef104d699b 100644
--- a/data/as/30125926/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125926/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125970/ws-services-calculation/WCBillingSlab.json b/data/as/30125970/ws-services-calculation/WCBillingSlab.json
index 9d30fcfba1..2ad185c751 100644
--- a/data/as/30125970/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125970/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125974/ws-services-calculation/WCBillingSlab.json b/data/as/30125974/ws-services-calculation/WCBillingSlab.json
index a762633360..62ebc7157d 100644
--- a/data/as/30125974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125974/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30125980/ws-services-calculation/WCBillingSlab.json b/data/as/30125980/ws-services-calculation/WCBillingSlab.json
index 27f43db70f..8e8ac35762 100644
--- a/data/as/30125980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30125980/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126191/ws-services-calculation/WCBillingSlab.json b/data/as/30126191/ws-services-calculation/WCBillingSlab.json
index a9b7110cfc..1fcc59be5b 100644
--- a/data/as/30126191/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126191/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126197/ws-services-calculation/WCBillingSlab.json b/data/as/30126197/ws-services-calculation/WCBillingSlab.json
index e9d77e9bf8..96c35f7d82 100644
--- a/data/as/30126197/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126197/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126217/ws-services-calculation/WCBillingSlab.json b/data/as/30126217/ws-services-calculation/WCBillingSlab.json
index 0ae08af9dc..454d00e6ad 100644
--- a/data/as/30126217/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126217/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126233/ws-services-calculation/WCBillingSlab.json b/data/as/30126233/ws-services-calculation/WCBillingSlab.json
index 44771cee9b..338ed7caf1 100644
--- a/data/as/30126233/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126233/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126239/ws-services-calculation/WCBillingSlab.json b/data/as/30126239/ws-services-calculation/WCBillingSlab.json
index 559440a73b..afb2c13f9e 100644
--- a/data/as/30126239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126239/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126308/ws-services-calculation/WCBillingSlab.json b/data/as/30126308/ws-services-calculation/WCBillingSlab.json
index 5fd8f89e43..ab3bab7c8d 100644
--- a/data/as/30126308/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126308/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126312/ws-services-calculation/WCBillingSlab.json b/data/as/30126312/ws-services-calculation/WCBillingSlab.json
index 4e631990fc..92bb9d597e 100644
--- a/data/as/30126312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126316/ws-services-calculation/WCBillingSlab.json b/data/as/30126316/ws-services-calculation/WCBillingSlab.json
index 244e59be3d..cd491d66a6 100644
--- a/data/as/30126316/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126316/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126334/ws-services-calculation/WCBillingSlab.json b/data/as/30126334/ws-services-calculation/WCBillingSlab.json
index b015cdb6ec..13c176421e 100644
--- a/data/as/30126334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126334/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126487/ws-services-calculation/WCBillingSlab.json b/data/as/30126487/ws-services-calculation/WCBillingSlab.json
index 67c131c0c6..aa81b0551b 100644
--- a/data/as/30126487/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126487/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126496/ws-services-calculation/WCBillingSlab.json b/data/as/30126496/ws-services-calculation/WCBillingSlab.json
index 9ac2ff62e7..05fab53d5d 100644
--- a/data/as/30126496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126500/ws-services-calculation/WCBillingSlab.json b/data/as/30126500/ws-services-calculation/WCBillingSlab.json
index 4a589a71f1..fcfd009964 100644
--- a/data/as/30126500/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126500/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126582/ws-services-calculation/WCBillingSlab.json b/data/as/30126582/ws-services-calculation/WCBillingSlab.json
index 0df2348b5c..bac99319dd 100644
--- a/data/as/30126582/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126582/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30126590/ws-services-calculation/WCBillingSlab.json b/data/as/30126590/ws-services-calculation/WCBillingSlab.json
index 505784fa8a..923384e6bc 100644
--- a/data/as/30126590/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30126590/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127284/ws-services-calculation/WCBillingSlab.json b/data/as/30127284/ws-services-calculation/WCBillingSlab.json
index 431d2ec0ac..5290ade70f 100644
--- a/data/as/30127284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127284/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127356/ws-services-calculation/WCBillingSlab.json b/data/as/30127356/ws-services-calculation/WCBillingSlab.json
index 867687ffc0..199b2416b4 100644
--- a/data/as/30127356/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127356/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127370/ws-services-calculation/WCBillingSlab.json b/data/as/30127370/ws-services-calculation/WCBillingSlab.json
index 67cf6ceb2b..f7fc41a9c7 100644
--- a/data/as/30127370/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127370/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30127414/ws-services-calculation/WCBillingSlab.json b/data/as/30127414/ws-services-calculation/WCBillingSlab.json
index 062e8c44db..2f93b8159c 100644
--- a/data/as/30127414/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30127414/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128175/ws-services-calculation/WCBillingSlab.json b/data/as/30128175/ws-services-calculation/WCBillingSlab.json
index e727e80a6d..1683b41474 100644
--- a/data/as/30128175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128175/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128194/ws-services-calculation/WCBillingSlab.json b/data/as/30128194/ws-services-calculation/WCBillingSlab.json
index 71fc8cabcb..a5e7645cf2 100644
--- a/data/as/30128194/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128194/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128549/ws-services-calculation/WCBillingSlab.json b/data/as/30128549/ws-services-calculation/WCBillingSlab.json
index 3e10e9f5b0..8fc4572f06 100644
--- a/data/as/30128549/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128549/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128554/ws-services-calculation/WCBillingSlab.json b/data/as/30128554/ws-services-calculation/WCBillingSlab.json
index 2cd86ff325..8b7dfc73eb 100644
--- a/data/as/30128554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128895/ws-services-calculation/WCBillingSlab.json b/data/as/30128895/ws-services-calculation/WCBillingSlab.json
index c1ab4ccae8..48c3ea393f 100644
--- a/data/as/30128895/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128895/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30128902/ws-services-calculation/WCBillingSlab.json b/data/as/30128902/ws-services-calculation/WCBillingSlab.json
index df42a0964d..9740ec25e7 100644
--- a/data/as/30128902/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30128902/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129324/ws-services-calculation/WCBillingSlab.json b/data/as/30129324/ws-services-calculation/WCBillingSlab.json
index ff1d6624f6..bb04c6691b 100644
--- a/data/as/30129324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129324/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129329/ws-services-calculation/WCBillingSlab.json b/data/as/30129329/ws-services-calculation/WCBillingSlab.json
index f89534c86c..9ffc55216a 100644
--- a/data/as/30129329/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129329/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129382/ws-services-calculation/WCBillingSlab.json b/data/as/30129382/ws-services-calculation/WCBillingSlab.json
index 2c6397d213..97951a1348 100644
--- a/data/as/30129382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129382/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129385/ws-services-calculation/WCBillingSlab.json b/data/as/30129385/ws-services-calculation/WCBillingSlab.json
index 47a1c1b0b0..d9965ea8b6 100644
--- a/data/as/30129385/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129385/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129475/ws-services-calculation/WCBillingSlab.json b/data/as/30129475/ws-services-calculation/WCBillingSlab.json
index 9593c3fde4..1cec7fe080 100644
--- a/data/as/30129475/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129475/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30129479/ws-services-calculation/WCBillingSlab.json b/data/as/30129479/ws-services-calculation/WCBillingSlab.json
index 2c28a7548e..e414a627b6 100644
--- a/data/as/30129479/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30129479/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130374/ws-services-calculation/WCBillingSlab.json b/data/as/30130374/ws-services-calculation/WCBillingSlab.json
index c7ba61eda9..af2292a441 100644
--- a/data/as/30130374/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130374/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130381/ws-services-calculation/WCBillingSlab.json b/data/as/30130381/ws-services-calculation/WCBillingSlab.json
index 18f9aa0f83..9ae0003724 100644
--- a/data/as/30130381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130381/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130399/ws-services-calculation/WCBillingSlab.json b/data/as/30130399/ws-services-calculation/WCBillingSlab.json
index c14d2b6737..e8cbd0f9ce 100644
--- a/data/as/30130399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130399/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130411/ws-services-calculation/WCBillingSlab.json b/data/as/30130411/ws-services-calculation/WCBillingSlab.json
index 19bf21cb2f..e4e2c7ea46 100644
--- a/data/as/30130411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130411/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130420/ws-services-calculation/WCBillingSlab.json b/data/as/30130420/ws-services-calculation/WCBillingSlab.json
index 61d4377b00..3ae1eb49ad 100644
--- a/data/as/30130420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130420/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30130435/ws-services-calculation/WCBillingSlab.json b/data/as/30130435/ws-services-calculation/WCBillingSlab.json
index 6e3756c68c..fc972f08a3 100644
--- a/data/as/30130435/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30130435/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132498/ws-services-calculation/WCBillingSlab.json b/data/as/30132498/ws-services-calculation/WCBillingSlab.json
index 42a72fc3a4..01c454e7bd 100644
--- a/data/as/30132498/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132498/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132532/ws-services-calculation/WCBillingSlab.json b/data/as/30132532/ws-services-calculation/WCBillingSlab.json
index 820ad810cc..a5888bfdf4 100644
--- a/data/as/30132532/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132532/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132548/ws-services-calculation/WCBillingSlab.json b/data/as/30132548/ws-services-calculation/WCBillingSlab.json
index 3c057386f7..c88466dbe7 100644
--- a/data/as/30132548/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132548/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132559/ws-services-calculation/WCBillingSlab.json b/data/as/30132559/ws-services-calculation/WCBillingSlab.json
index e80030ac9a..91de4d75a7 100644
--- a/data/as/30132559/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132559/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132588/ws-services-calculation/WCBillingSlab.json b/data/as/30132588/ws-services-calculation/WCBillingSlab.json
index 083ac949c2..0a008a6b6e 100644
--- a/data/as/30132588/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132588/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132620/ws-services-calculation/WCBillingSlab.json b/data/as/30132620/ws-services-calculation/WCBillingSlab.json
index 9ffc12cb80..6a5c958b0e 100644
--- a/data/as/30132620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132620/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132648/ws-services-calculation/WCBillingSlab.json b/data/as/30132648/ws-services-calculation/WCBillingSlab.json
index 582669c9d4..f5e7a65458 100644
--- a/data/as/30132648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132648/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132661/ws-services-calculation/WCBillingSlab.json b/data/as/30132661/ws-services-calculation/WCBillingSlab.json
index 79bf0a02ad..3b6c166fbe 100644
--- a/data/as/30132661/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132661/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30132799/ws-services-calculation/WCBillingSlab.json b/data/as/30132799/ws-services-calculation/WCBillingSlab.json
index 4820cb76ec..be39d0c268 100644
--- a/data/as/30132799/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30132799/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137902/ws-services-calculation/WCBillingSlab.json b/data/as/30137902/ws-services-calculation/WCBillingSlab.json
index 9f328354c7..5daa1ec7bc 100644
--- a/data/as/30137902/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137902/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137931/ws-services-calculation/WCBillingSlab.json b/data/as/30137931/ws-services-calculation/WCBillingSlab.json
index 3f32edcb52..c3a7a54f6d 100644
--- a/data/as/30137931/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137931/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137946/ws-services-calculation/WCBillingSlab.json b/data/as/30137946/ws-services-calculation/WCBillingSlab.json
index 24cf7b81d6..25c154abba 100644
--- a/data/as/30137946/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137946/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30137988/ws-services-calculation/WCBillingSlab.json b/data/as/30137988/ws-services-calculation/WCBillingSlab.json
index aff1d928ee..ab6f7cf176 100644
--- a/data/as/30137988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30137988/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30138003/ws-services-calculation/WCBillingSlab.json b/data/as/30138003/ws-services-calculation/WCBillingSlab.json
index 7a5df5e5b8..2aab95da37 100644
--- a/data/as/30138003/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30138003/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30138012/ws-services-calculation/WCBillingSlab.json b/data/as/30138012/ws-services-calculation/WCBillingSlab.json
index b01ea69068..17aa3b29b1 100644
--- a/data/as/30138012/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30138012/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30138032/ws-services-calculation/WCBillingSlab.json b/data/as/30138032/ws-services-calculation/WCBillingSlab.json
index 3bcfaa7ddd..92e953566b 100644
--- a/data/as/30138032/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30138032/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30139203/ws-services-calculation/WCBillingSlab.json b/data/as/30139203/ws-services-calculation/WCBillingSlab.json
index cda1a6bf1b..c7bec60529 100644
--- a/data/as/30139203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30139203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30139213/ws-services-calculation/WCBillingSlab.json b/data/as/30139213/ws-services-calculation/WCBillingSlab.json
index 2b8125ce26..8c1323e48e 100644
--- a/data/as/30139213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30139213/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140232/ws-services-calculation/WCBillingSlab.json b/data/as/30140232/ws-services-calculation/WCBillingSlab.json
index fa262266a4..d0f51f1e4e 100644
--- a/data/as/30140232/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140232/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140242/ws-services-calculation/WCBillingSlab.json b/data/as/30140242/ws-services-calculation/WCBillingSlab.json
index 1fa52874ff..dd190a4db1 100644
--- a/data/as/30140242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140242/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140254/ws-services-calculation/WCBillingSlab.json b/data/as/30140254/ws-services-calculation/WCBillingSlab.json
index 069eb6857f..3a234387f3 100644
--- a/data/as/30140254/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140254/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140608/ws-services-calculation/WCBillingSlab.json b/data/as/30140608/ws-services-calculation/WCBillingSlab.json
index 0757c6f663..f2587c3f93 100644
--- a/data/as/30140608/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140608/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140613/ws-services-calculation/WCBillingSlab.json b/data/as/30140613/ws-services-calculation/WCBillingSlab.json
index e121cf4199..1f665b817c 100644
--- a/data/as/30140613/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140613/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140620/ws-services-calculation/WCBillingSlab.json b/data/as/30140620/ws-services-calculation/WCBillingSlab.json
index bb7416fd6f..2100aa40a2 100644
--- a/data/as/30140620/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140620/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30140642/ws-services-calculation/WCBillingSlab.json b/data/as/30140642/ws-services-calculation/WCBillingSlab.json
index 8d70a4f98b..c8c6f705a6 100644
--- a/data/as/30140642/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30140642/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30141038/ws-services-calculation/WCBillingSlab.json b/data/as/30141038/ws-services-calculation/WCBillingSlab.json
index e6a34bb55e..8090417abd 100644
--- a/data/as/30141038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30141038/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30141193/ws-services-calculation/WCBillingSlab.json b/data/as/30141193/ws-services-calculation/WCBillingSlab.json
index ab82246658..a609ccca1f 100644
--- a/data/as/30141193/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30141193/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30141195/ws-services-calculation/WCBillingSlab.json b/data/as/30141195/ws-services-calculation/WCBillingSlab.json
index 14cd988c33..e3ef297e99 100644
--- a/data/as/30141195/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30141195/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143283/ws-services-calculation/WCBillingSlab.json b/data/as/30143283/ws-services-calculation/WCBillingSlab.json
index 1e52266390..f2b6337fd1 100644
--- a/data/as/30143283/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143283/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143295/ws-services-calculation/WCBillingSlab.json b/data/as/30143295/ws-services-calculation/WCBillingSlab.json
index f7f14fccc9..131b401ea1 100644
--- a/data/as/30143295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143295/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143305/ws-services-calculation/WCBillingSlab.json b/data/as/30143305/ws-services-calculation/WCBillingSlab.json
index 723546cba4..e57dd25fd5 100644
--- a/data/as/30143305/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143305/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143323/ws-services-calculation/WCBillingSlab.json b/data/as/30143323/ws-services-calculation/WCBillingSlab.json
index f2a2583749..3399bb98d5 100644
--- a/data/as/30143323/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143323/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143328/ws-services-calculation/WCBillingSlab.json b/data/as/30143328/ws-services-calculation/WCBillingSlab.json
index d3cc9908d7..c4b345de61 100644
--- a/data/as/30143328/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143328/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143496/ws-services-calculation/WCBillingSlab.json b/data/as/30143496/ws-services-calculation/WCBillingSlab.json
index 6854a9b7cb..8d0ef9febf 100644
--- a/data/as/30143496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143504/ws-services-calculation/WCBillingSlab.json b/data/as/30143504/ws-services-calculation/WCBillingSlab.json
index 529a220659..9ee5567d7a 100644
--- a/data/as/30143504/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143504/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143512/ws-services-calculation/WCBillingSlab.json b/data/as/30143512/ws-services-calculation/WCBillingSlab.json
index 996b434335..cd42be276c 100644
--- a/data/as/30143512/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143512/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30143523/ws-services-calculation/WCBillingSlab.json b/data/as/30143523/ws-services-calculation/WCBillingSlab.json
index 167d520c59..d0c22ce6f9 100644
--- a/data/as/30143523/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30143523/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30144955/ws-services-calculation/WCBillingSlab.json b/data/as/30144955/ws-services-calculation/WCBillingSlab.json
index cb3760d8e9..f04efa4e62 100644
--- a/data/as/30144955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30144955/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30145080/ws-services-calculation/WCBillingSlab.json b/data/as/30145080/ws-services-calculation/WCBillingSlab.json
index 6a89d0d755..daf7270601 100644
--- a/data/as/30145080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30145080/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146239/ws-services-calculation/WCBillingSlab.json b/data/as/30146239/ws-services-calculation/WCBillingSlab.json
index ca5e48004e..a83f2eace1 100644
--- a/data/as/30146239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146239/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146477/ws-services-calculation/WCBillingSlab.json b/data/as/30146477/ws-services-calculation/WCBillingSlab.json
index 129939f364..53523dd9cf 100644
--- a/data/as/30146477/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146477/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146517/ws-services-calculation/WCBillingSlab.json b/data/as/30146517/ws-services-calculation/WCBillingSlab.json
index 039d325980..e9d8187e09 100644
--- a/data/as/30146517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146517/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30146665/ws-services-calculation/WCBillingSlab.json b/data/as/30146665/ws-services-calculation/WCBillingSlab.json
index f42b1751ad..7168e60d98 100644
--- a/data/as/30146665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30146665/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148255/ws-services-calculation/WCBillingSlab.json b/data/as/30148255/ws-services-calculation/WCBillingSlab.json
index 1b8ec8c5dd..73a66e7c38 100644
--- a/data/as/30148255/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148255/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148279/ws-services-calculation/WCBillingSlab.json b/data/as/30148279/ws-services-calculation/WCBillingSlab.json
index 022aa7930a..020faca655 100644
--- a/data/as/30148279/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148279/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148838/ws-services-calculation/WCBillingSlab.json b/data/as/30148838/ws-services-calculation/WCBillingSlab.json
index 13643b6dee..177ca734d9 100644
--- a/data/as/30148838/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148838/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148938/ws-services-calculation/WCBillingSlab.json b/data/as/30148938/ws-services-calculation/WCBillingSlab.json
index 9d55cfcb60..2d19de19b8 100644
--- a/data/as/30148938/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148938/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30148954/ws-services-calculation/WCBillingSlab.json b/data/as/30148954/ws-services-calculation/WCBillingSlab.json
index ed61df2b47..e9b2628d8f 100644
--- a/data/as/30148954/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30148954/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149001/ws-services-calculation/WCBillingSlab.json b/data/as/30149001/ws-services-calculation/WCBillingSlab.json
index 1d67dafa32..60529a3702 100644
--- a/data/as/30149001/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149001/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149016/ws-services-calculation/WCBillingSlab.json b/data/as/30149016/ws-services-calculation/WCBillingSlab.json
index 5201a4aa04..36ea82fd65 100644
--- a/data/as/30149016/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149016/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149044/ws-services-calculation/WCBillingSlab.json b/data/as/30149044/ws-services-calculation/WCBillingSlab.json
index 690b9d6fcf..249caa8edf 100644
--- a/data/as/30149044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149044/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149093/ws-services-calculation/WCBillingSlab.json b/data/as/30149093/ws-services-calculation/WCBillingSlab.json
index 8d08b7665a..6450b63f90 100644
--- a/data/as/30149093/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149093/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30149113/ws-services-calculation/WCBillingSlab.json b/data/as/30149113/ws-services-calculation/WCBillingSlab.json
index 92ae0ea3d7..69f0829961 100644
--- a/data/as/30149113/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30149113/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150209/ws-services-calculation/WCBillingSlab.json b/data/as/30150209/ws-services-calculation/WCBillingSlab.json
index e6ec6ddcbc..1f85d47d9b 100644
--- a/data/as/30150209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150209/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150213/ws-services-calculation/WCBillingSlab.json b/data/as/30150213/ws-services-calculation/WCBillingSlab.json
index b763996dcd..d412e9aaf4 100644
--- a/data/as/30150213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150213/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150234/ws-services-calculation/WCBillingSlab.json b/data/as/30150234/ws-services-calculation/WCBillingSlab.json
index b4d17b7e69..66f0640919 100644
--- a/data/as/30150234/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150234/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150700/ws-services-calculation/WCBillingSlab.json b/data/as/30150700/ws-services-calculation/WCBillingSlab.json
index 728ee27658..cec86898c6 100644
--- a/data/as/30150700/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150700/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150737/ws-services-calculation/WCBillingSlab.json b/data/as/30150737/ws-services-calculation/WCBillingSlab.json
index 78b5a7ecb1..1d9f1baeb5 100644
--- a/data/as/30150737/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150737/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150785/ws-services-calculation/WCBillingSlab.json b/data/as/30150785/ws-services-calculation/WCBillingSlab.json
index 3279f7bd74..bb0785d463 100644
--- a/data/as/30150785/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150785/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150803/ws-services-calculation/WCBillingSlab.json b/data/as/30150803/ws-services-calculation/WCBillingSlab.json
index f07624838a..21bf0d7b13 100644
--- a/data/as/30150803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150803/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30150834/ws-services-calculation/WCBillingSlab.json b/data/as/30150834/ws-services-calculation/WCBillingSlab.json
index f27fd80025..5c04ab171a 100644
--- a/data/as/30150834/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30150834/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158066/ws-services-calculation/WCBillingSlab.json b/data/as/30158066/ws-services-calculation/WCBillingSlab.json
index 57483ccb4e..33fabd5195 100644
--- a/data/as/30158066/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158066/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158126/ws-services-calculation/WCBillingSlab.json b/data/as/30158126/ws-services-calculation/WCBillingSlab.json
index f473ab2821..2b122e8512 100644
--- a/data/as/30158126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158126/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158312/ws-services-calculation/WCBillingSlab.json b/data/as/30158312/ws-services-calculation/WCBillingSlab.json
index 2e938643ab..35eb30966e 100644
--- a/data/as/30158312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158662/ws-services-calculation/WCBillingSlab.json b/data/as/30158662/ws-services-calculation/WCBillingSlab.json
index a2427bf3a2..bd740b19da 100644
--- a/data/as/30158662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158662/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158694/ws-services-calculation/WCBillingSlab.json b/data/as/30158694/ws-services-calculation/WCBillingSlab.json
index 5c0274bae4..d5be6ed28b 100644
--- a/data/as/30158694/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158694/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158752/ws-services-calculation/WCBillingSlab.json b/data/as/30158752/ws-services-calculation/WCBillingSlab.json
index c22b9582eb..ec5bc5c49b 100644
--- a/data/as/30158752/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158752/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30158825/ws-services-calculation/WCBillingSlab.json b/data/as/30158825/ws-services-calculation/WCBillingSlab.json
index 1087cd46c3..ee42677d07 100644
--- a/data/as/30158825/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30158825/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30159298/ws-services-calculation/WCBillingSlab.json b/data/as/30159298/ws-services-calculation/WCBillingSlab.json
index d54dcba39a..636ba0ebc8 100644
--- a/data/as/30159298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30159298/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30159329/ws-services-calculation/WCBillingSlab.json b/data/as/30159329/ws-services-calculation/WCBillingSlab.json
index 9cda3d3c3b..b511779ee4 100644
--- a/data/as/30159329/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30159329/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30163627/ws-services-calculation/WCBillingSlab.json b/data/as/30163627/ws-services-calculation/WCBillingSlab.json
index b8ba38fc41..d09b8921ab 100644
--- a/data/as/30163627/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30163627/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30163652/ws-services-calculation/WCBillingSlab.json b/data/as/30163652/ws-services-calculation/WCBillingSlab.json
index 2523fd2cbe..4fa659a9f8 100644
--- a/data/as/30163652/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30163652/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30163717/ws-services-calculation/WCBillingSlab.json b/data/as/30163717/ws-services-calculation/WCBillingSlab.json
index ab23d59fd6..d7859fb940 100644
--- a/data/as/30163717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30163717/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166511/ws-services-calculation/WCBillingSlab.json b/data/as/30166511/ws-services-calculation/WCBillingSlab.json
index d8d7c435bb..6a0f490028 100644
--- a/data/as/30166511/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166511/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166533/ws-services-calculation/WCBillingSlab.json b/data/as/30166533/ws-services-calculation/WCBillingSlab.json
index 02faeb3570..c26e03eaba 100644
--- a/data/as/30166533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166583/ws-services-calculation/WCBillingSlab.json b/data/as/30166583/ws-services-calculation/WCBillingSlab.json
index 008dbcbab6..bf0338e195 100644
--- a/data/as/30166583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166583/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166670/ws-services-calculation/WCBillingSlab.json b/data/as/30166670/ws-services-calculation/WCBillingSlab.json
index c8fc2d5e41..d13b538629 100644
--- a/data/as/30166670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166670/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166739/ws-services-calculation/WCBillingSlab.json b/data/as/30166739/ws-services-calculation/WCBillingSlab.json
index 1f31237d51..eeeb3161ef 100644
--- a/data/as/30166739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166762/ws-services-calculation/WCBillingSlab.json b/data/as/30166762/ws-services-calculation/WCBillingSlab.json
index 893ecb3276..1703c26796 100644
--- a/data/as/30166762/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166762/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30166822/ws-services-calculation/WCBillingSlab.json b/data/as/30166822/ws-services-calculation/WCBillingSlab.json
index 71476851eb..ff8b6e5856 100644
--- a/data/as/30166822/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30166822/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167065/ws-services-calculation/WCBillingSlab.json b/data/as/30167065/ws-services-calculation/WCBillingSlab.json
index 42cb3a237d..064c9467a9 100644
--- a/data/as/30167065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167065/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167107/ws-services-calculation/WCBillingSlab.json b/data/as/30167107/ws-services-calculation/WCBillingSlab.json
index 5b862d8a8c..35273a8e78 100644
--- a/data/as/30167107/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167107/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167121/ws-services-calculation/WCBillingSlab.json b/data/as/30167121/ws-services-calculation/WCBillingSlab.json
index 17c1c93c9e..d279956bab 100644
--- a/data/as/30167121/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167121/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167130/ws-services-calculation/WCBillingSlab.json b/data/as/30167130/ws-services-calculation/WCBillingSlab.json
index d7a647471e..db40cf126a 100644
--- a/data/as/30167130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167130/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167292/ws-services-calculation/WCBillingSlab.json b/data/as/30167292/ws-services-calculation/WCBillingSlab.json
index edba116db2..171d54fcb6 100644
--- a/data/as/30167292/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167292/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167319/ws-services-calculation/WCBillingSlab.json b/data/as/30167319/ws-services-calculation/WCBillingSlab.json
index c58e43c447..64c86ad766 100644
--- a/data/as/30167319/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167319/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167381/ws-services-calculation/WCBillingSlab.json b/data/as/30167381/ws-services-calculation/WCBillingSlab.json
index 5ddf605b66..5e0d31adb0 100644
--- a/data/as/30167381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167381/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167391/ws-services-calculation/WCBillingSlab.json b/data/as/30167391/ws-services-calculation/WCBillingSlab.json
index 1b86f50eeb..a7dd10535d 100644
--- a/data/as/30167391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167391/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167408/ws-services-calculation/WCBillingSlab.json b/data/as/30167408/ws-services-calculation/WCBillingSlab.json
index 38af5f9844..72aab4397e 100644
--- a/data/as/30167408/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167408/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167439/ws-services-calculation/WCBillingSlab.json b/data/as/30167439/ws-services-calculation/WCBillingSlab.json
index 479625dccd..fe0b5d8636 100644
--- a/data/as/30167439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167439/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167463/ws-services-calculation/WCBillingSlab.json b/data/as/30167463/ws-services-calculation/WCBillingSlab.json
index e847d3bd5f..1805bec03c 100644
--- a/data/as/30167463/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167463/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167486/ws-services-calculation/WCBillingSlab.json b/data/as/30167486/ws-services-calculation/WCBillingSlab.json
index aa8cdf6699..e5469e0aad 100644
--- a/data/as/30167486/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167486/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30167823/ws-services-calculation/WCBillingSlab.json b/data/as/30167823/ws-services-calculation/WCBillingSlab.json
index 1af2dc57e6..9e37c8d5e0 100644
--- a/data/as/30167823/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30167823/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169470/ws-services-calculation/WCBillingSlab.json b/data/as/30169470/ws-services-calculation/WCBillingSlab.json
index 2007decee7..d6a4e4d479 100644
--- a/data/as/30169470/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169470/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169472/ws-services-calculation/WCBillingSlab.json b/data/as/30169472/ws-services-calculation/WCBillingSlab.json
index ba9f2e70fb..4a110fd9ff 100644
--- a/data/as/30169472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169472/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169516/ws-services-calculation/WCBillingSlab.json b/data/as/30169516/ws-services-calculation/WCBillingSlab.json
index 90ab5ca47d..c9546e217e 100644
--- a/data/as/30169516/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169516/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169525/ws-services-calculation/WCBillingSlab.json b/data/as/30169525/ws-services-calculation/WCBillingSlab.json
index 6ca0ae6317..791a31db78 100644
--- a/data/as/30169525/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169525/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169537/ws-services-calculation/WCBillingSlab.json b/data/as/30169537/ws-services-calculation/WCBillingSlab.json
index 51d092a37c..e1e0142c84 100644
--- a/data/as/30169537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169537/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169560/ws-services-calculation/WCBillingSlab.json b/data/as/30169560/ws-services-calculation/WCBillingSlab.json
index b95a682ca5..df7a1a4b54 100644
--- a/data/as/30169560/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169560/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169583/ws-services-calculation/WCBillingSlab.json b/data/as/30169583/ws-services-calculation/WCBillingSlab.json
index 86b966ac22..74676edda0 100644
--- a/data/as/30169583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169583/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169600/ws-services-calculation/WCBillingSlab.json b/data/as/30169600/ws-services-calculation/WCBillingSlab.json
index aafe8403b0..6018cff132 100644
--- a/data/as/30169600/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169600/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169629/ws-services-calculation/WCBillingSlab.json b/data/as/30169629/ws-services-calculation/WCBillingSlab.json
index f839148f89..2e4e2cd5f7 100644
--- a/data/as/30169629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169629/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169643/ws-services-calculation/WCBillingSlab.json b/data/as/30169643/ws-services-calculation/WCBillingSlab.json
index 86d4f6c005..7ff58180ab 100644
--- a/data/as/30169643/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169643/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169657/ws-services-calculation/WCBillingSlab.json b/data/as/30169657/ws-services-calculation/WCBillingSlab.json
index 80951def96..259ecafd05 100644
--- a/data/as/30169657/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169657/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169665/ws-services-calculation/WCBillingSlab.json b/data/as/30169665/ws-services-calculation/WCBillingSlab.json
index 782b5f819d..a7224821ef 100644
--- a/data/as/30169665/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169665/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169790/ws-services-calculation/WCBillingSlab.json b/data/as/30169790/ws-services-calculation/WCBillingSlab.json
index 3bf9721356..fd52f2b115 100644
--- a/data/as/30169790/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169790/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169802/ws-services-calculation/WCBillingSlab.json b/data/as/30169802/ws-services-calculation/WCBillingSlab.json
index d466c4cbf2..60f132e4dc 100644
--- a/data/as/30169802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169802/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169825/ws-services-calculation/WCBillingSlab.json b/data/as/30169825/ws-services-calculation/WCBillingSlab.json
index 29a75bcc6b..6cd5726fbf 100644
--- a/data/as/30169825/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169825/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30169988/ws-services-calculation/WCBillingSlab.json b/data/as/30169988/ws-services-calculation/WCBillingSlab.json
index f88cecf663..494545b9b7 100644
--- a/data/as/30169988/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30169988/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170226/ws-services-calculation/WCBillingSlab.json b/data/as/30170226/ws-services-calculation/WCBillingSlab.json
index 4072b43203..a1098cc716 100644
--- a/data/as/30170226/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170226/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170237/ws-services-calculation/WCBillingSlab.json b/data/as/30170237/ws-services-calculation/WCBillingSlab.json
index 6896290aac..3a2cfce4d1 100644
--- a/data/as/30170237/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170237/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170249/ws-services-calculation/WCBillingSlab.json b/data/as/30170249/ws-services-calculation/WCBillingSlab.json
index 9409503003..a9519675d1 100644
--- a/data/as/30170249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170249/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170262/ws-services-calculation/WCBillingSlab.json b/data/as/30170262/ws-services-calculation/WCBillingSlab.json
index 4c9505cab6..1c7c4b6a45 100644
--- a/data/as/30170262/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170262/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170419/ws-services-calculation/WCBillingSlab.json b/data/as/30170419/ws-services-calculation/WCBillingSlab.json
index 50ccf7a207..0ddff19735 100644
--- a/data/as/30170419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170429/ws-services-calculation/WCBillingSlab.json b/data/as/30170429/ws-services-calculation/WCBillingSlab.json
index 300e544e64..ecd17d047b 100644
--- a/data/as/30170429/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170429/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170784/ws-services-calculation/WCBillingSlab.json b/data/as/30170784/ws-services-calculation/WCBillingSlab.json
index 0ba80f0266..4ff2929ddc 100644
--- a/data/as/30170784/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170784/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170810/ws-services-calculation/WCBillingSlab.json b/data/as/30170810/ws-services-calculation/WCBillingSlab.json
index b6cdb213a2..b7959a6eec 100644
--- a/data/as/30170810/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170810/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30170948/ws-services-calculation/WCBillingSlab.json b/data/as/30170948/ws-services-calculation/WCBillingSlab.json
index 207ce8645e..51d1fe5c65 100644
--- a/data/as/30170948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30170948/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30171030/ws-services-calculation/WCBillingSlab.json b/data/as/30171030/ws-services-calculation/WCBillingSlab.json
index a751cf7fdf..b8b6df3cbb 100644
--- a/data/as/30171030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30171030/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172407/ws-services-calculation/WCBillingSlab.json b/data/as/30172407/ws-services-calculation/WCBillingSlab.json
index cfe52541e6..96b0b73059 100644
--- a/data/as/30172407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172407/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172409/ws-services-calculation/WCBillingSlab.json b/data/as/30172409/ws-services-calculation/WCBillingSlab.json
index fefc6b86b6..7209c70f0c 100644
--- a/data/as/30172409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172409/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172412/ws-services-calculation/WCBillingSlab.json b/data/as/30172412/ws-services-calculation/WCBillingSlab.json
index a07692c891..f1d926d84b 100644
--- a/data/as/30172412/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172412/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172420/ws-services-calculation/WCBillingSlab.json b/data/as/30172420/ws-services-calculation/WCBillingSlab.json
index 8066d8ed68..866a0409de 100644
--- a/data/as/30172420/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172420/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172437/ws-services-calculation/WCBillingSlab.json b/data/as/30172437/ws-services-calculation/WCBillingSlab.json
index c814e49245..156c92e791 100644
--- a/data/as/30172437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172437/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172442/ws-services-calculation/WCBillingSlab.json b/data/as/30172442/ws-services-calculation/WCBillingSlab.json
index 23fa710d08..e781cfc387 100644
--- a/data/as/30172442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172442/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172452/ws-services-calculation/WCBillingSlab.json b/data/as/30172452/ws-services-calculation/WCBillingSlab.json
index 4e541e90c3..a39ac17b20 100644
--- a/data/as/30172452/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172452/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172456/ws-services-calculation/WCBillingSlab.json b/data/as/30172456/ws-services-calculation/WCBillingSlab.json
index 89943e68a5..367d016fde 100644
--- a/data/as/30172456/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172456/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172473/ws-services-calculation/WCBillingSlab.json b/data/as/30172473/ws-services-calculation/WCBillingSlab.json
index c0f3829bf1..a5f8bbaed4 100644
--- a/data/as/30172473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172473/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172482/ws-services-calculation/WCBillingSlab.json b/data/as/30172482/ws-services-calculation/WCBillingSlab.json
index cd5c3c7158..d3eec2edf0 100644
--- a/data/as/30172482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172482/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172498/ws-services-calculation/WCBillingSlab.json b/data/as/30172498/ws-services-calculation/WCBillingSlab.json
index 0732d7859f..1b48d2a18e 100644
--- a/data/as/30172498/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172498/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172503/ws-services-calculation/WCBillingSlab.json b/data/as/30172503/ws-services-calculation/WCBillingSlab.json
index 9fa0af26f6..4ae747fc9a 100644
--- a/data/as/30172503/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172503/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172507/ws-services-calculation/WCBillingSlab.json b/data/as/30172507/ws-services-calculation/WCBillingSlab.json
index 016be2b7bb..1c61980f2f 100644
--- a/data/as/30172507/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172507/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172509/ws-services-calculation/WCBillingSlab.json b/data/as/30172509/ws-services-calculation/WCBillingSlab.json
index 647558674b..af0f4859ab 100644
--- a/data/as/30172509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172509/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172538/ws-services-calculation/WCBillingSlab.json b/data/as/30172538/ws-services-calculation/WCBillingSlab.json
index c851a483e3..71eeffc8f7 100644
--- a/data/as/30172538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172538/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172543/ws-services-calculation/WCBillingSlab.json b/data/as/30172543/ws-services-calculation/WCBillingSlab.json
index 987b9e7570..07fc76f65e 100644
--- a/data/as/30172543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172543/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30172573/ws-services-calculation/WCBillingSlab.json b/data/as/30172573/ws-services-calculation/WCBillingSlab.json
index 1505d49414..59d764ff41 100644
--- a/data/as/30172573/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30172573/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173072/ws-services-calculation/WCBillingSlab.json b/data/as/30173072/ws-services-calculation/WCBillingSlab.json
index 2b756239ae..9e49ecaea9 100644
--- a/data/as/30173072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173072/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173084/ws-services-calculation/WCBillingSlab.json b/data/as/30173084/ws-services-calculation/WCBillingSlab.json
index e7ecdcfbf7..dce228f9e0 100644
--- a/data/as/30173084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173097/ws-services-calculation/WCBillingSlab.json b/data/as/30173097/ws-services-calculation/WCBillingSlab.json
index 9486b21b5f..97ea8cbb24 100644
--- a/data/as/30173097/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173097/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173162/ws-services-calculation/WCBillingSlab.json b/data/as/30173162/ws-services-calculation/WCBillingSlab.json
index fba5d83e97..671bcd2d38 100644
--- a/data/as/30173162/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173162/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173172/ws-services-calculation/WCBillingSlab.json b/data/as/30173172/ws-services-calculation/WCBillingSlab.json
index d38eedcff2..56fa44de21 100644
--- a/data/as/30173172/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173172/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173251/ws-services-calculation/WCBillingSlab.json b/data/as/30173251/ws-services-calculation/WCBillingSlab.json
index f802eb184f..2e5f57090b 100644
--- a/data/as/30173251/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173251/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173284/ws-services-calculation/WCBillingSlab.json b/data/as/30173284/ws-services-calculation/WCBillingSlab.json
index be1a914cfa..36784884ef 100644
--- a/data/as/30173284/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173284/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173317/ws-services-calculation/WCBillingSlab.json b/data/as/30173317/ws-services-calculation/WCBillingSlab.json
index 74de8620c6..d112812ff2 100644
--- a/data/as/30173317/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173317/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173387/ws-services-calculation/WCBillingSlab.json b/data/as/30173387/ws-services-calculation/WCBillingSlab.json
index 5711c3699f..72ddb3415d 100644
--- a/data/as/30173387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173395/ws-services-calculation/WCBillingSlab.json b/data/as/30173395/ws-services-calculation/WCBillingSlab.json
index e2d6d86a01..61d5e1a231 100644
--- a/data/as/30173395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173395/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173400/ws-services-calculation/WCBillingSlab.json b/data/as/30173400/ws-services-calculation/WCBillingSlab.json
index 9573366af4..5d2751f95c 100644
--- a/data/as/30173400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173400/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173409/ws-services-calculation/WCBillingSlab.json b/data/as/30173409/ws-services-calculation/WCBillingSlab.json
index 594d1b3e1d..1cf1f1b15a 100644
--- a/data/as/30173409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173409/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173419/ws-services-calculation/WCBillingSlab.json b/data/as/30173419/ws-services-calculation/WCBillingSlab.json
index 2dceae1325..b3db745aa4 100644
--- a/data/as/30173419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173427/ws-services-calculation/WCBillingSlab.json b/data/as/30173427/ws-services-calculation/WCBillingSlab.json
index d1ed6270c0..bd93dcbc8c 100644
--- a/data/as/30173427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173427/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173442/ws-services-calculation/WCBillingSlab.json b/data/as/30173442/ws-services-calculation/WCBillingSlab.json
index 5aece8943d..3a4d37743e 100644
--- a/data/as/30173442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173442/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173455/ws-services-calculation/WCBillingSlab.json b/data/as/30173455/ws-services-calculation/WCBillingSlab.json
index a818b6fa9a..6dd6d76593 100644
--- a/data/as/30173455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173455/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173471/ws-services-calculation/WCBillingSlab.json b/data/as/30173471/ws-services-calculation/WCBillingSlab.json
index 052c041ae8..70ae2216a2 100644
--- a/data/as/30173471/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173471/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173496/ws-services-calculation/WCBillingSlab.json b/data/as/30173496/ws-services-calculation/WCBillingSlab.json
index f4c818cac5..700c747614 100644
--- a/data/as/30173496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173509/ws-services-calculation/WCBillingSlab.json b/data/as/30173509/ws-services-calculation/WCBillingSlab.json
index 97f57e415d..9eeb9dd96d 100644
--- a/data/as/30173509/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173509/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173535/ws-services-calculation/WCBillingSlab.json b/data/as/30173535/ws-services-calculation/WCBillingSlab.json
index 60f3aab266..5b1fa62389 100644
--- a/data/as/30173535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173679/ws-services-calculation/WCBillingSlab.json b/data/as/30173679/ws-services-calculation/WCBillingSlab.json
index 8f644ce11a..0a267a9497 100644
--- a/data/as/30173679/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173679/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173688/ws-services-calculation/WCBillingSlab.json b/data/as/30173688/ws-services-calculation/WCBillingSlab.json
index 7158b2b969..8433b3ff13 100644
--- a/data/as/30173688/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173688/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173698/ws-services-calculation/WCBillingSlab.json b/data/as/30173698/ws-services-calculation/WCBillingSlab.json
index ae22b59b6e..d0e1aea6d6 100644
--- a/data/as/30173698/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173698/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173710/ws-services-calculation/WCBillingSlab.json b/data/as/30173710/ws-services-calculation/WCBillingSlab.json
index 91a1645d98..cd0a95a773 100644
--- a/data/as/30173710/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173710/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173740/ws-services-calculation/WCBillingSlab.json b/data/as/30173740/ws-services-calculation/WCBillingSlab.json
index 7654e53cea..8cf3e9b603 100644
--- a/data/as/30173740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173740/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173753/ws-services-calculation/WCBillingSlab.json b/data/as/30173753/ws-services-calculation/WCBillingSlab.json
index b0e55143ea..255d844b58 100644
--- a/data/as/30173753/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173753/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173770/ws-services-calculation/WCBillingSlab.json b/data/as/30173770/ws-services-calculation/WCBillingSlab.json
index 85e2f2852a..5f8a66e6c7 100644
--- a/data/as/30173770/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173770/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173782/ws-services-calculation/WCBillingSlab.json b/data/as/30173782/ws-services-calculation/WCBillingSlab.json
index a7b717b5c9..4635ce1791 100644
--- a/data/as/30173782/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173782/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173794/ws-services-calculation/WCBillingSlab.json b/data/as/30173794/ws-services-calculation/WCBillingSlab.json
index 4eeac3746d..653a895fa5 100644
--- a/data/as/30173794/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173794/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173812/ws-services-calculation/WCBillingSlab.json b/data/as/30173812/ws-services-calculation/WCBillingSlab.json
index c421c2012f..c356d91279 100644
--- a/data/as/30173812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173814/ws-services-calculation/WCBillingSlab.json b/data/as/30173814/ws-services-calculation/WCBillingSlab.json
index 5f02a517a9..6c8b57c798 100644
--- a/data/as/30173814/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173814/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173816/ws-services-calculation/WCBillingSlab.json b/data/as/30173816/ws-services-calculation/WCBillingSlab.json
index aeec6f21bd..bec6fc2846 100644
--- a/data/as/30173816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173961/ws-services-calculation/WCBillingSlab.json b/data/as/30173961/ws-services-calculation/WCBillingSlab.json
index 6848e9e781..ccc9eaf961 100644
--- a/data/as/30173961/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173961/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173962/ws-services-calculation/WCBillingSlab.json b/data/as/30173962/ws-services-calculation/WCBillingSlab.json
index d52816b06f..25e9125466 100644
--- a/data/as/30173962/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173962/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173963/ws-services-calculation/WCBillingSlab.json b/data/as/30173963/ws-services-calculation/WCBillingSlab.json
index dc3c4d623d..0dc06357aa 100644
--- a/data/as/30173963/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173963/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173965/ws-services-calculation/WCBillingSlab.json b/data/as/30173965/ws-services-calculation/WCBillingSlab.json
index 1fff52c048..0af28b73db 100644
--- a/data/as/30173965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173965/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173967/ws-services-calculation/WCBillingSlab.json b/data/as/30173967/ws-services-calculation/WCBillingSlab.json
index 16f5464c82..a5268b16d0 100644
--- a/data/as/30173967/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173967/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173972/ws-services-calculation/WCBillingSlab.json b/data/as/30173972/ws-services-calculation/WCBillingSlab.json
index 377a5b069d..d0a6fd8e07 100644
--- a/data/as/30173972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173973/ws-services-calculation/WCBillingSlab.json b/data/as/30173973/ws-services-calculation/WCBillingSlab.json
index f1533ab0a7..548027a516 100644
--- a/data/as/30173973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173973/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173975/ws-services-calculation/WCBillingSlab.json b/data/as/30173975/ws-services-calculation/WCBillingSlab.json
index 731956f9e4..2121ba37e8 100644
--- a/data/as/30173975/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173975/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173977/ws-services-calculation/WCBillingSlab.json b/data/as/30173977/ws-services-calculation/WCBillingSlab.json
index 6596991052..480c9d1e4c 100644
--- a/data/as/30173977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173977/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173978/ws-services-calculation/WCBillingSlab.json b/data/as/30173978/ws-services-calculation/WCBillingSlab.json
index aad451d077..26dad75a15 100644
--- a/data/as/30173978/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173978/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173979/ws-services-calculation/WCBillingSlab.json b/data/as/30173979/ws-services-calculation/WCBillingSlab.json
index 7180c67f44..8fb0043354 100644
--- a/data/as/30173979/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173979/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173980/ws-services-calculation/WCBillingSlab.json b/data/as/30173980/ws-services-calculation/WCBillingSlab.json
index f2f802e283..f7d8b67555 100644
--- a/data/as/30173980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173980/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173981/ws-services-calculation/WCBillingSlab.json b/data/as/30173981/ws-services-calculation/WCBillingSlab.json
index 26c3ad43fa..499f0ae533 100644
--- a/data/as/30173981/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173981/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173982/ws-services-calculation/WCBillingSlab.json b/data/as/30173982/ws-services-calculation/WCBillingSlab.json
index 2d2dbd0bd6..056198205b 100644
--- a/data/as/30173982/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173982/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173983/ws-services-calculation/WCBillingSlab.json b/data/as/30173983/ws-services-calculation/WCBillingSlab.json
index 17385b3c00..ea57fa4e4f 100644
--- a/data/as/30173983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173983/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30173984/ws-services-calculation/WCBillingSlab.json b/data/as/30173984/ws-services-calculation/WCBillingSlab.json
index 717d6ba051..5dbb922ab1 100644
--- a/data/as/30173984/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30173984/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174052/ws-services-calculation/WCBillingSlab.json b/data/as/30174052/ws-services-calculation/WCBillingSlab.json
index f945a42c89..f5b0292862 100644
--- a/data/as/30174052/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174052/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174053/ws-services-calculation/WCBillingSlab.json b/data/as/30174053/ws-services-calculation/WCBillingSlab.json
index 1e16e20884..54b673ddf6 100644
--- a/data/as/30174053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174053/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174055/ws-services-calculation/WCBillingSlab.json b/data/as/30174055/ws-services-calculation/WCBillingSlab.json
index 7361511058..c023e53f73 100644
--- a/data/as/30174055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174055/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174058/ws-services-calculation/WCBillingSlab.json b/data/as/30174058/ws-services-calculation/WCBillingSlab.json
index ef7892d1ea..e8da08ac03 100644
--- a/data/as/30174058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174058/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174059/ws-services-calculation/WCBillingSlab.json b/data/as/30174059/ws-services-calculation/WCBillingSlab.json
index efd7318e09..9296f1e349 100644
--- a/data/as/30174059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174059/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174062/ws-services-calculation/WCBillingSlab.json b/data/as/30174062/ws-services-calculation/WCBillingSlab.json
index 3ca46508d5..d67595eefe 100644
--- a/data/as/30174062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174062/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174064/ws-services-calculation/WCBillingSlab.json b/data/as/30174064/ws-services-calculation/WCBillingSlab.json
index 60762d469f..5e71b994b5 100644
--- a/data/as/30174064/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174064/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174065/ws-services-calculation/WCBillingSlab.json b/data/as/30174065/ws-services-calculation/WCBillingSlab.json
index f1fa7641ef..747d312a4b 100644
--- a/data/as/30174065/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174065/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174068/ws-services-calculation/WCBillingSlab.json b/data/as/30174068/ws-services-calculation/WCBillingSlab.json
index 25304c693f..9da6789abf 100644
--- a/data/as/30174068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174068/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174070/ws-services-calculation/WCBillingSlab.json b/data/as/30174070/ws-services-calculation/WCBillingSlab.json
index faa89ae1ea..37122e2497 100644
--- a/data/as/30174070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174070/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174072/ws-services-calculation/WCBillingSlab.json b/data/as/30174072/ws-services-calculation/WCBillingSlab.json
index 15057e5c72..27d28ffd34 100644
--- a/data/as/30174072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174072/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174082/ws-services-calculation/WCBillingSlab.json b/data/as/30174082/ws-services-calculation/WCBillingSlab.json
index c11aee1703..670a0f3acc 100644
--- a/data/as/30174082/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174082/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174084/ws-services-calculation/WCBillingSlab.json b/data/as/30174084/ws-services-calculation/WCBillingSlab.json
index 98d2a81a28..2a2ddfbac8 100644
--- a/data/as/30174084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174085/ws-services-calculation/WCBillingSlab.json b/data/as/30174085/ws-services-calculation/WCBillingSlab.json
index 30b0647fd6..8cd6e70a0d 100644
--- a/data/as/30174085/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174085/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174088/ws-services-calculation/WCBillingSlab.json b/data/as/30174088/ws-services-calculation/WCBillingSlab.json
index 1f71ed9510..882ae90bab 100644
--- a/data/as/30174088/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174088/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174094/ws-services-calculation/WCBillingSlab.json b/data/as/30174094/ws-services-calculation/WCBillingSlab.json
index 39b7934bb3..a81277340a 100644
--- a/data/as/30174094/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174094/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174097/ws-services-calculation/WCBillingSlab.json b/data/as/30174097/ws-services-calculation/WCBillingSlab.json
index 7dfde0d359..834bf11ace 100644
--- a/data/as/30174097/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174097/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174123/ws-services-calculation/WCBillingSlab.json b/data/as/30174123/ws-services-calculation/WCBillingSlab.json
index c2343254b3..bfc8751b46 100644
--- a/data/as/30174123/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174123/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174125/ws-services-calculation/WCBillingSlab.json b/data/as/30174125/ws-services-calculation/WCBillingSlab.json
index c57794359f..b6bc5aa717 100644
--- a/data/as/30174125/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174125/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174133/ws-services-calculation/WCBillingSlab.json b/data/as/30174133/ws-services-calculation/WCBillingSlab.json
index 65582e704d..cdfe92e198 100644
--- a/data/as/30174133/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174133/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174139/ws-services-calculation/WCBillingSlab.json b/data/as/30174139/ws-services-calculation/WCBillingSlab.json
index d82664961a..29b6fda02e 100644
--- a/data/as/30174139/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174139/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174143/ws-services-calculation/WCBillingSlab.json b/data/as/30174143/ws-services-calculation/WCBillingSlab.json
index a4b52ff877..907aa9f79c 100644
--- a/data/as/30174143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174143/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174150/ws-services-calculation/WCBillingSlab.json b/data/as/30174150/ws-services-calculation/WCBillingSlab.json
index cfe74f235a..3e809666a9 100644
--- a/data/as/30174150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174150/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174158/ws-services-calculation/WCBillingSlab.json b/data/as/30174158/ws-services-calculation/WCBillingSlab.json
index b6f62e3723..ffc21c1315 100644
--- a/data/as/30174158/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174158/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174165/ws-services-calculation/WCBillingSlab.json b/data/as/30174165/ws-services-calculation/WCBillingSlab.json
index c9e77aff32..e79d4c988e 100644
--- a/data/as/30174165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174165/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174178/ws-services-calculation/WCBillingSlab.json b/data/as/30174178/ws-services-calculation/WCBillingSlab.json
index 7989794ead..eee1ab82b0 100644
--- a/data/as/30174178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174186/ws-services-calculation/WCBillingSlab.json b/data/as/30174186/ws-services-calculation/WCBillingSlab.json
index af6ad2185e..ae2736a832 100644
--- a/data/as/30174186/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174186/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174190/ws-services-calculation/WCBillingSlab.json b/data/as/30174190/ws-services-calculation/WCBillingSlab.json
index f049332f2e..43b8735757 100644
--- a/data/as/30174190/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174190/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174199/ws-services-calculation/WCBillingSlab.json b/data/as/30174199/ws-services-calculation/WCBillingSlab.json
index 11b3aff59c..62759bcdc9 100644
--- a/data/as/30174199/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174199/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174210/ws-services-calculation/WCBillingSlab.json b/data/as/30174210/ws-services-calculation/WCBillingSlab.json
index b323fe1a88..f69638c719 100644
--- a/data/as/30174210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174210/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174211/ws-services-calculation/WCBillingSlab.json b/data/as/30174211/ws-services-calculation/WCBillingSlab.json
index 0e9c007227..4482d85122 100644
--- a/data/as/30174211/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174211/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174222/ws-services-calculation/WCBillingSlab.json b/data/as/30174222/ws-services-calculation/WCBillingSlab.json
index 87ae37fb2c..e8813b1d59 100644
--- a/data/as/30174222/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174222/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174241/ws-services-calculation/WCBillingSlab.json b/data/as/30174241/ws-services-calculation/WCBillingSlab.json
index c98bdf907b..55f471d392 100644
--- a/data/as/30174241/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174241/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174244/ws-services-calculation/WCBillingSlab.json b/data/as/30174244/ws-services-calculation/WCBillingSlab.json
index 81d11900a9..51d17a2d21 100644
--- a/data/as/30174244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174244/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174286/ws-services-calculation/WCBillingSlab.json b/data/as/30174286/ws-services-calculation/WCBillingSlab.json
index 54c8f0c849..b55d066b16 100644
--- a/data/as/30174286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174291/ws-services-calculation/WCBillingSlab.json b/data/as/30174291/ws-services-calculation/WCBillingSlab.json
index 871b71b79f..0e15c1cf5c 100644
--- a/data/as/30174291/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174291/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174314/ws-services-calculation/WCBillingSlab.json b/data/as/30174314/ws-services-calculation/WCBillingSlab.json
index 77800ba0b2..3b78ba143f 100644
--- a/data/as/30174314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174314/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174344/ws-services-calculation/WCBillingSlab.json b/data/as/30174344/ws-services-calculation/WCBillingSlab.json
index 9df19aa3e8..8901585346 100644
--- a/data/as/30174344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174344/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174357/ws-services-calculation/WCBillingSlab.json b/data/as/30174357/ws-services-calculation/WCBillingSlab.json
index 093f137dbe..300b7e2360 100644
--- a/data/as/30174357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174357/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174375/ws-services-calculation/WCBillingSlab.json b/data/as/30174375/ws-services-calculation/WCBillingSlab.json
index 7d0d66fd7b..cf43098ae1 100644
--- a/data/as/30174375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174375/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174407/ws-services-calculation/WCBillingSlab.json b/data/as/30174407/ws-services-calculation/WCBillingSlab.json
index f732c596f4..7950f869e8 100644
--- a/data/as/30174407/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174407/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174416/ws-services-calculation/WCBillingSlab.json b/data/as/30174416/ws-services-calculation/WCBillingSlab.json
index d1288ca26e..13ad0cdbbe 100644
--- a/data/as/30174416/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174416/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174419/ws-services-calculation/WCBillingSlab.json b/data/as/30174419/ws-services-calculation/WCBillingSlab.json
index 75a3dbab15..cf9c3f480f 100644
--- a/data/as/30174419/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174419/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174439/ws-services-calculation/WCBillingSlab.json b/data/as/30174439/ws-services-calculation/WCBillingSlab.json
index 0ea79a3fa9..6a4a4788d2 100644
--- a/data/as/30174439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174439/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174442/ws-services-calculation/WCBillingSlab.json b/data/as/30174442/ws-services-calculation/WCBillingSlab.json
index 45a94ce8c7..f0c4193e36 100644
--- a/data/as/30174442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174442/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174454/ws-services-calculation/WCBillingSlab.json b/data/as/30174454/ws-services-calculation/WCBillingSlab.json
index 812833df75..526ff0d09a 100644
--- a/data/as/30174454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174454/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174538/ws-services-calculation/WCBillingSlab.json b/data/as/30174538/ws-services-calculation/WCBillingSlab.json
index f7f4396a9b..ed8140b63c 100644
--- a/data/as/30174538/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174538/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174541/ws-services-calculation/WCBillingSlab.json b/data/as/30174541/ws-services-calculation/WCBillingSlab.json
index f21506699f..cb07fc11af 100644
--- a/data/as/30174541/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174541/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174546/ws-services-calculation/WCBillingSlab.json b/data/as/30174546/ws-services-calculation/WCBillingSlab.json
index 3a416824d0..b327e52295 100644
--- a/data/as/30174546/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174546/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174562/ws-services-calculation/WCBillingSlab.json b/data/as/30174562/ws-services-calculation/WCBillingSlab.json
index e36badd1ca..3e2f8afea0 100644
--- a/data/as/30174562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174562/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174577/ws-services-calculation/WCBillingSlab.json b/data/as/30174577/ws-services-calculation/WCBillingSlab.json
index 1c5075a129..fd15c11591 100644
--- a/data/as/30174577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174577/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174593/ws-services-calculation/WCBillingSlab.json b/data/as/30174593/ws-services-calculation/WCBillingSlab.json
index 9a8d621bbd..c547fc0d80 100644
--- a/data/as/30174593/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174593/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174610/ws-services-calculation/WCBillingSlab.json b/data/as/30174610/ws-services-calculation/WCBillingSlab.json
index d1867adcb9..302f66af01 100644
--- a/data/as/30174610/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174610/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174622/ws-services-calculation/WCBillingSlab.json b/data/as/30174622/ws-services-calculation/WCBillingSlab.json
index 23578c4d24..4e568bba4c 100644
--- a/data/as/30174622/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174622/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174633/ws-services-calculation/WCBillingSlab.json b/data/as/30174633/ws-services-calculation/WCBillingSlab.json
index 1b606d47d1..3ebcde5eff 100644
--- a/data/as/30174633/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174633/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174651/ws-services-calculation/WCBillingSlab.json b/data/as/30174651/ws-services-calculation/WCBillingSlab.json
index 733c1bcf13..2a5365dc36 100644
--- a/data/as/30174651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174651/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174677/ws-services-calculation/WCBillingSlab.json b/data/as/30174677/ws-services-calculation/WCBillingSlab.json
index e225f5aa29..cc992c5e14 100644
--- a/data/as/30174677/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174677/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174688/ws-services-calculation/WCBillingSlab.json b/data/as/30174688/ws-services-calculation/WCBillingSlab.json
index cfb4250ec2..21fa1befcb 100644
--- a/data/as/30174688/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174688/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174694/ws-services-calculation/WCBillingSlab.json b/data/as/30174694/ws-services-calculation/WCBillingSlab.json
index a30aac9b00..a326b48fc6 100644
--- a/data/as/30174694/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174694/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174699/ws-services-calculation/WCBillingSlab.json b/data/as/30174699/ws-services-calculation/WCBillingSlab.json
index ef8101dc1d..30366f8b8e 100644
--- a/data/as/30174699/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174699/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174700/ws-services-calculation/WCBillingSlab.json b/data/as/30174700/ws-services-calculation/WCBillingSlab.json
index d696f911e5..54214f813a 100644
--- a/data/as/30174700/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174700/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174721/ws-services-calculation/WCBillingSlab.json b/data/as/30174721/ws-services-calculation/WCBillingSlab.json
index 3d418b1d43..61b5268633 100644
--- a/data/as/30174721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174721/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174729/ws-services-calculation/WCBillingSlab.json b/data/as/30174729/ws-services-calculation/WCBillingSlab.json
index 6056f53aec..24b1a36f89 100644
--- a/data/as/30174729/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174729/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174732/ws-services-calculation/WCBillingSlab.json b/data/as/30174732/ws-services-calculation/WCBillingSlab.json
index fb7786062e..7701ec146c 100644
--- a/data/as/30174732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174732/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174740/ws-services-calculation/WCBillingSlab.json b/data/as/30174740/ws-services-calculation/WCBillingSlab.json
index 51b117eb14..7b1e416db5 100644
--- a/data/as/30174740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174740/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174745/ws-services-calculation/WCBillingSlab.json b/data/as/30174745/ws-services-calculation/WCBillingSlab.json
index aa306cfc64..3bda30d9be 100644
--- a/data/as/30174745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174745/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174747/ws-services-calculation/WCBillingSlab.json b/data/as/30174747/ws-services-calculation/WCBillingSlab.json
index 8722b94dc5..510cc566d2 100644
--- a/data/as/30174747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174747/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174796/ws-services-calculation/WCBillingSlab.json b/data/as/30174796/ws-services-calculation/WCBillingSlab.json
index 517b55570a..21c95db62e 100644
--- a/data/as/30174796/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174796/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174826/ws-services-calculation/WCBillingSlab.json b/data/as/30174826/ws-services-calculation/WCBillingSlab.json
index e27b32a644..08ec42b344 100644
--- a/data/as/30174826/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174826/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174847/ws-services-calculation/WCBillingSlab.json b/data/as/30174847/ws-services-calculation/WCBillingSlab.json
index 96915d5c34..a2a39bf136 100644
--- a/data/as/30174847/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174847/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174854/ws-services-calculation/WCBillingSlab.json b/data/as/30174854/ws-services-calculation/WCBillingSlab.json
index d3ff443bec..15ca82c70a 100644
--- a/data/as/30174854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174854/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174863/ws-services-calculation/WCBillingSlab.json b/data/as/30174863/ws-services-calculation/WCBillingSlab.json
index e551c73f4a..5db4af8506 100644
--- a/data/as/30174863/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174863/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174870/ws-services-calculation/WCBillingSlab.json b/data/as/30174870/ws-services-calculation/WCBillingSlab.json
index a2afc5ee94..4771be17c5 100644
--- a/data/as/30174870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174870/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174887/ws-services-calculation/WCBillingSlab.json b/data/as/30174887/ws-services-calculation/WCBillingSlab.json
index 023e3e0cd2..3d001e49b8 100644
--- a/data/as/30174887/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174887/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174894/ws-services-calculation/WCBillingSlab.json b/data/as/30174894/ws-services-calculation/WCBillingSlab.json
index 633169be44..774bbdfe95 100644
--- a/data/as/30174894/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174894/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174961/ws-services-calculation/WCBillingSlab.json b/data/as/30174961/ws-services-calculation/WCBillingSlab.json
index aa5c322c09..51b71eff82 100644
--- a/data/as/30174961/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174961/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30174977/ws-services-calculation/WCBillingSlab.json b/data/as/30174977/ws-services-calculation/WCBillingSlab.json
index 778b713a23..1b2e60b6d5 100644
--- a/data/as/30174977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30174977/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175021/ws-services-calculation/WCBillingSlab.json b/data/as/30175021/ws-services-calculation/WCBillingSlab.json
index 9e5ef2b7a2..55be9271a5 100644
--- a/data/as/30175021/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175021/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175053/ws-services-calculation/WCBillingSlab.json b/data/as/30175053/ws-services-calculation/WCBillingSlab.json
index d16d31f7ef..a099f88bd8 100644
--- a/data/as/30175053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175053/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175075/ws-services-calculation/WCBillingSlab.json b/data/as/30175075/ws-services-calculation/WCBillingSlab.json
index cc4c225d66..643dbad7bc 100644
--- a/data/as/30175075/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175075/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175155/ws-services-calculation/WCBillingSlab.json b/data/as/30175155/ws-services-calculation/WCBillingSlab.json
index 38442a15d9..ce7bf8abcc 100644
--- a/data/as/30175155/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175155/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175169/ws-services-calculation/WCBillingSlab.json b/data/as/30175169/ws-services-calculation/WCBillingSlab.json
index 40c7bbf63a..c3bba7353e 100644
--- a/data/as/30175169/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175169/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175190/ws-services-calculation/WCBillingSlab.json b/data/as/30175190/ws-services-calculation/WCBillingSlab.json
index 2cf15ac66e..0c058b92a9 100644
--- a/data/as/30175190/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175190/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175203/ws-services-calculation/WCBillingSlab.json b/data/as/30175203/ws-services-calculation/WCBillingSlab.json
index 0c2ee2b4ec..48c6495080 100644
--- a/data/as/30175203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175204/ws-services-calculation/WCBillingSlab.json b/data/as/30175204/ws-services-calculation/WCBillingSlab.json
index 1135da741b..fe1b690750 100644
--- a/data/as/30175204/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175204/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175213/ws-services-calculation/WCBillingSlab.json b/data/as/30175213/ws-services-calculation/WCBillingSlab.json
index 3135fbc469..1182f87c97 100644
--- a/data/as/30175213/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175213/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175228/ws-services-calculation/WCBillingSlab.json b/data/as/30175228/ws-services-calculation/WCBillingSlab.json
index 27d517ff00..e01e51f32a 100644
--- a/data/as/30175228/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175228/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175239/ws-services-calculation/WCBillingSlab.json b/data/as/30175239/ws-services-calculation/WCBillingSlab.json
index 84c4c366e1..ef3cc4fab4 100644
--- a/data/as/30175239/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175239/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175264/ws-services-calculation/WCBillingSlab.json b/data/as/30175264/ws-services-calculation/WCBillingSlab.json
index cd28319c7a..3cd9bb1f3f 100644
--- a/data/as/30175264/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175264/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175272/ws-services-calculation/WCBillingSlab.json b/data/as/30175272/ws-services-calculation/WCBillingSlab.json
index 51344585b1..33d5589911 100644
--- a/data/as/30175272/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175272/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175295/ws-services-calculation/WCBillingSlab.json b/data/as/30175295/ws-services-calculation/WCBillingSlab.json
index 4c406e8915..170998f1c7 100644
--- a/data/as/30175295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175295/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175334/ws-services-calculation/WCBillingSlab.json b/data/as/30175334/ws-services-calculation/WCBillingSlab.json
index 7ced3be04a..7e1a1cea7b 100644
--- a/data/as/30175334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175334/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175367/ws-services-calculation/WCBillingSlab.json b/data/as/30175367/ws-services-calculation/WCBillingSlab.json
index 460fccab5f..991960516c 100644
--- a/data/as/30175367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175367/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175392/ws-services-calculation/WCBillingSlab.json b/data/as/30175392/ws-services-calculation/WCBillingSlab.json
index 1eeb06e2fd..9211c8d457 100644
--- a/data/as/30175392/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175392/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175425/ws-services-calculation/WCBillingSlab.json b/data/as/30175425/ws-services-calculation/WCBillingSlab.json
index 81a3ef35d5..0dcfc80b11 100644
--- a/data/as/30175425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175425/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175446/ws-services-calculation/WCBillingSlab.json b/data/as/30175446/ws-services-calculation/WCBillingSlab.json
index d3eaa4d7ac..181e83e2d2 100644
--- a/data/as/30175446/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175446/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175464/ws-services-calculation/WCBillingSlab.json b/data/as/30175464/ws-services-calculation/WCBillingSlab.json
index b0f79a9327..286c2bd38f 100644
--- a/data/as/30175464/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175464/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175466/ws-services-calculation/WCBillingSlab.json b/data/as/30175466/ws-services-calculation/WCBillingSlab.json
index e6555d77c2..b5a26d3c7d 100644
--- a/data/as/30175466/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175466/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175474/ws-services-calculation/WCBillingSlab.json b/data/as/30175474/ws-services-calculation/WCBillingSlab.json
index 42c6673c89..54037ed7b9 100644
--- a/data/as/30175474/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175474/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175490/ws-services-calculation/WCBillingSlab.json b/data/as/30175490/ws-services-calculation/WCBillingSlab.json
index 5f6263871c..8ca14b4326 100644
--- a/data/as/30175490/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175490/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175493/ws-services-calculation/WCBillingSlab.json b/data/as/30175493/ws-services-calculation/WCBillingSlab.json
index 4d57dc5ea6..b9d85f3609 100644
--- a/data/as/30175493/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175493/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175539/ws-services-calculation/WCBillingSlab.json b/data/as/30175539/ws-services-calculation/WCBillingSlab.json
index 9ca6b146ac..75d652be2a 100644
--- a/data/as/30175539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175539/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175554/ws-services-calculation/WCBillingSlab.json b/data/as/30175554/ws-services-calculation/WCBillingSlab.json
index 27b5789140..88b7e881f3 100644
--- a/data/as/30175554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175635/ws-services-calculation/WCBillingSlab.json b/data/as/30175635/ws-services-calculation/WCBillingSlab.json
index 790914b450..e6e4f4971b 100644
--- a/data/as/30175635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175648/ws-services-calculation/WCBillingSlab.json b/data/as/30175648/ws-services-calculation/WCBillingSlab.json
index 08d10b4db6..f48a58a146 100644
--- a/data/as/30175648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175648/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175668/ws-services-calculation/WCBillingSlab.json b/data/as/30175668/ws-services-calculation/WCBillingSlab.json
index 6ad665ab39..0070a320b0 100644
--- a/data/as/30175668/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175668/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175691/ws-services-calculation/WCBillingSlab.json b/data/as/30175691/ws-services-calculation/WCBillingSlab.json
index 64f888f188..d9200e9fb5 100644
--- a/data/as/30175691/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175691/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175708/ws-services-calculation/WCBillingSlab.json b/data/as/30175708/ws-services-calculation/WCBillingSlab.json
index b2d9750592..e271eea736 100644
--- a/data/as/30175708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175708/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175727/ws-services-calculation/WCBillingSlab.json b/data/as/30175727/ws-services-calculation/WCBillingSlab.json
index 0fb007f396..bdbd21c9ed 100644
--- a/data/as/30175727/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175727/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175767/ws-services-calculation/WCBillingSlab.json b/data/as/30175767/ws-services-calculation/WCBillingSlab.json
index eabe23b642..3917498cf2 100644
--- a/data/as/30175767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175767/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175783/ws-services-calculation/WCBillingSlab.json b/data/as/30175783/ws-services-calculation/WCBillingSlab.json
index 0df17feab6..9e921f212a 100644
--- a/data/as/30175783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175783/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175784/ws-services-calculation/WCBillingSlab.json b/data/as/30175784/ws-services-calculation/WCBillingSlab.json
index 5859395050..7e5fe89a16 100644
--- a/data/as/30175784/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175784/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175795/ws-services-calculation/WCBillingSlab.json b/data/as/30175795/ws-services-calculation/WCBillingSlab.json
index 32d76035f4..46494d1376 100644
--- a/data/as/30175795/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175795/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175807/ws-services-calculation/WCBillingSlab.json b/data/as/30175807/ws-services-calculation/WCBillingSlab.json
index e8df79da1e..e8e16eb7ad 100644
--- a/data/as/30175807/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175807/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175812/ws-services-calculation/WCBillingSlab.json b/data/as/30175812/ws-services-calculation/WCBillingSlab.json
index 6b050d5ce9..a1379f2fde 100644
--- a/data/as/30175812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175821/ws-services-calculation/WCBillingSlab.json b/data/as/30175821/ws-services-calculation/WCBillingSlab.json
index 76ef45982b..ae6e58c9be 100644
--- a/data/as/30175821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175821/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175827/ws-services-calculation/WCBillingSlab.json b/data/as/30175827/ws-services-calculation/WCBillingSlab.json
index 593ea94f07..3a5d605276 100644
--- a/data/as/30175827/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175827/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175831/ws-services-calculation/WCBillingSlab.json b/data/as/30175831/ws-services-calculation/WCBillingSlab.json
index f5ccbc4233..2345579d4c 100644
--- a/data/as/30175831/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175831/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175853/ws-services-calculation/WCBillingSlab.json b/data/as/30175853/ws-services-calculation/WCBillingSlab.json
index 2ac7ebee7d..f71d808523 100644
--- a/data/as/30175853/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175853/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175854/ws-services-calculation/WCBillingSlab.json b/data/as/30175854/ws-services-calculation/WCBillingSlab.json
index 422e5e1641..f9c8cea82b 100644
--- a/data/as/30175854/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175854/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175867/ws-services-calculation/WCBillingSlab.json b/data/as/30175867/ws-services-calculation/WCBillingSlab.json
index 6bb72a6f16..df97cfdd75 100644
--- a/data/as/30175867/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175867/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175876/ws-services-calculation/WCBillingSlab.json b/data/as/30175876/ws-services-calculation/WCBillingSlab.json
index b5e4b83b2e..83342a5148 100644
--- a/data/as/30175876/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175876/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175883/ws-services-calculation/WCBillingSlab.json b/data/as/30175883/ws-services-calculation/WCBillingSlab.json
index bc89a17cd8..ecf1be8c98 100644
--- a/data/as/30175883/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175883/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175888/ws-services-calculation/WCBillingSlab.json b/data/as/30175888/ws-services-calculation/WCBillingSlab.json
index 010f08a4d3..69c8cabb29 100644
--- a/data/as/30175888/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175888/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175891/ws-services-calculation/WCBillingSlab.json b/data/as/30175891/ws-services-calculation/WCBillingSlab.json
index 66a0f7505e..4ba6c79c5e 100644
--- a/data/as/30175891/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175891/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175904/ws-services-calculation/WCBillingSlab.json b/data/as/30175904/ws-services-calculation/WCBillingSlab.json
index 4d924732ee..441bcb75ea 100644
--- a/data/as/30175904/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175904/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175917/ws-services-calculation/WCBillingSlab.json b/data/as/30175917/ws-services-calculation/WCBillingSlab.json
index eee9556ab6..e23113b5d9 100644
--- a/data/as/30175917/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175917/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30175983/ws-services-calculation/WCBillingSlab.json b/data/as/30175983/ws-services-calculation/WCBillingSlab.json
index 22ac68e8ec..ff18210648 100644
--- a/data/as/30175983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30175983/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176038/ws-services-calculation/WCBillingSlab.json b/data/as/30176038/ws-services-calculation/WCBillingSlab.json
index 410976ac35..83e122bfa2 100644
--- a/data/as/30176038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176038/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176114/ws-services-calculation/WCBillingSlab.json b/data/as/30176114/ws-services-calculation/WCBillingSlab.json
index 135ccceaa7..12d8efbca7 100644
--- a/data/as/30176114/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176114/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176117/ws-services-calculation/WCBillingSlab.json b/data/as/30176117/ws-services-calculation/WCBillingSlab.json
index 24bb9c9103..6832331543 100644
--- a/data/as/30176117/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176117/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176156/ws-services-calculation/WCBillingSlab.json b/data/as/30176156/ws-services-calculation/WCBillingSlab.json
index 0907033575..767c4cfe73 100644
--- a/data/as/30176156/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176156/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176170/ws-services-calculation/WCBillingSlab.json b/data/as/30176170/ws-services-calculation/WCBillingSlab.json
index 159cca8ba3..6613dbac36 100644
--- a/data/as/30176170/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176170/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176178/ws-services-calculation/WCBillingSlab.json b/data/as/30176178/ws-services-calculation/WCBillingSlab.json
index 6a6c0548c0..ed44de5daa 100644
--- a/data/as/30176178/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176178/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176209/ws-services-calculation/WCBillingSlab.json b/data/as/30176209/ws-services-calculation/WCBillingSlab.json
index 8db4d75d1f..ba707ae7a6 100644
--- a/data/as/30176209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176209/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176222/ws-services-calculation/WCBillingSlab.json b/data/as/30176222/ws-services-calculation/WCBillingSlab.json
index b4f52bfc80..0c74583a61 100644
--- a/data/as/30176222/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176222/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176252/ws-services-calculation/WCBillingSlab.json b/data/as/30176252/ws-services-calculation/WCBillingSlab.json
index 8e3cd33703..5e216d2c4f 100644
--- a/data/as/30176252/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176252/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176279/ws-services-calculation/WCBillingSlab.json b/data/as/30176279/ws-services-calculation/WCBillingSlab.json
index a415df7294..6f3d98e1c6 100644
--- a/data/as/30176279/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176279/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176310/ws-services-calculation/WCBillingSlab.json b/data/as/30176310/ws-services-calculation/WCBillingSlab.json
index 4a4ebbdcd7..947f3cbbea 100644
--- a/data/as/30176310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176310/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176350/ws-services-calculation/WCBillingSlab.json b/data/as/30176350/ws-services-calculation/WCBillingSlab.json
index c3775afdc9..caa43f1464 100644
--- a/data/as/30176350/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176350/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176394/ws-services-calculation/WCBillingSlab.json b/data/as/30176394/ws-services-calculation/WCBillingSlab.json
index 3e653178b7..76e217f557 100644
--- a/data/as/30176394/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176394/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176403/ws-services-calculation/WCBillingSlab.json b/data/as/30176403/ws-services-calculation/WCBillingSlab.json
index 94ceab86fa..2a4e51fbb3 100644
--- a/data/as/30176403/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176403/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176503/ws-services-calculation/WCBillingSlab.json b/data/as/30176503/ws-services-calculation/WCBillingSlab.json
index d83a867e13..fcdc73610f 100644
--- a/data/as/30176503/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176503/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176512/ws-services-calculation/WCBillingSlab.json b/data/as/30176512/ws-services-calculation/WCBillingSlab.json
index a4f9fce2ec..4c8127b08b 100644
--- a/data/as/30176512/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176512/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176517/ws-services-calculation/WCBillingSlab.json b/data/as/30176517/ws-services-calculation/WCBillingSlab.json
index bfde0cd8e3..fbb594b15e 100644
--- a/data/as/30176517/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176517/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176525/ws-services-calculation/WCBillingSlab.json b/data/as/30176525/ws-services-calculation/WCBillingSlab.json
index 8000357027..c445e00b4d 100644
--- a/data/as/30176525/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176525/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176539/ws-services-calculation/WCBillingSlab.json b/data/as/30176539/ws-services-calculation/WCBillingSlab.json
index 58736bdc45..d7998e7a19 100644
--- a/data/as/30176539/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176539/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176552/ws-services-calculation/WCBillingSlab.json b/data/as/30176552/ws-services-calculation/WCBillingSlab.json
index 5d3567a88f..3147259223 100644
--- a/data/as/30176552/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176552/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176563/ws-services-calculation/WCBillingSlab.json b/data/as/30176563/ws-services-calculation/WCBillingSlab.json
index 7b95f83e31..ce3665fb6b 100644
--- a/data/as/30176563/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176563/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176575/ws-services-calculation/WCBillingSlab.json b/data/as/30176575/ws-services-calculation/WCBillingSlab.json
index f567eef4d2..9cc674bf90 100644
--- a/data/as/30176575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176575/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176589/ws-services-calculation/WCBillingSlab.json b/data/as/30176589/ws-services-calculation/WCBillingSlab.json
index 961697d93b..92a2ae5013 100644
--- a/data/as/30176589/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176589/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176605/ws-services-calculation/WCBillingSlab.json b/data/as/30176605/ws-services-calculation/WCBillingSlab.json
index 4e3054ba4d..c23b47362f 100644
--- a/data/as/30176605/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176605/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176670/ws-services-calculation/WCBillingSlab.json b/data/as/30176670/ws-services-calculation/WCBillingSlab.json
index c3eca3f95e..f48fbb741c 100644
--- a/data/as/30176670/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176670/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176673/ws-services-calculation/WCBillingSlab.json b/data/as/30176673/ws-services-calculation/WCBillingSlab.json
index ef2d7a74f7..3e8c4756df 100644
--- a/data/as/30176673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176676/ws-services-calculation/WCBillingSlab.json b/data/as/30176676/ws-services-calculation/WCBillingSlab.json
index 25fbb1939d..f560bfb17b 100644
--- a/data/as/30176676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176676/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176679/ws-services-calculation/WCBillingSlab.json b/data/as/30176679/ws-services-calculation/WCBillingSlab.json
index e5096440a1..bbda57c98c 100644
--- a/data/as/30176679/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176679/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176683/ws-services-calculation/WCBillingSlab.json b/data/as/30176683/ws-services-calculation/WCBillingSlab.json
index 4c07bc1d4a..37d8991a8b 100644
--- a/data/as/30176683/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176683/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176709/ws-services-calculation/WCBillingSlab.json b/data/as/30176709/ws-services-calculation/WCBillingSlab.json
index ac8269d8ef..58681e7749 100644
--- a/data/as/30176709/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176709/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176714/ws-services-calculation/WCBillingSlab.json b/data/as/30176714/ws-services-calculation/WCBillingSlab.json
index 5f645608e5..6b57be5997 100644
--- a/data/as/30176714/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176714/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176720/ws-services-calculation/WCBillingSlab.json b/data/as/30176720/ws-services-calculation/WCBillingSlab.json
index 49a2644e0c..9e65bd389d 100644
--- a/data/as/30176720/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176720/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30176756/ws-services-calculation/WCBillingSlab.json b/data/as/30176756/ws-services-calculation/WCBillingSlab.json
index b6d9879abd..bf79a492ee 100644
--- a/data/as/30176756/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30176756/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177227/ws-services-calculation/WCBillingSlab.json b/data/as/30177227/ws-services-calculation/WCBillingSlab.json
index 71298d8182..36a72f9111 100644
--- a/data/as/30177227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177227/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177242/ws-services-calculation/WCBillingSlab.json b/data/as/30177242/ws-services-calculation/WCBillingSlab.json
index 4dbc698f14..29d05d6eef 100644
--- a/data/as/30177242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177242/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177275/ws-services-calculation/WCBillingSlab.json b/data/as/30177275/ws-services-calculation/WCBillingSlab.json
index 543568d9b9..b38ee8bdf5 100644
--- a/data/as/30177275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177275/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177297/ws-services-calculation/WCBillingSlab.json b/data/as/30177297/ws-services-calculation/WCBillingSlab.json
index 579cf85339..b5f8d8dc76 100644
--- a/data/as/30177297/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177297/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177314/ws-services-calculation/WCBillingSlab.json b/data/as/30177314/ws-services-calculation/WCBillingSlab.json
index 6afedbc10f..502b07d772 100644
--- a/data/as/30177314/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177314/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177334/ws-services-calculation/WCBillingSlab.json b/data/as/30177334/ws-services-calculation/WCBillingSlab.json
index 741653cbb1..9eff99170f 100644
--- a/data/as/30177334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177334/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177375/ws-services-calculation/WCBillingSlab.json b/data/as/30177375/ws-services-calculation/WCBillingSlab.json
index bba266746f..d0d8cb1181 100644
--- a/data/as/30177375/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177375/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177874/ws-services-calculation/WCBillingSlab.json b/data/as/30177874/ws-services-calculation/WCBillingSlab.json
index b0f8e1fd03..2b0a8cba4d 100644
--- a/data/as/30177874/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177874/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177929/ws-services-calculation/WCBillingSlab.json b/data/as/30177929/ws-services-calculation/WCBillingSlab.json
index 20a5b0ced8..1f103cd67a 100644
--- a/data/as/30177929/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177929/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177971/ws-services-calculation/WCBillingSlab.json b/data/as/30177971/ws-services-calculation/WCBillingSlab.json
index 8e48d4aff6..330ed4dea2 100644
--- a/data/as/30177971/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177971/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30177999/ws-services-calculation/WCBillingSlab.json b/data/as/30177999/ws-services-calculation/WCBillingSlab.json
index 9be57d6fc4..fb4c077072 100644
--- a/data/as/30177999/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30177999/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178023/ws-services-calculation/WCBillingSlab.json b/data/as/30178023/ws-services-calculation/WCBillingSlab.json
index 3e77a2a3ed..ee239491f8 100644
--- a/data/as/30178023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178023/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178056/ws-services-calculation/WCBillingSlab.json b/data/as/30178056/ws-services-calculation/WCBillingSlab.json
index 585cd8ed68..7d5554be01 100644
--- a/data/as/30178056/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178056/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178092/ws-services-calculation/WCBillingSlab.json b/data/as/30178092/ws-services-calculation/WCBillingSlab.json
index f9506a9523..703b0566a2 100644
--- a/data/as/30178092/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178092/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178124/ws-services-calculation/WCBillingSlab.json b/data/as/30178124/ws-services-calculation/WCBillingSlab.json
index 5ac4298d1c..8da833662e 100644
--- a/data/as/30178124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178175/ws-services-calculation/WCBillingSlab.json b/data/as/30178175/ws-services-calculation/WCBillingSlab.json
index 6f4f75a5d0..576a7d5489 100644
--- a/data/as/30178175/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178175/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178287/ws-services-calculation/WCBillingSlab.json b/data/as/30178287/ws-services-calculation/WCBillingSlab.json
index 724e44c7d4..638aa32911 100644
--- a/data/as/30178287/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178287/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178310/ws-services-calculation/WCBillingSlab.json b/data/as/30178310/ws-services-calculation/WCBillingSlab.json
index a11e630d8f..15bc575b2b 100644
--- a/data/as/30178310/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178310/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178331/ws-services-calculation/WCBillingSlab.json b/data/as/30178331/ws-services-calculation/WCBillingSlab.json
index 77b86b3f16..c633a4a0f7 100644
--- a/data/as/30178331/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178331/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178371/ws-services-calculation/WCBillingSlab.json b/data/as/30178371/ws-services-calculation/WCBillingSlab.json
index d43191036a..88dd9222a8 100644
--- a/data/as/30178371/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178371/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178397/ws-services-calculation/WCBillingSlab.json b/data/as/30178397/ws-services-calculation/WCBillingSlab.json
index 1da1d7666b..4574a9b1d8 100644
--- a/data/as/30178397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178397/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178423/ws-services-calculation/WCBillingSlab.json b/data/as/30178423/ws-services-calculation/WCBillingSlab.json
index a1e11af13c..67427e4e25 100644
--- a/data/as/30178423/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178423/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178440/ws-services-calculation/WCBillingSlab.json b/data/as/30178440/ws-services-calculation/WCBillingSlab.json
index 5a0074990e..07b7d525d3 100644
--- a/data/as/30178440/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178440/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178942/ws-services-calculation/WCBillingSlab.json b/data/as/30178942/ws-services-calculation/WCBillingSlab.json
index 9cdf810b59..5ad0555297 100644
--- a/data/as/30178942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178942/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30178977/ws-services-calculation/WCBillingSlab.json b/data/as/30178977/ws-services-calculation/WCBillingSlab.json
index 95703b3f32..57f434994b 100644
--- a/data/as/30178977/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30178977/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179000/ws-services-calculation/WCBillingSlab.json b/data/as/30179000/ws-services-calculation/WCBillingSlab.json
index adf363bf0c..61c06da675 100644
--- a/data/as/30179000/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179000/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179124/ws-services-calculation/WCBillingSlab.json b/data/as/30179124/ws-services-calculation/WCBillingSlab.json
index b793ee25ce..f41b94328e 100644
--- a/data/as/30179124/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179124/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179165/ws-services-calculation/WCBillingSlab.json b/data/as/30179165/ws-services-calculation/WCBillingSlab.json
index 6a87fe737a..75593b1fe1 100644
--- a/data/as/30179165/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179165/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179209/ws-services-calculation/WCBillingSlab.json b/data/as/30179209/ws-services-calculation/WCBillingSlab.json
index 11dc7b40dd..68766b6428 100644
--- a/data/as/30179209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179209/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179232/ws-services-calculation/WCBillingSlab.json b/data/as/30179232/ws-services-calculation/WCBillingSlab.json
index 6dfee09bf8..9c4822dfde 100644
--- a/data/as/30179232/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179232/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179397/ws-services-calculation/WCBillingSlab.json b/data/as/30179397/ws-services-calculation/WCBillingSlab.json
index 6f4b672690..2798133a7a 100644
--- a/data/as/30179397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179397/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179439/ws-services-calculation/WCBillingSlab.json b/data/as/30179439/ws-services-calculation/WCBillingSlab.json
index 4492b02d3a..ee50526e8c 100644
--- a/data/as/30179439/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179439/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179473/ws-services-calculation/WCBillingSlab.json b/data/as/30179473/ws-services-calculation/WCBillingSlab.json
index bc483f0c5d..d09f1f43ac 100644
--- a/data/as/30179473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179473/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179510/ws-services-calculation/WCBillingSlab.json b/data/as/30179510/ws-services-calculation/WCBillingSlab.json
index 75f7337086..d716ece1fa 100644
--- a/data/as/30179510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179510/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179533/ws-services-calculation/WCBillingSlab.json b/data/as/30179533/ws-services-calculation/WCBillingSlab.json
index b1f69e64ce..145eeef37b 100644
--- a/data/as/30179533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179578/ws-services-calculation/WCBillingSlab.json b/data/as/30179578/ws-services-calculation/WCBillingSlab.json
index 41c1a61f51..e7362bcb35 100644
--- a/data/as/30179578/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179578/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179689/ws-services-calculation/WCBillingSlab.json b/data/as/30179689/ws-services-calculation/WCBillingSlab.json
index 4c61bdd2ab..7396f8e8c4 100644
--- a/data/as/30179689/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179689/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179724/ws-services-calculation/WCBillingSlab.json b/data/as/30179724/ws-services-calculation/WCBillingSlab.json
index 1c4312347d..8e58f478ba 100644
--- a/data/as/30179724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179739/ws-services-calculation/WCBillingSlab.json b/data/as/30179739/ws-services-calculation/WCBillingSlab.json
index 592bb38aa4..7d5555d1bb 100644
--- a/data/as/30179739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179767/ws-services-calculation/WCBillingSlab.json b/data/as/30179767/ws-services-calculation/WCBillingSlab.json
index 72f73348d9..58738749f5 100644
--- a/data/as/30179767/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179767/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179793/ws-services-calculation/WCBillingSlab.json b/data/as/30179793/ws-services-calculation/WCBillingSlab.json
index 405a6949aa..ea52e9478d 100644
--- a/data/as/30179793/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179793/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179802/ws-services-calculation/WCBillingSlab.json b/data/as/30179802/ws-services-calculation/WCBillingSlab.json
index 5526f01a92..29c1b2bf92 100644
--- a/data/as/30179802/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179802/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179808/ws-services-calculation/WCBillingSlab.json b/data/as/30179808/ws-services-calculation/WCBillingSlab.json
index cfa8f7236d..773d282ad7 100644
--- a/data/as/30179808/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179808/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179812/ws-services-calculation/WCBillingSlab.json b/data/as/30179812/ws-services-calculation/WCBillingSlab.json
index 9b0db2599e..98fbd1fa7a 100644
--- a/data/as/30179812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179815/ws-services-calculation/WCBillingSlab.json b/data/as/30179815/ws-services-calculation/WCBillingSlab.json
index d494516f4d..9b0e84f5c4 100644
--- a/data/as/30179815/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179815/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30179821/ws-services-calculation/WCBillingSlab.json b/data/as/30179821/ws-services-calculation/WCBillingSlab.json
index cb45078df1..49ae7f24bd 100644
--- a/data/as/30179821/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30179821/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180631/ws-services-calculation/WCBillingSlab.json b/data/as/30180631/ws-services-calculation/WCBillingSlab.json
index d56ec45d25..7f9ab22cf1 100644
--- a/data/as/30180631/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180631/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180654/ws-services-calculation/WCBillingSlab.json b/data/as/30180654/ws-services-calculation/WCBillingSlab.json
index 6d11830f54..a85b62234d 100644
--- a/data/as/30180654/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180654/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180663/ws-services-calculation/WCBillingSlab.json b/data/as/30180663/ws-services-calculation/WCBillingSlab.json
index bc83777c28..a54504d913 100644
--- a/data/as/30180663/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180663/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180675/ws-services-calculation/WCBillingSlab.json b/data/as/30180675/ws-services-calculation/WCBillingSlab.json
index e377db791a..cda35ce1c1 100644
--- a/data/as/30180675/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180675/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180698/ws-services-calculation/WCBillingSlab.json b/data/as/30180698/ws-services-calculation/WCBillingSlab.json
index 08acce0d0a..ce3d0c1f97 100644
--- a/data/as/30180698/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180698/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180724/ws-services-calculation/WCBillingSlab.json b/data/as/30180724/ws-services-calculation/WCBillingSlab.json
index a1428e9e0b..c4e1865e9e 100644
--- a/data/as/30180724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180855/ws-services-calculation/WCBillingSlab.json b/data/as/30180855/ws-services-calculation/WCBillingSlab.json
index e00c6a0653..2126f465b7 100644
--- a/data/as/30180855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180855/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180870/ws-services-calculation/WCBillingSlab.json b/data/as/30180870/ws-services-calculation/WCBillingSlab.json
index e91a3593ce..876045d36d 100644
--- a/data/as/30180870/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180870/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180952/ws-services-calculation/WCBillingSlab.json b/data/as/30180952/ws-services-calculation/WCBillingSlab.json
index 8ad45a610a..3a1c944f34 100644
--- a/data/as/30180952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180952/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30180965/ws-services-calculation/WCBillingSlab.json b/data/as/30180965/ws-services-calculation/WCBillingSlab.json
index 8a6fff57c4..c54013f2d3 100644
--- a/data/as/30180965/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30180965/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181077/ws-services-calculation/WCBillingSlab.json b/data/as/30181077/ws-services-calculation/WCBillingSlab.json
index 0cd643f8d6..ff93b7d378 100644
--- a/data/as/30181077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181077/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181091/ws-services-calculation/WCBillingSlab.json b/data/as/30181091/ws-services-calculation/WCBillingSlab.json
index 551334cde2..c1691e8895 100644
--- a/data/as/30181091/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181091/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181099/ws-services-calculation/WCBillingSlab.json b/data/as/30181099/ws-services-calculation/WCBillingSlab.json
index 7b5d19e467..db48892372 100644
--- a/data/as/30181099/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181099/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181126/ws-services-calculation/WCBillingSlab.json b/data/as/30181126/ws-services-calculation/WCBillingSlab.json
index a8be2753ec..f7e6966129 100644
--- a/data/as/30181126/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181126/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181144/ws-services-calculation/WCBillingSlab.json b/data/as/30181144/ws-services-calculation/WCBillingSlab.json
index 6653960165..3407c6d467 100644
--- a/data/as/30181144/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181144/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181145/ws-services-calculation/WCBillingSlab.json b/data/as/30181145/ws-services-calculation/WCBillingSlab.json
index 465521da2e..c54b90abd3 100644
--- a/data/as/30181145/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181145/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181168/ws-services-calculation/WCBillingSlab.json b/data/as/30181168/ws-services-calculation/WCBillingSlab.json
index 7033f1437e..393483c916 100644
--- a/data/as/30181168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181168/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181188/ws-services-calculation/WCBillingSlab.json b/data/as/30181188/ws-services-calculation/WCBillingSlab.json
index b4bb2a1815..429a655891 100644
--- a/data/as/30181188/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181188/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181246/ws-services-calculation/WCBillingSlab.json b/data/as/30181246/ws-services-calculation/WCBillingSlab.json
index 9482f76971..83fdf34117 100644
--- a/data/as/30181246/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181246/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181257/ws-services-calculation/WCBillingSlab.json b/data/as/30181257/ws-services-calculation/WCBillingSlab.json
index 91b7b23be2..fdd8979f29 100644
--- a/data/as/30181257/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181257/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181268/ws-services-calculation/WCBillingSlab.json b/data/as/30181268/ws-services-calculation/WCBillingSlab.json
index d750d12336..376d2ba892 100644
--- a/data/as/30181268/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181268/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181293/ws-services-calculation/WCBillingSlab.json b/data/as/30181293/ws-services-calculation/WCBillingSlab.json
index 8c0b9905c8..217745812f 100644
--- a/data/as/30181293/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181293/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181327/ws-services-calculation/WCBillingSlab.json b/data/as/30181327/ws-services-calculation/WCBillingSlab.json
index 0032d78b39..8f32a2fb8f 100644
--- a/data/as/30181327/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181327/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181400/ws-services-calculation/WCBillingSlab.json b/data/as/30181400/ws-services-calculation/WCBillingSlab.json
index e9be555fc3..4a06b4ffdf 100644
--- a/data/as/30181400/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181400/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181411/ws-services-calculation/WCBillingSlab.json b/data/as/30181411/ws-services-calculation/WCBillingSlab.json
index 59ee87f994..8bedb50818 100644
--- a/data/as/30181411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181411/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181434/ws-services-calculation/WCBillingSlab.json b/data/as/30181434/ws-services-calculation/WCBillingSlab.json
index 7c51eee2a7..3f5920f006 100644
--- a/data/as/30181434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181434/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181444/ws-services-calculation/WCBillingSlab.json b/data/as/30181444/ws-services-calculation/WCBillingSlab.json
index e1653bbccf..0bba7c70ea 100644
--- a/data/as/30181444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181444/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181457/ws-services-calculation/WCBillingSlab.json b/data/as/30181457/ws-services-calculation/WCBillingSlab.json
index 4e375b177c..64d0917373 100644
--- a/data/as/30181457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181457/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181562/ws-services-calculation/WCBillingSlab.json b/data/as/30181562/ws-services-calculation/WCBillingSlab.json
index e557fc5e78..ac32a62147 100644
--- a/data/as/30181562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181562/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181575/ws-services-calculation/WCBillingSlab.json b/data/as/30181575/ws-services-calculation/WCBillingSlab.json
index 22b95e8961..71125a1937 100644
--- a/data/as/30181575/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181575/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181597/ws-services-calculation/WCBillingSlab.json b/data/as/30181597/ws-services-calculation/WCBillingSlab.json
index c495f8d463..db0ccbb963 100644
--- a/data/as/30181597/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181597/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181604/ws-services-calculation/WCBillingSlab.json b/data/as/30181604/ws-services-calculation/WCBillingSlab.json
index 4a1aa4d43e..ed3452bac5 100644
--- a/data/as/30181604/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181604/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181615/ws-services-calculation/WCBillingSlab.json b/data/as/30181615/ws-services-calculation/WCBillingSlab.json
index cd9529486b..601ab219ab 100644
--- a/data/as/30181615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181615/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181621/ws-services-calculation/WCBillingSlab.json b/data/as/30181621/ws-services-calculation/WCBillingSlab.json
index 55d02b733b..99feff06d1 100644
--- a/data/as/30181621/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181621/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181628/ws-services-calculation/WCBillingSlab.json b/data/as/30181628/ws-services-calculation/WCBillingSlab.json
index c1d5173700..cdf93bfe58 100644
--- a/data/as/30181628/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181628/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181639/ws-services-calculation/WCBillingSlab.json b/data/as/30181639/ws-services-calculation/WCBillingSlab.json
index f503384697..120f7380a6 100644
--- a/data/as/30181639/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181639/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181769/ws-services-calculation/WCBillingSlab.json b/data/as/30181769/ws-services-calculation/WCBillingSlab.json
index 513eda653c..90923046c8 100644
--- a/data/as/30181769/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181769/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181824/ws-services-calculation/WCBillingSlab.json b/data/as/30181824/ws-services-calculation/WCBillingSlab.json
index 62ac09fab5..19f6270dee 100644
--- a/data/as/30181824/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181824/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181850/ws-services-calculation/WCBillingSlab.json b/data/as/30181850/ws-services-calculation/WCBillingSlab.json
index 3f3bd2f9e8..70feaccec1 100644
--- a/data/as/30181850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181850/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181892/ws-services-calculation/WCBillingSlab.json b/data/as/30181892/ws-services-calculation/WCBillingSlab.json
index b20658ca48..37eaaf42ac 100644
--- a/data/as/30181892/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181892/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181910/ws-services-calculation/WCBillingSlab.json b/data/as/30181910/ws-services-calculation/WCBillingSlab.json
index aedd558987..92a72def1b 100644
--- a/data/as/30181910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181910/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181935/ws-services-calculation/WCBillingSlab.json b/data/as/30181935/ws-services-calculation/WCBillingSlab.json
index 226d826053..ac5fcdcce3 100644
--- a/data/as/30181935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181935/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181958/ws-services-calculation/WCBillingSlab.json b/data/as/30181958/ws-services-calculation/WCBillingSlab.json
index f376560c2b..6a70e86471 100644
--- a/data/as/30181958/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181958/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30181970/ws-services-calculation/WCBillingSlab.json b/data/as/30181970/ws-services-calculation/WCBillingSlab.json
index 592056333f..3838ef6601 100644
--- a/data/as/30181970/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30181970/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182020/ws-services-calculation/WCBillingSlab.json b/data/as/30182020/ws-services-calculation/WCBillingSlab.json
index 3864dfa814..41c7ed84d4 100644
--- a/data/as/30182020/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182020/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182059/ws-services-calculation/WCBillingSlab.json b/data/as/30182059/ws-services-calculation/WCBillingSlab.json
index 6e8c9f41e5..f18605a1a9 100644
--- a/data/as/30182059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182059/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182076/ws-services-calculation/WCBillingSlab.json b/data/as/30182076/ws-services-calculation/WCBillingSlab.json
index 875bc35914..ec664965b9 100644
--- a/data/as/30182076/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182076/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182096/ws-services-calculation/WCBillingSlab.json b/data/as/30182096/ws-services-calculation/WCBillingSlab.json
index f633095e43..2fb4d2217f 100644
--- a/data/as/30182096/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182096/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182115/ws-services-calculation/WCBillingSlab.json b/data/as/30182115/ws-services-calculation/WCBillingSlab.json
index 6a36c3fe02..70e12db7d3 100644
--- a/data/as/30182115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182115/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182130/ws-services-calculation/WCBillingSlab.json b/data/as/30182130/ws-services-calculation/WCBillingSlab.json
index d316a7f2b7..b2623ae876 100644
--- a/data/as/30182130/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182130/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182227/ws-services-calculation/WCBillingSlab.json b/data/as/30182227/ws-services-calculation/WCBillingSlab.json
index ebbff621ec..e747807e82 100644
--- a/data/as/30182227/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182227/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182259/ws-services-calculation/WCBillingSlab.json b/data/as/30182259/ws-services-calculation/WCBillingSlab.json
index 6e86b80b0c..327341c9a7 100644
--- a/data/as/30182259/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182259/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182280/ws-services-calculation/WCBillingSlab.json b/data/as/30182280/ws-services-calculation/WCBillingSlab.json
index 2a59ee9ad1..75cd504b4e 100644
--- a/data/as/30182280/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182280/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182312/ws-services-calculation/WCBillingSlab.json b/data/as/30182312/ws-services-calculation/WCBillingSlab.json
index edc65fedf7..4c22232a81 100644
--- a/data/as/30182312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182324/ws-services-calculation/WCBillingSlab.json b/data/as/30182324/ws-services-calculation/WCBillingSlab.json
index 987f355d4f..0b07cc3993 100644
--- a/data/as/30182324/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182324/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182346/ws-services-calculation/WCBillingSlab.json b/data/as/30182346/ws-services-calculation/WCBillingSlab.json
index 925ffd224d..554c939e62 100644
--- a/data/as/30182346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182346/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182357/ws-services-calculation/WCBillingSlab.json b/data/as/30182357/ws-services-calculation/WCBillingSlab.json
index 63c2343cb8..07dea34dc7 100644
--- a/data/as/30182357/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182357/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182369/ws-services-calculation/WCBillingSlab.json b/data/as/30182369/ws-services-calculation/WCBillingSlab.json
index 2936da4bc0..5ebbeec14f 100644
--- a/data/as/30182369/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182369/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182379/ws-services-calculation/WCBillingSlab.json b/data/as/30182379/ws-services-calculation/WCBillingSlab.json
index 3a25ac881e..28233f5a23 100644
--- a/data/as/30182379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182379/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182397/ws-services-calculation/WCBillingSlab.json b/data/as/30182397/ws-services-calculation/WCBillingSlab.json
index 46ab321daa..928dc8b239 100644
--- a/data/as/30182397/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182397/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182413/ws-services-calculation/WCBillingSlab.json b/data/as/30182413/ws-services-calculation/WCBillingSlab.json
index d775aad525..3c24e2f199 100644
--- a/data/as/30182413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182413/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182433/ws-services-calculation/WCBillingSlab.json b/data/as/30182433/ws-services-calculation/WCBillingSlab.json
index 401bfa8adc..5a2e78f89a 100644
--- a/data/as/30182433/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182433/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182444/ws-services-calculation/WCBillingSlab.json b/data/as/30182444/ws-services-calculation/WCBillingSlab.json
index d6bf3df2d2..de3b4bd444 100644
--- a/data/as/30182444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182444/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182458/ws-services-calculation/WCBillingSlab.json b/data/as/30182458/ws-services-calculation/WCBillingSlab.json
index 028fb84220..68457f34fc 100644
--- a/data/as/30182458/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182458/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182473/ws-services-calculation/WCBillingSlab.json b/data/as/30182473/ws-services-calculation/WCBillingSlab.json
index 97eec80ae3..cabc31c7ce 100644
--- a/data/as/30182473/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182473/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182492/ws-services-calculation/WCBillingSlab.json b/data/as/30182492/ws-services-calculation/WCBillingSlab.json
index 1fafbe7110..e24733f05b 100644
--- a/data/as/30182492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182492/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30182502/ws-services-calculation/WCBillingSlab.json b/data/as/30182502/ws-services-calculation/WCBillingSlab.json
index 92b404ff6b..2610319bc2 100644
--- a/data/as/30182502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30182502/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183072/ws-services-calculation/WCBillingSlab.json b/data/as/30183072/ws-services-calculation/WCBillingSlab.json
index 4936bbef34..b1e4e64464 100644
--- a/data/as/30183072/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183072/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183077/ws-services-calculation/WCBillingSlab.json b/data/as/30183077/ws-services-calculation/WCBillingSlab.json
index 9b7f12f1f7..0266341cd7 100644
--- a/data/as/30183077/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183077/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183135/ws-services-calculation/WCBillingSlab.json b/data/as/30183135/ws-services-calculation/WCBillingSlab.json
index fc8df37f92..ecf6f9b314 100644
--- a/data/as/30183135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183135/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183229/ws-services-calculation/WCBillingSlab.json b/data/as/30183229/ws-services-calculation/WCBillingSlab.json
index d59352fa98..9ea77aa2da 100644
--- a/data/as/30183229/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183229/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183244/ws-services-calculation/WCBillingSlab.json b/data/as/30183244/ws-services-calculation/WCBillingSlab.json
index ae3ddaa4d5..59ab5a2815 100644
--- a/data/as/30183244/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183244/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183255/ws-services-calculation/WCBillingSlab.json b/data/as/30183255/ws-services-calculation/WCBillingSlab.json
index 4c80b28d2a..8928e74af3 100644
--- a/data/as/30183255/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183255/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183275/ws-services-calculation/WCBillingSlab.json b/data/as/30183275/ws-services-calculation/WCBillingSlab.json
index 329b5898ec..13c4409cff 100644
--- a/data/as/30183275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183275/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183307/ws-services-calculation/WCBillingSlab.json b/data/as/30183307/ws-services-calculation/WCBillingSlab.json
index c1e3124023..402639d47e 100644
--- a/data/as/30183307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183307/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183330/ws-services-calculation/WCBillingSlab.json b/data/as/30183330/ws-services-calculation/WCBillingSlab.json
index 1ee3713cc8..cbb7fec9e3 100644
--- a/data/as/30183330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183330/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183351/ws-services-calculation/WCBillingSlab.json b/data/as/30183351/ws-services-calculation/WCBillingSlab.json
index cf2f83eade..b2c6cdab10 100644
--- a/data/as/30183351/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183351/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183367/ws-services-calculation/WCBillingSlab.json b/data/as/30183367/ws-services-calculation/WCBillingSlab.json
index 112c7d3b24..cf1d7c6bd2 100644
--- a/data/as/30183367/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183367/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183379/ws-services-calculation/WCBillingSlab.json b/data/as/30183379/ws-services-calculation/WCBillingSlab.json
index ea1bf13f4f..47adf34a56 100644
--- a/data/as/30183379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183379/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183385/ws-services-calculation/WCBillingSlab.json b/data/as/30183385/ws-services-calculation/WCBillingSlab.json
index 9aee251edc..6d8507c1c2 100644
--- a/data/as/30183385/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183385/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183392/ws-services-calculation/WCBillingSlab.json b/data/as/30183392/ws-services-calculation/WCBillingSlab.json
index 9151fdd49b..6bc7634f52 100644
--- a/data/as/30183392/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183392/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183402/ws-services-calculation/WCBillingSlab.json b/data/as/30183402/ws-services-calculation/WCBillingSlab.json
index a1cd738882..46280f1a0b 100644
--- a/data/as/30183402/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183402/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183409/ws-services-calculation/WCBillingSlab.json b/data/as/30183409/ws-services-calculation/WCBillingSlab.json
index 51851c0952..6b6fb3f6a5 100644
--- a/data/as/30183409/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183409/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183414/ws-services-calculation/WCBillingSlab.json b/data/as/30183414/ws-services-calculation/WCBillingSlab.json
index 9662fa4f2c..9e331f114e 100644
--- a/data/as/30183414/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183414/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183459/ws-services-calculation/WCBillingSlab.json b/data/as/30183459/ws-services-calculation/WCBillingSlab.json
index 59d2d75358..bd822cfbea 100644
--- a/data/as/30183459/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183459/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183462/ws-services-calculation/WCBillingSlab.json b/data/as/30183462/ws-services-calculation/WCBillingSlab.json
index 0539e5082b..b3a7635974 100644
--- a/data/as/30183462/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183462/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183468/ws-services-calculation/WCBillingSlab.json b/data/as/30183468/ws-services-calculation/WCBillingSlab.json
index 4f7e65154a..421284e5d1 100644
--- a/data/as/30183468/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183468/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183496/ws-services-calculation/WCBillingSlab.json b/data/as/30183496/ws-services-calculation/WCBillingSlab.json
index 7533b0fa51..8a53bad6a3 100644
--- a/data/as/30183496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183522/ws-services-calculation/WCBillingSlab.json b/data/as/30183522/ws-services-calculation/WCBillingSlab.json
index ec08808014..1d748be7b3 100644
--- a/data/as/30183522/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183522/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183574/ws-services-calculation/WCBillingSlab.json b/data/as/30183574/ws-services-calculation/WCBillingSlab.json
index 78b529ec92..87ed698048 100644
--- a/data/as/30183574/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183574/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183599/ws-services-calculation/WCBillingSlab.json b/data/as/30183599/ws-services-calculation/WCBillingSlab.json
index 90121750e5..9fcf13140d 100644
--- a/data/as/30183599/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183599/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183693/ws-services-calculation/WCBillingSlab.json b/data/as/30183693/ws-services-calculation/WCBillingSlab.json
index 94d026150c..8c257849f8 100644
--- a/data/as/30183693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183693/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183728/ws-services-calculation/WCBillingSlab.json b/data/as/30183728/ws-services-calculation/WCBillingSlab.json
index 8bed3430e3..0ec19708a8 100644
--- a/data/as/30183728/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183728/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183739/ws-services-calculation/WCBillingSlab.json b/data/as/30183739/ws-services-calculation/WCBillingSlab.json
index 4fe44af4f1..43849306e7 100644
--- a/data/as/30183739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183758/ws-services-calculation/WCBillingSlab.json b/data/as/30183758/ws-services-calculation/WCBillingSlab.json
index 5e674ae40e..eab03a07e3 100644
--- a/data/as/30183758/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183758/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183945/ws-services-calculation/WCBillingSlab.json b/data/as/30183945/ws-services-calculation/WCBillingSlab.json
index 4092db38ac..417bf0472d 100644
--- a/data/as/30183945/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183945/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183971/ws-services-calculation/WCBillingSlab.json b/data/as/30183971/ws-services-calculation/WCBillingSlab.json
index fa4d0194ab..0e8029f663 100644
--- a/data/as/30183971/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183971/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30183980/ws-services-calculation/WCBillingSlab.json b/data/as/30183980/ws-services-calculation/WCBillingSlab.json
index 62e040b80b..220279bb2a 100644
--- a/data/as/30183980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30183980/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184382/ws-services-calculation/WCBillingSlab.json b/data/as/30184382/ws-services-calculation/WCBillingSlab.json
index d2c88a2a0d..b925ca3359 100644
--- a/data/as/30184382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184382/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184383/ws-services-calculation/WCBillingSlab.json b/data/as/30184383/ws-services-calculation/WCBillingSlab.json
index 091cfe7026..bd5b4e0a08 100644
--- a/data/as/30184383/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184383/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184384/ws-services-calculation/WCBillingSlab.json b/data/as/30184384/ws-services-calculation/WCBillingSlab.json
index df7ce962a8..772e3fed56 100644
--- a/data/as/30184384/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184384/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184386/ws-services-calculation/WCBillingSlab.json b/data/as/30184386/ws-services-calculation/WCBillingSlab.json
index 4432631b2f..f687837c14 100644
--- a/data/as/30184386/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184386/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184393/ws-services-calculation/WCBillingSlab.json b/data/as/30184393/ws-services-calculation/WCBillingSlab.json
index 7b043539ef..40cc552e14 100644
--- a/data/as/30184393/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184393/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30184401/ws-services-calculation/WCBillingSlab.json b/data/as/30184401/ws-services-calculation/WCBillingSlab.json
index 17a153ee9c..7b0a01abf0 100644
--- a/data/as/30184401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30184401/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30185152/ws-services-calculation/WCBillingSlab.json b/data/as/30185152/ws-services-calculation/WCBillingSlab.json
index 7a7b5510e1..271b50a320 100644
--- a/data/as/30185152/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30185152/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186115/ws-services-calculation/WCBillingSlab.json b/data/as/30186115/ws-services-calculation/WCBillingSlab.json
index af97dd2c1b..25c1ec3e2c 100644
--- a/data/as/30186115/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186115/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186145/ws-services-calculation/WCBillingSlab.json b/data/as/30186145/ws-services-calculation/WCBillingSlab.json
index e7475ab34d..2ba2c2eb2b 100644
--- a/data/as/30186145/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186145/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186206/ws-services-calculation/WCBillingSlab.json b/data/as/30186206/ws-services-calculation/WCBillingSlab.json
index b3ebaede7b..24f98a6646 100644
--- a/data/as/30186206/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186206/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186275/ws-services-calculation/WCBillingSlab.json b/data/as/30186275/ws-services-calculation/WCBillingSlab.json
index 9fdf9c84df..c7778be2d2 100644
--- a/data/as/30186275/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186275/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30186307/ws-services-calculation/WCBillingSlab.json b/data/as/30186307/ws-services-calculation/WCBillingSlab.json
index ee39c9708b..eb9aa169ae 100644
--- a/data/as/30186307/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30186307/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188401/ws-services-calculation/WCBillingSlab.json b/data/as/30188401/ws-services-calculation/WCBillingSlab.json
index 8269dd0cae..e21b8b07c2 100644
--- a/data/as/30188401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188401/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188411/ws-services-calculation/WCBillingSlab.json b/data/as/30188411/ws-services-calculation/WCBillingSlab.json
index fe9ad68818..f922ede9f9 100644
--- a/data/as/30188411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188411/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188425/ws-services-calculation/WCBillingSlab.json b/data/as/30188425/ws-services-calculation/WCBillingSlab.json
index 99972d43fe..516272d0be 100644
--- a/data/as/30188425/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188425/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188440/ws-services-calculation/WCBillingSlab.json b/data/as/30188440/ws-services-calculation/WCBillingSlab.json
index 596061ffff..5a1e2b73dc 100644
--- a/data/as/30188440/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188440/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188457/ws-services-calculation/WCBillingSlab.json b/data/as/30188457/ws-services-calculation/WCBillingSlab.json
index b7a70857f2..40eef5e510 100644
--- a/data/as/30188457/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188457/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188494/ws-services-calculation/WCBillingSlab.json b/data/as/30188494/ws-services-calculation/WCBillingSlab.json
index 4255eee749..e0d3b838ce 100644
--- a/data/as/30188494/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188494/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188506/ws-services-calculation/WCBillingSlab.json b/data/as/30188506/ws-services-calculation/WCBillingSlab.json
index 80aada1fdd..f2362b8cc5 100644
--- a/data/as/30188506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188506/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188524/ws-services-calculation/WCBillingSlab.json b/data/as/30188524/ws-services-calculation/WCBillingSlab.json
index b9d5624760..f7ab619410 100644
--- a/data/as/30188524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188524/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188535/ws-services-calculation/WCBillingSlab.json b/data/as/30188535/ws-services-calculation/WCBillingSlab.json
index ee727f0ec6..b8a5c1857c 100644
--- a/data/as/30188535/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188535/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188564/ws-services-calculation/WCBillingSlab.json b/data/as/30188564/ws-services-calculation/WCBillingSlab.json
index ed79daf59f..6cc0688c38 100644
--- a/data/as/30188564/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188564/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188569/ws-services-calculation/WCBillingSlab.json b/data/as/30188569/ws-services-calculation/WCBillingSlab.json
index 48595e9e9e..9ac606aef0 100644
--- a/data/as/30188569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188569/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188583/ws-services-calculation/WCBillingSlab.json b/data/as/30188583/ws-services-calculation/WCBillingSlab.json
index 6d87b550e2..6ab9a357c6 100644
--- a/data/as/30188583/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188583/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188648/ws-services-calculation/WCBillingSlab.json b/data/as/30188648/ws-services-calculation/WCBillingSlab.json
index 2e318c8456..f6fa8be0dc 100644
--- a/data/as/30188648/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188648/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188716/ws-services-calculation/WCBillingSlab.json b/data/as/30188716/ws-services-calculation/WCBillingSlab.json
index fe906d4d9d..c1983bca2e 100644
--- a/data/as/30188716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188716/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188739/ws-services-calculation/WCBillingSlab.json b/data/as/30188739/ws-services-calculation/WCBillingSlab.json
index 5c9fc63f5b..35aae57e58 100644
--- a/data/as/30188739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188761/ws-services-calculation/WCBillingSlab.json b/data/as/30188761/ws-services-calculation/WCBillingSlab.json
index a74fe4e1b8..29e660a313 100644
--- a/data/as/30188761/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188761/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188772/ws-services-calculation/WCBillingSlab.json b/data/as/30188772/ws-services-calculation/WCBillingSlab.json
index defac321c3..e934aff743 100644
--- a/data/as/30188772/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188772/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188786/ws-services-calculation/WCBillingSlab.json b/data/as/30188786/ws-services-calculation/WCBillingSlab.json
index 43f83a06ad..4c4496cd1c 100644
--- a/data/as/30188786/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188786/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188820/ws-services-calculation/WCBillingSlab.json b/data/as/30188820/ws-services-calculation/WCBillingSlab.json
index 84e846199b..c12e573a14 100644
--- a/data/as/30188820/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188820/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30188848/ws-services-calculation/WCBillingSlab.json b/data/as/30188848/ws-services-calculation/WCBillingSlab.json
index d4794a8da8..800428f485 100644
--- a/data/as/30188848/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30188848/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189208/ws-services-calculation/WCBillingSlab.json b/data/as/30189208/ws-services-calculation/WCBillingSlab.json
index ab15207eab..b4538d7a4e 100644
--- a/data/as/30189208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189234/ws-services-calculation/WCBillingSlab.json b/data/as/30189234/ws-services-calculation/WCBillingSlab.json
index b5a3563505..fc72903f78 100644
--- a/data/as/30189234/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189234/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189242/ws-services-calculation/WCBillingSlab.json b/data/as/30189242/ws-services-calculation/WCBillingSlab.json
index ef6b789e45..7318eeeeb6 100644
--- a/data/as/30189242/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189242/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189256/ws-services-calculation/WCBillingSlab.json b/data/as/30189256/ws-services-calculation/WCBillingSlab.json
index abab63bffb..62f0f046a4 100644
--- a/data/as/30189256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189256/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189269/ws-services-calculation/WCBillingSlab.json b/data/as/30189269/ws-services-calculation/WCBillingSlab.json
index 8ce447d943..37133cfd76 100644
--- a/data/as/30189269/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189269/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189277/ws-services-calculation/WCBillingSlab.json b/data/as/30189277/ws-services-calculation/WCBillingSlab.json
index e6be44cf07..ec6b02c93b 100644
--- a/data/as/30189277/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189277/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189286/ws-services-calculation/WCBillingSlab.json b/data/as/30189286/ws-services-calculation/WCBillingSlab.json
index 63ab766d23..620041a78e 100644
--- a/data/as/30189286/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189286/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189299/ws-services-calculation/WCBillingSlab.json b/data/as/30189299/ws-services-calculation/WCBillingSlab.json
index 43ee834335..6dd7dddb7b 100644
--- a/data/as/30189299/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189299/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189315/ws-services-calculation/WCBillingSlab.json b/data/as/30189315/ws-services-calculation/WCBillingSlab.json
index 8c88c964b7..32f0fc1002 100644
--- a/data/as/30189315/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189315/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189323/ws-services-calculation/WCBillingSlab.json b/data/as/30189323/ws-services-calculation/WCBillingSlab.json
index 67be5ce59c..332d035bac 100644
--- a/data/as/30189323/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189323/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189328/ws-services-calculation/WCBillingSlab.json b/data/as/30189328/ws-services-calculation/WCBillingSlab.json
index 9466acd634..21fc0f8d07 100644
--- a/data/as/30189328/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189328/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189336/ws-services-calculation/WCBillingSlab.json b/data/as/30189336/ws-services-calculation/WCBillingSlab.json
index 05e891fef5..06dbdae63e 100644
--- a/data/as/30189336/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189336/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189344/ws-services-calculation/WCBillingSlab.json b/data/as/30189344/ws-services-calculation/WCBillingSlab.json
index 9dc97d9b1f..d15edcda51 100644
--- a/data/as/30189344/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189344/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189379/ws-services-calculation/WCBillingSlab.json b/data/as/30189379/ws-services-calculation/WCBillingSlab.json
index 3ccc1598d7..79727c6845 100644
--- a/data/as/30189379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189379/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189381/ws-services-calculation/WCBillingSlab.json b/data/as/30189381/ws-services-calculation/WCBillingSlab.json
index 0c2c12c046..a967e9c4f4 100644
--- a/data/as/30189381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189381/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189391/ws-services-calculation/WCBillingSlab.json b/data/as/30189391/ws-services-calculation/WCBillingSlab.json
index 8dc1f51260..75fc1c97c8 100644
--- a/data/as/30189391/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189391/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189399/ws-services-calculation/WCBillingSlab.json b/data/as/30189399/ws-services-calculation/WCBillingSlab.json
index 515c20286b..c6ebdc4f69 100644
--- a/data/as/30189399/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189399/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189413/ws-services-calculation/WCBillingSlab.json b/data/as/30189413/ws-services-calculation/WCBillingSlab.json
index b9ff1e93ca..811e28980b 100644
--- a/data/as/30189413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189413/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189424/ws-services-calculation/WCBillingSlab.json b/data/as/30189424/ws-services-calculation/WCBillingSlab.json
index 191f6cf06f..be6bb80614 100644
--- a/data/as/30189424/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189424/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189431/ws-services-calculation/WCBillingSlab.json b/data/as/30189431/ws-services-calculation/WCBillingSlab.json
index 1d4c2c6898..7e8800613e 100644
--- a/data/as/30189431/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189431/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189444/ws-services-calculation/WCBillingSlab.json b/data/as/30189444/ws-services-calculation/WCBillingSlab.json
index 7503742153..abdd6d06d4 100644
--- a/data/as/30189444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189444/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189455/ws-services-calculation/WCBillingSlab.json b/data/as/30189455/ws-services-calculation/WCBillingSlab.json
index 7ef8f9401e..55c68abf65 100644
--- a/data/as/30189455/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189455/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189469/ws-services-calculation/WCBillingSlab.json b/data/as/30189469/ws-services-calculation/WCBillingSlab.json
index d92027664e..9292c2691c 100644
--- a/data/as/30189469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189469/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189496/ws-services-calculation/WCBillingSlab.json b/data/as/30189496/ws-services-calculation/WCBillingSlab.json
index 6337e86b20..0293120d58 100644
--- a/data/as/30189496/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189496/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189526/ws-services-calculation/WCBillingSlab.json b/data/as/30189526/ws-services-calculation/WCBillingSlab.json
index d21c538d8a..624a21442e 100644
--- a/data/as/30189526/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189526/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189537/ws-services-calculation/WCBillingSlab.json b/data/as/30189537/ws-services-calculation/WCBillingSlab.json
index 49d3e80372..a60c0cf7ad 100644
--- a/data/as/30189537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189537/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189551/ws-services-calculation/WCBillingSlab.json b/data/as/30189551/ws-services-calculation/WCBillingSlab.json
index 498b92ccfd..20e4374449 100644
--- a/data/as/30189551/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189551/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189562/ws-services-calculation/WCBillingSlab.json b/data/as/30189562/ws-services-calculation/WCBillingSlab.json
index 3429816fca..601482a578 100644
--- a/data/as/30189562/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189562/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189571/ws-services-calculation/WCBillingSlab.json b/data/as/30189571/ws-services-calculation/WCBillingSlab.json
index 7f4a92c759..dd1775826e 100644
--- a/data/as/30189571/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189571/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189582/ws-services-calculation/WCBillingSlab.json b/data/as/30189582/ws-services-calculation/WCBillingSlab.json
index 3a100f2e44..e649e6f655 100644
--- a/data/as/30189582/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189582/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189595/ws-services-calculation/WCBillingSlab.json b/data/as/30189595/ws-services-calculation/WCBillingSlab.json
index cea4a11f09..8ac51f1262 100644
--- a/data/as/30189595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189595/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30189615/ws-services-calculation/WCBillingSlab.json b/data/as/30189615/ws-services-calculation/WCBillingSlab.json
index 280bc1e5be..6162dc144d 100644
--- a/data/as/30189615/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30189615/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191686/ws-services-calculation/WCBillingSlab.json b/data/as/30191686/ws-services-calculation/WCBillingSlab.json
index 3a5d233045..afa80c4274 100644
--- a/data/as/30191686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191686/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191713/ws-services-calculation/WCBillingSlab.json b/data/as/30191713/ws-services-calculation/WCBillingSlab.json
index ae2750ee9e..6cade32d39 100644
--- a/data/as/30191713/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191713/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191743/ws-services-calculation/WCBillingSlab.json b/data/as/30191743/ws-services-calculation/WCBillingSlab.json
index 2d32b86437..ea0a1dd3ca 100644
--- a/data/as/30191743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191743/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191765/ws-services-calculation/WCBillingSlab.json b/data/as/30191765/ws-services-calculation/WCBillingSlab.json
index df1e5e88d6..ceb1ef1c6f 100644
--- a/data/as/30191765/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191765/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191816/ws-services-calculation/WCBillingSlab.json b/data/as/30191816/ws-services-calculation/WCBillingSlab.json
index 5d4bf47ee4..0611a334ef 100644
--- a/data/as/30191816/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191816/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191837/ws-services-calculation/WCBillingSlab.json b/data/as/30191837/ws-services-calculation/WCBillingSlab.json
index 74b44376a8..967a5e8ace 100644
--- a/data/as/30191837/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191837/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191855/ws-services-calculation/WCBillingSlab.json b/data/as/30191855/ws-services-calculation/WCBillingSlab.json
index 3e763b60db..88e0fd2303 100644
--- a/data/as/30191855/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191855/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191889/ws-services-calculation/WCBillingSlab.json b/data/as/30191889/ws-services-calculation/WCBillingSlab.json
index 3263be36ad..224af595fe 100644
--- a/data/as/30191889/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191889/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191910/ws-services-calculation/WCBillingSlab.json b/data/as/30191910/ws-services-calculation/WCBillingSlab.json
index d9d685bd83..b1138360e3 100644
--- a/data/as/30191910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191910/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191941/ws-services-calculation/WCBillingSlab.json b/data/as/30191941/ws-services-calculation/WCBillingSlab.json
index 479ecae5b6..b7480af366 100644
--- a/data/as/30191941/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191941/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30191974/ws-services-calculation/WCBillingSlab.json b/data/as/30191974/ws-services-calculation/WCBillingSlab.json
index e0b68cff59..e10ae99be5 100644
--- a/data/as/30191974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30191974/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192001/ws-services-calculation/WCBillingSlab.json b/data/as/30192001/ws-services-calculation/WCBillingSlab.json
index 4910598ea7..1347140e3f 100644
--- a/data/as/30192001/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192001/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192026/ws-services-calculation/WCBillingSlab.json b/data/as/30192026/ws-services-calculation/WCBillingSlab.json
index 5aad848b77..e82bcf1680 100644
--- a/data/as/30192026/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192026/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192045/ws-services-calculation/WCBillingSlab.json b/data/as/30192045/ws-services-calculation/WCBillingSlab.json
index 56a779535e..9b2bd2f30f 100644
--- a/data/as/30192045/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192045/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192070/ws-services-calculation/WCBillingSlab.json b/data/as/30192070/ws-services-calculation/WCBillingSlab.json
index 06ec121932..1616457713 100644
--- a/data/as/30192070/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192070/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192093/ws-services-calculation/WCBillingSlab.json b/data/as/30192093/ws-services-calculation/WCBillingSlab.json
index 9cf9cb7289..e68542091a 100644
--- a/data/as/30192093/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192093/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30192129/ws-services-calculation/WCBillingSlab.json b/data/as/30192129/ws-services-calculation/WCBillingSlab.json
index c22ff28ce2..b134f13797 100644
--- a/data/as/30192129/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30192129/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30193693/ws-services-calculation/WCBillingSlab.json b/data/as/30193693/ws-services-calculation/WCBillingSlab.json
index 02e98bc456..543dc12a68 100644
--- a/data/as/30193693/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30193693/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196401/ws-services-calculation/WCBillingSlab.json b/data/as/30196401/ws-services-calculation/WCBillingSlab.json
index ef807bf8cc..e7fa93b5e3 100644
--- a/data/as/30196401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196401/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196757/ws-services-calculation/WCBillingSlab.json b/data/as/30196757/ws-services-calculation/WCBillingSlab.json
index 87ccd7f64b..9961649364 100644
--- a/data/as/30196757/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196757/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196783/ws-services-calculation/WCBillingSlab.json b/data/as/30196783/ws-services-calculation/WCBillingSlab.json
index c5c5a92b0a..97d1c42a13 100644
--- a/data/as/30196783/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196783/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196788/ws-services-calculation/WCBillingSlab.json b/data/as/30196788/ws-services-calculation/WCBillingSlab.json
index a4dfa1fdd7..bd0bcd3462 100644
--- a/data/as/30196788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196788/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196800/ws-services-calculation/WCBillingSlab.json b/data/as/30196800/ws-services-calculation/WCBillingSlab.json
index 4183548ec4..644de5d288 100644
--- a/data/as/30196800/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196800/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30196806/ws-services-calculation/WCBillingSlab.json b/data/as/30196806/ws-services-calculation/WCBillingSlab.json
index 7ed7cd1351..83155e4917 100644
--- a/data/as/30196806/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30196806/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199561/ws-services-calculation/WCBillingSlab.json b/data/as/30199561/ws-services-calculation/WCBillingSlab.json
index b2b00d2784..9f7856e3c8 100644
--- a/data/as/30199561/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199561/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199580/ws-services-calculation/WCBillingSlab.json b/data/as/30199580/ws-services-calculation/WCBillingSlab.json
index 9249e2d1d8..86aad1f7e3 100644
--- a/data/as/30199580/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199580/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199609/ws-services-calculation/WCBillingSlab.json b/data/as/30199609/ws-services-calculation/WCBillingSlab.json
index f9dd53ba53..a6e529df88 100644
--- a/data/as/30199609/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199609/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30199656/ws-services-calculation/WCBillingSlab.json b/data/as/30199656/ws-services-calculation/WCBillingSlab.json
index 793ba7f21f..69699b3e09 100644
--- a/data/as/30199656/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30199656/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200209/ws-services-calculation/WCBillingSlab.json b/data/as/30200209/ws-services-calculation/WCBillingSlab.json
index 4096e28fda..9502e80a5c 100644
--- a/data/as/30200209/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200209/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200338/ws-services-calculation/WCBillingSlab.json b/data/as/30200338/ws-services-calculation/WCBillingSlab.json
index 85b845c6ac..a3844ca865 100644
--- a/data/as/30200338/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200338/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200348/ws-services-calculation/WCBillingSlab.json b/data/as/30200348/ws-services-calculation/WCBillingSlab.json
index 122418307e..f267d151bb 100644
--- a/data/as/30200348/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200348/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200365/ws-services-calculation/WCBillingSlab.json b/data/as/30200365/ws-services-calculation/WCBillingSlab.json
index 8ffb5c4d04..6a05921028 100644
--- a/data/as/30200365/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200365/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200373/ws-services-calculation/WCBillingSlab.json b/data/as/30200373/ws-services-calculation/WCBillingSlab.json
index 399e541108..3005c8cc76 100644
--- a/data/as/30200373/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200373/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200381/ws-services-calculation/WCBillingSlab.json b/data/as/30200381/ws-services-calculation/WCBillingSlab.json
index 30cac5b819..edb36e5022 100644
--- a/data/as/30200381/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200381/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200390/ws-services-calculation/WCBillingSlab.json b/data/as/30200390/ws-services-calculation/WCBillingSlab.json
index f45a1e34e2..6bd275478b 100644
--- a/data/as/30200390/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200390/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30200395/ws-services-calculation/WCBillingSlab.json b/data/as/30200395/ws-services-calculation/WCBillingSlab.json
index 44b87db062..8589afe718 100644
--- a/data/as/30200395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30200395/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201829/ws-services-calculation/WCBillingSlab.json b/data/as/30201829/ws-services-calculation/WCBillingSlab.json
index c6b1e0a4c7..99a4880da8 100644
--- a/data/as/30201829/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201829/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201845/ws-services-calculation/WCBillingSlab.json b/data/as/30201845/ws-services-calculation/WCBillingSlab.json
index 42e955458a..2d2c47cd8f 100644
--- a/data/as/30201845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201845/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201859/ws-services-calculation/WCBillingSlab.json b/data/as/30201859/ws-services-calculation/WCBillingSlab.json
index 92079ba507..d14cb866c8 100644
--- a/data/as/30201859/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201859/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201868/ws-services-calculation/WCBillingSlab.json b/data/as/30201868/ws-services-calculation/WCBillingSlab.json
index ffd1eb7c66..fb8f9539b1 100644
--- a/data/as/30201868/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201868/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201884/ws-services-calculation/WCBillingSlab.json b/data/as/30201884/ws-services-calculation/WCBillingSlab.json
index 2a5371ca2c..787dcf12b9 100644
--- a/data/as/30201884/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201884/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201910/ws-services-calculation/WCBillingSlab.json b/data/as/30201910/ws-services-calculation/WCBillingSlab.json
index 2a3e7bec87..0de59763b2 100644
--- a/data/as/30201910/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201910/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201927/ws-services-calculation/WCBillingSlab.json b/data/as/30201927/ws-services-calculation/WCBillingSlab.json
index d3a72250c2..23282b83ae 100644
--- a/data/as/30201927/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201927/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201982/ws-services-calculation/WCBillingSlab.json b/data/as/30201982/ws-services-calculation/WCBillingSlab.json
index 4985e3ce57..5820a44c2d 100644
--- a/data/as/30201982/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201982/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30201998/ws-services-calculation/WCBillingSlab.json b/data/as/30201998/ws-services-calculation/WCBillingSlab.json
index e0d208355e..d5383f253f 100644
--- a/data/as/30201998/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30201998/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202047/ws-services-calculation/WCBillingSlab.json b/data/as/30202047/ws-services-calculation/WCBillingSlab.json
index 6925d1d3f1..8138bcb68b 100644
--- a/data/as/30202047/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202047/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202048/ws-services-calculation/WCBillingSlab.json b/data/as/30202048/ws-services-calculation/WCBillingSlab.json
index 6da6ba3eb1..8adda55777 100644
--- a/data/as/30202048/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202048/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202080/ws-services-calculation/WCBillingSlab.json b/data/as/30202080/ws-services-calculation/WCBillingSlab.json
index e05e9044a6..ba15b591e5 100644
--- a/data/as/30202080/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202080/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202118/ws-services-calculation/WCBillingSlab.json b/data/as/30202118/ws-services-calculation/WCBillingSlab.json
index 9ff8e8c489..dd69d4c0d2 100644
--- a/data/as/30202118/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202118/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202288/ws-services-calculation/WCBillingSlab.json b/data/as/30202288/ws-services-calculation/WCBillingSlab.json
index 72b75efe65..d3ea418592 100644
--- a/data/as/30202288/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202288/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202311/ws-services-calculation/WCBillingSlab.json b/data/as/30202311/ws-services-calculation/WCBillingSlab.json
index bd7f08e4d1..73eef880ea 100644
--- a/data/as/30202311/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202311/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202346/ws-services-calculation/WCBillingSlab.json b/data/as/30202346/ws-services-calculation/WCBillingSlab.json
index 4fe7b8b358..b7e336e1d8 100644
--- a/data/as/30202346/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202346/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202436/ws-services-calculation/WCBillingSlab.json b/data/as/30202436/ws-services-calculation/WCBillingSlab.json
index d16b31ec46..31e4144a44 100644
--- a/data/as/30202436/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202436/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202462/ws-services-calculation/WCBillingSlab.json b/data/as/30202462/ws-services-calculation/WCBillingSlab.json
index 86692f657b..d636e12fd5 100644
--- a/data/as/30202462/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202462/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202484/ws-services-calculation/WCBillingSlab.json b/data/as/30202484/ws-services-calculation/WCBillingSlab.json
index 25f6796604..20431043e4 100644
--- a/data/as/30202484/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202484/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202510/ws-services-calculation/WCBillingSlab.json b/data/as/30202510/ws-services-calculation/WCBillingSlab.json
index 3512189dbc..56a85b2eda 100644
--- a/data/as/30202510/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202510/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202537/ws-services-calculation/WCBillingSlab.json b/data/as/30202537/ws-services-calculation/WCBillingSlab.json
index 5e9bef82eb..c50de81ae7 100644
--- a/data/as/30202537/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202537/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202570/ws-services-calculation/WCBillingSlab.json b/data/as/30202570/ws-services-calculation/WCBillingSlab.json
index eeb0d4b89c..8314c18c7a 100644
--- a/data/as/30202570/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202570/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202595/ws-services-calculation/WCBillingSlab.json b/data/as/30202595/ws-services-calculation/WCBillingSlab.json
index 57ede980a4..73ea793a61 100644
--- a/data/as/30202595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202595/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202611/ws-services-calculation/WCBillingSlab.json b/data/as/30202611/ws-services-calculation/WCBillingSlab.json
index 2707a608d4..9586de43a7 100644
--- a/data/as/30202611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202611/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202636/ws-services-calculation/WCBillingSlab.json b/data/as/30202636/ws-services-calculation/WCBillingSlab.json
index 221c2b2669..780a1ed2ca 100644
--- a/data/as/30202636/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202636/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202651/ws-services-calculation/WCBillingSlab.json b/data/as/30202651/ws-services-calculation/WCBillingSlab.json
index 1dcb88649e..5d9c863142 100644
--- a/data/as/30202651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202651/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202908/ws-services-calculation/WCBillingSlab.json b/data/as/30202908/ws-services-calculation/WCBillingSlab.json
index 4da389bb04..8687b87ff4 100644
--- a/data/as/30202908/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202908/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30202964/ws-services-calculation/WCBillingSlab.json b/data/as/30202964/ws-services-calculation/WCBillingSlab.json
index 45b1533301..3968c4dc44 100644
--- a/data/as/30202964/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30202964/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30204586/ws-services-calculation/WCBillingSlab.json b/data/as/30204586/ws-services-calculation/WCBillingSlab.json
index c836d14cc5..e85ef76d57 100644
--- a/data/as/30204586/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30204586/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207281/ws-services-calculation/WCBillingSlab.json b/data/as/30207281/ws-services-calculation/WCBillingSlab.json
index a47f750ec2..263151139f 100644
--- a/data/as/30207281/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207281/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207843/ws-services-calculation/WCBillingSlab.json b/data/as/30207843/ws-services-calculation/WCBillingSlab.json
index e94166620a..ff1cf46410 100644
--- a/data/as/30207843/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207843/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207863/ws-services-calculation/WCBillingSlab.json b/data/as/30207863/ws-services-calculation/WCBillingSlab.json
index 38f401b0ca..74a4b1e909 100644
--- a/data/as/30207863/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207863/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207883/ws-services-calculation/WCBillingSlab.json b/data/as/30207883/ws-services-calculation/WCBillingSlab.json
index d0efb0cdb6..87f9d1fe4a 100644
--- a/data/as/30207883/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207883/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207923/ws-services-calculation/WCBillingSlab.json b/data/as/30207923/ws-services-calculation/WCBillingSlab.json
index 9328e01c97..caf3787391 100644
--- a/data/as/30207923/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207923/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207980/ws-services-calculation/WCBillingSlab.json b/data/as/30207980/ws-services-calculation/WCBillingSlab.json
index 7a02310198..6da08ae734 100644
--- a/data/as/30207980/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207980/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207990/ws-services-calculation/WCBillingSlab.json b/data/as/30207990/ws-services-calculation/WCBillingSlab.json
index 671edebb86..8994875f35 100644
--- a/data/as/30207990/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207990/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30207996/ws-services-calculation/WCBillingSlab.json b/data/as/30207996/ws-services-calculation/WCBillingSlab.json
index c1f0ae86cc..460b17c2de 100644
--- a/data/as/30207996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30207996/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208033/ws-services-calculation/WCBillingSlab.json b/data/as/30208033/ws-services-calculation/WCBillingSlab.json
index 94de18da22..fb0c1c3ed5 100644
--- a/data/as/30208033/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208033/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208074/ws-services-calculation/WCBillingSlab.json b/data/as/30208074/ws-services-calculation/WCBillingSlab.json
index 4354c95c3d..7d00fae584 100644
--- a/data/as/30208074/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208074/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208101/ws-services-calculation/WCBillingSlab.json b/data/as/30208101/ws-services-calculation/WCBillingSlab.json
index f78d0ec05d..78e0cfee7a 100644
--- a/data/as/30208101/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208101/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208625/ws-services-calculation/WCBillingSlab.json b/data/as/30208625/ws-services-calculation/WCBillingSlab.json
index 5c1f366596..23e5c9155e 100644
--- a/data/as/30208625/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208625/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file

From c06e597c48328df4e6e6b7d678294208b7d3d6f7 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <056shubham@gmail.com>
Date: Wed, 13 Nov 2024 17:39:33 +0530
Subject: [PATCH 23/23] updated minimumCharge 0.0 to 0

---
 .../30208644/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30208681/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30208803/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211530/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211543/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211556/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211591/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211653/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211673/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211695/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211715/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211747/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30211881/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212673/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212710/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212736/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212751/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212766/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212780/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212817/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212830/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212847/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212906/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212926/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212942/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212948/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212952/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212973/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212983/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30212996/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213000/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213013/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213023/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213053/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213057/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213059/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213066/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213067/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213075/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213079/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213084/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213135/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213136/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213138/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213140/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213143/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213146/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213148/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213150/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213200/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213202/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213205/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213208/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213210/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213215/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213219/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213224/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213489/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213521/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213556/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213569/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213581/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213587/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213598/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213603/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213638/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213716/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213729/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213788/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213798/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213839/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213850/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213862/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213877/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213916/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30213935/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214038/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214044/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214051/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214059/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214062/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214069/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214095/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214145/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214148/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214152/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214157/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214168/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214174/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214298/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214330/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214334/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214398/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214413/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214437/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214444/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214454/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214478/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214502/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214524/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214533/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214551/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214559/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214579/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214623/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214632/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214635/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214651/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214686/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214704/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30214731/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30215695/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30215708/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216018/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216021/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216024/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216027/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216030/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216039/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216045/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216049/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216051/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216053/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216054/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216055/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216056/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216057/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216058/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216059/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216061/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216062/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216214/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216258/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216269/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216295/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216302/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216319/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216336/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216372/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216378/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216401/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216427/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216449/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216472/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216505/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216577/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216676/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216841/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216849/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216928/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216939/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30216955/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30217247/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30217255/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30217976/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218422/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218426/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218431/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218437/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218442/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218453/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218465/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218467/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218469/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218658/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218660/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218662/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218664/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218673/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218675/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218682/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218684/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218703/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218711/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218717/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218718/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218719/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218721/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218722/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218724/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218726/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218728/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218731/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218732/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218733/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218734/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218735/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218736/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218737/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218738/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218739/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218740/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218741/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218742/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218743/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218744/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218745/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218812/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218889/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30218974/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219042/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219068/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219089/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219100/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219362/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219371/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219382/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219434/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219447/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219463/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219482/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219492/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219505/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219515/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219532/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30219544/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30220972/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221079/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221116/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221135/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221148/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221164/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221189/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221203/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221221/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221249/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221256/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221262/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221312/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221327/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221330/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221335/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221339/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221352/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221370/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221379/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221387/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221395/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221411/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221525/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221530/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221533/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221545/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221554/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221603/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221622/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30221636/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30222577/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30222595/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30222601/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224592/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224594/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224596/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224601/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224607/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224611/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224621/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224626/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224629/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224634/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224638/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30224681/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30226845/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30231032/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30235506/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30244996/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 .../30245010/ws-services-calculation/WCBillingSlab.json   | 8 ++++----
 267 files changed, 1068 insertions(+), 1068 deletions(-)

diff --git a/data/as/30208644/ws-services-calculation/WCBillingSlab.json b/data/as/30208644/ws-services-calculation/WCBillingSlab.json
index 5d44b9c3c1..4c409504ae 100644
--- a/data/as/30208644/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208644/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208681/ws-services-calculation/WCBillingSlab.json b/data/as/30208681/ws-services-calculation/WCBillingSlab.json
index 9a9dad3842..6dda48f90f 100644
--- a/data/as/30208681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208681/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30208803/ws-services-calculation/WCBillingSlab.json b/data/as/30208803/ws-services-calculation/WCBillingSlab.json
index 1fe31a7cd0..3982371242 100644
--- a/data/as/30208803/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30208803/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211530/ws-services-calculation/WCBillingSlab.json b/data/as/30211530/ws-services-calculation/WCBillingSlab.json
index c4b3c880d0..13da287c6f 100644
--- a/data/as/30211530/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211530/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211543/ws-services-calculation/WCBillingSlab.json b/data/as/30211543/ws-services-calculation/WCBillingSlab.json
index 0301fcf10f..8afaa94f75 100644
--- a/data/as/30211543/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211543/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211556/ws-services-calculation/WCBillingSlab.json b/data/as/30211556/ws-services-calculation/WCBillingSlab.json
index 37e15f8f09..2b0c99d0b5 100644
--- a/data/as/30211556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211556/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211591/ws-services-calculation/WCBillingSlab.json b/data/as/30211591/ws-services-calculation/WCBillingSlab.json
index 2c1caae376..7cfb5470d0 100644
--- a/data/as/30211591/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211591/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211653/ws-services-calculation/WCBillingSlab.json b/data/as/30211653/ws-services-calculation/WCBillingSlab.json
index 147b1fb22e..e4bb72d9e6 100644
--- a/data/as/30211653/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211653/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211673/ws-services-calculation/WCBillingSlab.json b/data/as/30211673/ws-services-calculation/WCBillingSlab.json
index c64b8355a5..1b0014053a 100644
--- a/data/as/30211673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211695/ws-services-calculation/WCBillingSlab.json b/data/as/30211695/ws-services-calculation/WCBillingSlab.json
index fee0ac4125..5c3315365c 100644
--- a/data/as/30211695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211695/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211715/ws-services-calculation/WCBillingSlab.json b/data/as/30211715/ws-services-calculation/WCBillingSlab.json
index 6cf690405e..f49bb0e7f8 100644
--- a/data/as/30211715/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211715/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211747/ws-services-calculation/WCBillingSlab.json b/data/as/30211747/ws-services-calculation/WCBillingSlab.json
index 262923bb64..262dcbfd8b 100644
--- a/data/as/30211747/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211747/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30211881/ws-services-calculation/WCBillingSlab.json b/data/as/30211881/ws-services-calculation/WCBillingSlab.json
index 6d0791c012..b39f94c85b 100644
--- a/data/as/30211881/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30211881/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212673/ws-services-calculation/WCBillingSlab.json b/data/as/30212673/ws-services-calculation/WCBillingSlab.json
index a964c4fbc1..68d7d0f938 100644
--- a/data/as/30212673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212710/ws-services-calculation/WCBillingSlab.json b/data/as/30212710/ws-services-calculation/WCBillingSlab.json
index c3452386b8..32d3431095 100644
--- a/data/as/30212710/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212710/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212736/ws-services-calculation/WCBillingSlab.json b/data/as/30212736/ws-services-calculation/WCBillingSlab.json
index e9b8577398..678a1761c6 100644
--- a/data/as/30212736/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212736/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212751/ws-services-calculation/WCBillingSlab.json b/data/as/30212751/ws-services-calculation/WCBillingSlab.json
index 7823ba00d4..a560ec4870 100644
--- a/data/as/30212751/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212751/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212766/ws-services-calculation/WCBillingSlab.json b/data/as/30212766/ws-services-calculation/WCBillingSlab.json
index a80d8645f7..0c82d6d54b 100644
--- a/data/as/30212766/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212766/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212780/ws-services-calculation/WCBillingSlab.json b/data/as/30212780/ws-services-calculation/WCBillingSlab.json
index af8fe1b513..e8815a1260 100644
--- a/data/as/30212780/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212780/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212817/ws-services-calculation/WCBillingSlab.json b/data/as/30212817/ws-services-calculation/WCBillingSlab.json
index d0d422029f..e3fc5a3c0b 100644
--- a/data/as/30212817/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212817/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212830/ws-services-calculation/WCBillingSlab.json b/data/as/30212830/ws-services-calculation/WCBillingSlab.json
index 04fe8a10f2..e5b2dbe821 100644
--- a/data/as/30212830/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212830/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212847/ws-services-calculation/WCBillingSlab.json b/data/as/30212847/ws-services-calculation/WCBillingSlab.json
index 2661a1ddd4..282e0c2fee 100644
--- a/data/as/30212847/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212847/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212906/ws-services-calculation/WCBillingSlab.json b/data/as/30212906/ws-services-calculation/WCBillingSlab.json
index b4fbb3dd2d..1f391adfcf 100644
--- a/data/as/30212906/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212906/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212926/ws-services-calculation/WCBillingSlab.json b/data/as/30212926/ws-services-calculation/WCBillingSlab.json
index bfb0c83bf2..fcbaf76b9d 100644
--- a/data/as/30212926/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212926/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212942/ws-services-calculation/WCBillingSlab.json b/data/as/30212942/ws-services-calculation/WCBillingSlab.json
index 2b1acb4c6a..bc4d356c58 100644
--- a/data/as/30212942/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212942/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212948/ws-services-calculation/WCBillingSlab.json b/data/as/30212948/ws-services-calculation/WCBillingSlab.json
index 0217227578..8cd7c46d6d 100644
--- a/data/as/30212948/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212948/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212952/ws-services-calculation/WCBillingSlab.json b/data/as/30212952/ws-services-calculation/WCBillingSlab.json
index c38e0dc454..74ba432c96 100644
--- a/data/as/30212952/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212952/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212973/ws-services-calculation/WCBillingSlab.json b/data/as/30212973/ws-services-calculation/WCBillingSlab.json
index 17928b3764..5bc21ea0b3 100644
--- a/data/as/30212973/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212973/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212983/ws-services-calculation/WCBillingSlab.json b/data/as/30212983/ws-services-calculation/WCBillingSlab.json
index 86a16f40c2..eb6e688f08 100644
--- a/data/as/30212983/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212983/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30212996/ws-services-calculation/WCBillingSlab.json b/data/as/30212996/ws-services-calculation/WCBillingSlab.json
index 0304c4794e..c19a413326 100644
--- a/data/as/30212996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30212996/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213000/ws-services-calculation/WCBillingSlab.json b/data/as/30213000/ws-services-calculation/WCBillingSlab.json
index 45b76a5f6d..0a9022b442 100644
--- a/data/as/30213000/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213000/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213013/ws-services-calculation/WCBillingSlab.json b/data/as/30213013/ws-services-calculation/WCBillingSlab.json
index 7e4fa61da4..04a19111fb 100644
--- a/data/as/30213013/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213013/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213023/ws-services-calculation/WCBillingSlab.json b/data/as/30213023/ws-services-calculation/WCBillingSlab.json
index 578031b389..3fde841709 100644
--- a/data/as/30213023/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213023/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213053/ws-services-calculation/WCBillingSlab.json b/data/as/30213053/ws-services-calculation/WCBillingSlab.json
index 38d0c1206e..edf262b21c 100644
--- a/data/as/30213053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213053/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213057/ws-services-calculation/WCBillingSlab.json b/data/as/30213057/ws-services-calculation/WCBillingSlab.json
index d829d9c61e..4359428055 100644
--- a/data/as/30213057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213057/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213059/ws-services-calculation/WCBillingSlab.json b/data/as/30213059/ws-services-calculation/WCBillingSlab.json
index 5aea95dcec..d6424ec449 100644
--- a/data/as/30213059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213059/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213066/ws-services-calculation/WCBillingSlab.json b/data/as/30213066/ws-services-calculation/WCBillingSlab.json
index c747647097..805898b9c5 100644
--- a/data/as/30213066/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213066/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213067/ws-services-calculation/WCBillingSlab.json b/data/as/30213067/ws-services-calculation/WCBillingSlab.json
index 901f5b145a..93d6700bed 100644
--- a/data/as/30213067/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213067/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213075/ws-services-calculation/WCBillingSlab.json b/data/as/30213075/ws-services-calculation/WCBillingSlab.json
index b2e5e4e6c9..4b2ebdf87f 100644
--- a/data/as/30213075/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213075/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213079/ws-services-calculation/WCBillingSlab.json b/data/as/30213079/ws-services-calculation/WCBillingSlab.json
index 72855461f9..50205f28c6 100644
--- a/data/as/30213079/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213079/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213084/ws-services-calculation/WCBillingSlab.json b/data/as/30213084/ws-services-calculation/WCBillingSlab.json
index 2a1aa0b029..bf851ac994 100644
--- a/data/as/30213084/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213084/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213135/ws-services-calculation/WCBillingSlab.json b/data/as/30213135/ws-services-calculation/WCBillingSlab.json
index 23a0357e7f..2c3de59163 100644
--- a/data/as/30213135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213135/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213136/ws-services-calculation/WCBillingSlab.json b/data/as/30213136/ws-services-calculation/WCBillingSlab.json
index ef2a3dff39..a16112561d 100644
--- a/data/as/30213136/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213136/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213138/ws-services-calculation/WCBillingSlab.json b/data/as/30213138/ws-services-calculation/WCBillingSlab.json
index c7647acf5c..0194a154d3 100644
--- a/data/as/30213138/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213138/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213140/ws-services-calculation/WCBillingSlab.json b/data/as/30213140/ws-services-calculation/WCBillingSlab.json
index 635f20fa3a..efac89f682 100644
--- a/data/as/30213140/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213140/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213143/ws-services-calculation/WCBillingSlab.json b/data/as/30213143/ws-services-calculation/WCBillingSlab.json
index 3d26bbb8b8..985dcedd8b 100644
--- a/data/as/30213143/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213143/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213146/ws-services-calculation/WCBillingSlab.json b/data/as/30213146/ws-services-calculation/WCBillingSlab.json
index 081233765d..e736e998d4 100644
--- a/data/as/30213146/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213146/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213148/ws-services-calculation/WCBillingSlab.json b/data/as/30213148/ws-services-calculation/WCBillingSlab.json
index e09de246cc..0b2eac442e 100644
--- a/data/as/30213148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213148/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213150/ws-services-calculation/WCBillingSlab.json b/data/as/30213150/ws-services-calculation/WCBillingSlab.json
index bf5196b83c..e17f72e37e 100644
--- a/data/as/30213150/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213150/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213200/ws-services-calculation/WCBillingSlab.json b/data/as/30213200/ws-services-calculation/WCBillingSlab.json
index 29f893a69f..8f2c3d79c2 100644
--- a/data/as/30213200/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213200/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213202/ws-services-calculation/WCBillingSlab.json b/data/as/30213202/ws-services-calculation/WCBillingSlab.json
index dbda56219a..7c7f9ba66e 100644
--- a/data/as/30213202/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213202/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213205/ws-services-calculation/WCBillingSlab.json b/data/as/30213205/ws-services-calculation/WCBillingSlab.json
index bc7a268dfa..71d17141bf 100644
--- a/data/as/30213205/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213205/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213208/ws-services-calculation/WCBillingSlab.json b/data/as/30213208/ws-services-calculation/WCBillingSlab.json
index 33d2bb2638..55a1ec52b9 100644
--- a/data/as/30213208/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213208/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213210/ws-services-calculation/WCBillingSlab.json b/data/as/30213210/ws-services-calculation/WCBillingSlab.json
index 62540df71a..96c9461288 100644
--- a/data/as/30213210/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213210/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213215/ws-services-calculation/WCBillingSlab.json b/data/as/30213215/ws-services-calculation/WCBillingSlab.json
index 746259ab46..574d1df05e 100644
--- a/data/as/30213215/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213215/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213219/ws-services-calculation/WCBillingSlab.json b/data/as/30213219/ws-services-calculation/WCBillingSlab.json
index 1bfbf70836..3006d312a6 100644
--- a/data/as/30213219/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213219/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213224/ws-services-calculation/WCBillingSlab.json b/data/as/30213224/ws-services-calculation/WCBillingSlab.json
index 1777323a8c..747749da86 100644
--- a/data/as/30213224/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213224/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213489/ws-services-calculation/WCBillingSlab.json b/data/as/30213489/ws-services-calculation/WCBillingSlab.json
index 7a89738e11..ff26d267a3 100644
--- a/data/as/30213489/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213489/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213521/ws-services-calculation/WCBillingSlab.json b/data/as/30213521/ws-services-calculation/WCBillingSlab.json
index ad5e1f1d3b..e2259f1081 100644
--- a/data/as/30213521/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213521/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213556/ws-services-calculation/WCBillingSlab.json b/data/as/30213556/ws-services-calculation/WCBillingSlab.json
index dd2b652332..77dc2de979 100644
--- a/data/as/30213556/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213556/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213569/ws-services-calculation/WCBillingSlab.json b/data/as/30213569/ws-services-calculation/WCBillingSlab.json
index 7ea78bfdf3..cc51334574 100644
--- a/data/as/30213569/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213569/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213581/ws-services-calculation/WCBillingSlab.json b/data/as/30213581/ws-services-calculation/WCBillingSlab.json
index a3cbe7f344..0a260918e4 100644
--- a/data/as/30213581/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213581/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213587/ws-services-calculation/WCBillingSlab.json b/data/as/30213587/ws-services-calculation/WCBillingSlab.json
index f5958c9023..ba48ff34df 100644
--- a/data/as/30213587/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213587/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213598/ws-services-calculation/WCBillingSlab.json b/data/as/30213598/ws-services-calculation/WCBillingSlab.json
index b8850c9bf3..e0e3d4992f 100644
--- a/data/as/30213598/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213598/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213603/ws-services-calculation/WCBillingSlab.json b/data/as/30213603/ws-services-calculation/WCBillingSlab.json
index aab3ea8f76..7eefb90cd8 100644
--- a/data/as/30213603/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213603/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213638/ws-services-calculation/WCBillingSlab.json b/data/as/30213638/ws-services-calculation/WCBillingSlab.json
index 8d35830736..4484ab9d10 100644
--- a/data/as/30213638/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213638/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213716/ws-services-calculation/WCBillingSlab.json b/data/as/30213716/ws-services-calculation/WCBillingSlab.json
index 8c74511d64..2ce10caad3 100644
--- a/data/as/30213716/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213716/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213729/ws-services-calculation/WCBillingSlab.json b/data/as/30213729/ws-services-calculation/WCBillingSlab.json
index c2c7eac0c0..7b61ab50a5 100644
--- a/data/as/30213729/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213729/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213788/ws-services-calculation/WCBillingSlab.json b/data/as/30213788/ws-services-calculation/WCBillingSlab.json
index 4edaa70c19..fa0aef7fe0 100644
--- a/data/as/30213788/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213788/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213798/ws-services-calculation/WCBillingSlab.json b/data/as/30213798/ws-services-calculation/WCBillingSlab.json
index 04e8f0d461..d2d2e7bdc4 100644
--- a/data/as/30213798/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213798/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213839/ws-services-calculation/WCBillingSlab.json b/data/as/30213839/ws-services-calculation/WCBillingSlab.json
index 8c5c8426f0..60152019df 100644
--- a/data/as/30213839/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213839/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213850/ws-services-calculation/WCBillingSlab.json b/data/as/30213850/ws-services-calculation/WCBillingSlab.json
index efdd91e2e1..f19fed8cad 100644
--- a/data/as/30213850/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213850/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213862/ws-services-calculation/WCBillingSlab.json b/data/as/30213862/ws-services-calculation/WCBillingSlab.json
index 1e25662ef4..dbbd06798c 100644
--- a/data/as/30213862/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213862/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213877/ws-services-calculation/WCBillingSlab.json b/data/as/30213877/ws-services-calculation/WCBillingSlab.json
index 9e098fc313..492be83a75 100644
--- a/data/as/30213877/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213877/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213916/ws-services-calculation/WCBillingSlab.json b/data/as/30213916/ws-services-calculation/WCBillingSlab.json
index 35801d941e..a10c211fb2 100644
--- a/data/as/30213916/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213916/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30213935/ws-services-calculation/WCBillingSlab.json b/data/as/30213935/ws-services-calculation/WCBillingSlab.json
index 4aa55d421f..38364e7bf1 100644
--- a/data/as/30213935/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30213935/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214038/ws-services-calculation/WCBillingSlab.json b/data/as/30214038/ws-services-calculation/WCBillingSlab.json
index 0ceab068d6..f197c30916 100644
--- a/data/as/30214038/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214038/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214044/ws-services-calculation/WCBillingSlab.json b/data/as/30214044/ws-services-calculation/WCBillingSlab.json
index 48484022ce..f0f2dfb666 100644
--- a/data/as/30214044/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214044/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214051/ws-services-calculation/WCBillingSlab.json b/data/as/30214051/ws-services-calculation/WCBillingSlab.json
index 1277efb831..49555bbe36 100644
--- a/data/as/30214051/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214051/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214059/ws-services-calculation/WCBillingSlab.json b/data/as/30214059/ws-services-calculation/WCBillingSlab.json
index 45438b2d5e..b6f1b524ad 100644
--- a/data/as/30214059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214059/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214062/ws-services-calculation/WCBillingSlab.json b/data/as/30214062/ws-services-calculation/WCBillingSlab.json
index 99b8a6709b..7e06623f3e 100644
--- a/data/as/30214062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214062/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214069/ws-services-calculation/WCBillingSlab.json b/data/as/30214069/ws-services-calculation/WCBillingSlab.json
index 8a15459d3a..5213aa46a9 100644
--- a/data/as/30214069/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214069/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214095/ws-services-calculation/WCBillingSlab.json b/data/as/30214095/ws-services-calculation/WCBillingSlab.json
index 7b93e2b608..f387e3fa64 100644
--- a/data/as/30214095/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214095/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214145/ws-services-calculation/WCBillingSlab.json b/data/as/30214145/ws-services-calculation/WCBillingSlab.json
index 26e6cbf5d0..34a6bdc1ba 100644
--- a/data/as/30214145/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214145/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214148/ws-services-calculation/WCBillingSlab.json b/data/as/30214148/ws-services-calculation/WCBillingSlab.json
index 50f215425a..d374fd8ac5 100644
--- a/data/as/30214148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214148/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214152/ws-services-calculation/WCBillingSlab.json b/data/as/30214152/ws-services-calculation/WCBillingSlab.json
index 0c4570f840..7fd0309c6a 100644
--- a/data/as/30214152/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214152/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214157/ws-services-calculation/WCBillingSlab.json b/data/as/30214157/ws-services-calculation/WCBillingSlab.json
index 95d7cf3314..38b38b8aa5 100644
--- a/data/as/30214157/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214157/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214168/ws-services-calculation/WCBillingSlab.json b/data/as/30214168/ws-services-calculation/WCBillingSlab.json
index 92659db931..1deae78797 100644
--- a/data/as/30214168/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214168/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214174/ws-services-calculation/WCBillingSlab.json b/data/as/30214174/ws-services-calculation/WCBillingSlab.json
index 28bbe8af79..8f21880c6d 100644
--- a/data/as/30214174/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214174/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214298/ws-services-calculation/WCBillingSlab.json b/data/as/30214298/ws-services-calculation/WCBillingSlab.json
index 60f99ce26d..1e11a43962 100644
--- a/data/as/30214298/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214298/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214330/ws-services-calculation/WCBillingSlab.json b/data/as/30214330/ws-services-calculation/WCBillingSlab.json
index 4d0a3dc996..5db50fd214 100644
--- a/data/as/30214330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214330/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214334/ws-services-calculation/WCBillingSlab.json b/data/as/30214334/ws-services-calculation/WCBillingSlab.json
index e7091f68fc..ce5537ab4e 100644
--- a/data/as/30214334/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214334/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214398/ws-services-calculation/WCBillingSlab.json b/data/as/30214398/ws-services-calculation/WCBillingSlab.json
index 5e9cc18b82..9accbdaca9 100644
--- a/data/as/30214398/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214398/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214413/ws-services-calculation/WCBillingSlab.json b/data/as/30214413/ws-services-calculation/WCBillingSlab.json
index 65c57440d2..d31400e971 100644
--- a/data/as/30214413/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214413/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214437/ws-services-calculation/WCBillingSlab.json b/data/as/30214437/ws-services-calculation/WCBillingSlab.json
index aa667cf764..e349bd5000 100644
--- a/data/as/30214437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214437/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214444/ws-services-calculation/WCBillingSlab.json b/data/as/30214444/ws-services-calculation/WCBillingSlab.json
index 9b95f9426f..f35449a769 100644
--- a/data/as/30214444/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214444/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214454/ws-services-calculation/WCBillingSlab.json b/data/as/30214454/ws-services-calculation/WCBillingSlab.json
index d8aba146a0..e923769649 100644
--- a/data/as/30214454/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214454/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214478/ws-services-calculation/WCBillingSlab.json b/data/as/30214478/ws-services-calculation/WCBillingSlab.json
index b670a5198b..2a7cd0cfed 100644
--- a/data/as/30214478/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214478/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214502/ws-services-calculation/WCBillingSlab.json b/data/as/30214502/ws-services-calculation/WCBillingSlab.json
index d96d9a05f3..0aa094e2f5 100644
--- a/data/as/30214502/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214502/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214524/ws-services-calculation/WCBillingSlab.json b/data/as/30214524/ws-services-calculation/WCBillingSlab.json
index 505704bd49..b6934aab87 100644
--- a/data/as/30214524/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214524/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214533/ws-services-calculation/WCBillingSlab.json b/data/as/30214533/ws-services-calculation/WCBillingSlab.json
index 6c7d2b9520..26f0defd2c 100644
--- a/data/as/30214533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214551/ws-services-calculation/WCBillingSlab.json b/data/as/30214551/ws-services-calculation/WCBillingSlab.json
index e219d05026..d85a8bc002 100644
--- a/data/as/30214551/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214551/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214559/ws-services-calculation/WCBillingSlab.json b/data/as/30214559/ws-services-calculation/WCBillingSlab.json
index 22c20a84b6..659d7ee437 100644
--- a/data/as/30214559/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214559/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214579/ws-services-calculation/WCBillingSlab.json b/data/as/30214579/ws-services-calculation/WCBillingSlab.json
index 4f921a9046..7963ff4806 100644
--- a/data/as/30214579/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214579/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214623/ws-services-calculation/WCBillingSlab.json b/data/as/30214623/ws-services-calculation/WCBillingSlab.json
index ed32851480..df99f9b958 100644
--- a/data/as/30214623/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214623/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214632/ws-services-calculation/WCBillingSlab.json b/data/as/30214632/ws-services-calculation/WCBillingSlab.json
index 1192dc6e72..16bfa7ea21 100644
--- a/data/as/30214632/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214632/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214635/ws-services-calculation/WCBillingSlab.json b/data/as/30214635/ws-services-calculation/WCBillingSlab.json
index 5ff9db1bd2..5eda747b8c 100644
--- a/data/as/30214635/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214635/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214651/ws-services-calculation/WCBillingSlab.json b/data/as/30214651/ws-services-calculation/WCBillingSlab.json
index 2a975a03c9..5db0587c9b 100644
--- a/data/as/30214651/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214651/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214686/ws-services-calculation/WCBillingSlab.json b/data/as/30214686/ws-services-calculation/WCBillingSlab.json
index 4b367f3fb1..b8939c95b7 100644
--- a/data/as/30214686/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214686/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214704/ws-services-calculation/WCBillingSlab.json b/data/as/30214704/ws-services-calculation/WCBillingSlab.json
index 3a581c3df2..a15ddfc935 100644
--- a/data/as/30214704/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214704/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30214731/ws-services-calculation/WCBillingSlab.json b/data/as/30214731/ws-services-calculation/WCBillingSlab.json
index 0e51738acf..b5aa971680 100644
--- a/data/as/30214731/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30214731/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30215695/ws-services-calculation/WCBillingSlab.json b/data/as/30215695/ws-services-calculation/WCBillingSlab.json
index 2b37fa2f9d..a48bc38118 100644
--- a/data/as/30215695/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30215695/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30215708/ws-services-calculation/WCBillingSlab.json b/data/as/30215708/ws-services-calculation/WCBillingSlab.json
index 992d17f09d..dcd68ec0d5 100644
--- a/data/as/30215708/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30215708/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216018/ws-services-calculation/WCBillingSlab.json b/data/as/30216018/ws-services-calculation/WCBillingSlab.json
index 0002a0d1e9..c17c6a13cf 100644
--- a/data/as/30216018/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216018/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216021/ws-services-calculation/WCBillingSlab.json b/data/as/30216021/ws-services-calculation/WCBillingSlab.json
index d4d054d902..e567c26b95 100644
--- a/data/as/30216021/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216021/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216024/ws-services-calculation/WCBillingSlab.json b/data/as/30216024/ws-services-calculation/WCBillingSlab.json
index 757030c78c..0f20b19fe9 100644
--- a/data/as/30216024/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216024/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216027/ws-services-calculation/WCBillingSlab.json b/data/as/30216027/ws-services-calculation/WCBillingSlab.json
index ec48c06059..8c359379f8 100644
--- a/data/as/30216027/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216027/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216030/ws-services-calculation/WCBillingSlab.json b/data/as/30216030/ws-services-calculation/WCBillingSlab.json
index 3dbd091464..3bd33dd18e 100644
--- a/data/as/30216030/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216030/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216039/ws-services-calculation/WCBillingSlab.json b/data/as/30216039/ws-services-calculation/WCBillingSlab.json
index c6aba6f0fa..fcddb22a6d 100644
--- a/data/as/30216039/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216039/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216045/ws-services-calculation/WCBillingSlab.json b/data/as/30216045/ws-services-calculation/WCBillingSlab.json
index 924bc57b17..857add9a98 100644
--- a/data/as/30216045/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216045/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216049/ws-services-calculation/WCBillingSlab.json b/data/as/30216049/ws-services-calculation/WCBillingSlab.json
index 3dc65a43e4..802c9d197b 100644
--- a/data/as/30216049/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216049/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216051/ws-services-calculation/WCBillingSlab.json b/data/as/30216051/ws-services-calculation/WCBillingSlab.json
index fb3ae99d48..67f55fe783 100644
--- a/data/as/30216051/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216051/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216053/ws-services-calculation/WCBillingSlab.json b/data/as/30216053/ws-services-calculation/WCBillingSlab.json
index bf702677e4..a42a255204 100644
--- a/data/as/30216053/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216053/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216054/ws-services-calculation/WCBillingSlab.json b/data/as/30216054/ws-services-calculation/WCBillingSlab.json
index da0cfcc0b9..dcb7239fed 100644
--- a/data/as/30216054/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216054/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216055/ws-services-calculation/WCBillingSlab.json b/data/as/30216055/ws-services-calculation/WCBillingSlab.json
index b988829647..81059023f6 100644
--- a/data/as/30216055/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216055/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216056/ws-services-calculation/WCBillingSlab.json b/data/as/30216056/ws-services-calculation/WCBillingSlab.json
index e09b8e95e5..a54aa1c4f8 100644
--- a/data/as/30216056/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216056/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216057/ws-services-calculation/WCBillingSlab.json b/data/as/30216057/ws-services-calculation/WCBillingSlab.json
index cd621e4eca..64697cdd4d 100644
--- a/data/as/30216057/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216057/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216058/ws-services-calculation/WCBillingSlab.json b/data/as/30216058/ws-services-calculation/WCBillingSlab.json
index 793c04cbec..3da8e83b9a 100644
--- a/data/as/30216058/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216058/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216059/ws-services-calculation/WCBillingSlab.json b/data/as/30216059/ws-services-calculation/WCBillingSlab.json
index c699b5858f..4f960bd7e6 100644
--- a/data/as/30216059/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216059/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216061/ws-services-calculation/WCBillingSlab.json b/data/as/30216061/ws-services-calculation/WCBillingSlab.json
index 457b0f8da1..413327825a 100644
--- a/data/as/30216061/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216061/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216062/ws-services-calculation/WCBillingSlab.json b/data/as/30216062/ws-services-calculation/WCBillingSlab.json
index 720225be9c..029162b4b7 100644
--- a/data/as/30216062/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216062/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216214/ws-services-calculation/WCBillingSlab.json b/data/as/30216214/ws-services-calculation/WCBillingSlab.json
index e3020f3224..6534a31cb0 100644
--- a/data/as/30216214/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216214/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216258/ws-services-calculation/WCBillingSlab.json b/data/as/30216258/ws-services-calculation/WCBillingSlab.json
index ffb276ba14..a0b54aba1b 100644
--- a/data/as/30216258/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216258/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216269/ws-services-calculation/WCBillingSlab.json b/data/as/30216269/ws-services-calculation/WCBillingSlab.json
index 0fd8b5f3bc..060d0d839b 100644
--- a/data/as/30216269/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216269/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216295/ws-services-calculation/WCBillingSlab.json b/data/as/30216295/ws-services-calculation/WCBillingSlab.json
index e054d3c7c4..73dc406f5a 100644
--- a/data/as/30216295/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216295/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216302/ws-services-calculation/WCBillingSlab.json b/data/as/30216302/ws-services-calculation/WCBillingSlab.json
index 39f3c362a6..82e5e0560b 100644
--- a/data/as/30216302/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216302/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216319/ws-services-calculation/WCBillingSlab.json b/data/as/30216319/ws-services-calculation/WCBillingSlab.json
index dbff748b19..23ab0b9142 100644
--- a/data/as/30216319/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216319/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216336/ws-services-calculation/WCBillingSlab.json b/data/as/30216336/ws-services-calculation/WCBillingSlab.json
index 2f0333a848..5c53de2d11 100644
--- a/data/as/30216336/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216336/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216372/ws-services-calculation/WCBillingSlab.json b/data/as/30216372/ws-services-calculation/WCBillingSlab.json
index 4508d1312b..41e1ca6c4c 100644
--- a/data/as/30216372/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216372/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216378/ws-services-calculation/WCBillingSlab.json b/data/as/30216378/ws-services-calculation/WCBillingSlab.json
index 030a3169ee..b0e7799cff 100644
--- a/data/as/30216378/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216378/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216401/ws-services-calculation/WCBillingSlab.json b/data/as/30216401/ws-services-calculation/WCBillingSlab.json
index 5687215c5d..abda902d35 100644
--- a/data/as/30216401/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216401/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216427/ws-services-calculation/WCBillingSlab.json b/data/as/30216427/ws-services-calculation/WCBillingSlab.json
index d0d95a3e6b..8148fc9c10 100644
--- a/data/as/30216427/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216427/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216449/ws-services-calculation/WCBillingSlab.json b/data/as/30216449/ws-services-calculation/WCBillingSlab.json
index 0ee2527544..d95d291ce5 100644
--- a/data/as/30216449/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216449/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216472/ws-services-calculation/WCBillingSlab.json b/data/as/30216472/ws-services-calculation/WCBillingSlab.json
index 33cbda6f92..1af3b1109b 100644
--- a/data/as/30216472/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216472/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216505/ws-services-calculation/WCBillingSlab.json b/data/as/30216505/ws-services-calculation/WCBillingSlab.json
index c4ada70010..58e7942afe 100644
--- a/data/as/30216505/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216505/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216577/ws-services-calculation/WCBillingSlab.json b/data/as/30216577/ws-services-calculation/WCBillingSlab.json
index 14ee7939d3..bac1745020 100644
--- a/data/as/30216577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216577/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216676/ws-services-calculation/WCBillingSlab.json b/data/as/30216676/ws-services-calculation/WCBillingSlab.json
index 7ebbfd6605..c203cd10ac 100644
--- a/data/as/30216676/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216676/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216841/ws-services-calculation/WCBillingSlab.json b/data/as/30216841/ws-services-calculation/WCBillingSlab.json
index 0df3ed4a69..af873658c9 100644
--- a/data/as/30216841/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216841/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216849/ws-services-calculation/WCBillingSlab.json b/data/as/30216849/ws-services-calculation/WCBillingSlab.json
index 73fdcdf2dd..101fb823f6 100644
--- a/data/as/30216849/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216849/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216928/ws-services-calculation/WCBillingSlab.json b/data/as/30216928/ws-services-calculation/WCBillingSlab.json
index 58832c84c0..bd01b9a18e 100644
--- a/data/as/30216928/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216928/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216939/ws-services-calculation/WCBillingSlab.json b/data/as/30216939/ws-services-calculation/WCBillingSlab.json
index 41affbd98c..98f1ac171d 100644
--- a/data/as/30216939/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216939/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30216955/ws-services-calculation/WCBillingSlab.json b/data/as/30216955/ws-services-calculation/WCBillingSlab.json
index 11c20f7eeb..a47483f691 100644
--- a/data/as/30216955/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30216955/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30217247/ws-services-calculation/WCBillingSlab.json b/data/as/30217247/ws-services-calculation/WCBillingSlab.json
index e9c72d1a68..d00ff66624 100644
--- a/data/as/30217247/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30217247/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30217255/ws-services-calculation/WCBillingSlab.json b/data/as/30217255/ws-services-calculation/WCBillingSlab.json
index 1ef75575ae..a8f53142a9 100644
--- a/data/as/30217255/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30217255/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30217976/ws-services-calculation/WCBillingSlab.json b/data/as/30217976/ws-services-calculation/WCBillingSlab.json
index 1ccde4c8d4..fe5002bf0b 100644
--- a/data/as/30217976/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30217976/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218422/ws-services-calculation/WCBillingSlab.json b/data/as/30218422/ws-services-calculation/WCBillingSlab.json
index 56f8a6314e..030cca2ba4 100644
--- a/data/as/30218422/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218422/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218426/ws-services-calculation/WCBillingSlab.json b/data/as/30218426/ws-services-calculation/WCBillingSlab.json
index 3fc6c1a28c..dfa0d3dbec 100644
--- a/data/as/30218426/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218426/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218431/ws-services-calculation/WCBillingSlab.json b/data/as/30218431/ws-services-calculation/WCBillingSlab.json
index 2692fd7b17..a958384af3 100644
--- a/data/as/30218431/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218431/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218437/ws-services-calculation/WCBillingSlab.json b/data/as/30218437/ws-services-calculation/WCBillingSlab.json
index 5bd0d92c71..bf1ddfa616 100644
--- a/data/as/30218437/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218437/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218442/ws-services-calculation/WCBillingSlab.json b/data/as/30218442/ws-services-calculation/WCBillingSlab.json
index 5d36d0a10b..476bed95cc 100644
--- a/data/as/30218442/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218442/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218453/ws-services-calculation/WCBillingSlab.json b/data/as/30218453/ws-services-calculation/WCBillingSlab.json
index aefafd3581..a24db8b0bc 100644
--- a/data/as/30218453/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218453/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218465/ws-services-calculation/WCBillingSlab.json b/data/as/30218465/ws-services-calculation/WCBillingSlab.json
index 9383252fa8..78caf81268 100644
--- a/data/as/30218465/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218465/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218467/ws-services-calculation/WCBillingSlab.json b/data/as/30218467/ws-services-calculation/WCBillingSlab.json
index 75d37500be..3d06f1778a 100644
--- a/data/as/30218467/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218467/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218469/ws-services-calculation/WCBillingSlab.json b/data/as/30218469/ws-services-calculation/WCBillingSlab.json
index 2266ac22e9..4b8dd4ca64 100644
--- a/data/as/30218469/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218469/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218658/ws-services-calculation/WCBillingSlab.json b/data/as/30218658/ws-services-calculation/WCBillingSlab.json
index 92d360b4da..dd5de052b9 100644
--- a/data/as/30218658/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218658/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218660/ws-services-calculation/WCBillingSlab.json b/data/as/30218660/ws-services-calculation/WCBillingSlab.json
index 8d319cd8a7..fc106612f4 100644
--- a/data/as/30218660/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218660/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218662/ws-services-calculation/WCBillingSlab.json b/data/as/30218662/ws-services-calculation/WCBillingSlab.json
index 2b1778e715..e26913eb87 100644
--- a/data/as/30218662/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218662/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218664/ws-services-calculation/WCBillingSlab.json b/data/as/30218664/ws-services-calculation/WCBillingSlab.json
index 6f88eb140f..5113c3b626 100644
--- a/data/as/30218664/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218664/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218673/ws-services-calculation/WCBillingSlab.json b/data/as/30218673/ws-services-calculation/WCBillingSlab.json
index b3193b76a8..b3872a248c 100644
--- a/data/as/30218673/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218673/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218675/ws-services-calculation/WCBillingSlab.json b/data/as/30218675/ws-services-calculation/WCBillingSlab.json
index 0737508d27..5257519794 100644
--- a/data/as/30218675/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218675/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218682/ws-services-calculation/WCBillingSlab.json b/data/as/30218682/ws-services-calculation/WCBillingSlab.json
index f00e493977..15f5b57482 100644
--- a/data/as/30218682/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218682/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218684/ws-services-calculation/WCBillingSlab.json b/data/as/30218684/ws-services-calculation/WCBillingSlab.json
index e593a9c7e7..3e08f5965e 100644
--- a/data/as/30218684/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218684/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218703/ws-services-calculation/WCBillingSlab.json b/data/as/30218703/ws-services-calculation/WCBillingSlab.json
index 58d2d8007a..3721c87814 100644
--- a/data/as/30218703/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218703/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218711/ws-services-calculation/WCBillingSlab.json b/data/as/30218711/ws-services-calculation/WCBillingSlab.json
index 376d5382ca..47bcc073b9 100644
--- a/data/as/30218711/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218711/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218717/ws-services-calculation/WCBillingSlab.json b/data/as/30218717/ws-services-calculation/WCBillingSlab.json
index 326aa6caaf..a23b96c910 100644
--- a/data/as/30218717/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218717/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218718/ws-services-calculation/WCBillingSlab.json b/data/as/30218718/ws-services-calculation/WCBillingSlab.json
index a3853b39aa..529f527821 100644
--- a/data/as/30218718/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218718/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218719/ws-services-calculation/WCBillingSlab.json b/data/as/30218719/ws-services-calculation/WCBillingSlab.json
index 38dc518741..29f78a8c25 100644
--- a/data/as/30218719/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218719/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218721/ws-services-calculation/WCBillingSlab.json b/data/as/30218721/ws-services-calculation/WCBillingSlab.json
index 63bd9299e1..8c1b1b5ab8 100644
--- a/data/as/30218721/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218721/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218722/ws-services-calculation/WCBillingSlab.json b/data/as/30218722/ws-services-calculation/WCBillingSlab.json
index 69bb193e76..f6a58914ac 100644
--- a/data/as/30218722/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218722/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218724/ws-services-calculation/WCBillingSlab.json b/data/as/30218724/ws-services-calculation/WCBillingSlab.json
index a8cad43e8f..128b04ecd4 100644
--- a/data/as/30218724/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218724/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218726/ws-services-calculation/WCBillingSlab.json b/data/as/30218726/ws-services-calculation/WCBillingSlab.json
index 46a9501c0c..c392a38d79 100644
--- a/data/as/30218726/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218726/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218728/ws-services-calculation/WCBillingSlab.json b/data/as/30218728/ws-services-calculation/WCBillingSlab.json
index cb94697c0c..85c7b21180 100644
--- a/data/as/30218728/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218728/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218731/ws-services-calculation/WCBillingSlab.json b/data/as/30218731/ws-services-calculation/WCBillingSlab.json
index bc84701bb2..f2882087d7 100644
--- a/data/as/30218731/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218731/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218732/ws-services-calculation/WCBillingSlab.json b/data/as/30218732/ws-services-calculation/WCBillingSlab.json
index 9b87f35384..1c73fe2adf 100644
--- a/data/as/30218732/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218732/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218733/ws-services-calculation/WCBillingSlab.json b/data/as/30218733/ws-services-calculation/WCBillingSlab.json
index 265d3dc093..d950f1ba0a 100644
--- a/data/as/30218733/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218733/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218734/ws-services-calculation/WCBillingSlab.json b/data/as/30218734/ws-services-calculation/WCBillingSlab.json
index 94fedee02e..eccd93b038 100644
--- a/data/as/30218734/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218734/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218735/ws-services-calculation/WCBillingSlab.json b/data/as/30218735/ws-services-calculation/WCBillingSlab.json
index a1b142375b..1d19e3f515 100644
--- a/data/as/30218735/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218735/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218736/ws-services-calculation/WCBillingSlab.json b/data/as/30218736/ws-services-calculation/WCBillingSlab.json
index f80af92f9d..fd9a00774b 100644
--- a/data/as/30218736/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218736/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218737/ws-services-calculation/WCBillingSlab.json b/data/as/30218737/ws-services-calculation/WCBillingSlab.json
index 731631cc33..069e0ae1a4 100644
--- a/data/as/30218737/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218737/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218738/ws-services-calculation/WCBillingSlab.json b/data/as/30218738/ws-services-calculation/WCBillingSlab.json
index d9d62bfe40..118e8191a4 100644
--- a/data/as/30218738/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218738/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218739/ws-services-calculation/WCBillingSlab.json b/data/as/30218739/ws-services-calculation/WCBillingSlab.json
index 633fc925a6..07594d81fb 100644
--- a/data/as/30218739/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218739/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218740/ws-services-calculation/WCBillingSlab.json b/data/as/30218740/ws-services-calculation/WCBillingSlab.json
index 8f8098ba0d..ecf0749bb9 100644
--- a/data/as/30218740/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218740/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218741/ws-services-calculation/WCBillingSlab.json b/data/as/30218741/ws-services-calculation/WCBillingSlab.json
index d2a3591f90..4955edc5d2 100644
--- a/data/as/30218741/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218741/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218742/ws-services-calculation/WCBillingSlab.json b/data/as/30218742/ws-services-calculation/WCBillingSlab.json
index 82ceecc008..8019ea6433 100644
--- a/data/as/30218742/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218742/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218743/ws-services-calculation/WCBillingSlab.json b/data/as/30218743/ws-services-calculation/WCBillingSlab.json
index e28ef79be0..1f789985a4 100644
--- a/data/as/30218743/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218743/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218744/ws-services-calculation/WCBillingSlab.json b/data/as/30218744/ws-services-calculation/WCBillingSlab.json
index 353a862607..29074c964b 100644
--- a/data/as/30218744/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218744/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218745/ws-services-calculation/WCBillingSlab.json b/data/as/30218745/ws-services-calculation/WCBillingSlab.json
index e615760a9e..1ec4b815a8 100644
--- a/data/as/30218745/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218745/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218812/ws-services-calculation/WCBillingSlab.json b/data/as/30218812/ws-services-calculation/WCBillingSlab.json
index 9d35add9f8..2108dbbeb7 100644
--- a/data/as/30218812/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218812/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218889/ws-services-calculation/WCBillingSlab.json b/data/as/30218889/ws-services-calculation/WCBillingSlab.json
index 1ef5525faa..c409ffc53f 100644
--- a/data/as/30218889/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218889/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30218974/ws-services-calculation/WCBillingSlab.json b/data/as/30218974/ws-services-calculation/WCBillingSlab.json
index aab542b2c6..467cc40a7d 100644
--- a/data/as/30218974/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30218974/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219042/ws-services-calculation/WCBillingSlab.json b/data/as/30219042/ws-services-calculation/WCBillingSlab.json
index dbd04e25a0..a7b2967385 100644
--- a/data/as/30219042/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219042/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219068/ws-services-calculation/WCBillingSlab.json b/data/as/30219068/ws-services-calculation/WCBillingSlab.json
index f755bbb8c9..fbc595e13c 100644
--- a/data/as/30219068/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219068/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219089/ws-services-calculation/WCBillingSlab.json b/data/as/30219089/ws-services-calculation/WCBillingSlab.json
index 42295d208f..37a19779da 100644
--- a/data/as/30219089/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219089/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219100/ws-services-calculation/WCBillingSlab.json b/data/as/30219100/ws-services-calculation/WCBillingSlab.json
index ea91a89b3d..a06cc0c803 100644
--- a/data/as/30219100/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219100/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219362/ws-services-calculation/WCBillingSlab.json b/data/as/30219362/ws-services-calculation/WCBillingSlab.json
index 0d7d51fad8..cac49e9dfd 100644
--- a/data/as/30219362/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219362/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219371/ws-services-calculation/WCBillingSlab.json b/data/as/30219371/ws-services-calculation/WCBillingSlab.json
index b83dfaa97b..85ea4c9432 100644
--- a/data/as/30219371/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219371/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219382/ws-services-calculation/WCBillingSlab.json b/data/as/30219382/ws-services-calculation/WCBillingSlab.json
index c31cc5ecce..89d384697b 100644
--- a/data/as/30219382/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219382/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219434/ws-services-calculation/WCBillingSlab.json b/data/as/30219434/ws-services-calculation/WCBillingSlab.json
index 6d5b7a44f2..c8488f5b92 100644
--- a/data/as/30219434/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219434/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219447/ws-services-calculation/WCBillingSlab.json b/data/as/30219447/ws-services-calculation/WCBillingSlab.json
index 35a7d65651..20b1474c58 100644
--- a/data/as/30219447/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219447/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219463/ws-services-calculation/WCBillingSlab.json b/data/as/30219463/ws-services-calculation/WCBillingSlab.json
index 1b0fdc5d51..fde6d9a042 100644
--- a/data/as/30219463/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219463/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219482/ws-services-calculation/WCBillingSlab.json b/data/as/30219482/ws-services-calculation/WCBillingSlab.json
index d508a8c947..2e0c90cb06 100644
--- a/data/as/30219482/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219482/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219492/ws-services-calculation/WCBillingSlab.json b/data/as/30219492/ws-services-calculation/WCBillingSlab.json
index 2321c58220..bbba16e10a 100644
--- a/data/as/30219492/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219492/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219505/ws-services-calculation/WCBillingSlab.json b/data/as/30219505/ws-services-calculation/WCBillingSlab.json
index f384318332..e728690ee0 100644
--- a/data/as/30219505/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219505/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219515/ws-services-calculation/WCBillingSlab.json b/data/as/30219515/ws-services-calculation/WCBillingSlab.json
index 7b39d27a1f..da0e73c523 100644
--- a/data/as/30219515/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219515/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219532/ws-services-calculation/WCBillingSlab.json b/data/as/30219532/ws-services-calculation/WCBillingSlab.json
index ee59fa8576..a546c8e298 100644
--- a/data/as/30219532/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219532/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30219544/ws-services-calculation/WCBillingSlab.json b/data/as/30219544/ws-services-calculation/WCBillingSlab.json
index 774724d72a..7d82e5821d 100644
--- a/data/as/30219544/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30219544/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30220972/ws-services-calculation/WCBillingSlab.json b/data/as/30220972/ws-services-calculation/WCBillingSlab.json
index 11eb138e1e..0775b7f1e7 100644
--- a/data/as/30220972/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30220972/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221079/ws-services-calculation/WCBillingSlab.json b/data/as/30221079/ws-services-calculation/WCBillingSlab.json
index bd340e8b14..f0b7369569 100644
--- a/data/as/30221079/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221079/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221116/ws-services-calculation/WCBillingSlab.json b/data/as/30221116/ws-services-calculation/WCBillingSlab.json
index 581ac08585..36e54e4d31 100644
--- a/data/as/30221116/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221116/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221135/ws-services-calculation/WCBillingSlab.json b/data/as/30221135/ws-services-calculation/WCBillingSlab.json
index 3fe33ec3bb..664571f5bf 100644
--- a/data/as/30221135/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221135/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221148/ws-services-calculation/WCBillingSlab.json b/data/as/30221148/ws-services-calculation/WCBillingSlab.json
index 05f6263060..0744d88f2d 100644
--- a/data/as/30221148/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221148/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221164/ws-services-calculation/WCBillingSlab.json b/data/as/30221164/ws-services-calculation/WCBillingSlab.json
index 8e62f5a940..45ffbb1cbc 100644
--- a/data/as/30221164/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221164/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221189/ws-services-calculation/WCBillingSlab.json b/data/as/30221189/ws-services-calculation/WCBillingSlab.json
index 14d3945814..434688a601 100644
--- a/data/as/30221189/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221189/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221203/ws-services-calculation/WCBillingSlab.json b/data/as/30221203/ws-services-calculation/WCBillingSlab.json
index dea13f5625..b2f9e490aa 100644
--- a/data/as/30221203/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221203/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221221/ws-services-calculation/WCBillingSlab.json b/data/as/30221221/ws-services-calculation/WCBillingSlab.json
index 5df7973525..b5e4efbbb7 100644
--- a/data/as/30221221/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221221/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221249/ws-services-calculation/WCBillingSlab.json b/data/as/30221249/ws-services-calculation/WCBillingSlab.json
index a0fc6a008b..9ed9e7fdc9 100644
--- a/data/as/30221249/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221249/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221256/ws-services-calculation/WCBillingSlab.json b/data/as/30221256/ws-services-calculation/WCBillingSlab.json
index e18292e6c1..23200677be 100644
--- a/data/as/30221256/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221256/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221262/ws-services-calculation/WCBillingSlab.json b/data/as/30221262/ws-services-calculation/WCBillingSlab.json
index f031c53650..44a8cf0c0d 100644
--- a/data/as/30221262/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221262/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221312/ws-services-calculation/WCBillingSlab.json b/data/as/30221312/ws-services-calculation/WCBillingSlab.json
index fab6aa82cc..84b2b2f5d5 100644
--- a/data/as/30221312/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221312/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221327/ws-services-calculation/WCBillingSlab.json b/data/as/30221327/ws-services-calculation/WCBillingSlab.json
index df7889d67e..8f7f9ca73e 100644
--- a/data/as/30221327/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221327/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221330/ws-services-calculation/WCBillingSlab.json b/data/as/30221330/ws-services-calculation/WCBillingSlab.json
index e99acf43cd..b0deff388c 100644
--- a/data/as/30221330/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221330/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221335/ws-services-calculation/WCBillingSlab.json b/data/as/30221335/ws-services-calculation/WCBillingSlab.json
index 0da8342cde..b5ca4c00d6 100644
--- a/data/as/30221335/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221335/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221339/ws-services-calculation/WCBillingSlab.json b/data/as/30221339/ws-services-calculation/WCBillingSlab.json
index d20ba0e2e4..80e10a8e0d 100644
--- a/data/as/30221339/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221339/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221352/ws-services-calculation/WCBillingSlab.json b/data/as/30221352/ws-services-calculation/WCBillingSlab.json
index 2d60c5c820..3537d5e98a 100644
--- a/data/as/30221352/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221352/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221370/ws-services-calculation/WCBillingSlab.json b/data/as/30221370/ws-services-calculation/WCBillingSlab.json
index 9891dda4f3..570e982d3f 100644
--- a/data/as/30221370/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221370/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221379/ws-services-calculation/WCBillingSlab.json b/data/as/30221379/ws-services-calculation/WCBillingSlab.json
index b924ab8fa9..52dd95a6e1 100644
--- a/data/as/30221379/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221379/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221387/ws-services-calculation/WCBillingSlab.json b/data/as/30221387/ws-services-calculation/WCBillingSlab.json
index 98b923f998..bf53ffb7cc 100644
--- a/data/as/30221387/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221387/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221395/ws-services-calculation/WCBillingSlab.json b/data/as/30221395/ws-services-calculation/WCBillingSlab.json
index 5b15def150..62512e1ac6 100644
--- a/data/as/30221395/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221395/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221411/ws-services-calculation/WCBillingSlab.json b/data/as/30221411/ws-services-calculation/WCBillingSlab.json
index 99b0d772ab..0f859e52ef 100644
--- a/data/as/30221411/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221411/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221525/ws-services-calculation/WCBillingSlab.json b/data/as/30221525/ws-services-calculation/WCBillingSlab.json
index 6c33f4cce3..1d2b78a136 100644
--- a/data/as/30221525/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221525/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221530/ws-services-calculation/WCBillingSlab.json b/data/as/30221530/ws-services-calculation/WCBillingSlab.json
index a497e79c29..21d405ba17 100644
--- a/data/as/30221530/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221530/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221533/ws-services-calculation/WCBillingSlab.json b/data/as/30221533/ws-services-calculation/WCBillingSlab.json
index 092fe9717c..3a9eb3f093 100644
--- a/data/as/30221533/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221533/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221545/ws-services-calculation/WCBillingSlab.json b/data/as/30221545/ws-services-calculation/WCBillingSlab.json
index 0f9fbcc373..d92807b987 100644
--- a/data/as/30221545/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221545/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221554/ws-services-calculation/WCBillingSlab.json b/data/as/30221554/ws-services-calculation/WCBillingSlab.json
index 89a6944fd1..8b39da1791 100644
--- a/data/as/30221554/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221554/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221603/ws-services-calculation/WCBillingSlab.json b/data/as/30221603/ws-services-calculation/WCBillingSlab.json
index 49f5144da3..2873d82b24 100644
--- a/data/as/30221603/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221603/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221622/ws-services-calculation/WCBillingSlab.json b/data/as/30221622/ws-services-calculation/WCBillingSlab.json
index 4e6c943449..e0c141e18a 100644
--- a/data/as/30221622/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221622/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30221636/ws-services-calculation/WCBillingSlab.json b/data/as/30221636/ws-services-calculation/WCBillingSlab.json
index cf8db0aa96..c80adf361f 100644
--- a/data/as/30221636/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30221636/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30222577/ws-services-calculation/WCBillingSlab.json b/data/as/30222577/ws-services-calculation/WCBillingSlab.json
index 9b5ec055d1..f4a3946288 100644
--- a/data/as/30222577/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30222577/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30222595/ws-services-calculation/WCBillingSlab.json b/data/as/30222595/ws-services-calculation/WCBillingSlab.json
index f15a6da7bc..3fbf4a97e1 100644
--- a/data/as/30222595/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30222595/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30222601/ws-services-calculation/WCBillingSlab.json b/data/as/30222601/ws-services-calculation/WCBillingSlab.json
index 7d42c182de..473d691b19 100644
--- a/data/as/30222601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30222601/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224592/ws-services-calculation/WCBillingSlab.json b/data/as/30224592/ws-services-calculation/WCBillingSlab.json
index 4402de03f2..a9adb640ef 100644
--- a/data/as/30224592/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224592/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224594/ws-services-calculation/WCBillingSlab.json b/data/as/30224594/ws-services-calculation/WCBillingSlab.json
index 36d0501775..5c9cecca8c 100644
--- a/data/as/30224594/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224594/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224596/ws-services-calculation/WCBillingSlab.json b/data/as/30224596/ws-services-calculation/WCBillingSlab.json
index e8f18caf5a..72fb996df7 100644
--- a/data/as/30224596/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224596/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224601/ws-services-calculation/WCBillingSlab.json b/data/as/30224601/ws-services-calculation/WCBillingSlab.json
index 7c89f5a44b..a9bb19dead 100644
--- a/data/as/30224601/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224601/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224607/ws-services-calculation/WCBillingSlab.json b/data/as/30224607/ws-services-calculation/WCBillingSlab.json
index c51465c004..082b5de4d0 100644
--- a/data/as/30224607/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224607/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224611/ws-services-calculation/WCBillingSlab.json b/data/as/30224611/ws-services-calculation/WCBillingSlab.json
index d2b5b46dbb..7943f60bee 100644
--- a/data/as/30224611/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224611/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224621/ws-services-calculation/WCBillingSlab.json b/data/as/30224621/ws-services-calculation/WCBillingSlab.json
index 707c67dd25..8c7c95c1ac 100644
--- a/data/as/30224621/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224621/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224626/ws-services-calculation/WCBillingSlab.json b/data/as/30224626/ws-services-calculation/WCBillingSlab.json
index 89784dd0fd..9925296bb2 100644
--- a/data/as/30224626/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224626/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224629/ws-services-calculation/WCBillingSlab.json b/data/as/30224629/ws-services-calculation/WCBillingSlab.json
index a68bb68f81..09267cfbac 100644
--- a/data/as/30224629/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224629/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224634/ws-services-calculation/WCBillingSlab.json b/data/as/30224634/ws-services-calculation/WCBillingSlab.json
index 1e23e12981..11fcf66b08 100644
--- a/data/as/30224634/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224634/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224638/ws-services-calculation/WCBillingSlab.json b/data/as/30224638/ws-services-calculation/WCBillingSlab.json
index 28bda5f088..9495dfbf60 100644
--- a/data/as/30224638/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224638/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30224681/ws-services-calculation/WCBillingSlab.json b/data/as/30224681/ws-services-calculation/WCBillingSlab.json
index 479ee13a35..a9c824230a 100644
--- a/data/as/30224681/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30224681/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30226845/ws-services-calculation/WCBillingSlab.json b/data/as/30226845/ws-services-calculation/WCBillingSlab.json
index 3ced1a4340..904ced2a99 100644
--- a/data/as/30226845/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30226845/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30231032/ws-services-calculation/WCBillingSlab.json b/data/as/30231032/ws-services-calculation/WCBillingSlab.json
index 8921897bd3..00c344fbb1 100644
--- a/data/as/30231032/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30231032/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30235506/ws-services-calculation/WCBillingSlab.json b/data/as/30235506/ws-services-calculation/WCBillingSlab.json
index 03a71b0814..2c7e156f95 100644
--- a/data/as/30235506/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30235506/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30244996/ws-services-calculation/WCBillingSlab.json b/data/as/30244996/ws-services-calculation/WCBillingSlab.json
index b79f2add70..b2b50f7ac4 100644
--- a/data/as/30244996/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30244996/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file
diff --git a/data/as/30245010/ws-services-calculation/WCBillingSlab.json b/data/as/30245010/ws-services-calculation/WCBillingSlab.json
index f024d22552..ceee16ca21 100644
--- a/data/as/30245010/ws-services-calculation/WCBillingSlab.json
+++ b/data/as/30245010/ws-services-calculation/WCBillingSlab.json
@@ -91,28 +91,28 @@
             "buildingType": "RESIDENTIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "6",
             "buildingType": "COMMERCIAL",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "7",
             "buildingType": "MIXED",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         },
         {
             "id": "8",
             "buildingType": "PUBLICSECTOR",
             "calculationAttribute": "Flat",
             "connectionType": "Non_Metered",
-            "minimumCharge": 0.0
+            "minimumCharge": 0
         }
     ]
 }
\ No newline at end of file